Skip to content

Commit 5af8ab4

Browse files
vcua-mobifyvcua-mobify
authored
Merge branch 'develop' into add-page-meta-tags
Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
2 parents 73a2622 + 0778438 commit 5af8ab4

File tree

40 files changed

+122
-92
lines changed

40 files changed

+122
-92
lines changed

‎.github/workflows/e2e.yml‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,22 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
# Run all matrix env at once because we will not deploy demo app to MRT.
14-
node: [16, 18, 20]
15-
npm: [8, 9, 10]
16-
exclude: # node 16 is not compatible with npm 10
14+
node: [16, 18, 20, 22]
15+
npm: [8, 9, 10, 11]
16+
exclude: # node 16 with npm 10/11 and node 18 with npm 11 are not compatible
1717
- node: 16
1818
npm: 10
19+
- node: 16
20+
npm: 11
21+
- node: 18
22+
npm: 11
1923
runs-on: ubuntu-latest
2024
env:
2125
# The "default" npm is the one that ships with a given version of node.
2226
# For more: https://nodejs.org/en/download/releases/
2327
# (We also use this env var for making sure a step runs once for the current node version)
2428
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
25-
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
29+
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
2630
steps:
2731
- name: Checkout
2832
uses: actions/checkout@v4
@@ -58,18 +62,22 @@ jobs:
5862
# Run one matrix env at a time because we need to deploy each app to MRT and run e2e tests there
5963
max-parallel: 1
6064
matrix:
61-
node: [16, 18, 20]
62-
npm: [8, 9, 10]
63-
exclude: # node 16 is not compatible with npm 10
65+
node: [16, 18, 20, 22]
66+
npm: [8, 9, 10, 11]
67+
exclude: # node 16 with npm 10/11 and node 18 with npm 11 are not compatible
6468
- node: 16
6569
npm: 10
70+
- node: 16
71+
npm: 11
72+
- node: 18
73+
npm: 11
6674
runs-on: ubuntu-latest
6775
env:
6876
# The "default" npm is the one that ships with a given version of node.
6977
# For more: https://nodejs.org/en/download/releases/
7078
# (We also use this env var for making sure a step runs once for the current node version)
7179
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
72-
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
80+
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
7381
steps:
7482
- name: Checkout
7583
uses: actions/checkout@v4
@@ -155,18 +163,22 @@ jobs:
155163
# Run one matrix env at a time because we need to deploy each app to MRT and run e2e tests there
156164
max-parallel: 1
157165
matrix:
158-
node: [16, 18, 20]
159-
npm: [8, 9, 10]
160-
exclude: # node 16 is not compatible with npm 10
166+
node: [16, 18, 20, 22]
167+
npm: [8, 9, 10, 11]
168+
exclude: # node 16 with npm 10/11 and node 18 with npm 11 are not compatible
161169
- node: 16
162170
npm: 10
171+
- node: 16
172+
npm: 11
173+
- node: 18
174+
npm: 11
163175
runs-on: ubuntu-latest
164176
env:
165177
# The "default" npm is the one that ships with a given version of node.
166178
# For more: https://nodejs.org/en/download/releases/
167179
# (We also use this env var for making sure a step runs once for the current node version)
168180
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
169-
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
181+
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
170182
steps:
171183
- name: Checkout
172184
uses: actions/checkout@v4
@@ -251,18 +263,22 @@ jobs:
251263
max-parallel: 1
252264
matrix:
253265
# Run all matrix env at once because we will not deploy demo app to MRT.
254-
node: [16, 18, 20]
255-
npm: [8, 9, 10]
256-
exclude: # node 16 is not compatible with npm 10
266+
node: [16, 18, 20, 22]
267+
npm: [8, 9, 10, 11]
268+
exclude: # node 16 with npm 10/11 and node 18 with npm 11 are not compatible
257269
- node: 16
258270
npm: 10
271+
- node: 16
272+
npm: 11
273+
- node: 18
274+
npm: 11
259275
runs-on: ubuntu-latest
260276
env:
261277
# The "default" npm is the one that ships with a given version of node.
262278
# For more: https://nodejs.org/en/download/releases/
263279
# (We also use this env var for making sure a step runs once for the current node version)
264280
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
265-
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
281+
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
266282
steps:
267283
- name: Checkout
268284
uses: actions/checkout@v4

