@salesforce/pwa-kit-react-sdk 4.0.0-extensibility-preview.2 → 4.0.0-extensibility-preview.4

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-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()
@@ -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.d.ts

@@ -21,6 +21,24 @@ export namespace CorrelationIdProvider {
     }
 }
 export const ServerContext: React.Context<any>;
+export const RoutesContext: React.Context<any>;
+/**
+ * This provider initializes the routes
+ * @param children
+ * @param routes - array of routes
+ */
+export function RoutesProvider({ routes, children }: {
+    routes: any;
+    children: any;
+}): import("react/jsx-runtime").JSX.Element;
+export namespace RoutesProvider {
+    export namespace propTypes_1 {
+        export const routes: PropTypes.Validator<any[]>;
+        const children_1: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
+        export { children_1 as children };
+    }
+    export { propTypes_1 as propTypes };
+}
 import React from "react";
 import PropTypes from "prop-types";
 //# sourceMappingURL=index.d.ts.map

package/ssr/universal/contexts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ssr/universal/contexts/index.js"],"names":[],"mappings":"AAYA,sDAAkD;AAGlD;;;;;;;GAOG;AACH;;;;4CAiCC;;;;;;;;;AA3CD,+CAA2C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ssr/universal/contexts/index.js"],"names":[],"mappings":"AAYA,sDAAkD;AAGlD;;;;;;;GAOG;AACH;;;;4CAiCC;;;;;;;;;AA3CD,+CAA2C;AAoD3C,+CAA2C;AAE3C;;;;GAIG;AACH;;;4CAQC"}

package/ssr/universal/contexts/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ServerContext = exports.CorrelationIdProvider = exports.CorrelationIdContext = void 0;
+exports.ServerContext = exports.RoutesProvider = exports.RoutesContext = exports.CorrelationIdProvider = exports.CorrelationIdContext = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactRouterDom = require("react-router-dom");
@@ -69,4 +69,28 @@ CorrelationIdProvider.propTypes = {
   resetOnPageChange: _propTypes.default.bool,
   correlationId: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]).isRequired,
   location: _propTypes.default.object
+};
+const RoutesContext = exports.RoutesContext = /*#__PURE__*/_react.default.createContext();
+
+/**
+ * This provider initializes the routes
+ * @param children
+ * @param routes - array of routes
+ */
+const RoutesProvider = ({
+  routes,
+  children
+}) => {
+  const [_routes, setRoutes] = (0, _react.useState)(routes);
+  return /*#__PURE__*/_react.default.createElement(RoutesContext.Provider, {
+    value: {
+      routes: _routes,
+      setRoutes
+    }
+  }, children);
+};
+exports.RoutesProvider = RoutesProvider;
+RoutesProvider.propTypes = {
+  routes: _propTypes.default.array.isRequired,
+  children: _propTypes.default.node.isRequired
 };

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

@@ -98,4 +98,30 @@ describe('CorrelationIdProvider', function () {
     // expecting the provider to have a different correlation id when a page navigation happens
     expect(firstRenderedId).not.toEqual(secondRenderedId);
   }));
+});
+describe('RoutesProvider', () => {
+  it('provides routes via context', () => {
+    const testRoutes = [{
+      path: '/home'
+    }, {
+      path: '/about'
+    }];
+    const TestComponent = () => {
+      const {
+        routes
+      } = (0, _hooks.useRoutes)();
+      return /*#__PURE__*/_react.default.createElement("div", null, routes.map(route => route.path).join(', '));
+    };
+    (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.RoutesProvider, {
+      routes: testRoutes
+    }, /*#__PURE__*/_react.default.createElement(TestComponent, null)));
+    expect(_react2.screen.getByText('/home, /about')).toBeInTheDocument();
+  });
+  it('throws an error when useRoutes is used outside RoutesProvider', () => {
+    const TestComponent = () => {
+      (0, _hooks.useRoutes)();
+      return null;
+    };
+    expect(() => (0, _react2.render)(/*#__PURE__*/_react.default.createElement(TestComponent, null))).toThrow('useRoutes must be used within a RoutesProvider');
+  });
 });

package/ssr/universal/errors.d.ts

