@lwrjs/module-registry 0.10.0-alpha.8 → 0.10.0

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) => {
@@ -111,15 +116,7 @@ var LwrModuleRegistry = class {
     });
   }
   async createModuleDefinition(moduleId, runtimeParams) {
-    const {locker} = this.globalConfig;
     const moduleCompiled = await this.delegateGetModuleOnProviders(moduleId, runtimeParams);
-    if (locker.enabled && !locker.clientOnly) {
-      const {runtimeEnvironment} = this.context;
-      const {minify, sourceMapUrl} = runtimeEnvironment;
-      const sourcemap = typeof sourceMapUrl === "string" || !minify;
-      const {code: lockerizedCode} = (0, import_compiler.lockerize)(moduleCompiled, locker, sourcemap);
-      moduleCompiled.compiledSource = lockerizedCode;
-    }
     const moduleRecord = await (0, import_module_record.getModuleRecord)(moduleCompiled, this);
     return {...moduleCompiled, moduleRecord};
   }

package/build/cjs/linker/linker.cjs

@@ -31,7 +31,7 @@ var import_shared_utils2 = __toModule(require("@lwrjs/shared-utils"));
 var import_signature = __toModule(require("../signature.cjs"));
 async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, runtimeEnvironment, runtimeParams, config, interchangeableModules, exclude) {
   const {specifier, version, compiledSource, moduleRecord} = moduleDef;
-  const {imports, dynamicImports} = moduleRecord;
+  const {imports, dynamicImports, importMeta} = moduleRecord;
   const codeStringBuilder = (0, import_shared_utils.createStringBuilder)(compiledSource);
   const amdLoaderModule = config?.amdLoaderModule;
   const esmLoaderModule = config?.esmLoaderModule;
@@ -115,6 +115,7 @@ async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, run
       return {...importRef, sourceSpecifier, specifier: link2, locations: linkedLocations};
     }));
   }
+  let loaderImportOffset = 0;
   if (dynamicImports && dynamicImports.length > 0 && (amdLoaderModule || esmLoaderModule)) {
     const {version: version2, specifier: specifier2} = amdLoaderModule || esmLoaderModule;
     const {namespace, name} = (0, import_shared_utils2.explodeSpecifier)(specifier2);
@@ -123,8 +124,10 @@ async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, run
       signature = await (0, import_signature.getBundleSignature)({version: version2, specifier: specifier2}, moduleRegistry, exclude);
     }
     const loaderLink = strategy({specifier: specifier2, version: version2}, runtimeEnvironment, runtimeParams, signature);
-    codeStringBuilder.prepend(`import { load } from "${loaderLink}";
-`);
+    const loaderImport = `import { load } from "${loaderLink}";
+`;
+    loaderImportOffset = loaderImport.length;
+    codeStringBuilder.prepend(loaderImport);
     linkedImports.unshift({
       name,
       namespace,
@@ -139,6 +142,32 @@ async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, run
       ]
     });
   }
