@lwrjs/everywhere 0.12.0-alpha.18 → 0.12.0-alpha.19

package/build/__generated_site_amd_modules__/1/application/amd/l/en-US/ai/amd-bootstrap/configuration/ci/-/-/s/08723ea0a65554c7a931779934247206/config.js

@@ -0,0 +1,12 @@
+/* This script is generated */
+/* Client Bootstrap configuration */
+globalThis.LWR = globalThis.LWR || {};
+Object.assign(globalThis.LWR, {"appId":"amd-bootstrap","bootstrapModule":"@lwrjs/app-service/amd-bootstrap/module/amd/v/0_12_0-alpha_19","autoBoot":true,"imports":{"/1/module/amd/1/l/en-US/mi/%40lwrjs%2Fapp-service%2Famd-bootstrap%2Fmodule%2Famd%2Fv%2F0_12_0-alpha_19/s/8bce578258518655194bd71d1d72aad5/@lwrjs_app-service_amd-bootstrap_module_amd.js":["@lwrjs/app-service/amd-bootstrap/module/amd/v/0_12_0-alpha_19"],"/1/module/amd/1/l/en-US/mi/lwr%2FpreInit%2Fv%2F0_12_0-alpha_19/s/ec0fad0e38a96bb0b88c9f4553460347/lwr_preInit.js":["lwr/preInit/v/0_12_0-alpha_19"],"/1/module/amd/1/l/en-US/mi/lwr%2Finit%2Fv%2F0_12_0-alpha_19/s/f30361ad8ff7af505bf4d465c8499181/lwr_init.js":["lwr/init/v/0_12_0-alpha_19"],"/1/module/amd/1/l/en-US/mi/lwr%2Fmetrics%2Fv%2F0_12_0-alpha_19/s/274c8343f810353bbad085a79709395f/lwr_metrics.js":["lwr/metrics/v/0_12_0-alpha_19"],"/1/module/amd/1/l/en-US/mi/lwr%2Fprofiler%2Fv%2F0_12_0-alpha_19/s/a152b8d35f12ca1b5147c5cd1ee155fb/lwr_profiler.js":["lwr/profiler/v/0_12_0-alpha_19"],"/1/module/amd/1/l/en-US/mi/lwc%2Fv%2F6_2_1/s/2670f5386c68fa67ae710174187505e9/lwc.js":["lwc/v/6_2_1"],"/1/module/amd/1/l/en-US/mi/lwr%2FeverywhereAmd%2Fv%2F0_12_0-alpha_19/s/cb931ebef2b89dcf8ab51456e3a68864/lwr_everywhereAmd.js":["lwr/everywhereAmd/v/0_12_0-alpha_19"],"/1/module/amd/1/l/en-US/mi/lwr%2Fvault%2Fv%2F0_12_0-alpha_19/s/c92abd8c1fec2d7eff62e4b097abbe14/lwr_vault.js":["lwr/vault/v/0_12_0-alpha_19"]},"index":{"@lwrjs/app-service/amd-bootstrap/module/amd/v/0_12_0-alpha_19":"/1/module/amd/1/l/en-US/mi/%40lwrjs%2Fapp-service%2Famd-bootstrap%2Fmodule%2Famd%2Fv%2F0_12_0-alpha_19/s/8bce578258518655194bd71d1d72aad5/@lwrjs_app-service_amd-bootstrap_module_amd.js","lwr/preInit/v/0_12_0-alpha_19":"/1/module/amd/1/l/en-US/mi/lwr%2FpreInit%2Fv%2F0_12_0-alpha_19/s/ec0fad0e38a96bb0b88c9f4553460347/lwr_preInit.js","lwr/init/v/0_12_0-alpha_19":"/1/module/amd/1/l/en-US/mi/lwr%2Finit%2Fv%2F0_12_0-alpha_19/s/f30361ad8ff7af505bf4d465c8499181/lwr_init.js","lwr/metrics/v/0_12_0-alpha_19":"/1/module/amd/1/l/en-US/mi/lwr%2Fmetrics%2Fv%2F0_12_0-alpha_19/s/274c8343f810353bbad085a79709395f/lwr_metrics.js","lwr/profiler/v/0_12_0-alpha_19":"/1/module/amd/1/l/en-US/mi/lwr%2Fprofiler%2Fv%2F0_12_0-alpha_19/s/a152b8d35f12ca1b5147c5cd1ee155fb/lwr_profiler.js","lwc/v/6_2_1":"/1/module/amd/1/l/en-US/mi/lwc%2Fv%2F6_2_1/s/2670f5386c68fa67ae710174187505e9/lwc.js","lwr/everywhereAmd/v/0_12_0-alpha_19":"/1/module/amd/1/l/en-US/mi/lwr%2FeverywhereAmd%2Fv%2F0_12_0-alpha_19/s/cb931ebef2b89dcf8ab51456e3a68864/lwr_everywhereAmd.js","lwr/vault/v/0_12_0-alpha_19":"/1/module/amd/1/l/en-US/mi/lwr%2Fvault%2Fv%2F0_12_0-alpha_19/s/c92abd8c1fec2d7eff62e4b097abbe14/lwr_vault.js"},"rootComponents":["lwr/everywhereAmd/v/0_12_0-alpha_19"],"serverData":{},"requiredModules":["@lwrjs/app-service/amd-bootstrap/module/amd/v/0_12_0-alpha_19"],"preloadModules":["lwr/preInit/v/0_12_0-alpha_19","lwr/init/v/0_12_0-alpha_19","lwr/metrics/v/0_12_0-alpha_19","lwc/v/6_2_1","lwr/everywhereAmd/v/0_12_0-alpha_19"],"endpoints":{"uris":{"mapping":"/1/mapping/amd/1/l/en-US/mp/"}}});
+globalThis.LWR = {...globalThis.LWR, env: {"SSR":false,"basePath":"","locale":"en-US","assetBasePath":"","uiBasePath":""}};
+globalThis.process={...globalThis.process,env:{...globalThis.process?.env,...{"NODE_ENV":"compat"}}};
+globalThis.lwcRuntimeFlags = { ENABLE_MIXED_SHADOW_MODE: false };
+// Appended by Static Site Generator
+if (!globalThis.LWR.imports) { globalThis.LWR.imports = {}; }
+Object.assign(globalThis.LWR.imports, {"/1/module/amd/1/l/en-US/mi/lwr%2Floader%2Fv%2F0_12_0-alpha_19/s/bfa35394789428d30613fedf7507d1fd/lwr_loader.js":["lwr/loader/v/0_12_0-alpha_19"]})
+if (!globalThis.LWR.index) { globalThis.LWR.index = {}; }
+Object.assign(globalThis.LWR.index, {"lwr/loader/v/0_12_0-alpha_19":"/1/module/amd/1/l/en-US/mi/lwr%2Floader%2Fv%2F0_12_0-alpha_19/s/bfa35394789428d30613fedf7507d1fd/lwr_loader.js"})

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/@lwrjs/app-service/amd-bootstrap/module/amd/v/0_12_0-alpha_19/s/8bce578258518655194bd71d1d72aad5/@lwrjs_app-service_amd-bootstrap_module_amd.js