@@ -1,13 +1,9 @@
-export class HTTPError extends Error {
-    constructor(status: any, message: any);
-    constructor: typeof HTTPError;
-    __proto__: HTTPError;
-    message: any;
-    status: any;
+export declare class HTTPError extends Error {
+    status: number;
+    constructor(status: number, message: string);
+    toString(): string;
 }
-export class HTTPNotFound extends HTTPError {
-    constructor(message: any);
-    constructor: typeof HTTPNotFound;
-    __proto__: HTTPNotFound;
+export declare class HTTPNotFound extends HTTPError {
+    constructor(message: string);
 }
 //# sourceMappingURL=errors.d.ts.map

package/ssr/universal/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/ssr/universal/errors.js"],"names":[],"mappings":"AAOA;IACI,uCAMC;IAJG,8BAA4B;IAC5B,qBAAoC;IACpC,aAAsB;IACtB,YAAoB;CAM3B;AAED;IACI,0BAIC;IAFG,iCAA+B;IAC/B,wBAAuC;CAE9C"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/ssr/universal/errors.ts"],"names":[],"mappings":"AAOA,qBAAa,SAAU,SAAQ,KAAK;IAChC,MAAM,EAAE,MAAM,CAAA;gBAEF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAK3C,QAAQ;CAGX;AAED,qBAAa,YAAa,SAAQ,SAAS;gBAC3B,OAAO,EAAE,MAAM;CAG9B"}

package/ssr/universal/errors.js

@@ -14,9 +14,6 @@ exports.HTTPNotFound = exports.HTTPError = void 0;
 class HTTPError extends Error {
   constructor(status, message) {
     super(message);
-    this.constructor = HTTPError;
-    this.__proto__ = HTTPError.prototype;
-    this.message = message;
     this.status = status;
   }
   toString() {
@@ -27,8 +24,6 @@ exports.HTTPError = HTTPError;
 class HTTPNotFound extends HTTPError {
   constructor(message) {
     super(404, message);
-    this.constructor = HTTPNotFound;
-    this.__proto__ = HTTPNotFound.prototype;
   }
 }
 exports.HTTPNotFound = HTTPNotFound;

package/ssr/universal/events.d.ts

@@ -3,7 +3,7 @@ export namespace PAGEEVENTS {
     const ERROR: string;
 }
 export const pages: Pages;
-declare class Pages {
+declare class Pages extends EventTarget {
     pageLoad(templateName: any, start: any, end: any): void;
     error(name: any, content: any): void;
 }

package/ssr/universal/events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/ssr/universal/events.js"],"names":[],"mappings":";;;;AAiCA,0BAAgC;AApBhC;IACI,wDAOC;IACD,qCAMC;CACJ"}
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/ssr/universal/events.js"],"names":[],"mappings":";;;;AA6BA,0BAAgC;AAlBhC;IACI,wDAOC;IACD,qCAMC;CACJ"}

package/ssr/universal/events.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pages = exports.PAGEEVENTS = void 0;
-var _eventEmitter = _interopRequireDefault(require("event-emitter"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /*
  * Copyright (c) 2021, salesforce.com, inc.
  * All rights reserved.
@@ -17,22 +15,25 @@ const PAGEEVENTS = exports.PAGEEVENTS = {
   PAGELOAD: 'PAGELOAD',
   ERROR: 'ERROR'
 };
-class Pages {
+class Pages extends EventTarget {
   pageLoad(templateName, start, end) {
     const payload = {
       templateName,
       start,
       end
     };
-    this.emit(PAGEEVENTS.PAGELOAD, payload);
+    this.dispatchEvent(new CustomEvent(PAGEEVENTS.PAGELOAD, {
+      detail: payload
+    }));
   }
   error(name, content) {
     const payload = {
       name,
       content
     };
-    this.emit(PAGEEVENTS.ERROR, payload);
+    this.dispatchEvent(new CustomEvent(PAGEEVENTS.ERROR, {
+      detail: payload
+    }));
   }
 }
-(0, _eventEmitter.default)(Pages.prototype);
 const pages = exports.pages = new Pages();

package/ssr/universal/events.test.js

@@ -12,8 +12,8 @@ describe('Page Events', () => {
   test('emit and receive a PAGELOAD Page Event', () => {
     expect.assertions(1);
     return new Promise(resolve => {
-      _events.pages.on(_events.PAGEEVENTS.PAGELOAD, evt => {
-        expect(JSON.stringify(evt)).toEqual(JSON.stringify({
+      _events.pages.addEventListener(_events.PAGEEVENTS.PAGELOAD, evt => {
+        expect(JSON.stringify(evt.detail)).toEqual(JSON.stringify({
           templateName: 'blah',
           start: 123,
           end: 456
@@ -26,8 +26,8 @@ describe('Page Events', () => {
   test('emit and receive a ERROR Page Event', () => {
     expect.assertions(1);
     return new Promise(resolve => {
-      _events.pages.on(_events.PAGEEVENTS.ERROR, evt => {
-        expect(JSON.stringify(evt)).toEqual(JSON.stringify({
+      _events.pages.addEventListener(_events.PAGEEVENTS.ERROR, evt => {
+        expect(JSON.stringify(evt.detail)).toEqual(JSON.stringify({
           name: 'blah',
           content: 'more blah'
         }));

package/ssr/universal/hooks/index.d.ts

@@ -1,5 +1,9 @@
 export function useCorrelationId(): object;
 export function useServerContext(): ServerContext;
+export function useOrigin({ fromXForwardedHeader }: {
+    fromXForwardedHeader?: boolean | undefined;
+}): string;
+export function useRoutes(): object;
 /**
  * Server context
  */

package/ssr/universal/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ssr/universal/hooks/index.js"],"names":[],"mappings":"AAgBO,oCAFM,MAAM,CAQlB;AAiBM,oCANM,aAAa,CAUzB;;;;;;;;SAhBa,MAAM;;;;SACN,MAAM"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ssr/universal/hooks/index.js"],"names":[],"mappings":"AAgBO,oCAFM,MAAM,CAQlB;AAiBM,oCANM,aAAa,CAUzB;AAcM;;IAHM,MAAM,CAiBlB;AAOM,6BAFM,MAAM,CAQlB;;;;;;;;SAzDa,MAAM;;;;SACN,MAAM"}

package/ssr/universal/hooks/index.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useServerContext = exports.useCorrelationId = void 0;
+exports.useServerContext = exports.useRoutes = exports.useOrigin = exports.useCorrelationId = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _contexts = require("../contexts");
 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; }
 /*
- * Copyright (c) 2022, salesforce.com, inc.
+ * Copyright (c) 2024, salesforce.com, 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
@@ -49,4 +49,50 @@ const useServerContext = () => {
   const serverContext = (0, _react.useContext)(_contexts.ServerContext);
   return serverContext;
 };
-exports.useServerContext = useServerContext;
+
+/**
+ * Returns the application's origin.
+ *
+ * By default, it will return the ORIGIN under which we are serving the page.
+ *
+ * If `fromXForwardedHeader` is true, it will use the value of `x-forwarded-proto` and `x-forwarded-host` headers in req
+ * to build origin. (it is false by default)
+ *
+ * NOTE: this is a React hook, so it has to be used in a React rendering pipeline.
+ * @returns {string} origin string
+ *
+ */
+exports.useServerContext = useServerContext;
+const useOrigin = ({
+  fromXForwardedHeader = false
+}) => {
+  const {
+    res
+  } = useServerContext();
+  if (typeof window !== 'undefined') {
+    return window.location.origin;
+  }
+  const {
+    APP_ORIGIN
+  } = process.env;
+  const xForwardedOrigin = res.locals.xForwardedOrigin;
+  if (fromXForwardedHeader && xForwardedOrigin) {
+    return xForwardedOrigin;
+  }
+  return APP_ORIGIN;
+};
+
+/**
+ * Use this hook to get the routes value of the closest RoutesProvider component.
+ *
+ * @returns {object} array of routes
+ */
+exports.useOrigin = useOrigin;
+const useRoutes = () => {
+  const context = (0, _react.useContext)(_contexts.RoutesContext);
+  if (!context) {
+    throw new Error('useRoutes must be used within a RoutesProvider');
+  }
+  return context;
+};
+exports.useRoutes = useRoutes;

package/ssr/universal/utils.d.ts

@@ -18,7 +18,7 @@ export declare const getAssetUrl: (path: string) => string;
  * @function
  * @returns {string} The full URL to the static asset.
  */
-export declare const getStaticAssetUrl: (path: string, opts: GetAssetUrlOptions) => string;
+export declare const getStaticAssetUrl: (path?: string, opts?: GetAssetUrlOptions) => string;
 /**
  * @typedef {Object} ProxyConfig
  * @property {String} protocol - http or https

package/ssr/universal/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/ssr/universal/utils.ts"],"names":[],"mappings":"AAuBA,KAAK,kBAAkB,GAAG;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAA;CACnC,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,SAAU,MAAM,WAQvC,CAAA;AAID;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,SAAU,MAAM,QAAQ,kBAAkB,WAiBvE,CAAA;AAED;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,eAAO,MAAM,eAAe,WAS3B,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/ssr/universal/utils.ts"],"names":[],"mappings":"AAuBA,KAAK,kBAAkB,GAAG;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAA;CACnC,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,SAAU,MAAM,WAQvC,CAAA;AAID;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,yBAAqB,kBAAkB,WAkBpE,CAAA;AAED;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,eAAO,MAAM,eAAe,WAS3B,CAAA"}

package/ssr/universal/utils.js

@@ -20,7 +20,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  */ /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore
 // @ts-ignore
 const onClient = typeof window !== 'undefined';
-const EXTENIONS_NAMESPACE = '__extensions';
+const EXTENSIONS_NAMESPACE = '__extensions';
 const STATIC_FOLDER = 'static';
 /**
  * Get the URL that should be used to load an asset from the bundle.
@@ -38,7 +38,7 @@ const getAssetUrl = path => {
 };
 
 // TODO: Once we establish that we have a new @salesforce/pwa-kit-extensibility package, we can move this utility to
-// it as to not have direct references to extensibilty in the sdk. This will also reduce duplicate code.
+// it as to not have direct references to extensibility in the sdk. This will also reduce duplicate code.
 /**
  * Get the URL that should be used to load a static asset from the bundle.
  *
@@ -49,21 +49,22 @@ const getAssetUrl = path => {
  * @returns {string} The full URL to the static asset.
  */
 exports.getAssetUrl = getAssetUrl;
-const getStaticAssetUrl = (path, opts) => {
+const getStaticAssetUrl = (path = '', opts = {}) => {
   const {
     appExtensionPackageName = ''
   } = opts || {};
 
   /* istanbul ignore next */
-  const publicPath = onClient ?
-  // @ts-ignore
-  `${window.Progressive.buildOrigin}` : `${_ssrNamespacePaths.bundleBasePath}/${process.env.BUNDLE_ID || 'development'}/`;
+  let publicPath = getAssetUrl('');
 
   // Ensure all defined path arguments start with `/`.
   if (path && !path.startsWith('/')) {
     path = `/${path}`;
   }
-  return `${publicPath}/${STATIC_FOLDER}${appExtensionPackageName ? `/${EXTENIONS_NAMESPACE}/${appExtensionPackageName}` : ''}${path ? path : ''}`;
+  if (publicPath && !publicPath.endsWith('/')) {
+    publicPath = `${publicPath}/`;
+  }
+  return `${publicPath}${STATIC_FOLDER}${appExtensionPackageName ? `/${EXTENSIONS_NAMESPACE}/${appExtensionPackageName}` : ''}${path ? path : ''}`;
 };
 
 /**

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'
 };
 
 /**
@@ -60,7 +60,7 @@ class PerformanceTimer {
    */
   buildServerTimingHeader() {
     const header = this.metrics.map(metric => {
-      return `${metric.name};dur=${metric.duration}`;
+      return `${metric.name};dur=${metric.duration.toFixed(2)}`;
     }).join(', ');
     return header;
   }
@@ -73,7 +73,7 @@ class PerformanceTimer {
    */
   log() {
     this.metrics.forEach(metric => {
-      _loggerInstance.default.info(`${metric.name} - ${metric.duration}ms ${metric.detail || ''}`, {
+      _loggerInstance.default.info(`${metric.name} - ${metric.duration.toFixed(4)}ms ${metric.detail || ''}`, {
         namespace: 'performance'
       });
     });
@@ -115,7 +115,7 @@ class PerformanceTimer {
       if (startMark) {
         const measurement = {
           name,
-          duration: (timestamp - startMark.timestamp).toFixed(2),
+          duration: timestamp - startMark.timestamp,
           detail: options.detail
         };
         this.metrics.push(measurement);

package/utils/url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../src/utils/url.js"],"names":[],"mappings":"AAoBO,gCANM,MAAM,CAoBlB"}
+{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../src/utils/url.js"],"names":[],"mappings":"AAsBO,gCANM,MAAM,CAoBlB"}

package/utils/url.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getAppOrigin = void 0;
 /*
- * Copyright (c) 2021, salesforce.com, inc.
+ * Copyright (c) 2024, salesforce.com, 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
@@ -18,6 +18,8 @@ exports.getAppOrigin = void 0;
  * initialized using the `_createApp` method (This happens in your /app/ssr.js file).
  *
  * @function
+ * @deprecated use `useOrigin()` instead.
+ * This function will be removed in version 4.0.0.
  * @returns {string} Returns the ORIGIN under which we are serving the page.
  * @example
  * import {getAppOrigin} from '@salesforce/pwa-kit-react-sdk/utils/url'