@salesforce/pwa-kit-react-sdk 3.9.2 → 3.10.0-dev

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v3.10.0-dev (Feb 18, 2025)
+- Fix the performance logging util to use the correct delimiter for the server-timing header. [#2225](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2295)
+
 ## v3.9.2 (Mar 07, 2025)
 - Update PWA-Kit SDKs to v3.9.2 [#2304](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2304)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-react-sdk",
-  "version": "3.9.2",
+  "version": "3.10.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.9.2",
+    "@salesforce/pwa-kit-runtime": "3.10.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.9.2",
+    "@salesforce/pwa-kit-dev": "3.10.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.9.2",
+    "internal-lib-build": "3.10.0-dev",
     "node-html-parser": "^3.3.6",
     "nodemon": "^2.0.22",
     "react": "^18.2.0",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "d982971e3a1cc1f65ce296e526c459b2ea5f83fe"
+  "gitHead": "d86dc7bea3fe03a0f475ecf1a0ab878374f07026"
 }

package/ssr/browser/main.test.js

@@ -32,7 +32,7 @@ describe('main', function () {
       routes: (0, _routeComponent.getRoutes)(locals),
       WrappedApp: (0, _routeComponent.routeComponent)(App, false, locals)
     };
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_main.OuterApp, props));
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_main.OuterApp, props));
     expect(_react2.screen.getByText('App')).toBeInTheDocument();
     window.__PRELOADED_STATE__ = oldPreloadedState;
   });
@@ -47,7 +47,7 @@ describe('main', function () {
       routes: (0, _routeComponent.getRoutes)(locals),
       WrappedApp: (0, _routeComponent.routeComponent)(App, false, locals)
     };
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_main.OuterApp, props));
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_main.OuterApp, props));
     expect(_react2.screen.getByText('Error Status: 404')).toBeInTheDocument();
     window.__ERROR__ = oldWindowError;
   });

package/ssr/server/react-rendering.js

