Get ready to publish Alloy as an NPM repo

package.json

@@ -21,7 +21,7 @@
     "test:unit:coverage": "karma start --single-run --reporters spec,coverage",
     "test:functional": "rollup -c --environment BUILD:prod && EDGE_BASE_PATH=\"ee-pre-prd\" ALLOY_ENV=\"int\" testcafe chrome",
     "test:functional:watch": "EDGE_BASE_PATH=\"ee-pre-prd\" ALLOY_ENV=\"int\" BUILD=\"prod\" ./scripts/watchFunctionalTests.js",
-    "test:functional:ci:chrome": "EDGE_BASE_PATH=\"ee-pre-prd\" ALLOY_ENV=\"int\" testcafe 'browserstack:chrome@87:Windows 10'",
+    "test:functional:ci:chrome": "EDGE_BASE_PATH=\"ee-pre-prd\" ALLOY_ENV=\"int\" testcafe 'browserstack:chrome@87:OS X'",
     "test:functional:ci:ie": "EDGE_BASE_PATH=\"ee-pre-prd\" ALLOY_ENV=\"int\" testcafe 'browserstack:ie@11:Windows 10'",
     "test:functional:cron:prod": "ALLOY_ENV=\"prod\" testcafe 'browserstack:chrome@87:OS X'",
     "test:functional:api": "testcafe chrome:headless",

src/core/index.js

@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import createInstance from "./createInstance";
+import createInstanceFunction from "./createInstanceFunction";
 import { getApexDomain, injectStorage, cookieJar, isFunction } from "../utils";
 import createLogController from "./createLogController";
 import createLifecycle from "./createLifecycle";
@@ -41,140 +41,144 @@ import injectProcessWarningsAndErrors from "./edgeNetwork/injectProcessWarningsA
 import validateNetworkResponseIsWellFormed from "./edgeNetwork/validateNetworkResponseIsWellFormed";
 import isRetryableHttpStatusCode from "./network/isRetryableHttpStatusCode";
 
