@lwrjs/module-bundler 0.9.0-alpha.16 → 0.9.0-alpha.17

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

@@ -49,6 +49,7 @@ async function bundle(id, moduleGraphs, minify = false) {
 }
 async function amdBundler(moduleId, moduleRegistry, minify = false, runtimeEnvironment, runtimeParams = {}, {bundleConfig, amdLoader}, bundleConfigOverrides) {
   const {exclude, external = {}} = (0, import_bundle_common.overrideBundleConfig)(bundleConfig, bundleConfigOverrides);
+  const externalsArray = Object.keys(external);
   const requiredImports = new Map();
   const dynamicImports = new Map();
   const includedModules = [];
@@ -58,7 +59,9 @@ async function amdBundler(moduleId, moduleRegistry, minify = false, runtimeEnvir
       static: import_shared_utils.GraphDepth.ALL,
       dynamic: 0,
       includeId: (moduleRef) => {
-        if (exclude?.includes(moduleRef.specifier) || moduleRef.specifier === amdLoader) {
+        if (externalsArray.includes(moduleRef.specifier) || moduleRef.specifier === amdLoader) {
+          return false;
+        } else if (exclude?.includes(moduleRef.specifier)) {
           requiredImports.set(`${moduleRef.specifier}_${moduleRef.version}`, moduleRef);
           return false;
         }

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

@@ -22,6 +22,7 @@ async function bundle(id, moduleGraphs, minify = false) {
 }
 export async function amdBundler(moduleId, moduleRegistry, minify = false, runtimeEnvironment, runtimeParams = {}, { bundleConfig, amdLoader }, bundleConfigOverrides) {
     const { exclude, external = {} } = overrideBundleConfig(bundleConfig, bundleConfigOverrides);
+    const externalsArray = Object.keys(external);
     const requiredImports = new Map();
     const dynamicImports = new Map();
     const includedModules = [];
@@ -31,8 +32,15 @@ export async function amdBundler(moduleId, moduleRegistry, minify = false, runti
             static: GraphDepth.ALL,
             dynamic: 0,
             includeId: (moduleRef) => {
-                // loader should be auto bundled with shim already
-                if (exclude?.includes(moduleRef.specifier) || moduleRef.specifier === amdLoader) {
+                // Do not bundle externals, including the loader module, which is auto bundled
+                // with the shim + loader combo
+                if (externalsArray.includes(moduleRef.specifier) || moduleRef.specifier === amdLoader) {
+                    // Do not include externals in the required imports but also return false to indicate it should not be in the bundle
+                    return false;
+                }
+                else if (exclude?.includes(moduleRef.specifier)) {
+                    // If this is a bundle exclude return false to indicate it should not be in the bundle
+                    // but add it to the requriedImports so it shows up as a static dependency of the bundle.
                     requiredImports.set(`${moduleRef.specifier}_${moduleRef.version}`, moduleRef);
                     return false;
                 }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.16",
+    "version": "0.9.0-alpha.17",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -45,13 +45,13 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/shared-utils": "0.9.0-alpha.16",
+        "@lwrjs/shared-utils": "0.9.0-alpha.17",
         "@rollup/plugin-replace": "^2.4.2",
         "rollup": "~2.45.2",
         "rollup-plugin-terser": "^7.0.2"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.16"
+        "@lwrjs/types": "0.9.0-alpha.17"
     },
     "optionalDependencies": {
         "esbuild": "^0.9.7"
@@ -63,5 +63,5 @@
         "node": "14.19.1",
         "yarn": "1.22.19"
     },
-    "gitHead": "03fe3982780e7c63b96ef0733b58529057db61fa"
+    "gitHead": "447417ff091802927b25cfc1bcb01da02264f41b"
 }