Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/actions/datadog/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ runs:
steps:
- name: Send metrics to Datadog
run : |
# For the datadog cli, it must be installed via python
# to install python packages on CI environment, we must activate the virtual env
# or otherwise it throws error: externally-managed-environment
python3 -m venv venv
source venv/bin/activate
pip install datadog

# Add a dogrc so we can submit metrics to datadog
printf "[Connection]\napikey = ${{inputs.datadog_api_key}}\nappkey =\n" > ~/.dogrc

Expand Down
6 changes: 0 additions & 6 deletions .github/actions/setup_ubuntu/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ runs:
steps:
- name: Install Dependencies
run: |-
# Install system dependencies
sudo apt-get update -yq
sudo apt-get install python2 python3-pip time -yq
sudo pip install -U pip setuptools
sudo pip install awscli==1.18.85 datadog==0.40.1

# Install node dependencies
node ./scripts/gtime.js monorepo_install npm ci

Expand Down
34 changes: 21 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,25 @@ jobs:
pwa-kit:
strategy:
matrix:
node: [14, 16, 18]
npm: [6, 7, 8, 9]
node: [14, 16, 18, 20]
npm: [6, 7, 8, 9, 10]
exclude:
- node: 14
npm: 9
- node: 14
npm: 10
- node: 16
npm: 6
- node: 16
npm: 10
- node: 18
npm: 6
- node: 14
npm: 9
runs-on: ubuntu-latest
env:
# The "default" npm is the one that ships with a given version of node.
# For more: https://nodejs.org/en/download/releases/
IS_DEFAULT_NPM: ${{ matrix.node == 14 && matrix.npm == 6 || matrix.node == 16 && matrix.npm == 8 || matrix.node == 18 && matrix.npm == 9 }}
IS_LATEST_NPM: ${{ matrix.node == 16 && matrix.npm == 8 }}
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 }}
IS_LATEST_NPM: ${{ matrix.node == 20 && matrix.npm == 10 }}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -120,19 +124,23 @@ jobs:
pwa-kit-windows:
strategy:
matrix:
node: [14, 16, 18]
npm: [6, 7, 8, 9]
node: [14, 16, 18, 20]
npm: [6, 7, 8, 9, 10]
exclude:
- node: 14
npm: 9
- node: 14
npm: 10
- node: 16
npm: 6
- node: 16
npm: 10
- node: 18
npm: 6
- node: 14
npm: 9
env:
# The "default" npm is the one that ships with a given version of node.
# For more: https://nodejs.org/en/download/releases/
IS_DEFAULT_NPM: ${{ matrix.node == 14 && matrix.npm == 6 || matrix.node == 16 && matrix.npm == 8 || matrix.node == 18 && matrix.npm == 9 }}
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 }}
runs-on: windows-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -178,7 +186,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Setup Ubuntu Machine
uses: "./.github/actions/setup_ubuntu"
Expand Down Expand Up @@ -274,7 +282,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Setup Windows Machine
uses: "./.github/actions/setup_windows"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
"packages/*"
],
"version": "2.8.4",
"version": "2.9.0-preview.0",
"publish": {
"allowBranch": [
"master"
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "pwa-kit",
"version": "2.8.4",
"version": "2.9.0-preview.0",
"engines": {
"node": "^14.0.0 || ^16.0.0 || ^18.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0"
"node": "^14.0.0 || ^16.0.0 || ^18.0.0 || ^20.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
},
"devDependencies": {
"commander": "^2.20.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/internal-lib-build/configs/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const config = {
require('@babel/preset-env'),
{
targets: {
node: 18
node: 20
}
}
],
Expand Down
8 changes: 4 additions & 4 deletions packages/internal-lib-build/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/internal-lib-build/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "internal-lib-build",
"version": "2.8.4",
"version": "2.9.0-preview.0",
"engines": {
"node": "^14.0.0 || ^16.0.0 || ^18.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0"
"node": "^14.0.0 || ^16.0.0 || ^18.0.0 || ^20.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
},
"private": true,
"description": "Build tools for *libraries* in the monorepo",
Expand Down
2 changes: 2 additions & 0 deletions packages/pwa-kit-create-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## v2.9.0-preview.0 (Jan 10, 2025)
- Support Node 20 and NPM 10 in PWA Kit v2 [#2189](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2189)
## v2.8.1 (Nov 8, 2023)
## v2.8.0 (Nov 3, 2023)
## v2.7.1 (May 11, 2023)
Expand Down
8 changes: 4 additions & 4 deletions packages/pwa-kit-create-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/pwa-kit-create-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-create-app",
"version": "2.8.4",
"version": "2.9.0-preview.0",
"description": "Salesforce's project generator tool",
"author": "cc-pwa-kit@salesforce.com",
"license": "See license in LICENSE",
Expand All @@ -26,8 +26,8 @@
"test": "internal-lib-build test"
},
"engines": {
"node": "^14.0.0 || ^16.0.0 || ^18.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0"
"node": "^14.0.0 || ^16.0.0 || ^18.0.0 || ^20.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
},
"dependencies": {
"commander": "^9.5.0",
Expand All @@ -39,7 +39,7 @@
"tar": "^6.1.13"
},
"devDependencies": {
"internal-lib-build": "^2.8.4",
"internal-lib-build": "^2.9.0-preview.0",
"verdaccio": "^5.22.1"
}
}
2 changes: 2 additions & 0 deletions packages/pwa-kit-dev/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## v2.9.0-preview.0 (Jan 10, 2025)
- Support Node 20 and NPM 10 in PWA Kit v2 [#2189](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2189)
## v2.8.4 (Jul 12, 2024)
## v2.8.3 (Apr 09, 2024)
- Upgrade vulnerable dependency [#1737](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1737)
Expand Down
8 changes: 4 additions & 4 deletions packages/pwa-kit-dev/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/pwa-kit-dev/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-dev",
"version": "2.8.4",
"version": "2.9.0-preview.0",
"description": "Build tools for pwa-kit",
"repository": {
"type": "git",
Expand Down Expand Up @@ -90,7 +90,7 @@
"minimatch": "3.1.2",
"open": "^8.4.2",
"prettier": "^2.8.6",
"pwa-kit-runtime": "^2.8.4",
"pwa-kit-runtime": "^2.9.0-preview.0",
"react-refresh": "^0.14.0",
"replace-in-file": "^6.3.5",
"request": "^2.88.0",
Expand All @@ -111,7 +111,7 @@
},
"devDependencies": {
"@loadable/component": "^5.15.3",
"internal-lib-build": "^2.8.4",
"internal-lib-build": "^2.9.0-preview.0",
"nock": "^13.3.0",
"superagent": "^6.1.0",
"supertest": "^4.0.2"
Expand All @@ -120,8 +120,8 @@
"@loadable/component": "^5.15.0"
},
"engines": {
"node": "^14.0.0 || ^16.0.0 || ^18.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0"
"node": "^14.0.0 || ^16.0.0 || ^18.0.0 || ^20.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
},
"publishConfig": {
"directory": "dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/pwa-kit-dev/src/configs/babel/babel-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const config = {
require('@babel/preset-env'),
{
targets: {
node: 18
node: 20
}
}
],
Expand Down
2 changes: 2 additions & 0 deletions packages/pwa-kit-react-sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## v2.9.0-preview.0 (Jan 10, 2025)
- Support Node 20 and NPM 10 in PWA Kit v2 [#2189](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2189)
## v2.8.4 (Jul 12, 2024)
- Updated StorefrontPreview component to make siteId available [#1876](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1876)

Expand Down
8 changes: 4 additions & 4 deletions packages/pwa-kit-react-sdk/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading