@grafana/faro-react 2.3.1 → 2.5.0

package/dist/cjs/profiler/FaroProfiler.test.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const dependencies_1 = require("../dependencies");
+const FaroProfiler_1 = require("./FaroProfiler");
+describe('FaroProfiler', () => {
+    let mockSpan;
+    let mockChildSpan;
+    let startSpanCalls;
+    let setSpanMock;
+    let activeContextMock;
+    let withMock;
+    beforeEach(() => {
+        mockSpan = { end: jest.fn() };
+        mockChildSpan = { end: jest.fn() };
+        startSpanCalls = [];
+        let callIdx = 0;
+        const startSpan = jest.fn((name, options) => {
+            startSpanCalls.push({ name, options });
+            // First call is the mount span (from constructor); subsequent calls are children.
+            return callIdx++ === 0 ? mockSpan : mockChildSpan;
+        });
+        setSpanMock = jest.fn();
+        activeContextMock = jest.fn(() => ({}));
+        withMock = jest.fn((_ctx, fn) => fn());
+        const otelMock = {
+            trace: {
+                getTracer: () => ({ startSpan }),
+                setSpan: setSpanMock,
+            },
+            context: {
+                active: activeContextMock,
+                with: withMock,
+            },
+        };
+        const apiMock = {
+            isOTELInitialized: () => true,
+            getOTEL: () => otelMock,
+        };
+        const internalLoggerMock = { error: jest.fn(), warn: jest.fn(), info: jest.fn(), debug: jest.fn() };
+        (0, dependencies_1.setDependencies)(internalLoggerMock, apiMock);
+    });
+    it('does not pass Date.now() to span.end on mount (lets OTel stamp via monotonic hrTime)', () => {
+        const dateNowSpy = jest.spyOn(Date, 'now');
+        const profiler = new FaroProfiler_1.FaroProfiler({ name: 'C', updateProps: {}, children: null });
+        profiler.componentDidMount();
+        expect(mockSpan.end).toHaveBeenCalledTimes(1);
+        // Critical assertion: span.end was called with no wall-clock timestamp argument.
+        // OTel's web SDK stamps the end time via its hrTime helper (performance.timeOrigin +
+        // performance.now()), which is monotonic. Passing Date.now() here would mix clocks
+        // with the mount span's start (auto-stamped by OTel from hrTime).
+        expect(mockSpan.end).toHaveBeenCalledWith();
+        expect(dateNowSpy).not.toHaveBeenCalled();
+        dateNowSpy.mockRestore();
+    });
+    it('does not pass Date.now() to componentRender child span on unmount', () => {
+        const dateNowSpy = jest.spyOn(Date, 'now');
+        const profiler = new FaroProfiler_1.FaroProfiler({ name: 'C', updateProps: {}, children: null });
+        profiler.componentDidMount();
+        dateNowSpy.mockClear();
+        profiler.componentWillUnmount();
+        // A componentRender child span should have been created.
+        const renderCall = startSpanCalls.find((c) => c.name === 'componentRender');
+        expect(renderCall).toBeTruthy();
+        // Critical: neither startTime nor endTime should be sourced from Date.now() (wall clock).
+        expect(dateNowSpy).not.toHaveBeenCalled();
+        // Both timestamps should be undefined (let OTel stamp from hrTime) or, if explicitly
+        // provided, derived from a monotonic source. The simplest fix uses undefined.
+        if (renderCall.options) {
+            expect(renderCall.options.startTime).toBeUndefined();
+            expect(renderCall.options.endTime).toBeUndefined();
+        }
+        dateNowSpy.mockRestore();
+    });
+});
+//# sourceMappingURL=FaroProfiler.test.js.map

