@lwrjs/module-registry 0.6.0-alpha.13 → 0.6.0-alpha.14

package/build/cjs/index.cjs

@@ -185,7 +185,7 @@ 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 && {

package/build/cjs/linker/linker.cjs

@@ -84,17 +84,17 @@ 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 && amdLoaderModule ? strategy(importRef, runtimeEnvironment, runtimeParams, signature) : importRef.specifier;
       const linkedLocations = locations.map(({location, importLocation}) => {
         const {startColumn, endColumn} = location;
         const {startColumn: importStart, endColumn: importEnd} = importLocation;
-        if (isStringLiteral) {
+        if (isStringLiteral && amdLoaderModule) {
           codeStringBuilder.overwrite(startColumn + 1, endColumn - 1, link2);
         }
-        if (amdLoaderModule || esmLoaderModule && !isStringLiteral) {
+        if (amdLoaderModule || esmLoaderModule) {
           codeStringBuilder.overwrite(importStart, importEnd, "load(");
           loaderSizeOffset = 2;
-          if (!isStringLiteral) {
+          if (!(amdLoaderModule && isStringLiteral)) {
             const importerSpecifier = (0, import_shared_utils2.getSpecifier)({specifier, version});
             codeStringBuilder.overwrite(endColumn, endColumn + 1, `, '${importerSpecifier}')`);
             loaderSizeOffset = -1 * importerSpecifier.length - 2;

package/build/es/index.js

@@ -175,10 +175,8 @@ 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);
             }

package/build/es/linker/linker.js

@@ -70,26 +70,28 @@ export async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironme
             if (isStringLiteral && runtimeEnvironment.bundle && runtimeEnvironment.format === 'esm') {
                 signature = await getBundleSignature(importRef, moduleRegistry);
             }
-            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
+            const link = isStringLiteral && amdLoaderModule
+                ? strategy(importRef, runtimeEnvironment, runtimeParams, signature) // dynamic import of a static string in AMD
+                : importRef.specifier; // in ESM or a variable dynamic import in AMD: keep the variable name as-is
             // transform locations
             // replace all locations of importee with the link
             const linkedLocations = locations.map(({ location, importLocation }) => {
                 const { startColumn, endColumn } = location;
                 const { startColumn: importStart, endColumn: importEnd } = importLocation;
-                // rewrite the importee link if it is a static string
-                if (isStringLiteral) {
+                // rewrite the importee link if it is a static string in AMD
+                // do not rewrite ANY dynamic import importee links in ESM (no signatures or URIs prevents caching issues)
+                if (isStringLiteral && amdLoaderModule) {
                     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;
-                    if (!isStringLiteral) {
-                        // add the importer specifier as the 2nd arg to load() for VARIABLE dynamic imports
+                    if (!(amdLoaderModule && isStringLiteral)) {
+                        // add the importer specifier as the 2nd arg to load() for:
+                        // - VARIABLE dynamic imports in AMD
+                        // - ALL dynamic imports in ESM
                         const importerSpecifier = getSpecifier({ specifier, version });
                         codeStringBuilder.overwrite(endColumn, endColumn + 1, `, '${importerSpecifier}')`);
                         loaderSizeOffset = -1 * importerSpecifier.length - 2;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0-alpha.13",
+    "version": "0.6.0-alpha.14",
     "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.13",
-        "@lwrjs/shared-utils": "0.6.0-alpha.13",
+        "@lwrjs/diagnostics": "0.6.0-alpha.14",
+        "@lwrjs/shared-utils": "0.6.0-alpha.14",
         "es-module-lexer": "^0.3.18",
         "ws": "^7.2.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.0-alpha.13",
+        "@lwrjs/types": "0.6.0-alpha.14",
         "@types/es-module-lexer": "^0.3.0",
         "@types/ws": "^7.2.4"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "056d10307fe29540d1586f8fd75e357b82ce2acc"
+    "gitHead": "2850ceddcf17cdc561abbdbeb465edc5d5391cfa"
 }