@lwrjs/config 0.12.0-alpha.11 → 0.12.0-alpha.13

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
 });
@@ -125,6 +126,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 +158,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/hooks.cjs

@@ -32,6 +32,7 @@ __export(exports, {
 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"));
 async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globalData, skipValidate = false) {
   const span = (0, import_instrumentation.getTracer)().startSpan({name: import_instrumentation.ConfigSpan.ExecuteConfigHooks});
   if (!hooks.length) {
@@ -44,6 +45,10 @@ async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globa
     }
     await hook.initConfigs(globalConfig, globalData, runtimeEnvironment);
   }
+  const hasInfoRoute = globalConfig.routes.some((route) => route.id === import_defaults.LWR_INFO_ROUTE.id);
+  if (!hasInfoRoute) {
+    globalConfig.routes = [...globalConfig.routes, import_defaults.LWR_INFO_ROUTE];
+  }
   globalConfig.routes = (0, import_routes.normalizeRoutes)(globalConfig.routes, globalConfig.routeHandlers);
   globalConfig.errorRoutes = (0, import_routes.normalizeRoutes)(globalConfig.errorRoutes, globalConfig.routeHandlers);
   if (!skipValidate) {
@@ -73,6 +78,10 @@ function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipValidate
     globalConfig.routes = onStartConfig.routes || [];
     globalConfig.errorRoutes = onStartConfig.errorRoutes || [];
   }
+  const hasInfoRoute = globalConfig.routes.some((route) => route.id === import_defaults.LWR_INFO_ROUTE.id);
+  if (!hasInfoRoute) {
+    globalConfig.routes = [...globalConfig.routes, import_defaults.LWR_INFO_ROUTE];
+  }
   globalConfig.routes = (0, import_routes.normalizeRoutes)(globalConfig.routes, globalConfig.routeHandlers);
   globalConfig.errorRoutes = (0, import_routes.normalizeRoutes)(globalConfig.errorRoutes, globalConfig.routeHandlers);
   if (!skipValidate) {
@@ -82,16 +91,24 @@ 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) {

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/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

@@ -91,6 +91,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 +123,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/hooks.d.ts

@@ -1,4 +1,4 @@
-import type { GlobalData, HooksPlugin, NormalizedLwrGlobalConfig, RuntimeEnvironment, ServerContext } from '@lwrjs/types';
+import type { GlobalData, HooksPlugin, Instrumentation, NormalizedLwrGlobalConfig, RuntimeEnvironment, ServerContext } from '@lwrjs/types';
 /**
  * Run `initConfigs` hooks
  *
@@ -29,6 +29,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,6 +1,7 @@
 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';
 /**
  * Run `initConfigs` hooks
  *
@@ -28,6 +29,10 @@ export async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment
         // eslint-disable-next-line no-await-in-loop
         await hook.initConfigs(globalConfig, globalData, runtimeEnvironment);
     }
+    const hasInfoRoute = globalConfig.routes.some(route => route.id === LWR_INFO_ROUTE.id);
+    if (!hasInfoRoute) {
+        globalConfig.routes = [...globalConfig.routes, LWR_INFO_ROUTE];
+    }
     globalConfig.routes = normalizeRoutes(globalConfig.routes, globalConfig.routeHandlers);
     globalConfig.errorRoutes = normalizeRoutes(globalConfig.errorRoutes, globalConfig.routeHandlers);
     if (!skipValidate) {
@@ -72,6 +77,11 @@ export function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipV
         globalConfig.routes = (onStartConfig.routes || []);
         globalConfig.errorRoutes = (onStartConfig.errorRoutes || []);
     }
+    // Check if Info Route was removed
+    const hasInfoRoute = globalConfig.routes.some(route => route.id === LWR_INFO_ROUTE.id);
+    if (!hasInfoRoute) {
+        globalConfig.routes = [...globalConfig.routes, LWR_INFO_ROUTE];
+    }
     globalConfig.routes = normalizeRoutes(globalConfig.routes, globalConfig.routeHandlers);
     globalConfig.errorRoutes = normalizeRoutes(globalConfig.errorRoutes, globalConfig.routeHandlers);
     if (!skipValidate) {
@@ -81,16 +91,24 @@ 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) {

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/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.11",
+    "version": "0.12.0-alpha.13",
     "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.11",
-        "@lwrjs/instrumentation": "0.12.0-alpha.11",
-        "@lwrjs/shared-utils": "0.12.0-alpha.11",
+        "@lwrjs/diagnostics": "0.12.0-alpha.13",
+        "@lwrjs/instrumentation": "0.12.0-alpha.13",
+        "@lwrjs/shared-utils": "0.12.0-alpha.13",
         "fs-extra": "^11.1.1",
         "jsonc-parser": "^3.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.11",
+        "@lwrjs/types": "0.12.0-alpha.13",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -70,5 +70,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "781951a5ef92ce735cbffce7c7a2a32c60bd3c16"
+    "gitHead": "7a63e416f9e5f27b44331311a371f68e20ce685c"
 }