@lwrjs/module-registry 0.6.0-alpha.11 → 0.6.0-alpha.15

package/build/cjs/index.cjs

@@ -161,7 +161,7 @@ var LwrModuleRegistry = class {
         id,
         code: linkedES6,
         linkedModuleRecord
-      } = await (0, import_linker.link)(this, moduleDef, import_amd_strategy.default, runtimeEnvironment, runtimeParams, {
+      } = await (0, import_linker.link)(this, moduleDef, import_amd_strategy.default, import_esm_strategy.default, runtimeEnvironment, runtimeParams, {
         amdLoaderModule: loaderModuleEntry
       }, this.interchangeableModules);
       const {code: amdSource} = await this.context.compiler.convertToAmd(linkedES6, {
@@ -185,10 +185,10 @@ var LwrModuleRegistry = class {
     } else {
       let loaderModuleEntry;
       const dynamicImports = moduleDef.moduleRecord.dynamicImports;
-      if (moduleDef.moduleEntry.specifier !== esmLoader && dynamicImports && dynamicImports.some((d) => d.moduleNameType === import_shared_utils.ModuleNameType.unresolved)) {
+      if (moduleDef.moduleEntry.specifier !== esmLoader && dynamicImports) {
         loaderModuleEntry = await this.getModuleEntry({specifier: esmLoader}, runtimeParams);
       }
-      const {code: esmLinkedSource, linkedModuleRecord} = await (0, import_linker.link)(this, moduleDef, import_esm_strategy.default, runtimeEnvironment, runtimeParams, loaderModuleEntry && {
+      const {code: esmLinkedSource, linkedModuleRecord} = await (0, import_linker.link)(this, moduleDef, import_amd_strategy.default, import_esm_strategy.default, runtimeEnvironment, runtimeParams, loaderModuleEntry && {
         esmLoaderModule: loaderModuleEntry
       }, this.interchangeableModules, this.globalConfig.bundleConfig?.exclude);
       let transformedEsmCode = esmLinkedSource;

package/build/cjs/linker/linker.cjs

@@ -29,12 +29,13 @@ __export(exports, {
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_shared_utils2 = __toModule(require("@lwrjs/shared-utils"));
 var import_signature = __toModule(require("../signature.cjs"));
-async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironment, runtimeParams, config, interchangeableModules, exclude) {
+async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, runtimeEnvironment, runtimeParams, config, interchangeableModules, exclude) {
   const {specifier, version, compiledSource, moduleRecord} = moduleDef;
   const {imports, dynamicImports} = moduleRecord;
   const codeStringBuilder = (0, import_shared_utils.createStringBuilder)(compiledSource);
   const amdLoaderModule = config?.amdLoaderModule;
   const esmLoaderModule = config?.esmLoaderModule;
+  const strategy = amdLoaderModule ? versionStrategy : uriStrategy;
   const id = strategy({specifier, version}, runtimeEnvironment, runtimeParams);
   let linkedImports = [];
   let linkedDynamicImports = [];
@@ -84,14 +85,14 @@ async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironment, run
       if (isStringLiteral && runtimeEnvironment.bundle && runtimeEnvironment.format === "esm") {
         signature = await (0, import_signature.getBundleSignature)(importRef, moduleRegistry);
       }
-      const link2 = isStringLiteral ? strategy(importRef, runtimeEnvironment, runtimeParams, signature) : importRef.specifier;
+      const link2 = isStringLiteral ? versionStrategy(importRef, runtimeEnvironment, runtimeParams, signature) : importRef.specifier;
       const linkedLocations = locations.map(({location, importLocation}) => {
         const {startColumn, endColumn} = location;
         const {startColumn: importStart, endColumn: importEnd} = importLocation;
         if (isStringLiteral) {
           codeStringBuilder.overwrite(startColumn + 1, endColumn - 1, link2);
         }
-        if (amdLoaderModule || esmLoaderModule && !isStringLiteral) {
+        if (amdLoaderModule || esmLoaderModule) {
           codeStringBuilder.overwrite(importStart, importEnd, "load(");
           loaderSizeOffset = 2;
           if (!isStringLiteral) {

package/build/es/index.js

@@ -147,7 +147,7 @@ export class LwrModuleRegistry {
             // Resolve the loader entry
             const loaderModuleEntry = await this.getModuleEntry({ specifier: amdLoader }, runtimeParams);
             // transforms compiledModule into linkedModule (which means the imports may have changed)
-            const { id, code: linkedES6, linkedModuleRecord, } = await link(this, moduleDef, amdLinkingStrategy, runtimeEnvironment, runtimeParams, {
+            const { id, code: linkedES6, linkedModuleRecord, } = await link(this, moduleDef, amdLinkingStrategy, esmLinkingStrategy, runtimeEnvironment, runtimeParams, {
                 amdLoaderModule: loaderModuleEntry,
             }, this.interchangeableModules);
             // convert the linkedSource to the transport AMD format.
@@ -175,14 +175,12 @@ export class LwrModuleRegistry {
             // resolve the loader entry if there are VARIABLE dynamic imports
             let loaderModuleEntry;
             const dynamicImports = moduleDef.moduleRecord.dynamicImports;
-            if (moduleDef.moduleEntry.specifier !== esmLoader &&
-                dynamicImports &&
-                dynamicImports.some((d) => d.moduleNameType === ModuleNameType.unresolved)) {
-                // ONLY include the ESM loader if there are VARIABLE dynamic imports
+            if (moduleDef.moduleEntry.specifier !== esmLoader && dynamicImports) {
+                // ONLY include the ESM loader if there are dynamic imports
                 // AND this is not the ESM loader itself (it uses a variable dynamic import we DO NOT want to link)
                 loaderModuleEntry = await this.getModuleEntry({ specifier: esmLoader }, runtimeParams);
             }
-            const { code: esmLinkedSource, linkedModuleRecord } = await link(this, moduleDef, esmLinkingStrategy, runtimeEnvironment, runtimeParams, loaderModuleEntry && {
+            const { code: esmLinkedSource, linkedModuleRecord } = await link(this, moduleDef, amdLinkingStrategy, esmLinkingStrategy, runtimeEnvironment, runtimeParams, loaderModuleEntry && {
                 esmLoaderModule: loaderModuleEntry,
             }, this.interchangeableModules, this.globalConfig.bundleConfig?.exclude);
             let transformedEsmCode = esmLinkedSource;

package/build/es/linker/linker.d.ts

@@ -24,6 +24,6 @@ export interface ModuleLinkResult {
  * @param moduleRecord
  * @param strategy
  */
-export declare function link(moduleRegistry: LwrModuleRegistry, moduleDef: ModuleDefinition, strategy: LinkingStrategy, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, config?: LinkerConfig, interchangeableModules?: InterchangeableModuleMap, exclude?: string[]): Promise<ModuleLinkResult>;
+export declare function link(moduleRegistry: LwrModuleRegistry, moduleDef: ModuleDefinition, versionStrategy: LinkingStrategy, uriStrategy: LinkingStrategy, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, config?: LinkerConfig, interchangeableModules?: InterchangeableModuleMap, exclude?: string[]): Promise<ModuleLinkResult>;
 export {};
 //# sourceMappingURL=linker.d.ts.map

package/build/es/linker/linker.js

@@ -7,12 +7,13 @@ import { getBundleSignature } from '../signature.js';
  * @param moduleRecord
  * @param strategy
  */
-export async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironment, runtimeParams, config, interchangeableModules, exclude) {
+export async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, runtimeEnvironment, runtimeParams, config, interchangeableModules, exclude) {
     const { specifier, version, compiledSource, moduleRecord } = moduleDef;
     const { imports, dynamicImports } = moduleRecord;
     const codeStringBuilder = createStringBuilder(compiledSource);
     const amdLoaderModule = config?.amdLoaderModule;
     const esmLoaderModule = config?.esmLoaderModule;
+    const strategy = amdLoaderModule ? versionStrategy : uriStrategy;
     const id = strategy({ specifier, version }, runtimeEnvironment, runtimeParams);
     // transform each import using the provided linking strategy.
     let linkedImports = [];
@@ -70,9 +71,11 @@ export async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironme
             if (isStringLiteral && runtimeEnvironment.bundle && runtimeEnvironment.format === 'esm') {
                 signature = await getBundleSignature(importRef, moduleRegistry);
             }
+            // always link [literal] dynamic imports as versioned specifiers (AMD strategy)
+            // linking them as URIs (ESM strategy) causes caching issues since they can contain stale signatures
             const link = isStringLiteral
-                ? strategy(importRef, runtimeEnvironment, runtimeParams, signature) // dynamic import of a static string
-                : importRef.specifier; // variable dynamic import; keep the variable name as-is
+                ? versionStrategy(importRef, runtimeEnvironment, runtimeParams, signature) // dynamic import of a static string
+                : importRef.specifier; // variable dynamic imports: keep the variable name as-is
             // transform locations
             // replace all locations of importee with the link
             const linkedLocations = locations.map(({ location, importLocation }) => {
@@ -82,9 +85,8 @@ export async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironme
                 if (isStringLiteral) {
                     codeStringBuilder.overwrite(startColumn + 1, endColumn - 1, link);
                 }
-                if (amdLoaderModule || (esmLoaderModule && !isStringLiteral)) {
+                if (amdLoaderModule || esmLoaderModule) {
                     // replace the dynamic import with a configured loader
-                    // ONLY do this in ESM if the dynamic import is VARIABLE
                     // e.g. - await import('dynamic/module'); -> await load('dynamic/module');
                     codeStringBuilder.overwrite(importStart, importEnd, 'load(');
                     loaderSizeOffset = 2;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0-alpha.11",
+    "version": "0.6.0-alpha.15",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,18 +30,18 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.6.0-alpha.11",
-        "@lwrjs/shared-utils": "0.6.0-alpha.11",
+        "@lwrjs/diagnostics": "0.6.0-alpha.15",
+        "@lwrjs/shared-utils": "0.6.0-alpha.15",
         "es-module-lexer": "^0.3.18",
         "ws": "^7.2.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.0-alpha.11",
+        "@lwrjs/types": "0.6.0-alpha.15",
         "@types/es-module-lexer": "^0.3.0",
         "@types/ws": "^7.2.4"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "18ab72188c2d52e32cca47333951a9c76f996039"
+    "gitHead": "ebff01c190ee6f2777028f103e51446a1a8f00f7"
 }