@salesforce/pwa-kit-runtime 3.15.0-nightly-20251208080231 → 3.15.0-preview.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-runtime",
-  "version": "3.15.0-nightly-20251208080231",
+  "version": "3.15.0-preview.0",
   "description": "The PWAKit Runtime",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-runtime#readme",
   "bugs": {
@@ -46,11 +46,11 @@
   },
   "devDependencies": {
     "@loadable/component": "^5.15.3",
-    "@salesforce/pwa-kit-dev": "3.15.0-nightly-20251208080231",
+    "@salesforce/pwa-kit-dev": "3.15.0-preview.0",
     "@serverless/event-mocks": "^1.1.1",
     "aws-lambda-mock-context": "^3.2.1",
     "fs-extra": "^11.1.1",
-    "internal-lib-build": "3.15.0-nightly-20251208080231",
+    "internal-lib-build": "3.15.0-preview.0",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "sinon": "^13.0.2",
@@ -58,7 +58,7 @@
     "supertest": "^4.0.2"
   },
   "peerDependencies": {
-    "@salesforce/pwa-kit-dev": "3.15.0-nightly-20251208080231"
+    "@salesforce/pwa-kit-dev": "3.15.0-preview.0"
   },
   "peerDependenciesMeta": {
     "@salesforce/pwa-kit-dev": {
@@ -72,5 +72,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "937b1a20b08cb7fd113601c33d910e817b915e9f"
+  "gitHead": "40542ae8754e3274bc7910e89e57c96089e2d22a"
 }

package/ssr/server/express.test.js

@@ -17,8 +17,7 @@ var _buildRemoteServer = require("./build-remote-server");
 var _constants = require("./constants");
 var _express2 = require("./express");
 var _crypto = require("crypto");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }

package/utils/logger-factory.test.js

