@lwrjs/config 0.9.0-alpha.21 → 0.9.0-alpha.23

package/build/cjs/defaults.cjs

@@ -118,6 +118,7 @@ var DEFAULT_LWR_CONFIG = {
   rootDir: DEFAULT_ROOT_DIR,
   cacheDir: DEFAULT_CACHE_FOLDER,
   serverMode: MODE,
+  minify: null,
   apiVersion: DEFAULT_API_VERSION,
   assets: DEFAULT_ASSETS_DIR,
   assetProviders: DEFAULT_ASSET_PROVIDERS,
@@ -139,5 +140,6 @@ var DEFAULT_LWR_CONFIG = {
   routeHandlers: {},
   bundleConfig: getDefaultBundleConfig(MODE),
   serverType: DEFAULT_SERVER_TYPE,
-  locker: import_shared_utils.DEFAULT_LWR_LOCKER_CONFIG
+  locker: import_shared_utils.DEFAULT_LWR_LOCKER_CONFIG,
+  experimentalAllowDupeRouteIds: false
 };

package/build/cjs/hooks.cjs

@@ -29,7 +29,7 @@ __export(exports, {
 });
 var import_routes = __toModule(require("./utils/routes.cjs"));
 var import_app_config = __toModule(require("./validation/app-config.cjs"));
-async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globalData) {
+async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globalData, skipValidate = false) {
   if (!hooks.length) {
     return;
   }
@@ -41,9 +41,11 @@ async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globa
   }
   globalConfig.routes = (0, import_routes.normalizeRoutes)(globalConfig.routes, globalConfig.routeHandlers);
   globalConfig.errorRoutes = (0, import_routes.normalizeRoutes)(globalConfig.errorRoutes, globalConfig.routeHandlers);
-  (0, import_app_config.validateLwrAppConfig)(globalConfig, "post");
+  if (!skipValidate) {
+    (0, import_app_config.validateLwrAppConfig)(globalConfig, "post");
+  }
 }
