Cherry Pick PR #2285

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.9.0",
+  "version": "3.9.1",
   "packages": [
     "packages/*"
   ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pwa-kit",
-  "version": "3.9.0",
+  "version": "3.9.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",

packages/commerce-sdk-react/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v3.2.1 (Mar 05, 2025)
+- Update PWA-Kit SDKs to v3.9.1 [#2301](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2301)
+
 ## v3.2.0 (Feb 18, 2025)
 
 - Allow cookies for ShopperLogin API [#2190](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2190

packages/commerce-sdk-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/commerce-sdk-react",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "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.9.0",
+    "@salesforce/pwa-kit-dev": "3.9.1",
     "@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.9.0",
+    "internal-lib-build": "3.9.1",
     "jsonwebtoken": "^9.0.0",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",

packages/internal-lib-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "internal-lib-build",
-  "version": "3.9.0",
+  "version": "3.9.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.9.0",
+    "@salesforce/pwa-kit-dev": "3.9.1",
     "npm-packlist": "^4.0.0",
     "typescript": "4.9.5"
   },

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

@@ -1,3 +1,6 @@
+## v3.9.1 (Mar 05, 2025)
+- Update PWA-Kit SDKs to v3.9.1 [#2301](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2301)
+
 ## v3.9.0 (Feb 18, 2025)
 
 - Update `default.js` and `ssr.js` template to support new passwordless, social, and reset password flows. [#2263] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2263)

packages/pwa-kit-create-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-create-app",
-  "version": "3.9.0",
+  "version": "3.9.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.2.1"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.9.0",
-    "internal-lib-build": "3.9.0",
+    "@salesforce/pwa-kit-dev": "3.9.1",
+    "internal-lib-build": "3.9.1",
     "verdaccio": "^5.22.1"
   },
   "engines": {

packages/pwa-kit-dev/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v3.9.1 (Mar 05, 2025)
+- Update PWA-Kit SDKs to v3.9.1 [#2301](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2301)
+
 ## v3.9.0 (Feb 18, 2025)
 
 - Support Node 22 [#2218](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2218)

packages/pwa-kit-dev/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-dev",
-  "version": "3.9.0",
+  "version": "3.9.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.9.0",
+    "@salesforce/pwa-kit-runtime": "3.9.1",
     "@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.9.0",
+    "internal-lib-build": "3.9.1",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "superagent": "^6.1.0",

packages/pwa-kit-react-sdk/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v3.9.1 (Mar 05, 2025)
+- Update PWA-Kit SDKs to v3.9.1 [#2301](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2301)
+
 ## v3.9.0 (Feb 18, 2025)
 - Fix the performance logging util to not round duration. [#2199](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2199)
 - Add RedirectWithStatus component, allowing finer grained control of rediriects and their status code [#2173](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2173)

packages/pwa-kit-react-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-react-sdk",
-  "version": "3.9.0",
+  "version": "3.9.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.9.0",
+    "@salesforce/pwa-kit-runtime": "3.9.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.9.0",
+    "@salesforce/pwa-kit-dev": "3.9.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.9.0",
+    "internal-lib-build": "3.9.1",
     "node-html-parser": "^3.3.6",
     "nodemon": "^2.0.22",
     "react": "^18.2.0",

packages/pwa-kit-runtime/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v3.9.1 (Mar 05, 2025)
+- Update PWA-Kit SDKs to v3.9.1 [#2301](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2301)
+- Remove forced garbage collection on each invocation. Set `FORCE_GC=true` for the old behavior.
+
 ## v3.9.0 (Feb 18, 2025)
 - Fix stale service worker file that could cause requests to still use old Content-Security-Policy [#2191](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2191)
 - Support Node 22 [#2218](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2218)

packages/pwa-kit-runtime/package-lock.json

 "@salesforce/pwa-kit-dev": "3.9.0" 
 "@salesforce/pwa-kit-dev": "3.9.0" 

packages/pwa-kit-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-runtime",
-  "version": "3.9.0",
+  "version": "3.9.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.9.0",
+    "@salesforce/pwa-kit-dev": "3.9.1",
     "@serverless/event-mocks": "^1.1.1",
     "aws-lambda-mock-context": "^3.2.1",
     "fs-extra": "^11.1.1",
-    "internal-lib-build": "3.9.0",
+    "internal-lib-build": "3.9.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.9.0"
+    "@salesforce/pwa-kit-dev": "3.9.1"
   },
   "peerDependenciesMeta": {
     "@salesforce/pwa-kit-dev": {

packages/pwa-kit-runtime/src/ssr/server/build-remote-server.js

@@ -388,6 +388,8 @@ export const RemoteServerFactory = {
         const mixin = {
             options,
 
+            // Forcing a GC is no longer necessary, and will be
+            // skipped by default (unless FORCE_GC env-var is set).
             _collectGarbage() {
                 // Do global.gc in a separate 'then' handler so
                 // that all major variables are out of scope and
@@ -1044,12 +1046,15 @@ export const RemoteServerFactory = {
             context.callbackWaitsForEmptyEventLoop = false
 
             if (lambdaContainerReused) {
-                // DESKTOP-434 If this Lambda container is being reused,
-                // clean up memory now, so that we start with low usage.
-                // These regular GC calls take about 80-100 mS each, as opposed
-                // to forced GC calls, which occur randomly and can take several
-                // hundred mS.
-                app._collectGarbage()
+                const forceGarbageCollection = process.env.FORCE_GC
+                if (forceGarbageCollection && forceGarbageCollection.toLowerCase() === 'true') {
+                    // DESKTOP-434 If this Lambda container is being reused,
+                    // clean up memory now, so that we start with low usage.
+                    // These regular GC calls take about 80-100 mS each, as opposed
+                    // to forced GC calls, which occur randomly and can take several
+                    // hundred mS.
+                    app._collectGarbage()
+                }
                 app.sendMetric('LambdaReused')
             } else {
                 // This is the first use of this container, so set the