@lwrjs/module-bundler 0.12.0-alpha.3 → 0.12.0-alpha.30

package/build/cjs/esm-bundle-provider.cjs

@@ -31,8 +31,9 @@ var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_rollup_esm_bundler_plugin = __toModule(require("./utils/rollup-esm-bundler-plugin.cjs"));
 var import_esbuild_utils = __toModule(require("./utils/esbuild-utils.cjs"));
 var import_bundle_common = __toModule(require("./utils/bundle-common.cjs"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var EsmBundlerProvider = class {
-  constructor(options, {config, moduleRegistry}) {
+  constructor(_options, {config, moduleRegistry}) {
     this.name = "esm-bundle-provider";
     this.config = config;
     this.moduleRegistry = moduleRegistry;
@@ -72,11 +73,15 @@ async function esmBundler(moduleId, moduleRegistry, runtimeEnvironment, runtimeP
           dynamicImports
         })
       ],
+      external: Object.keys(external),
       makeAbsoluteExternalsRelative: "ifRelativeSource"
     });
     return bundle.generate({
       paths: (id2) => {
-        return external[id2] || id2;
+        if (external[id2] && (external[id2].startsWith(import_shared_utils.PROTOCOL_HTTP) || external[id2].startsWith(import_shared_utils.PROTOCOL_HTTPS))) {
+          return external[id2];
+        }
+        return id2;
       },
       sourcemap: true
     });

package/build/cjs/index.cjs

@@ -50,6 +50,9 @@ var LwrModuleBundler = class {
   addBundleTransformers(transformers) {
     this.transformers.push(...transformers);
   }
+  getConfig() {
+    return this.bundleConfig;
+  }
   async getModuleBundle(moduleId, runtimeEnvironment, runtimeParams = {}, bundleConfigOverrides) {
     const {format, minify, debug} = runtimeEnvironment;
     const cacheKey = `${moduleId.specifier}|${moduleId.version}|${(0, import_shared_utils.getCacheKeyFromJson)({
@@ -124,6 +127,7 @@ var LwrModuleBundler = class {
   }
   getPublicApi() {
     return {
+      getConfig: this.getConfig.bind(this),
       getModuleBundle: this.getModuleBundle.bind(this),
       resolveModuleUri: this.resolveModuleUri.bind(this)
     };

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

@@ -36,20 +36,25 @@ var AMD_DEFINE = "LWR.define";
 var groupieCodeCache = new Map();
 function includeIdFactory(graphSpecifier, external, exclude = [], requiredImports, groups) {
   return (moduleRef) => {
-    if (external[moduleRef.specifier] !== void 0) {
-      return false;
+    const moduleIsNotRoot = graphSpecifier !== moduleRef.specifier;
+    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;
+      }
     }
     const moduleRefIsGroupie = (0, import_shared_utils.isGroupie)(moduleRef.specifier, groups);
     const rootModuleIsGroupie = (0, import_shared_utils.isGroupie)(graphSpecifier, groups);
-    const moduleIsNotRoot = graphSpecifier !== moduleRef.specifier;
     if (moduleRefIsGroupie) {
       if (moduleIsNotRoot && !rootModuleIsGroupie) {
-        requiredImports.set(`${moduleRef.specifier}_${moduleRef.version}`, moduleRef);
+        requiredImports.set(`${moduleRef.specifier}_${moduleRef.version || import_shared_utils.VERSION_NOT_PROVIDED}`, moduleRef);
       }
       return false;
     } else if (exclude?.includes(moduleRef.specifier)) {
       if (moduleIsNotRoot) {
-        requiredImports.set(`${moduleRef.specifier}_${moduleRef.version}`, moduleRef);
+        requiredImports.set(`${moduleRef.specifier}_${moduleRef.version || import_shared_utils.VERSION_NOT_PROVIDED}`, moduleRef);
       }
       return false;
     }
@@ -121,16 +126,24 @@ 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 (isExternalFile) {
+      return linkedDefinition.linkedSource;
+    }
     return bundle(id, moduleGraphs, minify, unVersionedAliases);
   }))).filter((x) => typeof x === "string");
   return bundles;
@@ -175,8 +188,8 @@ async function amdBundler(rootModuleId, moduleRegistry, minify = false, runtimeE
       for (const rawGroupieSpecifier of groupies) {
         if (rawGroupieSpecifier !== rootModuleId.specifier) {
           const groupieModuleGraph = groupModuleGraphsMap.get(rawGroupieSpecifier);
-          const groupieSpecifer = groupieModuleGraph.graphs[0].specifier;
-          const groupieBundles = await getBundleCode(groupieSpecifer, groupieModuleGraph, includedModules, bundleGroupsIncludedModules, dynamicImports, minify, !!runtimeEnvironment.featureFlags?.EXPERIMENTAL_UNVERSIONED_ALIASES, includeIdFactory(rawGroupieSpecifier, external, exclude, requiredImports, groups), moduleRegistry, runtimeEnvironment, runtimeParams, bundledSpecifiersMap);
+          const groupieSpecifier = groupieModuleGraph.graphs[0].specifier;
+          const groupieBundles = await getBundleCode(groupieSpecifier, groupieModuleGraph, includedModules, bundleGroupsIncludedModules, dynamicImports, minify, !!runtimeEnvironment.featureFlags?.EXPERIMENTAL_UNVERSIONED_ALIASES, includeIdFactory(rawGroupieSpecifier, external, exclude, requiredImports, groups), moduleRegistry, runtimeEnvironment, runtimeParams, bundledSpecifiersMap);
           bundles.push(...groupieBundles);
         }
       }

package/build/es/esm-bundle-provider.d.ts

@@ -3,7 +3,7 @@ export default class EsmBundlerProvider implements BundleProvider {
     name: string;
     config: ProviderAppConfig;
     moduleRegistry: PublicModuleRegistry;
-    constructor(options: {}, { config, moduleRegistry }: ProviderContext);
+    constructor(_options: {}, { config, moduleRegistry }: ProviderContext);
     bundle<T extends AbstractModuleId, R extends RuntimeEnvironment>(moduleId: T, runtimeEnvironment: R, runtimeParams?: RuntimeParams, bundleConfigOverrides?: BundleConfigOverrides): Promise<BundleDefinition | undefined>;
 }
 //# sourceMappingURL=esm-bundle-provider.d.ts.map

package/build/es/esm-bundle-provider.js

@@ -3,8 +3,9 @@ import { BundleSpan, getTracer } from '@lwrjs/instrumentation';
 import { bundleDefinitions } from './utils/rollup-esm-bundler-plugin.js';
 import { minifyJavascript } from './utils/esbuild-utils.js';
 import { overrideBundleConfig } from './utils/bundle-common.js';
+import { PROTOCOL_HTTP, PROTOCOL_HTTPS } from '@lwrjs/shared-utils';
 export default class EsmBundlerProvider {
-    constructor(options, { config, moduleRegistry }) {
+    constructor(_options, { config, moduleRegistry }) {
         this.name = 'esm-bundle-provider';
         this.config = config;
         this.moduleRegistry = moduleRegistry;
@@ -43,13 +44,19 @@ async function esmBundler(moduleId, moduleRegistry, runtimeEnvironment, runtimeP
                     dynamicImports,
                 }),
             ],
+            external: Object.keys(external),
             makeAbsoluteExternalsRelative: 'ifRelativeSource', // Fix for breaking changes in https://github.com/rollup/rollup/pull/4021
         });
         return bundle.generate({
             paths: (id) => {
                 // The fallback on id is important due to a rollup semantic issue:
                 // https://github.com/rollup/rollup/issues/3831
-                return external[id] || id;
+                // If external is an http:// URL use that in the ESM Module
+                if (external[id] &&
+                    (external[id].startsWith(PROTOCOL_HTTP) || external[id].startsWith(PROTOCOL_HTTPS))) {
+                    return external[id];
+                }
+                return id;
             },
             sourcemap: true,
         });

package/build/es/index.d.ts

@@ -14,6 +14,7 @@ export declare class LwrModuleBundler implements ModuleBundler {
     constructor(config: LwrModuleBundlerConfig, globalConfig: NormalizedLwrGlobalConfig);
     addBundleProviders(providers: BundleProvider[]): void;
     addBundleTransformers(transformers: UriTransformPlugin[]): void;
+    getConfig(): BundleConfig;
     getModuleBundle<T extends AbstractModuleId>(moduleId: T, runtimeEnvironment: SourceMapRuntimeEnvironment, runtimeParams?: RuntimeParams, bundleConfigOverrides?: BundleConfigOverrides): Promise<BundleDefinition>;
     /**
      * Resolve the URI to the bundle rooted at the `moduleId`

package/build/es/index.js

@@ -28,6 +28,9 @@ export class LwrModuleBundler {
     addBundleTransformers(transformers) {
         this.transformers.push(...transformers);
     }
+    getConfig() {
+        return this.bundleConfig;
+    }
     async getModuleBundle(moduleId, runtimeEnvironment, runtimeParams = {}, bundleConfigOverrides) {
         const { format, minify, debug } = runtimeEnvironment;
         const cacheKey = `${moduleId.specifier}|${moduleId.version}|${getCacheKeyFromJson({
@@ -121,6 +124,7 @@ export class LwrModuleBundler {
     }
     getPublicApi() {
         return {
+            getConfig: this.getConfig.bind(this),
             getModuleBundle: this.getModuleBundle.bind(this),
             resolveModuleUri: this.resolveModuleUri.bind(this),
         };

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

@@ -1,4 +1,4 @@
-import { GraphDepth, createAmdAlias, explodeSpecifier, getModuleGraphs, getSpecifier, getGroupName, isGroupie, getCacheKeyFromJson, } 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';
@@ -8,21 +8,28 @@ const AMD_DEFINE = 'LWR.define';
 const groupieCodeCache = new Map();
 function includeIdFactory(graphSpecifier, external, exclude = [], requiredImports, groups) {
     return (moduleRef) => {
+        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) {
-            // Do not include externals in the required imports but also return false to indicate it should not be in the bundle
-            return false;
+        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;
+            }
         }
         const moduleRefIsGroupie = isGroupie(moduleRef.specifier, groups);
         const rootModuleIsGroupie = isGroupie(graphSpecifier, groups);
-        const moduleIsNotRoot = graphSpecifier !== moduleRef.specifier;
         if (moduleRefIsGroupie) {
             // If this is part of bundle group return false to indicate it should not be in the bundle
             // but add it to the requiredImports so it shows up as a static dependency of the bundle.
             // However, skip this if the requested specifier is also part of the same group.
             if (moduleIsNotRoot && !rootModuleIsGroupie) {
-                requiredImports.set(`${moduleRef.specifier}_${moduleRef.version}`, moduleRef);
+                requiredImports.set(`${moduleRef.specifier}_${moduleRef.version || VERSION_NOT_PROVIDED}`, moduleRef);
             }
             return false;
         }
@@ -30,7 +37,7 @@ function includeIdFactory(graphSpecifier, external, exclude = [], requiredImport
             // If this is a bundle exclude return false to indicate it should not be in the bundle
             // but add it to the requiredImports so it shows up as a static dependency of the bundle.
             if (moduleIsNotRoot) {
-                requiredImports.set(`${moduleRef.specifier}_${moduleRef.version}`, moduleRef);
+                requiredImports.set(`${moduleRef.specifier}_${moduleRef.version || VERSION_NOT_PROVIDED}`, moduleRef);
             }
             return false;
         }
@@ -115,19 +122,32 @@ 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 from a static file no need to bundle.
+        if (isExternalFile) {
+            return linkedDefinition.linkedSource;
+        }
         // bundle all dependencies for the linked definition and convert to AMD
         return bundle(id, moduleGraphs, minify, unVersionedAliases);
     }))).filter((x) => typeof x === 'string');
@@ -180,9 +200,9 @@ export async function amdBundler(rootModuleId, moduleRegistry, minify = false, r
             for (const rawGroupieSpecifier of groupies) {
                 if (rawGroupieSpecifier !== rootModuleId.specifier) {
                     const groupieModuleGraph = groupModuleGraphsMap.get(rawGroupieSpecifier);
-                    const groupieSpecifer = groupieModuleGraph.graphs[0].specifier;
+                    const groupieSpecifier = groupieModuleGraph.graphs[0].specifier;
                     // eslint-disable-next-line no-await-in-loop
-                    const groupieBundles = await getBundleCode(groupieSpecifer, groupieModuleGraph, includedModules, bundleGroupsIncludedModules, dynamicImports, minify, !!runtimeEnvironment.featureFlags?.EXPERIMENTAL_UNVERSIONED_ALIASES, includeIdFactory(rawGroupieSpecifier, external, exclude, requiredImports, groups), moduleRegistry, runtimeEnvironment, runtimeParams, bundledSpecifiersMap);
+                    const groupieBundles = await getBundleCode(groupieSpecifier, groupieModuleGraph, includedModules, bundleGroupsIncludedModules, dynamicImports, minify, !!runtimeEnvironment.featureFlags?.EXPERIMENTAL_UNVERSIONED_ALIASES, includeIdFactory(rawGroupieSpecifier, external, exclude, requiredImports, groups), moduleRegistry, runtimeEnvironment, runtimeParams, bundledSpecifiersMap);
                     bundles.push(...groupieBundles);
                 }
             }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.3",
+    "version": "0.12.0-alpha.30",
     "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.3",
-        "@lwrjs/instrumentation": "0.12.0-alpha.3",
-        "@lwrjs/shared-utils": "0.12.0-alpha.3",
+        "@lwrjs/diagnostics": "0.12.0-alpha.30",
+        "@lwrjs/instrumentation": "0.12.0-alpha.30",
+        "@lwrjs/shared-utils": "0.12.0-alpha.30",
         "@rollup/plugin-replace": "^2.4.2",
         "rollup": "^2.78.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.3",
+        "@lwrjs/types": "0.12.0-alpha.30",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -70,5 +70,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "48f97b40cbacce6cd6a6faee9206a465832c6774"
+    "gitHead": "5273cb7ece90a3a28645cb1dfde9d315548605db"
 }