‎.github/workflows/test.yml‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,24 @@ jobs:
4444
strategy:
4545
fail-fast: false
4646
matrix:
47-
node: [16, 18, 20]
48-
npm: [8, 9, 10]
49-
exclude: # node 16 is not compatible with npm 10
47+
node: [16, 18, 20, 22]
48+
npm: [8, 9, 10, 11]
49+
exclude: # node 16 with npm 10/11 and node 18 with npm 11 are not compatible
5050
- node: 16
5151
npm: 10
52+
- node: 16
53+
npm: 11
54+
- node: 18
55+
npm: 11
5256
runs-on: ubuntu-latest
5357
env:
5458
# The "default" npm is the one that ships with a given version of node.
5559
# For more: https://nodejs.org/en/download/releases/
5660
# (We also use this env var for making sure a step runs once for the current node version)
57-
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
58-
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
61+
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
5962
# The current recommended version for Managed Runtime:
6063
# https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html
61-
IS_MRT_NODE: ${{ matrix.node == 20 && matrix.npm == 10 }}
64+
IS_MRT_NODE: ${{ matrix.node == 22 && matrix.npm == 10 }}
6265
steps:
6366
- name: Checkout
6467
uses: actions/checkout@v3
@@ -141,21 +144,25 @@ jobs:
141144
strategy:
142145
fail-fast: false
143146
matrix:
144-
node: [16, 18, 20]
145-
npm: [8, 9, 10]
146-
exclude: # node 16 is not compatible with npm 10
147+
node: [16, 18, 20, 22]
148+
npm: [8, 9, 10, 11]
149+
exclude: # node 16 with npm 10/11 and node 18 with npm 11 are not compatible
147150
- node: 16
148151
npm: 10
152+
- node: 16
153+
npm: 11
154+
- node: 18
155+
npm: 11
149156
runs-on: windows-latest
150157
env:
151158
# The "default" npm is the one that ships with a given version of node.
152159
# For more: https://nodejs.org/en/download/releases/
153160
# (We also use this env var for making sure a step runs once for the current node version)
154161
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
155-
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
162+
IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
156163
# The current recommended version for Managed Runtime:
157164
# https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html
158-
IS_MRT_NODE: ${{ matrix.node == 20 && matrix.npm == 10 }}
165+
IS_MRT_NODE: ${{ matrix.node == 22 && matrix.npm == 10 }}
159166
steps:
160167
- name: Checkout
161168
uses: actions/checkout@v3
@@ -196,7 +203,7 @@ jobs:
196203
- name: Setup Node
197204
uses: actions/setup-node@v3
198205
with:
199-
node-version: 20
206+
node-version: 22
200207

201208
- name: Setup Ubuntu Machine
202209
uses: "./.github/actions/setup_ubuntu"
@@ -295,7 +302,7 @@ jobs:
295302
- name: Setup Node
296303
uses: actions/setup-node@v3
297304
with:
298-
node-version: 20
305+
node-version: 22
299306

300307
- name: Setup Windows Machine
301308
uses: "./.github/actions/setup_windows"
@@ -339,7 +346,7 @@ jobs:
339346
strategy:
340347
fail-fast: false
341348
matrix:
342-
node: [20] # Should match node version supported by MRT.
349+
node: [22] # Should match node version supported by MRT.
343350
runs-on: ubuntu-latest
344351
steps:
345352
- name: Checkout

‎package-lock.json‎

Lines changed: 2 additions & 2 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"syncpack": "^10.1.0"
3333
},
3434
"engines": {
35-
"node": "^16.11.0 || ^18.0.0 || ^20.0.0",
36-
"npm": "^8.0.0 || ^9.0.0 || ^10.0.0"
35+
"node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",
36+
"npm": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0"
3737
},
3838
"dependencies": {
3939
"node-fetch": "^2.6.9"

‎packages/commerce-sdk-react/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- Update CacheUpdateMatrix for mergeBasket mutation [#2138](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2092)
77
- Clear auth state if session has been invalidated by a password change [#2092](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2092)
88
- DNT interface improvement [#2203](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2203)
9+
- Support Node 22 [#2218](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2218)
910

1011
## v3.1.0 (Oct 28, 2024)
1112

‎packages/commerce-sdk-react/package-lock.json‎

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

‎packages/commerce-sdk-react/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
"react-router-dom": "^5.3.4"
8585
},
8686
"engines": {
87-
"node": "^16.11.0 || ^18.0.0 || ^20.0.0",
88-
"npm": "^8.0.0 || ^9.0.0 || ^10.0.0"
87+
"node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",
88+
"npm": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0"
8989
},
9090
"publishConfig": {
9191
"directory": "dist"

‎packages/internal-lib-build/configs/babel.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const config = {
1010
require('@babel/preset-env'),
1111
{
1212
targets: {
13-
node: 18
13+
node: 22
1414
}
1515
}
1616
],

‎packages/internal-lib-build/package-lock.json‎

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

‎packages/internal-lib-build/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
}
7474
},
7575
"engines": {
76-
"node": "^16.11.0 || ^18.0.0 || ^20.0.0",
77-
"npm": "^8.0.0 || ^9.0.0 || ^10.0.0"
76+
"node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",
77+
"npm": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0"
7878
}
7979
}

0 commit comments

Comments
 (0)