@adobe/alloy 2.34.2-beta.0 → 2.34.2-beta.2

package/dist/alloy.js

@@ -7552,10 +7552,10 @@
   governing permissions and limitations under the License.
   */
 
-  // The 2.34.2-beta.0 keyword will be replace at alloy build time with the package.json version.
+  // The 2.34.2-beta.2 keyword will be replace at alloy build time with the package.json version.
   // see babel-plugin-version
 
-  var libraryVersion = "2.34.2-beta.0";
+  var libraryVersion = "2.34.2-beta.2";
 
   /*
   Copyright 2019 Adobe. All rights reserved.
@@ -17030,10 +17030,24 @@
       };
     });
   };
-  const loadScript = (url) => {
+  const loadScript = (source) => {
+    const url = getAttribute(source, SRC);
     const script = document.createElement("script");
-    script.src = url;
+    // Preserve all author-supplied attributes (class, type, data-*, etc.) so
+    // consumers relying on them keep working.
+    const { attributes } = source;
+    for (let i = 0; i < attributes.length; i += 1) {
+      const { name, value } = attributes[i];
+      script.setAttribute(name, value);
+    }
+    // Override invariants last so they can't be clobbered by the source element.
+    const nonce = getNonce();
+    if (nonce) {
+      script.setAttribute("nonce", nonce);
+    }
     script.async = true;
+    // Assign load handlers after copying attributes so a copied inline
+    // onload/onerror attribute can't break load-completion tracking.
     const promise = getPromise(url, script);
     document.head.appendChild(script);
     return promise;
@@ -17076,7 +17090,7 @@
     return result;
   };
 
-  const getRemoteScriptsUrls = (fragment) => {
+  const getRemoteScripts = (fragment) => {
     const scripts = selectNodes(SCRIPT, fragment);
     const result = [];
     const { length } = scripts;
@@ -17084,17 +17098,12 @@
     for (let i = 0; i < length; i += 1) {
       const element = scripts[i];
 
+      // isRemoteScript already requires a non-empty src attribute.
       if (!isRemoteScript(element)) {
         continue;
       }
 
-      const url = getAttribute(element, SRC);
-
-      if (!url) {
-        continue;
-      }
-
-      result.push(url);
+      result.push(element);
     }
 
     return result;
@@ -17107,8 +17116,8 @@
     });
   };
 
-  const executeRemoteScripts = (urls) => {
-    return Promise.all(urls.map(loadScript));
+  const executeRemoteScripts = (scripts) => {
+    return Promise.all(scripts.map(loadScript));
   };
 
   /*
@@ -17129,7 +17138,7 @@
     addNonceToInlineStyleElements(fragment);
     const elements = getChildNodes(fragment);
     const scripts = getInlineScripts(fragment);
-    const scriptsUrls = getRemoteScriptsUrls(fragment);
+    const remoteScripts = getRemoteScripts(fragment);
 
     loadImages(fragment);
 
@@ -17141,7 +17150,7 @@
 
     executeInlineScripts(container, scripts);
 
-    return executeRemoteScripts(scriptsUrls);
+    return executeRemoteScripts(remoteScripts);
   };
 
   /*
@@ -17187,7 +17196,7 @@
     addNonceToInlineStyleElements(fragment);
     const elements = getChildNodes(fragment);
     const scripts = getInlineScripts(fragment);
-    const scriptsUrls = getRemoteScriptsUrls(fragment);
+    const remoteScripts = getRemoteScripts(fragment);
     const { length } = elements;
     let i = length - 1;
 
@@ -17212,7 +17221,7 @@
 
     executeInlineScripts(container, scripts);
 
-    return executeRemoteScripts(scriptsUrls);
+    return executeRemoteScripts(remoteScripts);
   };
 
   /*
@@ -17350,7 +17359,7 @@
     addNonceToInlineStyleElements(fragment);
     const elements = getChildNodes(fragment);
     const scripts = getInlineScripts(fragment);
-    const scriptsUrls = getRemoteScriptsUrls(fragment);
+    const remoteScripts = getRemoteScripts(fragment);
 
     loadImages(fragment);
 
@@ -17361,7 +17370,7 @@
 
     executeInlineScripts(container, scripts);
 
-    return executeRemoteScripts(scriptsUrls);
+    return executeRemoteScripts(remoteScripts);
   };
 
   /*
@@ -17401,7 +17410,7 @@
     addNonceToInlineStyleElements(fragment);
     const elements = getChildNodes(fragment);
     const scripts = getInlineScripts(fragment);
-    const scriptsUrls = getRemoteScriptsUrls(fragment);
+    const remoteScripts = getRemoteScripts(fragment);
 
     loadImages(fragment);
 
@@ -17415,7 +17424,7 @@
 
     executeInlineScripts(container, scripts);
 
-    return executeRemoteScripts(scriptsUrls);
+    return executeRemoteScripts(remoteScripts);
   };
 
   /*
@@ -20865,8 +20874,9 @@
     );
 
     const cacheValue = `${ecid}${serializedPushSubscriptionDetails}`;
+    const storedValue = await storage.getItem(SUBSCRIPTION_DETAILS);
 
-    if (cacheValue === storage.getItem(SUBSCRIPTION_DETAILS)) {
+    if (cacheValue === storedValue) {
       logger.info(
         "Subscription details have not changed. Not sending to the server.",
       );
@@ -20920,17 +20930,16 @@
    *
    * @param {Object} options
    * @param {{ orgId: string, datastreamId: string, edgeDomain: string, edgeBasePath: string, pushNotifications: { vapidPublicKey: string, appId: string, trackingDatasetId: string }}} options.config
-   * @param {StorageCreator} options.createNamespacedStorage
    * @param {EventManager} options.eventManager
    * @param {Logger} options.logger
    * @param {ConsentManager} options.consent
    * @param {IdentityManager} options.identity
    * @param {function(): string} options.getBrowser
    * @param {EdgeRequestExecutor} options.sendEdgeNetworkRequest
+   * @param {PlatformServices} options.platformServices
    * @returns {{ lifecycle: object, commands: { sendPushSubscription: object } }}
    */
   const createPushNotifications = ({
-    createNamespacedStorage,
     eventManager,
     config,
     logger,
@@ -20938,6 +20947,7 @@
     identity,
     getBrowser,
     sendEdgeNetworkRequest,
+    platformServices,
   }) => {
     return {
       lifecycle: {
@@ -20977,7 +20987,7 @@
               },
             } = config || {};
 
-            const storage = createNamespacedStorage(
+            const storage = platformServices.storage.createNamespacedStorage(
               `${sanitizeOrgIdForCookieName(orgId)}.pushNotifications.`,
             );