@lwrjs/config 0.10.0-alpha.4 → 0.10.0-alpha.6

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

@@ -377,6 +377,28 @@ var ValidationContext = class {
       });
     }
   }
+  assertClientLockerSSR(routesNode, lockerNode) {
+    if (routesNode && lockerNode) {
+      const enabled = (0, import_jsonc_parser.findNodeAtLocation)(lockerNode, ["enabled"]);
+      const clientOnly = (0, import_jsonc_parser.findNodeAtLocation)(lockerNode, ["clientOnly"]);
+      const compileTimeLocker = enabled && enabled.value === true && (!clientOnly || clientOnly.value === false);
+      if (compileTimeLocker && routesNode.children) {
+        const hasSSR = routesNode.children.some((n) => {
+          const bootstrap = (0, import_jsonc_parser.findNodeAtLocation)(n, ["bootstrap"]);
+          if (bootstrap) {
+            const ssr = (0, import_jsonc_parser.findNodeAtLocation)(bootstrap, ["ssr"]);
+            return ssr?.value === true;
+          }
+        });
+        if (hasSSR) {
+          this.diagnostics.push({
+            description: import_diagnostics.descriptions.CONFIG_PARSER.COMPILE_LOCKER_SSR(),
+            location: this.getLocationFromNode(lockerNode)
+          });
+        }
+      }
+    }
+  }
   assertRequiredKeys(node, property, requiredPropertyKeys) {
     const missingProps = requiredPropertyKeys.filter((p) => (0, import_jsonc_parser.findNodeAtLocation)(node, [p]) === void 0);
     if (missingProps.length > 0) {

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

@@ -152,11 +152,13 @@ function validateRoot(node, validationContext, preMerge) {
   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 lockerNode = (0, import_jsonc_parser.findNodeAtLocation)(node, ["locker"]);
   validateRoutes(routes, validationContext, preMerge);
   validateErrorRoutes(errorRoutes, validationContext);
   validateRouteHandlers((0, import_jsonc_parser.findNodeAtLocation)(node, ["routeHandlers"]), validationContext);
   validateAssets((0, import_jsonc_parser.findNodeAtLocation)(node, ["assets"]), validationContext, preMerge);
-  validateLocker((0, import_jsonc_parser.findNodeAtLocation)(node, ["locker"]), validationContext);
+  validateLocker(lockerNode, validationContext);
+  validationContext.assertClientLockerSSR(routes, lockerNode);
   validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["apiVersion"]), "apiVersion");
   validationContext.assertNotEmptyString((0, import_jsonc_parser.findNodeAtLocation)(node, ["lwrVersion"]), "lwrVersion");
   validationContext.assertIsSpecifier((0, import_jsonc_parser.findNodeAtLocation)(node, ["amdLoader"]), "amdLoader");

package/build/es/utils/routes.d.ts

@@ -1,6 +1,6 @@
 import type { LwrErrorRoute, LwrRoute, NormalizedLwrErrorRoute, NormalizedLwrRoute, ResourcePaths, RouteHandlersConfig } from '@lwrjs/types';
-declare type ViewOrErrorRoute = LwrRoute | LwrErrorRoute;
-declare type NormalizedRoute<T extends ViewOrErrorRoute> = T extends LwrRoute ? NormalizedLwrRoute : NormalizedLwrErrorRoute;
+type ViewOrErrorRoute = LwrRoute | LwrErrorRoute;
+type NormalizedRoute<T extends ViewOrErrorRoute> = T extends LwrRoute ? NormalizedLwrRoute : NormalizedLwrErrorRoute;
 export declare function normalizeRoutes<T extends ViewOrErrorRoute>(routes: T[], routeHandlers: RouteHandlersConfig): NormalizedRoute<T>[];
 export declare function normalizeRoutePaths<T extends ViewOrErrorRoute>(routes: T[] | undefined, resourcePaths: ResourcePaths): NormalizedRoute<T>[];
 export declare function normalizeRouteHandlerPaths(routeHandlers: RouteHandlersConfig, resourcePaths: ResourcePaths): RouteHandlersConfig;

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

@@ -1,11 +1,11 @@
 import { AssetDirConfig, AssetFileConfig, LwrErrorRoute, LwrRoute, NormalizedLwrGlobalConfig, NormalizedLwrAppBootstrapConfig, LwrLockerConfig, RouteHandlersConfig } from '@lwrjs/types';
 import { Node } from 'jsonc-parser';
 import { Diagnostic } from '@lwrjs/diagnostics';
-declare type RequiredAssetDirConfig = Required<AssetDirConfig>;
-declare type RequiredAssetFileConfig = Required<AssetFileConfig>;
-declare type RequiredLwrRoute = Required<LwrRoute>;
-declare type RequiredLwrErrorRoute = Required<LwrErrorRoute>;
-declare type RequiredLwrLockerConfig = Required<LwrLockerConfig>;
+type RequiredAssetDirConfig = Required<AssetDirConfig>;
+type RequiredAssetFileConfig = Required<AssetFileConfig>;
+type RequiredLwrRoute = Required<LwrRoute>;
+type RequiredLwrErrorRoute = Required<LwrErrorRoute>;
+type RequiredLwrLockerConfig = Required<LwrLockerConfig>;
 interface ConfigMap {
     root: NormalizedLwrGlobalConfig;
     assetDir: RequiredAssetDirConfig;
@@ -49,6 +49,7 @@ export declare class ValidationContext {
     assertArrayOfSpecifiers(node: Node | undefined, property: string): void;
     assertArrayOfServices(node: Node | undefined, property: string): void;
     assertUniqueIds(nodes: Node[], property: string): void;
+    assertClientLockerSSR(routesNode: Node | undefined, lockerNode: Node | undefined): void;
     assertRequiredKeys(node: Node, property: string, requiredPropertyKeys: string[]): void;
     assertValidKeys<T extends keyof ConfigMap>(node: Node, property: T, validPropertyKeys: (keyof ConfigMap[T])[]): void;
 }

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

@@ -359,6 +359,28 @@ export class ValidationContext {
             });
         }
     }
