Skip to content

Commit

Permalink
Merge pull request #512 from mlibrary/dependabot/npm_and_yarn/group-a…
Browse files Browse the repository at this point in the history
…ll-npm-updates-9bb2ece28b
  • Loading branch information
dependabot[bot] authored Jan 6, 2025
2 parents 62e2da4 + f5adbd5 commit a26e070
Show file tree
Hide file tree
Showing 82 changed files with 641 additions and 1,115 deletions.
4 changes: 3 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ export default [
'no-ternary': 'off',
'no-magic-numbers': 'off',
'one-var': ['error', { initialized: 'never' }],
'sort-imports': ['error', { 'ignoreCase': true }],
'sort-imports': ['error', { 'ignoreCase': true }],

'react/prop-types': 'off',

'@stylistic/brace-style': ['error', '1tbs'],
'@stylistic/comma-dangle': ['error', 'never'],
Expand Down
1,077 changes: 591 additions & 486 deletions package-lock.json

Large diffs are not rendered by default.

23 changes: 11 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,24 @@
"private": true,
"homepage": "https://search.lib.umich.edu",
"devDependencies": {
"@eslint/compat": "^1.2.3",
"@eslint/js": "^9.16.0",
"@stylistic/eslint-plugin": "^2.11.0",
"eslint": "^9.16.0",
"eslint-plugin-react": "^7.37.2",
"globals": "^15.11.0",
"@eslint/compat": "^1.2.4",
"@eslint/js": "^9.17.0",
"@stylistic/eslint-plugin": "^2.12.1",
"eslint": "^9.17.0",
"eslint-plugin-react": "^7.37.3",
"globals": "^15.14.0",
"react-scripts": "^5.0.1"
},
"dependencies": {
"@reduxjs/toolkit": "^2.4.0",
"@reduxjs/toolkit": "^2.5.0",
"citeproc": "^2.4.63",
"prejudice": "git+https://github.com/mlibrary/prejudice.git",
"pride": "git+https://github.com/mlibrary/pride.git",
"prop-types": "^15.8.1",
"qs": "^6.13.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^9.1.2",
"react-router-dom": "^7.0.1"
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-redux": "^9.2.0",
"react-router-dom": "^7.1.1"
},
"overrides": {
"@babel/plugin-proposal-private-property-in-object": "npm:@babel/plugin-transform-private-property-in-object",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import './styles.css';
import PropTypes from 'prop-types';
import React from 'react';

const ActiveAdvancedFilters = ({ activeFilters, filters }) => {
Expand Down Expand Up @@ -66,9 +65,4 @@ const ActiveAdvancedFilters = ({ activeFilters, filters }) => {
);
};

ActiveAdvancedFilters.propTypes = {
activeFilters: PropTypes.object,
filters: PropTypes.array
};

export default ActiveAdvancedFilters;
6 changes: 0 additions & 6 deletions src/modules/advanced/components/AdvancedFilter/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Checkbox } from '../../../reusable';
import NarrowSearchTo from '../NarrowSearchTo';
import PropTypes from 'prop-types';
import React from 'react';

const getIsCheckboxFilterChecked = ({ advancedFilter }) => {
Expand Down Expand Up @@ -53,9 +52,4 @@ const AdvancedFilter = ({ advancedFilter, changeAdvancedFilter }) => {
return null;
};

AdvancedFilter.propTypes = {
advancedFilter: PropTypes.object,
changeAdvancedFilter: PropTypes.func
};

export default AdvancedFilter;
5 changes: 0 additions & 5 deletions src/modules/advanced/components/AdvancedSearchForm/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import React, { useCallback, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import FieldInput from '../FieldInput';
import FiltersContainer from '../FiltersContainer';
import PropTypes from 'prop-types';
import { stringifySearch } from '../../../search';
import { useNavigate } from 'react-router-dom';

Expand Down Expand Up @@ -119,8 +118,4 @@ const AdvancedSearchForm = ({ datastore }) => {
);
};

AdvancedSearchForm.propTypes = {
datastore: PropTypes.object.isRequired
};

export default AdvancedSearchForm;
9 changes: 0 additions & 9 deletions src/modules/advanced/components/FieldInput/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { memo, useCallback } from 'react';
import { removeFieldedSearch, setFieldedSearch } from '../../../advanced';
import Icon from '../../../reusable/components/Icon';
import PropTypes from 'prop-types';
import SearchByOptions from '../../../search/components/SearchByOptions';
import { useDispatch } from 'react-redux';

Expand Down Expand Up @@ -118,12 +117,4 @@ const FieldInput = ({
);
};

FieldInput.propTypes = {
booleanTypes: PropTypes.array,
datastoreUid: PropTypes.string,
fieldedSearch: PropTypes.object,
fieldedSearchIndex: PropTypes.number,
fields: PropTypes.array
};

export default memo(FieldInput);
5 changes: 0 additions & 5 deletions src/modules/advanced/components/FiltersContainer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useDispatch, useSelector } from 'react-redux';
import ActiveAdvancedFilters from '../ActiveAdvancedFilters';
import AdvancedFilter from '../AdvancedFilter';
import getFilters from './getFilters';
import PropTypes from 'prop-types';
import React from 'react';

const FiltersContainer = ({ datastoreUid }) => {
Expand Down Expand Up @@ -116,8 +115,4 @@ const FiltersContainer = ({ datastoreUid }) => {
);
};

FiltersContainer.propTypes = {
datastoreUid: PropTypes.string
};

export default FiltersContainer;
6 changes: 0 additions & 6 deletions src/modules/advanced/components/NarrowSearchTo/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import PropTypes from 'prop-types';
import React from 'react';

const NarrowSearchTo = ({ handleChange, options }) => {
Expand Down Expand Up @@ -43,9 +42,4 @@ const NarrowSearchTo = ({ handleChange, options }) => {
);
};

NarrowSearchTo.propTypes = {
handleChange: PropTypes.func,
options: PropTypes.array
};

export default NarrowSearchTo;
18 changes: 0 additions & 18 deletions src/modules/browse/components/BrowseByFilters/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Anchor } from '../../../reusable';
import PropTypes from 'prop-types';
import React from 'react';
import { stringifySearch } from '../../../search';
import { useParams } from 'react-router-dom';
Expand Down Expand Up @@ -34,16 +33,6 @@ const NestedList = ({ browserFilterTo, filter }) => {
);
};

