@lwrjs/config 0.12.0-alpha.9 → 0.12.0

package/build/cjs/defaults.cjs

@@ -35,6 +35,7 @@ __export(exports, {
   DEFAULT_LWR_MODULES: () => DEFAULT_LWR_MODULES,
   DEFAULT_ROOT_DIR: () => DEFAULT_ROOT_DIR,
   DEFAULT_SERVICE_PACKAGE_NAME: () => DEFAULT_SERVICE_PACKAGE_NAME,
+  LWR_INFO_ROUTE: () => LWR_INFO_ROUTE,
   LWR_VERSION: () => LWR_VERSION,
   getDefaultBundleConfig: () => getDefaultBundleConfig
 });
@@ -66,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 = [
@@ -110,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": "",
+  "lwr/profiler": ""
 };
 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": "",
+  "lwr/profiler": ""
 };
 function getDefaultBundleConfig(mode) {
   const format = (0, import_runtime_config.getServerModeConfig)(mode || MODE).format;
@@ -125,6 +127,11 @@ function getDefaultBundleConfig(mode) {
     external: format === "esm" ? DEFAULT_ESM_BUNDLE_EXTERNALS : loaderLegacy ? DEFAULT_AMD_LEGACY_BUNDLE_EXTERNALS : DEFAULT_AMD_BUNDLE_EXTERNALS
   };
 }
