@lwrjs/config 0.12.0-alpha.20 → 0.12.0-alpha.22

package/build/cjs/defaults.cjs

@@ -67,7 +67,8 @@ var DEFAULT_MODULE_PROVIDERS = [
   "@lwrjs/router/module-provider",
   "@lwrjs/lwc-module-provider",
   "@lwrjs/lwc-ssr/moduleProvider",
-  "@lwrjs/npm-module-provider"
+  "@lwrjs/npm-module-provider",
+  "@lwrjs/module-registry/externals-module-provider"
 ];
 var DEFAULT_RESOURCE_PROVIDERS = ["@lwrjs/loader"];
 var DEFAULT_VIEW_PROVIDERS = [
@@ -111,12 +112,12 @@ var DEFAULT_ESM_BUNDLE_EXCLUSIONS = [
 var DEFAULT_AMD_BUNDLE_EXCLUSIONS = ["lwc", "lwr/navigation"];
 var DEFAULT_ESM_BUNDLE_EXTERNALS = {};
 var DEFAULT_AMD_BUNDLE_EXTERNALS = {
-  "lwr/loader": "lwr-loader-shim.bundle.min.js",
-  "lwr/profiler": "lwr-loader-shim.bundle.min.js"
+  "lwr/loader": `${import_shared_utils.PROTOCOL_LWR}lwr-loader-shim.bundle.min.js`,
+  "lwr/profiler": `${import_shared_utils.PROTOCOL_LWR}lwr-loader-shim.bundle.min.js`
 };
 var DEFAULT_AMD_LEGACY_BUNDLE_EXTERNALS = {
-  "lwr/loaderLegacy": "lwr-loader-shim-legacy.bundle.min.js",
-  "lwr/profiler": "lwr-loader-shim-legacy.bundle.min.js"
+  "lwr/loaderLegacy": `${import_shared_utils.PROTOCOL_LWR}lwr-loader-shim-legacy.bundle.min.js`,
+  "lwr/profiler": `${import_shared_utils.PROTOCOL_LWR}lwr-loader-shim-legacy.bundle.min.js`
 };
 function getDefaultBundleConfig(mode) {
   const format = (0, import_runtime_config.getServerModeConfig)(mode || MODE).format;

package/build/cjs/global-config.cjs

@@ -70,12 +70,21 @@ function mergeConfig(configArg) {
   if (configFile) {
     configFile.routes = (configFile?.routes ?? []).concat(import_defaults.DEFAULT_LWR_CONFIG.routes);
   }
+  const bundleConfig = (0, import_merge.mergeBundleConfig)(configFile, configArg);
+  if (bundleConfig.external) {
+    for (const key of Object.keys(bundleConfig.external)) {
+      const path2 = bundleConfig.external[key];
+      if ((0, import_shared_utils.isLocalPath)(path2)) {
+        bundleConfig.external[key] = (0, import_shared_utils.normalizeToFileUrl)(path2, rootDir);
+      }
+    }
+  }
   return {
     ...import_defaults.DEFAULT_LWR_CONFIG,
     ...configFile,
     ...configArg,
     lwc: (0, import_merge.mergeLwcConfig)(configFile, configArg),
-    bundleConfig: (0, import_merge.mergeBundleConfig)(configFile, configArg),
+    bundleConfig,
     locker: (0, import_merge.mergeLockerConfig)(configFile, configArg),
     staticSiteGenerator: (0, import_merge.mergeStaticGenerationConfig)(configFile, configArg),
     rootDir
@@ -143,7 +152,8 @@ function applyStaticProviderConfig(config) {
     resourceProviders: [["@lwrjs/static/resource-provider", {}]],
     moduleProviders: [
       ["@lwrjs/static/module-provider", void 0],
-      ["@lwrjs/lwc-ssr/moduleProvider", void 0]
+      ["@lwrjs/lwc-ssr/moduleProvider", void 0],
+      ["@lwrjs/module-registry/externals-module-provider", void 0]
     ],
     bundleProviders: [
       ["@lwrjs/static/bundle-provider", void 0],

package/build/es/defaults.js

@@ -1,4 +1,4 @@
-import { DEFAULT_LWR_LOCKER_CONFIG, getFeatureFlags } from '@lwrjs/shared-utils';
+import { DEFAULT_LWR_LOCKER_CONFIG, PROTOCOL_LWR, getFeatureFlags } from '@lwrjs/shared-utils';
 import { lwrVersion } from '@lwrjs/config/package';
 import { DEFAULT_I18N_CONFIG, getServerModeConfig } from './runtime-config.js';
 const PORT = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
@@ -29,6 +29,7 @@ const DEFAULT_MODULE_PROVIDERS = [
     '@lwrjs/lwc-module-provider',
     '@lwrjs/lwc-ssr/moduleProvider',
     '@lwrjs/npm-module-provider',
+    '@lwrjs/module-registry/externals-module-provider',
 ];
 const DEFAULT_RESOURCE_PROVIDERS = ['@lwrjs/loader'];
 const DEFAULT_VIEW_PROVIDERS = [
@@ -72,12 +73,12 @@ export const DEFAULT_ESM_BUNDLE_EXCLUSIONS = [
 export const DEFAULT_AMD_BUNDLE_EXCLUSIONS = ['lwc', 'lwr/navigation'];
 const DEFAULT_ESM_BUNDLE_EXTERNALS = {};
 const DEFAULT_AMD_BUNDLE_EXTERNALS = {
-    'lwr/loader': 'lwr-loader-shim.bundle.min.js',
-    'lwr/profiler': 'lwr-loader-shim.bundle.min.js',
+    'lwr/loader': `${PROTOCOL_LWR}lwr-loader-shim.bundle.min.js`,
+    'lwr/profiler': `${PROTOCOL_LWR}lwr-loader-shim.bundle.min.js`,
 };
 const DEFAULT_AMD_LEGACY_BUNDLE_EXTERNALS = {
-    'lwr/loaderLegacy': 'lwr-loader-shim-legacy.bundle.min.js',
-    'lwr/profiler': 'lwr-loader-shim-legacy.bundle.min.js',
+    'lwr/loaderLegacy': `${PROTOCOL_LWR}lwr-loader-shim-legacy.bundle.min.js`,
+    'lwr/profiler': `${PROTOCOL_LWR}lwr-loader-shim-legacy.bundle.min.js`,
 };
 export function getDefaultBundleConfig(mode) {
     const format = getServerModeConfig(mode || MODE).format;

package/build/es/global-config.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { parse } from 'jsonc-parser';
 import { logger } from '@lwrjs/diagnostics';
-import { readFile, normalizeDirectory, getFeatureFlags, ASSETS_CACHE_DIR } from '@lwrjs/shared-utils';
+import { readFile, normalizeDirectory, getFeatureFlags, ASSETS_CACHE_DIR, isLocalPath, normalizeToFileUrl } from '@lwrjs/shared-utils';
 import { DEFAULT_AMD_LOADER, DEFAULT_AMD_LOADER_LEGACY, DEFAULT_ESM_LOADER, DEFAULT_LWR_CONFIG, DEFAULT_LWR_CONFIG_JSON, DEFAULT_ROOT_DIR, LWR_VERSION, } from './defaults.js';
 import { validateLwrAppConfig } from './validation/app-config.js';
 import { normalizeAssetPaths, normalizeAssets } from './utils/assets.js';
@@ -81,6 +81,17 @@ function mergeConfig(configArg) {
     if (configFile) {
         configFile.routes = (configFile?.routes ?? []).concat(DEFAULT_LWR_CONFIG.routes);
     }
+    // Merge the bundle configs
+    const bundleConfig = mergeBundleConfig(configFile, configArg);
+    // Normalize external file paths to absolute file URLs
+    if (bundleConfig.external) {
+        for (const key of Object.keys(bundleConfig.external)) {
+            const path = bundleConfig.external[key];
+            if (isLocalPath(path)) {
+                bundleConfig.external[key] = normalizeToFileUrl(path, rootDir);
+            }
+        }
+    }
     // merge the various configs in order of priority
     return {
         ...DEFAULT_LWR_CONFIG,
@@ -88,7 +99,7 @@ function mergeConfig(configArg) {
         ...configArg,
         // merge nested configurations
         lwc: mergeLwcConfig(configFile, configArg),
-        bundleConfig: mergeBundleConfig(configFile, configArg),
+        bundleConfig,
         locker: mergeLockerConfig(configFile, configArg),
         staticSiteGenerator: mergeStaticGenerationConfig(configFile, configArg),
         // root dir set by the config file will be ignored
@@ -190,6 +201,7 @@ export function applyStaticProviderConfig(config) {
         moduleProviders: [
             ['@lwrjs/static/module-provider', undefined],
             ['@lwrjs/lwc-ssr/moduleProvider', undefined],
+            ['@lwrjs/module-registry/externals-module-provider', undefined],
         ],
         bundleProviders: [
             ['@lwrjs/static/bundle-provider', undefined],

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.20",
+    "version": "0.12.0-alpha.22",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -42,14 +42,14 @@
         "test": "jest"
     },
     "dependencies": {
-        "@lwrjs/diagnostics": "0.12.0-alpha.20",
-        "@lwrjs/instrumentation": "0.12.0-alpha.20",
-        "@lwrjs/shared-utils": "0.12.0-alpha.20",
+        "@lwrjs/diagnostics": "0.12.0-alpha.22",
+        "@lwrjs/instrumentation": "0.12.0-alpha.22",
+        "@lwrjs/shared-utils": "0.12.0-alpha.22",
         "fs-extra": "^11.2.0",
         "jsonc-parser": "^3.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.20",
+        "@lwrjs/types": "0.12.0-alpha.22",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -70,5 +70,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "ae1793e34eaf4e9b97996d7aea9031908b23a13a"
+    "gitHead": "6eb804007e93e513d4eb60fd321c088bad3c698e"
 }