@@ -0,0 +1,14 @@
+LWR.define('@lwrjs/app-service/amd-bootstrap/module/amd/v/0_12_0-alpha_19', ['lwr/loader/v/0_12_0-alpha_19', 'lwr/preInit/v/0_12_0-alpha_19', 'lwr/init/v/0_12_0-alpha_19'], (function (_0_12_0Alpha_19$2, _0_12_0Alpha_19, _0_12_0Alpha_19$1) { 'use strict';
+
+    const clientBootstrapConfig = _0_12_0Alpha_19.getClientBootstrapConfig();
+
+    // initialize additional non-configured root components
+    const { rootComponents, serverData } = clientBootstrapConfig;
+    Promise.all(rootComponents.map(async (rootSpecifier) => {
+        const element = _0_12_0Alpha_19$1.toKebabCase(rootSpecifier);
+        return _0_12_0Alpha_19$2.load(rootSpecifier, '@lwrjs/app-service/amd-bootstrap/module/amd/v/0_12_0-alpha_19').then(({default: Ctor}) => {
+            _0_12_0Alpha_19$1.init([[element, Ctor]], serverData);
+        });
+    }));
+
+}));

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/everywhereAmd/v/{0_12_0-alpha_18 → 0_12_0-alpha_19}/s/cb931ebef2b89dcf8ab51456e3a68864/lwr_everywhereAmd.js

