@inboxsdk/core 2.1.60 → 2.1.62

package/background.js

@@ -3,8 +3,18 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
   if (message.type === 'inboxsdk__injectPageWorld' && sender.tab) {
     if (chrome.scripting) {
       // MV3
+      let documentIds;
+      let frameIds;
+      if (sender.documentId) {
+        // Protect against https://github.com/w3c/webextensions/issues/8 in
+        // browsers (Chrome 106+) that support the documentId property.
+        // Protections for other browsers happen inside the injected script.
+        documentIds = [sender.documentId];
+      } else {
+        frameIds = [sender.frameId];
+      }
       chrome.scripting.executeScript({
-        target: { tabId: sender.tab.id, frameIds: [sender.frameId] },
+        target: { tabId: sender.tab.id, documentIds, frameIds },
         world: 'MAIN',
         files: ['pageWorld.js'],
       });

package/inboxsdk.js

@@ -371,7 +371,7 @@ function isNotNil(value) {
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- SDK_VERSION is injected by webpack
 ///@ts-ignore
-const BUILD_VERSION = "2.1.60-1718718023878-64aa156f6ee5ecb1";
+const BUILD_VERSION = "2.1.62-1721349710708-8510fe512f666f95";
 if (false) {}
 
 /***/ }),
@@ -2646,7 +2646,7 @@ options.insert = htmlElement => {
               htmlElement.setAttribute('data-inboxsdk-version',
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- this is injected by webpack
               ///@ts-ignore
-              "2.1.60-1718718023878-64aa156f6ee5ecb1");
+              "2.1.62-1721349710708-8510fe512f666f95");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -10197,7 +10197,7 @@ options.insert = htmlElement => {
               htmlElement.setAttribute('data-inboxsdk-version',
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- this is injected by webpack
               ///@ts-ignore
-              "2.1.60-1718718023878-64aa156f6ee5ecb1");
+              "2.1.62-1721349710708-8510fe512f666f95");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -10347,17 +10347,35 @@ var sha256 = __webpack_require__(6049);
 var sha256_default = /*#__PURE__*/__webpack_require__.n(sha256);
 // EXTERNAL MODULE: ./src/common/ajax.ts + 1 modules
 var ajax = __webpack_require__(8587);
+// EXTERNAL MODULE: ./node_modules/lodash/once.js
+var once = __webpack_require__(8921);
+var once_default = /*#__PURE__*/__webpack_require__.n(once);
 ;// CONCATENATED MODULE: ./src/common/get-extension-id.ts
-function getExtensionId() {
-  const chrome = __webpack_require__.g.chrome;
-  if (chrome?.runtime?.getURL) {
-    return chrome.runtime.getURL('');
-  }
-  if (chrome?.extension?.getURL) {
-    return chrome.extension.getURL('');
+
+const getExtensionId = once_default()(() => {
+  try {
+    const chrome = globalThis.chrome;
+    if (chrome?.runtime?.getURL) {
+      return chrome.runtime.getURL('');
+    }
+    // MV2
+    if (chrome?.extension?.getURL) {
+      return chrome.extension.getURL('');
+    }
+  } catch (e) {
+    // When an extension is reloaded or removed, then Chrome APIs in any of its
+    // pre-existing content scripts start throwing "Extension context
+    // invalidated" errors. We only use extension IDs for logging, so we
+    // shouldn't treat this as fatal.
+    console.error('Failed to read extension ID:', e);
   }
   return null;
-}
+});
+
+// pre-cache the extension ID so we still know it inside this content script if
+// the extension is reloaded or removed later.
+getExtensionId();
+/* harmony default export */ const get_extension_id = (getExtensionId);
 ;// CONCATENATED MODULE: ./src/common/get-session-id.ts
 function getSessionId() {
   const attrValue = typeof document !== 'undefined' && document.documentElement.getAttribute('data-inboxsdk-session-id');
@@ -10463,19 +10481,16 @@ function logError(err, details, context) {
     // our own current stack just in case.
     const nowStack = getStackTrace();
     const stuffToLog = ['Error logged:', err];
-    if (err && err.stack) {
-      stuffToLog.push('\n\nOriginal error stack:\n' + err.stack);
-    }
-    stuffToLog.push('\n\nError logged from:\n' + nowStack);
     if (details) {
       stuffToLog.push('\n\nError details:', details);
     }
-    stuffToLog.push('\n\nExtension App Ids:', JSON.stringify(appIds, null, 2));
-    stuffToLog.push('\nSent by App:', sentByApp);
-    stuffToLog.push('\nSession Id:', sessionId);
-    stuffToLog.push('\nExtension Id:', getExtensionId());
-    stuffToLog.push('\nInboxSDK Loader Version:', loaderVersion);
-    stuffToLog.push('\nInboxSDK Implementation Version:', implVersion);
+    stuffToLog.push(`\
+\n\nExtension App Ids: ${JSON.stringify(appIds, null, 2)}
+Sent by App: ${sentByApp}
+Session Id: ${sessionId}
+Extension Id: ${get_extension_id()}
+InboxSDK Loader Version: ${loaderVersion}
+InboxSDK Implementation Version: ${implVersion}`);
     console.error(...stuffToLog);
     const report = {
       message: err && err.message || err,
@@ -10486,7 +10501,7 @@ function logError(err, details, context) {
       sentByApp,
       sessionId,
       emailHash: userEmailHash,
-      extensionId: getExtensionId(),
+      extensionId: get_extension_id(),
       loaderVersion: loaderVersion,
       implementationVersion: implVersion,
       origin: document.location.origin,
@@ -11053,7 +11068,7 @@ function _trackEvent(appId, type, eventName, properties) {
   };
   if (type != 'gmail') {
     Object.assign(event, {
-      extensionId: getExtensionId(),
+      extensionId: get_extension_id(),
       appIds: getAppIdsProperty(appId)
     });
   } else {
@@ -14926,7 +14941,7 @@ options.insert = htmlElement => {
               htmlElement.setAttribute('data-inboxsdk-version',
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- this is injected by webpack
               ///@ts-ignore
-              "2.1.60-1718718023878-64aa156f6ee5ecb1");
+              "2.1.62-1721349710708-8510fe512f666f95");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -19655,7 +19670,7 @@ mole_view_module_options.insert = htmlElement => {
               htmlElement.setAttribute('data-inboxsdk-version',
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- this is injected by webpack
               ///@ts-ignore
-              "2.1.60-1718718023878-64aa156f6ee5ecb1");
+              "2.1.62-1721349710708-8510fe512f666f95");
               document.head.append(htmlElement);
             };
 mole_view_module_options.domAPI = (styleDomAPI_default());
@@ -21388,13 +21403,11 @@ class GmailNavItemView {
       };
       const accessoryViewController = new dropdown_button_view_controller/* default */.A(buttonOptions);
       this._accessoryViewController = accessoryViewController;
-      const accessoryEl = (0,querySelectorOrFail/* default */.A)(this._element, '.Yh');
-      const parentNode = accessoryEl.parentNode;
-      if (parentNode) {
-        buttonOptions.buttonView.getElement().classList.add(...accessoryEl.classList);
-        parentNode.replaceChild(buttonOptions.buttonView.getElement(), accessoryEl);
-        this._iconSettings.iconElement = null;
-      }
+      const accessoryEl = (0,querySelectorOrFail/* default */.A)(this._element, '.Yh:not(.inboxsdk__navItem_parent_accessory_button)');
+      buttonOptions.buttonView.getElement().classList.add(...accessoryEl.classList);
+      accessoryEl.style.display = 'none';
+      accessoryEl.parentNode.appendChild(buttonOptions.buttonView.getElement());
+      this._iconSettings.iconElement = null;
       return;
     }
 
@@ -21536,13 +21549,11 @@ class GmailNavItemView {
       // };
 
       this._accessoryViewController = new basic_button_view_controller/* default */.A(buttonOptions);
-      const accessoryEl = (0,querySelectorOrFail/* default */.A)(this._element, '.Yh');
-      const parentNode = accessoryEl.parentNode;
-      if (parentNode) {
-        buttonOptions.buttonView.getElement().classList.add(...accessoryEl.classList);
-        parentNode.replaceChild(buttonOptions.buttonView.getElement(), accessoryEl);
-        this._iconSettings.iconElement = null;
-      }
+      const accessoryEl = (0,querySelectorOrFail/* default */.A)(this._element, '.Yh:not(.inboxsdk__navItem_parent_accessory_button)');
+      buttonOptions.buttonView.getElement().classList.add(...accessoryEl.classList);
+      accessoryEl.style.display = 'none';
+      accessoryEl.parentNode.appendChild(buttonOptions.buttonView.getElement());
+      this._iconSettings.iconElement = null;
       return;
     }
 
@@ -21819,7 +21830,11 @@ class GmailNavItemView {
     if (this._type === type) {
       return;
     }
-    const nameElement = this._element.querySelector('.inboxsdk__navItem_name');
+    let nameElement = this._element.querySelector('.inboxsdk__navItem_name');
+    if (nameElement && nameElement.closest('.inboxsdk__navItem') !== this._element) {
+      // ignore the name element if it belongs to a child nav item
+      nameElement = null;
+    }
     switch (type) {
       case nav_item_types.GROUPER:
       case nav_item_types.NAVIGATION: