@lwrjs/module-bundler 0.13.0-alpha.1 → 0.13.0-alpha.10

package/build/cjs/utils/amd-common.cjs

@@ -93,7 +93,7 @@ async function bundle(id, moduleGraphs, minify = false, unVersionedAliases = fal
 async function getBundleCode(rootModule, moduleGraphs, includedModules, bundleGroupsIncludedModules, dynamicImports, minify, unVersionedAliases, includeId, moduleRegistry, runtimeEnvironment, runtimeParams, visitedSpecifiers) {
   const modules = [rootModule, ...moduleGraphs.graphs[0].static];
   const {moduleRecord} = await moduleRegistry.getModule((0, import_shared_utils.explodeSpecifier)(rootModule), runtimeParams);
-  if (moduleRecord.importMeta && process.env.MRT_HMR !== "true") {
+  if (moduleRecord.importMeta && !(0, import_shared_utils.isLocalDev)()) {
     for (const specifier of modules) {
       const linkedDefinition = moduleGraphs.linkedDefinitions[specifier];
       const imports = linkedDefinition?.linkedModuleRecord.imports || [];
@@ -116,7 +116,12 @@ async function getBundleCode(rootModule, moduleGraphs, includedModules, bundleGr
     }
     linkedDefinition.linkedModuleRecord.dynamicImports?.forEach((dynamicImport) => {
       if (dynamicImport.moduleNameType !== "unresolved") {
-        dynamicImports.set(`${dynamicImport.specifier}_${dynamicImport.version}`, dynamicImport);
+        const moduleId = (0, import_shared_utils.explodeSpecifier)(dynamicImport.specifier);
+        const importReference = {
+          ...dynamicImport,
+          specifier: moduleId.specifier
+        };
+        dynamicImports.set((0, import_shared_utils.getSpecifier)(importReference), importReference);
       }
     });
     if (specifier.includes("#")) {
@@ -167,7 +172,8 @@ async function amdBundler(rootModuleId, moduleRegistry, minify = false, runtimeE
     };
     return (0, import_shared_utils.getModuleGraphs)(graphSpecifier, graphOptions, moduleRegistry, moduleRegistry, runtimeEnvironment, runtimeParams);
   };
-  const moduleGraphs = await getModuleGraphsWrapper(rootModuleId.specifier);
+  const versionedSpecifier = (0, import_shared_utils.getSpecifier)(rootModuleId);
+  const moduleGraphs = await getModuleGraphsWrapper(versionedSpecifier);
   const rootModule = moduleGraphs.graphs[0];
   const groupModuleGraphsMap = new Map();
   if (!cachedGroupieCode && groupies && groupies.length) {

package/build/es/utils/amd-common.js

@@ -1,4 +1,4 @@
-import { GraphDepth, createAmdAlias, explodeSpecifier, getModuleGraphs, getSpecifier, getGroupName, isGroupie, getCacheKeyFromJson, VERSION_NOT_PROVIDED, isExternalSpecifier, PROTOCOL_FILE, } from '@lwrjs/shared-utils';
+import { GraphDepth, createAmdAlias, explodeSpecifier, getModuleGraphs, getSpecifier, getGroupName, isGroupie, getCacheKeyFromJson, VERSION_NOT_PROVIDED, isExternalSpecifier, PROTOCOL_FILE, isLocalDev, } from '@lwrjs/shared-utils';
 import { rollup } from 'rollup';
 import replace from '@rollup/plugin-replace';
 import { BundleSpan, getTracer } from '@lwrjs/instrumentation';
@@ -81,7 +81,7 @@ async function getBundleCode(rootModule, moduleGraphs, includedModules, bundleGr
     const { moduleRecord } = await moduleRegistry.getModule(explodeSpecifier(rootModule), runtimeParams);
     // add static imports from the LinkedModuleDefinitions added during module linking
     // they're not in the ModuleGraph imports b/c those are based on raw module source
-    if (moduleRecord.importMeta && process.env.MRT_HMR !== 'true') {
+    if (moduleRecord.importMeta && !isLocalDev()) {
         // the only use case for this is "lwr/environment", so skip the logic when it's not needed
         for (const specifier of modules) {
             const linkedDefinition = moduleGraphs.linkedDefinitions[specifier];
@@ -109,7 +109,13 @@ async function getBundleCode(rootModule, moduleGraphs, includedModules, bundleGr
         // add any dynamic imports from each of the linked definitions in the module graph
         linkedDefinition.linkedModuleRecord.dynamicImports?.forEach((dynamicImport) => {
             if (dynamicImport.moduleNameType !== 'unresolved') {
-                dynamicImports.set(`${dynamicImport.specifier}_${dynamicImport.version}`, dynamicImport);
+                // Linked specifiers add a version to them  We do not want this in the bundle record specifier
+                const moduleId = explodeSpecifier(dynamicImport.specifier);
+                const importReference = {
+                    ...dynamicImport,
+                    specifier: moduleId.specifier,
+                };
+                dynamicImports.set(getSpecifier(importReference), importReference);
             }
         });
         // skip relative dependencies
@@ -175,7 +181,8 @@ export async function amdBundler(rootModuleId, moduleRegistry, minify = false, r
         };
         return getModuleGraphs(graphSpecifier, graphOptions, moduleRegistry, moduleRegistry, runtimeEnvironment, runtimeParams);
     };
-    const moduleGraphs = await getModuleGraphsWrapper(rootModuleId.specifier);
+    const versionedSpecifier = getSpecifier(rootModuleId);
+    const moduleGraphs = await getModuleGraphsWrapper(versionedSpecifier);
     const rootModule = moduleGraphs.graphs[0];
     // we also need to get moduleGraphs for any group members this module belongs to
     const groupModuleGraphsMap = new Map();

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.13.0-alpha.1",
+    "version": "0.13.0-alpha.10",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -47,14 +47,14 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.13.0-alpha.1",
-        "@lwrjs/instrumentation": "0.13.0-alpha.1",
-        "@lwrjs/shared-utils": "0.13.0-alpha.1",
-        "@rollup/plugin-replace": "^2.4.2",
+        "@lwrjs/diagnostics": "0.13.0-alpha.10",
+        "@lwrjs/instrumentation": "0.13.0-alpha.10",
+        "@lwrjs/shared-utils": "0.13.0-alpha.10",
+        "@rollup/plugin-replace": "^5.0.5",
         "rollup": "^2.78.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.13.0-alpha.1",
+        "@lwrjs/types": "0.13.0-alpha.10",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -70,5 +70,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "1b7147d4db0dbc363f36529cd65374325f940c40"
+    "gitHead": "53e2a825868b4c9b1662419b531c80be13afd779"
 }