Skip to content

Commit 6fd8945

Browse files
Release preview of v2.9.0 of PWA Kit (@W-17624115@) (#2211)
* Support Node 20 in v2 of PWA Kit - @W-17543953@ (#2189) * test v2 ci * modify bootstrap.js * update test.yml * revert changes * remove install system dep steps and check-dependencies.js check * skip test * upgrade lighthouse dep to match v3 * add comment * bump version * pass channel_id to SLAS * add datadog install to workflow * fix test * bump version and update changelogs * update engines section in package.json * update CI to include node 20 and npm 10 * update package-lock.json * update exclude * exclude node 14 npm 10 * remove comments and add back in check dependency script * change version number * update babel configs * remove comment * update changelog for retail-react-app
1 parent d4e9ee9 commit 6fd8945

File tree

33 files changed

+207
-158
lines changed

33 files changed

+207
-158
lines changed

.github/actions/datadog/action.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ runs:
99
steps:
1010
- name: Send metrics to Datadog
1111
run : |
12+
# For the datadog cli, it must be installed via python
13+
# to install python packages on CI environment, we must activate the virtual env
14+
# or otherwise it throws error: externally-managed-environment
15+
python3 -m venv venv
16+
source venv/bin/activate
17+
pip install datadog
18+
1219
# Add a dogrc so we can submit metrics to datadog
1320
printf "[Connection]\napikey = ${{inputs.datadog_api_key}}\nappkey =\n" > ~/.dogrc
1421

.github/actions/setup_ubuntu/action.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ runs:
99
steps:
1010
- name: Install Dependencies
1111
run: |-
12-
# Install system dependencies
13-
sudo apt-get update -yq
14-
sudo apt-get install python2 python3-pip time -yq
15-
sudo pip install -U pip setuptools
16-
sudo pip install awscli==1.18.85 datadog==0.40.1
17-
1812
# Install node dependencies
1913
node ./scripts/gtime.js monorepo_install npm ci
2014

.github/workflows/test.yml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,25 @@ jobs:
3131
pwa-kit:
3232
strategy:
3333
matrix:
34-
node: [14, 16, 18]
35-
npm: [6, 7, 8, 9]
34+
node: [14, 16, 18, 20]
35+
npm: [6, 7, 8, 9, 10]
3636
exclude:
37+
- node: 14
38+
npm: 9
39+
- node: 14
40+
npm: 10
3741
- node: 16
3842
npm: 6
43+
- node: 16
44+
npm: 10
3945
- node: 18
4046
npm: 6
41-
- node: 14
42-
npm: 9
4347
runs-on: ubuntu-latest
4448
env:
4549
# The "default" npm is the one that ships with a given version of node.
4650
# For more: https://nodejs.org/en/download/releases/
47-
IS_DEFAULT_NPM: ${{ matrix.node == 14 && matrix.npm == 6 || matrix.node == 16 && matrix.npm == 8 || matrix.node == 18 && matrix.npm == 9 }}
48-
IS_LATEST_NPM: ${{ matrix.node == 16 && matrix.npm == 8 }}
51+
IS_DEFAULT_NPM: ${{ matrix.node == 14 && matrix.npm == 6 || matrix.node == 16 && matrix.npm == 8 || matrix.node == 18 && matrix.npm == 9 || matrix.node == 20 && matrix.npm == 10 }}
52+
IS_LATEST_NPM: ${{ matrix.node == 20 && matrix.npm == 10 }}
4953
steps:
5054
- name: Checkout
5155
uses: actions/checkout@v3
@@ -120,19 +124,23 @@ jobs:
120124
pwa-kit-windows:
121125
strategy:
122126
matrix:
123-
node: [14, 16, 18]
124-
npm: [6, 7, 8, 9]
127+
node: [14, 16, 18, 20]
128+
npm: [6, 7, 8, 9, 10]
125129
exclude:
130+
- node: 14
131+
npm: 9
132+
- node: 14
133+
npm: 10
126134
- node: 16
127135
npm: 6
136+
- node: 16
137+
npm: 10
128138
- node: 18
129139
npm: 6
130-
- node: 14
131-
npm: 9
132140
env:
133141
# The "default" npm is the one that ships with a given version of node.
134142
# For more: https://nodejs.org/en/download/releases/
135-
IS_DEFAULT_NPM: ${{ matrix.node == 14 && matrix.npm == 6 || matrix.node == 16 && matrix.npm == 8 || matrix.node == 18 && matrix.npm == 9 }}
143+
IS_DEFAULT_NPM: ${{ matrix.node == 14 && matrix.npm == 6 || matrix.node == 16 && matrix.npm == 8 || matrix.node == 18 && matrix.npm == 9 || matrix.node == 20 && matrix.npm == 10 }}
136144
runs-on: windows-latest
137145
steps:
138146
- name: Checkout
@@ -178,7 +186,7 @@ jobs:
178186
- name: Setup Node
179187
uses: actions/setup-node@v3
180188
with:
181-
node-version: 18
189+
node-version: 20
182190

183191
- name: Setup Ubuntu Machine
184192
uses: "./.github/actions/setup_ubuntu"
@@ -274,7 +282,7 @@ jobs:
274282
- name: Setup Node
275283
uses: actions/setup-node@v3
276284
with:
277-
node-version: 18
285+
node-version: 20
278286

279287
- name: Setup Windows Machine
280288
uses: "./.github/actions/setup_windows"

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
"packages/*"
55
],
6-
"version": "2.8.4",
6+
"version": "2.9.0-preview.0",
77
"publish": {
88
"allowBranch": [
99
"master"

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "pwa-kit",
3-
"version": "2.8.4",
3+
"version": "2.9.0-preview.0",
44
"engines": {
5-
"node": "^14.0.0 || ^16.0.0 || ^18.0.0",
6-
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0"
5+
"node": "^14.0.0 || ^16.0.0 || ^18.0.0 || ^20.0.0",
6+
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
77
},
88
"devDependencies": {
99
"commander": "^2.20.3",

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: 20
1414
}
1515
}
1616
],

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

Lines changed: 4 additions & 4 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "internal-lib-build",
3-
"version": "2.8.4",
3+
"version": "2.9.0-preview.0",
44
"engines": {
5-
"node": "^14.0.0 || ^16.0.0 || ^18.0.0",
6-
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0"
5+
"node": "^14.0.0 || ^16.0.0 || ^18.0.0 || ^20.0.0",
6+
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
77
},
88
"private": true,
99
"description": "Build tools for *libraries* in the monorepo",

packages/pwa-kit-create-app/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## v2.9.0-preview.0 (Jan 10, 2025)
2+
- Support Node 20 and NPM 10 in PWA Kit v2 [#2189](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2189)
13
## v2.8.1 (Nov 8, 2023)
24
## v2.8.0 (Nov 3, 2023)
35
## v2.7.1 (May 11, 2023)

0 commit comments

Comments
 (0)