@codecademy/tracking 1.0.26-alpha.0a3a8b2ca8.0 → 1.0.26-alpha.1f6ff1576e.0

package/dist/events/track.js

@@ -11,17 +11,13 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { getClientType } from '../integrations/device';
 const browserSupportsKeepalive = () => 'keepalive' in window.Request.prototype;
-const extendURLAsString = (base, pathsAndArgs) => {
-  // Trim slashes and add them back to ensure flexible input
-  base = base.replace(/\/$/, '');
-  pathsAndArgs = pathsAndArgs.replace(/\/$/, '').replace(/^\//, '');
-  return new URL(base + '/' + pathsAndArgs).toString();
-};
 export const createTracker = _ref => {
   let apiBaseUrl = _ref.apiBaseUrl,
     verbose = _ref.verbose;
   const beacon = (endpoint, data) => {
-    const uri = extendURLAsString(apiBaseUrl, endpoint);
+    const _URL = new URL(apiBaseUrl),
+      origin = _URL.origin;
+    const uri = new URL(endpoint, origin).toString();
     const form = new FormData();
     for (const _ref2 of Object.entries(data)) {
       var _ref3 = _slicedToArray(_ref2, 2);
@@ -50,7 +46,9 @@ export const createTracker = _ref => {
     }));
   };
   const serverSideBeacon = (endpoint, data) => {
-    const uri = extendURLAsString(apiBaseUrl, endpoint);
+    const _URL2 = new URL(apiBaseUrl),
+      origin = _URL2.origin;
+    const uri = new URL(endpoint, origin).toString();
     const form = new URLSearchParams();
     for (const _ref4 of Object.entries(data)) {
       var _ref5 = _slicedToArray(_ref4, 2);
@@ -84,17 +82,22 @@ export const createTracker = _ref => {
       });
       console.groupEnd();
     }
+
+    // Use /analytics path if path is not already specified in apiBaseUrl
+    const _URL3 = new URL(apiBaseUrl),
+      pathname = _URL3.pathname;
+    const basePath = pathname === '/' ? '/analytics' : pathname;
     if (typeof window !== 'undefined') {
       // This allows the UTM query params to get registered in the user session.
       const queryParams = window.location.search;
-      beacon("/".concat(category).concat(queryParams), {
+      beacon("".concat(basePath, "/").concat(category).concat(queryParams), {
         category,
         event,
         properties: JSON.stringify(properties),
         gdpr_safe: "".concat(options.gdprSafe)
       });
     } else {
-      serverSideBeacon("/".concat(category), {
+      serverSideBeacon("".concat(basePath, "/").concat(category), {
         category,
         event,
         properties: JSON.stringify(properties)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codecademy/tracking",
   "description": "Tracking library for Codecademy",
-  "version": "1.0.26-alpha.0a3a8b2ca8.0",
+  "version": "1.0.26-alpha.1f6ff1576e.0",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "files": [
     "dist/**"
@@ -13,5 +13,5 @@
     "access": "public"
   },
   "repository": "git@github.com:codecademy-engineering/mono.git",
-  "gitHead": "c7197d0e94d0545ffce83dd69d0c04399596cfea"
+  "gitHead": "6d7621abdb0a4bda78b64746cf2ca1cf94c08b52"
 }