@newrelic/browser-agent 1.234.0 → 1.235.0

package/README.md

@@ -6,7 +6,7 @@ The New Relic browser agent instruments your web application or site and provide
 
 - The instructions on this page pertain to installing the browser agent as an NPM package.
 
-- The browser agent is also generally available as a copy-paste JavaScript snippet and via auto-injection by backend apps. See *[Install the browser agent](https://docs.newrelic.com/docs/browser/browser-monitoring/installation/install-browser-monitoring-agent/)* for info on these alternatives.
+- The browser agent is also generally available as a copy-paste JavaScript snippet and via auto-injection by backend apps. See *[Install the browser agent](https://docs.newrelic.com/docs/browser/browser-monitoring/installation/install-browser-monitoring-agent/)* for info on these alternatives. Releases are deployed to customers gradually, so the version available via these other methods often lags the current release of this package.
 
 - For questions and feedback on this package, please visit the [Explorer's Hub](https://forum.newrelic.com/s/), New Relic's community support forum.
 

package/dist/cjs/common/constants/env.cdn.js

@@ -12,7 +12,7 @@ exports.VERSION = exports.DIST_METHOD = exports.BUILD_ENV = void 0;
 /**
  * Exposes the version of the agent
  */
-const VERSION = "1.234.0";
+const VERSION = "1.235.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/env.npm.js

@@ -12,7 +12,7 @@ exports.VERSION = exports.DIST_METHOD = exports.BUILD_ENV = void 0;
 /**
  * Exposes the version of the agent
  */
-const VERSION = "1.234.0";
+const VERSION = "1.235.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/shared-channel.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sharedChannel = void 0;
+/**
+ * @file Keeps an object alive that is passed to all feature aggregate modules.
+ * The purpose is to have a way for communication and signals to relay across features at runtime.
+ * This object can hold any arbitrary values and should be treated as on-the-fly dynamic.
+ */
+
+let onReplayReady;
+const sessionReplayInitialized = new Promise(resolve => onReplayReady = resolve);
+const sharedChannel = Object.freeze({
+  onReplayReady,
+  sessionReplayInitialized
+});
+exports.sharedChannel = sharedChannel;

package/dist/cjs/common/harvest/harvest-scheduler.js

@@ -9,6 +9,7 @@ var _sharedContext = require("../context/shared-context");
 var _harvest = require("./harvest");
 var _eol = require("../unload/eol");
 var _config = require("../config/config");
+var _sessionEntity = require("../session/session-entity");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -42,9 +43,18 @@ class HarvestScheduler extends _sharedContext.SharedContext {
     // unload if EOL mechanism fires
     (0, _eol.subscribeToEOL)(this.unload.bind(this), (0, _config.getConfigurationValue)(this.sharedContext.agentIdentifier, 'allow_bfcache')); // TO DO: remove feature flag after rls stable
 
-    // unload if session resets
-    this.sharedContext?.ee.on('session-reset', this.unload.bind(this));
+    /* Flush all buffered data if session resets and give up retries. This should be synchronous to ensure that the correct `session` value is sent.
+      Since session-reset generates a new session ID and the ID is grabbed at send-time, any delays or retries would cause the payload to be sent under
+      the wrong session ID. */
+    this.sharedContext?.ee.on(_sessionEntity.SESSION_EVENTS.RESET, () => this.runHarvest({
+      forceNoRetry: true
+    }));
   }
+
+  /**
+   * This function is only meant for the last outgoing harvest cycle of a page. It trickles down to using sendBeacon, which should not be used
+   * to send payloads while the page is still active, due to limitations on how much data can be buffered in the API at any one time.
+   */
   unload() {
     if (this.aborted) return;
     // If opts.onUnload is defined, these are special actions to execute before attempting to send the final payload.
@@ -116,7 +126,7 @@ class HarvestScheduler extends _sharedContext.SharedContext {
         payload,
         opts,
         submitMethod,
-        cbFinished: onHarvestFinished,
+        cbFinished: cbRanAfterSend,
         customUrl: this.opts.customUrl,
         raw: this.opts.raw
       });
@@ -125,8 +135,14 @@ class HarvestScheduler extends _sharedContext.SharedContext {
       this.scheduleHarvest();
     }
     return;
-    function onHarvestFinished(result) {
-      if (result.blocked) scheduler.onHarvestBlocked(opts, result);else scheduler.onHarvestFinished(opts, result);
+
+    /**
+     * This is executed immediately after harvest sends the data via XHR, or if there's nothing to send. Note that this excludes on unloading / sendBeacon.
+     * @param {Object} result
+     */
+    function cbRanAfterSend(result) {
+      if (opts?.forceNoRetry) result.retry = false; // discard unsent data rather than re-queuing for next harvest attempt
+      scheduler.onHarvestFinished(opts, result);
     }
   }
   onHarvestFinished(opts, result) {

package/dist/cjs/common/session/{session-entity.test.js → session-entity.component-test.js}

@@ -1,12 +1,38 @@
 "use strict";
 
-var _localMemory = require("../storage/local-memory");
-var _localStorage = require("../storage/local-storage");
 var _constants = require("./constants");
 var _sessionEntity = require("./session-entity");
 const agentIdentifier = 'test_agent_identifier';
 const key = 'test_key';
 const value = 'test_value';
+class LocalMemory {
+  constructor() {
+    let initialState = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    this.state = initialState;
+  }
+  get(key) {
+    try {
+      return this.state[key];
+    } catch (err) {
+      return '';
+    }
+  }
+  set(key, value) {
+    try {
+      if (value === undefined || value === null) return this.remove(key);
+      this.state[key] = value;
+    } catch (err) {
+      return;
+    }
+  }
+  remove(key) {
+    try {
+      delete this.state[key];
+    } catch (err) {
+      return;
+    }
+  }
+}
 jest.mock('../timer/timer');
 jest.mock('../timer/interaction-timer');
 jest.useFakeTimers();
@@ -20,9 +46,11 @@ jest.mock('../util/global-scope', () => ({
     return global.window;
   }
 }));
+let storage;
 beforeEach(() => {
   jest.restoreAllMocks();
   mockBrowserScope.mockReturnValue(true);
+  storage = new LocalMemory();
 });
 describe('constructor', () => {
   test('must use required fields', () => {
@@ -33,7 +61,8 @@ describe('constructor', () => {
   test('top-level properties are set and exposed', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
-      key
+      key,
+      storage
     });
     expect(session).toMatchObject({
       agentIdentifier: expect.any(String),
@@ -49,14 +78,15 @@ describe('constructor', () => {
         expiresAt: expect.any(Number),
         inactiveAt: expect.any(Number),
         sessionReplay: expect.any(Number),
-        sessionTraceActive: expect.any(Boolean)
+        sessionTraceMode: expect.any(Number)
       })
     });
   });
   test('can use sane defaults', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
-      key
+      key,
+      storage
     });
     expect(session.state).toEqual(expect.objectContaining({
       value: expect.any(String),
@@ -64,24 +94,16 @@ describe('constructor', () => {
       inactiveAt: expect.any(Number),
       updatedAt: expect.any(Number),
       sessionReplay: expect.any(Number),
-      sessionTraceActive: expect.any(Boolean)
+      sessionTraceMode: expect.any(Number)
     }));
   });
-  test('Workers are forced to use local memory', () => {
-    mockBrowserScope.mockReturnValueOnce(false);
-    const session = new _sessionEntity.SessionEntity({
-      agentIdentifier,
-      key,
-      storageAPI: new _localStorage.LocalStorage()
-    });
-    expect(session.storage instanceof _localMemory.LocalMemory).toEqual(true);
-  });
   test('expiresAt is the correct future timestamp - new session', () => {
     const now = Date.now();
     jest.setSystemTime(now);
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       expiresMs: 100
     });
     expect(session.state.expiresAt).toEqual(now + 100);
@@ -89,14 +111,14 @@ describe('constructor', () => {
   test('expiresAt is the correct future timestamp - existing session', () => {
     const now = Date.now();
     jest.setSystemTime(now);
-    const existingData = new _localMemory.LocalMemory({
+    const existingData = new LocalMemory({
       ["".concat(_constants.PREFIX, "_").concat(key)]: {
         value,
         expiresAt: now + 5000,
         inactiveAt: Infinity,
         updatedAt: now,
         sessionReplay: 0,
-        sessionTraceActive: false,
+        sessionTraceMode: 0,
         custom: {}
       }
     });
@@ -104,7 +126,7 @@ describe('constructor', () => {
       agentIdentifier,
       key,
       expiresMs: 100,
-      storageAPI: existingData
+      storage: existingData
     });
     expect(session.state.expiresAt).toEqual(now + 5000);
   });
@@ -112,6 +134,7 @@ describe('constructor', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       expiresMs: 0
     });
     expect(session.state.expiresAt).toEqual(Infinity);
@@ -122,6 +145,7 @@ describe('constructor', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       inactiveMs: 100
     });
     expect(session.state.inactiveAt).toEqual(now + 100);
@@ -129,14 +153,14 @@ describe('constructor', () => {
   test('inactiveAt is the correct future timestamp - existing session', () => {
     const now = Date.now();
     jest.setSystemTime(now);
-    const existingData = new _localMemory.LocalMemory({
+    const existingData = new LocalMemory({
       ["".concat(_constants.PREFIX, "_").concat(key)]: {
         value,
         inactiveAt: now + 5000,
         expiresAt: Infinity,
         updatedAt: now,
         sessionReplay: 0,
-        sessionTraceActive: false,
+        sessionTraceMode: 0,
         custom: {}
       }
     });
@@ -144,7 +168,7 @@ describe('constructor', () => {
       agentIdentifier,
       key,
       inactiveMs: 100,
-      storageAPI: existingData
+      storage: existingData
     });
     expect(session.state.inactiveAt).toEqual(now + 5000);
   });
@@ -152,6 +176,7 @@ describe('constructor', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       inactiveMs: 0
     });
     expect(session.state.inactiveAt).toEqual(Infinity);
@@ -160,17 +185,18 @@ describe('constructor', () => {
     const newSession = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       expiresMs: 10
     });
     expect(newSession.isNew).toBeTruthy();
-    const storageAPI = new _localMemory.LocalMemory({
+    const newStorage = new LocalMemory({
       ["".concat(_constants.PREFIX, "_").concat(key)]: {
         value,
         expiresAt: Infinity,
         inactiveAt: Infinity,
         updatedAt: Date.now(),
         sessionReplay: 0,
-        sessionTraceActive: false,
+        sessionTraceMode: 0,
         custom: {}
       }
     });
@@ -178,13 +204,13 @@ describe('constructor', () => {
       agentIdentifier,
       key,
       expiresMs: 10,
-      storageAPI
+      storage: newStorage
     });
     expect(existingSession.isNew).toBeFalsy();
   });
   test('invalid stored values sets new defaults', () => {
     // missing required fields
-    const storageAPI = new _localMemory.LocalMemory({
+    const storage = new LocalMemory({
       ["".concat(_constants.PREFIX, "_").concat(key)]: {
         invalid_fields: true
       }
@@ -192,7 +218,7 @@ describe('constructor', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
-      storageAPI
+      storage
     });
     expect(session.state).toEqual(expect.objectContaining({
       value: expect.any(String),
@@ -200,13 +226,13 @@ describe('constructor', () => {
       inactiveAt: expect.any(Number),
       updatedAt: expect.any(Number),
       sessionReplay: expect.any(Number),
-      sessionTraceActive: expect.any(Boolean)
+      sessionTraceMode: expect.any(Number)
     }));
   });
   test('expired expiresAt value in storage sets new defaults', () => {
     const now = Date.now();
     jest.setSystemTime(now);
-    const storageAPI = new _localMemory.LocalMemory({
+    const storage = new LocalMemory({
       ["".concat(_constants.PREFIX, "_").concat(key)]: {
         value,
         expiresAt: now - 100,
@@ -216,7 +242,7 @@ describe('constructor', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
-      storageAPI
+      storage
     });
     expect(session.state).toEqual(expect.objectContaining({
       value: expect.any(String),
@@ -224,13 +250,13 @@ describe('constructor', () => {
       inactiveAt: expect.any(Number),
       updatedAt: expect.any(Number),
       sessionReplay: expect.any(Number),
-      sessionTraceActive: expect.any(Boolean)
+      sessionTraceMode: expect.any(Number)
     }));
   });
   test('expired inactiveAt value in storage sets new defaults', () => {
     const now = Date.now();
     jest.setSystemTime(now);
-    const storageAPI = new _localMemory.LocalMemory({
+    const storage = new LocalMemory({
       ["".concat(_constants.PREFIX, "_").concat(key)]: {
         value,
         inactiveAt: now - 100,
@@ -240,7 +266,7 @@ describe('constructor', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
-      storageAPI
+      storage
     });
     expect(session.state).toEqual(expect.objectContaining({
       value: expect.any(String),
@@ -248,7 +274,7 @@ describe('constructor', () => {
       inactiveAt: expect.any(Number),
       updatedAt: expect.any(Number),
       sessionReplay: expect.any(Number),
-      sessionTraceActive: expect.any(Boolean)
+      sessionTraceMode: expect.any(Number)
     }));
   });
 });
@@ -259,6 +285,7 @@ describe('reset()', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       expiresMs: 10
     });
     const sessionVal = session.value;
@@ -273,6 +300,7 @@ describe('reset()', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       expiresMs: 10
     });
     session.syncCustomAttribute('test', 123);
@@ -290,6 +318,7 @@ describe('read()', () => {
     const newSession = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       expiresMs: 10
     });
     expect(newSession.isNew).toBeTruthy();
@@ -298,25 +327,25 @@ describe('read()', () => {
       expiresAt: expect.any(Number),
       inactiveAt: expect.any(Number),
       sessionReplay: expect.any(Number),
-      sessionTraceActive: expect.any(Boolean)
+      sessionTraceMode: expect.any(Number)
     }));
   });
   test('"pre-existing" sessions get data from read()', () => {
-    const storageAPI = new _localMemory.LocalMemory({
+    const storage = new LocalMemory({
       ["".concat(_constants.PREFIX, "_").concat(key)]: {
         value,
         expiresAt: Infinity,
         inactiveAt: Infinity,
         updatedAt: Date.now(),
         sessionReplay: 0,
-        sessionTraceActive: false,
+        sessionTraceMode: 0,
         custom: {}
       }
     });
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
-      storageAPI
+      storage
     });
     expect(session.isNew).toBeFalsy();
     expect(session.read()).toEqual(expect.objectContaining({
@@ -330,7 +359,8 @@ describe('write()', () => {
   test('write() sets data to top-level wrapper', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
-      key
+      key,
+      storage
     });
     expect(session.state.value).not.toEqual(value);
     expect(session.state.expiresAt).not.toEqual(Infinity);
@@ -350,7 +380,8 @@ describe('write()', () => {
     jest.setSystemTime(now);
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
-      key
+      key,
+      storage
     });
     session.write({
       ...session.state,
@@ -366,7 +397,8 @@ describe('write()', () => {
   test('write() does not run with invalid data', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
-      key
+      key,
+      storage
     });
     let out = session.write();
     expect(out).toEqual(undefined);
@@ -387,6 +419,7 @@ describe('refresh()', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       inactiveMs: 100
     });
     expect(session.state.inactiveAt).toEqual(now + 100);
@@ -400,6 +433,7 @@ describe('refresh()', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       value
     });
     expect(session.state.value).toEqual(value);
@@ -416,6 +450,7 @@ describe('refresh()', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
       key,
+      storage,
       value
     });
     expect(session.state.value).toEqual(value);
@@ -431,7 +466,8 @@ describe('syncCustomAttribute()', () => {
   test('Custom data can be managed by session entity', () => {
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
-      key
+      key,
+      storage
     });
 
     // if custom has never been set, and a "delete" action is triggered, do nothing
@@ -452,7 +488,8 @@ describe('syncCustomAttribute()', () => {
     mockBrowserScope.mockReturnValue(false);
     const session = new _sessionEntity.SessionEntity({
       agentIdentifier,
-      key
+      key,
+      storage
     });
     session.syncCustomAttribute('test', 1);
     expect(session.read().custom?.test).toEqual(undefined);

package/dist/cjs/common/session/session-entity.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SessionEntity = exports.SESSION_EVENTS = void 0;
+exports.SessionEntity = exports.SESSION_EVENTS = exports.MODE = void 0;
 var _uniqueId = require("../ids/unique-id");
 var _console = require("../util/console");
 var _stringify = require("../util/stringify");
@@ -11,22 +11,27 @@ var _contextualEe = require("../event-emitter/contextual-ee");
 var _timer = require("../timer/timer");
 var _globalScope = require("../util/global-scope");
 var _constants = require("./constants");
-var _localMemory = require("../storage/local-memory");
 var _interactionTimer = require("../timer/interaction-timer");
 var _wrap = require("../wrap");
 var _configurable = require("../config/state/configurable");
 var _handle = require("../event-emitter/handle");
 var _constants2 = require("../../features/metrics/constants");
 var _features = require("../../loaders/features/features");
+const MODE = {
+  OFF: 0,
+  FULL: 1,
+  ERROR: 2
+};
 // this is what can be stored in local storage (not enforced but probably should be)
 // these values should sync between local storage and the parent class props
+exports.MODE = MODE;
 const model = {
   value: '',
   inactiveAt: 0,
   expiresAt: 0,
   updatedAt: Date.now(),
-  sessionReplay: 0,
-  sessionTraceActive: false,
+  sessionReplay: MODE.OFF,
+  sessionTraceMode: MODE.OFF,
   custom: {}
 };
 const SESSION_EVENTS = {
@@ -49,16 +54,19 @@ class SessionEntity {
     let {
       agentIdentifier,
       key,
+      storage,
       value = (0, _uniqueId.generateRandomHexString)(16),
       expiresMs = _constants.DEFAULT_EXPIRES_MS,
-      inactiveMs = _constants.DEFAULT_INACTIVE_MS,
-      storageAPI = new _localMemory.LocalMemory()
+      inactiveMs = _constants.DEFAULT_INACTIVE_MS
     } = _ref;
-    if (!agentIdentifier || !key) throw new Error('Missing Required Fields');
-    if (!_globalScope.isBrowserScope) this.storage = new _localMemory.LocalMemory();else this.storage = storageAPI;
+    if (!agentIdentifier || !key || !storage) {
+      throw new Error("Missing required field(s):".concat(!agentIdentifier ? ' agentID' : '').concat(!key ? ' key' : '').concat(!storage ? ' storage' : ''));
+    }
+    this.agentIdentifier = agentIdentifier;
+    this.storage = storage;
     this.state = {};
     this.sync(model);
-    this.agentIdentifier = agentIdentifier;
+
     // key is intended to act as the k=v pair
     this.key = key;
     // value is intended to act as the primary value of the k=v pair
@@ -185,7 +193,7 @@ class SessionEntity {
       this.sync(data); // update the parent class "state" properties with the local storage values
       //
       // TODO - compression would need happen here if we decide to do it
-      this.storage.set(this.lookupKey, (0, _stringify.stringify)(data));
+      this.storage.set(this.lookupKey, (0, _stringify.stringify)(this.state));
       return data;
     } catch (e) {
       // storage is inaccessible
@@ -207,7 +215,7 @@ class SessionEntity {
       this.setup({
         agentIdentifier: this.agentIdentifier,
         key: this.key,
-        storageAPI: this.storage,
+        storage: this.storage,
         expiresMs: this.expiresMs,
         inactiveMs: this.inactiveMs
       });

package/dist/cjs/common/timer/interaction-timer.js

@@ -49,8 +49,8 @@ class InteractionTimer extends _timer.Timer {
         if (state === 'hidden') this.pause();
         // vis change --> visible is treated like a new interaction with the page
         else {
-          this.onResume();
           this.refresh();
+          this.onResume(); // emit resume event after state updated
         }
       }, false, false, this.abortController?.signal);
     }

package/dist/cjs/common/url/canonicalize-url.test.js

@@ -1,42 +1,38 @@
 "use strict";
 
+var _faker = require("@faker-js/faker");
+var globalScopeModule = _interopRequireWildcard(require("../util/global-scope"));
+var cleanUrlModule = _interopRequireWildcard(require("./clean-url"));
+var _canonicalizeUrl = require("./canonicalize-url");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+jest.mock('../util/global-scope');
+jest.mock('./clean-url');
+beforeEach(() => {
+  jest.spyOn(cleanUrlModule, 'cleanURL').mockImplementation(input => input);
+  jest.replaceProperty(globalScopeModule, 'initialLocation', _faker.faker.internet.url());
+});
 afterEach(() => {
-  jest.resetModules();
+  jest.resetAllMocks();
 });
 test.each([null, undefined, 34])('returns empty string when url argument is %s', async url => {
-  const {
-    canonicalizeUrl
-  } = await Promise.resolve().then(() => _interopRequireWildcard(require('./canonicalize-url')));
-  expect(canonicalizeUrl(url)).toEqual('');
+  expect((0, _canonicalizeUrl.canonicalizeUrl)(url)).toEqual('');
+});
+test('uses cleanURL to clean the input and initial location URLs', () => {
+  const url = _faker.faker.internet.url();
+  (0, _canonicalizeUrl.canonicalizeUrl)(url);
+  expect(cleanUrlModule.cleanURL).toHaveBeenCalledWith(globalScopeModule.initialLocation);
+  expect(cleanUrlModule.cleanURL).toHaveBeenCalledWith(url);
+  expect(cleanUrlModule.cleanURL).toHaveBeenCalledTimes(2);
 });
-test('strips URLs of query strings and fragments', async () => {
-  jest.doMock('../util/global-scope', () => ({
-    initialLocation: 'http://different-domain.com/'
-  }));
-  const {
-    canonicalizeUrl
-  } = await Promise.resolve().then(() => _interopRequireWildcard(require('./canonicalize-url')));
-  expect(canonicalizeUrl('http://example.com/path?query=string#fragment')).toBe('http://example.com/path');
-  expect(canonicalizeUrl('https://www.example.com/path/to/file.html?param=value')).toBe('https://www.example.com/path/to/file.html');
-  expect(canonicalizeUrl('https://www.example.com/?param=value#fragment')).toBe('https://www.example.com/');
+test('returns <inline> when input and initial page urls are the same', async () => {
+  expect((0, _canonicalizeUrl.canonicalizeUrl)(globalScopeModule.initialLocation)).toEqual('<inline>');
 });
-test('returns <inline> when matching the page URL of the loader', async () => {
-  jest.doMock('../util/global-scope', () => ({
-    initialLocation: 'http://example.com/'
-  }));
-  const {
-    canonicalizeUrl
-  } = await Promise.resolve().then(() => _interopRequireWildcard(require('./canonicalize-url')));
-  expect(canonicalizeUrl('http://example.com/')).toEqual('<inline>');
+test('returns input url when it does not match initial page url', async () => {
+  const url = _faker.faker.internet.url();
+  expect((0, _canonicalizeUrl.canonicalizeUrl)(url)).toEqual(url);
 });
 test('does not identify sub-paths of the loader origin as <inline>', async () => {
-  jest.doMock('../util/global-scope', () => ({
-    initialLocation: 'http://example.com/'
-  }));
-  const {
-    canonicalizeUrl
-  } = await Promise.resolve().then(() => _interopRequireWildcard(require('./canonicalize-url')));
-  expect(canonicalizeUrl('http://example.com/path/to/script.js')).not.toEqual('<inline>');
+  const url = globalScopeModule.initialLocation + '/path/to/script.js';
+  expect((0, _canonicalizeUrl.canonicalizeUrl)(url)).not.toEqual('<inline>');
 });