-export default () => {
-  // eslint-disable-next-line no-underscore-dangle
-  const instanceNames = window.__alloyNS;
+const createNamespacedStorage = injectStorage(window);
 
-  const createNamespacedStorage = injectStorage(window);
+const { console, fetch, navigator, XMLHttpRequest } = window;
 
-  const { console, fetch, navigator, XMLHttpRequest } = window;
+// set this up as a function so that monitors can be added at anytime
+// eslint-disable-next-line no-underscore-dangle
+const getMonitors = () => window.__alloyMonitors || [];
 
-  // set this up as a function so that monitors can be added at anytime
-  // eslint-disable-next-line no-underscore-dangle
-  const getMonitors = () => window.__alloyMonitors || [];
+const coreConfigValidators = createCoreConfigs();
+const apexDomain = getApexDomain(window, cookieJar);
+const sendFetchRequest = isFunction(fetch)
+  ? injectSendFetchRequest({ fetch })
+  : injectSendXhrRequest({ XMLHttpRequest });
 
-  const coreConfigValidators = createCoreConfigs();
-  const apexDomain = getApexDomain(window, cookieJar);
-  const sendFetchRequest = isFunction(fetch)
-    ? injectSendFetchRequest({ fetch })
-    : injectSendXhrRequest({ XMLHttpRequest });
-
-  if (instanceNames) {
-    instanceNames.forEach(instanceName => {
-      const {
-        setDebugEnabled,
-        logger,
-        createComponentLogger
-      } = createLogController({
-        console,
-        locationSearch: window.location.search,
-        createLogger,
-        instanceName,
-        createNamespacedStorage,
-        getMonitors
-      });
-      const componentRegistry = createComponentRegistry();
-      const lifecycle = createLifecycle(componentRegistry);
+export const createExecuteCommand = instanceName => {
+  const {
+    setDebugEnabled,
+    logger,
+    createComponentLogger
+  } = createLogController({
+    console,
+    locationSearch: window.location.search,
+    createLogger,
+    instanceName,
+    createNamespacedStorage,
+    getMonitors
+  });
+  const componentRegistry = createComponentRegistry();
+  const lifecycle = createLifecycle(componentRegistry);
 
-      const setDebugCommand = options => {
-        setDebugEnabled(options.enabled, { fromConfig: false });
-      };
+  const setDebugCommand = options => {
+    setDebugEnabled(options.enabled, { fromConfig: false });
+  };
 
-      const configureCommand = options => {
-        const config = buildAndValidateConfig({
-          options,
-          componentCreators,
-          coreConfigValidators,
-          createConfig,
-          logger,
-          setDebugEnabled
-        });
-        const cookieTransfer = createCookieTransfer({
-          cookieJar,
-          orgId: config.orgId,
-          apexDomain
-        });
-        const sendBeaconRequest = isFunction(navigator.sendBeacon)
-          ? injectSendBeaconRequest({
-              // Without the bind(), the browser will complain about an
-              // illegal invocation.
-              sendBeacon: navigator.sendBeacon.bind(navigator),
-              sendFetchRequest,
-              logger
-            })
-          : sendFetchRequest;
-        const networkStrategy = injectNetworkStrategy({
+  const configureCommand = options => {
+    const config = buildAndValidateConfig({
+      options,
+      componentCreators,
+      coreConfigValidators,
+      createConfig,
+      logger,
+      setDebugEnabled
+    });
+    const cookieTransfer = createCookieTransfer({
+      cookieJar,
+      orgId: config.orgId,
+      apexDomain
+    });
+    const sendBeaconRequest = isFunction(navigator.sendBeacon)
+      ? injectSendBeaconRequest({
+          // Without the bind(), the browser will complain about an
+          // illegal invocation.
+          sendBeacon: navigator.sendBeacon.bind(navigator),
           sendFetchRequest,
-          sendBeaconRequest
-        });
-        const sendNetworkRequest = injectSendNetworkRequest({
-          logger,
-          networkStrategy,
-          isRetryableHttpStatusCode
-        });
-        const processWarningsAndErrors = injectProcessWarningsAndErrors({
           logger
-        });
-        const sendEdgeNetworkRequest = injectSendEdgeNetworkRequest({
-          config,
-          lifecycle,
-          cookieTransfer,
-          sendNetworkRequest,
-          createResponse,
-          processWarningsAndErrors,
-          validateNetworkResponseIsWellFormed
-        });
+        })
+      : sendFetchRequest;
+    const networkStrategy = injectNetworkStrategy({
+      sendFetchRequest,
+      sendBeaconRequest
+    });
+    const sendNetworkRequest = injectSendNetworkRequest({
+      logger,
+      networkStrategy,
+      isRetryableHttpStatusCode
+    });
+    const processWarningsAndErrors = injectProcessWarningsAndErrors({
+      logger
+    });
+    const sendEdgeNetworkRequest = injectSendEdgeNetworkRequest({
+      config,
+      lifecycle,
+      cookieTransfer,
+      sendNetworkRequest,
+      createResponse,
+      processWarningsAndErrors,
+      validateNetworkResponseIsWellFormed
+    });
 
-        const generalConsentState = createConsentStateMachine();
-        const consent = createConsent({
-          generalConsentState,
-          logger
-        });
-        const eventManager = createEventManager({
+    const generalConsentState = createConsentStateMachine();
+    const consent = createConsent({
+      generalConsentState,
+      logger
+    });
+    const eventManager = createEventManager({
+      config,
+      logger,
+      lifecycle,
+      consent,
+      createEvent,
+      createDataCollectionRequestPayload,
+      sendEdgeNetworkRequest
+    });
+    return initializeComponents({
+      componentCreators,
+      lifecycle,
+      componentRegistry,
+      getImmediatelyAvailableTools(componentName) {
+        const componentLogger = createComponentLogger(componentName);
+        return {
           config,
-          logger,
-          lifecycle,
           consent,
-          createEvent,
-          createDataCollectionRequestPayload,
-          sendEdgeNetworkRequest
-        });
-        return initializeComponents({
-          componentCreators,
+          eventManager,
+          logger: componentLogger,
           lifecycle,
-          componentRegistry,
-          getImmediatelyAvailableTools(componentName) {
-            const componentLogger = createComponentLogger(componentName);
-            return {
-              config,
-              consent,
-              eventManager,
-              logger: componentLogger,
-              lifecycle,
-              sendEdgeNetworkRequest,
-              handleError: injectHandleError({
-                errorPrefix: `[${instanceName}] [${componentName}]`,
-                logger: componentLogger
-              })
-            };
-          }
-        });
-      };
+          sendEdgeNetworkRequest,
+          handleError: injectHandleError({
+            errorPrefix: `[${instanceName}] [${componentName}]`,
+            logger: componentLogger
+          })
+        };
+      }
+    });
+  };
 
-      const handleError = injectHandleError({
-        errorPrefix: `[${instanceName}]`,
-        logger
-      });
+  const handleError = injectHandleError({
+    errorPrefix: `[${instanceName}]`,
+    logger
+  });
 
-      const executeCommand = injectExecuteCommand({
-        logger,
-        configureCommand,
-        setDebugCommand,
-        handleError,
-        validateCommandOptions
-      });
+  const executeCommand = injectExecuteCommand({
+    logger,
+    configureCommand,
+    setDebugCommand,
+    handleError,
+    validateCommandOptions
+  });
+  return { executeCommand, logger };
+};
 
-      const instance = createInstance(executeCommand);
+export default () => {
+  // eslint-disable-next-line no-underscore-dangle
+  const instanceNames = window.__alloyNS;
+
+  if (instanceNames) {
+    instanceNames.forEach(instanceName => {
+      const { executeCommand, logger } = createExecuteCommand(instanceName);
+      const instance = createInstanceFunction(executeCommand);
 
       const queue = window[instanceName].q;
       queue.push = instance;

src/index.js

@@ -14,15 +14,12 @@ governing permissions and limitations under the License.
 // like the launch extension. Everything that is exported here can be used independently by other
 // npm projects.
 
-import baseCodeWithWindow from "./baseCode/index";
+import { createExecuteCommand } from "./core";
 
-export const baseCode = instanceNames => {
-  baseCodeWithWindow(window, instanceNames);
+export default instanceName => {
+  const { executeCommand: instance, logger } = createExecuteCommand(
+    instanceName
+  );
+  logger.logOnInstanceCreated({ instance });
+  return instance;
 };
-
-export { default as core } from "./core";
-
-// createEventMergeId is used by the Launch extension to provide a synchronous way to create an id
-export {
-  default as createEventMergeId
-} from "./components/EventMerge/createEventMergeId";

test/functional/helpers/createFixture/clientScripts.js

@@ -27,7 +27,7 @@ const remotePromisePolyfillPath =
   "https://cdn.jsdelivr.net/npm/promise-polyfill@8/dist/polyfill.min.js";
 const remoteVisitorLibraryUrl =
   "https://github.com/Adobe-Marketing-Cloud/id-service/releases/latest/download/visitorapi.min.js";
-const baseCodePath = path.join(__dirname, "../../../../dist/baseCode.min.js");
+const baseCodePath = path.join(__dirname, "../../../../dist/baseCode.js");
 const localAlloyLibraryPath = path.join(__dirname, "../../../../dist/alloy.js");
 const remoteAlloyLibraryUrl =
   "https://cdn1.adoberesources.net/alloy/latest/alloy.js";

test/unit/specs/core/createInstance.spec.js → test/unit/specs/core/createInstanceFunction.spec.js

@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import createInstance from "../../../../src/core/createInstance";
+import createInstance from "../../../../src/core/createInstanceFunction";
 import flushPromiseChains from "../../helpers/flushPromiseChains";
 
 describe("createInstance", () => {