package/dist/cjs/profiler/FaroProfiler.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FaroProfiler.test.js","sourceRoot":"","sources":["../../../src/profiler/FaroProfiler.test.tsx"],"names":[],"mappings":";;AAAA,kDAAkD;AAElD,iDAA8C;AAE9C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,QAA4B,CAAC;IACjC,IAAI,aAAiC,CAAC;IACtC,IAAI,cAAqD,CAAC;IAC1D,IAAI,WAAsB,CAAC;IAC3B,IAAI,iBAA4B,CAAC;IACjC,IAAI,QAAmB,CAAC;IAExB,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;QAC9B,aAAa,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;QACnC,cAAc,GAAG,EAAE,CAAC;QAEpB,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,IAAY,EAAE,OAAY,EAAE,EAAE;YACvD,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YACvC,kFAAkF;YAClF,OAAO,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACxB,iBAAiB,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAQ,CAAC,CAAC;QAC/C,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,IAAS,EAAE,EAAc,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAQ;YACpB,KAAK,EAAE;gBACL,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;gBAChC,OAAO,EAAE,WAAW;aACrB;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,iBAAiB;gBACzB,IAAI,EAAE,QAAQ;aACf;SACF,CAAC;QAEF,MAAM,OAAO,GAAQ;YACnB,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI;YAC7B,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ;SACxB,CAAC;QAEF,MAAM,kBAAkB,GAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;QAEzG,IAAA,8BAAe,EAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sFAAsF,EAAE,GAAG,EAAE;QAC9F,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE3C,MAAM,QAAQ,GAAG,IAAI,2BAAY,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAW,EAAE,CAAC,CAAC;QACzF,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAE7B,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,iFAAiF;QACjF,qFAAqF;QACrF,mFAAmF;QACnF,kEAAkE;QAClE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,oBAAoB,EAAE,CAAC;QAC5C,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAE1C,UAAU,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE3C,MAAM,QAAQ,GAAG,IAAI,2BAAY,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAW,EAAE,CAAC,CAAC;QACzF,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAE7B,UAAU,CAAC,SAAS,EAAE,CAAC;QACvB,QAAQ,CAAC,oBAAoB,EAAE,CAAC;QAEhC,yDAAyD;QACzD,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;QAC5E,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,CAAC;QAEhC,0FAA0F;QAC1F,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAE1C,qFAAqF;QACrF,8EAA8E;QAC9E,IAAI,UAAW,CAAC,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,UAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE,CAAC;YACtD,MAAM,CAAC,UAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC;QACtD,CAAC;QAED,UAAU,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import { setDependencies } from '../dependencies';\n\nimport { FaroProfiler } from './FaroProfiler';\n\ndescribe('FaroProfiler', () => {\n  let mockSpan: { end: jest.Mock };\n  let mockChildSpan: { end: jest.Mock };\n  let startSpanCalls: Array<{ name: string; options: any }>;\n  let setSpanMock: jest.Mock;\n  let activeContextMock: jest.Mock;\n  let withMock: jest.Mock;\n\n  beforeEach(() => {\n    mockSpan = { end: jest.fn() };\n    mockChildSpan = { end: jest.fn() };\n    startSpanCalls = [];\n\n    let callIdx = 0;\n    const startSpan = jest.fn((name: string, options: any) => {\n      startSpanCalls.push({ name, options });\n      // First call is the mount span (from constructor); subsequent calls are children.\n      return callIdx++ === 0 ? mockSpan : mockChildSpan;\n    });\n\n    setSpanMock = jest.fn();\n    activeContextMock = jest.fn(() => ({}) as any);\n    withMock = jest.fn((_ctx: any, fn: () => void) => fn());\n\n    const otelMock: any = {\n      trace: {\n        getTracer: () => ({ startSpan }),\n        setSpan: setSpanMock,\n      },\n      context: {\n        active: activeContextMock,\n        with: withMock,\n      },\n    };\n\n    const apiMock: any = {\n      isOTELInitialized: () => true,\n      getOTEL: () => otelMock,\n    };\n\n    const internalLoggerMock: any = { error: jest.fn(), warn: jest.fn(), info: jest.fn(), debug: jest.fn() };\n\n    setDependencies(internalLoggerMock, apiMock);\n  });\n\n  it('does not pass Date.now() to span.end on mount (lets OTel stamp via monotonic hrTime)', () => {\n    const dateNowSpy = jest.spyOn(Date, 'now');\n\n    const profiler = new FaroProfiler({ name: 'C', updateProps: {}, children: null as any });\n    profiler.componentDidMount();\n\n    expect(mockSpan.end).toHaveBeenCalledTimes(1);\n    // Critical assertion: span.end was called with no wall-clock timestamp argument.\n    // OTel's web SDK stamps the end time via its hrTime helper (performance.timeOrigin +\n    // performance.now()), which is monotonic. Passing Date.now() here would mix clocks\n    // with the mount span's start (auto-stamped by OTel from hrTime).\n    expect(mockSpan.end).toHaveBeenCalledWith();\n    expect(dateNowSpy).not.toHaveBeenCalled();\n\n    dateNowSpy.mockRestore();\n  });\n\n  it('does not pass Date.now() to componentRender child span on unmount', () => {\n    const dateNowSpy = jest.spyOn(Date, 'now');\n\n    const profiler = new FaroProfiler({ name: 'C', updateProps: {}, children: null as any });\n    profiler.componentDidMount();\n\n    dateNowSpy.mockClear();\n    profiler.componentWillUnmount();\n\n    // A componentRender child span should have been created.\n    const renderCall = startSpanCalls.find((c) => c.name === 'componentRender');\n    expect(renderCall).toBeTruthy();\n\n    // Critical: neither startTime nor endTime should be sourced from Date.now() (wall clock).\n    expect(dateNowSpy).not.toHaveBeenCalled();\n\n    // Both timestamps should be undefined (let OTel stamp from hrTime) or, if explicitly\n    // provided, derived from a monotonic source. The simplest fix uses undefined.\n    if (renderCall!.options) {\n      expect(renderCall!.options.startTime).toBeUndefined();\n      expect(renderCall!.options.endTime).toBeUndefined();\n    }\n\n    dateNowSpy.mockRestore();\n  });\n});\n"]}

package/dist/cjs/profiler/withFaroProfiler.js

@@ -1,30 +1,19 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withFaroProfiler = withFaroProfiler;
-var hoist_non_react_statics_1 = __importDefault(require("hoist-non-react-statics"));
-var react_1 = __importDefault(require("react"));
-var faro_core_1 = require("@grafana/faro-core");
-var FaroProfiler_1 = require("./FaroProfiler");
+const hoist_non_react_statics_1 = __importDefault(require("hoist-non-react-statics"));
+const react_1 = __importDefault(require("react"));
+const faro_core_1 = require("@grafana/faro-core");
+const FaroProfiler_1 = require("./FaroProfiler");
 function withFaroProfiler(WrappedComponent, options) {
     var _a, _b, _c;
-    var componentDisplayName = (_c = (_b = (_a = options === null || options === void 0 ? void 0 : options.name) !== null && _a !== void 0 ? _a : WrappedComponent.displayName) !== null && _b !== void 0 ? _b : WrappedComponent.name) !== null && _c !== void 0 ? _c : faro_core_1.unknownString;
-    var Component = function (props) { return (react_1.default.createElement(FaroProfiler_1.FaroProfiler, { name: componentDisplayName, updateProps: props },
-        react_1.default.createElement(WrappedComponent, __assign({}, props)))); };
-    Component.displayName = "faroProfiler(".concat(componentDisplayName, ")");
+    const componentDisplayName = (_c = (_b = (_a = options === null || options === void 0 ? void 0 : options.name) !== null && _a !== void 0 ? _a : WrappedComponent.displayName) !== null && _b !== void 0 ? _b : WrappedComponent.name) !== null && _c !== void 0 ? _c : faro_core_1.unknownString;
+    const Component = (props) => (react_1.default.createElement(FaroProfiler_1.FaroProfiler, { name: componentDisplayName, updateProps: props },
+        react_1.default.createElement(WrappedComponent, Object.assign({}, props))));
+    Component.displayName = `faroProfiler(${componentDisplayName})`;
     (0, hoist_non_react_statics_1.default)(Component, WrappedComponent);
     return Component;
 }

package/dist/cjs/profiler/withFaroProfiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"withFaroProfiler.js","sourceRoot":"","sources":["../../../src/profiler/withFaroProfiler.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AASA,4CAiBC;AA1BD,oFAA2D;AAC3D,gDAA0B;AAG1B,gDAAmD;AAEnD,+CAA8C;AAG9C,SAAgB,gBAAgB,CAC9B,gBAAkC,EAClC,OAAgD;;IAEhD,IAAM,oBAAoB,GAAG,MAAA,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,mCAAI,gBAAgB,CAAC,WAAW,mCAAI,gBAAgB,CAAC,IAAI,mCAAI,yBAAa,CAAC;IAErH,IAAM,SAAS,GAAU,UAAC,KAAQ,IAAK,OAAA,CACrC,8BAAC,2BAAY,IAAC,IAAI,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK;QAC1D,8BAAC,gBAAgB,eAAK,KAAK,EAAI,CAClB,CAChB,EAJsC,CAItC,CAAC;IAEF,SAAS,CAAC,WAAW,GAAG,uBAAgB,oBAAoB,MAAG,CAAC;IAEhE,IAAA,iCAAoB,EAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAElD,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\nimport React from 'react';\nimport type { ComponentType, FC } from 'react';\n\nimport { unknownString } from '@grafana/faro-core';\n\nimport { FaroProfiler } from './FaroProfiler';\nimport type { FaroProfilerProps } from './FaroProfiler';\n\nexport function withFaroProfiler<P extends Record<string, any>>(\n  WrappedComponent: ComponentType<P>,\n  options?: Omit<FaroProfilerProps, 'updateProps'>\n): FC<P> {\n  const componentDisplayName = options?.name ?? WrappedComponent.displayName ?? WrappedComponent.name ?? unknownString;\n\n  const Component: FC<P> = (props: P) => (\n    <FaroProfiler name={componentDisplayName} updateProps={props}>\n      <WrappedComponent {...props} />\n    </FaroProfiler>\n  );\n\n  Component.displayName = `faroProfiler(${componentDisplayName})`;\n\n  hoistNonReactStatics(Component, WrappedComponent);\n\n  return Component;\n}\n"]}
+{"version":3,"file":"withFaroProfiler.js","sourceRoot":"","sources":["../../../src/profiler/withFaroProfiler.tsx"],"names":[],"mappings":";;;;;AASA,4CAiBC;AA1BD,sFAA2D;AAC3D,kDAA0B;AAG1B,kDAAmD;AAEnD,iDAA8C;AAG9C,SAAgB,gBAAgB,CAC9B,gBAAkC,EAClC,OAAgD;;IAEhD,MAAM,oBAAoB,GAAG,MAAA,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,mCAAI,gBAAgB,CAAC,WAAW,mCAAI,gBAAgB,CAAC,IAAI,mCAAI,yBAAa,CAAC;IAErH,MAAM,SAAS,GAAU,CAAC,KAAQ,EAAE,EAAE,CAAC,CACrC,8BAAC,2BAAY,IAAC,IAAI,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK;QAC1D,8BAAC,gBAAgB,oBAAK,KAAK,EAAI,CAClB,CAChB,CAAC;IAEF,SAAS,CAAC,WAAW,GAAG,gBAAgB,oBAAoB,GAAG,CAAC;IAEhE,IAAA,iCAAoB,EAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAElD,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\nimport React from 'react';\nimport type { ComponentType, FC } from 'react';\n\nimport { unknownString } from '@grafana/faro-core';\n\nimport { FaroProfiler } from './FaroProfiler';\nimport type { FaroProfilerProps } from './FaroProfiler';\n\nexport function withFaroProfiler<P extends Record<string, any>>(\n  WrappedComponent: ComponentType<P>,\n  options?: Omit<FaroProfilerProps, 'updateProps'>\n): FC<P> {\n  const componentDisplayName = options?.name ?? WrappedComponent.displayName ?? WrappedComponent.name ?? unknownString;\n\n  const Component: FC<P> = (props: P) => (\n    <FaroProfiler name={componentDisplayName} updateProps={props}>\n      <WrappedComponent {...props} />\n    </FaroProfiler>\n  );\n\n  Component.displayName = `faroProfiler(${componentDisplayName})`;\n\n  hoistNonReactStatics(Component, WrappedComponent);\n\n  return Component;\n}\n"]}

package/dist/cjs/router/initialize.js

@@ -1,27 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initializeReactRouterInstrumentation = initializeReactRouterInstrumentation;
-var dependencies_1 = require("../dependencies");
-var types_1 = require("./types");
-var v4v5_1 = require("./v4v5");
-var v6v7_1 = require("./v6v7");
+const dependencies_1 = require("../dependencies");
+const types_1 = require("./types");
+const v4v5_1 = require("./v4v5");
+const v6v7_1 = require("./v6v7");
 function initializeReactRouterInstrumentation(options) {
     var _a;
-    var initMessage = 'Initializing React Router';
+    const initMessage = 'Initializing React Router';
     switch ((_a = options.router) === null || _a === void 0 ? void 0 : _a.version) {
         case types_1.ReactRouterVersion.V7:
         case types_1.ReactRouterVersion.V6:
-            dependencies_1.internalLogger.debug("".concat(initMessage, " ").concat(options.router.version, " instrumentation"));
+            dependencies_1.internalLogger.debug(`${initMessage} ${options.router.version} instrumentation`);
             (0, v6v7_1.initializeReactRouterV6Instrumentation)(options.router.dependencies);
             break;
         case types_1.ReactRouterVersion.V7_data_router:
         case types_1.ReactRouterVersion.V6_data_router:
-            dependencies_1.internalLogger.debug("".concat(initMessage, " ").concat(options.router.version, " data router instrumentation"));
+            dependencies_1.internalLogger.debug(`${initMessage} ${options.router.version} data router instrumentation`);
             (0, v6v7_1.initializeReactRouterV6DataRouterInstrumentation)(options.router.dependencies);
             break;
         case types_1.ReactRouterVersion.V5:
         case types_1.ReactRouterVersion.V4:
-            dependencies_1.internalLogger.debug("".concat(initMessage, " ").concat(options.router.version, " instrumentation"));
+            dependencies_1.internalLogger.debug(`${initMessage} ${options.router.version} instrumentation`);
             (0, v4v5_1.initializeReactRouterV4V5Instrumentation)(options.router.dependencies);
             break;
         default:

package/dist/cjs/router/initialize.js.map

@@ -1 +1 @@
-{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../src/router/initialize.ts"],"names":[],"mappings":";;AAOA,oFAyBC;AAhCD,gDAAiD;AAGjD,iCAA6C;AAC7C,+BAAkE;AAClE,+BAAkH;AAElH,SAAgB,oCAAoC,CAAC,OAA+B;;IAClF,IAAM,WAAW,GAAG,2BAA2B,CAAC;IAEhD,QAAQ,MAAA,OAAO,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;QAChC,KAAK,0BAAkB,CAAC,EAAE,CAAC;QAC3B,KAAK,0BAAkB,CAAC,EAAE;YACxB,6BAAc,CAAC,KAAK,CAAC,UAAG,WAAW,cAAI,OAAO,CAAC,MAAM,CAAC,OAAO,qBAAkB,CAAC,CAAC;YACjF,IAAA,6CAAsC,EAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACpE,MAAM;QAER,KAAK,0BAAkB,CAAC,cAAc,CAAC;QACvC,KAAK,0BAAkB,CAAC,cAAc;YACpC,6BAAc,CAAC,KAAK,CAAC,UAAG,WAAW,cAAI,OAAO,CAAC,MAAM,CAAC,OAAO,iCAA8B,CAAC,CAAC;YAC7F,IAAA,uDAAgD,EAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC9E,MAAM;QAER,KAAK,0BAAkB,CAAC,EAAE,CAAC;QAC3B,KAAK,0BAAkB,CAAC,EAAE;YACxB,6BAAc,CAAC,KAAK,CAAC,UAAG,WAAW,cAAI,OAAO,CAAC,MAAM,CAAC,OAAO,qBAAkB,CAAC,CAAC;YACjF,IAAA,+CAAwC,EAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACtE,MAAM;QAER;YACE,6BAAc,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;IACpF,CAAC;AACH,CAAC","sourcesContent":["import { internalLogger } from '../dependencies';\nimport type { ReactIntegrationConfig } from '../types';\n\nimport { ReactRouterVersion } from './types';\nimport { initializeReactRouterV4V5Instrumentation } from './v4v5';\nimport { initializeReactRouterV6DataRouterInstrumentation, initializeReactRouterV6Instrumentation } from './v6v7';\n\nexport function initializeReactRouterInstrumentation(options: ReactIntegrationConfig): void {\n  const initMessage = 'Initializing React Router';\n\n  switch (options.router?.version) {\n    case ReactRouterVersion.V7:\n    case ReactRouterVersion.V6:\n      internalLogger.debug(`${initMessage} ${options.router.version} instrumentation`);\n      initializeReactRouterV6Instrumentation(options.router.dependencies);\n      break;\n\n    case ReactRouterVersion.V7_data_router:\n    case ReactRouterVersion.V6_data_router:\n      internalLogger.debug(`${initMessage} ${options.router.version} data router instrumentation`);\n      initializeReactRouterV6DataRouterInstrumentation(options.router.dependencies);\n      break;\n\n    case ReactRouterVersion.V5:\n    case ReactRouterVersion.V4:\n      internalLogger.debug(`${initMessage} ${options.router.version} instrumentation`);\n      initializeReactRouterV4V5Instrumentation(options.router.dependencies);\n      break;\n\n    default:\n      internalLogger.debug('Skipping initialization of React Router instrumentation');\n  }\n}\n"]}
+{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../src/router/initialize.ts"],"names":[],"mappings":";;AAOA,oFAyBC;AAhCD,kDAAiD;AAGjD,mCAA6C;AAC7C,iCAAkE;AAClE,iCAAkH;AAElH,SAAgB,oCAAoC,CAAC,OAA+B;;IAClF,MAAM,WAAW,GAAG,2BAA2B,CAAC;IAEhD,QAAQ,MAAA,OAAO,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;QAChC,KAAK,0BAAkB,CAAC,EAAE,CAAC;QAC3B,KAAK,0BAAkB,CAAC,EAAE;YACxB,6BAAc,CAAC,KAAK,CAAC,GAAG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;YACjF,IAAA,6CAAsC,EAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACpE,MAAM;QAER,KAAK,0BAAkB,CAAC,cAAc,CAAC;QACvC,KAAK,0BAAkB,CAAC,cAAc;YACpC,6BAAc,CAAC,KAAK,CAAC,GAAG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,8BAA8B,CAAC,CAAC;YAC7F,IAAA,uDAAgD,EAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC9E,MAAM;QAER,KAAK,0BAAkB,CAAC,EAAE,CAAC;QAC3B,KAAK,0BAAkB,CAAC,EAAE;YACxB,6BAAc,CAAC,KAAK,CAAC,GAAG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;YACjF,IAAA,+CAAwC,EAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACtE,MAAM;QAER;YACE,6BAAc,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;IACpF,CAAC;AACH,CAAC","sourcesContent":["import { internalLogger } from '../dependencies';\nimport type { ReactIntegrationConfig } from '../types';\n\nimport { ReactRouterVersion } from './types';\nimport { initializeReactRouterV4V5Instrumentation } from './v4v5';\nimport { initializeReactRouterV6DataRouterInstrumentation, initializeReactRouterV6Instrumentation } from './v6v7';\n\nexport function initializeReactRouterInstrumentation(options: ReactIntegrationConfig): void {\n  const initMessage = 'Initializing React Router';\n\n  switch (options.router?.version) {\n    case ReactRouterVersion.V7:\n    case ReactRouterVersion.V6:\n      internalLogger.debug(`${initMessage} ${options.router.version} instrumentation`);\n      initializeReactRouterV6Instrumentation(options.router.dependencies);\n      break;\n\n    case ReactRouterVersion.V7_data_router:\n    case ReactRouterVersion.V6_data_router:\n      internalLogger.debug(`${initMessage} ${options.router.version} data router instrumentation`);\n      initializeReactRouterV6DataRouterInstrumentation(options.router.dependencies);\n      break;\n\n    case ReactRouterVersion.V5:\n    case ReactRouterVersion.V4:\n      internalLogger.debug(`${initMessage} ${options.router.version} instrumentation`);\n      initializeReactRouterV4V5Instrumentation(options.router.dependencies);\n      break;\n\n    default:\n      internalLogger.debug('Skipping initialization of React Router instrumentation');\n  }\n}\n"]}

package/dist/cjs/router/v4v5/FaroRoute.js

@@ -1,28 +1,17 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FaroRoute = FaroRoute;
-var react_1 = __importDefault(require("react"));
-var activeEvent_1 = require("./activeEvent");
-var routerDependencies_1 = require("./routerDependencies");
+const react_1 = __importDefault(require("react"));
+const activeEvent_1 = require("./activeEvent");
+const routerDependencies_1 = require("./routerDependencies");
 function FaroRoute(props) {
     var _a;
     if ((_a = props === null || props === void 0 ? void 0 : props.computedMatch) === null || _a === void 0 ? void 0 : _a.isExact) {
         (0, activeEvent_1.setActiveEventRoute)(props.computedMatch.path);
     }
-    return react_1.default.createElement(routerDependencies_1.Route, __assign({}, props));
+    return react_1.default.createElement(routerDependencies_1.Route, Object.assign({}, props));
 }
 //# sourceMappingURL=FaroRoute.js.map

package/dist/cjs/router/v4v5/FaroRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"FaroRoute.js","sourceRoot":"","sources":["../../../../src/router/v4v5/FaroRoute.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAMA,8BAMC;AAZD,gDAA0B;AAE1B,6CAAoD;AACpD,2DAA6C;AAG7C,SAAgB,SAAS,CAAC,KAAgC;;IACxD,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,0CAAE,OAAO,EAAE,CAAC;QAClC,IAAA,iCAAmB,EAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,8BAAC,0BAAK,eAAK,KAAK,EAAI,CAAC;AAC9B,CAAC","sourcesContent":["import React from 'react';\n\nimport { setActiveEventRoute } from './activeEvent';\nimport { Route } from './routerDependencies';\nimport type { ReactRouterV4V5RouteProps } from './types';\n\nexport function FaroRoute(props: ReactRouterV4V5RouteProps) {\n  if (props?.computedMatch?.isExact) {\n    setActiveEventRoute(props.computedMatch.path);\n  }\n\n  return <Route {...props} />;\n}\n"]}
+{"version":3,"file":"FaroRoute.js","sourceRoot":"","sources":["../../../../src/router/v4v5/FaroRoute.tsx"],"names":[],"mappings":";;;;;AAMA,8BAMC;AAZD,kDAA0B;AAE1B,+CAAoD;AACpD,6DAA6C;AAG7C,SAAgB,SAAS,CAAC,KAAgC;;IACxD,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,0CAAE,OAAO,EAAE,CAAC;QAClC,IAAA,iCAAmB,EAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,8BAAC,0BAAK,oBAAK,KAAK,EAAI,CAAC;AAC9B,CAAC","sourcesContent":["import React from 'react';\n\nimport { setActiveEventRoute } from './activeEvent';\nimport { Route } from './routerDependencies';\nimport type { ReactRouterV4V5RouteProps } from './types';\n\nexport function FaroRoute(props: ReactRouterV4V5RouteProps) {\n  if (props?.computedMatch?.isExact) {\n    setActiveEventRoute(props.computedMatch.path);\n  }\n\n  return <Route {...props} />;\n}\n"]}

package/dist/cjs/router/v4v5/activeEvent.js

@@ -4,13 +4,13 @@ exports.activeEvent = void 0;
 exports.createNewActiveEvent = createNewActiveEvent;
 exports.setActiveEventRoute = setActiveEventRoute;
 exports.sendActiveEvent = sendActiveEvent;
-var faro_web_sdk_1 = require("@grafana/faro-web-sdk");
-var dependencies_1 = require("../../dependencies");
+const faro_web_sdk_1 = require("@grafana/faro-web-sdk");
+const dependencies_1 = require("../../dependencies");
 exports.activeEvent = undefined;
 function createNewActiveEvent(url) {
     exports.activeEvent = {
         route: '',
-        url: url,
+        url,
     };
     return exports.activeEvent;
 }

package/dist/cjs/router/v4v5/activeEvent.js.map

@@ -1 +1 @@
-{"version":3,"file":"activeEvent.js","sourceRoot":"","sources":["../../../../src/router/v4v5/activeEvent.ts"],"names":[],"mappings":";;;AAQA,oDAOC;AAED,kDAIC;AAED,0CAIC;AA3BD,sDAA2D;AAE3D,mDAAyC;AAI9B,QAAA,WAAW,GAA2C,SAAS,CAAC;AAE3E,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,mBAAW,GAAG;QACZ,KAAK,EAAE,EAAE;QACT,GAAG,KAAA;KACJ,CAAC;IAEF,OAAO,mBAAW,CAAC;AACrB,CAAC;AAED,SAAgB,mBAAmB,CAAC,KAAa;IAC/C,IAAI,mBAAW,EAAE,CAAC;QAChB,mBAAW,CAAC,KAAK,GAAG,KAAK,CAAC;IAC5B,CAAC;AACH,CAAC;AAED,SAAgB,eAAe;IAC7B,kBAAG,CAAC,SAAS,CAAC,iCAAkB,EAAE,mBAAW,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhF,mBAAW,GAAG,SAAS,CAAC;AAC1B,CAAC","sourcesContent":["import { EVENT_ROUTE_CHANGE } from '@grafana/faro-web-sdk';\n\nimport { api } from '../../dependencies';\n\nimport type { ReactRouterV4V5ActiveEvent } from './types';\n\nexport let activeEvent: ReactRouterV4V5ActiveEvent | undefined = undefined;\n\nexport function createNewActiveEvent(url: string): ReactRouterV4V5ActiveEvent {\n  activeEvent = {\n    route: '',\n    url,\n  };\n\n  return activeEvent;\n}\n\nexport function setActiveEventRoute(route: string): void {\n  if (activeEvent) {\n    activeEvent.route = route;\n  }\n}\n\nexport function sendActiveEvent(): void {\n  api.pushEvent(EVENT_ROUTE_CHANGE, activeEvent, undefined, { skipDedupe: true });\n\n  activeEvent = undefined;\n}\n"]}
+{"version":3,"file":"activeEvent.js","sourceRoot":"","sources":["../../../../src/router/v4v5/activeEvent.ts"],"names":[],"mappings":";;;AAQA,oDAOC;AAED,kDAIC;AAED,0CAIC;AA3BD,wDAA2D;AAE3D,qDAAyC;AAI9B,QAAA,WAAW,GAA2C,SAAS,CAAC;AAE3E,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,mBAAW,GAAG;QACZ,KAAK,EAAE,EAAE;QACT,GAAG;KACJ,CAAC;IAEF,OAAO,mBAAW,CAAC;AACrB,CAAC;AAED,SAAgB,mBAAmB,CAAC,KAAa;IAC/C,IAAI,mBAAW,EAAE,CAAC;QAChB,mBAAW,CAAC,KAAK,GAAG,KAAK,CAAC;IAC5B,CAAC;AACH,CAAC;AAED,SAAgB,eAAe;IAC7B,kBAAG,CAAC,SAAS,CAAC,iCAAkB,EAAE,mBAAW,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhF,mBAAW,GAAG,SAAS,CAAC;AAC1B,CAAC","sourcesContent":["import { EVENT_ROUTE_CHANGE } from '@grafana/faro-web-sdk';\n\nimport { api } from '../../dependencies';\n\nimport type { ReactRouterV4V5ActiveEvent } from './types';\n\nexport let activeEvent: ReactRouterV4V5ActiveEvent | undefined = undefined;\n\nexport function createNewActiveEvent(url: string): ReactRouterV4V5ActiveEvent {\n  activeEvent = {\n    route: '',\n    url,\n  };\n\n  return activeEvent;\n}\n\nexport function setActiveEventRoute(route: string): void {\n  if (activeEvent) {\n    activeEvent.route = route;\n  }\n}\n\nexport function sendActiveEvent(): void {\n  api.pushEvent(EVENT_ROUTE_CHANGE, activeEvent, undefined, { skipDedupe: true });\n\n  activeEvent = undefined;\n}\n"]}

package/dist/cjs/router/v4v5/initialize.js

@@ -6,21 +6,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initializeReactRouterV4V5Instrumentation = initializeReactRouterV4V5Instrumentation;
 exports.createReactRouterV4Options = createReactRouterV4Options;
 exports.createReactRouterV5Options = createReactRouterV5Options;
-var hoist_non_react_statics_1 = __importDefault(require("hoist-non-react-statics"));
-var faro_web_sdk_1 = require("@grafana/faro-web-sdk");
-var types_1 = require("../types");
-var activeEvent_1 = require("./activeEvent");
-var FaroRoute_1 = require("./FaroRoute");
-var routerDependencies_1 = require("./routerDependencies");
+const hoist_non_react_statics_1 = __importDefault(require("hoist-non-react-statics"));
+const faro_web_sdk_1 = require("@grafana/faro-web-sdk");
+const types_1 = require("../types");
+const activeEvent_1 = require("./activeEvent");
+const FaroRoute_1 = require("./FaroRoute");
+const routerDependencies_1 = require("./routerDependencies");
 function initializeReactRouterV4V5Instrumentation(dependencies) {
     var _a, _b, _c, _d;
-    var Route = dependencies.Route;
-    var componentDisplayName = (_a = Route.displayName) !== null && _a !== void 0 ? _a : Route.name;
-    FaroRoute_1.FaroRoute.displayName = "faroRoute(".concat(componentDisplayName, ")");
+    const Route = dependencies.Route;
+    const componentDisplayName = (_a = Route.displayName) !== null && _a !== void 0 ? _a : Route.name;
+    FaroRoute_1.FaroRoute.displayName = `faroRoute(${componentDisplayName})`;
     (0, hoist_non_react_statics_1.default)(FaroRoute_1.FaroRoute, Route);
     (0, routerDependencies_1.setReactRouterV4V5Dependencies)(dependencies);
     (0, activeEvent_1.createNewActiveEvent)((_b = faro_web_sdk_1.globalObject.location) === null || _b === void 0 ? void 0 : _b.href);
-    (_d = (_c = dependencies.history).listen) === null || _d === void 0 ? void 0 : _d.call(_c, function (_location, action) {
+    (_d = (_c = dependencies.history).listen) === null || _d === void 0 ? void 0 : _d.call(_c, (_location, action) => {
         var _a;
         if (action === types_1.NavigationType.Push || action === types_1.NavigationType.Pop) {
             (0, activeEvent_1.sendActiveEvent)();
@@ -31,13 +31,13 @@ function initializeReactRouterV4V5Instrumentation(dependencies) {
 function createReactRouterV4Options(dependencies) {
     return {
         version: types_1.ReactRouterVersion.V4,
-        dependencies: dependencies,
+        dependencies,
     };
 }
 function createReactRouterV5Options(dependencies) {
     return {
         version: types_1.ReactRouterVersion.V5,
-        dependencies: dependencies,
+        dependencies,
     };
 }
 //# sourceMappingURL=initialize.js.map

package/dist/cjs/router/v4v5/initialize.js.map

@@ -1 +1 @@
-{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../../src/router/v4v5/initialize.ts"],"names":[],"mappings":";;;;;AAaA,4FAiBC;AAED,gEAKC;AAED,gEAKC;AA5CD,oFAA2D;AAG3D,sDAAqD;AAGrD,kCAA8D;AAE9D,6CAAsE;AACtE,yCAAwC;AACxC,2DAAsE;AAGtE,SAAgB,wCAAwC,CAAC,YAAyC;;IAChG,IAAM,KAAK,GAAG,YAAY,CAAC,KAA0B,CAAC;IACtD,IAAM,oBAAoB,GAAG,MAAA,KAAK,CAAC,WAAW,mCAAI,KAAK,CAAC,IAAI,CAAC;IAC5D,qBAA+B,CAAC,WAAW,GAAG,oBAAa,oBAAoB,MAAG,CAAC;IACpF,IAAA,iCAAoB,EAAC,qBAAS,EAAE,KAAK,CAAC,CAAC;IAEvC,IAAA,mDAA8B,EAAC,YAAY,CAAC,CAAC;IAE7C,IAAA,kCAAoB,EAAC,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;IAElD,MAAA,MAAA,YAAY,CAAC,OAAO,EAAC,MAAM,mDAAG,UAAC,SAAS,EAAE,MAAM;;QAC9C,IAAI,MAAM,KAAK,sBAAc,CAAC,IAAI,IAAI,MAAM,KAAK,sBAAc,CAAC,GAAG,EAAE,CAAC;YACpE,IAAA,6BAAe,GAAE,CAAC;YAElB,IAAA,kCAAoB,EAAC,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;QACpD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAyC;IAClF,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,EAAE;QAC9B,YAAY,cAAA;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAyC;IAClF,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,EAAE;QAC9B,YAAY,cAAA;KACb,CAAC;AACJ,CAAC","sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\nimport type { FunctionComponent } from 'react';\n\nimport { globalObject } from '@grafana/faro-web-sdk';\n\nimport type { ReactRouterV4V5Config } from '../../types';\nimport { NavigationType, ReactRouterVersion } from '../types';\n\nimport { createNewActiveEvent, sendActiveEvent } from './activeEvent';\nimport { FaroRoute } from './FaroRoute';\nimport { setReactRouterV4V5Dependencies } from './routerDependencies';\nimport type { ReactRouterV4V5Dependencies } from './types';\n\nexport function initializeReactRouterV4V5Instrumentation(dependencies: ReactRouterV4V5Dependencies): void {\n  const Route = dependencies.Route as FunctionComponent;\n  const componentDisplayName = Route.displayName ?? Route.name;\n  (FaroRoute as FunctionComponent).displayName = `faroRoute(${componentDisplayName})`;\n  hoistNonReactStatics(FaroRoute, Route);\n\n  setReactRouterV4V5Dependencies(dependencies);\n\n  createNewActiveEvent(globalObject.location?.href);\n\n  dependencies.history.listen?.((_location, action) => {\n    if (action === NavigationType.Push || action === NavigationType.Pop) {\n      sendActiveEvent();\n\n      createNewActiveEvent(globalObject.location?.href);\n    }\n  });\n}\n\nexport function createReactRouterV4Options(dependencies: ReactRouterV4V5Dependencies): ReactRouterV4V5Config {\n  return {\n    version: ReactRouterVersion.V4,\n    dependencies,\n  };\n}\n\nexport function createReactRouterV5Options(dependencies: ReactRouterV4V5Dependencies): ReactRouterV4V5Config {\n  return {\n    version: ReactRouterVersion.V5,\n    dependencies,\n  };\n}\n"]}
+{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../../src/router/v4v5/initialize.ts"],"names":[],"mappings":";;;;;AAaA,4FAiBC;AAED,gEAKC;AAED,gEAKC;AA5CD,sFAA2D;AAG3D,wDAAqD;AAGrD,oCAA8D;AAE9D,+CAAsE;AACtE,2CAAwC;AACxC,6DAAsE;AAGtE,SAAgB,wCAAwC,CAAC,YAAyC;;IAChG,MAAM,KAAK,GAAG,YAAY,CAAC,KAA0B,CAAC;IACtD,MAAM,oBAAoB,GAAG,MAAA,KAAK,CAAC,WAAW,mCAAI,KAAK,CAAC,IAAI,CAAC;IAC5D,qBAA+B,CAAC,WAAW,GAAG,aAAa,oBAAoB,GAAG,CAAC;IACpF,IAAA,iCAAoB,EAAC,qBAAS,EAAE,KAAK,CAAC,CAAC;IAEvC,IAAA,mDAA8B,EAAC,YAAY,CAAC,CAAC;IAE7C,IAAA,kCAAoB,EAAC,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;IAElD,MAAA,MAAA,YAAY,CAAC,OAAO,EAAC,MAAM,mDAAG,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE;;QAClD,IAAI,MAAM,KAAK,sBAAc,CAAC,IAAI,IAAI,MAAM,KAAK,sBAAc,CAAC,GAAG,EAAE,CAAC;YACpE,IAAA,6BAAe,GAAE,CAAC;YAElB,IAAA,kCAAoB,EAAC,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;QACpD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAyC;IAClF,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,EAAE;QAC9B,YAAY;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAyC;IAClF,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,EAAE;QAC9B,YAAY;KACb,CAAC;AACJ,CAAC","sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\nimport type { FunctionComponent } from 'react';\n\nimport { globalObject } from '@grafana/faro-web-sdk';\n\nimport type { ReactRouterV4V5Config } from '../../types';\nimport { NavigationType, ReactRouterVersion } from '../types';\n\nimport { createNewActiveEvent, sendActiveEvent } from './activeEvent';\nimport { FaroRoute } from './FaroRoute';\nimport { setReactRouterV4V5Dependencies } from './routerDependencies';\nimport type { ReactRouterV4V5Dependencies } from './types';\n\nexport function initializeReactRouterV4V5Instrumentation(dependencies: ReactRouterV4V5Dependencies): void {\n  const Route = dependencies.Route as FunctionComponent;\n  const componentDisplayName = Route.displayName ?? Route.name;\n  (FaroRoute as FunctionComponent).displayName = `faroRoute(${componentDisplayName})`;\n  hoistNonReactStatics(FaroRoute, Route);\n\n  setReactRouterV4V5Dependencies(dependencies);\n\n  createNewActiveEvent(globalObject.location?.href);\n\n  dependencies.history.listen?.((_location, action) => {\n    if (action === NavigationType.Push || action === NavigationType.Pop) {\n      sendActiveEvent();\n\n      createNewActiveEvent(globalObject.location?.href);\n    }\n  });\n}\n\nexport function createReactRouterV4Options(dependencies: ReactRouterV4V5Dependencies): ReactRouterV4V5Config {\n  return {\n    version: ReactRouterVersion.V4,\n    dependencies,\n  };\n}\n\nexport function createReactRouterV5Options(dependencies: ReactRouterV4V5Dependencies): ReactRouterV4V5Config {\n  return {\n    version: ReactRouterVersion.V5,\n    dependencies,\n  };\n}\n"]}

package/dist/cjs/router/v6v7/FaroRoutes.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -45,31 +34,31 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FaroRoutes = FaroRoutes;
-var react_1 = __importStar(require("react"));
-var faro_web_sdk_1 = require("@grafana/faro-web-sdk");
-var dependencies_1 = require("../../dependencies");
-var types_1 = require("../types");
-var routerDependencies_1 = require("./routerDependencies");
-var utils_1 = require("./utils");
+const react_1 = __importStar(require("react"));
+const faro_web_sdk_1 = require("@grafana/faro-web-sdk");
+const dependencies_1 = require("../../dependencies");
+const types_1 = require("../types");
+const routerDependencies_1 = require("./routerDependencies");
+const utils_1 = require("./utils");
 function FaroRoutes(props) {
     var _a;
-    var location = routerDependencies_1.useLocation === null || routerDependencies_1.useLocation === void 0 ? void 0 : (0, routerDependencies_1.useLocation)();
-    var navigationType = routerDependencies_1.useNavigationType === null || routerDependencies_1.useNavigationType === void 0 ? void 0 : (0, routerDependencies_1.useNavigationType)();
-    var routes = (0, react_1.useMemo)(function () { var _a; return (_a = routerDependencies_1.createRoutesFromChildren === null || routerDependencies_1.createRoutesFromChildren === void 0 ? void 0 : (0, routerDependencies_1.createRoutesFromChildren)(props.children)) !== null && _a !== void 0 ? _a : []; }, [props.children]);
-    var lastRouteRef = (0, react_1.useRef)({});
-    (0, react_1.useEffect)(function () {
+    const location = routerDependencies_1.useLocation === null || routerDependencies_1.useLocation === void 0 ? void 0 : (0, routerDependencies_1.useLocation)();
+    const navigationType = routerDependencies_1.useNavigationType === null || routerDependencies_1.useNavigationType === void 0 ? void 0 : (0, routerDependencies_1.useNavigationType)();
+    const routes = (0, react_1.useMemo)(() => { var _a; return (_a = routerDependencies_1.createRoutesFromChildren === null || routerDependencies_1.createRoutesFromChildren === void 0 ? void 0 : (0, routerDependencies_1.createRoutesFromChildren)(props.children)) !== null && _a !== void 0 ? _a : []; }, [props.children]);
+    const lastRouteRef = (0, react_1.useRef)({});
+    (0, react_1.useEffect)(() => {
         var _a, _b;
         if (routerDependencies_1.isInitialized && (navigationType === types_1.NavigationType.Push || navigationType === types_1.NavigationType.Pop)) {
-            var route = (0, utils_1.getRouteFromLocation)(routes, location);
-            var url = (_a = faro_web_sdk_1.globalObject.location) === null || _a === void 0 ? void 0 : _a.href;
-            dependencies_1.api.pushEvent(faro_web_sdk_1.EVENT_ROUTE_CHANGE, __assign({ toRoute: route, toUrl: (_b = faro_web_sdk_1.globalObject.location) === null || _b === void 0 ? void 0 : _b.href }, lastRouteRef.current));
+            const route = (0, utils_1.getRouteFromLocation)(routes, location);
+            const url = (_a = faro_web_sdk_1.globalObject.location) === null || _a === void 0 ? void 0 : _a.href;
+            dependencies_1.api.pushEvent(faro_web_sdk_1.EVENT_ROUTE_CHANGE, Object.assign({ toRoute: route, toUrl: (_b = faro_web_sdk_1.globalObject.location) === null || _b === void 0 ? void 0 : _b.href }, lastRouteRef.current));
             lastRouteRef.current = {
                 fromRoute: route,
                 fromUrl: url,
             };
         }
     }, [location, navigationType, routes]);
-    var ActualRoutes = (_a = props.routesComponent) !== null && _a !== void 0 ? _a : routerDependencies_1.Routes;
-    return react_1.default.createElement(ActualRoutes, __assign({}, props));
+    const ActualRoutes = (_a = props.routesComponent) !== null && _a !== void 0 ? _a : routerDependencies_1.Routes;
+    return react_1.default.createElement(ActualRoutes, Object.assign({}, props));
 }
 //# sourceMappingURL=FaroRoutes.js.map

package/dist/cjs/router/v6v7/FaroRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"FaroRoutes.js","sourceRoot":"","sources":["../../../../src/router/v6v7/FaroRoutes.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,gCA6BC;AAxCD,6CAA0D;AAE1D,sDAAyE;AAEzE,mDAAyC;AACzC,kCAA0C;AAE1C,2DAAuH;AAEvH,iCAA+C;AAE/C,SAAgB,UAAU,CAAC,KAA+B;;IACxD,IAAM,QAAQ,GAAG,gCAAW,aAAX,gCAAW,2BAAX,gCAAW,GAAI,CAAC;IACjC,IAAM,cAAc,GAAG,sCAAiB,aAAjB,sCAAiB,2BAAjB,sCAAiB,GAAI,CAAC;IAE7C,IAAM,MAAM,GAAG,IAAA,eAAO,EAAC,sBAAM,OAAA,MAAA,6CAAwB,aAAxB,6CAAwB,2BAAxB,6CAAwB,EAAG,KAAK,CAAC,QAAQ,CAAC,mCAAI,EAAE,CAAA,EAAA,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEjG,IAAM,YAAY,GAAG,IAAA,cAAM,EAAiC,EAAE,CAAC,CAAC;IAEhE,IAAA,iBAAS,EAAC;;QACR,IAAI,kCAAa,IAAI,CAAC,cAAc,KAAK,sBAAc,CAAC,IAAI,IAAI,cAAc,KAAK,sBAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACvG,IAAM,KAAK,GAAG,IAAA,4BAAoB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACrD,IAAM,GAAG,GAAG,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,CAAC;YAExC,kBAAG,CAAC,SAAS,CAAC,iCAAkB,aAC9B,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,IAC/B,YAAY,CAAC,OAAO,EACvB,CAAC;YAEH,YAAY,CAAC,OAAO,GAAG;gBACrB,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,GAAG;aACb,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;IAEvC,IAAM,YAAY,GAAG,MAAA,KAAK,CAAC,eAAe,mCAAI,2BAAM,CAAC;IAErD,OAAO,8BAAC,YAAY,eAAK,KAAK,EAAI,CAAC;AACrC,CAAC","sourcesContent":["import React, { useEffect, useMemo, useRef } from 'react';\n\nimport { EVENT_ROUTE_CHANGE, globalObject } from '@grafana/faro-web-sdk';\n\nimport { api } from '../../dependencies';\nimport { NavigationType } from '../types';\n\nimport { createRoutesFromChildren, isInitialized, Routes, useLocation, useNavigationType } from './routerDependencies';\nimport type { EventRouteTransitionAttributes, ReactRouterV6RoutesProps } from './types';\nimport { getRouteFromLocation } from './utils';\n\nexport function FaroRoutes(props: ReactRouterV6RoutesProps) {\n  const location = useLocation?.();\n  const navigationType = useNavigationType?.();\n\n  const routes = useMemo(() => createRoutesFromChildren?.(props.children) ?? [], [props.children]);\n\n  const lastRouteRef = useRef<EventRouteTransitionAttributes>({});\n\n  useEffect(() => {\n    if (isInitialized && (navigationType === NavigationType.Push || navigationType === NavigationType.Pop)) {\n      const route = getRouteFromLocation(routes, location);\n      const url = globalObject.location?.href;\n\n      api.pushEvent(EVENT_ROUTE_CHANGE, {\n        toRoute: route,\n        toUrl: globalObject.location?.href,\n        ...lastRouteRef.current,\n      });\n\n      lastRouteRef.current = {\n        fromRoute: route,\n        fromUrl: url,\n      };\n    }\n  }, [location, navigationType, routes]);\n\n  const ActualRoutes = props.routesComponent ?? Routes;\n\n  return <ActualRoutes {...props} />;\n}\n"]}
+{"version":3,"file":"FaroRoutes.js","sourceRoot":"","sources":["../../../../src/router/v6v7/FaroRoutes.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,gCA6BC;AAxCD,+CAA0D;AAE1D,wDAAyE;AAEzE,qDAAyC;AACzC,oCAA0C;AAE1C,6DAAuH;AAEvH,mCAA+C;AAE/C,SAAgB,UAAU,CAAC,KAA+B;;IACxD,MAAM,QAAQ,GAAG,gCAAW,aAAX,gCAAW,2BAAX,gCAAW,GAAI,CAAC;IACjC,MAAM,cAAc,GAAG,sCAAiB,aAAjB,sCAAiB,2BAAjB,sCAAiB,GAAI,CAAC;IAE7C,MAAM,MAAM,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,WAAC,OAAA,MAAA,6CAAwB,aAAxB,6CAAwB,2BAAxB,6CAAwB,EAAG,KAAK,CAAC,QAAQ,CAAC,mCAAI,EAAE,CAAA,EAAA,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEjG,MAAM,YAAY,GAAG,IAAA,cAAM,EAAiC,EAAE,CAAC,CAAC;IAEhE,IAAA,iBAAS,EAAC,GAAG,EAAE;;QACb,IAAI,kCAAa,IAAI,CAAC,cAAc,KAAK,sBAAc,CAAC,IAAI,IAAI,cAAc,KAAK,sBAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACvG,MAAM,KAAK,GAAG,IAAA,4BAAoB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACrD,MAAM,GAAG,GAAG,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,CAAC;YAExC,kBAAG,CAAC,SAAS,CAAC,iCAAkB,kBAC9B,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,IAC/B,YAAY,CAAC,OAAO,EACvB,CAAC;YAEH,YAAY,CAAC,OAAO,GAAG;gBACrB,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,GAAG;aACb,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;IAEvC,MAAM,YAAY,GAAG,MAAA,KAAK,CAAC,eAAe,mCAAI,2BAAM,CAAC;IAErD,OAAO,8BAAC,YAAY,oBAAK,KAAK,EAAI,CAAC;AACrC,CAAC","sourcesContent":["import React, { useEffect, useMemo, useRef } from 'react';\n\nimport { EVENT_ROUTE_CHANGE, globalObject } from '@grafana/faro-web-sdk';\n\nimport { api } from '../../dependencies';\nimport { NavigationType } from '../types';\n\nimport { createRoutesFromChildren, isInitialized, Routes, useLocation, useNavigationType } from './routerDependencies';\nimport type { EventRouteTransitionAttributes, ReactRouterV6RoutesProps } from './types';\nimport { getRouteFromLocation } from './utils';\n\nexport function FaroRoutes(props: ReactRouterV6RoutesProps) {\n  const location = useLocation?.();\n  const navigationType = useNavigationType?.();\n\n  const routes = useMemo(() => createRoutesFromChildren?.(props.children) ?? [], [props.children]);\n\n  const lastRouteRef = useRef<EventRouteTransitionAttributes>({});\n\n  useEffect(() => {\n    if (isInitialized && (navigationType === NavigationType.Push || navigationType === NavigationType.Pop)) {\n      const route = getRouteFromLocation(routes, location);\n      const url = globalObject.location?.href;\n\n      api.pushEvent(EVENT_ROUTE_CHANGE, {\n        toRoute: route,\n        toUrl: globalObject.location?.href,\n        ...lastRouteRef.current,\n      });\n\n      lastRouteRef.current = {\n        fromRoute: route,\n        fromUrl: url,\n      };\n    }\n  }, [location, navigationType, routes]);\n\n  const ActualRoutes = props.routesComponent ?? Routes;\n\n  return <ActualRoutes {...props} />;\n}\n"]}

package/dist/cjs/router/v6v7/initialize.js

@@ -9,10 +9,10 @@ exports.initializeReactRouterV6DataRouterInstrumentation = initializeReactRouter
 exports.createReactRouterV6DataOptions = createReactRouterV6DataOptions;
 exports.createReactRouterV7Options = createReactRouterV7Options;
 exports.createReactRouterV7DataOptions = createReactRouterV7DataOptions;
-var hoist_non_react_statics_1 = __importDefault(require("hoist-non-react-statics"));
-var types_1 = require("../types");
-var FaroRoutes_1 = require("./FaroRoutes");
-var routerDependencies_1 = require("./routerDependencies");
+const hoist_non_react_statics_1 = __importDefault(require("hoist-non-react-statics"));
+const types_1 = require("../types");
+const FaroRoutes_1 = require("./FaroRoutes");
+const routerDependencies_1 = require("./routerDependencies");
 function initializeReactRouterV6Instrumentation(dependencies) {
     (0, hoist_non_react_statics_1.default)(FaroRoutes_1.FaroRoutes, dependencies.Routes);
     (0, routerDependencies_1.setReactRouterV6Dependencies)(dependencies);
@@ -20,7 +20,7 @@ function initializeReactRouterV6Instrumentation(dependencies) {
 function createReactRouterV6Options(dependencies) {
     return {
         version: types_1.ReactRouterVersion.V6,
-        dependencies: dependencies,
+        dependencies,
     };
 }
 function initializeReactRouterV6DataRouterInstrumentation(dependencies) {
@@ -29,19 +29,19 @@ function initializeReactRouterV6DataRouterInstrumentation(dependencies) {
 function createReactRouterV6DataOptions(dependencies) {
     return {
         version: types_1.ReactRouterVersion.V6_data_router,
-        dependencies: dependencies,
+        dependencies,
     };
 }
 function createReactRouterV7Options(dependencies) {
     return {
         version: types_1.ReactRouterVersion.V7,
-        dependencies: dependencies,
+        dependencies,
     };
 }
 function createReactRouterV7DataOptions(dependencies) {
     return {
         version: types_1.ReactRouterVersion.V7_data_router,
-        dependencies: dependencies,
+        dependencies,
     };
 }
 //# sourceMappingURL=initialize.js.map

package/dist/cjs/router/v6v7/initialize.js.map

@@ -1 +1 @@
-{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../../src/router/v6v7/initialize.ts"],"names":[],"mappings":";;;;;AAiBA,wFAGC;AAED,gEAKC;AAED,4GAIC;AAED,wEAOC;AAED,gEAKC;AAED,wEAOC;AA1DD,oFAA2D;AAQ3D,kCAA8C;AAE9C,2CAA0C;AAC1C,2DAG8B;AAG9B,SAAgB,sCAAsC,CAAC,YAAuC;IAC5F,IAAA,iCAAoB,EAAC,uBAAU,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACtD,IAAA,iDAA4B,EAAC,YAAY,CAAC,CAAC;AAC7C,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAuC;IAChF,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,EAAE;QAC9B,YAAY,cAAA;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,gDAAgD,CAC9D,YAAiD;IAEjD,IAAA,2DAAsC,EAAC,YAAY,CAAC,CAAC;AACvD,CAAC;AAED,SAAgB,8BAA8B,CAC5C,YAAiD;IAEjD,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,cAAc;QAC1C,YAAY,cAAA;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAuC;IAChF,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,EAAE;QAC9B,YAAY,cAAA;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,8BAA8B,CAC5C,YAAiD;IAEjD,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,cAAc;QAC1C,YAAY,cAAA;KACb,CAAC;AACJ,CAAC","sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\n\nimport type {\n  ReactRouterV6Config,\n  ReactRouterV6DataRouterConfig,\n  ReactRouterV7Config,\n  ReactRouterV7DataRouterConfig,\n} from '../../types';\nimport { ReactRouterVersion } from '../types';\n\nimport { FaroRoutes } from './FaroRoutes';\nimport {\n  setReactRouterV6DataRouterDependencies as setReactRouterV6DataRouterDependencies,\n  setReactRouterV6Dependencies,\n} from './routerDependencies';\nimport type { ReactRouterV6DataRouterDependencies, ReactRouterV6Dependencies } from './types';\n\nexport function initializeReactRouterV6Instrumentation(dependencies: ReactRouterV6Dependencies): void {\n  hoistNonReactStatics(FaroRoutes, dependencies.Routes);\n  setReactRouterV6Dependencies(dependencies);\n}\n\nexport function createReactRouterV6Options(dependencies: ReactRouterV6Dependencies): ReactRouterV6Config {\n  return {\n    version: ReactRouterVersion.V6,\n    dependencies,\n  };\n}\n\nexport function initializeReactRouterV6DataRouterInstrumentation(\n  dependencies: ReactRouterV6DataRouterDependencies\n): void {\n  setReactRouterV6DataRouterDependencies(dependencies);\n}\n\nexport function createReactRouterV6DataOptions(\n  dependencies: ReactRouterV6DataRouterDependencies\n): ReactRouterV6DataRouterConfig {\n  return {\n    version: ReactRouterVersion.V6_data_router,\n    dependencies,\n  };\n}\n\nexport function createReactRouterV7Options(dependencies: ReactRouterV6Dependencies): ReactRouterV7Config {\n  return {\n    version: ReactRouterVersion.V7,\n    dependencies,\n  };\n}\n\nexport function createReactRouterV7DataOptions(\n  dependencies: ReactRouterV6DataRouterDependencies\n): ReactRouterV7DataRouterConfig {\n  return {\n    version: ReactRouterVersion.V7_data_router,\n    dependencies,\n  };\n}\n"]}
+{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../../src/router/v6v7/initialize.ts"],"names":[],"mappings":";;;;;AAiBA,wFAGC;AAED,gEAKC;AAED,4GAIC;AAED,wEAOC;AAED,gEAKC;AAED,wEAOC;AA1DD,sFAA2D;AAQ3D,oCAA8C;AAE9C,6CAA0C;AAC1C,6DAG8B;AAG9B,SAAgB,sCAAsC,CAAC,YAAuC;IAC5F,IAAA,iCAAoB,EAAC,uBAAU,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACtD,IAAA,iDAA4B,EAAC,YAAY,CAAC,CAAC;AAC7C,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAuC;IAChF,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,EAAE;QAC9B,YAAY;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,gDAAgD,CAC9D,YAAiD;IAEjD,IAAA,2DAAsC,EAAC,YAAY,CAAC,CAAC;AACvD,CAAC;AAED,SAAgB,8BAA8B,CAC5C,YAAiD;IAEjD,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,cAAc;QAC1C,YAAY;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAuC;IAChF,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,EAAE;QAC9B,YAAY;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,8BAA8B,CAC5C,YAAiD;IAEjD,OAAO;QACL,OAAO,EAAE,0BAAkB,CAAC,cAAc;QAC1C,YAAY;KACb,CAAC;AACJ,CAAC","sourcesContent":["import hoistNonReactStatics from 'hoist-non-react-statics';\n\nimport type {\n  ReactRouterV6Config,\n  ReactRouterV6DataRouterConfig,\n  ReactRouterV7Config,\n  ReactRouterV7DataRouterConfig,\n} from '../../types';\nimport { ReactRouterVersion } from '../types';\n\nimport { FaroRoutes } from './FaroRoutes';\nimport {\n  setReactRouterV6DataRouterDependencies as setReactRouterV6DataRouterDependencies,\n  setReactRouterV6Dependencies,\n} from './routerDependencies';\nimport type { ReactRouterV6DataRouterDependencies, ReactRouterV6Dependencies } from './types';\n\nexport function initializeReactRouterV6Instrumentation(dependencies: ReactRouterV6Dependencies): void {\n  hoistNonReactStatics(FaroRoutes, dependencies.Routes);\n  setReactRouterV6Dependencies(dependencies);\n}\n\nexport function createReactRouterV6Options(dependencies: ReactRouterV6Dependencies): ReactRouterV6Config {\n  return {\n    version: ReactRouterVersion.V6,\n    dependencies,\n  };\n}\n\nexport function initializeReactRouterV6DataRouterInstrumentation(\n  dependencies: ReactRouterV6DataRouterDependencies\n): void {\n  setReactRouterV6DataRouterDependencies(dependencies);\n}\n\nexport function createReactRouterV6DataOptions(\n  dependencies: ReactRouterV6DataRouterDependencies\n): ReactRouterV6DataRouterConfig {\n  return {\n    version: ReactRouterVersion.V6_data_router,\n    dependencies,\n  };\n}\n\nexport function createReactRouterV7Options(dependencies: ReactRouterV6Dependencies): ReactRouterV7Config {\n  return {\n    version: ReactRouterVersion.V7,\n    dependencies,\n  };\n}\n\nexport function createReactRouterV7DataOptions(\n  dependencies: ReactRouterV6DataRouterDependencies\n): ReactRouterV7DataRouterConfig {\n  return {\n    version: ReactRouterVersion.V7_data_router,\n    dependencies,\n  };\n}\n"]}

package/dist/cjs/router/v6v7/utils.js

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNumberOfUrlSegments = getNumberOfUrlSegments;
 exports.getRouteFromLocation = getRouteFromLocation;
-var routerDependencies_1 = require("./routerDependencies");
+const routerDependencies_1 = require("./routerDependencies");
 function getNumberOfUrlSegments(url) {
-    return url.split(/\\?\//).filter(function (currentSegment) { return currentSegment.length > 0 && currentSegment !== ','; }).length;
+    return url.split(/\\?\//).filter((currentSegment) => currentSegment.length > 0 && currentSegment !== ',').length;
 }
 function getRouteFromLocation(routes, location) {
     if (!routes || routes.length === 0) {
         return location.pathname;
     }
-    var matchedRoutes = (0, routerDependencies_1.matchRoutes)(routes, location);
-    var pathBuilder = '';
+    const matchedRoutes = (0, routerDependencies_1.matchRoutes)(routes, location);
+    let pathBuilder = '';
     if (matchedRoutes) {
-        for (var x = 0; x < matchedRoutes.length; x++) {
-            var branch = matchedRoutes[x];
-            var route = branch.route;
+        for (let x = 0; x < matchedRoutes.length; x++) {
+            const branch = matchedRoutes[x];
+            const route = branch.route;
             if (route) {
                 if (route.index) {
                     return branch.pathname;
                 }
-                var path = route.path;
+                let path = route.path;
                 if (path) {
-                    path = path.startsWith('/') ? path : "/".concat(path);
+                    path = path.startsWith('/') ? path : `/${path}`;
                     pathBuilder += path;
                     if (branch.pathname === location.pathname) {
                         if (getNumberOfUrlSegments(pathBuilder) !== getNumberOfUrlSegments(branch.pathname)) {

package/dist/cjs/router/v6v7/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/router/v6v7/utils.ts"],"names":[],"mappings":";;AAKA,wDAEC;AAED,oDAuCC;AA9CD,2DAAmD;AAGnD,SAAgB,sBAAsB,CAAC,GAAW;IAChD,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,UAAC,cAAc,IAAK,OAAA,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,KAAK,GAAG,EAAnD,CAAmD,CAAC,CAAC,MAAM,CAAC;AACnH,CAAC;AAED,SAAgB,oBAAoB,CAAC,MAAkC,EAAE,QAA6B;IACpG,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3B,CAAC;IAED,IAAM,aAAa,GAAG,IAAA,gCAAW,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEpD,IAAI,WAAW,GAAG,EAAE,CAAC;IAErB,IAAI,aAAa,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,IAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAE,CAAC;YACjC,IAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAE3B,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;oBAChB,OAAO,MAAM,CAAC,QAAQ,CAAC;gBACzB,CAAC;gBAED,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;gBAEtB,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAI,IAAI,CAAE,CAAC;oBAEhD,WAAW,IAAI,IAAI,CAAC;oBAEpB,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;wBAC1C,IAAI,sBAAsB,CAAC,WAAW,CAAC,KAAK,sBAAsB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;4BACpF,OAAO,IAAI,CAAC;wBACd,CAAC;wBAED,OAAO,WAAW,CAAC;oBACrB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC,QAAQ,CAAC;AAC3B,CAAC","sourcesContent":["import type { ReactRouterLocation } from '../types';\n\nimport { matchRoutes } from './routerDependencies';\nimport type { ReactRouterV6RouteObject } from './types';\n\nexport function getNumberOfUrlSegments(url: string): number {\n  return url.split(/\\\\?\\//).filter((currentSegment) => currentSegment.length > 0 && currentSegment !== ',').length;\n}\n\nexport function getRouteFromLocation(routes: ReactRouterV6RouteObject[], location: ReactRouterLocation): string {\n  if (!routes || routes.length === 0) {\n    return location.pathname;\n  }\n\n  const matchedRoutes = matchRoutes(routes, location);\n\n  let pathBuilder = '';\n\n  if (matchedRoutes) {\n    for (let x = 0; x < matchedRoutes.length; x++) {\n      const branch = matchedRoutes[x]!;\n      const route = branch.route;\n\n      if (route) {\n        if (route.index) {\n          return branch.pathname;\n        }\n\n        let path = route.path;\n\n        if (path) {\n          path = path.startsWith('/') ? path : `/${path}`;\n\n          pathBuilder += path;\n\n          if (branch.pathname === location.pathname) {\n            if (getNumberOfUrlSegments(pathBuilder) !== getNumberOfUrlSegments(branch.pathname)) {\n              return path;\n            }\n\n            return pathBuilder;\n          }\n        }\n      }\n    }\n  }\n\n  return location.pathname;\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/router/v6v7/utils.ts"],"names":[],"mappings":";;AAKA,wDAEC;AAED,oDAuCC;AA9CD,6DAAmD;AAGnD,SAAgB,sBAAsB,CAAC,GAAW;IAChD,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC;AACnH,CAAC;AAED,SAAgB,oBAAoB,CAAC,MAAkC,EAAE,QAA6B;IACpG,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3B,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,gCAAW,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEpD,IAAI,WAAW,GAAG,EAAE,CAAC;IAErB,IAAI,aAAa,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAE,CAAC;YACjC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAE3B,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;oBAChB,OAAO,MAAM,CAAC,QAAQ,CAAC;gBACzB,CAAC;gBAED,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;gBAEtB,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;oBAEhD,WAAW,IAAI,IAAI,CAAC;oBAEpB,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;wBAC1C,IAAI,sBAAsB,CAAC,WAAW,CAAC,KAAK,sBAAsB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;4BACpF,OAAO,IAAI,CAAC;wBACd,CAAC;wBAED,OAAO,WAAW,CAAC;oBACrB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC,QAAQ,CAAC;AAC3B,CAAC","sourcesContent":["import type { ReactRouterLocation } from '../types';\n\nimport { matchRoutes } from './routerDependencies';\nimport type { ReactRouterV6RouteObject } from './types';\n\nexport function getNumberOfUrlSegments(url: string): number {\n  return url.split(/\\\\?\\//).filter((currentSegment) => currentSegment.length > 0 && currentSegment !== ',').length;\n}\n\nexport function getRouteFromLocation(routes: ReactRouterV6RouteObject[], location: ReactRouterLocation): string {\n  if (!routes || routes.length === 0) {\n    return location.pathname;\n  }\n\n  const matchedRoutes = matchRoutes(routes, location);\n\n  let pathBuilder = '';\n\n  if (matchedRoutes) {\n    for (let x = 0; x < matchedRoutes.length; x++) {\n      const branch = matchedRoutes[x]!;\n      const route = branch.route;\n\n      if (route) {\n        if (route.index) {\n          return branch.pathname;\n        }\n\n        let path = route.path;\n\n        if (path) {\n          path = path.startsWith('/') ? path : `/${path}`;\n\n          pathBuilder += path;\n\n          if (branch.pathname === location.pathname) {\n            if (getNumberOfUrlSegments(pathBuilder) !== getNumberOfUrlSegments(branch.pathname)) {\n              return path;\n            }\n\n            return pathBuilder;\n          }\n        }\n      }\n    }\n  }\n\n  return location.pathname;\n}\n"]}

package/dist/cjs/router/v6v7/withFaroRouterInstrumentation.js

@@ -1,36 +1,25 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withFaroRouterInstrumentation = withFaroRouterInstrumentation;
-var faro_web_sdk_1 = require("@grafana/faro-web-sdk");
-var dependencies_1 = require("../../dependencies");
-var types_1 = require("../types");
-var routerDependencies_1 = require("./routerDependencies");
-var utils_1 = require("./utils");
+const faro_web_sdk_1 = require("@grafana/faro-web-sdk");
+const dependencies_1 = require("../../dependencies");
+const types_1 = require("../types");
+const routerDependencies_1 = require("./routerDependencies");
+const utils_1 = require("./utils");
 /**
  * To use with React Router 6.4 data APIs.
  */
 function withFaroRouterInstrumentation(router) {
-    var lastRoute = {};
-    router.subscribe(function (state) {
+    let lastRoute = {};
+    router.subscribe((state) => {
         var _a, _b;
-        var navigationType = state.historyAction;
-        var location = state.location;
-        var routes = router.routes;
+        const navigationType = state.historyAction;
+        const location = state.location;
+        const routes = router.routes;
         if (routerDependencies_1.isInitialized && (navigationType === types_1.NavigationType.Push || navigationType === types_1.NavigationType.Pop)) {
-            var route = (0, utils_1.getRouteFromLocation)(routes, location);
-            var url = (_a = faro_web_sdk_1.globalObject.location) === null || _a === void 0 ? void 0 : _a.href;
-            dependencies_1.api.pushEvent(faro_web_sdk_1.EVENT_ROUTE_CHANGE, __assign({ toRoute: route, toUrl: (_b = faro_web_sdk_1.globalObject.location) === null || _b === void 0 ? void 0 : _b.href }, lastRoute));
+            const route = (0, utils_1.getRouteFromLocation)(routes, location);
+            const url = (_a = faro_web_sdk_1.globalObject.location) === null || _a === void 0 ? void 0 : _a.href;
+            dependencies_1.api.pushEvent(faro_web_sdk_1.EVENT_ROUTE_CHANGE, Object.assign({ toRoute: route, toUrl: (_b = faro_web_sdk_1.globalObject.location) === null || _b === void 0 ? void 0 : _b.href }, lastRoute));
             lastRoute = {
                 fromRoute: route,
                 fromUrl: url,

package/dist/cjs/router/v6v7/withFaroRouterInstrumentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"withFaroRouterInstrumentation.js","sourceRoot":"","sources":["../../../../src/router/v6v7/withFaroRouterInstrumentation.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAwBA,sEA0BC;AAlDD,sDAAyE;AAEzE,mDAAyC;AACzC,kCAA0C;AAG1C,2DAAqD;AAErD,iCAA+C;AAa/C;;GAEG;AACH,SAAgB,6BAA6B,CAA4B,MAAS;IAChF,IAAI,SAAS,GAAmC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,CAAC,UAAC,KAAK;;QACrB,IAAM,cAAc,GAAmB,KAAK,CAAC,aAAa,CAAC;QAC3D,IAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,IAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE7B,IAAI,kCAAa,IAAI,CAAC,cAAc,KAAK,sBAAc,CAAC,IAAI,IAAI,cAAc,KAAK,sBAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACvG,IAAM,KAAK,GAAG,IAAA,4BAAoB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACrD,IAAM,GAAG,GAAG,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,CAAC;YAExC,kBAAG,CAAC,SAAS,CAAC,iCAAkB,aAC9B,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,IAC/B,SAAS,EACZ,CAAC;YAEH,SAAS,GAAG;gBACV,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,GAAG;aACb,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { EVENT_ROUTE_CHANGE, globalObject } from '@grafana/faro-web-sdk';\n\nimport { api } from '../../dependencies';\nimport { NavigationType } from '../types';\nimport type { ReactRouterLocation } from '../types';\n\nimport { isInitialized } from './routerDependencies';\nimport type { EventRouteTransitionAttributes, RouteObjectV6DataRouter } from './types';\nimport { getRouteFromLocation } from './utils';\n\ninterface RouterState {\n  historyAction: NavigationType | any;\n  location: ReactRouterLocation;\n}\n\ninterface Router {\n  state: RouterState;\n  routes: RouteObjectV6DataRouter[];\n  subscribe(fn: (state: RouterState) => void): () => void;\n}\n\n/**\n * To use with React Router 6.4 data APIs.\n */\nexport function withFaroRouterInstrumentation<R extends Router = Router>(router: R) {\n  let lastRoute: EventRouteTransitionAttributes = {};\n\n  router.subscribe((state) => {\n    const navigationType: NavigationType = state.historyAction;\n    const location = state.location;\n    const routes = router.routes;\n\n    if (isInitialized && (navigationType === NavigationType.Push || navigationType === NavigationType.Pop)) {\n      const route = getRouteFromLocation(routes, location);\n      const url = globalObject.location?.href;\n\n      api.pushEvent(EVENT_ROUTE_CHANGE, {\n        toRoute: route,\n        toUrl: globalObject.location?.href,\n        ...lastRoute,\n      });\n\n      lastRoute = {\n        fromRoute: route,\n        fromUrl: url,\n      };\n    }\n  });\n\n  return router;\n}\n"]}
+{"version":3,"file":"withFaroRouterInstrumentation.js","sourceRoot":"","sources":["../../../../src/router/v6v7/withFaroRouterInstrumentation.ts"],"names":[],"mappings":";;AAwBA,sEA0BC;AAlDD,wDAAyE;AAEzE,qDAAyC;AACzC,oCAA0C;AAG1C,6DAAqD;AAErD,mCAA+C;AAa/C;;GAEG;AACH,SAAgB,6BAA6B,CAA4B,MAAS;IAChF,IAAI,SAAS,GAAmC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;;QACzB,MAAM,cAAc,GAAmB,KAAK,CAAC,aAAa,CAAC;QAC3D,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE7B,IAAI,kCAAa,IAAI,CAAC,cAAc,KAAK,sBAAc,CAAC,IAAI,IAAI,cAAc,KAAK,sBAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACvG,MAAM,KAAK,GAAG,IAAA,4BAAoB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACrD,MAAM,GAAG,GAAG,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,CAAC;YAExC,kBAAG,CAAC,SAAS,CAAC,iCAAkB,kBAC9B,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,MAAA,2BAAY,CAAC,QAAQ,0CAAE,IAAI,IAC/B,SAAS,EACZ,CAAC;YAEH,SAAS,GAAG;gBACV,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,GAAG;aACb,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { EVENT_ROUTE_CHANGE, globalObject } from '@grafana/faro-web-sdk';\n\nimport { api } from '../../dependencies';\nimport { NavigationType } from '../types';\nimport type { ReactRouterLocation } from '../types';\n\nimport { isInitialized } from './routerDependencies';\nimport type { EventRouteTransitionAttributes, RouteObjectV6DataRouter } from './types';\nimport { getRouteFromLocation } from './utils';\n\ninterface RouterState {\n  historyAction: NavigationType | any;\n  location: ReactRouterLocation;\n}\n\ninterface Router {\n  state: RouterState;\n  routes: RouteObjectV6DataRouter[];\n  subscribe(fn: (state: RouterState) => void): () => void;\n}\n\n/**\n * To use with React Router 6.4 data APIs.\n */\nexport function withFaroRouterInstrumentation<R extends Router = Router>(router: R) {\n  let lastRoute: EventRouteTransitionAttributes = {};\n\n  router.subscribe((state) => {\n    const navigationType: NavigationType = state.historyAction;\n    const location = state.location;\n    const routes = router.routes;\n\n    if (isInitialized && (navigationType === NavigationType.Push || navigationType === NavigationType.Pop)) {\n      const route = getRouteFromLocation(routes, location);\n      const url = globalObject.location?.href;\n\n      api.pushEvent(EVENT_ROUTE_CHANGE, {\n        toRoute: route,\n        toUrl: globalObject.location?.href,\n        ...lastRoute,\n      });\n\n      lastRoute = {\n        fromRoute: route,\n        fromUrl: url,\n      };\n    }\n  });\n\n  return router;\n}\n"]}