@lwrjs/core 0.6.5 → 0.7.0-alpha.10

package/LICENSE

@@ -0,0 +1,10 @@
+MIT LICENSE
+
+Copyright (c) 2020, Salesforce.com, Inc.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/build/cjs/env-config.cjs

@@ -55,6 +55,7 @@ var DEFAULT_DATA_DIR = "$rootDir/src/data";
 var DEFAULT_MODULE_PROVIDERS = [
   "@lwrjs/app-service/moduleProvider",
   "@lwrjs/lwc-ssr/moduleProvider",
+  "@lwrjs/router/module-provider",
   "@lwrjs/lwc-module-provider",
   "@lwrjs/npm-module-provider"
 ];
@@ -299,7 +300,7 @@ function normalizeConfig(config) {
   const assets = normalizeAssetsDir(mergedLwrGlobalConfig.assets, rootDir);
   const contentDir = (0, import_shared_utils.normalizeDirectory)(mergedLwrGlobalConfig.contentDir, rootDir);
   const layoutsDir = (0, import_shared_utils.normalizeDirectory)(mergedLwrGlobalConfig.layoutsDir, rootDir);
-  const amdLoader = (0, import_shared_utils.getExperimentalFeatures)().ENABLE_FINGERPRINTS ? DEFAULT_AMD_LOADER : DEFAULT_AMD_LOADER_LEGACY;
+  const amdLoader = (0, import_shared_utils.getFeatureFlags)().LEGACY_LOADER ? DEFAULT_AMD_LOADER_LEGACY : DEFAULT_AMD_LOADER;
   return {
     ...mergedLwrGlobalConfig,
     assets,

package/build/cjs/index.cjs

@@ -75,7 +75,7 @@ async function initContext(app, server, rawLwrConfig) {
     lwrVersion,
     debug: false,
     serverMode,
-    experimental_features: (0, import_shared_utils.getExperimentalFeatures)()
+    featureFlags: (0, import_shared_utils.getFeatureFlags)()
   };
   const hookProviders = await getServices(rawLwrConfig.hooks, void 0, rawLwrConfig);
   const {lwrConfig, dataConfig, runtimeConfig} = await (0, import_hooks.runConfigurationsHook)(hookProviders, rawLwrConfig, rawDataConfig, rawRuntimeEnvConfig);
@@ -259,7 +259,7 @@ async function generateStaticSite(config) {
   await new import_static_generation.default().buildStaticApplication(lwrApp.getConfig(), dispatcher);
 }
 function overrideConfigAsSrc(lwrApp) {
-  if ((0, import_shared_utils.getExperimentalFeatures)().ENABLE_FINGERPRINTS) {
+  if (!(0, import_shared_utils.getFeatureFlags)().LEGACY_LOADER) {
     const normalizedConfig = lwrApp.getConfig();
     const routes = normalizedConfig.routes || [];
     for (const route of routes) {

package/build/cjs/middlewares/api-middleware.cjs

@@ -252,9 +252,13 @@ function apiMiddleware(app, context) {
     }
   });
   app.get([
+    `/:apiVersion/mapping/:format/:compat/l/:locale/e/:environment/bi/:bundleSpecifier/mp/:specifiers`,
     `/:apiVersion/mapping/:format/:compat/l/:locale/e/:environment/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/l/:locale/bi/:bundleSpecifier/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/e/:environment/bi/:bundleSpecifier/mp/:specifiers`,
     `/:apiVersion/mapping/:format/:compat/l/:locale/mp/:specifiers`,
     `/:apiVersion/mapping/:format/:compat/e/:environment/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/bi/:bundleSpecifier/mp/:specifiers`,
     `/:apiVersion/mapping/:format/:compat/mp/:specifiers`
   ], async (req, res) => {
     const requestContext = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/cjs/middlewares/ui-middleware.cjs

@@ -42,6 +42,7 @@ function uiMiddleware(app, context) {
       res.status(400).send({error: "Accept header and json query parameter are incompatible"});
       return;
     }
+    req.params.bundleSpecifier = defaultRuntimeEnvironment.bundle ? "0" : void 0;
     const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);
     const targetEnvironment = runtimeParams.environment;
     if (!(0, import_utils.isSupportedEnvironment)(environmentConfig, targetEnvironment)) {
@@ -89,6 +90,7 @@ function uiMiddleware(app, context) {
     }
   }
   async function sendConfigurationResponse(req, res, defaultStatus = 200) {
+    req.params.bundleSpecifier = defaultRuntimeEnvironment.bundle ? "0" : void 0;
     const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);
     const {appId, encodedViewPath} = req.params;
     const route = routes.find((route2) => route2.id === appId);

package/build/cjs/tools/server-warmup.cjs

@@ -29,11 +29,20 @@ __export(exports, {
 var import_static_generation = __toModule(require("./static-generation.cjs"));
 var import_dir = __toModule(require("./utils/dir.cjs"));
 var import_network_dispatcher = __toModule(require("./utils/network-dispatcher.cjs"));
+var import_env_config = __toModule(require("../env-config.cjs"));
 async function warmupServer(config, internalRequestKey) {
   console.log("[Server Warmup] starting");
-  const {routes, staticSiteGenerator, port} = config;
+  const {routes, staticSiteGenerator, port, apiVersion, basePath, lwrVersion, serverMode} = config;
   staticSiteGenerator.outputDir = import_dir.skipDirCreation;
   const urlRewriteMap = new Map();
-  await new import_static_generation.default().generateRoutes(staticSiteGenerator, routes, new import_network_dispatcher.default(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
+  const runtimeEnvironment = {
+    ...(0, import_env_config.explodeMode)(serverMode),
+    apiVersion,
+    basePath,
+    lwrVersion,
+    debug: false,
+    serverMode
+  };
+  await new import_static_generation.default().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, new import_network_dispatcher.default(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
   console.log("[Server Warmup] complete");
 }

package/build/cjs/tools/static-generation.cjs

@@ -33,6 +33,7 @@ var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
 var import_stream = __toModule(require("./utils/stream.cjs"));
 var import_dir = __toModule(require("./utils/dir.cjs"));
+var import_env_config = __toModule(require("../env-config.cjs"));
 var SiteGenerator = class {
   async buildStaticApplication(config, dispatcher) {
     const startTime = import_perf_hooks.performance.now();
@@ -45,29 +46,45 @@ var SiteGenerator = class {
     console.log(`[INFO] Clear Output Location: ${outputDir}`);
     import_fs_extra.default.rmSync(outputDir, {recursive: true, force: true});
     const urlRewriteMap = new Map();
-    await this.generateRoutes(staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap);
+    const {apiVersion, basePath, lwrVersion, serverMode} = config;
+    const runtimeEnvironment = {
+      ...(0, import_env_config.explodeMode)(serverMode),
+      apiVersion,
+      basePath,
+      lwrVersion,
+      debug: false,
+      serverMode
+    };
+    await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap);
     this.writeNetlifyRedirectConfig(outputDir, urlRewriteMap);
     this.copyAssets(assets, outputDir);
     const endTime = import_perf_hooks.performance.now();
     const timeDiff = (endTime - startTime) / 1e3;
     console.log(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
   }
-  async generateRoutes(staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap = new Map()) {
+  async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap = new Map()) {
     if (!staticSiteGenerator.locales) {
       staticSiteGenerator.locales = ["en-US"];
     }
     const generateUrl = this.createGenerateURLFunction(dispatcher);
     for (const locale of staticSiteGenerator.locales) {
       for (const route of routes) {
-        const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap);
+        const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment);
         await generateUrl(route.path, siteConfig);
       }
       if (staticSiteGenerator._additionalRoutePaths) {
         for (const uri of staticSiteGenerator._additionalRoutePaths) {
-          const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap);
+          const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment);
           await generateUrl(uri, siteConfig);
         }
       }
+      const {_additionalModules} = staticSiteGenerator;
+      if (_additionalModules) {
+        for (const specifier of _additionalModules) {
+          const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment);
+          await this.dispatchJSResourceRecursive(specifier, dispatcher, siteConfig, true);
+        }
+      }
     }
   }
   createGenerateURLFunction(dispatcher) {
@@ -88,7 +105,14 @@ var SiteGenerator = class {
         console.error("Skipped url with variable path segment: " + url);
         return;
       }
-      const context = await dispatcher.dispatchUrl(url, "GET", siteConfig.locale);
+      let context;
+      context = await dispatcher.dispatchUrl(url, "GET", siteConfig.locale);
+      if (context?.fs?.headers?.Location) {
+        const redirectUrl = context?.fs?.headers?.Location;
+        url = redirectUrl;
+        const redirectContext = await dispatcher.dispatchUrl(url, "GET", siteConfig.locale);
+        context = redirectContext;
+      }
       const {resourceType} = resourceOpts;
       if (resourceType === "route") {
         await this.handleHtmlResource(url, context, siteConfig, dispatcher);
@@ -139,11 +163,12 @@ var SiteGenerator = class {
     const statusCode = context.response?.status;
     if (statusCode === 200) {
       const newImportMetadata = context.fs?.body;
+      let filteredImportMetadata;
       if (!importMetatdata) {
-        console.warn("[WARN] Import metadata collector was never initialized");
-        return;
+        filteredImportMetadata = newImportMetadata;
+      } else {
+        filteredImportMetadata = importMetatdata.addAdditionalMetadata(newImportMetadata);
       }
-      const filteredImportMetadata = importMetatdata.addAdditionalMetadata(newImportMetadata);
       const dispatchRequests = [];
       for (const uri of Object.keys(filteredImportMetadata.imports)) {
         dispatchRequests.push(this.dispatchResourceRecursive(uri, dispatcher, {resourceType: "js"}, siteConfig));
@@ -173,7 +198,6 @@ var SiteGenerator = class {
     }
   }
   async handleViewDefinition(viewDefinition, siteConfig, dispatcher) {
-    siteConfig.endpoints = viewDefinition.viewRecord.endpoints;
     if (viewDefinition.viewRecord.importMetadata) {
       siteConfig.importMetadata = new ViewImportMetadataImpl(viewDefinition.viewRecord.importMetadata);
     }
@@ -224,11 +248,11 @@ var SiteGenerator = class {
     }
     await Promise.all(dispatchRequests);
   }
-  async dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig) {
+  async dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig, isAdditionalModulesRequest) {
     if (jsUri.startsWith("/")) {
       await this.dispatchResourceRecursive(jsUri, dispatcher, {resourceType: "js"}, siteConfig);
     } else {
-      const supportsFingerprints = siteConfig.experimentalFeatures?.ENABLE_FINGERPRINTS;
+      const supportsFingerprints = !siteConfig.featureFlags?.LEGACY_LOADER;
       if (supportsFingerprints) {
         const mappingEndpoint = siteConfig.endpoints?.uris?.mapping;
         if (mappingEndpoint) {
@@ -237,6 +261,9 @@ var SiteGenerator = class {
         } else {
           console.warn('[WARN] Unable to fetch mapping for bare specifier or variable dynamic import: "' + jsUri + '"');
         }
+      } else if (isAdditionalModulesRequest) {
+        const uri = `${siteConfig.endpoints?.uris.legacyDefault}${encodeURIComponent(jsUri)}`;
+        await this.dispatchResourceRecursive(uri, dispatcher, {resourceType: "js"}, siteConfig);
       }
     }
   }
@@ -279,31 +306,38 @@ var SiteGenerator = class {
           throw new Error("Could not find assets to copy at path: " + assetSrcDir);
         }
       } catch (e) {
-        console.error("Error occurred processing asset config: " + asset);
+        console.error("Error occurred processing asset config: " + JSON.stringify(asset));
         console.error(e);
       }
     }
   }
-  createSiteConfig(outputDir, locale, urlRewriteMap) {
-    const experimentalFeatures = this.filterExperimentalFeatures();
+  createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment) {
+    const featureFlags = this.filterFeatureFlags();
+    const endpoints = {
+      uris: {
+        legacyDefault: (0, import_shared_utils.getModuleUriPrefix)(runtimeEnvironment, {locale}),
+        mapping: (0, import_shared_utils.getMappingUriPrefix)(runtimeEnvironment, {locale})
+      }
+    };
     return {
       outputDir,
       viewPaths: new Set(),
       visitedUrls: new Set(),
       locale,
       urlRewriteMap,
-      ...experimentalFeatures
+      endpoints,
+      ...featureFlags
     };
   }
-  filterExperimentalFeatures() {
-    if ((0, import_shared_utils.getExperimentalFeatures)().ENABLE_FINGERPRINTS) {
-      return {experimentalFeatures: {ENABLE_FINGERPRINTS: true}};
+  filterFeatureFlags() {
+    if ((0, import_shared_utils.getFeatureFlags)().LEGACY_LOADER) {
+      return {featureFlags: {LEGACY_LOADER: true}};
     } else {
       return void 0;
     }
   }
   addAdditionalImportMetadataToViewConfig(siteConfig) {
-    const supportsFingerprints = siteConfig.experimentalFeatures?.ENABLE_FINGERPRINTS;
+    const supportsFingerprints = !siteConfig.featureFlags?.LEGACY_LOADER;
     const additionalImportMetadata = siteConfig?.importMetadata?.getAdditionalImportMetadata();
     if (supportsFingerprints && siteConfig.viewConfigPath && additionalImportMetadata?.imports && Object.keys(additionalImportMetadata.imports).length > 0) {
       const imports = additionalImportMetadata.imports ? JSON.stringify(additionalImportMetadata.imports) : "{}";

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

@@ -26,6 +26,7 @@ __markAsModule(exports);
 __export(exports, {
   ASSET_DIR_ATTRIBUTE_KEYS: () => ASSET_DIR_ATTRIBUTE_KEYS,
   ASSET_FILE_ATTRIBUTE_KEYS: () => ASSET_FILE_ATTRIBUTE_KEYS,
+  BASE_PATH_REGEX: () => BASE_PATH_REGEX,
   BOOTSTRAP_ATTRIBUTE_KEYS: () => BOOTSTRAP_ATTRIBUTE_KEYS,
   ERROR_ROUTE_ATTRIBUTE_KEYS: () => ERROR_ROUTE_ATTRIBUTE_KEYS,
   LOCKER_ATTRIBUTE_KEYS: () => LOCKER_ATTRIBUTE_KEYS,
@@ -111,6 +112,7 @@ var SPECIFIER_REGEX = /^@?[\w-]+(\/[\w-]+)*$/;
 function isNotEmptyString(node) {
   return node.type === "string" && node.value.length > 0;
 }
+var BASE_PATH_REGEX = /^(\/[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$/g;
 var ValidationContext = class {
   constructor(sourceText) {
     this.diagnostics = [];
@@ -224,6 +226,24 @@ var ValidationContext = class {
       });
     }
   }
+  assertIsBasePath(node, property) {
+    if (!node) {
+      return;
+    }
+    if (node.type !== "string") {
+      this.diagnostics.push({
+        description: import_diagnostics.descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, "string", node.type),
+        location: this.getLocationFromNode(node)
+      });
+    } else if (node.value === "") {
+      return;
+    } else if (node.value.match(BASE_PATH_REGEX) === null) {
+      this.diagnostics.push({
+        description: import_diagnostics.descriptions.CONFIG_PARSER.INVALID_BASEPATH(property, node.value),
+        location: this.getLocationFromNode(node)
+      });
+    }
+  }
   assertNotEmptyString(node, property) {
     if (!node) {
       return;

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

@@ -168,6 +168,7 @@ function validateRoot(node, validationContext, preMerge) {
   validationContext.assertArrayOfServices((0, import_jsonc_parser.findNodeAtLocation)(node, ["assetProviders"]), "assetProviders");
   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");
 }
 function validateLwrAppConfig(jsonSourceText, phase) {
   const errors = [];

package/build/es/env-config.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { createRequire } from 'module';
-import { ASSETS_CACHE_DIR, readFile, normalizeDirectory, normalizeResourcePath, DEFAULT_LWR_BOOTSTRAP_CONFIG, DEFAULT_LWR_LOCKER_CONFIG, DEFAULT_LOCKER_TRUSTED_CMP, normalizeInterchangeableModuleConfig, getExperimentalFeatures, } from '@lwrjs/shared-utils';
+import { ASSETS_CACHE_DIR, readFile, normalizeDirectory, normalizeResourcePath, DEFAULT_LWR_BOOTSTRAP_CONFIG, DEFAULT_LWR_LOCKER_CONFIG, DEFAULT_LOCKER_TRUSTED_CMP, normalizeInterchangeableModuleConfig, getFeatureFlags, } from '@lwrjs/shared-utils';
 import { rootPath, version } from '@lwrjs/core/package';
 import { validateLwrAppConfig } from './validation/app-config.js';
 import { LwrConfigValidationError } from '@lwrjs/diagnostics';
@@ -28,6 +28,7 @@ const DEFAULT_DATA_DIR = '$rootDir/src/data';
 const DEFAULT_MODULE_PROVIDERS = [
     '@lwrjs/app-service/moduleProvider',
     '@lwrjs/lwc-ssr/moduleProvider',
+    '@lwrjs/router/module-provider',
     '@lwrjs/lwc-module-provider',
     '@lwrjs/npm-module-provider',
 ];
@@ -311,9 +312,7 @@ export function normalizeConfig(config) {
     const assets = normalizeAssetsDir(mergedLwrGlobalConfig.assets, rootDir);
     const contentDir = normalizeDirectory(mergedLwrGlobalConfig.contentDir, rootDir);
     const layoutsDir = normalizeDirectory(mergedLwrGlobalConfig.layoutsDir, rootDir);
-    const amdLoader = getExperimentalFeatures().ENABLE_FINGERPRINTS
-        ? DEFAULT_AMD_LOADER
-        : DEFAULT_AMD_LOADER_LEGACY;
+    const amdLoader = getFeatureFlags().LEGACY_LOADER ? DEFAULT_AMD_LOADER_LEGACY : DEFAULT_AMD_LOADER;
     return {
         ...mergedLwrGlobalConfig,
         assets,

package/build/es/index.js

@@ -1,4 +1,4 @@
-import { deepFreeze, getExperimentalFeatures, DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
+import { deepFreeze, getFeatureFlags, DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
 import { LwrCompiler } from '@lwrjs/compiler';
 import { LwrModuleBundler } from '@lwrjs/module-bundler';
 import { LwrModuleRegistry } from '@lwrjs/module-registry';
@@ -50,7 +50,7 @@ async function initContext(app, server, rawLwrConfig) {
         lwrVersion,
         debug: false,
         serverMode,
-        experimental_features: getExperimentalFeatures(),
+        featureFlags: getFeatureFlags(),
     };
     const hookProviders = await getServices(rawLwrConfig.hooks, undefined, rawLwrConfig);
     const { lwrConfig, dataConfig, runtimeConfig } = await runConfigurationsHook(hookProviders, rawLwrConfig, rawDataConfig, rawRuntimeEnvConfig);
@@ -233,7 +233,7 @@ export async function generateStaticSite(config) {
  * Create normalized config for static generation forcing the app config to come as src
  */
 function overrideConfigAsSrc(lwrApp) {
-    if (getExperimentalFeatures().ENABLE_FINGERPRINTS) {
+    if (!getFeatureFlags().LEGACY_LOADER) {
         const normalizedConfig = lwrApp.getConfig();
         const routes = normalizedConfig.routes || [];
         for (const route of routes) {

package/build/es/middlewares/api-middleware.js

@@ -276,15 +276,19 @@ export default function apiMiddleware(app, context) {
         }
     });
     // Mapping Services
-    // /{apiversion}/mapping/{format}/{compat}/l/{language}/mp/{specifiers}
+    // /{apiversion}/mapping/{format}/{compat}(/l/{language})?(/e/{environment})?(/bi/{bundleStrategyId})?/mp/{specifiers}
     app.get([
-        // Full URL
+        // Full URL (3 optional segments)
+        `/:apiVersion/mapping/:format/:compat/l/:locale/e/:environment/bi/:bundleSpecifier/mp/:specifiers`,
+        // With 2 optional segments: l & e, l & bi, e & bi
         `/:apiVersion/mapping/:format/:compat/l/:locale/e/:environment/mp/:specifiers`,
-        // Without Environment
+        `/:apiVersion/mapping/:format/:compat/l/:locale/bi/:bundleSpecifier/mp/:specifiers`,
+        `/:apiVersion/mapping/:format/:compat/e/:environment/bi/:bundleSpecifier/mp/:specifiers`,
+        // With 1 optional segment
         `/:apiVersion/mapping/:format/:compat/l/:locale/mp/:specifiers`,
-        // Without Locale
         `/:apiVersion/mapping/:format/:compat/e/:environment/mp/:specifiers`,
-        // Without Optional Segments
+        `/:apiVersion/mapping/:format/:compat/bi/:bundleSpecifier/mp/:specifiers`,
+        // With 0 optional segments
         `/:apiVersion/mapping/:format/:compat/mp/:specifiers`,
     ], async (req, res) => {
         const requestContext = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/es/middlewares/ui-middleware.js

@@ -14,6 +14,8 @@ export default function uiMiddleware(app, context) {
             res.status(400).send({ error: 'Accept header and json query parameter are incompatible' });
             return;
         }
+        // UI URIs do not contain bundle IDs, so always use the environment default
+        req.params.bundleSpecifier = defaultRuntimeEnvironment.bundle ? '0' : undefined;
         const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);
         const targetEnvironment = runtimeParams.environment;
         if (!isSupportedEnvironment(environmentConfig, targetEnvironment)) {
@@ -67,6 +69,8 @@ export default function uiMiddleware(app, context) {
         }
     }
     async function sendConfigurationResponse(req, res, defaultStatus = 200) {
+        // UI URIs do not contain bundle IDs, so always use the environment default
+        req.params.bundleSpecifier = defaultRuntimeEnvironment.bundle ? '0' : undefined;
         const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);
         const { appId, encodedViewPath } = req.params;
         // Match the route id

package/build/es/tools/server-warmup.js

@@ -1,13 +1,22 @@
 import SiteGenerator from './static-generation.js';
 import { skipDirCreation } from './utils/dir.js';
 import NetworkDispatcher from './utils/network-dispatcher.js';
+import { explodeMode } from '../env-config.js';
 export async function warmupServer(config, internalRequestKey) {
     console.log('[Server Warmup] starting');
-    const { routes, staticSiteGenerator, port } = config;
+    const { routes, staticSiteGenerator, port, apiVersion, basePath, lwrVersion, serverMode } = config;
     staticSiteGenerator.outputDir = skipDirCreation;
     const urlRewriteMap = new Map();
+    const runtimeEnvironment = {
+        ...explodeMode(serverMode),
+        apiVersion,
+        basePath,
+        lwrVersion,
+        debug: false,
+        serverMode,
+    };
     // For each locale, generate all the modules
-    await new SiteGenerator().generateRoutes(staticSiteGenerator, routes, new NetworkDispatcher(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
+    await new SiteGenerator().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, new NetworkDispatcher(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
     console.log('[Server Warmup] complete');
 }
 //# sourceMappingURL=server-warmup.js.map

package/build/es/tools/static-generation.d.ts

@@ -1,4 +1,4 @@
-import { ImportMetadata, LwrDispatcher, StaticSiteGenerator, LwrRoute, NormalizedLwrGlobalConfig } from '@lwrjs/types';
+import { ImportMetadata, LwrDispatcher, StaticSiteGenerator, LwrRoute, NormalizedLwrGlobalConfig, RuntimeEnvironment } from '@lwrjs/types';
 import { ResourceContextOpts, SiteConfig, ViewImportMetadata } from './types.js';
 export default class SiteGenerator {
     /**
@@ -13,7 +13,7 @@ export default class SiteGenerator {
     /**
      * Crawl all view routes for a site
      */
-    generateRoutes(staticSiteGenerator: StaticSiteGenerator, routes: LwrRoute[], dispatcher: LwrDispatcher, outputDir: string, urlRewriteMap?: Map<string, string>): Promise<void>;
+    generateRoutes(runtimeEnvironment: RuntimeEnvironment, staticSiteGenerator: StaticSiteGenerator, routes: LwrRoute[], dispatcher: LwrDispatcher, outputDir: string, urlRewriteMap?: Map<string, string>): Promise<void>;
     /**
      * Creates a function to dispatch the root requests for a given view url
      */
@@ -91,7 +91,7 @@ export default class SiteGenerator {
      * Create a new site config for the current view
      */
     private createSiteConfig;
-    private filterExperimentalFeatures;
+    private filterFeatureFlags;
     /**
      * Add any additional import metadata collected during static site generation to the Client Bootstrap Config for this view.
      */

package/build/es/tools/static-generation.js

@@ -1,9 +1,10 @@
 import { performance } from 'perf_hooks';
-import { getSpecifier, getExperimentalFeatures, hashContent } from '@lwrjs/shared-utils';
+import { getSpecifier, getFeatureFlags, hashContent, getModuleUriPrefix, getMappingUriPrefix, } from '@lwrjs/shared-utils';
 import { join, dirname, extname } from 'path';
 import fs from 'fs-extra';
 import { writeResponse } from './utils/stream.js';
 import { createDir, createResourceDir } from './utils/dir.js';
+import { explodeMode } from '../env-config.js';
 export default class SiteGenerator {
     /**
      * Build a static site in the configured directory
@@ -24,8 +25,17 @@ export default class SiteGenerator {
         console.log(`[INFO] Clear Output Location: ${outputDir}`);
         fs.rmSync(outputDir, { recursive: true, force: true });
         const urlRewriteMap = new Map();
+        const { apiVersion, basePath, lwrVersion, serverMode } = config;
+        const runtimeEnvironment = {
+            ...explodeMode(serverMode),
+            apiVersion,
+            basePath,
+            lwrVersion,
+            debug: false,
+            serverMode,
+        };
         // For each locale, generate all the modules
-        await this.generateRoutes(staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap);
+        await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap);
         // Write redirect files
         this.writeNetlifyRedirectConfig(outputDir, urlRewriteMap);
         // Copy over assets
@@ -37,7 +47,7 @@ export default class SiteGenerator {
     /**
      * Crawl all view routes for a site
      */
-    async generateRoutes(staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap = new Map()) {
+    async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap = new Map()) {
         if (!staticSiteGenerator.locales) {
             staticSiteGenerator.locales = ['en-US'];
         }
@@ -46,18 +56,27 @@ export default class SiteGenerator {
         for (const locale of staticSiteGenerator.locales) {
             // Generate all the routes
             for (const route of routes) {
-                const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap);
+                const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment);
                 // eslint-disable-next-line no-await-in-loop
                 await generateUrl(route.path, siteConfig);
             }
             // Generate any additional urls
             if (staticSiteGenerator._additionalRoutePaths) {
                 for (const uri of staticSiteGenerator._additionalRoutePaths) {
-                    const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap);
+                    const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment);
                     // eslint-disable-next-line no-await-in-loop
                     await generateUrl(uri, siteConfig);
                 }
             }
+            // Handle _additionalModules specifiers
+            const { _additionalModules } = staticSiteGenerator;
+            if (_additionalModules) {
+                for (const specifier of _additionalModules) {
+                    const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment);
+                    // eslint-disable-next-line no-await-in-loop
+                    await this.dispatchJSResourceRecursive(specifier, dispatcher, siteConfig, true);
+                }
+            }
         }
     }
     /**
@@ -94,7 +113,15 @@ export default class SiteGenerator {
                 return;
             }
             // Generate resource
-            const context = await dispatcher.dispatchUrl(url, 'GET', siteConfig.locale);
+            let context;
+            context = await dispatcher.dispatchUrl(url, 'GET', siteConfig.locale);
+            // Handle 302 redirect if applicable
+            if (context?.fs?.headers?.Location) {
+                const redirectUrl = context?.fs?.headers?.Location;
+                url = redirectUrl;
+                const redirectContext = await dispatcher.dispatchUrl(url, 'GET', siteConfig.locale);
+                context = redirectContext;
+            }
             const { resourceType } = resourceOpts;
             // -- Routes (root resources) -------
             if (resourceType === 'route') {
@@ -192,12 +219,16 @@ export default class SiteGenerator {
         if (statusCode === 200) {
             // Read JSON
             const newImportMetadata = context.fs?.body;
+            let filteredImportMetadata;
             if (!importMetatdata) {
-                console.warn('[WARN] Import metadata collector was never initialized');
-                return;
+                filteredImportMetadata = newImportMetadata;
+            }
+            else {
+                // need to handle importMetadata when generating from a view
+                filteredImportMetadata = importMetatdata.addAdditionalMetadata(newImportMetadata);
             }
             // Filter out and import metadata already included with the view
-            const filteredImportMetadata = importMetatdata.addAdditionalMetadata(newImportMetadata);
+            // const filteredImportMetadata = importMetatdata.addAdditionalMetadata(newImportMetadata);
             // Build up a list of dispatch requests to kick off in parallel
             const dispatchRequests = [];
             // Iterate through the import mappings and return request uris
@@ -254,8 +285,6 @@ export default class SiteGenerator {
      * @param dispatcher - Network dispatcher
      */
     async handleViewDefinition(viewDefinition, siteConfig, dispatcher) {
-        // Save mapping endpoint for future
-        siteConfig.endpoints = viewDefinition.viewRecord.endpoints;
         // Save existing import metadata
         if (viewDefinition.viewRecord.importMetadata) {
             // Initialize import metadata collector
@@ -320,12 +349,12 @@ export default class SiteGenerator {
         // -- Dispatch dependencies
         await Promise.all(dispatchRequests);
     }
-    async dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig) {
+    async dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig, isAdditionalModulesRequest) {
         if (jsUri.startsWith('/')) {
             await this.dispatchResourceRecursive(jsUri, dispatcher, { resourceType: 'js' }, siteConfig);
         }
         else {
-            const supportsFingerprints = siteConfig.experimentalFeatures?.ENABLE_FINGERPRINTS;
+            const supportsFingerprints = !siteConfig.featureFlags?.LEGACY_LOADER;
             if (supportsFingerprints) {
                 // Download mapping
                 const mappingEndpoint = siteConfig.endpoints?.uris?.mapping;
@@ -339,6 +368,14 @@ export default class SiteGenerator {
                         '"');
                 }
             }
+            // TODO: this code path was still being hit prior to _additionalModules
+            // flag for bare dynamic imports metadata.  This flag keeps the behavior as
+            // before until we can figure out what to do with those requests.
+            else if (isAdditionalModulesRequest) {
+                // fallback to globalThis.LWR.imports.default
+                const uri = `${siteConfig.endpoints?.uris.legacyDefault}${encodeURIComponent(jsUri)}`;
+                await this.dispatchResourceRecursive(uri, dispatcher, { resourceType: 'js' }, siteConfig);
+            }
         }
     }
     /**
@@ -408,7 +445,7 @@ export default class SiteGenerator {
                 }
             }
             catch (e) {
-                console.error('Error occurred processing asset config: ' + asset);
+                console.error('Error occurred processing asset config: ' + JSON.stringify(asset));
                 console.error(e);
             }
         }
@@ -416,21 +453,29 @@ export default class SiteGenerator {
     /**
      * Create a new site config for the current view
      */
-    createSiteConfig(outputDir, locale, urlRewriteMap) {
-        const experimentalFeatures = this.filterExperimentalFeatures();
+    createSiteConfig(outputDir, locale, urlRewriteMap, runtimeEnvironment) {
+        const featureFlags = this.filterFeatureFlags();
+        const endpoints = {
+            uris: {
+                // legacy globalThis.LWR.importMappings.default
+                legacyDefault: getModuleUriPrefix(runtimeEnvironment, { locale }),
+                mapping: getMappingUriPrefix(runtimeEnvironment, { locale }),
+            },
+        };
         return {
             outputDir,
             viewPaths: new Set(),
             visitedUrls: new Set(),
             locale,
             urlRewriteMap,
-            // Only include ENABLE_FINGERPRINTS if true
-            ...experimentalFeatures,
+            endpoints,
+            // Only include LEGACY_LOADER if true
+            ...featureFlags,
         };
     }
-    filterExperimentalFeatures() {
-        if (getExperimentalFeatures().ENABLE_FINGERPRINTS) {
-            return { experimentalFeatures: { ENABLE_FINGERPRINTS: true } };
+    filterFeatureFlags() {
+        if (getFeatureFlags().LEGACY_LOADER) {
+            return { featureFlags: { LEGACY_LOADER: true } };
         }
         else {
             return undefined;
@@ -440,7 +485,7 @@ export default class SiteGenerator {
      * Add any additional import metadata collected during static site generation to the Client Bootstrap Config for this view.
      */
     addAdditionalImportMetadataToViewConfig(siteConfig) {
-        const supportsFingerprints = siteConfig.experimentalFeatures?.ENABLE_FINGERPRINTS;
+        const supportsFingerprints = !siteConfig.featureFlags?.LEGACY_LOADER;
         const additionalImportMetadata = siteConfig?.importMetadata?.getAdditionalImportMetadata();
         if (supportsFingerprints &&
             siteConfig.viewConfigPath &&

package/build/es/tools/types.d.ts

@@ -1,4 +1,4 @@
-import { Endpoints, ExperimentalFeatures, ImportMetadata } from '@lwrjs/types';
+import { Endpoints, FeatureFlags, ImportMetadata } from '@lwrjs/types';
 import { RenderedAssetReference } from '@lwrjs/types';
 export interface BaseResourceContextOpts {
     resourceType: 'route' | 'asset' | 'js' | 'resource' | 'mapping';
@@ -41,6 +41,7 @@ export interface SiteConfig {
     endpoints?: Endpoints;
     importMetadata?: ViewImportMetadata;
     viewConfigPath?: string;
-    experimentalFeatures?: ExperimentalFeatures;
+    featureFlags?: FeatureFlags;
+    legacyDefaultMappingEndpoint?: string;
 }
 //# sourceMappingURL=types.d.ts.map

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

@@ -22,6 +22,7 @@ export declare const LOCKER_ATTRIBUTE_KEYS: ["enabled", "trustedComponents", "cl
 export declare const ROUTE_ATTRIBUTE_KEYS: ["bootstrap", "contentTemplate", "id", "cache", "layoutTemplate", "method", "path", "rootComponent", "routeHandler", "properties"];
 export declare const ERROR_ROUTE_ATTRIBUTE_KEYS: ["bootstrap", "contentTemplate", "id", "layoutTemplate", "rootComponent", "routeHandler", "status", "properties", "cache"];
 export declare const BOOTSTRAP_ATTRIBUTE_KEYS: ["autoBoot", "syntheticShadow", "workers", "services", "configAsSrc", "experimentalSSR"];
+export declare const BASE_PATH_REGEX: RegExp;
 export declare class ValidationContext {
     diagnostics: Diagnostic[];
     sourceText: string;
@@ -38,6 +39,7 @@ export declare class ValidationContext {
     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;
     assertNotEmptyString(node: Node | undefined, property: string): void;
     assertNotEmptyArray(node: Node | undefined, property: string): void;
     assertHasOneOrMore(node: Node, property: string, childProps: string[]): void;

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

@@ -78,6 +78,7 @@ const SPECIFIER_REGEX = /^@?[\w-]+(\/[\w-]+)*$/;
 function isNotEmptyString(node) {
     return node.type === 'string' && node.value.length > 0;
 }
+export const BASE_PATH_REGEX = /^(\/[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$/g;
 export class ValidationContext {
     constructor(sourceText) {
         this.diagnostics = [];
@@ -191,6 +192,26 @@ export class ValidationContext {
             });
         }
     }
+    assertIsBasePath(node, property) {
+        if (!node) {
+            return;
+        }
+        if (node.type !== 'string') {
+            this.diagnostics.push({
+                description: descriptions.CONFIG_PARSER.INCORRECT_NODE_TYPE(property, 'string', node.type),
+                location: this.getLocationFromNode(node),
+            });
+        }
+        else if (node.value === '') {
+            return;
+        }
+        else if (node.value.match(BASE_PATH_REGEX) === null) {
+            this.diagnostics.push({
+                description: descriptions.CONFIG_PARSER.INVALID_BASEPATH(property, node.value),
+                location: this.getLocationFromNode(node),
+            });
+        }
+    }
     assertNotEmptyString(node, property) {
         if (!node) {
             return;

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

@@ -180,6 +180,7 @@ function validateLocker(node, validationContext) {
  *      - resourceProviders: array of services
  *      - assetProviders: array of services
  *      - lwc.modules: array
+ *      - basePath: valid subdomain part
  * Notes:
  *      - ignore `bundleConfig` because it is not yet RFCed
  *      - specifier strings are validated for type and shape only, NOT if they are resolvable
@@ -216,6 +217,7 @@ function validateRoot(node, validationContext, preMerge) {
     validationContext.assertArrayOfServices(findNode(node, ['assetProviders']), 'assetProviders');
     validationContext.assertNotEmptyArray(findNode(node, ['lwc', 'modules']), 'lwc.modules');
     validationContext.assertIsEnvironment(findNode(node, ['environment']), 'environment');
+    validationContext.assertIsBasePath(findNode(node, ['basePath']), 'basePath');
 }
 export function validateLwrAppConfig(jsonSourceText, phase) {
     const errors = [];

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.5",
+    "version": "0.7.0-alpha.10",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,31 +33,31 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.6.5",
-        "@lwrjs/asset-registry": "0.6.5",
-        "@lwrjs/asset-transformer": "0.6.5",
-        "@lwrjs/base-template-engine": "0.6.5",
-        "@lwrjs/base-view-provider": "0.6.5",
-        "@lwrjs/base-view-transformer": "0.6.5",
-        "@lwrjs/client-modules": "0.6.5",
-        "@lwrjs/compiler": "0.6.5",
-        "@lwrjs/diagnostics": "0.6.5",
-        "@lwrjs/fs-asset-provider": "0.6.5",
-        "@lwrjs/html-view-provider": "0.6.5",
-        "@lwrjs/loader": "0.6.5",
-        "@lwrjs/lwc-module-provider": "0.6.5",
-        "@lwrjs/lwc-ssr": "0.6.5",
-        "@lwrjs/markdown-view-provider": "0.6.5",
-        "@lwrjs/module-bundler": "0.6.5",
-        "@lwrjs/module-registry": "0.6.5",
-        "@lwrjs/npm-module-provider": "0.6.5",
-        "@lwrjs/nunjucks-view-provider": "0.6.5",
-        "@lwrjs/o11y": "0.6.5",
-        "@lwrjs/resource-registry": "0.6.5",
-        "@lwrjs/router": "0.6.5",
-        "@lwrjs/server": "0.6.5",
-        "@lwrjs/shared-utils": "0.6.5",
-        "@lwrjs/view-registry": "0.6.5",
+        "@lwrjs/app-service": "0.7.0-alpha.10",
+        "@lwrjs/asset-registry": "0.7.0-alpha.10",
+        "@lwrjs/asset-transformer": "0.7.0-alpha.10",
+        "@lwrjs/base-template-engine": "0.7.0-alpha.10",
+        "@lwrjs/base-view-provider": "0.7.0-alpha.10",
+        "@lwrjs/base-view-transformer": "0.7.0-alpha.10",
+        "@lwrjs/client-modules": "0.7.0-alpha.10",
+        "@lwrjs/compiler": "0.7.0-alpha.10",
+        "@lwrjs/diagnostics": "0.7.0-alpha.10",
+        "@lwrjs/fs-asset-provider": "0.7.0-alpha.10",
+        "@lwrjs/html-view-provider": "0.7.0-alpha.10",
+        "@lwrjs/loader": "0.7.0-alpha.10",
+        "@lwrjs/lwc-module-provider": "0.7.0-alpha.10",
+        "@lwrjs/lwc-ssr": "0.7.0-alpha.10",
+        "@lwrjs/markdown-view-provider": "0.7.0-alpha.10",
+        "@lwrjs/module-bundler": "0.7.0-alpha.10",
+        "@lwrjs/module-registry": "0.7.0-alpha.10",
+        "@lwrjs/npm-module-provider": "0.7.0-alpha.10",
+        "@lwrjs/nunjucks-view-provider": "0.7.0-alpha.10",
+        "@lwrjs/o11y": "0.7.0-alpha.10",
+        "@lwrjs/resource-registry": "0.7.0-alpha.10",
+        "@lwrjs/router": "0.7.0-alpha.10",
+        "@lwrjs/server": "0.7.0-alpha.10",
+        "@lwrjs/shared-utils": "0.7.0-alpha.10",
+        "@lwrjs/view-registry": "0.7.0-alpha.10",
         "dompurify": "^2.3.0",
         "fs-extra": "^10.0.0",
         "jsdom": "^16.7.0",
@@ -67,12 +67,13 @@
         "qs": "^6.9.4"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.5"
+        "@lwrjs/types": "0.7.0-alpha.10"
     },
     "peerDependencies": {
         "lwc": ">= 1.x <= 2.x"
     },
     "engines": {
         "node": ">=14.15.4 <17"
-    }
+    },
+    "gitHead": "83c1e65e2169094cb55ac2c37e5aef16d3a9aa4a"
 }

package/runtime-configs/compat.json

@@ -6,5 +6,8 @@
     "watchFiles": true,
     "defaultLocale": "en_US",
     "hmrEnabled": false,
-    "immutableAssets": false
+    "immutableAssets": false,
+    "env": {
+        "NODE_ENV": "development"
+    }
 }

package/runtime-configs/dev.json

@@ -6,5 +6,8 @@
     "watchFiles": true,
     "defaultLocale": "en_US",
     "hmrEnabled": true,
-    "immutableAssets": false
+    "immutableAssets": false,
+    "env": {
+        "NODE_ENV": "development"
+    }
 }

package/runtime-configs/prod-compat.json

@@ -6,5 +6,8 @@
     "watchFiles": false,
     "defaultLocale": "en_US",
     "hmrEnabled": false,
-    "immutableAssets": true
+    "immutableAssets": true,
+    "env": {
+        "NODE_ENV": "production"
+    }
 }

package/runtime-configs/prod.json

@@ -6,5 +6,8 @@
     "watchFiles": false,
     "defaultLocale": "en_US",
     "hmrEnabled": false,
-    "immutableAssets": true
+    "immutableAssets": true,
+    "env": {
+        "NODE_ENV": "production"
+    }
 }