@lwrjs/module-registry 0.9.0-alpha.20 → 0.9.0-alpha.22

package/build/cjs/index.cjs

@@ -67,10 +67,17 @@ var LwrModuleRegistry = class {
       }
     });
   }
-  resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {
+  resolveModuleUriSync(moduleId, signature, runtimeEnvironment, runtimeParams) {
+    const uri = (0, import_esm_strategy.default)(moduleId, runtimeEnvironment, runtimeParams, signature);
+    return uri;
+  }
+  async resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {
     if (signature !== void 0) {
-      const uri = (0, import_esm_strategy.default)(moduleId, runtimeEnvironment, runtimeParams, signature);
-      return uri;
+      return this.resolveModuleUriSync(moduleId, signature, runtimeEnvironment, runtimeParams);
+    }
+    const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
+    if (moduleEntry.src) {
+      return moduleEntry.src;
     }
     const {bundle, format} = runtimeEnvironment;
     if (bundle) {

package/build/cjs/signature.cjs

@@ -27,11 +27,10 @@ __export(exports, {
   getBundleSignature: () => getBundleSignature
 });
 var import_crypto = __toModule(require("crypto"));
-var import_resolve = __toModule(require("resolve"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var LWC_VERSION = getLWCVersion();
+var import_config = __toModule(require("@lwrjs/config"));
 var ENABLED_FINGERPRINTS = !(0, import_shared_utils.getFeatureFlags)().LEGACY_LOADER;
-var ENV_KEY = `LWC:${LWC_VERSION},FINGERPRINTS:${ENABLED_FINGERPRINTS}`;
+var ENV_KEY = `LWC:${import_config.LWC_VERSION},FINGERPRINTS:${ENABLED_FINGERPRINTS}`;
 async function getRecursiveModuleHash(modules, registry, hash, visitedDefinitions = new Set(), excludes = new Set()) {
   if (!modules.length) {
     return;
@@ -62,8 +61,3 @@ async function getBundleSignature(moduleId, registry, excludes) {
   await getRecursiveModuleHash([moduleId], registry, hash, new Set(), new Set(excludes));
   return hash.digest("hex");
 }
-function getLWCVersion() {
-  const packageJsonPath = import_resolve.default.sync(`lwc/package.json`);
-  const {version} = JSON.parse((0, import_shared_utils.readFile)(packageJsonPath));
-  return version;
-}

package/build/es/index.d.ts

@@ -15,7 +15,8 @@ export declare class LwrModuleRegistry implements ModuleRegistry {
     private interchangeableModules?;
     private inflightModuleDefinitions;
     constructor(context: RegistryContext, globalConfig: NormalizedLwrGlobalConfig, registries?: ModuleProvider[]);
-    resolveModuleUri<R extends RuntimeEnvironment, S extends string | undefined>(moduleId: Required<Pick<ModuleId, 'specifier' | 'version'>>, runtimeEnvironment: R, runtimeParams?: RuntimeParams, signature?: S): S extends string ? string : Promise<string>;
+    resolveModuleUriSync<R extends RuntimeEnvironment, S extends string | undefined>(moduleId: Required<Pick<ModuleId, 'specifier' | 'version'>>, signature: S, runtimeEnvironment: R, runtimeParams?: RuntimeParams): string;
+    resolveModuleUri<R extends RuntimeEnvironment, S extends string | undefined>(moduleId: Required<Pick<ModuleId, 'specifier' | 'version'>>, runtimeEnvironment: R, runtimeParams?: RuntimeParams, signature?: S): Promise<string>;
     addModuleProviders(registries: ModuleProvider[]): void;
     getModuleEntry<T extends AbstractModuleId>(moduleId: T, runtimeParams?: RuntimeParams): Promise<ModuleEntry>;
     getModule<T extends AbstractModuleId>(moduleId: T, runtimeParams?: RuntimeParams): Promise<ModuleDefinition>;

package/build/es/index.js

@@ -43,11 +43,21 @@ export class LwrModuleRegistry {
             }
         });
     }
-    resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {
+    resolveModuleUriSync(moduleId, signature, runtimeEnvironment, runtimeParams) {
+        const uri = esmLinkingStrategy(moduleId, runtimeEnvironment, runtimeParams, signature);
+        return uri;
+    }
+    async resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {
+        // If we have a signature just sync resolve the uri
         if (signature !== undefined) {
-            const uri = esmLinkingStrategy(moduleId, runtimeEnvironment, runtimeParams, signature);
-            return uri;
+            return this.resolveModuleUriSync(moduleId, signature, runtimeEnvironment, runtimeParams);
+        }
+        // Get the module entry to see if the src is provided by the provider.
+        const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
+        if (moduleEntry.src) {
+            return moduleEntry.src;
         }
+        // Else compute the URL from source
         const { bundle, format } = runtimeEnvironment;
         if (bundle) {
             return new Promise((resolve, reject) => {
@@ -55,7 +65,7 @@ export class LwrModuleRegistry {
                     .then((bundleSignature) => resolve(esmLinkingStrategy(moduleId, runtimeEnvironment, runtimeParams, bundleSignature)))
                     .catch(reject);
             });
-            // For individual files we a module URL
+            // For individual files we return a module URL
         }
         else {
             return new Promise((resolve, reject) => {

package/build/es/signature.js

@@ -1,7 +1,6 @@
 import crypto from 'crypto';
-import resolve from 'resolve';
-import { getFeatureFlags, getSpecifier, readFile } from '@lwrjs/shared-utils';
-const LWC_VERSION = getLWCVersion();
+import { getFeatureFlags, getSpecifier } from '@lwrjs/shared-utils';
+import { LWC_VERSION } from '@lwrjs/config';
 const ENABLED_FINGERPRINTS = !getFeatureFlags().LEGACY_LOADER;
 const ENV_KEY = `LWC:${LWC_VERSION},FINGERPRINTS:${ENABLED_FINGERPRINTS}`;
 async function getRecursiveModuleHash(modules, registry, hash, visitedDefinitions = new Set(), excludes = new Set()) {
@@ -65,12 +64,4 @@ export async function getBundleSignature(moduleId, registry, excludes) {
     await getRecursiveModuleHash([moduleId], registry, hash, new Set(), new Set(excludes));
     return hash.digest('hex');
 }
-/**
- * Get the configured LWC version
- */
-function getLWCVersion() {
-    const packageJsonPath = resolve.sync(`lwc/package.json`);
-    const { version } = JSON.parse(readFile(packageJsonPath));
-    return version;
-}
 //# sourceMappingURL=signature.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.20",
+    "version": "0.9.0-alpha.22",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -31,17 +31,17 @@
     ],
     "dependencies": {
         "@locker/compiler": "0.18.9",
-        "@lwrjs/diagnostics": "0.9.0-alpha.20",
-        "@lwrjs/shared-utils": "0.9.0-alpha.20",
+        "@lwrjs/diagnostics": "0.9.0-alpha.22",
+        "@lwrjs/shared-utils": "0.9.0-alpha.22",
         "es-module-lexer": "^0.3.18",
         "rollup": "~2.45.2"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.20",
+        "@lwrjs/types": "0.9.0-alpha.22",
         "@types/es-module-lexer": "^0.3.0"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "b01b6beb86cae6c28308c373db15cb1a4f42a0ee"
+    "gitHead": "d7e7a6e84df652a09d78b9b0fadca271a438a01c"
 }