@@ -122,7 +122,7 @@ exports.getLocationSearch = getLocationSearch;
 const render = exports.render = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(function* (req, res, next) {
     var _config$app, _config$app$url;
-    const includeServerTimingHeader = ('__server_timing' in req.query);
+    const includeServerTimingHeader = '__server_timing' in req.query;
     const shouldTrackPerformance = includeServerTimingHeader || process.env.SERVER_TIMING;
     res.__performanceTimer = new _performance.default({
       enabled: shouldTrackPerformance
@@ -315,7 +315,7 @@ const renderApp = args => {
 
   try {
     routerContext = {};
-    appHtml = renderToString( /*#__PURE__*/_react.default.cloneElement(appJSX, {
+    appHtml = renderToString(/*#__PURE__*/_react.default.cloneElement(appJSX, {
       routerContext
     }), extractor);
   } catch (e) {
@@ -323,7 +323,7 @@ const renderApp = args => {
     // to the AppErrorBoundary component, and renders the error page.
     routerContext = {};
     renderError = logAndFormatError(e);
-    appHtml = renderToString( /*#__PURE__*/_react.default.cloneElement(appJSX, {
+    appHtml = renderToString(/*#__PURE__*/_react.default.cloneElement(appJSX, {
       routerContext,
       error: renderError
     }), extractor);
@@ -384,7 +384,7 @@ const renderApp = args => {
     }
   })];
   const helmetHeadTags = VALID_TAG_NAMES.map(tag => helmet[tag] && helmet[tag].toComponent()).filter(tag => tag);
-  const html = _server.default.renderToString( /*#__PURE__*/_react.default.createElement(_document.default, {
+  const html = _server.default.renderToString(/*#__PURE__*/_react.default.createElement(_document.default, {
     head: [...helmetHeadTags],
     html: appHtml,
     afterBodyStart: svgs,

package/ssr/universal/components/_app/index.test.js

@@ -14,7 +14,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 describe('App', () => {
   test('Renders correctly', () => {
     const body = /*#__PURE__*/_react.default.createElement("p", null, "Hello world");
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.default, null, body));
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.default, null, body));
     expect(_react2.screen.getByText(/hello world/i)).toBeInTheDocument();
   });
 });

package/ssr/universal/components/_document/index.test.js

@@ -32,7 +32,7 @@ describe('Document', () => {
     const htmlAttributes = {
       lang: 'en'
     };
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.default, {
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.default, {
       head: [style],
       html: html,
       afterBodyStart: [sprite],

package/ssr/universal/components/_error/index.test.js

@@ -16,7 +16,7 @@ describe('Error Page', () => {
   const status = 500;
   const message = 'Error message';
   test('Renders correctly', () => {
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.default, {
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.default, {
       message: message,
       stack: stack,
       status: status

package/ssr/universal/components/app-error-boundary/index.test.js

@@ -62,7 +62,7 @@ describe('AppErrorBoundary', () => {
   }) => {
     test(`Displays errors correctly (variation: ${variation})`, () => {
       const ref = /*#__PURE__*/_react.default.createRef();
-      (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.AppErrorBoundaryWithoutRouter, {
+      (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.AppErrorBoundaryWithoutRouter, {
         ref: ref
       }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, content)));
       expect(_react2.screen.getByText(content)).toBeInTheDocument();
@@ -77,7 +77,7 @@ describe('AppErrorBoundary', () => {
         listen: _sinon.default.stub().returns(_sinon.default.stub())
       };
       const ref = /*#__PURE__*/_react.default.createRef();
-      (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.AppErrorBoundaryWithoutRouter, {
+      (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.AppErrorBoundaryWithoutRouter, {
         ref: ref,
         history: history
       }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, content)));
@@ -100,7 +100,7 @@ describe('AppErrorBoundary', () => {
     const history = {
       listen: jest.fn().mockReturnValue(unlisten)
     };
-    const wrapper = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.AppErrorBoundaryWithoutRouter, {
+    const wrapper = (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.AppErrorBoundaryWithoutRouter, {
       history: history
     }, "test"));
     wrapper.unmount();

package/ssr/universal/components/redirect-with-status/index.js

@@ -15,8 +15,8 @@ const _excluded = ["status", "staticContext"];
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 /**
  * The `RedirectWithStatus` component is used to specify a different status code when redirecting via
  * the Redirect component.

package/ssr/universal/components/redirect-with-status/index.test.js

@@ -18,7 +18,7 @@ describe('RedirectWithStatus', () => {
     const targetUrl = '/target';
     const history = (0, _history.createMemoryHistory)();
     history.push('/redirect');
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
       history: history
     }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
       path: "/redirect"
@@ -31,7 +31,7 @@ describe('RedirectWithStatus', () => {
     const context = {};
     const status = 303;
     const targetUrl = '/target';
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_reactRouterDom.StaticRouter, {
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_reactRouterDom.StaticRouter, {
       location: "/redirect",
       context: context
     }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {

package/ssr/universal/components/refresh/index.test.js

@@ -35,11 +35,11 @@ jest.mock('@tanstack/react-query', () => {
   };
 });
 test('renders a loading spinner initially', () => {
-  (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_index.default, null));
+  (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_index.default, null));
   expect(_react.screen.getByTestId('loading-spinner')).toBeInTheDocument();
 });
 test('wait for react-query cache to be invalidated', /*#__PURE__*/_asyncToGenerator(function* () {
-  (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_index.default, null));
+  (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_index.default, null));
   yield (0, _react.waitFor)(() => {
     expect((0, _reactQuery.useQueryClient)().invalidateQueries).toHaveBeenCalled();
   });
@@ -49,7 +49,7 @@ test('a project not using react-query', /*#__PURE__*/_asyncToGenerator(function*
   _reactQuery.useQueryClient.mockImplementationOnce(() => {
     throw new Error();
   });
-  (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_index.default, null));
+  (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_index.default, null));
   jest.runAllTimers();
   yield (0, _react.waitFor)(() => {
     // Expect to still continue despite the project not using react-query,
@@ -58,7 +58,7 @@ test('a project not using react-query', /*#__PURE__*/_asyncToGenerator(function*
   });
 }));
 test('wait for soft navigation to the referrer', /*#__PURE__*/_asyncToGenerator(function* () {
-  (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_index.default, null));
+  (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_index.default, null));
   jest.runAllTimers();
   yield (0, _react.waitFor)(() => {
     expect((0, _reactRouterDom.useHistory)().replace).toHaveBeenCalledWith(referrerURL);
@@ -69,7 +69,7 @@ test('navigate to homepage if `referrer` search param cannot be found in the pag
   _reactRouterDom.useLocation.mockImplementationOnce(() => ({
     search: ''
   }));
-  (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_index.default, null));
+  (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_index.default, null));
   jest.runAllTimers();
   yield (0, _react.waitFor)(() => {
     expect(console.warn).toHaveBeenCalled();

package/ssr/universal/components/route-component/index.js

@@ -17,8 +17,8 @@ var _withLegacyGetProps = require("../../components/with-legacy-get-props");
 var _refresh = _interopRequireDefault(require("../refresh"));
 const _excluded = ["component"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 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); }); }; }
 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; }

package/ssr/universal/components/route-component/index.test.js

@@ -94,7 +94,7 @@ describe('The routeComponent component', () => {
   test('Is a higher-order component', () => {
     const Mock = getMockComponent();
     const Component = (0, _index.routeComponent)(Mock);
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(Component, {
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(Component, {
       isHydrating: false
     }));
     expect(_react2.screen.getByText(/mockComponent/i)).toBeInTheDocument();
@@ -112,7 +112,7 @@ describe('The routeComponent component', () => {
     }).then(() => {
       // Simulate the initial client-side mount (hydrating=true)
       return new Promise(resolve => {
-        wrapper = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(Component, {
+        wrapper = (0, _react2.render)(/*#__PURE__*/_react.default.createElement(Component, {
           history: {
             location: {
               pathname: '/home/'
@@ -130,7 +130,7 @@ describe('The routeComponent component', () => {
     }).then(() => {
       // Simulate visiting a different URL, which should trigger shouldMount() and getProps()
       return new Promise(resolve => {
-        wrapper.rerender( /*#__PURE__*/_react.default.createElement(Component, {
+        wrapper.rerender(/*#__PURE__*/_react.default.createElement(Component, {
           history: {
             location: {
               pathname: '/plp/'
@@ -211,7 +211,7 @@ describe('The routeComponent component', () => {
       throw error;
     };
     const Component = (0, _index.routeComponent)(Mock, {}, true);
-    return new Promise(resolve => (0, _react2.render)( /*#__PURE__*/_react.default.createElement(Component, {
+    return new Promise(resolve => (0, _react2.render)(/*#__PURE__*/_react.default.createElement(Component, {
       isHydrating: false,
       onGetPropsError: resolve
     }))).then(caught => expect(caught).toBe(error));
@@ -222,7 +222,7 @@ describe('The routeComponent component', () => {
     Mock.shouldGetProps = trueOnceThenFalse();
     Mock.getProps = () => delay(10).then(() => Promise.reject(errorText));
     const Component = (0, _index.routeComponent)(Mock);
-    return new Promise(resolve => (0, _react2.render)( /*#__PURE__*/_react.default.createElement(Component, {
+    return new Promise(resolve => (0, _react2.render)(/*#__PURE__*/_react.default.createElement(Component, {
       isHydrating: false,
       onGetPropsError: resolve
     }))).then(caught => expect(caught).toBe(errorText));
@@ -239,7 +239,7 @@ describe('The routeComponent component', () => {
     Mock.shouldGetProps = trueOnceThenFalse();
     const Component = (0, _index.routeComponent)(Mock, {}, true);
     yield new Promise(resolve => {
-      (0, _react2.render)( /*#__PURE__*/_react.default.createElement(Component, {
+      (0, _react2.render)(/*#__PURE__*/_react.default.createElement(Component, {
         onUpdateComplete: () => {
           resolve();
         }
@@ -302,7 +302,7 @@ describe('Handles race conditions for getProps', () => {
     };
     yield new Promise(resolve => {
       resolver.push(resolve);
-      wrapper = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(Component, {
+      wrapper = (0, _react2.render)(/*#__PURE__*/_react.default.createElement(Component, {
         onUpdateComplete: onUpdateComplete
       }));
     });
@@ -311,13 +311,13 @@ describe('Handles race conditions for getProps', () => {
     // twice, but only the later should call `setStateAsync` causing a re-render.
     const p1 = new Promise(resolve => {
       resolver.push(resolve);
-      wrapper.rerender( /*#__PURE__*/_react.default.createElement(Component, {
+      wrapper.rerender(/*#__PURE__*/_react.default.createElement(Component, {
         onUpdateComplete: onUpdateComplete
       }));
     });
     const p2 = new Promise(resolve => {
       resolver.push(resolve);
-      wrapper.rerender( /*#__PURE__*/_react.default.createElement(Component, {
+      wrapper.rerender(/*#__PURE__*/_react.default.createElement(Component, {
         onUpdateComplete: onUpdateComplete
       }));
     });
@@ -343,7 +343,7 @@ describe('Uses preloaded props on initial clientside page load', () => {
     Mock.displayName = 'MockComponent';
     const Component = (0, _index.routeComponent)(Mock, true, {});
     yield new Promise(resolve => {
-      const wrapper = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(Component, {
+      const wrapper = (0, _react2.render)(/*#__PURE__*/_react.default.createElement(Component, {
         preloadedProps: preloadedProps,
         onUpdateComplete: () => resolve(wrapper)
       }));
@@ -366,7 +366,7 @@ describe('Uses preloaded props on initial clientside page load', () => {
     Mock.displayName = 'MockComponent';
     const Component = (0, _index.routeComponent)(Mock, true, {});
     yield new Promise(resolve => {
-      const wrapper = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(Component, {
+      const wrapper = (0, _react2.render)(/*#__PURE__*/_react.default.createElement(Component, {
         preloadedProps: preloadedProps,
         onUpdateComplete: () => resolve(wrapper)
       }));

package/ssr/universal/components/switch/index.js

@@ -18,8 +18,8 @@ const _excluded = ["component"];
  */
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 /**
  * The Switch component packages up the bits of rendering that are shared between
  * server and client-side. It's *mostly* a react-router Switch component, hence the

package/ssr/universal/components/throw-404/index.test.js

@@ -16,7 +16,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 
 describe('Throw404', () => {
   test('Renders correctly', () => {
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.default, null));
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.default, null));
     const content = document.querySelector('body').firstElementChild.innerHTML;
     expect(content).toBe('<div></div>');
   });

package/ssr/universal/components/with-legacy-get-props/index.js

@@ -49,7 +49,7 @@ const withLegacyGetProps = Wrapped => {
           // to avoid blocking the execution of the getProps function to maximize performance
           // getTemplateName should be very fast, under 0.2ms
           c.getTemplateName().then(templateName => {
-            res.__performanceTimer.mark(`${_performance.PERFORMANCE_MARKS.getProps}::${templateName}`, 'start');
+            res.__performanceTimer.mark(`${_performance.PERFORMANCE_MARKS.getProps}.${templateName}`, 'start');
           });
           return c.getProps ? c.getProps({
             req,
@@ -58,7 +58,7 @@ const withLegacyGetProps = Wrapped => {
             location
           }).then(result => {
             c.getTemplateName().then(templateName => {
-              res.__performanceTimer.mark(`${_performance.PERFORMANCE_MARKS.getProps}::${templateName}`, 'end');
+              res.__performanceTimer.mark(`${_performance.PERFORMANCE_MARKS.getProps}.${templateName}`, 'end');
             });
             return result;
           }) : Promise.resolve({});

package/ssr/universal/components/with-legacy-get-props/index.test.js

@@ -15,7 +15,7 @@ describe('withLegacyGetProps', function () {
   test('Renders correctly', () => {
     const Wrapped = () => /*#__PURE__*/_react2.default.createElement("p", null, "Hello world");
     const Component = (0, _index.withLegacyGetProps)(Wrapped);
-    (0, _react.render)( /*#__PURE__*/_react2.default.createElement(Component, {
+    (0, _react.render)(/*#__PURE__*/_react2.default.createElement(Component, {
       locals: {}
     }));
     expect(_react.screen.getByText(/Hello world/i)).toBeInTheDocument();

package/ssr/universal/components/with-react-query/index.js

@@ -83,10 +83,10 @@ const withReactQuery = (Wrapped, options = {}) => {
         yield Promise.all(queries.map((q, i) => {
           var _q$meta, _q$meta2;
           // always include the index to avoid duplicate entries
-          const displayName = (_q$meta = q.meta) !== null && _q$meta !== void 0 && _q$meta.displayName ? `${(_q$meta2 = q.meta) === null || _q$meta2 === void 0 ? void 0 : _q$meta2.displayName}:${i}` : `${i}`;
-          res.__performanceTimer.mark(`${_performance.PERFORMANCE_MARKS.reactQueryUseQuery}::${displayName}`, 'start');
+          const displayName = (_q$meta = q.meta) !== null && _q$meta !== void 0 && _q$meta.displayName ? `${(_q$meta2 = q.meta) === null || _q$meta2 === void 0 ? void 0 : _q$meta2.displayName}-${i}` : `${i}`;
+          res.__performanceTimer.mark(`${_performance.PERFORMANCE_MARKS.reactQueryUseQuery}.${displayName}`, 'start');
           return q.fetch().then(result => {
-            res.__performanceTimer.mark(`${_performance.PERFORMANCE_MARKS.reactQueryUseQuery}::${displayName}`, 'end', {
+            res.__performanceTimer.mark(`${_performance.PERFORMANCE_MARKS.reactQueryUseQuery}.${displayName}`, 'end', {
               detail: q.queryHash
             });
             return result;

package/ssr/universal/components/with-react-query/index.test.js

@@ -4,14 +4,23 @@ var _index = require("./index");
 var _react = require("@testing-library/react");
 var _react2 = _interopRequireDefault(require("react"));
 var _loggerInstance = _interopRequireDefault(require("../../../../utils/logger-instance"));
+var _performance = require("../../../../utils/performance");
 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); }); }; }
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /*
  * Copyright (c) 2022, Salesforce, Inc.
  * All rights reserved.
  * 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
  */
-
+jest.mock('@tanstack/react-query', () => _objectSpread(_objectSpread({}, jest.requireActual('@tanstack/react-query')), {}, {
+  dehydrate: jest.fn().mockReturnValue({})
+}));
 jest.mock('../../../../utils/logger-instance', () => {
   return {
     error: jest.fn()
@@ -32,7 +41,7 @@ describe('withReactQuery', function () {
   test('Renders correctly', () => {
     const Wrapped = () => /*#__PURE__*/_react2.default.createElement("p", null, "Hello world");
     const Component = (0, _index.withReactQuery)(Wrapped);
-    (0, _react.render)( /*#__PURE__*/_react2.default.createElement(Component, {
+    (0, _react.render)(/*#__PURE__*/_react2.default.createElement(Component, {
       locals: {}
     }));
     expect(_react.screen.getByText(/Hello world/i)).toBeInTheDocument();
@@ -49,7 +58,7 @@ describe('withReactQuery', function () {
     window.__PRELOADED_STATE__ = {
       __reactQuery: mockPreloadedState
     };
-    (0, _react.render)( /*#__PURE__*/_react2.default.createElement(Component, {
+    (0, _react.render)(/*#__PURE__*/_react2.default.createElement(Component, {
       locals: {}
     }));
     expect(_react.screen.getByText(/Hello world/i)).toBeInTheDocument();
@@ -72,7 +81,7 @@ describe('withReactQuery', function () {
       __reactQuery: mockPreloadedState
     };
     _loggerInstance.default.error = jest.fn();
-    (0, _react.render)( /*#__PURE__*/_react2.default.createElement(Component, {
+    (0, _react.render)(/*#__PURE__*/_react2.default.createElement(Component, {
       locals: {}
     }));
     expect(_react.screen.getByText(/Hello world/i)).toBeInTheDocument();
@@ -98,4 +107,101 @@ describe('withReactQuery', function () {
       getHOCsInUse: () => ['xyz']
     }).getHOCsInUse()).toHaveLength(2);
   });
+  test('Performance markers use hyphen as delimiter for displayName', /*#__PURE__*/_asyncToGenerator(function* () {
+    const mockPerformanceTimer = {
+      mark: jest.fn()
+    };
+    const mockQueryMeta = {
+      displayName: 'TestQuery'
+    };
+    const mockQueryCache = {
+      getAll: jest.fn().mockReturnValue([{
+        options: {
+          enabled: true
+        },
+        meta: mockQueryMeta,
+        queryHash: 'test-hash',
+        fetch: jest.fn().mockResolvedValue({})
+      }])
+    };
+    const mockQueryClient = {
+      getQueryCache: jest.fn().mockReturnValue(mockQueryCache)
+    };
+    const res = {
+      locals: {
+        __queryClient: mockQueryClient
+      },
+      __performanceTimer: mockPerformanceTimer
+    };
+    const Component = (0, _index.withReactQuery)({});
+    yield Component.doInitAppState({
+      res,
+      appJSX: /*#__PURE__*/_react2.default.createElement("div", null, "Test")
+    });
+    expect(mockPerformanceTimer.mark).toHaveBeenCalledWith(`${_performance.PERFORMANCE_MARKS.reactQueryUseQuery}.TestQuery-0`, 'start');
+    expect(mockPerformanceTimer.mark).toHaveBeenCalledWith(`${_performance.PERFORMANCE_MARKS.reactQueryUseQuery}.TestQuery-0`, 'end', expect.objectContaining({
+      detail: 'test-hash'
+    }));
+  }));
+  test('Performance markers use index as displayName when meta.displayName is not available', /*#__PURE__*/_asyncToGenerator(function* () {
+    const mockPerformanceTimer = {
+      mark: jest.fn()
+    };
+    const mockQueryCache = {
+      getAll: jest.fn().mockReturnValue([{
+        options: {
+          enabled: true
+        },
+        meta: {},
+        queryHash: 'test-hash',
+        fetch: jest.fn().mockResolvedValue({})
+      }])
+    };
+    const mockQueryClient = {
+      getQueryCache: jest.fn().mockReturnValue(mockQueryCache)
+    };
+    const res = {
+      locals: {
+        __queryClient: mockQueryClient
+      },
+      __performanceTimer: mockPerformanceTimer
+    };
+    const Component = (0, _index.withReactQuery)({});
+    yield Component.doInitAppState({
+      res,
+      appJSX: /*#__PURE__*/_react2.default.createElement("div", null, "Test")
+    });
+
+    // Verify the performance marker uses just the index when no displayName is available
+    expect(mockPerformanceTimer.mark).toHaveBeenCalledWith(`${_performance.PERFORMANCE_MARKS.reactQueryUseQuery}.0`, 'start');
+    expect(mockPerformanceTimer.mark).toHaveBeenCalledWith(`${_performance.PERFORMANCE_MARKS.reactQueryUseQuery}.0`, 'end', expect.objectContaining({
+      detail: 'test-hash'
+    }));
+  }));
+  test('Performance markers for reactQueryPrerender are set correctly', /*#__PURE__*/_asyncToGenerator(function* () {
+    const mockPerformanceTimer = {
+      mark: jest.fn()
+    };
+    const mockQueryCache = {
+      getAll: jest.fn().mockReturnValue([])
+    };
+    const mockQueryClient = {
+      getQueryCache: jest.fn().mockReturnValue(mockQueryCache)
+    };
+    const res = {
+      locals: {
+        __queryClient: mockQueryClient
+      },
+      __performanceTimer: mockPerformanceTimer
+    };
+    const Component = (0, _index.withReactQuery)({});
+    yield Component.doInitAppState({
+      res,
+      appJSX: /*#__PURE__*/_react2.default.createElement("div", null, "Test")
+    });
+
+    // Verify the performance markers for reactQueryPrerender are set correctly
+    expect(mockPerformanceTimer.mark).toHaveBeenCalledWith(_performance.PERFORMANCE_MARKS.reactQueryPrerender, 'start');
+    expect(mockPerformanceTimer.mark).toHaveBeenCalledWith(_performance.PERFORMANCE_MARKS.reactQueryPrerender, 'end');
+  }));
 });

package/ssr/universal/contexts/index.test.js

@@ -44,7 +44,7 @@ describe('CorrelationIdProvider', function () {
   test('Renders without errors', () => {
     const history = (0, _history.createMemoryHistory)();
     const id = _crypto.default.randomUUID();
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
       history: history
     }, /*#__PURE__*/_react.default.createElement(SampleProvider, {
       correlationId: () => id
@@ -54,7 +54,7 @@ describe('CorrelationIdProvider', function () {
   test('renders when correlationId is passed as a function', () => {
     const id = _crypto.default.randomUUID();
     const history = (0, _history.createMemoryHistory)();
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
       history: history
     }, /*#__PURE__*/_react.default.createElement(SampleProvider, {
       correlationId: () => id
@@ -64,7 +64,7 @@ describe('CorrelationIdProvider', function () {
   test('renders when correlationId is passed as a string', () => {
     const id = _crypto.default.randomUUID();
     const history = (0, _history.createMemoryHistory)();
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
       history: history
     }, /*#__PURE__*/_react.default.createElement(SampleProvider, {
       correlationId: id,
@@ -86,7 +86,7 @@ describe('CorrelationIdProvider', function () {
         onClick: () => history.push('/page-1')
       }, "Go to another page"));
     };
-    (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_reactRouterDom.Router, {
       history: history
     }, /*#__PURE__*/_react.default.createElement(SampleProvider, {
       correlationId: () => _crypto.default.randomUUID()

package/utils/performance.js

@@ -14,14 +14,14 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  */
 
 const PERFORMANCE_MARKS = exports.PERFORMANCE_MARKS = {
-  total: 'ssr:total',
-  renderToString: 'ssr:render-to-string',
-  routeMatching: 'ssr:route-matching',
-  loadComponent: 'ssr:load-component',
-  fetchStrategies: 'ssr:fetch-strategies',
-  reactQueryPrerender: 'ssr:fetch-strategies:react-query:pre-render',
-  reactQueryUseQuery: 'ssr:fetch-strategies:react-query:use-query',
-  getProps: 'ssr:fetch-strategies:get-prop'
+  total: 'ssr.total',
+  renderToString: 'ssr.render-to-string',
+  routeMatching: 'ssr.route-matching',
+  loadComponent: 'ssr.load-component',
+  fetchStrategies: 'ssr.fetch-strategies',
+  reactQueryPrerender: 'ssr.fetch-strategies.react-query.pre-render',
+  reactQueryUseQuery: 'ssr.fetch-strategies.react-query.use-query',
+  getProps: 'ssr.fetch-strategies.get-prop'
 };
 
 /**