Merge pull request #1532 from SalesforceCommerceCloud/hotfix-3.2.1

Hotfix SDK 3.2.1 - @W-14446652@
SalesforceCommerceCloud · Nov 9, 2023 · 2c85024 · 2c85024
2 parents 6a614ba + 6f71bea
commit 2c85024
Show file tree

Hide file tree

Showing 29 changed files with 70 additions and 66 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.2.0",
+  "version": "3.2.1",
   "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.2.0",
+  "version": "3.2.1",
   "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/package.json b/packages/commerce-sdk-react/package.json
@@ -45,7 +45,7 @@
     "jwt-decode": "^3.1.2"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.2.0",
+    "@salesforce/pwa-kit-dev": "3.2.1",
     "@tanstack/react-query": "^4.28.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
@@ -59,7 +59,7 @@
     "@types/react-helmet": "~6.1.6",
     "@types/react-router-dom": "~5.3.3",
     "cross-env": "^5.2.1",
-    "internal-lib-build": "3.2.0",
+    "internal-lib-build": "3.2.1",
     "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.2.0",
+  "version": "3.2.1",
   "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.2.0",
+    "@salesforce/pwa-kit-dev": "3.2.1",
     "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,3 +1,4 @@
+## v3.2.1 (Nov 8, 2023)
 ## v3.2.0 (Nov 3, 2023)
 
 ## v3.1.0 (Jul 26, 2023)

diff --git a/packages/pwa-kit-create-app/assets/bootstrap/js/overrides/app/ssr.js b/packages/pwa-kit-create-app/assets/bootstrap/js/overrides/app/ssr.js
@@ -9,6 +9,7 @@
 
 import path from 'path'
 import {getRuntime} from '@salesforce/pwa-kit-runtime/ssr/server/express'
+import {defaultPwaKitSecurityHeaders} from '@salesforce/pwa-kit-runtime/utils/middleware'
 import {getConfig} from '@salesforce/pwa-kit-runtime/utils/ssr-config'
 import helmet from 'helmet'
 
@@ -34,11 +35,11 @@ const options = {
 const runtime = getRuntime()
 
 const {handler} = runtime.createHandler(options, (app) => {
-    // Set HTTP security headers
+    // Set default HTTP security headers required by PWA Kit
+    app.use(defaultPwaKitSecurityHeaders)
+    // Set custom HTTP security headers
     app.use(
         helmet({
-            // pwa-kit-runtime ensures that the Content-Security-Policy header always contains the
-            // directives required for PWA Kit to function. Add custom directives here.
             contentSecurityPolicy: {
                 useDefaults: true,
                 directives: {

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.2.0",
+  "version": "3.2.1",
   "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.1.13"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.2.0",
-    "internal-lib-build": "3.2.0",
+    "@salesforce/pwa-kit-dev": "3.2.1",
+    "internal-lib-build": "3.2.1",
     "verdaccio": "^5.22.1"
   },
   "engines": {

diff --git a/packages/pwa-kit-dev/CHANGELOG.md b/packages/pwa-kit-dev/CHANGELOG.md
@@ -1,3 +1,4 @@
+## v3.2.1 (Nov 08, 2023)
 ## v3.2.0 (Nov 03, 2023)
 ## v3.1.1 (Sep 21, 2023)
 

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.2.0",
+  "version": "3.2.1",
   "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.2.0",
+    "@salesforce/pwa-kit-runtime": "3.2.1",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "archiver": "1.3.0",
@@ -121,7 +121,7 @@
     "@types/node-fetch": "~2.6.3",
     "@types/validator": "~13.7.14",
     "eslint-plugin-no-relative-import-paths": "^1.5.2",
-    "internal-lib-build": "3.2.0",
+    "internal-lib-build": "3.2.1",
     "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,3 +1,4 @@
+## v3.2.1 (Nov 08, 2023)
 ## v3.2.0 (Nov 03, 2023)
 
 ## v3.1.1 (Sep 21, 2023)

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.2.0",
+  "version": "3.2.1",
   "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.2.0",
+    "@salesforce/pwa-kit-runtime": "3.2.1",
     "@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.2.0",
+    "@salesforce/pwa-kit-dev": "3.2.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
-    "internal-lib-build": "3.2.0",
+    "internal-lib-build": "3.2.1",
     "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,4 +1,4 @@
-## v3.2.1 (Nov 07, 2023)
+## v3.2.1 (Nov 08, 2023)
 
 - Revert mandatory enforcement of Content-Security-Policy headers. Provide middleware as an opt-in replacement. [#1528](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1528)
 

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.2.0",
+  "version": "3.2.1",
   "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.2.0",
+    "@salesforce/pwa-kit-dev": "3.2.1",
     "@serverless/event-mocks": "^1.1.1",
     "aws-lambda-mock-context": "^3.2.1",
     "fs-extra": "^11.1.1",
-    "internal-lib-build": "3.2.0",
+    "internal-lib-build": "3.2.1",
     "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.2.0"
+    "@salesforce/pwa-kit-dev": "3.2.1"
   },
   "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.2.0",
+  "version": "3.2.1",
   "private": true,
   "license": "See license in LICENSE",
   "scripts": {
@@ -15,8 +15,8 @@
     "test": "pwa-kit-dev test"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.2.0",
-    "@salesforce/pwa-kit-runtime": "3.2.0",
+    "@salesforce/pwa-kit-dev": "3.2.1",
+    "@salesforce/pwa-kit-runtime": "3.2.1",
     "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
diff --git a/packages/template-mrt-reference-app/package.json b/packages/template-mrt-reference-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "template-mrt-reference-app",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "private": true,
   "license": "See license in LICENSE",
   "scripts": {
@@ -16,8 +16,8 @@
   },
   "devDependencies": {
     "@loadable/component": "^5.15.3",
-    "@salesforce/pwa-kit-dev": "3.2.0",
-    "@salesforce/pwa-kit-runtime": "3.2.0",
+    "@salesforce/pwa-kit-dev": "3.2.1",
+    "@salesforce/pwa-kit-runtime": "3.2.1",
     "cross-fetch": "^3.1.4",
     "express-basic-auth": "^1.2.0",
     "supertest": "^4.0.2"

diff --git a/packages/template-retail-react-app/package-lock.json b/packages/template-retail-react-app/package-lock.json