+  if (importMeta && importMeta.length > 0) {
+    importMeta.forEach(({statement, location}) => {
+      if (statement === "import.meta.env.SSR") {
+        codeStringBuilder.overwrite(location.startColumn, location.endColumn, "isServer");
+      }
+    });
+    const envSpecifier = "lwr/environment";
+    const {namespace, name} = (0, import_shared_utils2.explodeSpecifier)(envSpecifier);
+    const envLink = strategy({specifier: envSpecifier, version: runtimeEnvironment.lwrVersion}, runtimeEnvironment, runtimeParams);
+    const envImport = `import { isServer } from "${envLink}";
+`;
+    codeStringBuilder.prepend(envImport);
+    linkedImports.unshift({
+      name,
+      namespace,
+      sourceSpecifier: specifier,
+      specifier: envLink,
+      version,
+      locations: [
+        {
+          startColumn: 26 + loaderImportOffset,
+          endColumn: 26 + envLink.length + loaderImportOffset
+        }
+      ]
+    });
+  }
   return {
     id,
     code: codeStringBuilder.toString(),

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/cjs/module-record.cjs

@@ -74,7 +74,11 @@ async function getModuleRecord(compiledModule, registry) {
   const dynamicImports = [];
   const {compiledMetadata: defaultCompilerMetadata, moduleEntry, version} = compiledModule;
   const compiledMetadata = defaultCompilerMetadata || {};
-  const {imports: compiledModuleImports, dynamicImports: compiledModuleDynamicImports} = await (0, import_shared_utils.getImportMetadata)(compiledModule.compiledSource);
+  const {
+    imports: compiledModuleImports,
+    dynamicImports: compiledModuleDynamicImports,
+    importMeta
+  } = await (0, import_shared_utils.getImportMetadata)(compiledModule.compiledSource);
   Object.assign(compiledMetadata, {
     imports: compiledModuleImports,
     dynamicImports: compiledModuleDynamicImports
@@ -158,6 +162,7 @@ async function getModuleRecord(compiledModule, registry) {
   }
   return {
     imports,
-    dynamicImports
+    dynamicImports,
+    importMeta
   };
 }

package/build/es/index.js

@@ -1,7 +1,7 @@
 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 { convertToAmd } from '@lwrjs/shared-utils/compiler';
 import { link } from './linker/linker.js';
 import { getModuleRecord } from './module-record.js';
 import amdLinkingStrategy from './linker/strategies/amd-strategy.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
@@ -101,18 +107,7 @@ export class LwrModuleRegistry {
         });
     }
     async createModuleDefinition(moduleId, runtimeParams) {
-        const { locker } = this.globalConfig;
         const moduleCompiled = await this.delegateGetModuleOnProviders(moduleId, runtimeParams); // provider source + hash
-        /** Locker before collecting dep module records so locker imports are processed normally */
-        if (locker.enabled && !locker.clientOnly) {
-            const { runtimeEnvironment } = this.context;
-            // Locker should generate inline source maps in non-minified modes
-            // in addition to being explicitly enabled.
-            const { minify, sourceMapUrl } = runtimeEnvironment;
-            const sourcemap = typeof sourceMapUrl === 'string' || !minify;
-            const { code: lockerizedCode } = lockerize(moduleCompiled, locker, sourcemap);
-            moduleCompiled.compiledSource = lockerizedCode;
-        }
         const moduleRecord = await getModuleRecord(moduleCompiled, this);
         return { ...moduleCompiled, moduleRecord };
     }

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

@@ -1,5 +1,5 @@
-import { ModuleRecord, ModuleEntry, ModuleDefinition, RuntimeEnvironment, Specifier, RuntimeParams, InterchangeableModuleMap } from '@lwrjs/types';
-import { LwrModuleRegistry } from '../index.js';
+import type { ModuleRecord, ModuleEntry, ModuleDefinition, RuntimeEnvironment, Specifier, RuntimeParams, InterchangeableModuleMap } from '@lwrjs/types';
+import type { LwrModuleRegistry } from '../index.js';
 export interface LinkingStrategy {
     (moduleId: {
         specifier: Specifier;

package/build/es/linker/linker.js

@@ -9,7 +9,7 @@ import { getBundleSignature } from '../signature.js';
  */
 export async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, runtimeEnvironment, runtimeParams, config, interchangeableModules, exclude) {
     const { specifier, version, compiledSource, moduleRecord } = moduleDef;
-    const { imports, dynamicImports } = moduleRecord;
+    const { imports, dynamicImports, importMeta } = moduleRecord;
     const codeStringBuilder = createStringBuilder(compiledSource);
     const amdLoaderModule = config?.amdLoaderModule;
     const esmLoaderModule = config?.esmLoaderModule;
@@ -112,6 +112,7 @@ export async function link(moduleRegistry, moduleDef, versionStrategy, uriStrate
         }));
     }
     // (optionally) add loader module import link if necessary
+    let loaderImportOffset = 0;
     if (dynamicImports && dynamicImports.length > 0 && (amdLoaderModule || esmLoaderModule)) {
         // mutate ModuleEntry to ImportModuleRecord
         const { version, specifier } = amdLoaderModule || esmLoaderModule;
@@ -123,7 +124,9 @@ export async function link(moduleRegistry, moduleDef, versionStrategy, uriStrate
         }
         const loaderLink = strategy({ specifier, version }, runtimeEnvironment, runtimeParams, signature);
         // import {load} from 'loader/loader'
-        codeStringBuilder.prepend(`import { load } from "${loaderLink}";\n`);
+        const loaderImport = `import { load } from "${loaderLink}";\n`;
+        loaderImportOffset = loaderImport.length;
+        codeStringBuilder.prepend(loaderImport);
         linkedImports.unshift({
             name,
             namespace,
@@ -138,6 +141,34 @@ export async function link(moduleRegistry, moduleDef, versionStrategy, uriStrate
             ],
         });
     }
+    // replace "import.meta.env.SSR" statements with the "isServer" boolean from "lwr/environment"
+    if (importMeta && importMeta.length > 0) {
+        // Replace each "import.meta.env.SSR" statement with "isServer"
+        importMeta.forEach(({ statement, location }) => {
+            if (statement === 'import.meta.env.SSR') {
+                codeStringBuilder.overwrite(location.startColumn, location.endColumn, 'isServer');
+            }
+        });
+        // Add import { isServer } from 'lwr/environment'
+        const envSpecifier = 'lwr/environment';
+        const { namespace, name } = explodeSpecifier(envSpecifier);
+        const envLink = strategy({ specifier: envSpecifier, version: runtimeEnvironment.lwrVersion }, runtimeEnvironment, runtimeParams);
+        const envImport = `import { isServer } from "${envLink}";\n`;
+        codeStringBuilder.prepend(envImport);
+        linkedImports.unshift({
+            name,
+            namespace,
+            sourceSpecifier: specifier,
+            specifier: envLink,
+            version,
+            locations: [
+                {
+                    startColumn: 26 + loaderImportOffset,
+                    endColumn: 26 + envLink.length + loaderImportOffset,
+                },
+            ],
+        });
+    }
     return {
         id,
         code: codeStringBuilder.toString(),

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

@@ -1,4 +1,4 @@
-import { Specifier } from '@lwrjs/types';
+import type { Specifier } from '@lwrjs/types';
 export default function amdLinkingStrategy(moduleId: {
     specifier: Specifier;
     version: string;

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

@@ -1,6 +1,6 @@
-import { RuntimeEnvironment, RuntimeParams, Specifier } from '@lwrjs/types';
+import type { 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/build/es/module-record.js

@@ -57,7 +57,7 @@ export async function getModuleRecord(compiledModule, registry) {
     const { compiledMetadata: defaultCompilerMetadata, moduleEntry, version } = compiledModule;
     const compiledMetadata = defaultCompilerMetadata || {};
     // Get imports metadata and merge with rest of compiledModule metadata
-    const { imports: compiledModuleImports, dynamicImports: compiledModuleDynamicImports } = await getImportMetadata(compiledModule.compiledSource);
+    const { imports: compiledModuleImports, dynamicImports: compiledModuleDynamicImports, importMeta, } = await getImportMetadata(compiledModule.compiledSource);
     Object.assign(compiledMetadata, {
         imports: compiledModuleImports,
         dynamicImports: compiledModuleDynamicImports,
@@ -153,6 +153,7 @@ export async function getModuleRecord(compiledModule, registry) {
     return {
         imports,
         dynamicImports,
+        importMeta,
     };
 }
 //# sourceMappingURL=module-record.js.map

package/package.json

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