Skip to content

Commit 91a4774

Browse files
dependencies: update axios
* closes #278
1 parent cb10bb7 commit 91a4774

File tree

7 files changed

+2495
-2182
lines changed

7 files changed

+2495
-2182
lines changed

.github/workflows/js-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323

2424
strategy:
2525
matrix:
26-
node-version: [14.x, 16.x]
26+
node-version: [18.x]
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3131

3232
- name: Use Node.js ${{ matrix.node-version }}
33-
uses: actions/setup-node@v1
33+
uses: actions/setup-node@v3
3434
with:
3535
node-version: ${{ matrix.node-version }}
3636

.github/workflows/npm-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111

1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v1
14+
uses: actions/checkout@v3
1515

1616
- name: Setup Node.js
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v3
1818
with:
19-
node-version: 14
19+
node-version: '18.x'
2020
registry-url: 'https://registry.npmjs.org'
2121

2222
- name: Install and Build

package-lock.json

Lines changed: 2452 additions & 2149 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"peerDependencies": {
2626
"@babel/runtime": "^7.9.0",
27-
"axios": "^0.21.0",
27+
"axios": "^1.7.7",
2828
"lodash": "^4.17.0",
2929
"qs": "^6.8.0",
3030
"react": "^16.13.0",
@@ -42,12 +42,11 @@
4242
"@rollup/plugin-babel": "^5.2.0",
4343
"@rollup/plugin-commonjs": "^15.1.0",
4444
"@rollup/plugin-node-resolve": "^9.0.0",
45-
"axios": "^0.21.0",
45+
"axios": "^1.7.7",
4646
"axios-mock-adapter": "^1.18.0",
4747
"coveralls": "^3.0.0",
4848
"enzyme": "^3.10.0",
4949
"enzyme-adapter-react-16": "^1.15.0",
50-
"enzyme-to-json": "^3.6.0",
5150
"expect": "^26.5.0",
5251
"json": "^10.0.0",
5352
"lodash": "^4.17.0",
@@ -107,10 +106,5 @@
107106
},
108107
"engines": {
109108
"node": ">=14.0.0"
110-
},
111-
"jest": {
112-
"snapshotSerializers": [
113-
"enzyme-to-json/serializer"
114-
]
115109
}
116110
}

src/lib/components/ResultsGrid/ResultsGrid.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ import { Card, Image } from "semantic-ui-react";
1313
import { AppContext } from "../ReactSearchKit";
1414
import { ShouldRender } from "../ShouldRender";
1515

16-
function ResultsGrid({ loading, totalResults, results, resultsPerRow, overridableId, onResultsRendered }) {
17-
16+
function ResultsGrid({
17+
loading,
18+
totalResults,
19+
results,
20+
resultsPerRow,
21+
overridableId,
22+
onResultsRendered,
23+
}) {
1824
useEffect(() => {
1925
if (onResultsRendered) {
2026
onResultsRendered();
2127
}
22-
23-
return () => {
24-
if (onResultsRendered) {
25-
onResultsRendered = null;
26-
}
27-
};
2828
}, [onResultsRendered]);
2929

3030
return (

src/lib/components/ResultsList/ResultsList.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ import { Item } from "semantic-ui-react";
1313
import { AppContext } from "../ReactSearchKit";
1414
import { ShouldRender } from "../ShouldRender";
1515

16-
function ResultsList({ loading, totalResults, results, overridableId, onResultsRendered }) {
16+
function ResultsList({
17+
loading,
18+
totalResults,
19+
results,
20+
overridableId,
21+
onResultsRendered,
22+
}) {
1723
useEffect(() => {
1824
if (onResultsRendered) {
1925
onResultsRendered();
2026
}
21-
22-
return () => {
23-
if (onResultsRendered) {
24-
onResultsRendered = null;
25-
}
26-
};
2727
}, [onResultsRendered]);
2828

2929
return (

src/lib/components/ResultsMultiLayout/ResultsMultiLayout.js

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,20 @@ import { ResultsGrid } from "../ResultsGrid";
1414
import { ResultsList } from "../ResultsList";
1515
import { ShouldRender } from "../ShouldRender";
1616

17-
function ResultsMultiLayout({ loading, totalResults, currentLayout, overridableId, onResultsRendered }) {
17+
function ResultsMultiLayout({
18+
loading,
19+
totalResults,
20+
currentLayout,
21+
overridableId,
22+
onResultsRendered,
23+
}) {
1824
return (
1925
<ShouldRender condition={currentLayout != null && !loading && totalResults > 0}>
20-
<Element layout={currentLayout} overridableId={overridableId} onResultsRendered={onResultsRendered} />
26+
<Element
27+
layout={currentLayout}
28+
overridableId={overridableId}
29+
onResultsRendered={onResultsRendered}
30+
/>
2131
</ShouldRender>
2232
);
2333
}
@@ -46,9 +56,15 @@ const Element = ({ layout, overridableId, onResultsRendered }) => {
4656
onResultsRendered={onResultsRendered}
4757
>
4858
{layout === "list" ? (
49-
<ResultsList overridableId={overridableId} onResultsRendered={onResultsRendered}/>
59+
<ResultsList
60+
overridableId={overridableId}
61+
onResultsRendered={onResultsRendered}
62+
/>
5063
) : (
51-
<ResultsGrid overridableId={overridableId} onResultsRendered={onResultsRendered}/>
64+
<ResultsGrid
65+
overridableId={overridableId}
66+
onResultsRendered={onResultsRendered}
67+
/>
5268
)}
5369
</Overridable>
5470
);

0 commit comments

Comments
 (0)