@lwrjs/module-bundler 0.12.0-alpha.26 → 0.12.0-alpha.28

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

@@ -37,12 +37,13 @@ var groupieCodeCache = new Map();
 function includeIdFactory(graphSpecifier, external, exclude = [], requiredImports, groups) {
   return (moduleRef) => {
     const moduleIsNotRoot = graphSpecifier !== moduleRef.specifier;
-    if (external[moduleRef.specifier] !== void 0) {
+    if ((0, import_shared_utils.isExternalSpecifier)(moduleRef.specifier, {external})) {
       moduleRef.externalSrc = external[moduleRef.specifier];
+      moduleRef.external = true;
       if (moduleIsNotRoot) {
         requiredImports.set(`${moduleRef.specifier}_${moduleRef.version || import_shared_utils.VERSION_NOT_PROVIDED}`, moduleRef);
+        return false;
       }
-      return false;
     }
     const moduleRefIsGroupie = (0, import_shared_utils.isGroupie)(moduleRef.specifier, groups);
     const rootModuleIsGroupie = (0, import_shared_utils.isGroupie)(graphSpecifier, groups);
@@ -125,17 +126,22 @@ async function getBundleCode(rootModule, moduleGraphs, includedModules, bundleGr
     return filteredModules;
   }, []).map((linkedDefinition) => {
     const id = (0, import_shared_utils.getSpecifier)(linkedDefinition);
+    includeId(linkedDefinition);
+    const isExternal = linkedDefinition.external;
+    const isExternalFile = linkedDefinition.externalSrc && linkedDefinition.externalSrc.startsWith(import_shared_utils.PROTOCOL_FILE);
     if (visitedSpecifiers?.has(id)) {
       return false;
     } else {
       visitedSpecifiers?.set(id, true);
     }
     if (id !== rootModule) {
-      includedModules.push(id);
+      if (!isExternal) {
+        includedModules.push(id);
+      }
     } else {
       bundleGroupsIncludedModules.push(id);
     }
-    if ((0, import_shared_utils.isExternalSpecifier)(id, moduleRegistry.getConfig().bundleConfig)) {
+    if (isExternalFile) {
       return linkedDefinition.linkedSource;
     }
     return bundle(id, moduleGraphs, minify, unVersionedAliases);

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

@@ -1,4 +1,4 @@
-import { GraphDepth, createAmdAlias, explodeSpecifier, getModuleGraphs, getSpecifier, getGroupName, isGroupie, getCacheKeyFromJson, VERSION_NOT_PROVIDED, isExternalSpecifier, } from '@lwrjs/shared-utils';
+import { GraphDepth, createAmdAlias, explodeSpecifier, getModuleGraphs, getSpecifier, getGroupName, isGroupie, getCacheKeyFromJson, VERSION_NOT_PROVIDED, isExternalSpecifier, PROTOCOL_FILE, } from '@lwrjs/shared-utils';
 import { rollup } from 'rollup';
 import replace from '@rollup/plugin-replace';
 import { BundleSpan, getTracer } from '@lwrjs/instrumentation';
@@ -11,15 +11,16 @@ function includeIdFactory(graphSpecifier, external, exclude = [], requiredImport
         const moduleIsNotRoot = graphSpecifier !== moduleRef.specifier;
         // Do not bundle externals, including the loader module, which is auto bundled
         // with the shim + loader combo
-        if (external[moduleRef.specifier] !== undefined) {
+        if (isExternalSpecifier(moduleRef.specifier, { external })) {
             // Include externals just mark them as such
             moduleRef.externalSrc = external[moduleRef.specifier];
+            moduleRef.external = true;
             if (moduleIsNotRoot) {
                 // Include externals in the required imports
                 requiredImports.set(`${moduleRef.specifier}_${moduleRef.version || VERSION_NOT_PROVIDED}`, moduleRef);
+                // return false to indicate it should not be in the bundle
+                return false;
             }
-            // return false to indicate it should not be in the bundle
-            return false;
         }
         const moduleRefIsGroupie = isGroupie(moduleRef.specifier, groups);
         const rootModuleIsGroupie = isGroupie(graphSpecifier, groups);
@@ -121,21 +122,30 @@ async function getBundleCode(rootModule, moduleGraphs, includedModules, bundleGr
     }, [])
         .map((linkedDefinition) => {
         const id = getSpecifier(linkedDefinition);
+        // Calling includeId will set external and external source as a side effect
+        includeId(linkedDefinition);
+        const isExternal = linkedDefinition.external;
+        const isExternalFile = linkedDefinition.externalSrc &&
+            linkedDefinition.externalSrc.startsWith(PROTOCOL_FILE);
         if (visitedSpecifiers?.has(id)) {
             return false;
         }
         else {
             visitedSpecifiers?.set(id, true);
         }
+        // If this is the root module we do not include it in the included modules
         if (id !== rootModule) {
-            includedModules.push(id);
+            // If this is an external module do not include it as included
+            if (!isExternal) {
+                includedModules.push(id);
+            }
         }
         else {
             // we need to still keep track of roots for bundle groups
             bundleGroupsIncludedModules.push(id);
         }
-        // If this is a external dependency just return the linked source no need to bundle.
-        if (isExternalSpecifier(id, moduleRegistry.getConfig().bundleConfig)) {
+        // If this is a external from a static file no need to bundle.
+        if (isExternalFile) {
             return linkedDefinition.linkedSource;
         }
         // bundle all dependencies for the linked definition and convert to AMD

package/package.json

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