Merge branch 'enable-source-maps' of github.com:SalesforceCommerceClo…

…ud/pwa-kit into enable-source-maps
SalesforceCommerceCloud · Dec 28, 2023 · a8dbce6 · a8dbce6
2 parents d447b51 + 1a0b712
commit a8dbce6
Show file tree

Hide file tree

Showing 101 changed files with 4,339 additions and 2,344 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -11,14 +11,18 @@ jobs:
       fail-fast: false
       matrix:
         # Run all matrix env at once because we will not deploy demo app to MRT.
-        node: [16, 18]
-        npm: [8, 9]
+        node: [16, 18, 20]
+        npm: [8, 9, 10]
+        exclude: # node 16 is not compatible with npm 10
+          - node: 16
+            npm: 10
     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/
       # (We also use this env var for making sure a step runs once for the current node version)
-      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 9) }}
+      # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
+      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -54,14 +58,18 @@ jobs:
       # Run one matrix env at a time because we need to deploy each app to MRT and run e2e tests there
       max-parallel: 1
       matrix:
-        node: [16, 18]
-        npm: [8, 9]
+        node: [16, 18, 20]
+        npm: [8, 9, 10]
+        exclude: # node 16 is not compatible with npm 10
+          - node: 16
+            npm: 10
     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/
       # (We also use this env var for making sure a step runs once for the current node version)
-      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 9) }}
+      # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
+      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -126,14 +134,18 @@ jobs:
       # Run one matrix env at a time because we need to deploy each app to MRT and run e2e tests there
       max-parallel: 1
       matrix:
-        node: [16, 18]
-        npm: [8, 9]
+        node: [16, 18, 20]
+        npm: [8, 9, 10]
+        exclude: # node 16 is not compatible with npm 10
+          - node: 16
+            npm: 10
     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/
       # (We also use this env var for making sure a step runs once for the current node version)
-      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 9) }}
+      # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
+      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,17 +32,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16, 18]
-        npm: [8, 9]
+        node: [16, 18, 20]
+        npm: [8, 9, 10]
+        exclude: # node 16 is not compatible with npm 10
+          - node: 16
+            npm: 10
     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/
       # (We also use this env var for making sure a step runs once for the current node version)
-      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 9) }}
+      # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
+      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
       # The current recommended version for Managed Runtime:
       # https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html
-      IS_MRT_NODE: ${{ matrix.node == 16 && matrix.npm == 8 }}
+      IS_MRT_NODE: ${{ matrix.node == 18 && matrix.npm == 10 }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -124,16 +128,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16, 18]
-        npm: [8, 9]
+        node: [16, 18, 20]
+        npm: [8, 9, 10]
+        exclude: # node 16 is not compatible with npm 10
+          - node: 16
+            npm: 10
     env:
       # The "default" npm is the one that ships with a given version of node.
       # For more: https://nodejs.org/en/download/releases/
       # (We also use this env var for making sure a step runs once for the current node version)
-      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 9) }}
+      # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
+      IS_DEFAULT_NPM: ${{ (matrix.node == 16 && matrix.npm == 8) || (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) }}
       # The current recommended version for Managed Runtime:
       # https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html
-      IS_MRT_NODE: ${{ matrix.node == 16 && matrix.npm == 8 }}
+      IS_MRT_NODE: ${{ matrix.node == 18 && matrix.npm == 10 }}
     runs-on: windows-latest
     steps:
         - name: Checkout
@@ -174,7 +182,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"
@@ -271,7 +279,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"
@@ -313,7 +321,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16] # Should match node version supported by MRT.
+        node: [18] # Should match node version supported by MRT.
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.3.0-dev",
+  "version": "3.4.0-dev",
   "packages": [
     "packages/*"
   ]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pwa-kit",
-  "version": "3.3.0-dev",
+  "version": "3.4.0-dev",
   "scripts": {
     "bump-version": "node ./scripts/bump-version/index.js",
     "bump-version:retail-react-app": "node ./scripts/bump-version/index.js --package=@salesforce/retail-react-app",
@@ -30,8 +30,8 @@
     "syncpack": "^10.1.0"
   },
   "engines": {
-    "node": "^16.11.0 || ^18.0.0",
-    "npm": "^8.0.0 || ^9.0.0"
+    "node": "^16.11.0 || ^18.0.0 || ^20.0.0",
+    "npm": "^8.0.0 || ^9.0.0 || ^10.0.0"
   },
   "dependencies": {
     "node-fetch": "^2.6.9"