NestedList.propTypes = {
browserFilterTo: PropTypes.func.isRequired,
filter: PropTypes.shape({
children: PropTypes.array,
count: PropTypes.number,
name: PropTypes.string.isRequired,
value: PropTypes.string
}).isRequired
};

const BrowseByFilters = ({ filters }) => {
const { datastoreSlug } = useParams();

Expand Down Expand Up @@ -81,11 +70,4 @@ const BrowseByFilters = ({ filters }) => {
);
};

BrowseByFilters.propTypes = {
filters: PropTypes.objectOf(PropTypes.shape({
filters: PropTypes.array.isRequired,
name: PropTypes.string.isRequired
})).isRequired
};

export default BrowseByFilters;
5 changes: 0 additions & 5 deletions src/modules/browse/components/BrowseInfo/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Anchor } from '../../../reusable';
import PropTypes from 'prop-types';
import React from 'react';

const BrowseInfo = ({ datastore }) => {
Expand All @@ -14,8 +13,4 @@ const BrowseInfo = ({ datastore }) => {
);
};

BrowseInfo.propTypes = {
datastore: PropTypes.object
};

export default BrowseInfo;
10 changes: 0 additions & 10 deletions src/modules/browse/components/BrowseLink/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Anchor } from '../../../reusable';
import PropTypes from 'prop-types';
import React from 'react';

const BrowseLink = ({ type = 'callnumber', value, children, ...rest }) => {
Expand All @@ -18,13 +17,4 @@ const BrowseLink = ({ type = 'callnumber', value, children, ...rest }) => {
);
};

BrowseLink.propTypes = {
children: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.node),
PropTypes.node
]),
type: PropTypes.string,
value: PropTypes.string
};

