Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Commit 04fcb5c

Browse files
build: update .nvmrc to 20, regenerate package-lock.json (#881)
* test: add node 20 to CI matrix * build: update `.nvmrc` to 20, regenerate `package-lock.json` * test: update snapshots
1 parent f59949b commit 04fcb5c

File tree

8 files changed

+4506
-6306
lines changed

8 files changed

+4506
-6306
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@ on:
1010

1111
jobs:
1212
tests:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
node: [18, 20]
17+
continue-on-error: ${{ matrix.node == 20 }}
1418

1519
steps:
1620
- name: Checkout
17-
uses: actions/checkout@v3
18-
- name: Setup Nodejs Env
19-
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
21+
uses: actions/checkout@v4
2022
- name: Setup Nodejs
21-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2224
with:
23-
node-version: ${{ env.NODE_VER }}
25+
node-version: ${{ matrix.node }}
2426

2527
- name: Install dependencies
2628
run: npm ci

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20

audit-ci.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"GHSA-wf5p-g6vw-rhxx",
55
"GHSA-cxjh-pqwp-8mfp",
66
"GHSA-wr3j-pwj9-hqq6",
7-
"GHSA-rv95-896h-c2vc"
7+
"GHSA-rv95-896h-c2vc",
8+
"GHSA-vc8w-jr9v-vj7f"
89
],
910
"moderate": true
1011
}

package-lock.json

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

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@
3131
},
3232
"dependencies": {
3333
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
34-
"@edx/frontend-component-footer": "13.0.2",
35-
"@edx/frontend-component-header": "5.0.2",
36-
"@edx/frontend-platform": "7.1.0",
34+
"@edx/frontend-component-footer": "^14.0.0",
35+
"@edx/frontend-component-header": "^5.0.2",
36+
"@edx/frontend-platform": "^7.1.0",
3737
"@edx/openedx-atlas": "^0.6.0",
3838
"@fortawesome/fontawesome-svg-core": "^6.1.1",
3939
"@fortawesome/free-brands-svg-icons": "^6.1.1",
4040
"@fortawesome/free-regular-svg-icons": "^6.1.1",
4141
"@fortawesome/free-solid-svg-icons": "^6.1.1",
4242
"@fortawesome/react-fontawesome": "^0.2.0",
43-
"@openedx/paragon": "22.1.1",
43+
"@openedx/paragon": "^22.1.1",
4444
"@stripe/react-stripe-js": "^1.10.0",
4545
"@stripe/stripe-js": "^1.36.0",
4646
"axios": "^0.27.2",
47-
"bootstrap": "4.6.1",
47+
"bootstrap": "^4.6.1",
4848
"classnames": "^2.3.1",
4949
"core-js": "^3.23.5",
5050
"country-state-city": "^3.2.1",
@@ -73,7 +73,7 @@
7373
"devDependencies": {
7474
"@edx/browserslist-config": "^1.2.0",
7575
"@edx/reactifex": "^2.1.0",
76-
"@openedx/frontend-build": "13.0.27",
76+
"@openedx/frontend-build": "^14.0.0",
7777
"@testing-library/jest-dom": "^5.14.1",
7878
"@testing-library/react": "^12.1.5",
7979
"audit-ci": "^6.3.0",
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`redux tests should return the default state when appropriate 1`] = `
4-
Object {
5-
"byId": Object {},
6-
"orderedIds": Array [],
4+
{
5+
"byId": {},
6+
"orderedIds": [],
77
}
88
`;
99

1010
exports[`redux tests should return the default state when appropriate 2`] = `
11-
Object {
12-
"byId": Object {},
13-
"orderedIds": Array [],
11+
{
12+
"byId": {},
13+
"orderedIds": [],
1414
}
1515
`;
1616

1717
exports[`redux tests should return the default state when appropriate 3`] = `
18-
Object {
19-
"byId": Object {},
20-
"orderedIds": Array [],
18+
{
19+
"byId": {},
20+
"orderedIds": [],
2121
}
2222
`;

src/payment/__snapshots__/PaymentPage.test.jsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2054,7 +2054,7 @@ exports[`<PaymentPage /> Renders correctly in various states should render the b
20542054
xmlns="http://www.w3.org/2000/svg"
20552055
>
20562056
<path
2057-
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"
2057+
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"
20582058
fill="currentColor"
20592059
/>
20602060
</svg>
@@ -4054,7 +4054,7 @@ exports[`<PaymentPage /> Renders correctly in various states should render the b
40544054
xmlns="http://www.w3.org/2000/svg"
40554055
>
40564056
<path
4057-
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"
4057+
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"
40584058
fill="currentColor"
40594059
/>
40604060
</svg>
@@ -5918,7 +5918,7 @@ exports[`<PaymentPage /> Renders correctly in various states should render the b
59185918
xmlns="http://www.w3.org/2000/svg"
59195919
>
59205920
<path
5921-
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"
5921+
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"
59225922
fill="currentColor"
59235923
/>
59245924
</svg>
@@ -7791,7 +7791,7 @@ exports[`<PaymentPage /> Renders correctly in various states should render the b
77917791
xmlns="http://www.w3.org/2000/svg"
77927792
>
77937793
<path
7794-
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"
7794+
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"
77957795
fill="currentColor"
77967796
/>
77977797
</svg>

src/payment/data/__snapshots__/redux.test.js.snap

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`redux tests basket reducer should return the default state when appropriate 1`] = `
4-
Object {
5-
"basket": Object {
4+
{
5+
"basket": {
66
"isBasketProcessing": false,
77
"loaded": false,
88
"loading": true,
9-
"products": Array [],
9+
"products": [],
1010
"redirect": false,
1111
"submitting": false,
1212
},
13-
"captureKey": Object {
13+
"captureKey": {
1414
"captureKeyId": "",
1515
"isCaptureKeyProcessing": false,
1616
"microformStatus": "LOADING",
1717
},
18-
"clientSecret": Object {
18+
"clientSecret": {
1919
"clientSecretId": "",
2020
"isClientSecretProcessing": false,
2121
},
2222
}
2323
`;
2424

2525
exports[`redux tests basket reducer should return the default state when appropriate 2`] = `
26-
Object {
27-
"basket": Object {
26+
{
27+
"basket": {
2828
"isBasketProcessing": false,
2929
"loaded": false,
3030
"loading": true,
31-
"products": Array [],
31+
"products": [],
3232
"redirect": false,
3333
"submitting": false,
3434
},
35-
"captureKey": Object {
35+
"captureKey": {
3636
"captureKeyId": "",
3737
"isCaptureKeyProcessing": false,
3838
"microformStatus": "LOADING",
3939
},
40-
"clientSecret": Object {
40+
"clientSecret": {
4141
"clientSecretId": "",
4242
"isClientSecretProcessing": false,
4343
},
4444
}
4545
`;
4646

4747
exports[`redux tests basket reducer should return the default state when appropriate 3`] = `
48-
Object {
49-
"basket": Object {
48+
{
49+
"basket": {
5050
"isBasketProcessing": false,
5151
"loaded": false,
5252
"loading": true,
53-
"products": Array [],
53+
"products": [],
5454
"redirect": false,
5555
"submitting": false,
5656
},
57-
"captureKey": Object {
57+
"captureKey": {
5858
"captureKeyId": "",
5959
"isCaptureKeyProcessing": false,
6060
"microformStatus": "LOADING",
6161
},
62-
"clientSecret": Object {
62+
"clientSecret": {
6363
"clientSecretId": "",
6464
"isClientSecretProcessing": false,
6565
},

0 commit comments

Comments
 (0)