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

package/dist/types/browser/src/components/Personalization/dom-actions/scripts.d.ts

@@ -1,5 +1,5 @@
 export function is(element: any, tagName: any): boolean;
 export function getInlineScripts(fragment: any): any[];
-export function getRemoteScriptsUrls(fragment: any): any[];
+export function getRemoteScripts(fragment: any): any[];
 export function executeInlineScripts(parent: any, scripts: any): void;
-export function executeRemoteScripts(urls: any): Promise<any[]>;
+export function executeRemoteScripts(scripts: any): Promise<any[]>;

package/dist/types/browser/src/components/PushNotifications/index.d.ts

@@ -4,16 +4,16 @@ export default createPushNotifications;
  *
  * @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 } }}
  */
-declare function createPushNotifications({ createNamespacedStorage, eventManager, config, logger, consent, identity, getBrowser, sendEdgeNetworkRequest, }: {
+declare function createPushNotifications({ eventManager, config, logger, consent, identity, getBrowser, sendEdgeNetworkRequest, platformServices, }: {
     config: {
         orgId: string;
         datastreamId: string;
@@ -25,13 +25,13 @@ declare function createPushNotifications({ createNamespacedStorage, eventManager
             trackingDatasetId: string;
         };
     };
-    createNamespacedStorage: StorageCreator;
     eventManager: EventManager;
     logger: Logger;
     consent: ConsentManager;
     identity: IdentityManager;
     getBrowser: () => string;
     sendEdgeNetworkRequest: EdgeRequestExecutor;
+    platformServices: PlatformServices;
 }): {
     lifecycle: object;
     commands: {
@@ -42,9 +42,9 @@ declare namespace createPushNotifications {
     let namespace: string;
     let configValidators: Function;
 }
-import type { StorageCreator } from '@adobe/alloy-core/utils/types.js';
 import type { EventManager } from '@adobe/alloy-core/core/types.js';
 import type { Logger } from '@adobe/alloy-core/core/types.js';
 import type { ConsentManager } from '@adobe/alloy-core/core/consent/types.js';
 import type { IdentityManager } from '@adobe/alloy-core/core/identity/types.js';
 import type { EdgeRequestExecutor } from '@adobe/alloy-core/core/edgeNetwork/types.js';
+import type { PlatformServices } from '@adobe/alloy-core/services';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.34.2-beta.0",
+  "version": "2.34.2-beta.2",
   "description": "Adobe Experience Platform Web SDK",
   "type": "module",
   "repository": {

package/src/components/Personalization/dom-actions/appendHtml.js

@@ -18,7 +18,7 @@ import {
   executeInlineScripts,
   executeRemoteScripts,
   getInlineScripts,
-  getRemoteScriptsUrls,
+  getRemoteScripts,
 } from "./scripts.js";
 
 export default (container, html, decorateProposition) => {
@@ -26,7 +26,7 @@ export default (container, html, decorateProposition) => {
   addNonceToInlineStyleElements(fragment);
   const elements = getChildNodes(fragment);
   const scripts = getInlineScripts(fragment);
-  const scriptsUrls = getRemoteScriptsUrls(fragment);
+  const remoteScripts = getRemoteScripts(fragment);
 
   loadImages(fragment);
 
@@ -38,5 +38,5 @@ export default (container, html, decorateProposition) => {
 
   executeInlineScripts(container, scripts);
 
-  return executeRemoteScripts(scriptsUrls);
+  return executeRemoteScripts(remoteScripts);
 };

package/src/components/Personalization/dom-actions/insertHtmlAfter.js

@@ -15,7 +15,7 @@ import { loadImages } from "./images.js";
 import addNonceToInlineStyleElements from "./addNonceToInlineStyleElements.js";
 import {
   getInlineScripts,
-  getRemoteScriptsUrls,
+  getRemoteScripts,
   executeInlineScripts,
   executeRemoteScripts,
 } from "./scripts.js";
@@ -25,7 +25,7 @@ export default (container, html, decorateProposition) => {
   addNonceToInlineStyleElements(fragment);
   const elements = getChildNodes(fragment);
   const scripts = getInlineScripts(fragment);
-  const scriptsUrls = getRemoteScriptsUrls(fragment);
+  const remoteScripts = getRemoteScripts(fragment);
 
   loadImages(fragment);
 
@@ -39,5 +39,5 @@ export default (container, html, decorateProposition) => {
 
   executeInlineScripts(container, scripts);
 
-  return executeRemoteScripts(scriptsUrls);
+  return executeRemoteScripts(remoteScripts);
 };

package/src/components/Personalization/dom-actions/insertHtmlBefore.js

@@ -17,7 +17,7 @@ import {
   executeInlineScripts,
   executeRemoteScripts,
   getInlineScripts,
-  getRemoteScriptsUrls,
+  getRemoteScripts,
 } from "./scripts.js";
 
 export default (container, html, decorateProposition) => {
@@ -25,7 +25,7 @@ export default (container, html, decorateProposition) => {
   addNonceToInlineStyleElements(fragment);
   const elements = getChildNodes(fragment);
   const scripts = getInlineScripts(fragment);
-  const scriptsUrls = getRemoteScriptsUrls(fragment);
+  const remoteScripts = getRemoteScripts(fragment);
 
   loadImages(fragment);
 
@@ -36,5 +36,5 @@ export default (container, html, decorateProposition) => {
 
   executeInlineScripts(container, scripts);
 
-  return executeRemoteScripts(scriptsUrls);
+  return executeRemoteScripts(remoteScripts);
 };

package/src/components/Personalization/dom-actions/prependHtml.js

@@ -23,7 +23,7 @@ import {
   executeInlineScripts,
   executeRemoteScripts,
   getInlineScripts,
-  getRemoteScriptsUrls,
+  getRemoteScripts,
 } from "./scripts.js";
 
 export default (container, html, decorateProposition) => {
@@ -31,7 +31,7 @@ export default (container, html, decorateProposition) => {
   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;
 
@@ -56,5 +56,5 @@ export default (container, html, decorateProposition) => {
 
   executeInlineScripts(container, scripts);
 
-  return executeRemoteScripts(scriptsUrls);
+  return executeRemoteScripts(remoteScripts);
 };

package/src/components/Personalization/dom-actions/scripts.js

@@ -24,10 +24,24 @@ const getPromise = (url, script) => {
     };
   });
 };
-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;
@@ -70,7 +84,7 @@ export const getInlineScripts = (fragment) => {
   return result;
 };
 
-export const getRemoteScriptsUrls = (fragment) => {
+export const getRemoteScripts = (fragment) => {
   const scripts = selectNodes(SCRIPT, fragment);
   const result = [];
   const { length } = scripts;
@@ -78,17 +92,12 @@ export const getRemoteScriptsUrls = (fragment) => {
   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;
@@ -101,6 +110,6 @@ export const executeInlineScripts = (parent, scripts) => {
   });
 };
 
-export const executeRemoteScripts = (urls) => {
-  return Promise.all(urls.map(loadScript));
+export const executeRemoteScripts = (scripts) => {
+  return Promise.all(scripts.map(loadScript));
 };

package/src/components/PushNotifications/index.js

@@ -10,11 +10,11 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-/** @import { StorageCreator } from '@adobe/alloy-core/utils/types.js' */
 /** @import { EventManager, Logger } from '@adobe/alloy-core/core/types.js' */
 /** @import { IdentityManager } from '@adobe/alloy-core/core/identity/types.js' */
 /** @import { ConsentManager } from '@adobe/alloy-core/core/consent/types.js' */
 /** @import { EdgeRequestExecutor } from '@adobe/alloy-core/core/edgeNetwork/types.js' */
+/** @import { PlatformServices } from '@adobe/alloy-core/services' */
 
 import { objectOf, string } from "@adobe/alloy-core/utils/validation";
 import { sanitizeOrgIdForCookieName } from "@adobe/alloy-core/utils";
@@ -35,17 +35,16 @@ const isComponentConfigured = ({
  *
  * @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,
@@ -53,6 +52,7 @@ const createPushNotifications = ({
   identity,
   getBrowser,
   sendEdgeNetworkRequest,
+  platformServices,
 }) => {
   return {
     lifecycle: {
@@ -92,7 +92,7 @@ const createPushNotifications = ({
             },
           } = config || {};
 
-          const storage = createNamespacedStorage(
+          const storage = platformServices.storage.createNamespacedStorage(
             `${sanitizeOrgIdForCookieName(orgId)}.pushNotifications.`,
           );
 

package/src/components/PushNotifications/request/makeSendPushSubscriptionRequest.js

@@ -69,8 +69,9 @@ export default async ({
   );
 
   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.",
     );