+    assertClientLockerSSR(routesNode, lockerNode) {
+        if (routesNode && lockerNode) {
+            const enabled = findNodeAtLocation(lockerNode, ['enabled']);
+            const clientOnly = findNodeAtLocation(lockerNode, ['clientOnly']);
+            const compileTimeLocker = enabled && enabled.value === true && (!clientOnly || clientOnly.value === false);
+            if (compileTimeLocker && routesNode.children) {
+                const hasSSR = routesNode.children.some((n) => {
+                    const bootstrap = findNodeAtLocation(n, ['bootstrap']);
+                    if (bootstrap) {
+                        const ssr = findNodeAtLocation(bootstrap, ['ssr']);
+                        return ssr?.value === true;
+                    }
+                });
+                if (hasSSR) {
+                    this.diagnostics.push({
+                        description: descriptions.CONFIG_PARSER.COMPILE_LOCKER_SSR(),
+                        location: this.getLocationFromNode(lockerNode),
+                    });
+                }
+            }
+        }
+    }
     assertRequiredKeys(node, property, requiredPropertyKeys) {
         // All of the given properties must exist on the node
         const missingProps = requiredPropertyKeys.filter((p) => findNodeAtLocation(node, [p]) === undefined);

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

@@ -4,7 +4,7 @@ export declare const SOURCE_BY_PHASE: {
     pre: string;
     post: string;
 };
-declare type ConfigPhase = 'file' | 'pre' | 'post';
+type ConfigPhase = 'file' | 'pre' | 'post';
 export declare function validateLwrAppConfig(config: string | LwrGlobalConfig, phase: ConfigPhase): void | never;
 export {};
 //# sourceMappingURL=app-config.d.ts.map

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

@@ -178,6 +178,8 @@ function validateLocker(node, validationContext) {
  *      - routes...
  *      - errorRoutes...
  *      - assets...
+ *      - locker...
+ *      - SSR is only used with clientOnly locker (or locker is disabled)
  *      - route and errorRoute ids must be unique
  *      - apiVersion: string
  *      - lwrVersion: string
@@ -206,11 +208,13 @@ function validateRoot(node, validationContext, preMerge) {
     const routes = findNode(node, ['routes']);
     const errorRoutes = findNode(node, ['errorRoutes']);
     validationContext.assertUniqueIds([...(routes?.children || []), ...(errorRoutes?.children || [])], 'routes');
+    const lockerNode = findNode(node, ['locker']);
     validateRoutes(routes, validationContext, preMerge);
     validateErrorRoutes(errorRoutes, validationContext);
     validateRouteHandlers(findNode(node, ['routeHandlers']), validationContext);
     validateAssets(findNode(node, ['assets']), validationContext, preMerge);
-    validateLocker(findNode(node, ['locker']), validationContext);
+    validateLocker(lockerNode, validationContext);
+    validationContext.assertClientLockerSSR(routes, lockerNode);
     validationContext.assertNotEmptyString(findNode(node, ['apiVersion']), 'apiVersion');
     validationContext.assertNotEmptyString(findNode(node, ['lwrVersion']), 'lwrVersion');
     validationContext.assertIsSpecifier(findNode(node, ['amdLoader']), 'amdLoader');

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.10.0-alpha.4",
+    "version": "0.10.0-alpha.6",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -36,13 +36,13 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.10.0-alpha.4",
-        "@lwrjs/shared-utils": "0.10.0-alpha.4",
+        "@lwrjs/diagnostics": "0.10.0-alpha.6",
+        "@lwrjs/shared-utils": "0.10.0-alpha.6",
         "fs-extra": "^11.1.0",
         "jsonc-parser": "^3.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.10.0-alpha.4"
+        "@lwrjs/types": "0.10.0-alpha.6"
     },
     "peerDependencies": {
         "lwc": "2.x"
@@ -50,5 +50,5 @@
     "engines": {
         "node": ">=16.0.0 <20"
     },
-    "gitHead": "f39a534d92fd3980b87839820f484729172e1067"
+    "gitHead": "9592d07bd5204eb85c9cb8b576e2a267a798ce00"
 }