@lwrjs/config 0.15.0-alpha.16 → 0.15.0-alpha.18

package/build/cjs/defaults.cjs

@@ -160,6 +160,7 @@ var DEFAULT_LWR_CONFIG = {
   viewTransformers: DEFAULT_VIEW_TRANSFORM_PLUGINS,
   environment: {},
   lwc: {modules: []},
+  caseSensitiveRoutes: false,
   routes: [
     LWR_INFO_ROUTE
   ],
@@ -169,7 +170,8 @@ var DEFAULT_LWR_CONFIG = {
   serverType: DEFAULT_SERVER_TYPE,
   locker: import_shared_utils.DEFAULT_LWR_LOCKER_CONFIG,
   uriTransformers: DEFAULT_URI_TRANSFORM_PLUGINS,
-  i18n: import_runtime_config.DEFAULT_I18N_CONFIG
+  i18n: import_runtime_config.DEFAULT_I18N_CONFIG,
+  coreProxy: null
 };
 var DEFAULT_LWR_BOOTSTRAP_CONFIG = {
   autoBoot: true,

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

@@ -28,6 +28,7 @@ __export(exports, {
   ASSET_FILE_ATTRIBUTE_KEYS: () => ASSET_FILE_ATTRIBUTE_KEYS,
   BASE_PATH_REGEX: () => BASE_PATH_REGEX,
   BOOTSTRAP_ATTRIBUTE_KEYS: () => BOOTSTRAP_ATTRIBUTE_KEYS,
+  CORE_PROXY_ATTRIBUTE_KEYS: () => CORE_PROXY_ATTRIBUTE_KEYS,
   ERROR_ROUTE_ATTRIBUTE_KEYS: () => ERROR_ROUTE_ATTRIBUTE_KEYS,
   I18N_ATTRIBUTE_KEYS: () => I18N_ATTRIBUTE_KEYS,
   LOCKER_ATTRIBUTE_KEYS: () => LOCKER_ATTRIBUTE_KEYS,
@@ -52,7 +53,9 @@ var ROOT_ATTRIBUTE_KEYS = createKeys("root", [
   "bundleConfig",
   "bundleProviders",
   "cacheDir",
+  "caseSensitiveRoutes",
   "contentDir",
+  "coreProxy",
   "environment",
   "errorRoutes",
   "esmLoader",
@@ -85,6 +88,7 @@ var ASSET_DIR_ATTRIBUTE_KEYS = createKeys("assetDir", ["alias", "dir", "urlPath"
 var ASSET_FILE_ATTRIBUTE_KEYS = createKeys("assetFile", ["alias", "file", "urlPath"]);
 var LOCKER_ATTRIBUTE_KEYS = createKeys("locker", ["enabled", "trustedComponents"]);
 var I18N_ATTRIBUTE_KEYS = createKeys("i18n", ["defaultLocale", "locales", "uriPattern"]);
+var CORE_PROXY_ATTRIBUTE_KEYS = createKeys("coreProxy", ["origin", "host", "servername", "sitePath"]);
 var STATIC_SITE_GENERATOR_ATTRIBUTE_KEYS = createKeys("staticSiteGenerator", [
   "outputDir",
   "skipBaseDocumentGeneration",
@@ -202,6 +206,14 @@ var ValidationContext = class {
       });
     }
   }
+  assertIsOrigin(node, property) {
+    if (node && (node.type !== "string" || !/^https?:\/\//i.test(node.value))) {
+      this.diagnostics.push({
+        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_ORIGIN(property, node.value),
+        location: this.getLocationFromNode(node)
+      });
+    }
+  }
   assertIsPort(node, property) {
     if (node && (node.type !== "number" || node.value < 0 || node.value > 65353)) {
       this.diagnostics.push({
@@ -267,7 +279,7 @@ var ValidationContext = class {
       });
     }
   }
-  assertIsBasePath(node, property) {
+  assertIsBasePath(node, property, allowSlash = false) {
     if (!node) {
       return;
     }
@@ -276,7 +288,7 @@ var ValidationContext = class {
         description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "string", node.type),
         location: this.getLocationFromNode(node)
       });
-    } else if (node.value === "") {
+    } else if (node.value === "" || allowSlash && node.value === "/") {
       return;
     } else if (node.value.match(BASE_PATH_REGEX) === null) {
       this.diagnostics.push({
@@ -534,4 +546,23 @@ var ValidationContext = class {
       });
     }
   }
+  assertIsCoreProxy(node, validationContext) {
+    if (node && node.type !== "null") {
+      validationContext.assertIsObject(node, "coreProxy");
+      validationContext.assertValidKeys(node, "coreProxy", CORE_PROXY_ATTRIBUTE_KEYS);
+      validationContext.assertRequiredKeys(node, "coreProxy", ["origin", "host"]);
+      validationContext.assertIsOrigin((0, import_jsonc_parser.findNodeAtLocation)(node, ["origin"]), "coreProxy.origin");
+      validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["host"]), "coreProxy.host");
+      const servername = (0, import_jsonc_parser.findNodeAtLocation)(node, ["servername"]);
+      const sitePath = (0, import_jsonc_parser.findNodeAtLocation)(node, ["sitePath"]);
+      if (!servername && !sitePath) {
+        this.diagnostics.push({
+          description: import_diagnostics.descriptions.CONFIG_PARSER.INCOMPLETE_CORE_PROXY(),
+          location: this.getLocationFromNode(node)
+        });
+      }
+      servername && validationContext.assertNotEmptyString(servername, "coreProxy.servername");
+      sitePath && validationContext.assertIsBasePath(sitePath, "coreProxy.sitePath", true);
+    }
+  }
 };

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

@@ -242,6 +242,7 @@ function validateRoot(node, validationContext, preMerge) {
   validationContext.assertUniqueIds([...routes?.children || [], ...errorRoutes?.children || []], "routes");
   const lockerNode = (0, import_jsonc_parser.findNodeAtLocation)(node, ["locker"]);
   const bundleConfigNode = (0, import_jsonc_parser.findNodeAtLocation)(node, ["bundleConfig"]);
+  validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["caseSensitiveRoutes"]), "caseSensitiveRoutes");
   validateRoutes(routes, validationContext, preMerge);
   validateErrorRoutes(errorRoutes, validationContext);
   validateRouteHandlers((0, import_jsonc_parser.findNodeAtLocation)(node, ["routeHandlers"]), validationContext);
@@ -271,6 +272,7 @@ function validateRoot(node, validationContext, preMerge) {
   validationContext.assertNotEmptyArray((0, import_jsonc_parser.findNodeAtLocation)(node, ["lwc", "modules"]), "lwc.modules");
   validationContext.assertIsEnvironment((0, import_jsonc_parser.findNodeAtLocation)(node, ["environment"]), "environment");
   validationContext.assertIsBasePath((0, import_jsonc_parser.findNodeAtLocation)(node, ["basePath"]), "basePath");
+  validationContext.assertIsCoreProxy((0, import_jsonc_parser.findNodeAtLocation)(node, ["coreProxy"]), validationContext);
 }
 function validateLwrAppConfig(config, phase) {
   const span = (0, import_instrumentation.getTracer)().startSpan({name: import_instrumentation.ConfigSpan.ValidateConfig});

package/build/es/defaults.js

@@ -135,6 +135,7 @@ export const DEFAULT_LWR_CONFIG = {
     viewTransformers: DEFAULT_VIEW_TRANSFORM_PLUGINS,
     environment: {},
     lwc: { modules: [] },
+    caseSensitiveRoutes: false,
     routes: [
         LWR_INFO_ROUTE,
     ],
@@ -145,6 +146,7 @@ export const DEFAULT_LWR_CONFIG = {
     locker: DEFAULT_LWR_LOCKER_CONFIG,
     uriTransformers: DEFAULT_URI_TRANSFORM_PLUGINS,
     i18n: DEFAULT_I18N_CONFIG,
+    coreProxy: null, // unset by default
 };
 export const DEFAULT_LWR_BOOTSTRAP_CONFIG = {
     autoBoot: true,

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

@@ -1,4 +1,4 @@
-import type { AssetDirConfig, AssetFileConfig, LwrErrorRoute, LwrRoute, NormalizedLwrGlobalConfig, NormalizedLwrAppBootstrapConfig, LwrLockerConfig, RouteHandlersConfig, BundleConfig, I18NConfig, Locale, StaticSiteGenerator } from '@lwrjs/types';
+import type { AssetDirConfig, AssetFileConfig, DirectToCoreProxy, LwrErrorRoute, LwrRoute, NormalizedLwrGlobalConfig, NormalizedLwrAppBootstrapConfig, LwrLockerConfig, RouteHandlersConfig, BundleConfig, I18NConfig, Locale, StaticSiteGenerator } from '@lwrjs/types';
 import { Node } from 'jsonc-parser';
 import { Diagnostic } from '@lwrjs/diagnostics';
 type RequiredAssetDirConfig = Required<AssetDirConfig>;
@@ -9,6 +9,7 @@ type RequiredLwrLockerConfig = Required<LwrLockerConfig>;
 type RequiredI18NConfig = Required<I18NConfig>;
 type RequiredLocalesConfig = Required<Locale>;
 type RequiredSSGConfig = Required<StaticSiteGenerator>;
+type RequiredDirectToCoreProxy = Required<DirectToCoreProxy>;
 interface ConfigMap {
     root: NormalizedLwrGlobalConfig;
     assetDir: RequiredAssetDirConfig;
@@ -24,12 +25,14 @@ interface ConfigMap {
     i18n: RequiredI18NConfig;
     'i18n.locales': RequiredLocalesConfig;
     staticSiteGenerator: RequiredSSGConfig;
+    coreProxy: RequiredDirectToCoreProxy;
 }
-export declare const ROOT_ATTRIBUTE_KEYS: ["amdLoader", "apiVersion", "assets", "assetProviders", "assetTransformers", "bundleConfig", "bundleProviders", "cacheDir", "contentDir", "environment", "errorRoutes", "esmLoader", "staticSiteGenerator", "globalData", "globalDataDir", "hooks", "i18n", "ignoreLwrConfigFile", "lwrConfigFile", "layoutsDir", "locker", "lwc", "lwrVersion", "moduleProviders", "port", "basePath", "resourceProviders", "rootDir", "routeHandlers", "routes", "serverMode", "minify", "serverType", "uriTransformers", "viewProviders", "viewTransformers"];
+export declare const ROOT_ATTRIBUTE_KEYS: ["amdLoader", "apiVersion", "assets", "assetProviders", "assetTransformers", "bundleConfig", "bundleProviders", "cacheDir", "caseSensitiveRoutes", "contentDir", "coreProxy", "environment", "errorRoutes", "esmLoader", "staticSiteGenerator", "globalData", "globalDataDir", "hooks", "i18n", "ignoreLwrConfigFile", "lwrConfigFile", "layoutsDir", "locker", "lwc", "lwrVersion", "moduleProviders", "port", "basePath", "resourceProviders", "rootDir", "routeHandlers", "routes", "serverMode", "minify", "serverType", "uriTransformers", "viewProviders", "viewTransformers"];
 export declare const ASSET_DIR_ATTRIBUTE_KEYS: ["alias", "dir", "urlPath", "root"];
 export declare const ASSET_FILE_ATTRIBUTE_KEYS: ["alias", "file", "urlPath"];
 export declare const LOCKER_ATTRIBUTE_KEYS: ["enabled", "trustedComponents"];
 export declare const I18N_ATTRIBUTE_KEYS: ["defaultLocale", "locales", "uriPattern"];
+export declare const CORE_PROXY_ATTRIBUTE_KEYS: ["origin", "host", "servername", "sitePath"];
 export declare const STATIC_SITE_GENERATOR_ATTRIBUTE_KEYS: ["outputDir", "skipBaseDocumentGeneration", "skipCleanOutputDir", "_additionalModules", "_additionalRoutePaths"];
 export declare const ROUTE_ATTRIBUTE_KEYS: ["bootstrap", "subRoutes", "contentTemplate", "id", "cache", "layoutTemplate", "method", "path", "rootComponent", "routeHandler", "properties"];
 export declare const ERROR_ROUTE_ATTRIBUTE_KEYS: ["bootstrap", "subRoutes", "contentTemplate", "id", "layoutTemplate", "rootComponent", "routeHandler", "status", "properties", "cache"];
@@ -46,13 +49,14 @@ export declare class ValidationContext {
     assertIsSpecifier(node: Node | undefined, property: string): void;
     assertIsFilePattern(node: Node | undefined, property: string): void;
     assertIsPath(node: Node | undefined, property: string): void;
+    assertIsOrigin(node: Node | undefined, property: string): void;
     assertIsPort(node: Node | undefined, property: string): void;
     assertIsServerType(node: Node | undefined, property: string): void;
     assertIsStaticSiteGenerator(node: Node | undefined, property: string): void;
     assertIsMethod(node: Node | undefined, property: string): void;
     assertIsStatus(node: Node | undefined, property: string): void;
     assertIsEnvironment(node: Node | undefined, property: string): void;
-    assertIsBasePath(node: Node | undefined, property: string): void;
+    assertIsBasePath(node: Node | undefined, property: string, allowSlash?: boolean): void;
     assertNotEmptyString(node: Node | undefined, property: string): void;
     assertNotEmptyArray(node: Node | undefined, property: string): void;
     assertHasOneOrMore(node: Node, property: string, childProps: string[]): void;
@@ -70,6 +74,7 @@ export declare class ValidationContext {
     assertDefaultInLocales(node: Node, defaultLocale: string, localesIds: string[]): void;
     assertFallbackIds(nodes: Node[]): void;
     assertSsrPreloadData(node: Node, propPrefix: string): void;
+    assertIsCoreProxy(node: Node | undefined, validationContext: ValidationContext): void;
 }
 export {};
 //# sourceMappingURL=app-config-context.d.ts.map

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

@@ -16,7 +16,9 @@ export const ROOT_ATTRIBUTE_KEYS = createKeys('root', [
     'bundleConfig',
     'bundleProviders',
     'cacheDir',
+    'caseSensitiveRoutes',
     'contentDir',
+    'coreProxy',
     'environment',
     'errorRoutes',
     'esmLoader',
@@ -49,6 +51,7 @@ export const ASSET_DIR_ATTRIBUTE_KEYS = createKeys('assetDir', ['alias', 'dir',
 export const ASSET_FILE_ATTRIBUTE_KEYS = createKeys('assetFile', ['alias', 'file', 'urlPath']);
 export const LOCKER_ATTRIBUTE_KEYS = createKeys('locker', ['enabled', 'trustedComponents']);
 export const I18N_ATTRIBUTE_KEYS = createKeys('i18n', ['defaultLocale', 'locales', 'uriPattern']);
+export const CORE_PROXY_ATTRIBUTE_KEYS = createKeys('coreProxy', ['origin', 'host', 'servername', 'sitePath']);
 export const STATIC_SITE_GENERATOR_ATTRIBUTE_KEYS = createKeys('staticSiteGenerator', [
     'outputDir',
     'skipBaseDocumentGeneration',
@@ -166,6 +169,14 @@ export class ValidationContext {
             });
         }
     }
+    assertIsOrigin(node, property) {
+        if (node && (node.type !== 'string' || !/^https?:\/\//i.test(node.value))) {
+            this.diagnostics.push({
+                description: descriptions.CONFIG_PARSER.INVALID_ORIGIN(property, node.value),
+                location: this.getLocationFromNode(node),
+            });
+        }
+    }
     assertIsPort(node, property) {
         if (node && (node.type !== 'number' || node.value < 0 || node.value > 65353)) {
             this.diagnostics.push({
@@ -231,7 +242,7 @@ export class ValidationContext {
             });
         }
     }
-    assertIsBasePath(node, property) {
+    assertIsBasePath(node, property, allowSlash = false) {
         if (!node) {
             return;
         }
@@ -241,7 +252,7 @@ export class ValidationContext {
                 location: this.getLocationFromNode(node),
             });
         }
-        else if (node.value === '') {
+        else if (node.value === '' || allowSlash && node.value === '/') {
             return;
         }
         else if (node.value.match(BASE_PATH_REGEX) === null) {
@@ -521,5 +532,25 @@ export class ValidationContext {
             });
         }
     }
+    assertIsCoreProxy(node, validationContext) {
+        if (node && node.type !== 'null') {
+            validationContext.assertIsObject(node, 'coreProxy');
+            validationContext.assertValidKeys(node, 'coreProxy', CORE_PROXY_ATTRIBUTE_KEYS);
+            validationContext.assertRequiredKeys(node, 'coreProxy', ['origin', 'host']);
+            validationContext.assertIsOrigin(findNodeAtLocation(node, ['origin']), 'coreProxy.origin');
+            validationContext.assertNotEmptyString(findNodeAtLocation(node, ['host']), 'coreProxy.host');
+            // Validate locales the config has one of [servername, sitePath]
+            const servername = findNodeAtLocation(node, ['servername']);
+            const sitePath = findNodeAtLocation(node, ['sitePath']);
+            if (!servername && !sitePath) {
+                this.diagnostics.push({
+                    description: descriptions.CONFIG_PARSER.INCOMPLETE_CORE_PROXY(),
+                    location: this.getLocationFromNode(node),
+                });
+            }
+            servername && validationContext.assertNotEmptyString(servername, 'coreProxy.servername');
+            sitePath && validationContext.assertIsBasePath(sitePath, 'coreProxy.sitePath', true);
+        }
+    }
 }
 //# sourceMappingURL=app-config-context.js.map

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

@@ -311,6 +311,7 @@ function validateRoot(node, validationContext, preMerge) {
     validationContext.assertUniqueIds([...(routes?.children || []), ...(errorRoutes?.children || [])], 'routes');
     const lockerNode = findNode(node, ['locker']);
     const bundleConfigNode = findNode(node, ['bundleConfig']);
+    validationContext.assertIsBoolean(findNode(node, ['caseSensitiveRoutes']), 'caseSensitiveRoutes');
     validateRoutes(routes, validationContext, preMerge);
     validateErrorRoutes(errorRoutes, validationContext);
     validateRouteHandlers(findNode(node, ['routeHandlers']), validationContext);
@@ -340,6 +341,7 @@ function validateRoot(node, validationContext, preMerge) {
     validationContext.assertNotEmptyArray(findNode(node, ['lwc', 'modules']), 'lwc.modules');
     validationContext.assertIsEnvironment(findNode(node, ['environment']), 'environment');
     validationContext.assertIsBasePath(findNode(node, ['basePath']), 'basePath');
+    validationContext.assertIsCoreProxy(findNode(node, ['coreProxy']), validationContext);
 }
 export function validateLwrAppConfig(config, phase) {
     const span = getTracer().startSpan({ name: ConfigSpan.ValidateConfig });

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.16",
+    "version": "0.15.0-alpha.18",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -42,14 +42,14 @@
         "test": "jest"
     },
     "dependencies": {
-        "@lwrjs/diagnostics": "0.15.0-alpha.16",
-        "@lwrjs/instrumentation": "0.15.0-alpha.16",
-        "@lwrjs/shared-utils": "0.15.0-alpha.16",
+        "@lwrjs/diagnostics": "0.15.0-alpha.18",
+        "@lwrjs/instrumentation": "0.15.0-alpha.18",
+        "@lwrjs/shared-utils": "0.15.0-alpha.18",
         "fs-extra": "^11.2.0",
         "jsonc-parser": "^3.3.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.16",
+        "@lwrjs/types": "0.15.0-alpha.18",
         "jest": "^26.6.3",
         "memfs": "^4.9.3",
         "ts-jest": "^26.5.6"
@@ -71,5 +71,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "7aed7f695758ebce4869f0f3d42c54b057fc4d76"
+    "gitHead": "fefc639770948be769b1ace03b7759e7b8906cae"
 }