Merge pull request #1866 from SalesforceCommerceCloud/merge-3.6.0

Merge 3.6.0 back to `develop` branch
SalesforceCommerceCloud · Jun 25, 2024 · 7ab1fd7 · 7ab1fd7
2 parents 6d9ca82 + bf3f7f7
commit 7ab1fd7
Show file tree

Hide file tree

Showing 31 changed files with 108 additions and 88 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.6.0-dev.1",
+  "version": "3.7.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.6.0-dev.1",
+  "version": "3.7.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",

diff --git a/packages/commerce-sdk-react/CHANGELOG.md b/packages/commerce-sdk-react/CHANGELOG.md
@@ -1,6 +1,6 @@
-## v2.0.0-dev (Jun 21, 2024)
-## v3.6.0-dev.1 (Jun 21, 2024)
-## v2.0.0-dev (May 21, 2024)
+## v2.1.0-dev (Jun 25, 2024)
+
+## v2.0.0 (Jun 25, 2024)
 - Add `useCustomQuery` and `useCustomMutation` for SCAPI custom endpoint support [#1793](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1793)
 - Add Shopper Stores hooks [#1788](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1788)
 - Add a helper method to add an item to either new or existing basket [#1677](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1677)

diff --git a/packages/commerce-sdk-react/package-lock.json b/packages/commerce-sdk-react/package-lock.json
diff --git a/packages/commerce-sdk-react/package.json b/packages/commerce-sdk-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/commerce-sdk-react",
-  "version": "2.0.0-dev",
+  "version": "2.1.0-dev",
   "description": "A library that provides react hooks for fetching data from Commerce Cloud",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/ecom-react-hooks#readme",
   "bugs": {
@@ -45,7 +45,7 @@
     "jwt-decode": "^4.0.0"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.6.0-dev.1",
+    "@salesforce/pwa-kit-dev": "3.7.0-dev",
     "@tanstack/react-query": "^4.28.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
@@ -60,7 +60,7 @@
     "@types/react-helmet": "~6.1.6",
     "@types/react-router-dom": "~5.3.3",
     "cross-env": "^5.2.1",
-    "internal-lib-build": "3.6.0-dev.1",
+    "internal-lib-build": "3.7.0-dev",
     "jsonwebtoken": "^9.0.0",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",

diff --git a/packages/internal-lib-build/package-lock.json b/packages/internal-lib-build/package-lock.json
diff --git a/packages/internal-lib-build/package.json b/packages/internal-lib-build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internal-lib-build",
-  "version": "3.6.0-dev.1",
+  "version": "3.7.0-dev",
   "private": true,
   "description": "Build tools for *libraries* in the monorepo",
   "bugs": {
@@ -60,7 +60,7 @@
     "shelljs": "^0.8.5"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.6.0-dev.1",
+    "@salesforce/pwa-kit-dev": "3.7.0-dev",
     "npm-packlist": "^4.0.0",
     "typescript": "4.9.5"
   },

diff --git a/packages/pwa-kit-create-app/CHANGELOG.md b/packages/pwa-kit-create-app/CHANGELOG.md
@@ -1,4 +1,9 @@
-## v3.6.0-dev (Apr 17, 2024)
+## v3.7.0-dev (Jun 25, 2024)
+
+## v3.6.0 (Jun 25, 2024)
+
+- Fix: 'Cannot use import statement outside a module' error in generated extensible project unit tests [#1821](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1821)
+
 ## v3.5.1 (Apr 15, 2024)
 
 - Add Support for SLAS private flow [#1722](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1722)

diff --git a/packages/pwa-kit-create-app/package-lock.json b/packages/pwa-kit-create-app/package-lock.json
diff --git a/packages/pwa-kit-create-app/package.json b/packages/pwa-kit-create-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-create-app",
-  "version": "3.6.0-dev.1",
+  "version": "3.7.0-dev",
   "description": "Salesforce's project generator tool",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-create-app#readme",
   "bugs": {
@@ -38,8 +38,8 @@
     "tar": "^6.2.1"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.6.0-dev.1",
-    "internal-lib-build": "3.6.0-dev.1",
+    "@salesforce/pwa-kit-dev": "3.7.0-dev",
+    "internal-lib-build": "3.7.0-dev",
     "verdaccio": "^5.22.1"
   },
   "engines": {

diff --git a/packages/pwa-kit-dev/CHANGELOG.md b/packages/pwa-kit-dev/CHANGELOG.md
@@ -1,5 +1,7 @@
-## v3.6.0-dev.1 (Jun 21, 2024)
-## v3.6.0-dev (Apr 17, 2024)
+## v3.7.0-dev (Jun 25, 2024)
+
+## v3.6.0 (Jun 25, 2024)
+
 ## v3.5.1 (Apr 17, 2024)
 - Update SLAS private proxy path [#1752](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1752)
 

diff --git a/packages/pwa-kit-dev/package-lock.json b/packages/pwa-kit-dev/package-lock.json
diff --git a/packages/pwa-kit-dev/package.json b/packages/pwa-kit-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-dev",
-  "version": "3.6.0-dev.1",
+  "version": "3.7.0-dev",
   "description": "Build tools for pwa-kit",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-dev#readme",
   "bugs": {
@@ -58,7 +58,7 @@
     "@loadable/server": "^5.15.3",
     "@loadable/webpack-plugin": "^5.15.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@salesforce/pwa-kit-runtime": "3.6.0-dev.1",
+    "@salesforce/pwa-kit-runtime": "3.7.0-dev",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "archiver": "1.3.0",
@@ -121,7 +121,7 @@
     "@types/node": "~16.0.3",
     "@types/node-fetch": "~2.6.3",
     "@types/validator": "~13.7.14",
-    "internal-lib-build": "3.6.0-dev.1",
+    "internal-lib-build": "3.7.0-dev",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "superagent": "^6.1.0",

diff --git a/packages/pwa-kit-react-sdk/CHANGELOG.md b/packages/pwa-kit-react-sdk/CHANGELOG.md
@@ -1,5 +1,7 @@
-## v3.6.0-dev.1 (Jun 21, 2024)
-## v3.6.0-dev (Apr 17, 2024)
+## v3.7.0-dev (Jun 25, 2024)
+
+## v3.6.0 (Jun 25, 2024)
+
 ## v3.5.1 (Apr 17, 2024)
 
 ## v3.5.0 (Apr 15, 2024)

diff --git a/packages/pwa-kit-react-sdk/package-lock.json b/packages/pwa-kit-react-sdk/package-lock.json
diff --git a/packages/pwa-kit-react-sdk/package.json b/packages/pwa-kit-react-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-react-sdk",
-  "version": "3.6.0-dev.1",
+  "version": "3.7.0-dev",
   "description": "A library that supports the isomorphic React rendering pipeline for Commerce Cloud Managed Runtime apps",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-react-sdk#readme",
   "bugs": {
@@ -37,7 +37,7 @@
     "@loadable/babel-plugin": "^5.15.3",
     "@loadable/server": "^5.15.3",
     "@loadable/webpack-plugin": "^5.15.2",
-    "@salesforce/pwa-kit-runtime": "3.6.0-dev.1",
+    "@salesforce/pwa-kit-runtime": "3.7.0-dev",
     "@tanstack/react-query": "^4.28.0",
     "cross-env": "^5.2.1",
     "event-emitter": "^0.3.5",
@@ -50,11 +50,11 @@
   },
   "devDependencies": {
     "@loadable/component": "^5.15.3",
-    "@salesforce/pwa-kit-dev": "3.6.0-dev.1",
+    "@salesforce/pwa-kit-dev": "3.7.0-dev",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
-    "internal-lib-build": "3.6.0-dev.1",
+    "internal-lib-build": "3.7.0-dev",
     "node-html-parser": "^3.3.6",
     "nodemon": "^2.0.22",
     "react": "^18.2.0",

diff --git a/packages/pwa-kit-runtime/CHANGELOG.md b/packages/pwa-kit-runtime/CHANGELOG.md
@@ -1,7 +1,11 @@
-## v3.6.0-dev.1 (Jun 21, 2024)
-## v3.6.0-dev (Jun 11, 2024)
+## v3.7.0-dev (Jun 25, 2024)
+
+## v3.6.0 (Jun 25, 2024)
 - Add logger to print logs generated by PWA Kit packages [#1822](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1822)
+- Memoize `getConfig` on the server-side [#1800](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1800)
 - Added the `x-correlation-id` response header, which is set to the MRT correlation ID. This enhances traceability by including the correlation ID from the request in the response. [#1787](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1787)
+- Keep API Gateway headers in proxied requests [#1772](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1772)
+- Hide x-sfdc-access-control header [#1805](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1805)
 
 ## v3.5.1 (Apr 17, 2024)
 - Update SLAS private proxy path [#1752](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1752)

diff --git a/packages/pwa-kit-runtime/package-lock.json b/packages/pwa-kit-runtime/package-lock.json
diff --git a/packages/pwa-kit-runtime/package.json b/packages/pwa-kit-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-runtime",
-  "version": "3.6.0-dev.1",
+  "version": "3.7.0-dev",
   "description": "The PWAKit Runtime",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-runtime#readme",
   "bugs": {
@@ -46,19 +46,19 @@
   },
   "devDependencies": {
     "@loadable/component": "^5.15.3",
-    "@salesforce/pwa-kit-dev": "3.6.0-dev.1",
+    "@salesforce/pwa-kit-dev": "3.7.0-dev",
     "@serverless/event-mocks": "^1.1.1",
     "aws-lambda-mock-context": "^3.2.1",
     "fs-extra": "^11.1.1",
-    "internal-lib-build": "3.6.0-dev.1",
+    "internal-lib-build": "3.7.0-dev",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "sinon": "^13.0.2",
     "superagent": "^6.1.0",
     "supertest": "^4.0.2"
   },
   "peerDependencies": {
-    "@salesforce/pwa-kit-dev": "3.6.0-dev.1"
+    "@salesforce/pwa-kit-dev": "3.7.0-dev"
   },
   "peerDependenciesMeta": {
     "@salesforce/pwa-kit-dev": {

diff --git a/packages/template-express-minimal/package-lock.json b/packages/template-express-minimal/package-lock.json
diff --git a/packages/template-express-minimal/package.json b/packages/template-express-minimal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "template-express-minimal",
-  "version": "3.6.0-dev.1",
+  "version": "3.7.0-dev",
   "private": true,
   "license": "See license in LICENSE",
   "scripts": {
@@ -15,8 +15,8 @@
     "test": "pwa-kit-dev test"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.6.0-dev.1",
-    "@salesforce/pwa-kit-runtime": "3.6.0-dev.1",
+    "@salesforce/pwa-kit-dev": "3.7.0-dev",
+    "@salesforce/pwa-kit-runtime": "3.7.0-dev",
     "supertest": "^4.0.2"
   },
   "mobify": {

diff --git a/packages/template-mrt-reference-app/package-lock.json b/packages/template-mrt-reference-app/package-lock.json