@@ -1,10 +1,10 @@
-LWR.define('lwr/everywhereAmd/v/0_12_0-alpha_18', ['exports', 'lwr/vault/v/0_12_0-alpha_18'], (function (exports, _0_12_0Alpha_18) { 'use strict';
+LWR.define('lwr/everywhereAmd/v/0_12_0-alpha_19', ['exports', 'lwr/vault/v/0_12_0-alpha_19'], (function (exports, _0_12_0Alpha_19) { 'use strict';
 
   // IMPORTANT: Do not add any static imports to this file that are not bundled with the amd-client
 
   // Do an OAuthed fetch
   async function authFetch(url, accept = 'javascript') {
-    const authInfo = _0_12_0Alpha_18.getAuthInfo();
+    const authInfo = _0_12_0Alpha_19.getAuthInfo();
     if (authInfo) {
       return fetch(url, {
         headers: {
@@ -53,7 +53,7 @@ LWR.define('lwr/everywhereAmd/v/0_12_0-alpha_18', ['exports', 'lwr/vault/v/0_12_
   function authenticate(authInfo) {
     // Put OAuth info into the vault
     if (authInfo) {
-      _0_12_0Alpha_18.setAuthInfo(authInfo);
+      _0_12_0Alpha_19.setAuthInfo(authInfo);
     }
   }
 

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/init/v/{0_12_0-alpha_18 → 0_12_0-alpha_19}/s/f30361ad8ff7af505bf4d465c8499181/lwr_init.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/init/v/0_12_0-alpha_18', ['exports', 'lwr/metrics/v/0_12_0-alpha_18', 'lwr/profiler/v/0_12_0-alpha_18', 'lwc/v/6_2_1'], (function (exports, _0_12_0Alpha_18$1, _0_12_0Alpha_18, _6_2_1) { 'use strict';
+LWR.define('lwr/init/v/0_12_0-alpha_19', ['exports', 'lwr/metrics/v/0_12_0-alpha_19', 'lwr/profiler/v/0_12_0-alpha_19', 'lwc/v/6_2_1'], (function (exports, _0_12_0Alpha_19$1, _0_12_0Alpha_19, _6_2_1) { 'use strict';
 
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 
@@ -47,13 +47,13 @@ LWR.define('lwr/init/v/0_12_0-alpha_18', ['exports', 'lwr/metrics/v/0_12_0-alpha
    */
   function init(rootModules, serverData = {}) {
     if (typeof customElements === 'undefined' || typeof document === 'undefined') {
-      _0_12_0Alpha_18.logOperationStart({
-        id: _0_12_0Alpha_18$1.BOOTSTRAP_END
+      _0_12_0Alpha_19.logOperationStart({
+        id: _0_12_0Alpha_19$1.BOOTSTRAP_END
       });
       return;
     }
-    _0_12_0Alpha_18.logOperationStart({
-      id: _0_12_0Alpha_18$1.INIT
+    _0_12_0Alpha_19.logOperationStart({
+      id: _0_12_0Alpha_19$1.INIT
     });
     let index = 0;
     for (const [specifier, ctor] of rootModules) {
@@ -61,8 +61,8 @@ LWR.define('lwr/init/v/0_12_0-alpha_18', ['exports', 'lwr/metrics/v/0_12_0-alpha
 
       // initialize and inject the root module into the LWR Root or DOM if it is missing
       if (!document.body.querySelector(elementName)) {
-        _0_12_0Alpha_18.logOperationStart({
-          id: _0_12_0Alpha_18$1.INIT_MODULE,
+        _0_12_0Alpha_19.logOperationStart({
+          id: _0_12_0Alpha_19$1.INIT_MODULE,
           specifier,
           specifierIndex: ++index
         });
@@ -71,8 +71,8 @@ LWR.define('lwr/init/v/0_12_0-alpha_18', ['exports', 'lwr/metrics/v/0_12_0-alpha
         const component = initializeWebComponent(elementName, ctor);
         const container = document.querySelector('[lwr-root]');
         container ? container.appendChild(component) : document.body.appendChild(component);
-        _0_12_0Alpha_18.logOperationEnd({
-          id: _0_12_0Alpha_18$1.INIT_MODULE,
+        _0_12_0Alpha_19.logOperationEnd({
+          id: _0_12_0Alpha_19$1.INIT_MODULE,
           specifier,
           specifierIndex: index,
           metadata: {
@@ -85,8 +85,8 @@ LWR.define('lwr/init/v/0_12_0-alpha_18', ['exports', 'lwr/metrics/v/0_12_0-alpha
       // the page has been rendered or SSR'd, and each component needs to initialized(or hydrated)
       const elements = document.querySelectorAll(elementName);
       for (const element of elements) {
-        _0_12_0Alpha_18.logOperationStart({
-          id: _0_12_0Alpha_18$1.INIT_MODULE,
+        _0_12_0Alpha_19.logOperationStart({
+          id: _0_12_0Alpha_19$1.INIT_MODULE,
           specifier,
           specifierIndex: ++index
         });
@@ -97,8 +97,8 @@ LWR.define('lwr/init/v/0_12_0-alpha_18', ['exports', 'lwr/metrics/v/0_12_0-alpha
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
           hydrateComponentProxy(element, ctor, serverData[propsId] || {});
-          _0_12_0Alpha_18.logOperationEnd({
-            id: _0_12_0Alpha_18$1.INIT_MODULE,
+          _0_12_0Alpha_19.logOperationEnd({
+            id: _0_12_0Alpha_19$1.INIT_MODULE,
             specifier,
             specifierIndex: index,
             metadata: {
@@ -136,8 +136,8 @@ LWR.define('lwr/init/v/0_12_0-alpha_18', ['exports', 'lwr/metrics/v/0_12_0-alpha
         if (parent) {
           parent.replaceChild(component, element);
         }
-        _0_12_0Alpha_18.logOperationEnd({
-          id: _0_12_0Alpha_18$1.INIT_MODULE,
+        _0_12_0Alpha_19.logOperationEnd({
+          id: _0_12_0Alpha_19$1.INIT_MODULE,
           specifier,
           specifierIndex: index,
           metadata: {
@@ -146,11 +146,11 @@ LWR.define('lwr/init/v/0_12_0-alpha_18', ['exports', 'lwr/metrics/v/0_12_0-alpha
         });
       }
     }
-    _0_12_0Alpha_18.logOperationEnd({
-      id: _0_12_0Alpha_18$1.INIT
+    _0_12_0Alpha_19.logOperationEnd({
+      id: _0_12_0Alpha_19$1.INIT
     });
-    _0_12_0Alpha_18.logOperationStart({
-      id: _0_12_0Alpha_18$1.BOOTSTRAP_END
+    _0_12_0Alpha_19.logOperationStart({
+      id: _0_12_0Alpha_19$1.BOOTSTRAP_END
     });
   }
 

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/loader/v/{0_12_0-alpha_18/s/4d339c68d153d7a65ee9aeda30e5c3d9 → 0_12_0-alpha_19/s/bfa35394789428d30613fedf7507d1fd}/lwr_loader.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/loader/v/0_12_0-alpha_19', ['exports'], (function (exports) { 'use strict';
 
   /**
   * Copyright (c) 2021, salesforce.com, inc.
@@ -6,7 +6,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
   * SPDX-License-Identifier: MIT
   * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
   */
-  /* LWR Module Loader v0.12.0-alpha.18 */
+  /* LWR Module Loader v0.12.0-alpha.19 */
   const templateRegex = /\{([0-9]+)\}/g;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function templateString(template, args) {
@@ -697,18 +697,6 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
   /* global console,process */
 
   class ModuleRegistry {
-    // A registry for named AMD defines containing the *metadata* of AMD module
-    __init() {
-      this.namedDefineRegistry = new Map();
-    }
-    // The evaluated module registry where the module identifier (name or URL?) is the key
-    __init2() {
-      this.moduleRegistry = new Map();
-    }
-    // Aliases of modules in the registry
-    __init3() {
-      this.aliases = new Map();
-    }
     constructor(config) {
       ModuleRegistry.prototype.__init.call(this);
       ModuleRegistry.prototype.__init2.call(this);
@@ -716,10 +704,6 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
       this.profiler = config.profiler;
       this.resolver = new ImportMetadataResolver(config, this.importMetadataInvalidationCallback.bind(this));
     }
-
-    /**
-     * Module import
-     */
     async load(id, importer) {
       const metadata = importer ? {
         importer
@@ -730,20 +714,16 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
         metadata
       });
       const resolvedId = await this.resolve(id, importer);
-      const moduleRecord = this.getModuleRecord(resolvedId, id);
+      const moduleRecord = await this.getModuleRecord(resolvedId, id);
       if (moduleRecord.evaluated) {
         return moduleRecord.module;
       } else {
         if (!moduleRecord.evaluationPromise) {
-          moduleRecord.evaluationPromise = this.evaluateModule(moduleRecord, {});
+          moduleRecord.evaluationPromise = this.topLevelEvaluation(moduleRecord);
         }
         return moduleRecord.evaluationPromise;
       }
     }
-
-    /**
-     * Resolve id for a module
-     */
     async resolve(id, importer) {
       const parentUrl = this.resolver.getBaseUrl(); // only support baseUrl for now
 
@@ -761,7 +741,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
             // eslint-disable-next-line no-await-in-loop
             result = isResponseAPromise(response) ? await response : response;
           }
-          if (!isValidResolveResponse(result)) {
+          if (!this.isValidResolveResponse(result)) {
             throw new LoaderError(INVALID_LOADER_SERVICE_RESPONSE);
           }
 
@@ -836,10 +816,6 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
     has(id) {
       return this.moduleRegistry.has(id);
     }
-
-    /**
-     * Module entry point LWR.define()
-     */
     define(name, dependencies, exporter) {
       const mod = this.namedDefineRegistry.get(name);
       // Don't allow redefining a module.
@@ -906,6 +882,21 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
         }
       });
     }
+
+    // A registry for named AMD defines containing the *metadata* of AMD module
+    __init() {
+      this.namedDefineRegistry = new Map();
+    }
+
+    // The evaluated module registry where the module identifier (name or URL?) is the key
+    __init2() {
+      this.moduleRegistry = new Map();
+    }
+
+    // Aliases of modules in the registry
+    __init3() {
+      this.aliases = new Map();
+    }
     getImportMetadataResolver() {
       return this.resolver;
     }
@@ -930,23 +921,41 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
       }
       return moduleRecord;
     }
-    getModuleRecord(resolvedId, id) {
+    async getModuleRecord(resolvedId, id) {
       // Look for an existing record
       const existingRecord = this.getExistingModuleRecord(resolvedId, id);
       if (existingRecord) {
         // return existing
         return existingRecord;
       }
+
+      // Create a new Module Record
+      const instantiation = this.getModuleDef(resolvedId, id);
+      const dependencyRecords = instantiation.then(moduleDef => {
+        const dependencies = moduleDef.dependencies || [];
+        // get dep and filter out exports
+        const filtered = dependencies.map(dep => {
+          if (dep === 'exports') {
+            return;
+          }
+          invariant(dep !== 'require', NO_AMD_REQUIRE);
+          return this.getModuleDependencyRecord.call(this, dep);
+        }).filter(depRecord => depRecord !== undefined);
+        return Promise.all(filtered);
+      });
       const newModuleRecord = {
         id: resolvedId,
         module: Object.create(null),
-        instantiation: this.getModuleDef(resolvedId, id),
+        dependencyRecords,
+        instantiation,
         evaluated: false,
         evaluationPromise: null
       };
       this.moduleRegistry.set(resolvedId, newModuleRecord);
       this.storeModuleAlias(id, resolvedId);
-      return newModuleRecord;
+
+      // Wait for the dependencies to resolve the return the moduleRecord
+      return dependencyRecords.then(() => newModuleRecord);
     }
     storeModuleAlias(aliasId, resolvedId) {
       if (aliasId !== resolvedId) {
@@ -965,87 +974,82 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
         }
       }
     }
+    async getModuleDependencyRecord(dependency) {
+      const resolvedDepId = await this.resolve(dependency);
+      return this.getModuleRecord(resolvedDepId, dependency);
+    }
 
-    /**
-     * Evaluate all module dependencies
-     */
-    async evaluateDependencies(dependencies, evaluationMap) {
-      const exports = {};
-      const promiseArray = [];
-      if (dependencies) {
-        for (const dep of dependencies) {
-          if (dep === 'exports') {
-            promiseArray.push(Promise.resolve(exports));
-          } else {
-            invariant(dep !== 'require', NO_AMD_REQUIRE);
-            promiseArray.push(this.evaluateDependent(dep, evaluationMap));
-          }
-        }
-      }
-      return Promise.all(promiseArray).then(results => {
-        const depsMapped = results.filter(result => result !== undefined);
-        return {
-          depsMapped,
-          exports
-        };
-      });
+    // execute the "top-level code" (the code outside of functions) of a module
+    async topLevelEvaluation(moduleRecord) {
+      await this.instantiateAll(moduleRecord, {});
+      return this.evaluateModule(moduleRecord, {});
     }
-    async evaluateDependent(dep, evaluationMap) {
-      const resolvedDepId = await this.resolve(dep);
-      const depModuleRecord = this.getModuleRecord(resolvedDepId, dep);
-      let module = depModuleRecord.module;
-      const handleReturn = module => {
-        if (module) {
-          return module.__defaultInterop ? module.default : module;
-        }
-        throw new LoaderError(FAILED_DEP, [resolvedDepId]);
-      };
 
-      // If evaluated return the module
-      if (depModuleRecord.evaluated) {
-        return handleReturn(module);
-      }
-      /**
-       * Circular dependencies are handled properly when named exports are used,
-       * however, for default exports there is a bug: https://github.com/rollup/rollup/issues/3384
-       *
-       * The workaround below applies for circular dependencies (!moduleRecord.evaluated)
-       */
-      if (!evaluationMap[depModuleRecord.id]) {
-        // If we have not started dependency evaluation kick it off
-        if (!depModuleRecord.evaluationPromise) {
-          depModuleRecord.evaluationPromise = this.evaluateModule(depModuleRecord, evaluationMap);
+    // Returns a promise when a module and all of it's dependencies have finished instantiation
+    async instantiateAll(moduleRecord, instantiatedMap) {
+      if (!instantiatedMap[moduleRecord.id]) {
+        instantiatedMap[moduleRecord.id] = true;
+        const dependencyModuleRecords = await moduleRecord.dependencyRecords;
+        if (dependencyModuleRecords) {
+          for (let i = 0; i < dependencyModuleRecords.length; i++) {
+            const depRecord = dependencyModuleRecords[i];
+            // eslint-disable-next-line no-await-in-loop
+            await this.instantiateAll(depRecord, instantiatedMap);
+          }
         }
-        return depModuleRecord.evaluationPromise.then(module => {
-          return handleReturn(module);
-        });
-      } else {
-        // Otherwise return a dummy circular module wrapper
-        module = getCircularDependencyWrapper(module);
       }
-      return handleReturn(module);
     }
     async evaluateModule(moduleRecord, evaluationMap) {
-      // Create a evaluationMap to detect cycles in this dep chain
-      const chainMap = {
-        ...evaluationMap
-      };
-      chainMap[moduleRecord.id] = true;
-
-      // Wait for load to finish
+      const dependencyModuleRecords = await moduleRecord.dependencyRecords;
+      if (dependencyModuleRecords.length > 0) {
+        evaluationMap[moduleRecord.id] = true;
+        // evaluate dependencies first
+        await this.evaluateModuleDependencies(dependencyModuleRecords, evaluationMap);
+      }
       const {
         exporter,
         dependencies
       } = await moduleRecord.instantiation;
+      // The exports object automatically gets filled in by the exporter evaluation
+      const exports = {};
+      const depsMapped = dependencies ? await Promise.all(dependencies.map(async dep => {
+        if (dep === 'exports') {
+          return exports;
+        }
+        const resolvedDepId = await this.resolve(dep);
+        const moduleRecord = this.moduleRegistry.get(resolvedDepId);
+        if (!moduleRecord) {
+          throw new LoaderError(FAILED_DEP, [resolvedDepId]);
+        }
+        const module = moduleRecord.module;
 
-      // Evaluate all it's dependents
-      const {
-        depsMapped,
-        exports
-      } = await this.evaluateDependencies(dependencies, chainMap);
+        /**
+         * Circular dependencies are handled properly when named exports are used,
+         * however, for default exports there is a bug: https://github.com/rollup/rollup/issues/3384
+         *
+         * The workaround below applies for circular dependencies (!moduleRecord.evaluated)
+         */
+        if (!moduleRecord.evaluated) {
+          return this.getCircularDependencyWrapper(module);
+        }
+        if (module) {
+          return module.__defaultInterop ? module.default : module;
+        }
+        throw new LoaderError(FAILED_DEP, [resolvedDepId]);
+      })) : [];
+
+      // W-10029836 - In the case where we could be instantiating multiple graphs at the same time lets make sure the module have not already been evaluated
+      if (moduleRecord.evaluated) {
+        return moduleRecord.module;
+      }
 
       // evaluates the module function
-      let moduleDefault = this.evaluateModuleCode(exporter, depsMapped, moduleRecord);
+      let moduleDefault;
+      try {
+        moduleDefault = exporter(...depsMapped);
+      } catch (e) {
+        throw new LoaderError(EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
+      }
       // value is returned from exporter, then we are not using named exports
       if (moduleDefault !== undefined) {
         moduleDefault = {
@@ -1061,7 +1065,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
       // if no return value, then we are using the exports object
       else {
         // handle only default export with Rollup forced named exports
-        if (isNamedExportDefaultOnly(exports)) {
+        if (this.isNamedExportDefaultOnly(exports)) {
           Object.defineProperty(exports, '__useDefault', {
             value: true
           });
@@ -1099,16 +1103,33 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
           value: true
         });
       }
-      Object.freeze(moduleRecord.module);
       moduleRecord.evaluated = true;
-      moduleRecord.evaluationPromise = null;
+      Object.freeze(moduleRecord.module);
       return moduleRecord.module;
     }
-    evaluateModuleCode(evaluatedExporter, depsMapped, moduleRecord) {
-      try {
-        return evaluatedExporter(...depsMapped);
-      } catch (e) {
-        throw new LoaderError(EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
+
+    // Determines if named exports module has only default export
+    isNamedExportDefaultOnly(exports) {
+      return exports !== undefined && Object.getOwnPropertyNames(exports).length === 2 && Object.prototype.hasOwnProperty.call(exports, 'default') && Object.prototype.hasOwnProperty.call(exports, '__esModule');
+    }
+
+    // Wrap the dependency in a function that can be called and detected by __circular__ property.
+    // The LWC engine checks for __circular__ to detect circular dependencies.
+    getCircularDependencyWrapper(module) {
+      const tmp = () => {
+        return module.__useDefault || module.__defaultInterop ? module.default : module;
+      };
+      tmp.__circular__ = true;
+      return tmp;
+    }
+    async evaluateModuleDependencies(dependencyModuleRecords, evaluationMap) {
+      for (let i = 0; i < dependencyModuleRecords.length; i++) {
+        const depRecord = dependencyModuleRecords[i];
+        if (!depRecord.evaluated && !evaluationMap[depRecord.id]) {
+          evaluationMap[depRecord.id] = true;
+          // eslint-disable-next-line no-await-in-loop
+          await this.evaluateModule(depRecord, evaluationMap);
+        }
       }
     }
     async getModuleDef(resolvedId, originalId) {
@@ -1235,24 +1256,9 @@ LWR.define('lwr/loader/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'u
         this.handleStaleModuleHook = [handleStaleModule];
       }
     }
-  }
-
-  // Determines if named exports module has only default export
-  function isNamedExportDefaultOnly(exports) {
-    return exports !== undefined && Object.getOwnPropertyNames(exports).length === 2 && Object.prototype.hasOwnProperty.call(exports, 'default') && Object.prototype.hasOwnProperty.call(exports, '__esModule');
-  }
-
-  // Wrap the dependency in a function that can be called and detected by __circular__ property.
-  // The LWC engine checks for __circular__ to detect circular dependencies.
-  function getCircularDependencyWrapper(module) {
-    const tmp = () => {
-      return module.__useDefault || module.__defaultInterop ? module.default : module;
-    };
-    tmp.__circular__ = true;
-    return tmp;
-  }
-  function isValidResolveResponse(res) {
-    return res === null || typeof res === 'string' || res && typeof res.url === 'string';
+    isValidResolveResponse(res) {
+      return res === null || typeof res === 'string' || res && typeof res.url === 'string';
+    }
   }
 
   /**

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/metrics/v/{0_12_0-alpha_18 → 0_12_0-alpha_19}/s/274c8343f810353bbad085a79709395f/lwr_metrics.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/metrics/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/metrics/v/0_12_0-alpha_19', ['exports'], (function (exports) { 'use strict';
 
 	// Bootstrap / shim
 	const BOOTSTRAP_PREFIX = 'lwr.bootstrap.';

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/preInit/v/{0_12_0-alpha_18 → 0_12_0-alpha_19}/s/ec0fad0e38a96bb0b88c9f4553460347/lwr_preInit.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/preInit/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/preInit/v/0_12_0-alpha_19', ['exports'], (function (exports) { 'use strict';
 
   /**
    * This module is called in the ABS module (app bootstrap module) to perform neccesary pre initialization steps for an LWR app.

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/profiler/v/{0_12_0-alpha_18 → 0_12_0-alpha_19}/s/a152b8d35f12ca1b5147c5cd1ee155fb/lwr_profiler.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/profiler/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/profiler/v/0_12_0-alpha_19', ['exports'], (function (exports) { 'use strict';
 
   var Phase = /*#__PURE__*/function (Phase) {
     Phase[Phase["Start"] = 0] = "Start";

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/vault/v/{0_12_0-alpha_18 → 0_12_0-alpha_19}/s/c92abd8c1fec2d7eff62e4b097abbe14/lwr_vault.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/vault/v/0_12_0-alpha_18', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/vault/v/0_12_0-alpha_19', ['exports'], (function (exports) { 'use strict';
 
   // Credential vault for storing setters and subscribers for OAuth info
   // This module is a SINGLETON and must be excluded from ESM bundling

package/build/__generated_site_amd_modules__/1/resource/amd/lwr-error-shim.js/v/{0_12_0-alpha_18 → 0_12_0-alpha_19}/lwr-error-shim.js

@@ -4,5 +4,5 @@
 * SPDX-License-Identifier: MIT
 * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
 */
-/* LWR Error Shim v0.12.0-alpha.18 */
+/* LWR Error Shim v0.12.0-alpha.19 */
 !function(){"use strict";if(!(globalThis.LWR&&globalThis.LWR.define)){const o=new Error("The LWR application failed to bootstrap");if(!globalThis.LWR||!globalThis.LWR.onError)throw o;globalThis.LWR.onError(o)}}();