-function executeStartHooks(hooks, globalConfig) {
+function executeStartHooks(hooks, globalConfig, skipValidate = false) {
   if (!hooks.length) {
     return;
   }
@@ -54,5 +56,7 @@ function executeStartHooks(hooks, globalConfig) {
     hook.onStart(globalConfig.routes);
   }
   globalConfig.routes = (0, import_routes.normalizeRoutes)(globalConfig.routes, globalConfig.routeHandlers);
-  (0, import_app_config.validateLwrAppConfig)(globalConfig, "post");
+  if (!skipValidate) {
+    (0, import_app_config.validateLwrAppConfig)(globalConfig, "post");
+  }
 }

package/build/cjs/index.cjs

@@ -24,14 +24,17 @@ var __toModule = (module2) => {
 // packages/@lwrjs/config/src/index.ts
 __markAsModule(exports);
 __export(exports, {
+  LWC_VERSION: () => import_package.lwcVersion,
   LWR_VERSION: () => import_package.version,
   executeConfigHooks: () => import_hooks.executeConfigHooks,
   executeStartHooks: () => import_hooks.executeStartHooks,
   getRuntimeEnvironment: () => import_runtime_config.getRuntimeEnvironment,
   loadConfig: () => import_global_config.loadConfig,
-  normalizeConfig: () => import_global_config.resolveGlobalConfig
+  normalizeConfig: () => import_global_config.resolveGlobalConfig,
+  validateLwrAppConfig: () => import_app_config.validateLwrAppConfig
 });
 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"));
+var import_app_config = __toModule(require("./validation/app-config.cjs"));

package/build/cjs/runtime-config.cjs

@@ -96,9 +96,11 @@ function getServerModeConfig(serverMode) {
   return selectedMode;
 }
 function getRuntimeEnvironment(config) {
-  const {serverMode, lwrVersion, apiVersion, basePath} = config;
+  const {serverMode, lwrVersion, apiVersion, basePath, minify} = config;
+  const serverModeConfig = getServerModeConfig(config.serverMode);
   return {
-    ...getServerModeConfig(config.serverMode),
+    ...serverModeConfig,
+    minify: minify !== null ? minify : serverModeConfig.minify,
     featureFlags: (0, import_shared_utils.getFeatureFlags)(),
     serverMode,
     lwrVersion,

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

@@ -70,9 +70,11 @@ var ROOT_ATTRIBUTE_KEYS = createKeys("root", [
   "routeHandlers",
   "routes",
   "serverMode",
+  "minify",
   "serverType",
   "viewProviders",
-  "viewTransformers"
+  "viewTransformers",
+  "experimentalAllowDupeRouteIds"
 ]);
 var ASSET_DIR_ATTRIBUTE_KEYS = createKeys("assetDir", ["alias", "dir", "urlPath"]);
 var ASSET_FILE_ATTRIBUTE_KEYS = createKeys("assetFile", ["alias", "file", "urlPath"]);

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

@@ -149,7 +149,10 @@ function validateRoot(node, validationContext, preMerge) {
   !preMerge && validationContext.assertRequiredKeys(node, "root", import_app_config_context.ROOT_ATTRIBUTE_KEYS);
   const routes = (0, import_jsonc_parser.findNodeAtLocation)(node, ["routes"]);
   const errorRoutes = (0, import_jsonc_parser.findNodeAtLocation)(node, ["errorRoutes"]);
-  validationContext.assertUniqueIds([...routes?.children || [], ...errorRoutes?.children || []], "routes");
+  const experimentalAllowDupeRouteIds = (0, import_jsonc_parser.findNodeAtLocation)(node, ["experimentalAllowDupeRouteIds"]);
+  if (experimentalAllowDupeRouteIds?.value !== true) {
+    validationContext.assertUniqueIds([...routes?.children || [], ...errorRoutes?.children || []], "routes");
+  }
   validateRoutes(routes, validationContext, preMerge);
   validateErrorRoutes(errorRoutes, validationContext);
   validateRouteHandlers((0, import_jsonc_parser.findNodeAtLocation)(node, ["routeHandlers"]), validationContext);

package/build/es/defaults.js

@@ -86,6 +86,7 @@ export const DEFAULT_LWR_CONFIG = {
     rootDir: DEFAULT_ROOT_DIR,
     cacheDir: DEFAULT_CACHE_FOLDER,
     serverMode: MODE,
+    minify: null,
     apiVersion: DEFAULT_API_VERSION,
     assets: DEFAULT_ASSETS_DIR,
     assetProviders: DEFAULT_ASSET_PROVIDERS,
@@ -108,5 +109,6 @@ export const DEFAULT_LWR_CONFIG = {
     bundleConfig: getDefaultBundleConfig(MODE),
     serverType: DEFAULT_SERVER_TYPE,
     locker: DEFAULT_LWR_LOCKER_CONFIG,
+    experimentalAllowDupeRouteIds: false,
 };
 //# sourceMappingURL=defaults.js.map

package/build/es/hooks.d.ts

@@ -13,7 +13,7 @@ import type { GlobalData, HooksPlugin, NormalizedLwrGlobalConfig, RuntimeEnviron
  * @param runtimeEnvironment - runtime environment resolved from programmatic config and config file
  * @param globalData - resolved global data
  */
-export declare function executeConfigHooks(hooks: HooksPlugin[], globalConfig: NormalizedLwrGlobalConfig, runtimeEnvironment: RuntimeEnvironment, globalData: GlobalData): Promise<void>;
+export declare function executeConfigHooks(hooks: HooksPlugin[], globalConfig: NormalizedLwrGlobalConfig, runtimeEnvironment: RuntimeEnvironment, globalData: GlobalData, skipValidate?: boolean): Promise<void>;
 /**
  * Run `onStart` hooks
  *
@@ -28,5 +28,5 @@ export declare function executeConfigHooks(hooks: HooksPlugin[], globalConfig: N
  * @param hooks - hooks plugins
  * @param globalConfig - global configuration
  */
-export declare function executeStartHooks(hooks: HooksPlugin[], globalConfig: NormalizedLwrGlobalConfig): void;
+export declare function executeStartHooks(hooks: HooksPlugin[], globalConfig: NormalizedLwrGlobalConfig, skipValidate?: boolean): void;
 //# sourceMappingURL=hooks.d.ts.map

package/build/es/hooks.js

@@ -14,7 +14,7 @@ import { validateLwrAppConfig } from './validation/app-config.js';
  * @param runtimeEnvironment - runtime environment resolved from programmatic config and config file
  * @param globalData - resolved global data
  */
-export async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globalData) {
+export async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globalData, skipValidate = false) {
     if (!hooks.length) {
         return;
     }
@@ -27,7 +27,9 @@ export async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment
     }
     globalConfig.routes = normalizeRoutes(globalConfig.routes, globalConfig.routeHandlers);
     globalConfig.errorRoutes = normalizeRoutes(globalConfig.errorRoutes, globalConfig.routeHandlers);
-    validateLwrAppConfig(globalConfig, 'post');
+    if (!skipValidate) {
+        validateLwrAppConfig(globalConfig, 'post');
+    }
 }
 /**
  * Run `onStart` hooks
@@ -43,7 +45,7 @@ export async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment
  * @param hooks - hooks plugins
  * @param globalConfig - global configuration
  */
-export function executeStartHooks(hooks, globalConfig) {
+export function executeStartHooks(hooks, globalConfig, skipValidate = false) {
     if (!hooks.length) {
         return;
     }
@@ -54,6 +56,8 @@ export function executeStartHooks(hooks, globalConfig) {
         hook.onStart(globalConfig.routes);
     }
     globalConfig.routes = normalizeRoutes(globalConfig.routes, globalConfig.routeHandlers);
-    validateLwrAppConfig(globalConfig, 'post');
+    if (!skipValidate) {
+        validateLwrAppConfig(globalConfig, 'post');
+    }
 }
 //# sourceMappingURL=hooks.js.map

package/build/es/index.d.ts

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

package/build/es/index.js

@@ -1,5 +1,6 @@
-export { version as LWR_VERSION } from '@lwrjs/config/package';
+export { version as LWR_VERSION, lwcVersion as LWC_VERSION } from '@lwrjs/config/package';
 export { loadConfig, resolveGlobalConfig as normalizeConfig } from './global-config.js';
 export { getRuntimeEnvironment } from './runtime-config.js';
 export { executeConfigHooks, executeStartHooks } from './hooks.js';
+export { validateLwrAppConfig } from './validation/app-config.js';
 //# sourceMappingURL=index.js.map

package/build/es/runtime-config.js

@@ -80,9 +80,11 @@ export function getServerModeConfig(serverMode) {
  * @returns {RuntimeEnvironment} the complete runtime environment
  */
 export function getRuntimeEnvironment(config) {
-    const { serverMode, lwrVersion, apiVersion, basePath } = config;
+    const { serverMode, lwrVersion, apiVersion, basePath, minify } = config;
+    const serverModeConfig = getServerModeConfig(config.serverMode);
     return {
-        ...getServerModeConfig(config.serverMode),
+        ...serverModeConfig,
+        minify: minify !== null ? minify : serverModeConfig.minify,
         featureFlags: getFeatureFlags(),
         serverMode,
         lwrVersion,

package/build/es/validation/app-config-context.d.ts

@@ -16,7 +16,7 @@ interface ConfigMap {
     bootstrap: NormalizedLwrAppBootstrapConfig;
     locker: RequiredLwrLockerConfig;
 }
-export declare const ROOT_ATTRIBUTE_KEYS: ["amdLoader", "apiVersion", "assets", "assetProviders", "assetTransformers", "bundleConfig", "cacheDir", "contentDir", "environment", "errorRoutes", "esmLoader", "staticSiteGenerator", "globalData", "globalDataDir", "hooks", "ignoreLwrConfigFile", "lwrConfigFile", "layoutsDir", "locker", "lwc", "lwrVersion", "moduleProviders", "port", "basePath", "resourceProviders", "rootDir", "routeHandlers", "routes", "serverMode", "serverType", "viewProviders", "viewTransformers"];
+export declare const ROOT_ATTRIBUTE_KEYS: ["amdLoader", "apiVersion", "assets", "assetProviders", "assetTransformers", "bundleConfig", "cacheDir", "contentDir", "environment", "errorRoutes", "esmLoader", "staticSiteGenerator", "globalData", "globalDataDir", "hooks", "ignoreLwrConfigFile", "lwrConfigFile", "layoutsDir", "locker", "lwc", "lwrVersion", "moduleProviders", "port", "basePath", "resourceProviders", "rootDir", "routeHandlers", "routes", "serverMode", "minify", "serverType", "viewProviders", "viewTransformers", "experimentalAllowDupeRouteIds"];
 export declare const ASSET_DIR_ATTRIBUTE_KEYS: ["alias", "dir", "urlPath"];
 export declare const ASSET_FILE_ATTRIBUTE_KEYS: ["alias", "file", "urlPath"];
 export declare const LOCKER_ATTRIBUTE_KEYS: ["enabled", "trustedComponents", "clientOnly"];

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

@@ -36,9 +36,11 @@ export const ROOT_ATTRIBUTE_KEYS = createKeys('root', [
     'routeHandlers',
     'routes',
     'serverMode',
+    'minify',
     'serverType',
     'viewProviders',
     'viewTransformers',
+    'experimentalAllowDupeRouteIds',
 ]);
 export const ASSET_DIR_ATTRIBUTE_KEYS = createKeys('assetDir', ['alias', 'dir', 'urlPath']);
 export const ASSET_FILE_ATTRIBUTE_KEYS = createKeys('assetFile', ['alias', 'file', 'urlPath']);

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

@@ -71,6 +71,8 @@ function validateRouteCommon(node, validationContext, propPrefix) {
 function validateRoutes(node, validationContext, preMerge) {
     if (node) {
         // routes may not be defined until after config hooks are applied
+        // note: there are 2 "post" hooks (onConfig/onStart) that routes can be applied.
+        // We need to ensure that we only validate after the last one (if both are used)
         if (!preMerge) {
             validationContext.assertNotEmptyArray(node, 'routes');
         }
@@ -198,7 +200,10 @@ function validateRoot(node, validationContext, preMerge) {
     !preMerge && validationContext.assertRequiredKeys(node, 'root', ROOT_ATTRIBUTE_KEYS);
     const routes = findNode(node, ['routes']);
     const errorRoutes = findNode(node, ['errorRoutes']);
-    validationContext.assertUniqueIds([...(routes?.children || []), ...(errorRoutes?.children || [])], 'routes');
+    const experimentalAllowDupeRouteIds = findNode(node, ['experimentalAllowDupeRouteIds']);
+    if (experimentalAllowDupeRouteIds?.value !== true) {
+        validationContext.assertUniqueIds([...(routes?.children || []), ...(errorRoutes?.children || [])], 'routes');
+    }
     validateRoutes(routes, validationContext, preMerge);
     validateErrorRoutes(errorRoutes, validationContext);
     validateRouteHandlers(findNode(node, ['routeHandlers']), validationContext);

package/package.cjs

@@ -1,7 +1,9 @@
 const fs = require('fs');
 const path = require('path');
+const resolve = require('resolve');
 const rootPath = path.join(__dirname, './');
 
+// Get the LWR Version
 let version;
 if (globalThis.LWR_VERSION) {
     version = globalThis.LWR_VERSION;
@@ -9,7 +11,18 @@ if (globalThis.LWR_VERSION) {
     version = JSON.parse(fs.readFileSync(path.join(rootPath, 'package.json'), 'utf-8')).version;
 }
 
+// Get the LWC Version
+let lwcVersion;
+if (globalThis.LWC_VERSION) {
+    version = globalThis.LWC_VERSION;
+} else {
+    const packageJsonPath = resolve.sync(`lwc/package.json`);
+    const { version: packageVersion } = JSON.parse(fs.readFileSync(packageJsonPath), 'utf-8');
+    lwcVersion = packageVersion;
+}
+
 module.exports = {
     rootPath,
-    version
+    version,
+    lwcVersion
 };

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.21",
+    "version": "0.9.0-alpha.23",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -36,16 +36,19 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.9.0-alpha.21",
-        "@lwrjs/shared-utils": "0.9.0-alpha.21",
+        "@lwrjs/diagnostics": "0.9.0-alpha.23",
+        "@lwrjs/shared-utils": "0.9.0-alpha.23",
         "fs-extra": "^10.1.0",
         "jsonc-parser": "^3.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.21"
+        "@lwrjs/types": "0.9.0-alpha.23"
+    },
+    "peerDependencies": {
+        "lwc": "2.x"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "a89adcac80601f657becd6fd734c765e6b2a2745"
+    "gitHead": "13106b8a0e5011dfd0fab2e361aa9b518f409fbb"
 }