@lwrjs/module-registry 0.10.0-alpha.12 → 0.10.0-alpha.14

package/build/cjs/index.cjs

@@ -81,8 +81,13 @@ var LwrModuleRegistry = class {
     }
     const {bundle, format} = runtimeEnvironment;
     if (bundle) {
+      let bundleId;
+      if (format === "amd") {
+        const bundleGroups = this.globalConfig?.bundleConfig?.groups;
+        bundleId = bundleGroups && (0, import_shared_utils.getGroupName)(moduleId.specifier, bundleGroups);
+      }
       return new Promise((resolve, reject) => {
-        (0, import_signature.getBundleSignature)(moduleId, this, this.globalConfig?.bundleConfig?.exclude).then((bundleSignature) => resolve((0, import_esm_strategy.default)(moduleId, runtimeEnvironment, runtimeParams, bundleSignature))).catch(reject);
+        (0, import_signature.getBundleSignature)(moduleId, this, this.globalConfig?.bundleConfig?.exclude).then((bundleSignature) => resolve((0, import_esm_strategy.default)(moduleId, runtimeEnvironment, runtimeParams, bundleSignature, bundleId))).catch(reject);
       });
     } else {
       return new Promise((resolve, reject) => {

package/build/cjs/linker/strategies/esm-strategy.cjs

@@ -29,15 +29,15 @@ __export(exports, {
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var SIGNATURE_SIGIL = "s";
 var LATEST_SIG = "latest";
-function linkEsm(moduleId, environment, params = {}, signature) {
+function linkEsm(moduleId, environment, params = {}, signature, bundleId) {
   const {bundle, debug} = environment;
   const {specifier, version} = moduleId;
-  const uriPrefix = (0, import_shared_utils.getModuleUriPrefix)(environment, params);
+  const uriPrefix = (0, import_shared_utils.getModuleUriPrefix)(environment, params, bundleId);
   const vSpecifier = (0, import_shared_utils.getSpecifier)({specifier, version: (0, import_shared_utils.normalizeVersionToUri)(version)});
   const encodedVSpecifier = encodeURIComponent(vSpecifier);
   const latestSignature = signature === void 0 || signature === LATEST_SIG;
   const sigilSignature = latestSignature ? LATEST_SIG : `${SIGNATURE_SIGIL}/${signature}`;
-  const prettyUrl = (bundle ? "bundle_" : "") + (0, import_shared_utils.prettyModuleUriSuffix)(specifier);
+  const prettyUrl = (bundle ? "bundle_" : "") + (0, import_shared_utils.prettyModuleUriSuffix)(bundleId || specifier);
   const debugModifier = debug ? "?debug=true" : "";
   return `${uriPrefix}${encodedVSpecifier}/${sigilSignature}/${prettyUrl}.js${debugModifier}`;
 }

package/build/es/index.js

@@ -1,5 +1,5 @@
 import { LwrUnresolvableError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
-import { discoverInterchangeableModules, getCacheKeyFromJson, InflightTasks, LATEST_SIGNATURE, ModuleNameType, } from '@lwrjs/shared-utils';
+import { discoverInterchangeableModules, getCacheKeyFromJson, InflightTasks, LATEST_SIGNATURE, ModuleNameType, getGroupName, } from '@lwrjs/shared-utils';
 // dependencies @locker/compiler and rollup are in this package.json is to satisfy the shared-utils/compiler optional dependencies
 import { convertToAmd, lockerize } from '@lwrjs/shared-utils/compiler';
 import { link } from './linker/linker.js';
@@ -60,9 +60,15 @@ export class LwrModuleRegistry {
         // Else compute the URL from source
         const { bundle, format } = runtimeEnvironment;
         if (bundle) {
+            let bundleId;
+            if (format === 'amd') {
+                // bundling groups is only supported in AMD for now
+                const bundleGroups = this.globalConfig?.bundleConfig?.groups;
+                bundleId = bundleGroups && getGroupName(moduleId.specifier, bundleGroups);
+            }
             return new Promise((resolve, reject) => {
                 getBundleSignature(moduleId, this, this.globalConfig?.bundleConfig?.exclude)
-                    .then((bundleSignature) => resolve(esmLinkingStrategy(moduleId, runtimeEnvironment, runtimeParams, bundleSignature)))
+                    .then((bundleSignature) => resolve(esmLinkingStrategy(moduleId, runtimeEnvironment, runtimeParams, bundleSignature, bundleId)))
                     .catch(reject);
             });
             // For individual files we return a module URL

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

@@ -12,7 +12,7 @@ interface AmdLinkerConfig {
 interface EsmLinkerConfig {
     esmLoaderModule: ModuleEntry;
 }
-export type LinkerConfig = AmdLinkerConfig | EsmLinkerConfig;
+export declare type LinkerConfig = AmdLinkerConfig | EsmLinkerConfig;
 export interface ModuleLinkResult {
     id: string;
     code: string;

package/build/es/linker/strategies/esm-strategy.d.ts

@@ -2,5 +2,5 @@ import { RuntimeEnvironment, RuntimeParams, Specifier } from '@lwrjs/types';
 export default function linkEsm(moduleId: {
     specifier: Specifier;
     version: string;
-}, environment: RuntimeEnvironment, params?: RuntimeParams, signature?: string): string;
+}, environment: RuntimeEnvironment, params?: RuntimeParams, signature?: string, bundleId?: string): string;
 //# sourceMappingURL=esm-strategy.d.ts.map

package/build/es/linker/strategies/esm-strategy.js

@@ -1,15 +1,15 @@
 import { getModuleUriPrefix, getSpecifier, normalizeVersionToUri, prettyModuleUriSuffix, } from '@lwrjs/shared-utils';
 const SIGNATURE_SIGIL = 's';
 const LATEST_SIG = 'latest';
-export default function linkEsm(moduleId, environment, params = {}, signature) {
+export default function linkEsm(moduleId, environment, params = {}, signature, bundleId) {
     const { bundle, debug } = environment;
     const { specifier, version } = moduleId;
-    const uriPrefix = getModuleUriPrefix(environment, params);
+    const uriPrefix = getModuleUriPrefix(environment, params, bundleId);
     const vSpecifier = getSpecifier({ specifier, version: normalizeVersionToUri(version) });
     const encodedVSpecifier = encodeURIComponent(vSpecifier);
     const latestSignature = signature === undefined || signature === LATEST_SIG;
     const sigilSignature = latestSignature ? LATEST_SIG : `${SIGNATURE_SIGIL}/${signature}`;
-    const prettyUrl = (bundle ? 'bundle_' : '') + prettyModuleUriSuffix(specifier);
+    const prettyUrl = (bundle ? 'bundle_' : '') + prettyModuleUriSuffix(bundleId || specifier);
     const debugModifier = debug ? '?debug=true' : '';
     return `${uriPrefix}${encodedVSpecifier}/${sigilSignature}/${prettyUrl}.js${debugModifier}`;
 }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.10.0-alpha.12",
+    "version": "0.10.0-alpha.14",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,18 +30,16 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@locker/compiler": "0.19.0",
-        "@lwrjs/diagnostics": "0.10.0-alpha.12",
-        "@lwrjs/shared-utils": "0.10.0-alpha.12",
-        "es-module-lexer": "^0.3.18",
+        "@locker/compiler": "0.19.5",
+        "@lwrjs/diagnostics": "0.10.0-alpha.14",
+        "@lwrjs/shared-utils": "0.10.0-alpha.14",
         "rollup": "^2.78.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.10.0-alpha.12",
-        "@types/es-module-lexer": "^0.3.0"
+        "@lwrjs/types": "0.10.0-alpha.14"
     },
     "engines": {
         "node": ">=16.0.0 <20"
     },
-    "gitHead": "c280f6e4914d67a58cb18a52d2320824c8ed4a7b"
+    "gitHead": "f80dc1c18719b77c183f339027313be11d69f9dc"
 }