@lwrjs/module-registry 0.8.0-alpha.0 → 0.8.0-alpha.10

package/build/cjs/index.cjs

@@ -94,15 +94,13 @@ var LwrModuleRegistry = class {
     if (cacheDisabled === false && this.moduleDefCache.has(moduleEntry.id)) {
       return this.moduleDefCache.get(moduleEntry.id);
     }
-    const createModulePromiseCtor = async () => {
-      return this.createModuleDefinition(moduleId, runtimeParams).then((moduleDef) => {
-        if (cacheDisabled === false) {
-          this.moduleDefCache.set(moduleDef.id, moduleDef);
-        }
-        return moduleDef;
-      });
-    };
-    return this.inflightModuleDefinitions.execute(moduleEntry.id, createModulePromiseCtor, this);
+    return this.inflightModuleDefinitions.execute(moduleEntry.id, async () => {
+      const moduleDef = await this.createModuleDefinition(moduleId, runtimeParams);
+      if (cacheDisabled === false) {
+        this.moduleDefCache.set(moduleDef.id, moduleDef);
+      }
+      return moduleDef;
+    });
   }
   async createModuleDefinition(moduleId, runtimeParams) {
     const {locker} = this.globalConfig;
@@ -120,7 +118,14 @@ var LwrModuleRegistry = class {
   async getLinkedModule(moduleId, runtimeEnvironment, runtimeParams) {
     const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
     const id = moduleEntry.id;
-    const {format, compat, debug, minify, bundle} = runtimeEnvironment;
+    const {
+      format,
+      compat,
+      debug,
+      minify,
+      bundle,
+      env: {NODE_ENV: envMode}
+    } = runtimeEnvironment;
     const locale = runtimeParams?.["locale"];
     const environment = runtimeParams?.["environment"];
     const {
@@ -146,6 +151,18 @@ var LwrModuleRegistry = class {
     }
     const moduleDef = await this.getModule(moduleId, runtimeParams);
     const moduleLinked = await this.createLinkedModuleDefinition(moduleDef, runtimeEnvironment, runtimeParams);
+    if (format === "amd" && !bundle) {
+      moduleLinked.linkedSource = (await this.context.compiler.convertToAmd(moduleLinked.linkedSource, {
+        id: moduleLinked.id
+      })).code;
+    }
+    const minified = !!minify && !debug;
+    if (minified && !bundle) {
+      moduleLinked.linkedSource = (await this.context.compiler.minifyJavascript(moduleLinked.linkedSource)).code;
+      moduleLinked.linkedConfig.minified = true;
+    } else {
+      moduleLinked.linkedSource = (await this.context.compiler.parseJavascript(moduleLinked.linkedSource, {envMode})).code;
+    }
     if (cacheDisabled === false) {
       const linkedMap = this.moduleLinkedCache.get(id) || new Map();
       linkedMap.set((0, import_shared_utils.getCacheKeyFromJson)({
@@ -163,42 +180,24 @@ var LwrModuleRegistry = class {
     return moduleLinked;
   }
   async createLinkedModuleDefinition(moduleDef, runtimeEnvironment, runtimeParams) {
-    const {
-      format,
-      minify,
-      debug,
-      env: {NODE_ENV: envMode}
-    } = runtimeEnvironment;
-    const minified = !!minify && !debug;
+    const {format} = runtimeEnvironment;
     const {amdLoader, esmLoader} = this.globalConfig;
     if (format === "amd") {
       const loaderModuleEntry = await this.getModuleEntry({specifier: amdLoader}, runtimeParams);
       const {
         id,
-        code: linkedES6,
+        code: linkedSource,
         linkedModuleRecord
       } = 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, {
-        id
-      });
-      let linkedAmdSource = amdSource;
-      if (minified) {
-        const {code: minifiedCode} = await this.context.compiler.minifyJavascript(amdSource);
-        linkedAmdSource = minifiedCode;
-      } else {
-        const {code: minifiedCode} = await this.context.compiler.parseJavascript(amdSource, {
-          envMode
-        });
-        linkedAmdSource = minifiedCode;
-      }
       linkedModuleRecord.dynamicImports = linkedModuleRecord.dynamicImports?.filter((imp) => imp.moduleNameType !== import_shared_utils.ModuleNameType.unresolved);
       return {
         ...moduleDef,
-        linkedSource: linkedAmdSource,
+        id,
+        linkedSource,
         linkedConfig: {
-          minified
+          minified: false
         },
         linkedModuleRecord,
         runtimeEnvironment
@@ -209,26 +208,21 @@ var LwrModuleRegistry = class {
       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_amd_strategy.default, import_esm_strategy.default, runtimeEnvironment, runtimeParams, loaderModuleEntry && {
+      const {
+        id,
+        code: linkedSource,
+        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;
-      if (minified) {
-        const {code: minifiedEsm} = await this.context.compiler.minifyJavascript(transformedEsmCode);
-        transformedEsmCode = minifiedEsm;
-      } else {
-        const {code: parsedEsm} = await this.context.compiler.parseJavascript(transformedEsmCode, {
-          envMode
-        });
-        transformedEsmCode = parsedEsm;
-      }
       linkedModuleRecord.dynamicImports = linkedModuleRecord.dynamicImports?.filter((imp) => imp.moduleNameType !== import_shared_utils.ModuleNameType.unresolved);
       return {
         ...moduleDef,
+        id,
+        linkedSource,
         linkedConfig: {
-          minified
+          minified: false
         },
-        linkedSource: transformedEsmCode,
         linkedModuleRecord,
         runtimeEnvironment,
         runtimeParams

package/build/cjs/signature.cjs

@@ -60,7 +60,18 @@ async function getBundleSignature(moduleId, registry, exclude) {
   return hash.digest("hex");
 }
 function getLWCVersion() {
-  const require2 = (0, import_module.createRequire)(import_path.default.join((0, import_process.cwd)(), "./env-config.js"));
-  const {version} = require2("lwc/package.json");
-  return version;
+  let lwcVersion;
+  try {
+    if (LWR?.LWC_VERSION) {
+      lwcVersion = LWR.LWC_VERSION;
+    }
+  } catch (err) {
+  }
+  if (!lwcVersion) {
+    const require2 = (0, import_module.createRequire)(import_path.default.join((0, import_process.cwd)(), "./env-config.js"));
+    const {version} = require2("lwc/package.json");
+    lwcVersion = version;
+  }
+  import_shared_utils.logger.debug(`Signature LWC Version: ${lwcVersion}`);
+  return lwcVersion;
 }

package/build/es/index.js

@@ -80,15 +80,13 @@ export class LwrModuleRegistry {
             // console.log('[INFO] Module Cache Hit: %s', moduleEntry.id);
             return this.moduleDefCache.get(moduleEntry.id);
         }
-        const createModulePromiseCtor = async () => {
-            return this.createModuleDefinition(moduleId, runtimeParams).then((moduleDef) => {
-                if (cacheDisabled === false) {
-                    this.moduleDefCache.set(moduleDef.id, moduleDef);
-                }
-                return moduleDef;
-            });
-        };
-        return this.inflightModuleDefinitions.execute(moduleEntry.id, createModulePromiseCtor, this);
+        return this.inflightModuleDefinitions.execute(moduleEntry.id, async () => {
+            const moduleDef = await this.createModuleDefinition(moduleId, runtimeParams);
+            if (cacheDisabled === false) {
+                this.moduleDefCache.set(moduleDef.id, moduleDef);
+            }
+            return moduleDef;
+        });
     }
     async createModuleDefinition(moduleId, runtimeParams) {
         const { locker } = this.globalConfig;
@@ -110,7 +108,7 @@ export class LwrModuleRegistry {
         const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
         const id = moduleEntry.id;
         // cache key pivots from the runtimeEnvironment
-        const { format, compat, debug, minify, bundle } = runtimeEnvironment;
+        const { format, compat, debug, minify, bundle, env: { NODE_ENV: envMode }, } = runtimeEnvironment;
         const locale = runtimeParams?.['locale'];
         const environment = runtimeParams?.['environment'];
         const { locker: { enabled: lockerEnabled }, } = this.globalConfig;
@@ -134,6 +132,22 @@ export class LwrModuleRegistry {
         }
         const moduleDef = await this.getModule(moduleId, runtimeParams);
         const moduleLinked = await this.createLinkedModuleDefinition(moduleDef, runtimeEnvironment, runtimeParams);
+        // the bundler will convert the linked source to AMD when bundling is enabled
+        if (format === 'amd' && !bundle) {
+            // convert the linkedSource to the transport AMD format
+            moduleLinked.linkedSource = (await this.context.compiler.convertToAmd(moduleLinked.linkedSource, {
+                id: moduleLinked.id,
+            })).code;
+        }
+        const minified = !!minify && !debug;
+        // the bundler will minify when bundling is enabled
+        if (minified && !bundle) {
+            moduleLinked.linkedSource = (await this.context.compiler.minifyJavascript(moduleLinked.linkedSource)).code;
+            moduleLinked.linkedConfig.minified = true;
+        }
+        else {
+            moduleLinked.linkedSource = (await this.context.compiler.parseJavascript(moduleLinked.linkedSource, { envMode })).code;
+        }
         // Add to cache
         if (cacheDisabled === false) {
             const linkedMap = this.moduleLinkedCache.get(id) || new Map();
@@ -152,39 +166,24 @@ export class LwrModuleRegistry {
         return moduleLinked;
     }
     async createLinkedModuleDefinition(moduleDef, runtimeEnvironment, runtimeParams) {
-        const { format, minify, debug, env: { NODE_ENV: envMode }, } = runtimeEnvironment;
-        const minified = !!minify && !debug;
+        const { format } = runtimeEnvironment;
         const { amdLoader, esmLoader } = this.globalConfig;
         // TODO: compat transformation based on runtimeEnvironment.compat
         if (format === 'amd') {
             // 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, esmLinkingStrategy, runtimeEnvironment, runtimeParams, {
+            const { id, code: linkedSource, linkedModuleRecord, } = await link(this, moduleDef, amdLinkingStrategy, esmLinkingStrategy, runtimeEnvironment, runtimeParams, {
                 amdLoaderModule: loaderModuleEntry,
             }, this.interchangeableModules);
-            // convert the linkedSource to the transport AMD format.
-            const { code: amdSource } = await this.context.compiler.convertToAmd(linkedES6, {
-                id,
-            });
-            let linkedAmdSource = amdSource;
-            if (minified) {
-                const { code: minifiedCode } = await this.context.compiler.minifyJavascript(amdSource);
-                linkedAmdSource = minifiedCode;
-            }
-            else {
-                const { code: minifiedCode } = await this.context.compiler.parseJavascript(amdSource, {
-                    envMode,
-                });
-                linkedAmdSource = minifiedCode;
-            }
             // Filter out variable dynamic imports
             linkedModuleRecord.dynamicImports = linkedModuleRecord.dynamicImports?.filter((imp) => imp.moduleNameType !== ModuleNameType.unresolved);
             return {
                 ...moduleDef,
-                linkedSource: linkedAmdSource,
+                id,
+                linkedSource,
                 linkedConfig: {
-                    minified,
+                    minified: false,
                 },
                 linkedModuleRecord,
                 runtimeEnvironment,
@@ -199,28 +198,18 @@ export class LwrModuleRegistry {
                 // 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, amdLinkingStrategy, esmLinkingStrategy, runtimeEnvironment, runtimeParams, loaderModuleEntry && {
+            const { id, code: linkedSource, linkedModuleRecord, } = await link(this, moduleDef, amdLinkingStrategy, esmLinkingStrategy, runtimeEnvironment, runtimeParams, loaderModuleEntry && {
                 esmLoaderModule: loaderModuleEntry,
             }, this.interchangeableModules, this.globalConfig.bundleConfig?.exclude);
-            let transformedEsmCode = esmLinkedSource;
-            if (minified) {
-                const { code: minifiedEsm } = await this.context.compiler.minifyJavascript(transformedEsmCode);
-                transformedEsmCode = minifiedEsm;
-            }
-            else {
-                const { code: parsedEsm } = await this.context.compiler.parseJavascript(transformedEsmCode, {
-                    envMode,
-                });
-                transformedEsmCode = parsedEsm;
-            }
             // Filter out variable dynamic imports
             linkedModuleRecord.dynamicImports = linkedModuleRecord.dynamicImports?.filter((imp) => imp.moduleNameType !== ModuleNameType.unresolved);
             return {
                 ...moduleDef,
+                id,
+                linkedSource,
                 linkedConfig: {
-                    minified,
+                    minified: false,
                 },
-                linkedSource: transformedEsmCode,
                 linkedModuleRecord,
                 runtimeEnvironment,
                 runtimeParams,

package/build/es/signature.js

@@ -2,7 +2,7 @@ import crypto from 'crypto';
 import path from 'path';
 import { cwd } from 'process';
 import { createRequire } from 'module';
-import { getFeatureFlags, getSpecifier } from '@lwrjs/shared-utils';
+import { getFeatureFlags, getSpecifier, logger } from '@lwrjs/shared-utils';
 const LWC_VERSION = getLWCVersion();
 const ENABLED_FINGERPRINTS = !getFeatureFlags().LEGACY_LOADER;
 const ENV_KEY = `LWC:${LWC_VERSION},FINGERPRINTS:${ENABLED_FINGERPRINTS}`;
@@ -60,9 +60,23 @@ export async function getBundleSignature(moduleId, registry, exclude) {
  * Get the configured LWC version
  */
 function getLWCVersion() {
-    const require = createRequire(path.join(cwd(), './env-config.js'));
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const { version } = require('lwc/package.json');
-    return version;
+    let lwcVersion;
+    try {
+        // check if it is set on the global shim
+        if (LWR?.LWC_VERSION) {
+            lwcVersion = LWR.LWC_VERSION;
+        }
+    }
+    catch (err) {
+        // No-op throws an error in cli when LWR versison not set in global
+    }
+    if (!lwcVersion) {
+        const require = createRequire(path.join(cwd(), './env-config.js'));
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const { version } = require('lwc/package.json');
+        lwcVersion = version;
+    }
+    logger.debug(`Signature LWC Version: ${lwcVersion}`);
+    return lwcVersion;
 }
 //# sourceMappingURL=signature.js.map

package/package.json

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