@lwrjs/loader 0.6.0-alpha.9 → 0.6.2

package/build/bundle/prod/lwr/esmLoader/esmLoader.js

@@ -1 +1 @@
-class t{constructor(t){if(this.importURICache=new Map,t&&t.imports)for(const[r,e]of Object.entries(t.imports))if(r&&e){(Array.isArray(e)?e:[]).forEach((t=>{this.importURICache.set(t,r)}))}}resolve(t){return this.importURICache.get(t)}}class r{constructor(t){this.importURICache=t&&t.imports?t:{imports:{}}}legacyResolve(t){return this.importURICache.imports[t]}}let e,o,i;function n(n){e=n;const{imports:s,index:c,importMappings:p}=n;o=new t({imports:s,index:c}),i=new r(p)}function s(t,r){const n=function(t,r){let n;if(!o||!i)throw new Error("The ESM Loader was not initialized");if(n=o.resolve(t),n)return n;if(n=i.legacyResolve(t),n)return n;if(n=t,n.indexOf("://")<0&&!n.startsWith("/")){const{endpoints:o}=e;o&&o.uris&&o.uris.module&&(n=o.uris.module+encodeURIComponent(t),r&&(n+=`?importer=${encodeURIComponent(r)}`))}return n}(t,r);return import(n)}export{n as init,s as load};
+class i{constructor(i){var t,e;this.importURICache=new Map,this.modifiers="",this.normalizeMetadata(i),this.mappingEndpoint=(null==i?void 0:i.importMappings)||null===(t=null==i?void 0:i.endpoints)||void 0===t?void 0:t.uris.mapping,(null===(e=null==i?void 0:i.endpoints)||void 0===e?void 0:e.modifiers)&&(this.modifiers=Object.entries(i.endpoints.modifiers).reduce(((i,[t,e])=>i+`${t}=${e}&`),"?"))}normalizeMetadata(i){if(i&&i.imports)for(const[t,e]of Object.entries(i.imports))if(t&&e){(Array.isArray(e)?e:[]).forEach((i=>{this.importURICache.set(i,t)}))}}async fetchMappings(i){const t=`${this.mappingEndpoint}${encodeURIComponent(i)}${this.modifiers}`,e=await globalThis.fetch(t);if(e.ok){const i=await e.json();this.normalizeMetadata(i)}}async resolve(i){let t=this.importURICache.get(i);return!t&&this.mappingEndpoint&&(await this.fetchMappings(i),t=this.importURICache.get(i)),t}}class t{constructor(i){this.importURICache=i&&i.imports?i:{imports:{}}}legacyResolve(i){return this.importURICache.imports[i]}}let e,o,n;function s(s){e=s;const{imports:r,index:a,importMappings:p,endpoints:c}=s;o=new i({imports:r,index:a,endpoints:c,importMappings:p}),n=new t(p)}async function r(i,t){const s=await async function(i,t){let s;if(!o||!n)throw new Error("The ESM Loader was not initialized");if(s=await o.resolve(i),s)return s;if(s=n.legacyResolve(i),s)return s;if(s=i,s.indexOf("://")<0&&!s.startsWith("/")){const{endpoints:o}=e;o&&o.uris&&o.uris.module&&(s=o.uris.module+encodeURIComponent(i),t&&(s+=`?importer=${encodeURIComponent(t)}`),o.modifiers&&(s+=Object.entries(o.modifiers).reduce(((i,[t,e])=>i+`${t}=${e}&`),t?"&":"?")))}return s}(i,t);return import(s)}export{s as init,r as load};

package/build/cjs/modules/lwr/esmLoader/esmLoader.cjs

@@ -34,20 +34,20 @@ var resolver;
 var resolverLegacy;
 function init(config) {
   esmLoaderConfig = config;
-  const {imports, index, importMappings} = config;
-  resolver = new import_importResolver.default({imports, index});
+  const {imports, index, importMappings, endpoints} = config;
+  resolver = new import_importResolver.default({imports, index, endpoints, importMappings});
   resolverLegacy = new import_importResolverLegacy.default(importMappings);
 }