@@ -1,8 +1,7 @@
 "use strict";
 
 var _loggerFactory = _interopRequireWildcard(require("./logger-factory"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /*
  * Copyright (c) 2024, Salesforce, Inc.
  * All rights reserved.

package/utils/ssr-namespace-paths.test.js

@@ -2,8 +2,7 @@
 
 var _ssrNamespacePaths = require("./ssr-namespace-paths");
 var ssrConfig = _interopRequireWildcard(require("./ssr-config"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /*
  * Copyright (c) 2024, Salesforce, Inc.
  * All rights reserved.

package/utils/ssr-server/configure-proxy.basic.test.js

@@ -2,8 +2,7 @@
 
 var _configureProxy = require("./configure-proxy");
 var ssrProxying = _interopRequireWildcard(require("../ssr-proxying"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /*
  * Copyright (c) 2025, Salesforce, Inc.
  * All rights reserved.

package/utils/ssr-server/hybrid-proxy.test.js

@@ -3,8 +3,7 @@
 var _hybridProxy = require("./hybrid-proxy");
 var _loggerInstance = _interopRequireDefault(require("../logger-instance"));
 var utils = _interopRequireWildcard(require("./utils"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }

package/utils/ssr-server/process-lambda-response.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.processLambdaResponse = void 0;
+exports.processLambdaResponse = exports.processHeaders = void 0;
 var _constants = require("../../ssr/server/constants");
 var _serverlessAdapter = require("@h4ad/serverless-adapter");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -16,30 +16,95 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  * SPDX-License-Identifier: BSD-3-Clause
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
+/**
+ * Processes multi-value headers by flattening them into a single headers object,
+ * while preserving cookies in multiValueHeaders format.
+ * Cookies are extracted from multiValueHeaders and kept separate, as they need
+ * to remain in multiValueHeaders format for AWS Lambda responses.
+ * Also restores the original content type if it was temporarily replaced
+ * (e.g., when binary content encoding is used).
+ *
+ * @private
+ * @param {Object} multiValueHeaders - An object containing multi-value headers,
+ * where each key maps to an array of header values (e.g., {'set-cookie': ['cookie1', 'cookie2']})
+ * @returns {Object} An object containing:
+ *   - headers: A flattened headers object with all headers joined by commas,
+ *     excluding set-cookie headers, with a 'date' header added and content-type
+ *     restored from x-original-content-type if present
+ *   - multiValueHeaders: An object containing only the 'set-cookie' header if cookies were present,
+ *     otherwise an empty object
+ */
+const processHeaders = multiValueHeaders => {
+  const cookies = multiValueHeaders === null || multiValueHeaders === void 0 ? void 0 : multiValueHeaders['set-cookie'];
+  let headers = (0, _serverlessAdapter.getFlattenedHeadersMap)(multiValueHeaders || {}, ',', true);
+  headers['date'] = new Date().toUTCString();
+  let newMultiValueHeaders = {};
+
+  // Only allow set-cookie headers to be in multiValueHeaders
+  // to return multiple set-cookie headers instead of a single set-cookie header with multiple values
+  if (cookies) {
+    delete headers['set-cookie'];
+    newMultiValueHeaders = {
+      'set-cookie': cookies
+    };
+  }
+
+  // If the response contains an X_ORIGINAL_CONTENT_TYPE header,
+  // then replace the current CONTENT_TYPE header with it.
+  const originalContentType = headers[_constants.X_ORIGINAL_CONTENT_TYPE];
+  if (originalContentType) {
+    headers[_constants.CONTENT_TYPE] = originalContentType;
+    delete headers[_constants.X_ORIGINAL_CONTENT_TYPE];
+  }
+  return {
+    headers,
+    multiValueHeaders: newMultiValueHeaders
+  };
+};
+
+/**
+ * Processes a Lambda response by converting multi-value headers to a flattened format,
+ * preserving cookies in multiValueHeaders, and adding correlation ID from the event.
+ *
+ * This function is used to transform Express response headers into the format
+ * expected by AWS Lambda/API Gateway, ensuring that:
+ * - Multi-value headers are properly flattened (except for set-cookie)
+ * - Cookies remain in multiValueHeaders format for proper handling
+ * - Correlation IDs are propagated from the request to the response
+ * - Original content types are restored when they were temporarily replaced
+ *   (handled by processHeaders)
+ *
+ * @param {Object} response - The Lambda response object containing multiValueHeaders
+ * @param {Object} event - The Lambda event object containing request headers
+ * @param {Object} [event.headers] - Request headers from the Lambda event
+ * @param {string} [event.headers['x-correlation-id']] - Correlation ID to add to response headers
+ * @returns {Object} The processed response object with:
+ *   - headers: Flattened headers object (all headers joined by commas, except set-cookie)
+ *   - multiValueHeaders: Object containing set-cookie headers if present
+ *   - All other properties from the original response object
+ */
+exports.processHeaders = processHeaders;
 const processLambdaResponse = (response, event) => {
   var _event$headers;
   if (!response) return response;
 
   // Retrieve the correlation ID from the event headers
   const correlationId = (_event$headers = event.headers) === null || _event$headers === void 0 ? void 0 : _event$headers['x-correlation-id'];
-  let joinedHeaders = (0, _serverlessAdapter.getFlattenedHeadersMap)(response.multiValueHeaders || {}, ',', true);
-  joinedHeaders['date'] = new Date().toUTCString();
-  delete response['multiValueHeaders'];
+
+  // The response only has multiValueHeaders but the updated response needs joined single value headers
+  // except for the set-cookie headers
+  let {
+    headers,
+    multiValueHeaders
+  } = processHeaders(response.multiValueHeaders);
 
   // Add the correlation ID to the response headers if it exists
   if (correlationId) {
-    joinedHeaders['x-correlation-id'] = correlationId;
-  }
-
-  // If the response contains an X_ORIGINAL_CONTENT_TYPE header,
-  // then replace the current CONTENT_TYPE header with it.
-  const originalContentType = joinedHeaders[_constants.X_ORIGINAL_CONTENT_TYPE];
-  if (originalContentType) {
-    joinedHeaders[_constants.CONTENT_TYPE] = originalContentType;
-    delete joinedHeaders[_constants.X_ORIGINAL_CONTENT_TYPE];
+    headers['x-correlation-id'] = correlationId;
   }
   const result = _objectSpread(_objectSpread({}, response), {}, {
-    headers: joinedHeaders
+    headers,
+    multiValueHeaders
   });
   return result;
 };

package/utils/ssr-server/utils.test.js

@@ -1,8 +1,7 @@
 "use strict";
 
 var utils = _interopRequireWildcard(require("./utils"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); } /*
  * Copyright (c) 2022, Salesforce, Inc.
  * All rights reserved.

package/utils/ssr-server.test.js

@@ -502,6 +502,76 @@ describe('processLambdaResponse', () => {
       testCase.validate(res.headers);
     });
   });
+  test('preserves single cookie in multiValueHeaders', () => {
+    const response = {
+      multiValueHeaders: {
+        'set-cookie': ['test-cookie=test-value; Path=/']
+      }
+    };
+    const event = {};
+    const result = (0, _ssrServer.processLambdaResponse)(response, event);
+    expect(result.multiValueHeaders).toBeDefined();
+    expect(result.multiValueHeaders['set-cookie']).toEqual(['test-cookie=test-value; Path=/']);
+    expect(result.headers['set-cookie']).toBeUndefined();
+  });
+  test('preserves multiple cookies in multiValueHeaders', () => {
+    const response = {
+      multiValueHeaders: {
+        'set-cookie': ['test-cookie=test-value; Path=/', 'test-value2', 'test-value3']
+      }
+    };
+    const event = {};
+    const result = (0, _ssrServer.processLambdaResponse)(response, event);
+    expect(result.multiValueHeaders).toBeDefined();
+    expect(result.multiValueHeaders['set-cookie']).toEqual(['test-cookie=test-value; Path=/', 'test-value2', 'test-value3']);
+    expect(result.headers['set-cookie']).toBeUndefined();
+  });
+  test('removes set-cookie from headers when cookies are in multiValueHeaders', () => {
+    const response = {
+      multiValueHeaders: {
+        'set-cookie': ['test-cookie=test-value; Path=/'],
+        'Accept-Language': ['en-US']
+      }
+    };
+    const event = {};
+    const result = (0, _ssrServer.processLambdaResponse)(response, event);
+
+    // set-cookie should be removed from headers
+    expect(result.headers['set-cookie']).toBeUndefined();
+    // Other headers should still be present
+    expect(result.headers['accept-language']).toBe('en-US');
+    // Cookies should be in multiValueHeaders
+    expect(result.multiValueHeaders['set-cookie']).toEqual(['test-cookie=test-value; Path=/']);
+  });
+  test('does not add multiValueHeaders when no cookies are present', () => {
+    const response = {
+      multiValueHeaders: {
+        'Accept-Language': ['en-US']
+      }
+    };
+    const event = {};
+    const result = (0, _ssrServer.processLambdaResponse)(response, event);
+
+    // multiValueHeaders should be an empty object when no cookies are present
+    expect(result.multiValueHeaders).toEqual({});
+    expect(result.headers['accept-language']).toBe('en-US');
+  });
+  test('handles cookies with correlation ID', () => {
+    const response = {
+      multiValueHeaders: {
+        'set-cookie': ['test-cookie=test-value; Path=/']
+      }
+    };
+    const event = {
+      headers: {
+        'x-correlation-id': 'e46cd109-39b7-4173-963e-2c5de78ba087'
+      }
+    };
+    const result = (0, _ssrServer.processLambdaResponse)(response, event);
+    expect(result.headers['x-correlation-id']).toBe('e46cd109-39b7-4173-963e-2c5de78ba087');
+    expect(result.multiValueHeaders['set-cookie']).toEqual(['test-cookie=test-value; Path=/']);
+    expect(result.headers['set-cookie']).toBeUndefined();
+  });
 });
 describe('processExpressResponse', () => {
   const testCases = [{