@lwrjs/loader 0.17.2-alpha.9 → 0.17.2

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.17.2-alpha.9 */
+/* LWR Module Loader v0.17.2 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -538,20 +538,21 @@ class ImportMetadataResolver {
         if (!uri) {
             throw new LoaderError(UNRESOLVEABLE_MAPPING_ERROR, [specifier]);
         }
-        return globalThis.fetch(uri).then((res) => {
-            if (!res.ok) {
-                this.config.profiler.logOperationStart({ id: MAPPINGS_ERROR, specifier });
-                throw new LoaderError(UNRESOLVED, [specifier]);
-            }
-            return res
-                .json()
-                .then((ret) => {
-                    return ret ;
-                })
-                .catch((err) => {
+
+        return globalThis
+            .fetch(uri)
+            .then((res) => {
+                if (!res.ok) {
+                    this.config.profiler.logOperationStart({ id: MAPPINGS_ERROR, specifier });
                     throw new LoaderError(UNRESOLVED, [specifier]);
+                }
+                return res.json().then((ret) => {
+                    return ret ;
                 });
-        });
+            })
+            .catch((err) => {
+                throw new LoaderError(UNRESOLVED, [specifier]);
+            });
     }
 
      saveImportURIRecord(specifier, uri, identity, isRoot) {
@@ -608,15 +609,28 @@ var MODULE_WARNING; (function (MODULE_WARNING) {
  */
 // @ts-ignore: Prevent cannot find name 'trustedTypes' error.
 const SUPPORTS_TRUSTED_TYPES = typeof trustedTypes !== 'undefined';
