@lwrjs/config 0.12.0-alpha.0 → 0.12.0-alpha.10

package/build/cjs/defaults.cjs

@@ -36,8 +36,6 @@ __export(exports, {
   DEFAULT_ROOT_DIR: () => DEFAULT_ROOT_DIR,
   DEFAULT_SERVICE_PACKAGE_NAME: () => DEFAULT_SERVICE_PACKAGE_NAME,
   LWR_VERSION: () => LWR_VERSION,
-  SSR_MODULE_PROVIDER: () => SSR_MODULE_PROVIDER,
-  SSR_VIEW_TRANSFORM_PLUGIN: () => SSR_VIEW_TRANSFORM_PLUGIN,
   getDefaultBundleConfig: () => getDefaultBundleConfig
 });
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
@@ -47,7 +45,7 @@ var PORT = process.env.PORT ? parseInt(process.env.PORT, 10) : 3e3;
 var MODE = process.env.MODE || "prod";
 var DEFAULT_BASE_PATH = "";
 var DEFAULT_API_VERSION = "1";
-var LWR_VERSION = import_package.version;
+var LWR_VERSION = import_package.lwrVersion;
 var DEFAULT_SERVER_TYPE = "express";
 var DEFAULT_LWR_CONFIG_JSON = "$rootDir/lwr.config.json";
 var DEFAULT_GENERATOR_CONFIG = {
@@ -67,9 +65,9 @@ var DEFAULT_MODULE_PROVIDERS = [
   "@lwrjs/app-service/moduleProvider",
   "@lwrjs/router/module-provider",
   "@lwrjs/lwc-module-provider",
+  "@lwrjs/lwc-ssr/moduleProvider",
   "@lwrjs/npm-module-provider"
 ];
-var SSR_MODULE_PROVIDER = "@lwrjs/lwc-ssr/moduleProvider";
 var DEFAULT_RESOURCE_PROVIDERS = ["@lwrjs/loader"];
 var DEFAULT_VIEW_PROVIDERS = [
   "@lwrjs/nunjucks-view-provider",
@@ -81,9 +79,12 @@ var DEFAULT_BUNDLE_PROVIDERS = [
   "@lwrjs/module-bundler/amd-bundle-provider",
   "@lwrjs/module-bundler/esm-bundle-provider"
 ];
-var DEFAULT_VIEW_TRANSFORM_PLUGINS = ["@lwrjs/base-view-transformer"];
-var SSR_VIEW_TRANSFORM_PLUGIN = "@lwrjs/lwc-ssr/viewTransformer";
 var DEFAULT_ASSET_PROVIDERS = ["@lwrjs/fs-asset-provider"];
+var DEFAULT_VIEW_TRANSFORM_PLUGINS = [
+  "@lwrjs/base-view-transformer",
+  "@lwrjs/lwc-ssr/viewTransformer",
+  "@lwrjs/lwc-ssr/dataViewTransformer"
+];
 var DEFAULT_ASSET_TRANSFORM_PLUGINS = ["@lwrjs/asset-transformer"];
 var DEFAULT_URI_TRANSFORM_PLUGINS = [];
 var DEFAULT_AMD_LOADER = "lwr/loader";
@@ -150,7 +151,13 @@ var DEFAULT_LWR_CONFIG = {
   viewTransformers: DEFAULT_VIEW_TRANSFORM_PLUGINS,
   environment: {},
   lwc: {modules: []},
-  routes: [],
+  routes: [
+    {
+      id: "lwrInfo",
+      path: "/lwr-info",
+      routeHandler: `@lwrjs/core/info/route-handler`
+    }
+  ],
   errorRoutes: [],
   routeHandlers: {},
   bundleConfig: getDefaultBundleConfig(MODE),

package/build/cjs/global-config.cjs

@@ -24,7 +24,6 @@ var __toModule = (module2) => {
 // packages/@lwrjs/config/src/global-config.ts
 __markAsModule(exports);
 __export(exports, {
-  applySsrConfig: () => applySsrConfig,
   applyStaticProviderConfig: () => applyStaticProviderConfig,
   getLwrConfigFromFile: () => getLwrConfigFromFile,
   loadConfig: () => loadConfig,
@@ -36,7 +35,6 @@ var import_jsonc_parser = __toModule(require("jsonc-parser"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_defaults = __toModule(require("./defaults.cjs"));
-var import_defaults2 = __toModule(require("./defaults.cjs"));
 var import_app_config = __toModule(require("./validation/app-config.cjs"));
 var import_assets = __toModule(require("./utils/assets.cjs"));
 var import_services = __toModule(require("./utils/services.cjs"));
@@ -46,7 +44,7 @@ var import_lwc = __toModule(require("./utils/lwc.cjs"));
 var import_runtime_config = __toModule(require("./runtime-config.cjs"));
 var import_global_data = __toModule(require("./utils/global-data.cjs"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
-function getLwrConfigFromFile(rootDir, lwrConfigPath = import_defaults2.DEFAULT_LWR_CONFIG_JSON) {
+function getLwrConfigFromFile(rootDir, lwrConfigPath = import_defaults.DEFAULT_LWR_CONFIG_JSON) {
   const resolvedLwrConfigPath = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(lwrConfigPath, rootDir));
   if (!import_fs.default.existsSync(resolvedLwrConfigPath)) {
     import_diagnostics.logger.warn({label: `config`, message: `LWR Config not found on "${resolvedLwrConfigPath}"`});
@@ -67,10 +65,13 @@ function mergeConfig(configArg) {
     configArg = (0, import_merge.trimLwrConfig)(configArg);
     (0, import_app_config.validateLwrAppConfig)(configArg, "pre");
   }
-  const rootDir = import_path.default.resolve(configArg?.rootDir || import_defaults2.DEFAULT_ROOT_DIR);
+  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);
+  }
   return {
-    ...import_defaults2.DEFAULT_LWR_CONFIG,
+    ...import_defaults.DEFAULT_LWR_CONFIG,
     ...configFile,
     ...configArg,
     lwc: (0, import_merge.mergeLwcConfig)(configFile, configArg),
@@ -81,12 +82,12 @@ function mergeConfig(configArg) {
   };
 }
 function normalizeConfig(config) {
-  const amdLoader = (0, import_shared_utils.getFeatureFlags)().LEGACY_LOADER ? import_defaults2.DEFAULT_AMD_LOADER_LEGACY : import_defaults2.DEFAULT_AMD_LOADER;
+  const amdLoader = (0, import_shared_utils.getFeatureFlags)().LEGACY_LOADER ? import_defaults.DEFAULT_AMD_LOADER_LEGACY : import_defaults.DEFAULT_AMD_LOADER;
   return {
     ...config,
     amdLoader,
-    esmLoader: import_defaults2.DEFAULT_ESM_LOADER,
-    lwrVersion: import_defaults2.LWR_VERSION,
+    esmLoader: import_defaults.DEFAULT_ESM_LOADER,
+    lwrVersion: import_defaults.LWR_VERSION,
     assets: (0, import_assets.normalizeAssets)(config.assets),
     lwc: (0, import_lwc.normalizeLwcConfig)(config.lwc),
     hooks: (0, import_services.normalizeServices)(config.hooks),
@@ -104,7 +105,7 @@ function normalizeConfig(config) {
   };
 }
 function normalizeConfigPaths(config) {
-  const rootDir = config.rootDir || import_defaults2.DEFAULT_ROOT_DIR;
+  const rootDir = config.rootDir || import_defaults.DEFAULT_ROOT_DIR;
   const resourcePaths = {
     rootDir,
     assets: (0, import_assets.normalizeAssetPaths)(config.assets, rootDir),
@@ -134,26 +135,16 @@ function normalizeConfigPaths(config) {
     routeHandlers: (0, import_routes.normalizeRouteHandlerPaths)(config.routeHandlers, resourcePaths)
   };
 }
-function applySsrConfig(config) {
-  const hasSSR = config.routes.some((r) => r.bootstrap.ssr);
-  if (!hasSSR) {
-    return config;
-  }
-  const hasSsrModuleProvider = config.moduleProviders.some(([m]) => m === import_defaults.SSR_MODULE_PROVIDER);
-  const hasSsrViewTransformer = config.viewTransformers.some(([v]) => v === import_defaults.SSR_VIEW_TRANSFORM_PLUGIN);
-  return {
-    ...config,
-    moduleProviders: hasSsrModuleProvider ? config.moduleProviders : [[import_defaults.SSR_MODULE_PROVIDER, void 0], ...config.moduleProviders],
-    viewTransformers: hasSsrViewTransformer ? config.viewTransformers : [...config.viewTransformers, [import_defaults.SSR_VIEW_TRANSFORM_PLUGIN, void 0]]
-  };
-}
 function applyStaticProviderConfig(config) {
   return {
     ...config,
     assetProviders: [["@lwrjs/static/asset-provider", void 0]],
     assetTransformers: [],
     resourceProviders: [["@lwrjs/static/resource-provider", {}]],
-    moduleProviders: [["@lwrjs/static/module-provider", void 0]],
+    moduleProviders: [
+      ["@lwrjs/static/module-provider", void 0],
+      ["@lwrjs/lwc-ssr/moduleProvider", void 0]
+    ],
     bundleProviders: [
       ["@lwrjs/static/bundle-provider", void 0],
       ["@lwrjs/module-bundler/amd-runtime-bundle-provider", void 0]
@@ -168,7 +159,6 @@ function resolveGlobalConfig(configArg, options) {
   if (options?.useStaticProviders) {
     normalizedConfig = applyStaticProviderConfig(normalizedConfig);
   }
-  normalizedConfig = applySsrConfig(normalizedConfig);
   if (!options?.skipCacheDirCreation) {
     createCacheFolder(normalizedConfig.cacheDir, normalizedConfig.rootDir);
   }

package/build/cjs/hooks.cjs

@@ -30,7 +30,6 @@ __export(exports, {
 });
 var import_routes = __toModule(require("./utils/routes.cjs"));
 var import_app_config = __toModule(require("./validation/app-config.cjs"));
-var import_global_config = __toModule(require("./global-config.cjs"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment, globalData, skipValidate = false) {
   const span = (0, import_instrumentation.getTracer)().startSpan({name: import_instrumentation.ConfigSpan.ExecuteConfigHooks});
@@ -46,9 +45,6 @@ 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);
-  const ssrConfig = (0, import_global_config.applySsrConfig)(globalConfig);
-  globalConfig.moduleProviders = ssrConfig.moduleProviders;
-  globalConfig.viewTransformers = ssrConfig.viewTransformers;
   if (!skipValidate) {
     (0, import_app_config.validateLwrAppConfig)(globalConfig, "post");
   }
@@ -78,9 +74,6 @@ function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipValidate
   }
   globalConfig.routes = (0, import_routes.normalizeRoutes)(globalConfig.routes, globalConfig.routeHandlers);
   globalConfig.errorRoutes = (0, import_routes.normalizeRoutes)(globalConfig.errorRoutes, globalConfig.routeHandlers);
-  const ssrConfig = (0, import_global_config.applySsrConfig)(globalConfig);
-  globalConfig.moduleProviders = ssrConfig.moduleProviders;
-  globalConfig.viewTransformers = ssrConfig.viewTransformers;
   if (!skipValidate) {
     (0, import_app_config.validateLwrAppConfig)(globalConfig, "post");
   }

package/build/cjs/index.cjs

@@ -25,7 +25,9 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   LWC_VERSION: () => import_package.lwcVersion,
-  LWR_VERSION: () => import_package.version,
+  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,

package/build/cjs/utils/routes.cjs

@@ -36,6 +36,13 @@ function normalizeRoutes(routes, routeHandlers) {
   return routes.map((route) => {
     const rawServices = route?.bootstrap?.services || [];
     const services = rawServices.map((s) => typeof s === "string" ? {name: s, ssr: false} : s);
+    const preloadData = route.bootstrap?.preloadData === void 0 ? route.bootstrap?.ssr === true ? true : false : route.bootstrap?.preloadData;
+    const bootstrap = {
+      ...import_shared_utils.DEFAULT_LWR_BOOTSTRAP_CONFIG,
+      ...route.bootstrap,
+      preloadData,
+      services
+    };
     if (route.routeHandler) {
       const handler = typeof route.routeHandler === "string" ? route.routeHandler : route.routeHandler[0];
       if (!(handler in routeHandlers)) {
@@ -44,20 +51,12 @@ function normalizeRoutes(routes, routeHandlers) {
       return {
         ...route,
         routeHandler: typeof route.routeHandler === "string" ? [route.routeHandler, void 0] : route.routeHandler,
-        bootstrap: {
-          ...import_shared_utils.DEFAULT_LWR_BOOTSTRAP_CONFIG,
-          ...route.bootstrap,
-          services
-        }
+        bootstrap
       };
     }
     return {
       ...route,
-      bootstrap: {
-        ...import_shared_utils.DEFAULT_LWR_BOOTSTRAP_CONFIG,
-        ...route.bootstrap,
-        services
-      }
+      bootstrap
     };
   });
 }

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

@@ -83,7 +83,7 @@ var ROOT_ATTRIBUTE_KEYS = createKeys("root", [
 ]);
 var ASSET_DIR_ATTRIBUTE_KEYS = createKeys("assetDir", ["alias", "dir", "urlPath", "root"]);
 var ASSET_FILE_ATTRIBUTE_KEYS = createKeys("assetFile", ["alias", "file", "urlPath"]);
-var LOCKER_ATTRIBUTE_KEYS = createKeys("locker", ["enabled", "trustedComponents", "clientOnly"]);
+var LOCKER_ATTRIBUTE_KEYS = createKeys("locker", ["enabled", "trustedComponents"]);
 var I18N_ATTRIBUTE_KEYS = createKeys("i18n", ["defaultLocale", "locales", "uriPattern"]);
 var STATIC_SITE_GENERATOR_ATTRIBUTE_KEYS = createKeys("staticSiteGenerator", [
   "outputDir",
@@ -124,6 +124,7 @@ var BOOTSTRAP_ATTRIBUTE_KEYS = createKeys("bootstrap", [
   "services",
   "configAsSrc",
   "ssr",
+  "preloadData",
   "mixedMode",
   "module",
   "preloadModules"
@@ -437,28 +438,6 @@ 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) {
@@ -524,4 +503,14 @@ var ValidationContext = class {
       }
     }
   }
+  assertSsrPreloadData(node, propPrefix) {
+    const ssr = (0, import_jsonc_parser.findNodeAtLocation)(node, ["ssr"])?.value;
+    const preloadData = (0, import_jsonc_parser.findNodeAtLocation)(node, ["preloadData"])?.value;
+    if (ssr === true && preloadData === false) {
+      this.diagnostics.push({
+        description: import_diagnostics.descriptions.CONFIG_PARSER.SSR_WITHOUT_PRELOAD(propPrefix),
+        location: this.getLocationFromNode(node)
+      });
+    }
+  }
 };

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

@@ -47,10 +47,12 @@ function validateBootstrap(node, validationContext, propPrefix) {
     validationContext.assertArrayOfSpecifiers((0, import_jsonc_parser.findNodeAtLocation)(node, ["preloadModules"]), `${propPrefix}.preloadModules`);
     validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["autoBoot"]), `${propPrefix}.autoBoot`);
     validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["ssr"]), `${propPrefix}.ssr`);
+    validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["preloadData"]), `${propPrefix}.preloadData`);
     validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["mixedMode"]), `${propPrefix}.mixedMode`);
     validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["configAsSrc"]), `${propPrefix}.configAsSrc`);
     validationContext.assertIsSpecifier((0, import_jsonc_parser.findNodeAtLocation)(node, ["module"]), `${propPrefix}.module`);
     validationContext.assertIsBoolean((0, import_jsonc_parser.findNodeAtLocation)(node, ["syntheticShadow"]), `${propPrefix}.syntheticShadow`);
+    validationContext.assertSsrPreloadData(node, propPrefix);
     const workers = (0, import_jsonc_parser.findNodeAtLocation)(node, ["workers"]);
     if (workers && workers.children) {
       workers.children.forEach((w, index) => {
@@ -242,7 +244,6 @@ function validateRoot(node, validationContext, preMerge) {
   validateLocker(lockerNode, validationContext);
   validateI18NConfig((0, import_jsonc_parser.findNodeAtLocation)(node, ["i18n"]), validationContext, preMerge);
   validateBundleConfig(bundleConfigNode, 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/defaults.d.ts

@@ -3,8 +3,6 @@ export declare const LWR_VERSION: string;
 export declare const DEFAULT_LWR_CONFIG_JSON = "$rootDir/lwr.config.json";
 export declare const DEFAULT_GENERATOR_CONFIG: StaticSiteGenerator;
 export declare const DEFAULT_ROOT_DIR: string;
-export declare const SSR_MODULE_PROVIDER = "@lwrjs/lwc-ssr/moduleProvider";
-export declare const SSR_VIEW_TRANSFORM_PLUGIN = "@lwrjs/lwc-ssr/viewTransformer";
 export declare const DEFAULT_AMD_LOADER = "lwr/loader";
 export declare const DEFAULT_AMD_LOADER_LEGACY = "lwr/loaderLegacy";
 export declare const DEFAULT_ESM_LOADER = "lwr/esmLoader";

package/build/es/defaults.js

@@ -1,11 +1,11 @@
 import { DEFAULT_LWR_LOCKER_CONFIG, getFeatureFlags } from '@lwrjs/shared-utils';
-import { version } from '@lwrjs/config/package';
+import { lwrVersion } from '@lwrjs/config/package';
 import { DEFAULT_I18N_CONFIG, getServerModeConfig } from './runtime-config.js';
 const PORT = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
 const MODE = process.env.MODE || 'prod';
 const DEFAULT_BASE_PATH = '';
 const DEFAULT_API_VERSION = '1';
-export const LWR_VERSION = version;
+export const LWR_VERSION = lwrVersion;
 const DEFAULT_SERVER_TYPE = 'express';
 export const DEFAULT_LWR_CONFIG_JSON = '$rootDir/lwr.config.json';
 export const DEFAULT_GENERATOR_CONFIG = {
@@ -27,9 +27,9 @@ const DEFAULT_MODULE_PROVIDERS = [
     '@lwrjs/app-service/moduleProvider',
     '@lwrjs/router/module-provider',
     '@lwrjs/lwc-module-provider',
+    '@lwrjs/lwc-ssr/moduleProvider',
     '@lwrjs/npm-module-provider',
 ];
-export const SSR_MODULE_PROVIDER = '@lwrjs/lwc-ssr/moduleProvider';
 const DEFAULT_RESOURCE_PROVIDERS = ['@lwrjs/loader'];
 const DEFAULT_VIEW_PROVIDERS = [
     '@lwrjs/nunjucks-view-provider',
@@ -41,9 +41,12 @@ const DEFAULT_BUNDLE_PROVIDERS = [
     '@lwrjs/module-bundler/amd-bundle-provider',
     '@lwrjs/module-bundler/esm-bundle-provider',
 ];
-const DEFAULT_VIEW_TRANSFORM_PLUGINS = ['@lwrjs/base-view-transformer'];
-export const SSR_VIEW_TRANSFORM_PLUGIN = '@lwrjs/lwc-ssr/viewTransformer';
 const DEFAULT_ASSET_PROVIDERS = ['@lwrjs/fs-asset-provider'];
+const DEFAULT_VIEW_TRANSFORM_PLUGINS = [
+    '@lwrjs/base-view-transformer',
+    '@lwrjs/lwc-ssr/viewTransformer',
+    '@lwrjs/lwc-ssr/dataViewTransformer',
+];
 const DEFAULT_ASSET_TRANSFORM_PLUGINS = ['@lwrjs/asset-transformer'];
 const DEFAULT_URI_TRANSFORM_PLUGINS = [];
 export const DEFAULT_AMD_LOADER = 'lwr/loader';
@@ -114,7 +117,13 @@ export const DEFAULT_LWR_CONFIG = {
     viewTransformers: DEFAULT_VIEW_TRANSFORM_PLUGINS,
     environment: {},
     lwc: { modules: [] },
-    routes: [],
+    routes: [
+        {
+            id: 'lwrInfo',
+            path: '/lwr-info',
+            routeHandler: `@lwrjs/core/info/route-handler`,
+        },
+    ],
     errorRoutes: [],
     routeHandlers: {},
     bundleConfig: getDefaultBundleConfig(MODE),

package/build/es/global-config.d.ts

@@ -24,13 +24,6 @@ export interface Configurations {
  * @returns {LwrGlobalConfig | undefined} the validated config file contents if it exists
  */
 export declare function getLwrConfigFromFile(rootDir: string, lwrConfigPath?: string): LwrGlobalConfig | undefined;
-/**
- * Add the SSR module provider and view transformer, if any route has `ssr` turned on.
- *
- * @param {NormalizedLwrGlobalConfig} config - a normalized global config to check / mutate
- * @returns {NormalizedLwrGlobalConfig} an SSR-enabled normalized global config, if needed
- */
-export declare function applySsrConfig(config: NormalizedLwrGlobalConfig): NormalizedLwrGlobalConfig;
 /**
  * Apply Static Providers for MRT runtime (used exclusively by buildServer)
  *

package/build/es/global-config.js

@@ -3,7 +3,6 @@ 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 { SSR_MODULE_PROVIDER, SSR_VIEW_TRANSFORM_PLUGIN } from './defaults.js';
 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';
@@ -78,6 +77,10 @@ function mergeConfig(configArg) {
     const configFile = !configArg?.ignoreLwrConfigFile
         ? getLwrConfigFromFile(rootDir, configArg?.lwrConfigFile)
         : undefined;
+    // merge default routes with the config file routes
+    if (configFile) {
+        configFile.routes = (configFile?.routes ?? []).concat(DEFAULT_LWR_CONFIG.routes);
+    }
     // merge the various configs in order of priority
     return {
         ...DEFAULT_LWR_CONFIG,
@@ -172,33 +175,6 @@ function normalizeConfigPaths(config) {
         routeHandlers: normalizeRouteHandlerPaths(config.routeHandlers, resourcePaths),
     };
 }
-/**
- * Add the SSR module provider and view transformer, if any route has `ssr` turned on.
- *
- * @param {NormalizedLwrGlobalConfig} config - a normalized global config to check / mutate
- * @returns {NormalizedLwrGlobalConfig} an SSR-enabled normalized global config, if needed
- */
-export function applySsrConfig(config) {
-    // check if any route has SSR turned on
-    const hasSSR = config.routes.some((r) => r.bootstrap.ssr);
-    if (!hasSSR) {
-        return config;
-    }
-    // add the SSR configuration, if it's not already there
-    // note: this is a noop when called from an onStart hook of an LWR@MRT app,
-    //       since the app has already been built / rolled up
-    const hasSsrModuleProvider = config.moduleProviders.some(([m]) => m === SSR_MODULE_PROVIDER);
-    const hasSsrViewTransformer = config.viewTransformers.some(([v]) => v === SSR_VIEW_TRANSFORM_PLUGIN);
-    return {
-        ...config,
-        moduleProviders: hasSsrModuleProvider
-            ? config.moduleProviders
-            : [[SSR_MODULE_PROVIDER, undefined], ...config.moduleProviders],
-        viewTransformers: hasSsrViewTransformer
-            ? config.viewTransformers
-            : [...config.viewTransformers, [SSR_VIEW_TRANSFORM_PLUGIN, undefined]],
-    };
-}
 /**
  * Apply Static Providers for MRT runtime (used exclusively by buildServer)
  *
@@ -211,7 +187,10 @@ export function applyStaticProviderConfig(config) {
         assetProviders: [['@lwrjs/static/asset-provider', undefined]],
         assetTransformers: [],
         resourceProviders: [['@lwrjs/static/resource-provider', {}]],
-        moduleProviders: [['@lwrjs/static/module-provider', undefined]],
+        moduleProviders: [
+            ['@lwrjs/static/module-provider', undefined],
+            ['@lwrjs/lwc-ssr/moduleProvider', undefined],
+        ],
         bundleProviders: [
             ['@lwrjs/static/bundle-provider', undefined],
             ['@lwrjs/module-bundler/amd-runtime-bundle-provider', undefined],
@@ -242,8 +221,6 @@ export function resolveGlobalConfig(configArg, options) {
     if (options?.useStaticProviders) {
         normalizedConfig = applyStaticProviderConfig(normalizedConfig);
     }
-    // Add SSR config if applicable
-    normalizedConfig = applySsrConfig(normalizedConfig);
     // skip cache dir creation when the option is set
     if (!options?.skipCacheDirCreation) {
         createCacheFolder(normalizedConfig.cacheDir, normalizedConfig.rootDir);

package/build/es/hooks.js

@@ -1,6 +1,5 @@
 import { normalizeRoutes } from './utils/routes.js';
 import { validateLwrAppConfig } from './validation/app-config.js';
-import { applySsrConfig } from './global-config.js';
 import { getTracer, ConfigSpan } from '@lwrjs/instrumentation';
 /**
  * Run `initConfigs` hooks
@@ -31,9 +30,6 @@ export async function executeConfigHooks(hooks, globalConfig, runtimeEnvironment
     }
     globalConfig.routes = normalizeRoutes(globalConfig.routes, globalConfig.routeHandlers);
     globalConfig.errorRoutes = normalizeRoutes(globalConfig.errorRoutes, globalConfig.routeHandlers);
-    const ssrConfig = applySsrConfig(globalConfig);
-    globalConfig.moduleProviders = ssrConfig.moduleProviders;
-    globalConfig.viewTransformers = ssrConfig.viewTransformers;
     if (!skipValidate) {
         validateLwrAppConfig(globalConfig, 'post');
     }
@@ -78,9 +74,6 @@ export function executeStartHooks(hooks, globalConfig, runtimeEnvironment, skipV
     }
     globalConfig.routes = normalizeRoutes(globalConfig.routes, globalConfig.routeHandlers);
     globalConfig.errorRoutes = normalizeRoutes(globalConfig.errorRoutes, globalConfig.routeHandlers);
-    const ssrConfig = applySsrConfig(globalConfig);
-    globalConfig.moduleProviders = ssrConfig.moduleProviders;
-    globalConfig.viewTransformers = ssrConfig.viewTransformers;
     if (!skipValidate) {
         validateLwrAppConfig(globalConfig, 'post');
     }

package/build/es/index.d.ts

@@ -1,4 +1,4 @@
-export { version as LWR_VERSION, lwcVersion as LWC_VERSION } from '@lwrjs/config/package';
+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';

package/build/es/index.js

@@ -1,4 +1,4 @@
-export { version as LWR_VERSION, lwcVersion as LWC_VERSION } from '@lwrjs/config/package';
+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';

package/build/es/utils/routes.js

@@ -6,6 +6,18 @@ export function normalizeRoutes(routes, routeHandlers) {
         // normalize the bootstrap services
         const rawServices = route?.bootstrap?.services || [];
         const services = rawServices.map((s) => (typeof s === 'string' ? { name: s, ssr: false } : s));
+        // default preloadData to true if ssr is true
+        const preloadData = route.bootstrap?.preloadData === undefined
+            ? route.bootstrap?.ssr === true
+                ? true
+                : false
+            : route.bootstrap?.preloadData;
+        const bootstrap = {
+            ...DEFAULT_LWR_BOOTSTRAP_CONFIG,
+            ...route.bootstrap,
+            preloadData,
+            services,
+        };
         // when a route handler is set, ensure it is set in the route handler config
         if (route.routeHandler) {
             const handler = typeof route.routeHandler === 'string' ? route.routeHandler : route.routeHandler[0];
@@ -17,20 +29,12 @@ export function normalizeRoutes(routes, routeHandlers) {
                 routeHandler: typeof route.routeHandler === 'string'
                     ? [route.routeHandler, undefined]
                     : route.routeHandler,
-                bootstrap: {
-                    ...DEFAULT_LWR_BOOTSTRAP_CONFIG,
-                    ...route.bootstrap,
-                    services,
-                },
+                bootstrap,
             };
         }
         return {
             ...route,
-            bootstrap: {
-                ...DEFAULT_LWR_BOOTSTRAP_CONFIG,
-                ...route.bootstrap,
-                services,
-            },
+            bootstrap,
         };
     });
 }

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

@@ -28,12 +28,12 @@ interface ConfigMap {
 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 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", "clientOnly"];
+export declare const LOCKER_ATTRIBUTE_KEYS: ["enabled", "trustedComponents"];
 export declare const I18N_ATTRIBUTE_KEYS: ["defaultLocale", "locales", "uriPattern"];
 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"];
-export declare const BOOTSTRAP_ATTRIBUTE_KEYS: ["autoBoot", "syntheticShadow", "workers", "services", "configAsSrc", "ssr", "mixedMode", "module", "preloadModules"];
+export declare const BOOTSTRAP_ATTRIBUTE_KEYS: ["autoBoot", "syntheticShadow", "workers", "services", "configAsSrc", "ssr", "preloadData", "mixedMode", "module", "preloadModules"];
 export declare const BASE_PATH_REGEX: RegExp;
 export declare class ValidationContext {
     diagnostics: Diagnostic[];
@@ -63,12 +63,12 @@ export declare class ValidationContext {
     assertIsStringOrObject(node: Node | undefined, property: string, index?: number): void;
     assertIsService(node: Node | undefined, property: string, index?: number): 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;
     assertNoBundleConfigDupes(node: Node, dupes: string[]): void;
     assertDefaultInLocales(node: Node, defaultLocale: string, localesIds: string[]): void;
     assertFallbackIds(nodes: Node[]): void;
+    assertSsrPreloadData(node: Node, propPrefix: string): void;
 }
 export {};
 //# sourceMappingURL=app-config-context.d.ts.map

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

@@ -47,7 +47,7 @@ export const ROOT_ATTRIBUTE_KEYS = createKeys('root', [
 ]);
 export const ASSET_DIR_ATTRIBUTE_KEYS = createKeys('assetDir', ['alias', 'dir', 'urlPath', 'root']);
 export const ASSET_FILE_ATTRIBUTE_KEYS = createKeys('assetFile', ['alias', 'file', 'urlPath']);
-export const LOCKER_ATTRIBUTE_KEYS = createKeys('locker', ['enabled', 'trustedComponents', 'clientOnly']);
+export const LOCKER_ATTRIBUTE_KEYS = createKeys('locker', ['enabled', 'trustedComponents']);
 export const I18N_ATTRIBUTE_KEYS = createKeys('i18n', ['defaultLocale', 'locales', 'uriPattern']);
 export const STATIC_SITE_GENERATOR_ATTRIBUTE_KEYS = createKeys('staticSiteGenerator', [
     'outputDir',
@@ -88,6 +88,7 @@ export const BOOTSTRAP_ATTRIBUTE_KEYS = createKeys('bootstrap', [
     'services',
     'configAsSrc',
     'ssr',
+    'preloadData',
     'mixedMode',
     'module',
     'preloadModules',
@@ -420,28 +421,6 @@ 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);
@@ -511,5 +490,15 @@ export class ValidationContext {
             }
         }
     }
+    assertSsrPreloadData(node, propPrefix) {
+        const ssr = findNodeAtLocation(node, ['ssr'])?.value;
+        const preloadData = findNodeAtLocation(node, ['preloadData'])?.value;
+        if (ssr === true && preloadData === false) {
+            this.diagnostics.push({
+                description: descriptions.CONFIG_PARSER.SSR_WITHOUT_PRELOAD(propPrefix),
+                location: this.getLocationFromNode(node),
+            });
+        }
+    }
 }
 //# sourceMappingURL=app-config-context.js.map

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

@@ -28,10 +28,12 @@ function validateBootstrap(node, validationContext, propPrefix) {
         validationContext.assertArrayOfSpecifiers(findNode(node, ['preloadModules']), `${propPrefix}.preloadModules`);
         validationContext.assertIsBoolean(findNode(node, ['autoBoot']), `${propPrefix}.autoBoot`);
         validationContext.assertIsBoolean(findNode(node, ['ssr']), `${propPrefix}.ssr`);
+        validationContext.assertIsBoolean(findNode(node, ['preloadData']), `${propPrefix}.preloadData`);
         validationContext.assertIsBoolean(findNode(node, ['mixedMode']), `${propPrefix}.mixedMode`);
         validationContext.assertIsBoolean(findNode(node, ['configAsSrc']), `${propPrefix}.configAsSrc`);
         validationContext.assertIsSpecifier(findNode(node, ['module']), `${propPrefix}.module`);
         validationContext.assertIsBoolean(findNode(node, ['syntheticShadow']), `${propPrefix}.syntheticShadow`);
+        validationContext.assertSsrPreloadData(node, propPrefix);
         // Each value in the worker map msut be a specifier
         const workers = findNode(node, ['workers']);
         if (workers && workers.children) {
@@ -271,7 +273,6 @@ function validateLocker(node, validationContext) {
  *      - 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
@@ -308,7 +309,6 @@ function validateRoot(node, validationContext, preMerge) {
     validateLocker(lockerNode, validationContext);
     validateI18NConfig(findNode(node, ['i18n']), validationContext, preMerge);
     validateBundleConfig(bundleConfigNode, 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.cjs

@@ -4,17 +4,17 @@ const resolve = require('resolve');
 const rootPath = path.join(__dirname, './');
 
 // Get the LWR Version
-let version;
+let lwrVersion;
 if (globalThis.LWR_VERSION) {
-    version = globalThis.LWR_VERSION;
+    lwrVersion = globalThis.LWR_VERSION;
 } else {
-    version = JSON.parse(fs.readFileSync(path.join(rootPath, 'package.json'), 'utf-8')).version;
+    lwrVersion = 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;
+    lwcVersion = globalThis.LWC_VERSION;
 } else {
     try {
         const packageJsonPath = resolve.sync(`lwc/package.json`);
@@ -26,8 +26,23 @@ 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';
+}
+
+const nodeVersion = process.version
+
 module.exports = {
     rootPath,
-    version,
-    lwcVersion
+    lwrVersion,
+    lwcVersion,
+    nodeVersion,
+    pwaKitRuntimeVersion
 };

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.0",
+    "version": "0.12.0-alpha.10",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,6 +33,7 @@
         "build/**/*.js",
         "build/**/*.cjs",
         "build/**/*.d.ts",
+        "types/**/*.d.ts",
         "package.cjs"
     ],
     "scripts": {
@@ -41,14 +42,14 @@
         "test": "jest"
     },
     "dependencies": {
-        "@lwrjs/diagnostics": "0.12.0-alpha.0",
-        "@lwrjs/instrumentation": "0.12.0-alpha.0",
-        "@lwrjs/shared-utils": "0.12.0-alpha.0",
+        "@lwrjs/diagnostics": "0.12.0-alpha.10",
+        "@lwrjs/instrumentation": "0.12.0-alpha.10",
+        "@lwrjs/shared-utils": "0.12.0-alpha.10",
         "fs-extra": "^11.1.1",
         "jsonc-parser": "^3.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.0",
+        "@lwrjs/types": "0.12.0-alpha.10",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -64,10 +65,10 @@
         }
     },
     "engines": {
-        "node": ">=16.0.0"
+        "node": ">=18.0.0"
     },
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "e79862bc238ededc3cf61f0d2c7d8120d1105a6b"
+    "gitHead": "36759959f624aa40d371dc9ee698dd472813f19c"
 }

package/types/package.d.ts

@@ -0,0 +1,13 @@
+declare module '@lwrjs/config/package' {
+    export const version: string;
+    export const lwcVersion: string;
+    export const rootPath: string;
+    export const lwrVersion: string;
+    export const nodeVersion: string;
+    export const pwaKitRuntimeVersion: string;
+}
+
+declare module '@lwrjs/instrumentation/package' {
+    export const version: string;
+    export const rootPath: string;
+}