Skip to content

Commit

Permalink
build: update .nvmrc to 20, regenerate package-lock.json (#881)
Browse files Browse the repository at this point in the history
* test: add node 20 to CI matrix

* build: update `.nvmrc` to 20, regenerate `package-lock.json`

* test: update snapshots
  • Loading branch information
brian-smith-tcril committed Sep 19, 2024
1 parent f59949b commit 04fcb5c
Show file tree
Hide file tree
Showing 8 changed files with 4,506 additions and 6,306 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,19 @@ on:

jobs:
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
node: [18, 20]
continue-on-error: ${{ matrix.node == 20 }}

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
uses: actions/checkout@v4
- name: Setup Nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VER }}
node-version: ${{ matrix.node }}

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
3 changes: 2 additions & 1 deletion audit-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"GHSA-wf5p-g6vw-rhxx",
"GHSA-cxjh-pqwp-8mfp",
"GHSA-wr3j-pwj9-hqq6",
"GHSA-rv95-896h-c2vc"
"GHSA-rv95-896h-c2vc",
"GHSA-vc8w-jr9v-vj7f"
],
"moderate": true
}
10,725 changes: 4,461 additions & 6,264 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@
},
"dependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-component-footer": "13.0.2",
"@edx/frontend-component-header": "5.0.2",
"@edx/frontend-platform": "7.1.0",
"@edx/frontend-component-footer": "^14.0.0",
"@edx/frontend-component-header": "^5.0.2",
"@edx/frontend-platform": "^7.1.0",
"@edx/openedx-atlas": "^0.6.0",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-brands-svg-icons": "^6.1.1",
"@fortawesome/free-regular-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@openedx/paragon": "22.1.1",
"@openedx/paragon": "^22.1.1",
"@stripe/react-stripe-js": "^1.10.0",
"@stripe/stripe-js": "^1.36.0",
"axios": "^0.27.2",
"bootstrap": "4.6.1",
"bootstrap": "^4.6.1",
"classnames": "^2.3.1",
"core-js": "^3.23.5",
"country-state-city": "^3.2.1",
Expand Down Expand Up @@ -73,7 +73,7 @@
"devDependencies": {
"@edx/browserslist-config": "^1.2.0",
"@edx/reactifex": "^2.1.0",
"@openedx/frontend-build": "13.0.27",
"@openedx/frontend-build": "^14.0.0",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.1.5",
"audit-ci": "^6.3.0",
Expand Down
18 changes: 9 additions & 9 deletions src/feedback/data/__snapshots__/redux.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`redux tests should return the default state when appropriate 1`] = `
Object {
"byId": Object {},
"orderedIds": Array [],
{
"byId": {},
"orderedIds": [],
}
`;

exports[`redux tests should return the default state when appropriate 2`] = `
Object {
"byId": Object {},
"orderedIds": Array [],
{
"byId": {},
"orderedIds": [],
}
`;

exports[`redux tests should return the default state when appropriate 3`] = `
Object {
"byId": Object {},
"orderedIds": Array [],
{
"byId": {},
"orderedIds": [],
}
`;
8 changes: 4 additions & 4 deletions src/payment/__snapshots__/PaymentPage.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,7 @@ exports[`<PaymentPage /> Renders correctly in various states should render the b
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM169.8 165.3c7.9-22.3 29.1-37.3 52.8-37.3h58.3c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24V250.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1H222.6c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM169.8 165.3c7.9-22.3 29.1-37.3 52.8-37.3l58.3 0c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24l0-13.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1l-58.3 0c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
fill="currentColor"
/>
</svg>
Expand Down Expand Up @@ -4054,7 +4054,7 @@ exports[`<PaymentPage /> Renders correctly in various states should render the b
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM169.8 165.3c7.9-22.3 29.1-37.3 52.8-37.3h58.3c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24V250.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1H222.6c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM169.8 165.3c7.9-22.3 29.1-37.3 52.8-37.3l58.3 0c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24l0-13.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1l-58.3 0c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
fill="currentColor"
/>
</svg>
Expand Down Expand Up @@ -5918,7 +5918,7 @@ exports[`<PaymentPage /> Renders correctly in various states should render the b
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM169.8 165.3c7.9-22.3 29.1-37.3 52.8-37.3h58.3c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24V250.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1H222.6c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM169.8 165.3c7.9-22.3 29.1-37.3 52.8-37.3l58.3 0c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24l0-13.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1l-58.3 0c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
fill="currentColor"
/>
</svg>
Expand Down Expand Up @@ -7791,7 +7791,7 @@ exports[`<PaymentPage /> Renders correctly in various states should render the b
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM169.8 165.3c7.9-22.3 29.1-37.3 52.8-37.3h58.3c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24V250.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1H222.6c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM169.8 165.3c7.9-22.3 29.1-37.3 52.8-37.3l58.3 0c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24l0-13.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1l-58.3 0c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
fill="currentColor"
/>
</svg>
Expand Down
30 changes: 15 additions & 15 deletions src/payment/data/__snapshots__/redux.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`redux tests basket reducer should return the default state when appropriate 1`] = `
Object {
"basket": Object {
{
"basket": {
"isBasketProcessing": false,
"loaded": false,
"loading": true,
"products": Array [],
"products": [],
"redirect": false,
"submitting": false,
},
"captureKey": Object {
"captureKey": {
"captureKeyId": "",
"isCaptureKeyProcessing": false,
"microformStatus": "LOADING",
},
"clientSecret": Object {
"clientSecret": {
"clientSecretId": "",
"isClientSecretProcessing": false,
},
}
`;

exports[`redux tests basket reducer should return the default state when appropriate 2`] = `
Object {
"basket": Object {
{
"basket": {
"isBasketProcessing": false,
"loaded": false,
"loading": true,
"products": Array [],
"products": [],
"redirect": false,
"submitting": false,
},
"captureKey": Object {
"captureKey": {
"captureKeyId": "",
"isCaptureKeyProcessing": false,
"microformStatus": "LOADING",
},
"clientSecret": Object {
"clientSecret": {
"clientSecretId": "",
"isClientSecretProcessing": false,
},
}
`;

exports[`redux tests basket reducer should return the default state when appropriate 3`] = `
Object {
"basket": Object {
{
"basket": {
"isBasketProcessing": false,
"loaded": false,
"loading": true,
"products": Array [],
"products": [],
"redirect": false,
"submitting": false,
},
"captureKey": Object {
"captureKey": {
"captureKeyId": "",
"isCaptureKeyProcessing": false,
"microformStatus": "LOADING",
},
"clientSecret": Object {
"clientSecret": {
"clientSecretId": "",
"isClientSecretProcessing": false,
},
Expand Down

0 comments on commit 04fcb5c

Please sign in to comment.