-function createTrustedTypesPolicy(name, options) {
+const trustedTypePolicyRegistry = {
+  __proto__: null
+};
+function createDuplicateSafeTrustedTypesPolicy(name, options) {
+  // istanbul ignore next: not testable in coverage collection
+  if (trustedTypePolicyRegistry[name]) {
+    return trustedTypePolicyRegistry[name];
+  }
   // @ts-ignore: Prevent cannot find name 'trustedTypes' error.
-  return trustedTypes.createPolicy(name, options);
+  // eslint-disable-next-line no-return-assign
+  return trustedTypePolicyRegistry[name] = trustedTypes.createPolicy(name, options);
 }
-function createFallbackPolicy(_name, options) {
-  return options;
+function createDuplicateSafeFallbackPolicy(name, options) {
+  if (trustedTypePolicyRegistry[name]) {
+    return trustedTypePolicyRegistry[name];
+  }
+  // @ts-ignore: Prevent cannot find name 'trustedTypes' error.
+  // eslint-disable-next-line no-return-assign
+  return trustedTypePolicyRegistry[name] = options;
 }
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/trusted-types
-const createPolicy = SUPPORTS_TRUSTED_TYPES ? createTrustedTypesPolicy : createFallbackPolicy;
+const createPolicy = SUPPORTS_TRUSTED_TYPES ? createDuplicateSafeTrustedTypesPolicy : createDuplicateSafeFallbackPolicy;
 const policyOptions = {
   createHTML(value) {
     return value;
@@ -664,7 +678,7 @@ try {
   // swallow
 }
 const trusted = createPolicy('trusted', policyOptions);
-/*! version: 0.23.6 */
+/*! version: 0.24.6 */
 
 /* global console,process */
 
@@ -734,7 +748,7 @@ async function evaluateLoadHookResponse(response, id) {
         code = `${code}\n//# sourceURL=${id}`; // append sourceURL for debugging
         try {
             // TODO eval source maps for debugging
-            eval(trusted.createScript(code));
+            eval(trusted.createScript(code) );
         } catch (e) {
             // eslint-disable-next-line lwr/no-unguarded-apis
             if (process.env.NODE_ENV !== 'production' && hasConsole) {
@@ -1144,7 +1158,25 @@ class ModuleRegistry {
     }
 
      async getModuleDependencyRecord(dependency) {
-        const resolvedDepId = await this.resolve(dependency);
+        // Initially resolve the dependency to get its ID, which may be a bundle URL.
+        let resolvedDepId = await this.resolve(dependency);
+
+        // If the resolved dependency ID is a URL, it indicates that the dependency
+        // is provided by a bundle that hasn't been fully instantiated yet.
+        if (isUrl(resolvedDepId)) {
+            // Retrieve the module record corresponding to the bundle URL.
+            const existingRecord = this.moduleRegistry.get(resolvedDepId);
+
+            // If a module record for the bundle exists and we haven't already created an alias for this dependency,
+            // then the bundle is still pending instantiation.
+            if (existingRecord && !this.aliases.has(dependency)) {
+                // Wait for the bundle's instantiation promise to resolve.
+                await existingRecord.instantiation;
+                // After instantiation, re-resolve the dependency.
+                // This should now return the final alias (the logical module ID) instead of the raw bundle URL.
+                resolvedDepId = await this.resolve(dependency);
+            }
+        }
         return this.getModuleRecord(resolvedDepId, dependency);
     }
 
@@ -1368,6 +1400,10 @@ class ModuleRegistry {
 
                 // Fallback to the last loader.define call
                 if (!moduleDef) {
+                    this.logMessage(
+                        'warning',
+                        `${moduleName} not found, falling back to the last loader.define call`,
+                    );
                     moduleDef = this.lastDefine;
                 }
 

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

@@ -177,19 +177,19 @@ export class ImportMetadataResolver {
         if (!uri) {
             throw new LoaderError(UNRESOLVEABLE_MAPPING_ERROR, [specifier]);
         }
-        return globalThis.fetch(uri).then((res) => {
+        return globalThis
+            .fetch(uri)
+            .then((res) => {
             if (!res.ok) {
                 this.config.profiler.logOperationStart({ id: MAPPINGS_ERROR, specifier });
                 throw new LoaderError(UNRESOLVED, [specifier]);
             }
-            return res
-                .json()
-                .then((ret) => {
+            return res.json().then((ret) => {
                 return ret;
-            })
-                .catch((err) => {
-                throw new LoaderError(UNRESOLVED, [specifier]);
             });
+        })
+            .catch((err) => {
+            throw new LoaderError(UNRESOLVED, [specifier]);
         });
     }
     saveImportURIRecord(specifier, uri, identity, isRoot) {

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

@@ -289,7 +289,23 @@ export class ModuleRegistry {
         }
     }
     async getModuleDependencyRecord(dependency) {
-        const resolvedDepId = await this.resolve(dependency);
+        // Initially resolve the dependency to get its ID, which may be a bundle URL.
+        let resolvedDepId = await this.resolve(dependency);
+        // If the resolved dependency ID is a URL, it indicates that the dependency
+        // is provided by a bundle that hasn't been fully instantiated yet.
+        if (isUrl(resolvedDepId)) {
+            // Retrieve the module record corresponding to the bundle URL.
+            const existingRecord = this.moduleRegistry.get(resolvedDepId);
+            // If a module record for the bundle exists and we haven't already created an alias for this dependency,
+            // then the bundle is still pending instantiation.
+            if (existingRecord && !this.aliases.has(dependency)) {
+                // Wait for the bundle's instantiation promise to resolve.
+                await existingRecord.instantiation;
+                // After instantiation, re-resolve the dependency.
+                // This should now return the final alias (the logical module ID) instead of the raw bundle URL.
+                resolvedDepId = await this.resolve(dependency);
+            }
+        }
         return this.getModuleRecord(resolvedDepId, dependency);
     }
     // execute the "top-level code" (the code outside of functions) of a module
@@ -478,6 +494,7 @@ export class ModuleRegistry {
             moduleDef = moduleName && this.namedDefineRegistry.get(moduleName);
             // Fallback to the last loader.define call
             if (!moduleDef) {
+                this.logMessage('warning', `${moduleName} not found, falling back to the last loader.define call`);
                 moduleDef = this.lastDefine;
             }
             // This should not happen

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.17.2-alpha.9 */
+/* LWR Legacy Module Loader v0.17.2 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -331,15 +331,28 @@ var MODULE_WARNING; (function (MODULE_WARNING) {
  */
 // @ts-ignore: Prevent cannot find name 'trustedTypes' error.
 const SUPPORTS_TRUSTED_TYPES = typeof trustedTypes !== 'undefined';
-function createTrustedTypesPolicy(name, options) {
+const trustedTypePolicyRegistry = {
+  __proto__: null
+};
+function createDuplicateSafeTrustedTypesPolicy(name, options) {
+  // istanbul ignore next: not testable in coverage collection
+  if (trustedTypePolicyRegistry[name]) {
+    return trustedTypePolicyRegistry[name];
+  }
   // @ts-ignore: Prevent cannot find name 'trustedTypes' error.
-  return trustedTypes.createPolicy(name, options);
+  // eslint-disable-next-line no-return-assign
+  return trustedTypePolicyRegistry[name] = trustedTypes.createPolicy(name, options);
 }
-function createFallbackPolicy(_name, options) {
-  return options;
+function createDuplicateSafeFallbackPolicy(name, options) {
+  if (trustedTypePolicyRegistry[name]) {
+    return trustedTypePolicyRegistry[name];
+  }
+  // @ts-ignore: Prevent cannot find name 'trustedTypes' error.
+  // eslint-disable-next-line no-return-assign
+  return trustedTypePolicyRegistry[name] = options;
 }
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/trusted-types
-const createPolicy = SUPPORTS_TRUSTED_TYPES ? createTrustedTypesPolicy : createFallbackPolicy;
+const createPolicy = SUPPORTS_TRUSTED_TYPES ? createDuplicateSafeTrustedTypesPolicy : createDuplicateSafeFallbackPolicy;
 const policyOptions = {
   createHTML(value) {
     return value;
@@ -387,7 +400,7 @@ try {
   // swallow
 }
 const trusted = createPolicy('trusted', policyOptions);
-/*! version: 0.23.6 */
+/*! version: 0.24.6 */
 
 /* global console,process */
 
@@ -457,7 +470,7 @@ async function evaluateLoadHookResponse(response, id) {
         code = `${code}\n//# sourceURL=${id}`; // append sourceURL for debugging
         try {
             // TODO eval source maps for debugging
-            eval(trusted.createScript(code));
+            eval(trusted.createScript(code) );
         } catch (e) {
             // eslint-disable-next-line lwr/no-unguarded-apis
             if (process.env.NODE_ENV !== 'production' && hasConsole) {
@@ -954,7 +967,23 @@ class ModuleRegistry {
     }
 
      async getModuleDependencyRecord(dependency) {
-        const resolvedDepId = await this.resolve(dependency);
+        let resolvedDepId = await this.resolve(dependency);
+        // If the resolved dependency ID is a URL, it indicates that the dependency
+        // is provided by a bundle that hasn't been fully instantiated yet.
+        if (isUrl(resolvedDepId)) {
+            // Retrieve the module record corresponding to the bundle URL.
+            const existingRecord = this.moduleRegistry.get(resolvedDepId);
+
+            // If a module record for the bundle exists and we haven't already created an alias for this dependency,
+            // then the bundle is still pending instantiation.
+            if (existingRecord && !this.aliases.has(dependency)) {
+                // Wait for the bundle's instantiation promise to resolve.
+                await existingRecord.instantiation;
+                // After instantiation, re-resolve the dependency.
+                // This should now return the final alias (the logical module ID) instead of the raw bundle URL.
+                resolvedDepId = await this.resolve(dependency);
+            }
+        }
         return this.getModuleRecord(resolvedDepId, dependency);
     }
 
@@ -1179,6 +1208,10 @@ class ModuleRegistry {
 
                 // Fallback to the last loader.define call
                 if (!moduleDef) {
+                    this.logMessage(
+                        'warning',
+                        `${moduleName} not found, falling back to the last loader.define call`,
+                    );
                     moduleDef = this.lastDefine;
                 }
 
@@ -1603,11 +1636,9 @@ class Loader {
             sigs = execute;
         }
 
-        sigs = sigs || {};
-
         invariant(Array.isArray(deps), INVALID_DEPS);
 
-        this.registry.define(name, deps, ctor , sigs );
+        this.registry.define(name, deps, ctor , (sigs || {}) );
     }
 
     /**

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

@@ -327,7 +327,22 @@ export class ModuleRegistry {
         }
     }
     async getModuleDependencyRecord(dependency) {
-        const resolvedDepId = await this.resolve(dependency);
+        let resolvedDepId = await this.resolve(dependency);
+        // If the resolved dependency ID is a URL, it indicates that the dependency
+        // is provided by a bundle that hasn't been fully instantiated yet.
+        if (isUrl(resolvedDepId)) {
+            // Retrieve the module record corresponding to the bundle URL.
+            const existingRecord = this.moduleRegistry.get(resolvedDepId);
+            // If a module record for the bundle exists and we haven't already created an alias for this dependency,
+            // then the bundle is still pending instantiation.
+            if (existingRecord && !this.aliases.has(dependency)) {
+                // Wait for the bundle's instantiation promise to resolve.
+                await existingRecord.instantiation;
+                // After instantiation, re-resolve the dependency.
+                // This should now return the final alias (the logical module ID) instead of the raw bundle URL.
+                resolvedDepId = await this.resolve(dependency);
+            }
+        }
         return this.getModuleRecord(resolvedDepId, dependency);
     }
     // execute the "top-level code" (the code outside of functions) of a module
@@ -516,6 +531,7 @@ export class ModuleRegistry {
             moduleDef = moduleName && this.namedDefineRegistry.get(moduleName);
             // Fallback to the last loader.define call
             if (!moduleDef) {
+                this.logMessage('warning', `${moduleName} not found, falling back to the last loader.define call`);
                 moduleDef = this.lastDefine;
             }
             // This should not happen

package/build/shim/shim.d.ts

@@ -22,6 +22,7 @@ export default class LoaderShim {
     private tempDefine;
     private postCustomInit;
     private initApp;
+    private waitForBody;
     private waitForDOMContentLoaded;
     private createProfilerModule;
     private mountApp;

package/build/shim/shim.js

@@ -115,11 +115,25 @@ export default class LoaderShim {
             this.enterErrorState(e);
         }
     }
+    waitForBody() {
+        return new Promise((resolve) => {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            if (document.body) {
+                resolve();
+            }
+            else {
+                const observer = new MutationObserver(() => {
+                    // eslint-disable-next-line lwr/no-unguarded-apis
+                    if (document.body) {
+                        observer.disconnect();
+                        resolve();
+                    }
+                });
+                observer.observe(document.documentElement, { childList: true });
+            }
+        });
+    }
     waitForDOMContentLoaded() {
-        // eslint-disable-next-line lwr/no-unguarded-apis
-        if (typeof document === undefined) {
-            return Promise.resolve();
-        }
         // Resolve if document is already "ready" https://developer.mozilla.org/en-US/docs/Web/API/Document/readyState
         // eslint-disable-next-line lwr/no-unguarded-apis
         if (document.readyState === 'interactive' || document.readyState === 'complete') {
@@ -161,8 +175,9 @@ export default class LoaderShim {
                 loader.define(...this.defineCache[specifier]);
             }
         });
-        // by default, app initialization is gated on waiting for document to be parsed (via DOMContentLoaded)
-        const { disableInitDefer } = this.config;
+        // by default, app initialization is gated on waiting for body to be available
+        // this flag uses the DOMContentLoaded event instead
+        const { initDeferDOM } = this.config;
         // Load the import mappings and application bootstrap module
         loader
             .registerImportMappings({ imports: importsObj, index }, [
@@ -170,9 +185,14 @@ export default class LoaderShim {
             rootComponent,
         ])
             .then(() => {
-            if (!disableInitDefer) {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            if (typeof window === 'undefined' || typeof document === undefined) {
+                return Promise.resolve();
+            }
+            if (initDeferDOM) {
                 return this.waitForDOMContentLoaded();
             }
+            return this.waitForBody();
         })
             .then(() => loader.load(bootstrapModule))
             .catch((reason) => {

package/build/shim-legacy/shimLegacy.d.ts

@@ -22,6 +22,7 @@ export default class LoaderShim {
     private tempDefine;
     private postCustomInit;
     private initApp;
+    private waitForBody;
     private waitForDOMContentLoaded;
     private createProfilerModule;
     private mountApp;

package/build/shim-legacy/shimLegacy.js

@@ -114,11 +114,25 @@ export default class LoaderShim {
             this.enterErrorState(e);
         }
     }
+    waitForBody() {
+        return new Promise((resolve) => {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            if (document.body) {
+                resolve();
+            }
+            else {
+                const observer = new MutationObserver(() => {
+                    // eslint-disable-next-line lwr/no-unguarded-apis
+                    if (document.body) {
+                        observer.disconnect();
+                        resolve();
+                    }
+                });
+                observer.observe(document.documentElement, { childList: true });
+            }
+        });
+    }
     waitForDOMContentLoaded() {
-        // eslint-disable-next-line lwr/no-unguarded-apis
-        if (typeof document === undefined) {
-            return Promise.resolve();
-        }
         // Resolve if document is already "ready" https://developer.mozilla.org/en-US/docs/Web/API/Document/readyState
         // eslint-disable-next-line lwr/no-unguarded-apis
         if (document.readyState === 'interactive' || document.readyState === 'complete') {
@@ -158,15 +172,21 @@ export default class LoaderShim {
                 loader.define(...this.defineCache[specifier]);
             }
         });
-        // by default, app initialization is gated on waiting for document to be parsed (via DOMContentLoaded)
-        const { disableInitDefer } = this.config;
+        // by default, app initialization is gated on waiting for body to be available
+        // this flag uses the DOMContentLoaded event instead
+        const { initDeferDOM } = this.config;
         // Load the import mappings and application bootstrap module
         loader
             .registerImportMappings(importMappings)
             .then(() => {
-            if (!disableInitDefer) {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            if (typeof window === 'undefined' || typeof document === undefined) {
+                return Promise.resolve();
+            }
+            if (initDeferDOM) {
                 return this.waitForDOMContentLoaded();
             }
+            return this.waitForBody();
         })
             .then(() => loader.load(bootstrapModule))
             .catch((reason) => {

package/package.json

@@ -5,7 +5,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.2-alpha.9",
+    "version": "0.17.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -60,17 +60,17 @@
         "build": "yarn build:ts && yarn build:error-shim && yarn build:shim && yarn build:loader && yarn build:shim:bundle && yarn build:shim:bundle:minify"
     },
     "devDependencies": {
-        "@locker/trusted-types": "0.23.6",
-        "@lwrjs/diagnostics": "0.17.2-alpha.9",
-        "@lwrjs/types": "0.17.2-alpha.9",
+        "@locker/trusted-types": "0.24.6",
+        "@lwrjs/diagnostics": "0.17.2",
+        "@lwrjs/types": "0.17.2",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-sucrase": "^5.0.2",
         "@rollup/plugin-terser": "^0.4.4",
         "rollup": "^2.79.2"
     },
     "dependencies": {
-        "@lwrjs/client-modules": "0.17.2-alpha.9",
-        "@lwrjs/shared-utils": "0.17.2-alpha.9"
+        "@lwrjs/client-modules": "0.17.2",
+        "@lwrjs/shared-utils": "0.17.2"
     },
     "lwc": {
         "modules": [
@@ -85,10 +85,10 @@
         ]
     },
     "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
     },
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "7ede5d04a97513b9869b13e66155bc4f3920bb99"
+    "gitHead": "d64d8888a28da36c05e3d8d9baf51416551863a9"
 }