+var LWR_INFO_ROUTE = {
+  id: "lwrInfo",
+  path: "/lwr-info",
+  routeHandler: `@lwrjs/core/info/route-handler`
+};
 var DEFAULT_LWR_CONFIG = {
   port: PORT,
   ignoreLwrConfigFile: false,
@@ -152,11 +159,7 @@ var DEFAULT_LWR_CONFIG = {
   environment: {},
   lwc: {modules: []},
   routes: [
-    {
-      id: "lwrInfo",
-      path: "/lwr-info",
-      routeHandler: `@lwrjs/core/info/route-handler`
-    }
+    LWR_INFO_ROUTE
   ],
   errorRoutes: [],
   routeHandlers: {},

package/build/cjs/global-config.cjs

@@ -52,7 +52,11 @@ function getLwrConfigFromFile(rootDir, lwrConfigPath = import_defaults.DEFAULT_L
   }
   const configSource = (0, import_shared_utils.readFile)(resolvedLwrConfigPath);
   (0, import_app_config.validateLwrAppConfig)(configSource, "file");
-  return (0, import_jsonc_parser.parse)(configSource);
+  let parsedConfig = (0, import_jsonc_parser.parse)(configSource);
+  if (parsedConfig?.routes) {
+    parsedConfig.routes = parsedConfig.routes.filter((route) => route.path !== "/lwr-info");
+  }
+  return parsedConfig;
 }
 function createCacheFolder(cache, rootDir) {
   const cacheDir = (0, import_shared_utils.normalizeDirectory)(cache, rootDir);
@@ -68,14 +72,23 @@ function mergeConfig(configArg) {
   const rootDir = import_path.default.resolve(configArg?.rootDir || import_defaults.DEFAULT_ROOT_DIR);
   const configFile = !configArg?.ignoreLwrConfigFile ? getLwrConfigFromFile(rootDir, configArg?.lwrConfigFile) : void 0;
   if (configFile) {
-    configFile.routes = (configFile?.routes ?? []).concat(import_defaults.DEFAULT_LWR_CONFIG.routes);
+    configFile.routes = [...import_defaults.DEFAULT_LWR_CONFIG.routes, ...configFile?.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 +156,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/cjs/hooks.cjs

@@ -25,12 +25,25 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   executeConfigHooks: () => executeConfigHooks,
+  executeContextHooks: () => executeContextHooks,
   executeInstrumentationHooks: () => executeInstrumentationHooks,
   executeStartHooks: () => executeStartHooks
 });
 var import_routes = __toModule(require("./utils/routes.cjs"));
 var import_app_config = __toModule(require("./validation/app-config.cjs"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
+var import_defaults = __toModule(require("./defaults.cjs"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
+function isInfoRoute(route) {
+  if (route.path === import_defaults.LWR_INFO_ROUTE.path && route.id === import_defaults.LWR_INFO_ROUTE.id) {
+    if (Array.isArray(route.routeHandler)) {
+      return route.routeHandler?.includes(`${import_defaults.LWR_INFO_ROUTE.routeHandler}`);
+    } else if (typeof route.routeHandler === "string") {
+      return route.routeHandler === import_defaults.LWR_INFO_ROUTE.routeHandler;
+    }
+  }
+  return false;
+}
 async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globalData, skipValidate = false) {
   const span = (0, import_instrumentation.getTracer)().startSpan({name: import_instrumentation.ConfigSpan.ExecuteConfigHooks});
   if (!hooks.length) {
@@ -43,7 +56,22 @@ async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globa
     }
     await hook.initConfigs(globalConfig, globalData, runtimeEnvironment);
   }
-  globalConfig.routes = (0, import_routes.normalizeRoutes)(globalConfig.routes, globalConfig.routeHandlers);
+  let filteredRoutes = globalConfig.routes.filter((e) => e.path !== "/lwr-info" || isInfoRoute(e));
+  if (filteredRoutes.length < globalConfig.routes.length) {
+    import_diagnostics.logger.warn({
+      label: "config hooks",
+      message: "config hook attempted to redefine protected /lwr-info path"
+    });
+  }
+  const hasInfoRoute = filteredRoutes.some((route) => isInfoRoute(route));
+  if (!hasInfoRoute) {
+    filteredRoutes = [import_defaults.LWR_INFO_ROUTE, ...filteredRoutes];
+    import_diagnostics.logger.warn({
+      label: "config hooks",
+      message: "config hook attempted to remove /lwr-info route"
+    });
+  }
+  globalConfig.routes = (0, import_routes.normalizeRoutes)(filteredRoutes, globalConfig.routeHandlers);
   globalConfig.errorRoutes = (0, import_routes.normalizeRoutes)(globalConfig.errorRoutes, globalConfig.routeHandlers);
   if (!skipValidate) {
     (0, import_app_config.validateLwrAppConfig)(globalConfig, "post");
@@ -72,7 +100,22 @@ function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipValidate
     globalConfig.routes = onStartConfig.routes || [];
     globalConfig.errorRoutes = onStartConfig.errorRoutes || [];
   }
-  globalConfig.routes = (0, import_routes.normalizeRoutes)(globalConfig.routes, globalConfig.routeHandlers);
+  let filteredRoutes = globalConfig.routes.filter((e) => e.path !== "/lwr-info" || isInfoRoute(e));
+  if (filteredRoutes.length < globalConfig.routes.length) {
+    import_diagnostics.logger.warn({
+      label: "start hooks",
+      message: "onStart hook attempted to redefine protected /lwr-info path"
+    });
+  }
+  const hasInfoRoute = filteredRoutes.some((route) => isInfoRoute(route));
+  if (!hasInfoRoute) {
+    filteredRoutes = [import_defaults.LWR_INFO_ROUTE, ...filteredRoutes];
+    import_diagnostics.logger.warn({
+      label: "start hooks",
+      message: "onStart hook attempted to remove /lwr-info route"
+    });
+  }
+  globalConfig.routes = (0, import_routes.normalizeRoutes)(filteredRoutes, globalConfig.routeHandlers);
   globalConfig.errorRoutes = (0, import_routes.normalizeRoutes)(globalConfig.errorRoutes, globalConfig.routeHandlers);
   if (!skipValidate) {
     (0, import_app_config.validateLwrAppConfig)(globalConfig, "post");
@@ -81,14 +124,33 @@ function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipValidate
 }
 function executeInstrumentationHooks(hooks) {
   const span = (0, import_instrumentation.getTracer)().startSpan({name: import_instrumentation.ConfigSpan.ExecuteInstrHooks});
-  let retVal = false;
+  const instrumentation = [];
   for (const hook of hooks) {
     if (!hook.initInstrumentation) {
       continue;
     }
-    retVal = true;
-    hook.initInstrumentation();
+    instrumentation.push(hook.initInstrumentation());
   }
   span.end();
-  return retVal;
+  if (!instrumentation.length) {
+    return void 0;
+  }
+  return {
+    flush() {
+      for (const instance of instrumentation) {
+        instance.flush();
+      }
+    }
+  };
+}
+async function executeContextHooks(hooks, serverContext) {
+  if (!hooks.length) {
+    return;
+  }
+  for (const hook of hooks) {
+    if (!hook.setupServerContext) {
+      continue;
+    }
+    await hook.setupServerContext(serverContext, hooks);
+  }
 }

package/build/cjs/index.cjs

@@ -28,9 +28,6 @@ __export(exports, {
   LWR_VERSION: () => import_package.lwrVersion,
   NODE_VERSION: () => import_package.nodeVersion,
   PWA_KIT_RUNTIME_VERSION: () => import_package.pwaKitRuntimeVersion,
-  executeConfigHooks: () => import_hooks.executeConfigHooks,
-  executeInstrumentationHooks: () => import_hooks.executeInstrumentationHooks,
-  executeStartHooks: () => import_hooks.executeStartHooks,
   getLwrConfigFromFile: () => import_global_config.getLwrConfigFromFile,
   getRuntimeEnvironment: () => import_runtime_config.getRuntimeEnvironment,
   loadConfig: () => import_global_config.loadConfig,
@@ -40,5 +37,5 @@ __export(exports, {
 var import_package = __toModule(require("@lwrjs/config/package"));
 var import_global_config = __toModule(require("./global-config.cjs"));
 var import_runtime_config = __toModule(require("./runtime-config.cjs"));
-var import_hooks = __toModule(require("./hooks.cjs"));
+__exportStar(exports, __toModule(require("./hooks.cjs")));
 var import_app_config = __toModule(require("./validation/app-config.cjs"));

package/build/cjs/runtime-config.cjs

@@ -100,7 +100,7 @@ var RUNTIME_CONFIGS = {
 function getServerModeConfig(serverMode) {
   const selectedMode = RUNTIME_CONFIGS[serverMode];
   if (!selectedMode) {
-    throw (0, import_diagnostics.createSingleDiagnosticError)({description: import_diagnostics.descriptions.SERVER.INVALID_MODE(serverMode)}, import_diagnostics.LwrServerError);
+    throw (0, import_diagnostics.createSingleDiagnosticError)({description: import_diagnostics.descriptions.UNRESOLVABLE.INVALID_MODE(serverMode)}, import_diagnostics.LwrServerError);
   }
   return selectedMode;
 }

package/build/cjs/validation/app-config.cjs

@@ -288,6 +288,9 @@ function validateLwrAppConfig(config, phase) {
     if (validationContext.diagnostics.length) {
       throw new import_diagnostics2.LwrConfigValidationError(`Configuration validation errors in ${SOURCE_BY_PHASE[phase]}`, validationContext.diagnostics);
     }
+    if (phase === "file" && jsonSourceText.includes("/lwr-info")) {
+      import_diagnostics.logger.warn({label: `config`, message: `LWR Config file attempted to override "/lwr-info" path`});
+    }
     span.end();
     return;
   } catch (err) {

package/build/es/defaults.d.ts

@@ -1,4 +1,4 @@
-import type { BundleConfig, LwrGlobalConfig, StaticSiteGenerator } from '@lwrjs/types';
+import type { BundleConfig, LwrGlobalConfig, LwrRoute, StaticSiteGenerator } from '@lwrjs/types';
 export declare const LWR_VERSION: string;
 export declare const DEFAULT_LWR_CONFIG_JSON = "$rootDir/lwr.config.json";
 export declare const DEFAULT_GENERATOR_CONFIG: StaticSiteGenerator;
@@ -13,5 +13,6 @@ export declare const DEFAULT_LWR_MODULES: {
 export declare const DEFAULT_ESM_BUNDLE_EXCLUSIONS: string[];
 export declare const DEFAULT_AMD_BUNDLE_EXCLUSIONS: string[];
 export declare function getDefaultBundleConfig(mode?: string): BundleConfig;
+export declare const LWR_INFO_ROUTE: LwrRoute;
 export declare const DEFAULT_LWR_CONFIG: Required<LwrGlobalConfig>;
 //# sourceMappingURL=defaults.d.ts.map

package/build/es/defaults.js

@@ -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': '',
+    'lwr/profiler': '',
 };
 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': '',
+    'lwr/profiler': '',
 };
 export function getDefaultBundleConfig(mode) {
     const format = getServerModeConfig(mode || MODE).format;
@@ -91,6 +92,11 @@ export function getDefaultBundleConfig(mode) {
                 : DEFAULT_AMD_BUNDLE_EXTERNALS,
     };
 }
+export const LWR_INFO_ROUTE = {
+    id: 'lwrInfo',
+    path: '/lwr-info',
+    routeHandler: `@lwrjs/core/info/route-handler`
+};
 export const DEFAULT_LWR_CONFIG = {
     port: PORT,
     ignoreLwrConfigFile: false,
@@ -118,11 +124,7 @@ export const DEFAULT_LWR_CONFIG = {
     environment: {},
     lwc: { modules: [] },
     routes: [
-        {
-            id: 'lwrInfo',
-            path: '/lwr-info',
-            routeHandler: `@lwrjs/core/info/route-handler`,
-        },
+        LWR_INFO_ROUTE,
     ],
     errorRoutes: [],
     routeHandlers: {},

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';
@@ -35,7 +35,11 @@ export function getLwrConfigFromFile(rootDir, lwrConfigPath = DEFAULT_LWR_CONFIG
     }
     const configSource = readFile(resolvedLwrConfigPath);
     validateLwrAppConfig(configSource, 'file');
-    return parse(configSource);
+    let parsedConfig = parse(configSource);
+    if (parsedConfig?.routes) {
+        parsedConfig.routes = parsedConfig.routes.filter(route => route.path !== '/lwr-info');
+    }
+    return parsedConfig;
 }
 /**
  * Normalize the cache directory path and create the directory
@@ -79,7 +83,18 @@ function mergeConfig(configArg) {
         : undefined;
     // merge default routes with the config file routes
     if (configFile) {
-        configFile.routes = (configFile?.routes ?? []).concat(DEFAULT_LWR_CONFIG.routes);
+        configFile.routes = [...DEFAULT_LWR_CONFIG.routes, ...(configFile?.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 {
@@ -88,7 +103,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 +205,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/build/es/hooks.d.ts

@@ -1,18 +1,4 @@
-import type { GlobalData, HooksPlugin, NormalizedLwrGlobalConfig, RuntimeEnvironment } from '@lwrjs/types';
-/**
- * Run `initConfigs` hooks
- *
- * @remarks
- * Route normalization and validation will be executed after all config hooks have been executed.
- *
- * @privateRemarks
- * Changes to configurations are made by reference.
- *
- * @param hooks - hooks plugins
- * @param globalConfig - global configuration
- * @param runtimeEnvironment - runtime environment resolved from programmatic config and config file
- * @param globalData - resolved global data
- */
+import type { GlobalData, HooksPlugin, Instrumentation, NormalizedLwrGlobalConfig, RuntimeEnvironment, ServerContext } from '@lwrjs/types';
 export declare function executeConfigHooks(hooks: HooksPlugin[], globalConfig: NormalizedLwrGlobalConfig, runtimeEnvironment: RuntimeEnvironment, globalData: GlobalData, skipValidate?: boolean): Promise<void>;
 /**
  * Run `onStart` hooks
@@ -29,5 +15,6 @@ export declare function executeConfigHooks(hooks: HooksPlugin[], globalConfig: N
  * @param globalConfig - global configuration
  */
 export declare function executeStartHooks(hooks: HooksPlugin[], globalConfig: NormalizedLwrGlobalConfig, runtimeEnvironment: RuntimeEnvironment, skipValidate?: boolean): void;
-export declare function executeInstrumentationHooks(hooks: HooksPlugin[]): boolean;
+export declare function executeInstrumentationHooks(hooks: HooksPlugin[]): Instrumentation | undefined;
+export declare function executeContextHooks(hooks: HooksPlugin[], serverContext: ServerContext): Promise<void>;
 //# sourceMappingURL=hooks.d.ts.map

package/build/es/hooks.js

@@ -1,7 +1,20 @@
 import { normalizeRoutes } from './utils/routes.js';
 import { validateLwrAppConfig } from './validation/app-config.js';
 import { getTracer, ConfigSpan } from '@lwrjs/instrumentation';
-/**
+import { LWR_INFO_ROUTE } from './defaults.js';
+import { logger } from '@lwrjs/diagnostics';
+function isInfoRoute(route) {
+    if (route.path === LWR_INFO_ROUTE.path && route.id === LWR_INFO_ROUTE.id) {
+        if (Array.isArray(route.routeHandler)) {
+            return route.routeHandler?.includes(`${LWR_INFO_ROUTE.routeHandler}`);
+        }
+        else if (typeof route.routeHandler === 'string') {
+            return route.routeHandler === LWR_INFO_ROUTE.routeHandler;
+        }
+    }
+    return false;
+}
+/*
  * Run `initConfigs` hooks
  *
  * @remarks
@@ -28,7 +41,24 @@ export async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment
         // eslint-disable-next-line no-await-in-loop
         await hook.initConfigs(globalConfig, globalData, runtimeEnvironment);
     }
-    globalConfig.routes = normalizeRoutes(globalConfig.routes, globalConfig.routeHandlers);
+    // Check if /lwr-info was redefined
+    let filteredRoutes = globalConfig.routes.filter(e => e.path !== "/lwr-info" || isInfoRoute(e));
+    if (filteredRoutes.length < globalConfig.routes.length) {
+        logger.warn({
+            label: 'config hooks',
+            message: 'config hook attempted to redefine protected /lwr-info path',
+        });
+    }
+    // Check if /lwr-info was removed
+    const hasInfoRoute = filteredRoutes.some(route => isInfoRoute(route));
+    if (!hasInfoRoute) {
+        filteredRoutes = [LWR_INFO_ROUTE, ...filteredRoutes];
+        logger.warn({
+            label: 'config hooks',
+            message: 'config hook attempted to remove /lwr-info route',
+        });
+    }
+    globalConfig.routes = normalizeRoutes(filteredRoutes, globalConfig.routeHandlers);
     globalConfig.errorRoutes = normalizeRoutes(globalConfig.errorRoutes, globalConfig.routeHandlers);
     if (!skipValidate) {
         validateLwrAppConfig(globalConfig, 'post');
@@ -72,7 +102,24 @@ export function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipV
         globalConfig.routes = (onStartConfig.routes || []);
         globalConfig.errorRoutes = (onStartConfig.errorRoutes || []);
     }
-    globalConfig.routes = normalizeRoutes(globalConfig.routes, globalConfig.routeHandlers);
+    // Check if /lwr-info was redefined
+    let filteredRoutes = globalConfig.routes.filter(e => e.path !== "/lwr-info" || isInfoRoute(e));
+    if (filteredRoutes.length < globalConfig.routes.length) {
+        logger.warn({
+            label: 'start hooks',
+            message: 'onStart hook attempted to redefine protected /lwr-info path',
+        });
+    }
+    // Check if /lwr-info was removed
+    const hasInfoRoute = filteredRoutes.some(route => isInfoRoute(route));
+    if (!hasInfoRoute) {
+        filteredRoutes = [LWR_INFO_ROUTE, ...filteredRoutes];
+        logger.warn({
+            label: 'start hooks',
+            message: 'onStart hook attempted to remove /lwr-info route',
+        });
+    }
+    globalConfig.routes = normalizeRoutes(filteredRoutes, globalConfig.routeHandlers);
     globalConfig.errorRoutes = normalizeRoutes(globalConfig.errorRoutes, globalConfig.routeHandlers);
     if (!skipValidate) {
         validateLwrAppConfig(globalConfig, 'post');
@@ -81,15 +128,35 @@ export function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipV
 }
 export function executeInstrumentationHooks(hooks) {
     const span = getTracer().startSpan({ name: ConfigSpan.ExecuteInstrHooks });
-    let retVal = false;
+    const instrumentation = [];
     for (const hook of hooks) {
         if (!hook.initInstrumentation) {
             continue;
         }
-        retVal = true;
-        hook.initInstrumentation();
+        instrumentation.push(hook.initInstrumentation());
     }
     span.end();
-    return retVal;
+    if (!instrumentation.length) {
+        return undefined;
+    }
+    return {
+        flush() {
+            for (const instance of instrumentation) {
+                instance.flush();
+            }
+        }
+    };
+}
+export async function executeContextHooks(hooks, serverContext) {
+    if (!hooks.length) {
+        return;
+    }
+    for (const hook of hooks) {
+        if (!hook.setupServerContext) {
+            continue;
+        }
+        // eslint-disable-next-line no-await-in-loop
+        await hook.setupServerContext(serverContext, hooks);
+    }
 }
 //# sourceMappingURL=hooks.js.map

package/build/es/index.d.ts

@@ -1,6 +1,6 @@
 export { lwrVersion as LWR_VERSION, lwcVersion as LWC_VERSION, nodeVersion as NODE_VERSION, pwaKitRuntimeVersion as PWA_KIT_RUNTIME_VERSION, } from '@lwrjs/config/package';
 export { loadConfig, resolveGlobalConfig as normalizeConfig, getLwrConfigFromFile } from './global-config.js';
 export { getRuntimeEnvironment } from './runtime-config.js';
-export { executeConfigHooks, executeStartHooks, executeInstrumentationHooks } from './hooks.js';
+export * from './hooks.js';
 export { validateLwrAppConfig } from './validation/app-config.js';
 //# sourceMappingURL=index.d.ts.map

package/build/es/index.js

@@ -1,6 +1,6 @@
 export { lwrVersion as LWR_VERSION, lwcVersion as LWC_VERSION, nodeVersion as NODE_VERSION, pwaKitRuntimeVersion as PWA_KIT_RUNTIME_VERSION, } from '@lwrjs/config/package';
 export { loadConfig, resolveGlobalConfig as normalizeConfig, getLwrConfigFromFile } from './global-config.js';
 export { getRuntimeEnvironment } from './runtime-config.js';
-export { executeConfigHooks, executeStartHooks, executeInstrumentationHooks } from './hooks.js';
+export * from './hooks.js';
 export { validateLwrAppConfig } from './validation/app-config.js';
 //# sourceMappingURL=index.js.map

package/build/es/runtime-config.js

@@ -77,7 +77,7 @@ export const RUNTIME_CONFIGS = {
 export function getServerModeConfig(serverMode) {
     const selectedMode = RUNTIME_CONFIGS[serverMode];
     if (!selectedMode) {
-        throw createSingleDiagnosticError({ description: descriptions.SERVER.INVALID_MODE(serverMode) }, LwrServerError);
+        throw createSingleDiagnosticError({ description: descriptions.UNRESOLVABLE.INVALID_MODE(serverMode) }, LwrServerError);
     }
     return selectedMode;
 }

package/build/es/validation/app-config.js

@@ -356,6 +356,9 @@ export function validateLwrAppConfig(config, phase) {
         if (validationContext.diagnostics.length) {
             throw new LwrConfigValidationError(`Configuration validation errors in ${SOURCE_BY_PHASE[phase]}`, validationContext.diagnostics);
         }
+        if (phase === 'file' && jsonSourceText.includes("/lwr-info")) {
+            logger.warn({ label: `config`, message: `LWR Config file attempted to override "/lwr-info" path` });
+        }
         span.end();
         return;
     }

package/package.cjs

@@ -28,15 +28,18 @@ if (globalThis.LWC_VERSION) {
 
 // Get the PWA Kit Dev Runtime Version
 let pwaKitRuntimeVersion;
-try {
-    const packageJsonPath = resolve.sync(`@salesforce/pwa-kit-runtime/package.json`);
-    const { version: packageVersion } = JSON.parse(fs.readFileSync(packageJsonPath), 'utf-8');
-    pwaKitRuntimeVersion = packageVersion;
-} catch(err) {
-    console.log(`[config] peer dependency pwa-kit-runtime was not provided`);
-    pwaKitRuntimeVersion = 'not-provided';
+if (globalThis.PWA_KIT_RUNTIME_VERSION) {
+    pwaKitRuntimeVersion = globalThis.PWA_KIT_RUNTIME_VERSION;
+} else {
+    try {
+        const packageJsonPath = resolve.sync(`@salesforce/pwa-kit-runtime/package.json`);
+        const { version: packageVersion } = JSON.parse(fs.readFileSync(packageJsonPath), 'utf-8');
+        pwaKitRuntimeVersion = packageVersion;
+    } catch(err) {
+        console.log(`[config] peer dependency pwa-kit-runtime was not provided`);
+        pwaKitRuntimeVersion = 'not-provided';
+    }
 }
-
 const nodeVersion = process.version
 
 module.exports = {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.9",
+    "version": "0.12.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -42,21 +42,21 @@
         "test": "jest"
     },
     "dependencies": {
-        "@lwrjs/diagnostics": "0.12.0-alpha.9",
-        "@lwrjs/instrumentation": "0.12.0-alpha.9",
-        "@lwrjs/shared-utils": "0.12.0-alpha.9",
-        "fs-extra": "^11.1.1",
-        "jsonc-parser": "^3.0.0"
+        "@lwrjs/diagnostics": "0.12.0",
+        "@lwrjs/instrumentation": "0.12.0",
+        "@lwrjs/shared-utils": "0.12.0",
+        "fs-extra": "^11.2.0",
+        "jsonc-parser": "^3.2.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.9",
+        "@lwrjs/types": "0.12.0",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
     "peerDependencies": {
         "@lwc/engine-dom": ">= 2.x",
         "@lwc/synthetic-shadow": ">= 2.x",
-        "@lwrjs/esbuild": "0.11.x",
+        "@lwrjs/esbuild": "0.12.x || >= 0.12.0-alpha",
         "lwc": ">= 2.x"
     },
     "peerDependenciesMeta": {
@@ -70,5 +70,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "58b28fbc6300b704ac17f8878423120de0e376d7"
+    "gitHead": "90f93604b26003e1e1eb85bb0d1f34f4fc9e9ff9"
 }