@lwrjs/loader 0.9.0-alpha.8 → 0.9.0

package/build/modules/lwr/esmLoader/esmLoader.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 ESM Module Loader v0.9.0-alpha.8 */
+/* LWR ESM Module Loader v0.9.0 */
 /**
  * Simplified version of the AMD Import Metadata Resolver.
  * Just reads the ImportMetadata at construction time.
@@ -87,37 +87,41 @@ async function load(specifier, importer) {
     return import(uri);
 }
 async function resolveUrl(specifier, importer) {
-    let uri;
+    var _a;
+    // HMR imports complete URIs when swapping out modules
+    if (specifier.includes('://') || specifier.startsWith('/')) {
+        return specifier;
+    }
     if (!resolver || !resolverLegacy) {
         throw new Error('The ESM Loader was not initialized');
     }
     // Check if the URI is in the import metadata
-    uri = await resolver.resolve(specifier);
-    if (uri) {
-        return uri;
+    if (resolver) {
+        const uri = await resolver.resolve(specifier);
+        if (uri) {
+            return uri;
+        }
     }
     // Check if the URI is in the legacy import metadata
-    uri = resolverLegacy.legacyResolve(specifier);
-    if (uri) {
-        return uri;
-    }
-    // Else fall back to the module endpoint
-    uri = specifier;
-    // do not alter the specifier if it is already a URL
-    if (uri.indexOf('://') < 0 && !uri.startsWith('/')) {
-        // add the specifier and importer to the default URI
-        const { endpoints } = esmLoaderConfig;
-        if (endpoints && endpoints.uris && endpoints.uris.module) {
-            uri = endpoints.uris.module + encodeURIComponent(specifier);
-            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 ? '&' : '?');
-            }
+    if (resolverLegacy) {
+        const uri = resolverLegacy.legacyResolve(specifier);
+        if (uri) {
+            return uri;
         }
     }
+    const { endpoints } = esmLoaderConfig;
+    if (!((_a = endpoints === null || endpoints === void 0 ? void 0 : endpoints.uris) === null || _a === void 0 ? void 0 : _a.module)) {
+        throw new Error(`Unable to resolve the URL for "${specifier}"`);
+    }
+    // add the specifier and importer to the default URI
+    let uri = endpoints.uris.module + encodeURIComponent(specifier);
+    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/__tests__/utils/amd.js

@@ -1,9 +1,8 @@
-import { LwrCompiler } from '@lwrjs/compiler'; // eslint-disable-line lwr/only-allowed-imports
 import { readFile } from '@lwrjs/shared-utils'; // eslint-disable-line lwr/only-allowed-imports
-const compiler = new LwrCompiler();
+import { convertToAmd } from '@lwrjs/shared-utils/compiler'; // eslint-disable-line lwr/only-allowed-imports
 export async function getAMDModule(specifier, filename, autoExports) {
     const code = readFile(filename);
-    const { code: amdModule } = await compiler.convertToAmd(code, { id: specifier }, autoExports !== true);
+    const { code: amdModule } = await convertToAmd(code, { id: specifier }, autoExports !== true);
     return amdModule;
 }
 export function evaluateDefine(moduleString) {

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.9.0-alpha.8 */
+/* LWR Module Loader v0.9.0 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -102,7 +102,7 @@ const STALE_HOOK_ERROR = Object.freeze({
 const MODULE_ALREADY_LOADED = Object.freeze({
     code: 3017,
     level: 0,
-    message: 'Marking module(s) as externally loaded, but they are already loaded: {0}',
+    message: 'Marking module(s) as externally loaded, but they are already loaded:',
 });
 const FAIL_HOOK_LOAD = Object.freeze({
     code: 3018,
@@ -301,11 +301,13 @@ if (hasDocument) {
 
 // Bootstrap / shim
 
+// Loader: modules
 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`;
 
+// Loader: mappings
 const MAPPINGS_FETCH = `${LOADER_PREFIX}mappings.fetch`;
 const MAPPINGS_ERROR = `${LOADER_PREFIX}mappings.error`;
 
@@ -766,12 +768,8 @@ class ModuleRegistry {
      * @param modules - list of module identifiers
      */
     registerExternalModules(modules) {
-        const alreadyRegistered = [];
         modules.map((id) => {
-            if (this.namedDefineRegistry.has(id)) {
-                alreadyRegistered.push(id);
-            }
-            else {
+            if (!this.namedDefineRegistry.has(id)) {
                 let resolveExternal;
                 let timer;
                 const moduleDefPromise = new Promise((resolve, reject) => {
@@ -795,11 +793,11 @@ class ModuleRegistry {
                 };
                 this.namedDefineRegistry.set(id, moduleDef);
             }
+            else if (process.env.NODE_ENV !== 'production' && hasConsole) {
+                // eslint-disable-next-line lwr/no-unguarded-apis
+                console.warn(MODULE_ALREADY_LOADED.message, id);
+            }
         });
-        // throw error for modules that were already registered
-        if (alreadyRegistered.length) {
-            throw new LoaderError(MODULE_ALREADY_LOADED, [alreadyRegistered.join(', ')]);
-        }
     }
     getImportMetadataResolver() {
         return this.resolver;
@@ -941,7 +939,7 @@ class ModuleRegistry {
             moduleDefault = { default: moduleDefault };
             // __defaultInterop is ONLY used to support backwards compatibility
             // of importing default exports the "wrong" way (when not using named exports).
-            // See https://github.com/salesforce/lwr/pull/816
+            // See https://github.com/salesforce-experience-platform-emu/lwr/pull/816
             Object.defineProperty(moduleDefault, '__defaultInterop', { value: true });
         }
         // if no return value, then we are using the exports object
@@ -1163,7 +1161,7 @@ class Loader {
             const appId = match && match[1];
             config.appMetadata.appId = appId;
         }
-        // TODO: https://github.com/salesforce/lwr/issues/1087
+        // TODO: https://github.com/salesforce-experience-platform-emu/lwr/issues/1087
         this.services = Object.freeze({
             addLoaderPlugin: this.registry.addLoaderPlugin.bind(this.registry),
             handleStaleModule: this.registry.registerHandleStaleModuleHook.bind(this.registry),

package/build/modules/lwr/loaderLegacy/__tests__/utils/amd.js

@@ -1,9 +1,8 @@
-import { LwrCompiler } from '@lwrjs/compiler'; // eslint-disable-line lwr/only-allowed-imports
-import { readFile } from '@lwrjs/shared-utils'; // eslint-disable-line lwr/only-allowed-imports
-const compiler = new LwrCompiler();
+import { getImportMetadata, readFile } from '@lwrjs/shared-utils'; // eslint-disable-line lwr/only-allowed-imports
+import { convertToAmd } from '@lwrjs/shared-utils/compiler'; // eslint-disable-line lwr/only-allowed-imports
 export async function getAMDModule(specifier, filename, fixtureHashes, autoExports) {
     const code = readFile(filename);
-    const metadata = await compiler.getModuleMetadata(code);
+    const metadata = await getImportMetadata(code);
     const depHashes = {};
     if (metadata && metadata.imports && metadata.imports.length > 0) {
         metadata.imports.forEach((dependency) => {
@@ -11,7 +10,7 @@ export async function getAMDModule(specifier, filename, fixtureHashes, autoExpor
             depHashes[specifier] = fixtureHashes[specifier];
         });
     }
-    const { code: amdModule } = await compiler.convertToAmd(code, { id: specifier }, autoExports !== true);
+    const { code: amdModule } = await convertToAmd(code, { id: specifier }, autoExports !== true);
     const openAmdCodeString = amdModule.trim().slice(0, -2);
     const signedCode = `${openAmdCodeString}, ${JSON.stringify({
         ownHash: fixtureHashes[specifier],

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.9.0-alpha.8 */
+/* LWR Legacy Module Loader v0.9.0 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -402,6 +402,7 @@ function evaluateHandleStaleModuleHooks(handleStaleModuleHooks, hookArgs) {
 
 // Bootstrap / shim
 
+// Loader: modules
 const LOADER_PREFIX = 'lwr.loader.';
 const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
 const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
@@ -548,12 +549,8 @@ class ModuleRegistry {
      * @param modules - list of module identifiers
      */
     registerExternalModules(modules) {
-        const alreadyRegistered = [];
         modules.map((id) => {
-            if (this.namedDefineRegistry.has(id)) {
-                alreadyRegistered.push(id);
-            }
-            else {
+            if (!this.namedDefineRegistry.has(id)) {
                 let resolveExternal;
                 let timer;
                 const moduleDefPromise = new Promise((resolve, reject) => {
@@ -577,11 +574,11 @@ class ModuleRegistry {
                 };
                 this.namedDefineRegistry.set(id, moduleDef);
             }
+            else if (process.env.NODE_ENV !== 'production' && hasConsole) {
+                // eslint-disable-next-line lwr/no-unguarded-apis
+                console.warn(MODULE_ALREADY_LOADED.message, id);
+            }
         });
-        // throw error for modules that were already registered
-        if (alreadyRegistered.length) {
-            throw new LoaderError(MODULE_ALREADY_LOADED, [alreadyRegistered.join(', ')]);
-        }
     }
     checkModuleSignature(name, signature) {
         const moduleDef = this.namedDefineRegistry.get(name);
@@ -755,7 +752,7 @@ class ModuleRegistry {
             moduleDefault = { default: moduleDefault };
             // __defaultInterop is ONLY used to support backwards compatibility
             // of importing default exports the "wrong" way (when not using named exports).
-            // See https://github.com/salesforce/lwr/pull/816
+            // See https://github.com/salesforce-experience-platform-emu/lwr/pull/816
             Object.defineProperty(moduleDefault, '__defaultInterop', { value: true });
         }
         // if no return value, then we are using the exports object
@@ -967,7 +964,7 @@ function applyPackages(id, packages, defaultUri) {
         // When a specifier's URI cannot be resolved via the imports, fallback to "default".
         //     -> https://rfcs.lwc.dev/rfcs/lwr/0000-import-metadata#json-schema
         // However, if `id` is already a fully resolved url,
-        // we cannot prepend the defaultUri -> https://github.com/salesforce/lwr/issues/378.
+        // we cannot prepend the defaultUri -> https://github.com/salesforce-experience-platform-emu/lwr/issues/378.
         // In this case we do not apply any package mappings and allow the caller (resolveImportMapEntry) to handle it.
         if (!isUrl(id)) {
             return defaultUri + encodeURIComponent(id);
@@ -1134,7 +1131,7 @@ class Loader {
             };
         }
         this.registry = new ModuleRegistry({ baseUrl, profiler });
-        // TODO: https://github.com/salesforce/lwr/issues/1087
+        // TODO: https://github.com/salesforce-experience-platform-emu/lwr/issues/1087
         this.services = Object.freeze({
             addLoaderPlugin: this.registry.addLoaderPlugin.bind(this.registry),
             handleStaleModule: this.registry.registerHandleStaleModuleHook.bind(this.registry),

package/package.json

@@ -5,15 +5,15 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.8",
+    "version": "0.9.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
-        "url": "https://github.com/salesforce/lwr.git",
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr.git",
         "directory": "packages/@lwrjs/loader"
     },
     "bugs": {
-        "url": "https://github.com/salesforce/lwr/issues"
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr/issues"
     },
     "type": "module",
     "types": "build/index.d.ts",
@@ -61,13 +61,14 @@
         "build": "yarn build:ts && yarn build:error-shim && yarn build:shim && yarn build:loader && yarn build:shim:bundle && yarn build:shim:bundle:minify"
     },
     "devDependencies": {
-        "@lwrjs/compiler": "0.9.0-alpha.8",
-        "@lwrjs/diagnostics": "0.9.0-alpha.8",
-        "@lwrjs/types": "0.9.0-alpha.8",
+        "@locker/compiler": "0.18.14",
+        "@lwrjs/diagnostics": "0.9.0",
+        "@lwrjs/types": "0.9.0",
+        "rollup": "~2.45.2",
         "rollup-plugin-terser": "^7.0.2"
     },
     "dependencies": {
-        "@lwrjs/shared-utils": "0.9.0-alpha.8"
+        "@lwrjs/shared-utils": "0.9.0"
     },
     "lwc": {
         "modules": [
@@ -82,7 +83,7 @@
         ]
     },
     "engines": {
-        "node": ">=14.15.4 <19"
+        "node": ">=16.0.0 <20"
     },
-    "gitHead": "013fcee240ff2e1c23ef304e70fc39d6ef13fb8b"
+    "gitHead": "4e42b0dc5453f92b36b42aa8132c5bc281e616b7"
 }