@lwrjs/everywhere 0.11.0-alpha.4 → 0.11.0-alpha.7

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/metrics/v/{0_11_0-alpha_4/s/7a802ee7a2430244c1f66bce2c2eafef → 0_11_0-alpha_7/s/274c8343f810353bbad085a79709395f}/lwr_metrics.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/metrics/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/metrics/v/0_11_0-alpha_7', ['exports'], (function (exports) { 'use strict';
 
 	// Bootstrap / shim
 	const BOOTSTRAP_PREFIX = 'lwr.bootstrap.';
@@ -18,6 +18,8 @@ LWR.define('lwr/metrics/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'u
 	const LOADER_PREFIX = 'lwr.loader.';
 	const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
 	const MODULE_DEFINE_COUNT = `${MODULE_DEFINE}.count`;
+	const MODULE_DYNAMIC_LOAD = `${LOADER_PREFIX}moduleRegistry.dynamicLoad`;
+	const MODULE_DYNAMIC_LOAD_COUNT = `${MODULE_DYNAMIC_LOAD}.count`;
 	const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
 	const MODULE_FETCH_COUNT = `${MODULE_FETCH}.count`;
 	const MODULE_FETCH_DURATION = `${MODULE_FETCH}.duration`;
@@ -59,6 +61,8 @@ LWR.define('lwr/metrics/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'u
 	exports.MAPPINGS_FETCH_DURATION = MAPPINGS_FETCH_DURATION;
 	exports.MODULE_DEFINE = MODULE_DEFINE;
 	exports.MODULE_DEFINE_COUNT = MODULE_DEFINE_COUNT;
+	exports.MODULE_DYNAMIC_LOAD = MODULE_DYNAMIC_LOAD;
+	exports.MODULE_DYNAMIC_LOAD_COUNT = MODULE_DYNAMIC_LOAD_COUNT;
 	exports.MODULE_ERROR = MODULE_ERROR;
 	exports.MODULE_ERROR_COUNT = MODULE_ERROR_COUNT;
 	exports.MODULE_FETCH = MODULE_FETCH;

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

@@ -1,4 +1,4 @@
-LWR.define('lwr/profiler/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/profiler/v/0_11_0-alpha_7', ['exports'], (function (exports) { 'use strict';
 
   function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
   function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }

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

@@ -1,4 +1,4 @@
-LWR.define('lwr/vault/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/vault/v/0_11_0-alpha_7', ['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_11_0-alpha_4 → 0_11_0-alpha_7}/lwr-error-shim.js

@@ -4,6 +4,6 @@
 * 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.11.0-alpha.4 */
+/* LWR Error Shim v0.11.0-alpha.7 */
 !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)}}();
 //# sourceMappingURL=lwr-error-shim.js.map

package/build/__generated_site_amd_modules__/1/resource/amd/lwr-loader-shim.bundle.js/v/{0_11_0-alpha_4 → 0_11_0-alpha_7}/lwr-loader-shim.bundle.js

@@ -4,7 +4,7 @@
 * 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 Shim v0.11.0-alpha.4 */
+/* LWR Module Loader Shim v0.11.0-alpha.7 */
 (function () {
   'use strict';
 
@@ -205,7 +205,7 @@
           // Parse configuration
           this.global = global;
           this.config = global.LWR ;
-          this.loaderSpecifier = 'lwr/loader/v/0_11_0-alpha_4';
+          this.loaderSpecifier = 'lwr/loader/v/0_11_0-alpha_7';
 
           // Set up error handler
           this.errorHandler = this.config.onError;
@@ -325,12 +325,12 @@
           const exporter = (exports) => {
               Object.assign(exports, { logOperationStart, logOperationEnd });
           };
-          globalLWR.define('lwr/profiler/v/0_11_0-alpha_4', ['exports'], exporter);
+          globalLWR.define('lwr/profiler/v/0_11_0-alpha_7', ['exports'], exporter);
       }
 
       // Set up the application globals, import map, root custom element...
        mountApp(loader) {
-          const { bootstrapModule, rootComponent, rootComponents, ssrProps, endpoints, imports, index } =
+          const { bootstrapModule, rootComponent, rootComponents, serverData, endpoints, imports, index } =
               this.config;
 
           // Set global LWR.define to loader.define
@@ -338,7 +338,7 @@
               define: loader.define.bind(loader),
               rootComponent,
               rootComponents,
-              ssrProps,
+              serverData,
               endpoints,
               imports: imports || {},
               index: index || {},
@@ -397,15 +397,15 @@
   // The loader module is ALWAYS required
   const GLOBAL = globalThis ;
   GLOBAL.LWR.requiredModules = GLOBAL.LWR.requiredModules || [];
-  if (GLOBAL.LWR.requiredModules.indexOf('lwr/loader/v/0_11_0-alpha_4') < 0) {
-      GLOBAL.LWR.requiredModules.push('lwr/loader/v/0_11_0-alpha_4');
+  if (GLOBAL.LWR.requiredModules.indexOf('lwr/loader/v/0_11_0-alpha_7') < 0) {
+      GLOBAL.LWR.requiredModules.push('lwr/loader/v/0_11_0-alpha_7');
   }
   new LoaderShim(GLOBAL);
 
 })();
 //# sourceMappingURL=lwr-loader-shim.js.map
 
-LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/loader/v/0_11_0-alpha_7', ['exports'], (function (exports) { 'use strict';
 
     const templateRegex = /\{([0-9]+)\}/g;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -530,6 +530,11 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
         level: 0,
         message: 'Invalid import metadata: {0} {1}',
     });
+    const EXPORTER_ERROR = Object.freeze({
+        code: 3021,
+        level: 0,
+        message: 'Error evaluating module "{0}", error was "{1}"',
+    });
 
     /* importMap errors */
     Object.freeze({
@@ -726,6 +731,7 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
     // Loader: modules
     const LOADER_PREFIX = 'lwr.loader.';
     const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
+    const MODULE_DYNAMIC_LOAD = `${LOADER_PREFIX}moduleRegistry.dynamicLoad`;
     const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
     const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
 
@@ -1086,7 +1092,7 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
 
     async function evaluateLoadHookResponse(response, id) {
         return Promise.resolve().then(async () => {
-            if (!response.status) {
+            if (!response || !response.status) {
                 throw new LoaderError(INVALID_LOADER_SERVICE_RESPONSE);
             }
             if (response.status !== 200) {
@@ -1113,6 +1119,10 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
                 // TODO eval source maps for debugging
                 eval(trusted.createScript(code));
             } catch (e) {
+                if (process.env.NODE_ENV !== 'production' && hasConsole) {
+                    // eslint-disable-next-line lwr/no-unguarded-apis
+                    console.error(e);
+                }
                 throw new LoaderError(FAIL_LOAD, [id]);
             }
 
@@ -1193,7 +1203,6 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
 
 
 
-
 
 
     class ModuleRegistry {
@@ -1208,8 +1217,14 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
         }
 
         async load(id, importer) {
+            const metadata = importer ? { importer } : {};
+            this.profiler.logOperationStart({
+                id: MODULE_DYNAMIC_LOAD,
+                specifier: id,
+                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 {
@@ -1283,6 +1298,8 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
                     // return the plain id if it is already defined && the resolvedUrl is NOT already in the module registry
                     if (
                         this.namedDefineRegistry.has(resolvedOrPlain) &&
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-ignore has check right above
                         this.namedDefineRegistry.get(resolvedOrPlain).defined
                     ) {
                         const record = this.moduleRegistry.get(resolvedUrl);
@@ -1423,7 +1440,7 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
             return moduleRecord;
         }
 
-         getModuleRecord(resolvedId, id) {
+         async getModuleRecord(resolvedId, id) {
             // Look for an existing record
             const existingRecord = this.getExistingModuleRecord(resolvedId, id);
             if (existingRecord) {
@@ -1434,7 +1451,7 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
             // Create a new Module Record
             const instantiation = this.getModuleDef(resolvedId, id);
             const dependencyRecords = instantiation.then((moduleDef) => {
-                const dependencies = moduleDef.dependencies;
+                const dependencies = moduleDef.dependencies || [];
                 // get dep and filter out exports
                 const filtered = dependencies
                     .map((dep) => {
@@ -1460,7 +1477,9 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
 
             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) {
@@ -1472,7 +1491,10 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
                     const currentResolvedId = this.aliases.get(aliasId);
                     if (currentResolvedId !== resolvedId) {
                         // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
-                        console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+                        if (process.env.NODE_ENV !== 'production' && hasConsole) {
+                            // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
+                            console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+                        }
                     }
                 }
             }
@@ -1521,37 +1543,39 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
             const { exporter, dependencies } = await moduleRecord.instantiation;
             // The exports object automatically gets filled in by the exporter evaluation
             const exports = {};
-            const depsMapped = 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;
-
-                    /**
-                     * 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]);
-                }),
-            );
+            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;
+
+                          /**
+                           * 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) {
@@ -1559,8 +1583,12 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
             }
 
             // evaluates the module function
-            let moduleDefault = exporter(...depsMapped);
-
+            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 = { default: moduleDefault };
@@ -1709,7 +1737,12 @@ LWR.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (function (exports) { 'us
                     return moduleDef;
                 })
                 .catch((e) => {
-                    this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
+                    // Create module error marks for all errors caused by the loader
+                    // Note: these marks do not include errors caused by invalid server responses or loader hooks
+                    if (!(e instanceof LoaderError)) {
+                        this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
+                    }
+
                     throw e;
                 });
         }

package/build/assets/amd/lwr-everywhere-debug.js

@@ -20,7 +20,7 @@ function getConfiguration(options) {
         : `${ORIGIN}${PREFIX}/module/${format}/${POSTFIX}/mi/`;
 
     // Component specifiers and URIs
-    const BOOT_MODULE = `lwr/everywhere${format === 'esm' ? 'Esm' : 'Amd'}/v/0_11_0-alpha_4`;
+    const BOOT_MODULE = `lwr/everywhere${format === 'esm' ? 'Esm' : 'Amd'}/v/0_11_0-alpha_7`;
     const BOOT_URI = `${ENDPOINT}${encodeURIComponent(BOOT_MODULE)}/latest${debug ? '?debug' : ''}`;
 
     // Client Bootstrap Config
@@ -52,7 +52,7 @@ function getConfiguration(options) {
 * 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.11.0-alpha.4 */
+/* LWR Module Loader v0.11.0-alpha.7 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -176,6 +176,11 @@ const BAD_IMPORT_METADATA = Object.freeze({
     level: 0,
     message: 'Invalid import metadata: {0} {1}',
 });
+const EXPORTER_ERROR = Object.freeze({
+    code: 3021,
+    level: 0,
+    message: 'Error evaluating module "{0}", error was "{1}"',
+});
 
 /* importMap errors */
 Object.freeze({
@@ -372,6 +377,7 @@ if (hasDocument) {
 // Loader: modules
 const LOADER_PREFIX = 'lwr.loader.';
 const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
+const MODULE_DYNAMIC_LOAD = `${LOADER_PREFIX}moduleRegistry.dynamicLoad`;
 const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
 const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
 
@@ -732,7 +738,7 @@ function isResponseAPromise(
 
 async function evaluateLoadHookResponse(response, id) {
     return Promise.resolve().then(async () => {
-        if (!response.status) {
+        if (!response || !response.status) {
             throw new LoaderError(INVALID_LOADER_SERVICE_RESPONSE);
         }
         if (response.status !== 200) {
@@ -759,6 +765,10 @@ async function evaluateLoadHookResponse(response, id) {
             // TODO eval source maps for debugging
             eval(trusted.createScript(code));
         } catch (e) {
+            if (process.env.NODE_ENV !== 'production' && hasConsole) {
+                // eslint-disable-next-line lwr/no-unguarded-apis
+                console.error(e);
+            }
             throw new LoaderError(FAIL_LOAD, [id]);
         }
 
@@ -839,7 +849,6 @@ async function evaluateLoadHook(
 
 
 
-
 
 
 class ModuleRegistry {
@@ -854,8 +863,14 @@ class ModuleRegistry {
     }
 
     async load(id, importer) {
+        const metadata = importer ? { importer } : {};
+        this.profiler.logOperationStart({
+            id: MODULE_DYNAMIC_LOAD,
+            specifier: id,
+            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 {
@@ -929,6 +944,8 @@ class ModuleRegistry {
                 // return the plain id if it is already defined && the resolvedUrl is NOT already in the module registry
                 if (
                     this.namedDefineRegistry.has(resolvedOrPlain) &&
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore has check right above
                     this.namedDefineRegistry.get(resolvedOrPlain).defined
                 ) {
                     const record = this.moduleRegistry.get(resolvedUrl);
@@ -1069,7 +1086,7 @@ class ModuleRegistry {
         return moduleRecord;
     }
 
-     getModuleRecord(resolvedId, id) {
+     async getModuleRecord(resolvedId, id) {
         // Look for an existing record
         const existingRecord = this.getExistingModuleRecord(resolvedId, id);
         if (existingRecord) {
@@ -1080,7 +1097,7 @@ class ModuleRegistry {
         // Create a new Module Record
         const instantiation = this.getModuleDef(resolvedId, id);
         const dependencyRecords = instantiation.then((moduleDef) => {
-            const dependencies = moduleDef.dependencies;
+            const dependencies = moduleDef.dependencies || [];
             // get dep and filter out exports
             const filtered = dependencies
                 .map((dep) => {
@@ -1106,7 +1123,9 @@ class ModuleRegistry {
 
         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) {
@@ -1118,7 +1137,10 @@ class ModuleRegistry {
                 const currentResolvedId = this.aliases.get(aliasId);
                 if (currentResolvedId !== resolvedId) {
                     // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
-                    console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+                    if (process.env.NODE_ENV !== 'production' && hasConsole) {
+                        // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
+                        console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+                    }
                 }
             }
         }
@@ -1167,37 +1189,39 @@ class ModuleRegistry {
         const { exporter, dependencies } = await moduleRecord.instantiation;
         // The exports object automatically gets filled in by the exporter evaluation
         const exports = {};
-        const depsMapped = 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;
-
-                /**
-                 * 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]);
-            }),
-        );
+        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;
+
+                      /**
+                       * 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) {
@@ -1205,8 +1229,12 @@ class ModuleRegistry {
         }
 
         // evaluates the module function
-        let moduleDefault = exporter(...depsMapped);
-
+        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 = { default: moduleDefault };
@@ -1355,7 +1383,12 @@ class ModuleRegistry {
                 return moduleDef;
             })
             .catch((e) => {
-                this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
+                // Create module error marks for all errors caused by the loader
+                // Note: these marks do not include errors caused by invalid server responses or loader hooks
+                if (!(e instanceof LoaderError)) {
+                    this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
+                }
+
                 throw e;
             });
     }
@@ -1564,7 +1597,7 @@ const { bootstrapModule, endpoints, baseUrl, imports, index } = configuration;
 
 // Initialize the AMD loader (its code is bundled into the LWR Everywhere module)
 const loader = new Loader({ endpoints, baseUrl });
-loader.define('lwr/loader/v/0_11_0-alpha_4', ['exports'], (exports) => {
+loader.define('lwr/loader/v/0_11_0-alpha_7', ['exports'], (exports) => {
     Object.assign(exports, {
         define: loader.define.bind(loader),
         load: loader.load.bind(loader),
@@ -1574,12 +1607,12 @@ await loader.registerImportMappings({ imports, index }, [bootstrapModule]);
 (globalThis ).LWR = Object.freeze({ define: loader.define.bind(loader) });
 
 // Define preload modules (ie: ABS, vault, etc) BEFORE loading them
-LWR.define('lwr/everywhereAmd/v/0_11_0-alpha_4', ['exports', 'lwr/vault/v/0_11_0-alpha_4'], (function (exports, _0_11_0Alpha_4) {
+LWR.define('lwr/everywhereAmd/v/0_11_0-alpha_7', ['exports', 'lwr/vault/v/0_11_0-alpha_7'], (function (exports, _0_11_0Alpha_7) {
   // 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_11_0Alpha_4.getAuthInfo();
+    const authInfo = _0_11_0Alpha_7.getAuthInfo();
     if (authInfo) {
       return fetch(url, {
         headers: {
@@ -1629,7 +1662,7 @@ LWR.define('lwr/everywhereAmd/v/0_11_0-alpha_4', ['exports', 'lwr/vault/v/0_11_0
   function authenticate(authInfo) {
     // Put OAuth info into the vault
     if (authInfo) {
-      _0_11_0Alpha_4.setAuthInfo(authInfo);
+      _0_11_0Alpha_7.setAuthInfo(authInfo);
     }
   }
 
@@ -1639,7 +1672,7 @@ LWR.define('lwr/everywhereAmd/v/0_11_0-alpha_4', ['exports', 'lwr/vault/v/0_11_0
   Object.defineProperty(exports, '__esModule', { value: true });
 
 }));
-LWR.define('lwr/vault/v/0_11_0-alpha_4', ['exports'], (function (exports) {
+LWR.define('lwr/vault/v/0_11_0-alpha_7', ['exports'], (function (exports) {
   // Credential vault for storing setters and subscribers for OAuth info
   // This module is a SINGLETON and must be excluded from ESM bundling
 
@@ -1663,7 +1696,7 @@ LWR.define('lwr/vault/v/0_11_0-alpha_4', ['exports'], (function (exports) {
 
 // Set up the AMD loader hooks for OAuth
 const { initAmd, authenticate } = await loader.load(bootstrapModule);
-initAmd(loader.services, _optionalChain([endpoints, 'optionalAccess', _ => _.uris, 'access', _2 => _2.mapping]), '0_11_0-alpha_4');
+initAmd(loader.services, _optionalChain([endpoints, 'optionalAccess', _ => _.uris, 'access', _2 => _2.mapping]), '0_11_0-alpha_7');
 
 // Wrap the createComponent API to allow proper ordering of module definitions:
 //  1. LWRE module bundle (this): lwr/loader, lwr/everywhereAmd, lwr/vault