export default BrowseLink;
32 changes: 16 additions & 16 deletions src/modules/browse/components/ShelfBrowse/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,23 +105,23 @@ const ShelfBrowse = () => {
>
{shelfData === 'loading'
? loadingItems.map((element, index) => {
return (
<li key={index} className='shelf-browse-item'>
<div className='container__rounded padding-x__s padding-bottom__xs padding-top__s'>
<div className='placeholder-item-title'>
<div className='placeholder placeholder-title margin-bottom__none' />
<div className='placeholder placeholder-title margin-bottom__none margin-top__2xs' />
<div className='placeholder placeholder-title margin-bottom__none margin-top__2xs' />
return (
<li key={index} className='shelf-browse-item'>
<div className='container__rounded padding-x__s padding-bottom__xs padding-top__s'>
<div className='placeholder-item-title'>
<div className='placeholder placeholder-title margin-bottom__none' />
<div className='placeholder placeholder-title margin-bottom__none margin-top__2xs' />
<div className='placeholder placeholder-title margin-bottom__none margin-top__2xs' />
</div>
<div className='placeholder-item-line'>
<div className='placeholder placeholder-line margin-bottom__none margin-top__s' />
<div className='placeholder placeholder-line margin-bottom__none margin-top__s' />
<div className='placeholder placeholder-line placeholder-line-alt margin-top__s' />
</div>
</div>
<div className='placeholder-item-line'>
<div className='placeholder placeholder-line margin-bottom__none margin-top__s' />
<div className='placeholder placeholder-line margin-bottom__none margin-top__s' />
<div className='placeholder placeholder-line placeholder-line-alt margin-top__s' />
</div>
</div>
</li>
);
})
</li>
);
})
: (
<ShelfBrowseCarousel {...{
callNumber,
Expand Down
10 changes: 0 additions & 10 deletions src/modules/browse/components/ShelfBrowseCarousel/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import './styles.css';
import { Anchor, Icon } from '../../../reusable';
import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types';

const ShelfBrowseCarousel = ({ callNumber, items, itemsPerPage, setButtonAction, setDisableButton, uid }) => {
const currentItem = (item) => {
Expand Down Expand Up @@ -142,13 +141,4 @@ const ShelfBrowseCarousel = ({ callNumber, items, itemsPerPage, setButtonAction,
);
};

ShelfBrowseCarousel.propTypes = {
callNumber: PropTypes.string,
items: PropTypes.array,
itemsPerPage: PropTypes.number,
setButtonAction: PropTypes.func,
setDisableButton: PropTypes.func,
uid: PropTypes.string
};

export default ShelfBrowseCarousel;
7 changes: 0 additions & 7 deletions src/modules/core/components/DateRangeInput/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useCallback, useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import { setAdvancedFilter } from '../../../advanced';
import { useDispatch } from 'react-redux';

Expand Down Expand Up @@ -125,10 +124,4 @@ const DateRangeInput = ({ currentFilter = '', datastoreUid, filterGroupUid }) =>
);
};

DateRangeInput.propTypes = {
currentFilter: PropTypes.string,
datastoreUid: PropTypes.string.isRequired,
filterGroupUid: PropTypes.string.isRequired
};

export default DateRangeInput;
9 changes: 0 additions & 9 deletions src/modules/core/components/Multiselect/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import './styles.css';
import React, { useEffect, useMemo, useState } from 'react';
import PropTypes from 'prop-types';
import { setAdvancedFilter } from '../../../advanced';
import { useDispatch } from 'react-redux';

Expand Down Expand Up @@ -112,12 +111,4 @@ const Multiselect = ({ currentFilters, datastoreUid, filterGroupUid, filters = {
);
};

Multiselect.propTypes = {
currentFilters: PropTypes.array,
datastoreUid: PropTypes.string,
filterGroupUid: PropTypes.string,
filters: PropTypes.array,
name: PropTypes.string
};

export default Multiselect;
7 changes: 0 additions & 7 deletions src/modules/core/components/TrimString/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';

const TrimString = ({ expandable, string, trimLength = 240 }) => {
const [show, setShow] = useState(false);
Expand All @@ -26,10 +25,4 @@ const TrimString = ({ expandable, string, trimLength = 240 }) => {
);
};

TrimString.propTypes = {
expandable: PropTypes.bool,
string: PropTypes.string,
trimLength: PropTypes.number
};

export default TrimString;
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useState } from 'react';
import { Anchor } from '../../../reusable';
import PropTypes from 'prop-types';

const DatastoreInfoContainer = ({ name, uid }) => {
const [hide, setHide] = useState([]);
Expand Down Expand Up @@ -39,9 +38,4 @@ const DatastoreInfoContainer = ({ name, uid }) => {
);
};

DatastoreInfoContainer.propTypes = {
name: PropTypes.string,
uid: PropTypes.string
};

export default DatastoreInfoContainer;
8 changes: 0 additions & 8 deletions src/modules/datastores/components/DatastoreMain/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { RecordFull, Results } from '../../../records';
import { Route, Routes } from 'react-router-dom';
import { GetThisPage } from '../../../getthis';
import { List } from '../../../lists';
import PropTypes from 'prop-types';
import React from 'react';
import { SearchBox } from '../../../search';
import { useSelector } from 'react-redux';
Expand Down Expand Up @@ -48,11 +47,4 @@ const DatastoreMain = ({ activeDatastore, currentDatastore, datastores, query })
);
};

DatastoreMain.propTypes = {
activeDatastore: PropTypes.object,
currentDatastore: PropTypes.string,
datastores: PropTypes.array,
query: PropTypes.string
};

export default DatastoreMain;
11 changes: 0 additions & 11 deletions src/modules/datastores/components/DatastoreNavigation/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import './styles.css';
import { Anchor, Icon } from '../../../reusable';
import PropTypes from 'prop-types';
import React from 'react';
import { stringifySearch } from '../../../search';

Expand Down Expand Up @@ -34,14 +33,4 @@ const DatastoreNavigation = ({ activeFilters, activeInstitution, currentDatastor
);
};

DatastoreNavigation.propTypes = {
activeFilters: PropTypes.object,
activeInstitution: PropTypes.string,
currentDatastore: PropTypes.string,
datastores: PropTypes.array,
page: PropTypes.object,
query: PropTypes.string,
sort: PropTypes.object
};

export default DatastoreNavigation;
Loading

0 comments on commit a26e070

Please sign in to comment.