-function load(specifier, importer) {
-  const uri = resolveUrl(specifier, importer);
+async function load(specifier, importer) {
+  const uri = await resolveUrl(specifier, importer);
   return Promise.resolve().then(() => __toModule(require(uri)));
 }
-function resolveUrl(specifier, importer) {
+async function resolveUrl(specifier, importer) {
   let uri;
   if (!resolver || !resolverLegacy) {
     throw new Error("The ESM Loader was not initialized");
   }
-  uri = resolver.resolve(specifier);
+  uri = await resolver.resolve(specifier);
   if (uri) {
     return uri;
   }
@@ -63,6 +63,9 @@ function resolveUrl(specifier, importer) {
       if (importer) {
         uri += `?importer=${encodeURIComponent(importer)}`;
       }
+      if (endpoints.modifiers) {
+        uri += Object.entries(endpoints.modifiers).reduce((q, [k, v]) => q += `${k}=${v}&`, importer ? "&" : "?");
+      }
     }
   }
   return uri;

package/build/cjs/modules/lwr/esmLoader/importResolver.cjs

@@ -11,8 +11,16 @@ __export(exports, {
   default: () => importResolver_default
 });
 var ImportResolver = class {
-  constructor(importMetada) {
+  constructor(config) {
     this.importURICache = new Map();
+    this.modifiers = "";
+    this.normalizeMetadata(config);
+    this.mappingEndpoint = config?.importMappings ? void 0 : config?.endpoints?.uris.mapping;
+    if (config?.endpoints?.modifiers) {
+      this.modifiers = Object.entries(config.endpoints.modifiers).reduce((q, [k, v]) => q += `${k}=${v}&`, "?");
+    }
+  }
+  normalizeMetadata(importMetada) {
     if (importMetada && importMetada.imports) {
       for (const [uri, value] of Object.entries(importMetada.imports)) {
         if (uri && value) {
@@ -24,8 +32,21 @@ var ImportResolver = class {
       }
     }
   }
-  resolve(specifier) {
-    return this.importURICache.get(specifier);
+  async fetchMappings(specifier) {
+    const mappingUri = `${this.mappingEndpoint}${encodeURIComponent(specifier)}${this.modifiers}`;
+    const res = await globalThis.fetch(mappingUri);
+    if (res.ok) {
+      const mappings = await res.json();
+      this.normalizeMetadata(mappings);
+    }
+  }
+  async resolve(specifier) {
+    let uri = this.importURICache.get(specifier);
+    if (!uri && this.mappingEndpoint) {
+      await this.fetchMappings(specifier);
+      uri = this.importURICache.get(specifier);
+    }
+    return uri;
   }
 };
 var importResolver_default = ImportResolver;

package/build/cjs/modules/lwr/loader/constants/constants.cjs

@@ -8,16 +8,6 @@ var __export = (target, all) => {
 // packages/@lwrjs/loader/src/modules/lwr/loader/constants/constants.ts
 __markAsModule(exports);
 __export(exports, {
-  METRIC_MAPPINGS_ERROR: () => METRIC_MAPPINGS_ERROR,
-  METRIC_MAPPINGS_FETCH: () => METRIC_MAPPINGS_FETCH,
-  METRIC_MODULE_DEFINE: () => METRIC_MODULE_DEFINE,
-  METRIC_MODULE_ERROR: () => METRIC_MODULE_ERROR,
-  METRIC_MODULE_FETCH: () => METRIC_MODULE_FETCH,
   MODULE_LOAD_TIMEOUT_TIMER: () => MODULE_LOAD_TIMEOUT_TIMER
 });
 var MODULE_LOAD_TIMEOUT_TIMER = 3e5;
-var METRIC_MODULE_DEFINE = "lwr.loader.module.define";
-var METRIC_MODULE_FETCH = "lwr.loader.module.fetch";
-var METRIC_MAPPINGS_FETCH = "lwr.loader.mappings.fetch";
-var METRIC_MODULE_ERROR = "lwr.loader.module.error";
-var METRIC_MAPPINGS_ERROR = "lwr.loader.mappings.error";

package/build/cjs/modules/lwr/loader/moduleRegistry/importMetadataResolver.cjs

@@ -28,7 +28,7 @@ __export(exports, {
 });
 var import_messages = __toModule(require("../errors/messages"));
 var import_url = __toModule(require("../utils/url"));
-var import_constants = __toModule(require("../constants/constants"));
+var import_metrics = __toModule(require("lwr/metrics"));
 var ImportMetadataResolver = class {
   constructor(config, invalidationCallback) {
     this.importURICache = new Map();
@@ -119,7 +119,7 @@ var ImportMetadataResolver = class {
       if (pending) {
         return pending;
       }
-      this.config.profiler.logOperationStart({id: import_constants.METRIC_MAPPINGS_FETCH, specifier});
+      this.config.profiler.logOperationStart({id: import_metrics.MAPPINGS_FETCH, specifier});
       const fetchMappingService = this.hasMappingHooks() ? this.evaluateMappingHooks : this.fetchNewMappings;
       const promise = fetchMappingService.bind(this)(specifier).then((importMetadata) => {
         if (!importMetadata || !importMetadata.imports) {
@@ -130,6 +130,7 @@ var ImportMetadataResolver = class {
         if (!uri) {
           throw new import_messages.LoaderError(import_messages.UNRESOLVED, [specifier]);
         }
+        this.config.profiler.logOperationEnd({id: import_metrics.MAPPINGS_FETCH, specifier});
         return uri;
       }).finally(() => {
         this.pendingURICache.delete(specifier);
@@ -162,7 +163,7 @@ var ImportMetadataResolver = class {
     const uri = (0, import_url.resolveUrl)(this.buildMappingUrl(specifier), this.getBaseUrl());
     return globalThis.fetch(uri).then((res) => {
       if (!res.ok) {
-        this.config.profiler.logOperationStart({id: import_constants.METRIC_MAPPINGS_ERROR, specifier});
+        this.config.profiler.logOperationStart({id: import_metrics.MAPPINGS_ERROR, specifier});
         throw new import_messages.LoaderError(import_messages.UNRESOLVED, [specifier]);
       }
       return res.json().then((ret) => {

package/build/cjs/modules/lwr/loader/moduleRegistry/moduleRegistry.cjs

@@ -33,6 +33,7 @@ var import_scriptLoad = __toModule(require("./scriptLoad"));
 var import_importMetadataResolver = __toModule(require("./importMetadataResolver"));
 var import_moduleInvalidation = __toModule(require("../hooks/moduleInvalidation"));
 var import_resolveAndLoadHook = __toModule(require("../hooks/resolveAndLoadHook"));
+var import_metrics = __toModule(require("lwr/metrics"));
 var import_constants = __toModule(require("../constants/constants"));
 var ModuleRegistry = class {
   constructor(config) {
@@ -144,7 +145,7 @@ var ModuleRegistry = class {
     if (mod && mod.external) {
       mod.external.resolveExternal(moduleDef);
     }
-    this.profiler.logOperationStart({id: import_constants.METRIC_MODULE_DEFINE, specifier: name});
+    this.profiler.logOperationStart({id: import_metrics.MODULE_DEFINE, specifier: name});
     this.namedDefineRegistry.set(name, moduleDef);
     this.lastDefine = moduleDef;
   }
@@ -290,6 +291,9 @@ var ModuleRegistry = class {
     if (moduleExports.__defaultInterop) {
       Object.defineProperty(moduleRecord.module, "__defaultInterop", {value: true});
     }
+    if (moduleExports.__esModule) {
+      Object.defineProperty(moduleRecord.module, "__esModule", {value: true});
+    }
     moduleRecord.evaluated = true;
     Object.freeze(moduleRecord.module);
     return moduleRecord.module;
@@ -325,7 +329,7 @@ var ModuleRegistry = class {
     }
     const parentUrl = this.resolver.getBaseUrl();
     const specifier = moduleName || originalId;
-    this.profiler.logOperationStart({id: import_constants.METRIC_MODULE_FETCH, specifier});
+    this.profiler.logOperationStart({id: import_metrics.MODULE_FETCH, specifier});
     return Promise.resolve().then(async () => {
       const loadHooks = this.loadHook;
       if (loadHooks) {
@@ -354,9 +358,10 @@ var ModuleRegistry = class {
       if (!moduleDef) {
         throw new import_messages.LoaderError(import_messages.FAIL_INSTANTIATE, [resolvedId]);
       }
+      this.profiler.logOperationEnd({id: import_metrics.MODULE_FETCH, specifier});
       return moduleDef;
     }).catch((e) => {
-      this.profiler.logOperationStart({id: import_constants.METRIC_MODULE_ERROR, specifier});
+      this.profiler.logOperationStart({id: import_metrics.MODULE_ERROR, specifier});
       throw e;
     });
   }

package/build/cjs/modules/lwr/loaderLegacy/moduleRegistry/moduleRegistry.cjs

@@ -33,11 +33,13 @@ var import_scriptLoad = __toModule(require("./scriptLoad"));
 var import_resolveAndLoadHook = __toModule(require("../hooks/resolveAndLoadHook"));
 var import_moduleInvalidation = __toModule(require("../hooks/moduleInvalidation"));
 var import_constants = __toModule(require("../constants/constants"));
+var import_metrics = __toModule(require("lwr/metrics"));
 var ModuleRegistry = class {
-  constructor(baseUrl) {
+  constructor(config) {
     this.namedDefineRegistry = new Map();
     this.moduleRegistry = new Map();
-    this.baseUrl = baseUrl;
+    this.baseUrl = config.baseUrl;
+    this.profiler = config.profiler;
   }
   async load(id, importer) {
     const resolvedId = await this.resolve(id, importer);
@@ -137,6 +139,7 @@ var ModuleRegistry = class {
     if (mod && mod.external) {
       mod.external.resolveExternal(moduleDef);
     }
+    this.profiler.logOperationStart({id: import_metrics.MODULE_DEFINE, specifier: name});
     this.namedDefineRegistry.set(name, moduleDef);
     this.lastDefine = moduleDef;
     if (signatures.hashes) {
@@ -316,6 +319,9 @@ var ModuleRegistry = class {
     if (moduleExports.__defaultInterop) {
       Object.defineProperty(moduleRecord.module, "__defaultInterop", {value: true});
     }
+    if (moduleExports.__esModule) {
+      Object.defineProperty(moduleRecord.module, "__esModule", {value: true});
+    }
     moduleRecord.evaluated = true;
     Object.freeze(moduleRecord.module);
     return moduleRecord.module;
@@ -350,6 +356,8 @@ var ModuleRegistry = class {
       return moduleDef;
     }
     const parentUrl = this.baseUrl;
+    const specifier = moduleName || originalId;
+    this.profiler.logOperationStart({id: import_metrics.MODULE_FETCH, specifier});
     return Promise.resolve().then(async () => {
       const loadHooks = this.loadHook;
       if (loadHooks) {
@@ -378,8 +386,10 @@ var ModuleRegistry = class {
       if (!moduleDef) {
         throw new import_messages.LoaderError(import_messages.FAIL_INSTANTIATE, [resolvedId]);
       }
+      this.profiler.logOperationEnd({id: import_metrics.MODULE_FETCH, specifier});
       return moduleDef;
     }).catch((e) => {
+      this.profiler.logOperationStart({id: import_metrics.MODULE_ERROR, specifier});
       throw e;
     });
   }

package/build/modules/lwr/esmLoader/esmLoader.js

@@ -4,14 +4,25 @@
 * SPDX-License-Identifier: MIT
 * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
 */
-/* LWR ESM Module Loader v0.6.0-alpha.9 */
+/* LWR ESM Module Loader v0.6.2 */
 /**
  * Simplified version of the AMD Import Metadata Resolver.
  * Just reads the ImportMetadata at construction time.
  */
 class ImportResolver {
-    constructor(importMetada) {
+    constructor(config) {
+        var _a, _b;
         this.importURICache = new Map();
+        this.modifiers = '';
+        this.normalizeMetadata(config);
+        // only fetch mappings if fingerprints is ON
+        this.mappingEndpoint = (config === null || config === void 0 ? void 0 : config.importMappings) ? undefined : (_a = config === null || config === void 0 ? void 0 : config.endpoints) === null || _a === void 0 ? void 0 : _a.uris.mapping;
+        if ((_b = config === null || config === void 0 ? void 0 : config.endpoints) === null || _b === void 0 ? void 0 : _b.modifiers) {
+            // Add URI modifiers to mapping endpoint query
+            this.modifiers = Object.entries(config.endpoints.modifiers).reduce((q, [k, v]) => (q += `${k}=${v}&`), '?');
+        }
+    }
+    normalizeMetadata(importMetada) {
         // Normalize the URI cache to optimize retrieval
         if (importMetada && importMetada.imports) {
             for (const [uri, value] of Object.entries(importMetada.imports)) {
@@ -24,8 +35,21 @@ class ImportResolver {
             }
         }
     }
-    resolve(specifier) {
-        return this.importURICache.get(specifier);
+    async fetchMappings(specifier) {
+        const mappingUri = `${this.mappingEndpoint}${encodeURIComponent(specifier)}${this.modifiers}`;
+        const res = await globalThis.fetch(mappingUri);
+        if (res.ok) {
+            const mappings = await res.json();
+            this.normalizeMetadata(mappings);
+        }
+    }
+    async resolve(specifier) {
+        let uri = this.importURICache.get(specifier);
+        if (!uri && this.mappingEndpoint) {
+            await this.fetchMappings(specifier);
+            uri = this.importURICache.get(specifier);
+        }
+        return uri;
     }
 }
 
@@ -54,21 +78,21 @@ let resolverLegacy;
 function init(config) {
     // Save config from globalThis.LWR
     esmLoaderConfig = config;
-    const { imports, index, importMappings } = config;
-    resolver = new ImportResolver({ imports, index });
+    const { imports, index, importMappings, endpoints } = config;
+    resolver = new ImportResolver({ imports, index, endpoints, importMappings });
     resolverLegacy = new ImportResolverLegacy(importMappings);
 }
-function load(specifier, importer) {
-    const uri = resolveUrl(specifier, importer);
+async function load(specifier, importer) {
+    const uri = await resolveUrl(specifier, importer);
     return import(uri);
 }
-function resolveUrl(specifier, importer) {
+async function resolveUrl(specifier, importer) {
     let uri;
     if (!resolver || !resolverLegacy) {
         throw new Error('The ESM Loader was not initialized');
     }
     // Check if the URI is in the import metadata
-    uri = resolver.resolve(specifier);
+    uri = await resolver.resolve(specifier);
     if (uri) {
         return uri;
     }
@@ -88,6 +112,10 @@ function resolveUrl(specifier, importer) {
             if (importer) {
                 uri += `?importer=${encodeURIComponent(importer)}`;
             }
+            if (endpoints.modifiers) {
+                // Add URI modifiers to query
+                uri += Object.entries(endpoints.modifiers).reduce((q, [k, v]) => (q += `${k}=${v}&`), importer ? '&' : '?');
+            }
         }
     }
     return uri;

package/build/modules/lwr/loader/loader.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 v0.6.0-alpha.9 */
+/* LWR Module Loader v0.6.2 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -300,12 +300,15 @@ if (hasDocument) {
     });
 }
 
-const MODULE_LOAD_TIMEOUT_TIMER = 300000;
-const METRIC_MODULE_DEFINE = 'lwr.loader.module.define';
-const METRIC_MODULE_FETCH = 'lwr.loader.module.fetch';
-const METRIC_MAPPINGS_FETCH = 'lwr.loader.mappings.fetch';
-const METRIC_MODULE_ERROR = 'lwr.loader.module.error';
-const METRIC_MAPPINGS_ERROR = 'lwr.loader.mappings.error';
+// Bootstrap / shim
+
+const LOADER_PREFIX = 'lwr.loader.';
+const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
+const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
+const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
+
+const MAPPINGS_FETCH = `${LOADER_PREFIX}mappings.fetch`;
+const MAPPINGS_ERROR = `${LOADER_PREFIX}mappings.error`;
 
 /* spec based import map resolver */
 class ImportMetadataResolver {
@@ -422,7 +425,7 @@ class ImportMetadataResolver {
             if (pending) {
                 return pending;
             }
-            this.config.profiler.logOperationStart({ id: METRIC_MAPPINGS_FETCH, specifier });
+            this.config.profiler.logOperationStart({ id: MAPPINGS_FETCH, specifier });
             const fetchMappingService = this.hasMappingHooks()
                 ? this.evaluateMappingHooks
                 : this.fetchNewMappings;
@@ -437,6 +440,7 @@ class ImportMetadataResolver {
                 if (!uri) {
                     throw new LoaderError(UNRESOLVED, [specifier]);
                 }
+                this.config.profiler.logOperationEnd({ id: MAPPINGS_FETCH, specifier });
                 return uri;
             })
                 .finally(() => {
@@ -481,7 +485,7 @@ class ImportMetadataResolver {
         const uri = resolveUrl(this.buildMappingUrl(specifier), this.getBaseUrl());
         return globalThis.fetch(uri).then((res) => {
             if (!res.ok) {
-                this.config.profiler.logOperationStart({ id: METRIC_MAPPINGS_ERROR, specifier });
+                this.config.profiler.logOperationStart({ id: MAPPINGS_ERROR, specifier });
                 throw new LoaderError(UNRESOLVED, [specifier]);
             }
             return res
@@ -535,6 +539,8 @@ function evaluateHandleStaleModuleHooks(handleStaleModuleHooks, hookArgs) {
     }
 }
 
+const MODULE_LOAD_TIMEOUT_TIMER = 300000;
+
 let lastWindowError;
 if (hasDocument) {
     globalThis.addEventListener('error', (evt) => {
@@ -749,7 +755,7 @@ class ModuleRegistry {
             // if module is "external", resolve the external promise to notify any dependees
             mod.external.resolveExternal(moduleDef);
         }
-        this.profiler.logOperationStart({ id: METRIC_MODULE_DEFINE, specifier: name });
+        this.profiler.logOperationStart({ id: MODULE_DEFINE, specifier: name });
         this.namedDefineRegistry.set(name, moduleDef);
         this.lastDefine = moduleDef;
     }
@@ -932,6 +938,9 @@ class ModuleRegistry {
         if (moduleExports.__defaultInterop) {
             Object.defineProperty(moduleRecord.module, '__defaultInterop', { value: true });
         }
+        if (moduleExports.__esModule) {
+            Object.defineProperty(moduleRecord.module, '__esModule', { value: true });
+        }
         moduleRecord.evaluated = true;
         Object.freeze(moduleRecord.module);
         return moduleRecord.module;
@@ -980,7 +989,7 @@ class ModuleRegistry {
         }
         const parentUrl = this.resolver.getBaseUrl(); // only support baseUrl for now
         const specifier = moduleName || originalId;
-        this.profiler.logOperationStart({ id: METRIC_MODULE_FETCH, specifier });
+        this.profiler.logOperationStart({ id: MODULE_FETCH, specifier });
         return Promise.resolve()
             .then(async () => {
             const loadHooks = this.loadHook;
@@ -1018,10 +1027,11 @@ class ModuleRegistry {
             if (!moduleDef) {
                 throw new LoaderError(FAIL_INSTANTIATE, [resolvedId]);
             }
+            this.profiler.logOperationEnd({ id: MODULE_FETCH, specifier });
             return moduleDef;
         })
             .catch((e) => {
-            this.profiler.logOperationStart({ id: METRIC_MODULE_ERROR, specifier });
+            this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
             throw e;
         });
     }
@@ -1105,12 +1115,25 @@ class Loader {
                 logOperationStart: () => {
                     /* noop */
                 },
+                logOperationEnd: () => {
+                    /* noop */
+                },
             };
         }
         this.registry = new ModuleRegistry(Object.freeze({ endpoints: config.endpoints, baseUrl, profiler }));
+        // TODO: W-10539691 - temp workaround for LWR-Java -- remove once appId is implemented there
+        if (config.appMetadata && !config.appMetadata.appId) {
+            // Parse the appId from the bootstrapModule
+            // LWR-Java bootstrap module format: @lwr-bootstrap/my/app/v/0_0_1 -- my/app is the appId
+            const match = config.appMetadata.bootstrapModule.match(/@lwr-bootstrap\/(.+)\/v\/.+/);
+            const appId = match && match[1];
+            config.appMetadata.appId = appId;
+        }
+        // TODO: https://github.com/salesforce/lwr/issues/1087
         this.services = Object.freeze({
             addLoaderPlugin: this.registry.addLoaderPlugin.bind(this.registry),
             handleStaleModule: this.registry.registerHandleStaleModuleHook.bind(this.registry),
+            appMetadata: config.appMetadata,
         });
     }
     /**

package/build/modules/lwr/loaderLegacy/loaderLegacy.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 Legacy Module Loader v0.6.0-alpha.9 */
+/* LWR Legacy Module Loader v0.6.2 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -401,14 +401,22 @@ function evaluateHandleStaleModuleHooks(handleStaleModuleHooks, hookArgs) {
     }
 }
 
+// Bootstrap / shim
+
+const LOADER_PREFIX = 'lwr.loader.';
+const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
+const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
+const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
+
 /* global console,process */
 class ModuleRegistry {
-    constructor(baseUrl) {
+    constructor(config) {
         // A registry for named AMD defines containing the *metadata* of AMD module
         this.namedDefineRegistry = new Map();
         // The evaluted module registry where the module identifier (name or URL?) is the key
         this.moduleRegistry = new Map();
-        this.baseUrl = baseUrl;
+        this.baseUrl = config.baseUrl;
+        this.profiler = config.profiler;
     }
     async load(id, importer) {
         const resolvedId = await this.resolve(id, importer);
@@ -523,6 +531,7 @@ class ModuleRegistry {
             // if module is "external", resolve the external promise to notify any dependees
             mod.external.resolveExternal(moduleDef);
         }
+        this.profiler.logOperationStart({ id: MODULE_DEFINE, specifier: name });
         this.namedDefineRegistry.set(name, moduleDef);
         this.lastDefine = moduleDef;
         // Check signatures of dependencies against those in the namedDefineRegistry
@@ -743,6 +752,9 @@ class ModuleRegistry {
         if (moduleExports.__defaultInterop) {
             Object.defineProperty(moduleRecord.module, '__defaultInterop', { value: true });
         }
+        if (moduleExports.__esModule) {
+            Object.defineProperty(moduleRecord.module, '__esModule', { value: true });
+        }
         moduleRecord.evaluated = true;
         Object.freeze(moduleRecord.module);
         return moduleRecord.module;
@@ -790,6 +802,8 @@ class ModuleRegistry {
             return moduleDef;
         }
         const parentUrl = this.baseUrl; // only support baseUrl for now
+        const specifier = moduleName || originalId;
+        this.profiler.logOperationStart({ id: MODULE_FETCH, specifier });
         return Promise.resolve()
             .then(async () => {
             const loadHooks = this.loadHook;
@@ -827,9 +841,11 @@ class ModuleRegistry {
             if (!moduleDef) {
                 throw new LoaderError(FAIL_INSTANTIATE, [resolvedId]);
             }
+            this.profiler.logOperationEnd({ id: MODULE_FETCH, specifier });
             return moduleDef;
         })
             .catch((e) => {
+            this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
             throw e;
         });
     }
@@ -1057,7 +1073,10 @@ async function evaluateImportMaps(baseUrl) {
  * The LWR loader is inspired and borrows from the algorithms and native browser principles of https://github.com/systemjs/systemjs
  */
 class Loader {
-    constructor(baseUrl) {
+    constructor(config) {
+        config = config || {};
+        let baseUrl = config.baseUrl;
+        let profiler = config.profiler;
         if (baseUrl) {
             // add a trailing slash, if it does not exist
             baseUrl = baseUrl.replace(/\/?$/, '/');
@@ -1069,10 +1088,23 @@ class Loader {
             throw new LoaderError(NO_BASE_URL);
         }
         this.baseUrl = baseUrl;
-        this.registry = new ModuleRegistry(baseUrl);
+        if (!profiler) {
+            // default noop profiler
+            profiler = {
+                logOperationStart: () => {
+                    /* noop */
+                },
+                logOperationEnd: () => {
+                    /* noop */
+                },
+            };
+        }
+        this.registry = new ModuleRegistry({ baseUrl, profiler });
+        // TODO: https://github.com/salesforce/lwr/issues/1087
         this.services = Object.freeze({
             addLoaderPlugin: this.registry.addLoaderPlugin.bind(this.registry),
             handleStaleModule: this.registry.registerHandleStaleModuleHook.bind(this.registry),
+            appMetadata: config.appMetadata,
         });
     }
     /**

package/package.json

@@ -5,7 +5,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0-alpha.9",
+    "version": "0.6.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -24,6 +24,10 @@
             "import": "./build/index.js",
             "require": "./build/cjs/index.cjs"
         },
+        "./metrics": {
+            "import": "./build/metrics.js",
+            "require": "./build/cjs/metrics.cjs"
+        },
         "./prod-loader-shim": "./build/assets/prod/lwr-loader-shim.js",
         "./prod-loader-shim-bundle": "./build/assets/prod/lwr-loader-shim.bundle.js",
         "./prod-loader-shim-bundle-min": "./build/assets/prod/lwr-loader-shim.bundle.min.js",
@@ -51,16 +55,17 @@
         "build:shim:bundle:minify": "MINIFY=true yarn build:shim:bundle",
         "build:shim": "rollup --config scripts/rollup-shim.config.cjs",
         "build:loader": "rollup --config scripts/rollup.config.cjs",
-        "build": "tsc -b; yarn build:shim && yarn build:loader && yarn build:shim:bundle && yarn build:shim:bundle:minify"
+        "build:ts": "tsc -b",
+        "build": "yarn build:ts && yarn build:shim && yarn build:loader && yarn build:shim:bundle && yarn build:shim:bundle:minify"
     },
     "devDependencies": {
-        "@lwrjs/compiler": "0.6.0-alpha.9",
-        "@lwrjs/diagnostics": "0.6.0-alpha.9",
-        "@lwrjs/types": "0.6.0-alpha.9",
+        "@lwrjs/compiler": "0.6.2",
+        "@lwrjs/diagnostics": "0.6.2",
+        "@lwrjs/types": "0.6.2",
         "rollup-plugin-terser": "^7.0.2"
     },
     "dependencies": {
-        "@lwrjs/shared-utils": "0.6.0-alpha.9"
+        "@lwrjs/shared-utils": "0.6.2"
     },
     "lwc": {
         "modules": [
@@ -77,5 +82,5 @@
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "9cb371a5d01ef345660138a48fe0b3f0119d0799"
+    "gitHead": "ef85bdc48adde58b7c648561d67acbb408bbe189"
 }