@lwrjs/core 0.6.0-alpha.8 → 0.6.1

package/build/cjs/context/hooks.cjs

@@ -39,7 +39,16 @@ async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig, runtime
   for (const hookPlugin of hookPlugins) {
     await hookPlugin.initConfigs(lwrConfig, dataConfig, runtimeConfig);
   }
-  (0, import_app_config.validateLwrAppConfig)(JSON.stringify(lwrConfig), "post");
+  try {
+    (0, import_app_config.validateLwrAppConfig)(JSON.stringify(lwrConfig), "post");
+  } catch (e) {
+    if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === "true") {
+      console.warn("ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution");
+      console.dir(e, {depth: null});
+    } else {
+      throw e;
+    }
+  }
   normalizeRoutesBootstrap(lwrConfig);
   return {
     lwrConfig,

package/build/cjs/env-config.cjs

@@ -80,7 +80,13 @@ var DEFAULT_LWR_MODULES = [
   {npm: "@lwrjs/router"},
   {npm: "@lwc/synthetic-shadow"}
 ];
-var DEFAULT_BUNDLE_EXCLUSIONS = ["lwc", "@lwc/synthetic-shadow", "lwr/navigation", "lwr/esmLoader"];
+var DEFAULT_BUNDLE_EXCLUSIONS = [
+  "lwc",
+  "@lwc/synthetic-shadow",
+  "lwr/navigation",
+  "lwr/esmLoader",
+  "lwr/profiler"
+];
 var DEFAULT_LWR_CONFIG = {
   port: PORT,
   ignoreLwrConfigFile: false,
@@ -120,11 +126,18 @@ function createCacheFolder(cache, rootDir) {
 function getLwrConfigFromFile(rootDir, customDir = DEFAULT_LWR_CONFIG_JSON) {
   const lwrConfigPath = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(customDir, rootDir));
   if (import_fs.default.existsSync(lwrConfigPath)) {
+    const configAsString = (0, import_shared_utils.readFile)(lwrConfigPath);
     try {
-      return (0, import_app_config.validateLwrAppConfig)((0, import_shared_utils.readFile)(lwrConfigPath), "file");
+      return (0, import_app_config.validateLwrAppConfig)(configAsString, "file");
     } catch (e) {
       if (e instanceof import_diagnostics.LwrConfigValidationError) {
-        throw e;
+        if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === "true") {
+          console.warn("ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution");
+          console.dir(e, {depth: null});
+          return JSON.parse(configAsString);
+        } else {
+          throw e;
+        }
       }
       return void 0;
     }
@@ -217,7 +230,7 @@ function mergeLWCConfigs(config1, config2) {
   };
 }
 function mergeBundleConfig(jsonConfig, config) {
-  const defaultExclusions = DEFAULT_BUNDLE_EXCLUSIONS;
+  const defaultExclusions = config?.bundleConfig?.UNSAFE_lwrDefaultExclude || jsonConfig?.bundleConfig?.UNSAFE_lwrDefaultExclude || DEFAULT_BUNDLE_EXCLUSIONS;
   const configExclusions = config?.bundleConfig?.exclude || jsonConfig?.bundleConfig?.exclude || [];
   return {
     ...jsonConfig?.bundleConfig,
@@ -259,7 +272,16 @@ function trimLwrConfig(config) {
 function normalizeConfig(config) {
   if (config !== void 0) {
     config = trimLwrConfig(config);
-    (0, import_app_config.validateLwrAppConfig)(JSON.stringify(config), "pre");
+    try {
+      (0, import_app_config.validateLwrAppConfig)(JSON.stringify(config), "pre");
+    } catch (e) {
+      if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === "true") {
+        console.warn("ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution");
+        console.dir(e, {depth: null});
+      } else {
+        throw e;
+      }
+    }
   }
   const rootDir = import_path.default.resolve(config?.rootDir || DEFAULT_ROOT_DIR);
   const lwrJsonConfig = config?.ignoreLwrConfigFile === true ? void 0 : getLwrConfigFromFile(rootDir, config?.lwrConfigFile);

package/build/cjs/index.cjs

@@ -229,6 +229,15 @@ var LwrApp = class {
   getInternalServer() {
     return this.app.getImpl();
   }
+  getServer() {
+    return {
+      use: this.app.use.bind(this.app),
+      all: this.app.all.bind(this.app),
+      get: this.app.get.bind(this.app),
+      post: this.app.post.bind(this.app),
+      getRegexWildcard: this.app.getRegexWildcard.bind(this.app)
+    };
+  }
 };
 function createServer(config) {
   return new LwrApp(config);
@@ -236,6 +245,10 @@ function createServer(config) {
 async function generateStaticSite(config) {
   config = config || {};
   config.serverType = "fs";
+  const {serverMode} = config;
+  if (serverMode === "dev" || serverMode === "compat") {
+    console.warn("[WARN] static generation in `dev` or `compat` mode is currently not fully supported");
+  }
   const lwrApp = createServer(config);
   overrideConfigAsSrc(lwrApp);
   await lwrApp.init();

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

@@ -127,17 +127,12 @@ function apiMiddleware(app, context) {
         const {entry} = await moduleRegistry.getModuleEntry(importerModuleId);
         moduleId = {...moduleId, importer: entry};
       }
-      const {format, compat, locale, apiVersion} = req.params;
       const {ownHash, moduleEntry} = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
       if (ownHash) {
-        const localeSegment = locale ? `/l/${locale}` : "";
-        const uriSpecifier = encodeURIComponent((0, import_shared_utils.getSpecifier)({
-          specifier: moduleEntry.specifier,
-          version: (0, import_shared_utils.normalizeVersionToUri)(moduleEntry.version)
-        }));
-        const jsonQuery = req.isJsonRequest() ? "?json" : "";
+        const jsonQuery = req.isJsonRequest() ? `${ctx.runtimeEnvironment.debug ? "&" : "?"}json` : "";
+        const uri = await moduleRegistry.resolveModuleUri({...moduleId, version: moduleEntry.version}, ctx.runtimeEnvironment, ctx.runtimeParams, ownHash);
         res.set({
-          Location: `/${apiVersion}/bundle/${format}/${compat}${localeSegment}/bi/0/module/mi/${uriSpecifier}/s/${ownHash}/${moduleId.specifier.replace(/\//g, "_")}${jsonQuery}`
+          Location: `${uri}${jsonQuery}`
         });
         res.sendStatus(302);
       }
@@ -241,17 +236,12 @@ function apiMiddleware(app, context) {
         const {entry} = await moduleRegistry.getModuleEntry(importerModuleId);
         moduleId = {...moduleId, importer: entry};
       }
-      const {format, compat, locale, apiVersion} = req.params;
       const {ownHash, moduleEntry} = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
       if (ownHash) {
-        const localeSegment = locale ? `/l/${locale}` : "";
-        const uriSpecifier = encodeURIComponent((0, import_shared_utils.getSpecifier)({
-          specifier: moduleEntry.specifier,
-          version: (0, import_shared_utils.normalizeVersionToUri)(moduleEntry.version)
-        }));
-        const jsonQuery = req.isJsonRequest() ? "?json" : "";
+        const jsonQuery = req.isJsonRequest() ? `${ctx.runtimeEnvironment.debug ? "&" : "?"}json` : "";
+        const uri = await moduleRegistry.resolveModuleUri({...moduleId, version: moduleEntry.version}, ctx.runtimeEnvironment, ctx.runtimeParams, ownHash);
         res.set({
-          Location: `/${apiVersion}/module/${format}/${compat}${localeSegment}/mi/${uriSpecifier}/s/${ownHash}/${moduleId.specifier.replace(/\//g, "_")}${jsonQuery}`
+          Location: `${uri}${jsonQuery}`
         });
         res.sendStatus(302);
       }

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

@@ -27,6 +27,7 @@ __export(exports, {
   ViewImportMetadataImpl: () => ViewImportMetadataImpl,
   default: () => static_generation_default
 });
+var import_perf_hooks = __toModule(require("perf_hooks"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
@@ -34,6 +35,7 @@ var import_stream = __toModule(require("./utils/stream.cjs"));
 var import_dir = __toModule(require("./utils/dir.cjs"));
 var SiteGenerator = class {
   async buildStaticApplication(config, dispatcher) {
+    const startTime = import_perf_hooks.performance.now();
     console.log("[Static Generation] starting");
     const {routes, staticSiteGenerator, rootDir, assets} = config;
     if (!staticSiteGenerator.outputDir) {
@@ -46,27 +48,27 @@ var SiteGenerator = class {
     await this.generateRoutes(staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap);
     this.writeNetlifyRedirectConfig(outputDir, urlRewriteMap);
     this.copyAssets(assets, outputDir);
-    console.log("[Static Generation] complete");
+    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()) {
     if (!staticSiteGenerator.locales) {
       staticSiteGenerator.locales = ["en-US"];
     }
-    const dispatchRequests = [];
     const generateUrl = this.createGenerateURLFunction(dispatcher);
     for (const locale of staticSiteGenerator.locales) {
       for (const route of routes) {
         const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap);
-        dispatchRequests.push(generateUrl(route.path, siteConfig));
+        await generateUrl(route.path, siteConfig);
       }
       if (staticSiteGenerator._additionalRoutePaths) {
         for (const uri of staticSiteGenerator._additionalRoutePaths) {
           const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap);
-          dispatchRequests.push(generateUrl(uri, siteConfig));
+          await generateUrl(uri, siteConfig);
         }
       }
     }
-    await Promise.all(dispatchRequests);
   }
   createGenerateURLFunction(dispatcher) {
     const generateRoute = async (uri, siteConfig) => {
@@ -108,20 +110,21 @@ var SiteGenerator = class {
     await (0, import_stream.writeResponse)(context, fullPath);
     const dispatchRequests = [];
     if (normalizedUrl.indexOf("/s/") !== -1) {
-      const rewriteUrl = normalizedUrl.substring(0, normalizedUrl.indexOf("/s/"));
-      siteConfig.urlRewriteMap.set(rewriteUrl, normalizedUrl);
+      siteConfig.urlRewriteMap.set(normalizedUrl.substring(0, normalizedUrl.indexOf("/s/")), normalizedUrl);
       siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf("/s/")), normalizedUrl);
+      siteConfig.urlRewriteMap.set(normalizedUrl.substring(0, normalizedUrl.indexOf("/v/")), normalizedUrl);
+      siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf("%2Fv%2F")), normalizedUrl);
     }
     const moduleDefinition = context.fs?.metadata?.moduleDefinition;
     if (moduleDefinition) {
       const imports = moduleDefinition.linkedModuleRecord?.imports || moduleDefinition.bundleRecord?.imports || [];
       for (const importModule of imports) {
-        const jsUri = (0, import_shared_utils.getSpecifier)(importModule);
+        const jsUri = importModule.specifier.startsWith("/") ? importModule.specifier : (0, import_shared_utils.getSpecifier)(importModule);
         dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
       }
       const dynamicImports = moduleDefinition.linkedModuleRecord?.dynamicImports || moduleDefinition.bundleRecord?.dynamicImports || [];
       for (const importModule of dynamicImports) {
-        const jsUri = (0, import_shared_utils.getSpecifier)(importModule);
+        const jsUri = importModule.specifier.startsWith("/") ? importModule.specifier : (0, import_shared_utils.getSpecifier)(importModule);
         dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
       }
     }
@@ -158,9 +161,11 @@ var SiteGenerator = class {
     const filePath = (0, import_path.join)(dir, "index.html");
     const fileLocalePath = (0, import_path.join)(localeDir, "index.html");
     if (siteConfig.locale.toLowerCase().startsWith("en")) {
+      siteConfig.viewPaths.add(filePath);
       await (0, import_stream.writeResponse)(context, filePath);
     }
     (0, import_dir.createDir)(localeDir);
+    siteConfig.viewPaths.add(fileLocalePath);
     await (0, import_stream.writeResponse)(context, fileLocalePath);
     const viewDefinition = context.fs?.metadata?.viewDefinition;
     if (viewDefinition) {
@@ -285,6 +290,7 @@ var SiteGenerator = class {
     const experimentalFeatures = this.filterExperimentalFeatures();
     return {
       outputDir,
+      viewPaths: new Set(),
       visitedUrls: new Set(),
       locale,
       urlRewriteMap,
@@ -308,13 +314,26 @@ var SiteGenerator = class {
       const index = additionalImportMetadata.index ? JSON.stringify(additionalImportMetadata.index) : "{}";
       const initIndex = `if (!globalThis.LWR.index) { globalThis.LWR.index = {}; }`;
       const mergeIndex = `Object.assign(globalThis.LWR.index, ${index})`;
-      import_fs_extra.default.appendFileSync(siteConfig.viewConfigPath, `
+      const oldConfig = import_fs_extra.default.readFileSync(siteConfig.viewConfigPath, "utf-8");
+      const newConfig = `${oldConfig}
 // Appended by Static Site Generator
 ${initImports}
 ${mergeImports}
 ${initIndex}
 ${mergeIndex}
-`);
+`;
+      const configHash = (0, import_shared_utils.hashContent)(newConfig);
+      const sigRegex = /\/s\/[a-z0-9]+\/config\.js/i;
+      const configSuffix = `/s/${configHash}/config.js`;
+      const newConfigPath = siteConfig.viewConfigPath.replace(sigRegex, configSuffix);
+      import_fs_extra.default.mkdirSync((0, import_path.dirname)(newConfigPath), {recursive: true});
+      import_fs_extra.default.writeFileSync(newConfigPath, newConfig, "utf-8");
+      import_fs_extra.default.rmSync(siteConfig.viewConfigPath);
+      siteConfig.viewPaths.forEach((path) => {
+        const oldDoc = import_fs_extra.default.readFileSync(path, "utf-8");
+        const newDoc = oldDoc.toString().replace(sigRegex, configSuffix);
+        import_fs_extra.default.writeFileSync(path, newDoc, "utf-8");
+      });
     }
   }
 };

package/build/es/context/hooks.js

@@ -13,7 +13,19 @@ export async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig,
         // eslint-disable-next-line no-await-in-loop
         await hookPlugin.initConfigs(lwrConfig, dataConfig, runtimeConfig);
     }
-    validateLwrAppConfig(JSON.stringify(lwrConfig), 'post');
+    try {
+        validateLwrAppConfig(JSON.stringify(lwrConfig), 'post');
+    }
+    catch (e) {
+        // TODO: temporary workaround for https://github.com/salesforce/lwr/issues/825
+        if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === 'true') {
+            console.warn('ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution');
+            console.dir(e, { depth: null });
+        }
+        else {
+            throw e;
+        }
+    }
     normalizeRoutesBootstrap(lwrConfig);
     return {
         lwrConfig,

package/build/es/env-config.js

@@ -54,7 +54,13 @@ const DEFAULT_LWR_MODULES = [
     { npm: '@lwrjs/router' },
     { npm: '@lwc/synthetic-shadow' },
 ];
-const DEFAULT_BUNDLE_EXCLUSIONS = ['lwc', '@lwc/synthetic-shadow', 'lwr/navigation', 'lwr/esmLoader'];
+const DEFAULT_BUNDLE_EXCLUSIONS = [
+    'lwc',
+    '@lwc/synthetic-shadow',
+    'lwr/navigation',
+    'lwr/esmLoader',
+    'lwr/profiler',
+];
 // Default config objects
 const DEFAULT_LWR_CONFIG = {
     port: PORT,
@@ -95,12 +101,21 @@ function createCacheFolder(cache, rootDir) {
 function getLwrConfigFromFile(rootDir, customDir = DEFAULT_LWR_CONFIG_JSON) {
     const lwrConfigPath = path.resolve(normalizeDirectory(customDir, rootDir));
     if (fs.existsSync(lwrConfigPath)) {
+        const configAsString = readFile(lwrConfigPath);
         try {
-            return validateLwrAppConfig(readFile(lwrConfigPath), 'file');
+            return validateLwrAppConfig(configAsString, 'file');
         }
         catch (e) {
             if (e instanceof LwrConfigValidationError) {
-                throw e;
+                // TODO: temporary workaround for https://github.com/salesforce/lwr/issues/825
+                if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === 'true') {
+                    console.warn('ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution');
+                    console.dir(e, { depth: null });
+                    return JSON.parse(configAsString);
+                }
+                else {
+                    throw e;
+                }
             }
             return undefined;
         }
@@ -202,7 +217,9 @@ function mergeLWCConfigs(config1, config2) {
 }
 // merge default bundle exclusions with any bundle exclusions specified in config
 function mergeBundleConfig(jsonConfig, config) {
-    const defaultExclusions = DEFAULT_BUNDLE_EXCLUSIONS;
+    const defaultExclusions = config?.bundleConfig?.UNSAFE_lwrDefaultExclude ||
+        jsonConfig?.bundleConfig?.UNSAFE_lwrDefaultExclude ||
+        DEFAULT_BUNDLE_EXCLUSIONS;
     const configExclusions = config?.bundleConfig?.exclude || jsonConfig?.bundleConfig?.exclude || [];
     return {
         ...jsonConfig?.bundleConfig,
@@ -260,7 +277,19 @@ function trimLwrConfig(config) {
 export function normalizeConfig(config) {
     if (config !== undefined) {
         config = trimLwrConfig(config);
-        validateLwrAppConfig(JSON.stringify(config), 'pre');
+        try {
+            validateLwrAppConfig(JSON.stringify(config), 'pre');
+        }
+        catch (e) {
+            // TODO: temporary workaround for https://github.com/salesforce/lwr/issues/825
+            if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === 'true') {
+                console.warn('ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution');
+                console.dir(e, { depth: null });
+            }
+            else {
+                throw e;
+            }
+        }
     }
     // Merge all configurations together, and return
     const rootDir = path.resolve(config?.rootDir || DEFAULT_ROOT_DIR);

package/build/es/index.d.ts

@@ -1,4 +1,4 @@
-import { LwrGlobalConfig, NormalizedLwrGlobalConfig, ServerTypeImpl, ServerTypes } from '@lwrjs/types';
+import { LwrGlobalConfig, NormalizedLwrGlobalConfig, ServerTypeImpl, PublicAppServer, ServerTypes } from '@lwrjs/types';
 export declare class LwrApp {
     private app;
     private server;
@@ -14,6 +14,7 @@ export declare class LwrApp {
     }) => void) | undefined): Promise<void>;
     close(): Promise<void>;
     getInternalServer<S extends ServerTypes>(): ServerTypeImpl<S>;
+    getServer(): PublicAppServer<ServerTypes>;
 }
 export declare function createServer(config?: LwrGlobalConfig): LwrApp;
 export declare function generateStaticSite(config?: LwrGlobalConfig): Promise<void>;

package/build/es/index.js

@@ -193,9 +193,20 @@ export class LwrApp {
     async close() {
         this.server?.close && (await this.server.close());
     }
+    // Get the underlying server (e.g. express, koa...)
     getInternalServer() {
         return this.app.getImpl();
     }
+    // Return the public server interface which is compatible with all server types
+    getServer() {
+        return {
+            use: this.app.use.bind(this.app),
+            all: this.app.all.bind(this.app),
+            get: this.app.get.bind(this.app),
+            post: this.app.post.bind(this.app),
+            getRegexWildcard: this.app.getRegexWildcard.bind(this.app),
+        };
+    }
 }
 export function createServer(config) {
     return new LwrApp(config);
@@ -203,6 +214,12 @@ export function createServer(config) {
 export async function generateStaticSite(config) {
     config = config || {};
     config.serverType = 'fs'; // override serverType
+    const { serverMode } = config;
+    if (serverMode === 'dev' || serverMode === 'compat') {
+        // TODO: dynamic imports are not generated in dev mode
+        // https://github.com/salesforce/lwr/issues/1111
+        console.warn('[WARN] static generation in `dev` or `compat` mode is currently not fully supported');
+    }
     const lwrApp = createServer(config);
     overrideConfigAsSrc(lwrApp);
     await lwrApp.init();

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

@@ -1,5 +1,5 @@
 import { LwrUnresolvableError, createSingleDiagnosticError as createDiagnostic, descriptions, } from '@lwrjs/diagnostics';
-import { LATEST_SIGNATURE, explodeSpecifier, getImportMetadataMappings, getSpecifier, normalizeVersionToUri, serializeModuleToJson, getModuleIdentity, getResourceIdentity, getAssetIdentity, getMappingIdentity, getVersionedModuleId, } from '@lwrjs/shared-utils';
+import { LATEST_SIGNATURE, explodeSpecifier, getImportMetadataMappings, serializeModuleToJson, getModuleIdentity, getResourceIdentity, getAssetIdentity, getMappingIdentity, getVersionedModuleId, } from '@lwrjs/shared-utils';
 import { createReturnStatus, isSupportedEnvironment } from './utils.js';
 export default function apiMiddleware(app, context) {
     const { appConfig: { environment: environmentConfig }, moduleRegistry, moduleBundler, resourceRegistry, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
@@ -118,20 +118,15 @@ export default function apiMiddleware(app, context) {
                 const { entry } = await moduleRegistry.getModuleEntry(importerModuleId);
                 moduleId = { ...moduleId, importer: entry };
             }
-            // const { ownHash, moduleEntry } = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
-            const { format, compat, locale, apiVersion } = req.params;
             const { ownHash, moduleEntry } = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
             if (ownHash) {
-                const localeSegment = locale ? `/l/${locale}` : '';
-                const uriSpecifier = encodeURIComponent(getSpecifier({
-                    specifier: moduleEntry.specifier,
-                    version: normalizeVersionToUri(moduleEntry.version),
-                })); // get specifier from registry, not req.params
-                const jsonQuery = req.isJsonRequest() ? '?json' : '';
+                const jsonQuery = req.isJsonRequest()
+                    ? `${ctx.runtimeEnvironment.debug ? '&' : '?'}json`
+                    : '';
+                const uri = await moduleRegistry.resolveModuleUri({ ...moduleId, version: moduleEntry.version }, ctx.runtimeEnvironment, ctx.runtimeParams, ownHash);
                 res.set({
                     // This redirects to a signed URI
-                    // A prettifier is added to the end so resources have a meaningful name in browser devtools
-                    Location: `/${apiVersion}/bundle/${format}/${compat}${localeSegment}/bi/0/module/mi/${uriSpecifier}/s/${ownHash}/${moduleId.specifier.replace(/\//g, '_')}${jsonQuery}`,
+                    Location: `${uri}${jsonQuery}`,
                 });
                 res.sendStatus(302);
             }
@@ -261,19 +256,15 @@ export default function apiMiddleware(app, context) {
                 moduleId = { ...moduleId, importer: entry };
             }
             // Get the module's signature from the registry
-            const { format, compat, locale, apiVersion } = req.params;
             const { ownHash, moduleEntry } = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
             if (ownHash) {
-                const localeSegment = locale ? `/l/${locale}` : '';
-                const uriSpecifier = encodeURIComponent(getSpecifier({
-                    specifier: moduleEntry.specifier,
-                    version: normalizeVersionToUri(moduleEntry.version),
-                })); // get specifier from registry, not req.params
-                const jsonQuery = req.isJsonRequest() ? '?json' : '';
+                const jsonQuery = req.isJsonRequest()
+                    ? `${ctx.runtimeEnvironment.debug ? '&' : '?'}json`
+                    : '';
+                const uri = await moduleRegistry.resolveModuleUri({ ...moduleId, version: moduleEntry.version }, ctx.runtimeEnvironment, ctx.runtimeParams, ownHash);
                 res.set({
                     // This redirects to a signed URI
-                    // A prettifier is added to the end so resources have a meaningful name in browser devtools
-                    Location: `/${apiVersion}/module/${format}/${compat}${localeSegment}/mi/${uriSpecifier}/s/${ownHash}/${moduleId.specifier.replace(/\//g, '_')}${jsonQuery}`,
+                    Location: `${uri}${jsonQuery}`,
                 });
                 res.sendStatus(302);
             }

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

@@ -1,4 +1,5 @@
-import { getSpecifier, getExperimentalFeatures } from '@lwrjs/shared-utils';
+import { performance } from 'perf_hooks';
+import { getSpecifier, getExperimentalFeatures, hashContent } from '@lwrjs/shared-utils';
 import { join, dirname, extname } from 'path';
 import fs from 'fs-extra';
 import { writeResponse } from './utils/stream.js';
@@ -13,6 +14,7 @@ export default class SiteGenerator {
      * @param dispatcher - Facilitate server requests
      */
     async buildStaticApplication(config, dispatcher) {
+        const startTime = performance.now();
         console.log('[Static Generation] starting');
         const { routes, staticSiteGenerator, rootDir, assets } = config;
         if (!staticSiteGenerator.outputDir) {
@@ -28,7 +30,9 @@ export default class SiteGenerator {
         this.writeNetlifyRedirectConfig(outputDir, urlRewriteMap);
         // Copy over assets
         this.copyAssets(assets, outputDir);
-        console.log('[Static Generation] complete');
+        const endTime = performance.now();
+        const timeDiff = (endTime - startTime) / 1000;
+        console.log(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
     }
     /**
      * Crawl all view routes for a site
@@ -37,25 +41,24 @@ export default class SiteGenerator {
         if (!staticSiteGenerator.locales) {
             staticSiteGenerator.locales = ['en-US'];
         }
-        // Build up a list of dispatch requests to kick off in parallel
-        const dispatchRequests = [];
         const generateUrl = this.createGenerateURLFunction(dispatcher);
+        // Note: generateUrl can consume a lot of memory so we need to do this sequentially
         for (const locale of staticSiteGenerator.locales) {
             // Generate all the routes
             for (const route of routes) {
                 const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap);
-                dispatchRequests.push(generateUrl(route.path, siteConfig));
+                // 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);
-                    dispatchRequests.push(generateUrl(uri, siteConfig));
+                    // eslint-disable-next-line no-await-in-loop
+                    await generateUrl(uri, siteConfig);
                 }
             }
         }
-        // -- Dispatch routes
-        await Promise.all(dispatchRequests);
     }
     /**
      * Creates a function to dispatch the root requests for a given view url
@@ -129,13 +132,20 @@ export default class SiteGenerator {
         const dispatchRequests = [];
         // Add URL re-writes for module redirects
         if (normalizedUrl.indexOf('/s/') !== -1) {
-            const rewriteUrl = normalizedUrl.substring(0, normalizedUrl.indexOf('/s/'));
-            // Redirect /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation/v/0_1_6 -> /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation/v/0_1_6/s/{signature}
-            siteConfig.urlRewriteMap.set(rewriteUrl, normalizedUrl);
-            // Redirect /1/bundle/amd/l/en-US/bi/0/module/mi/lwr%2Fnavigation%2Fv%2F0_1_6 -> /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation/v/0_1_6/s/{signature}
+            // Redirect unsigned to signed URIs
+            // e.g. /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6 -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            siteConfig.urlRewriteMap.set(normalizedUrl.substring(0, normalizedUrl.indexOf('/s/')), normalizedUrl);
+            // Redirect encoded signed URIs to UNencoded signed URIs
+            // e.g. /1/bundle/amd/l/en-US/bi/0/module/mi/c%2Fmodule%2Fv%2F0_1_6/s/{signature} -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
             siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf('/s/')), normalizedUrl);
-            // TODO Redirect /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation -> /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation/v/0_1_6/s/{signature}
-            // Dynamic import example /1/bundle/amd/l/en-US/bi/0/module/mi/dynamic%2Fmodule?importer=examples%2Fhome%2Fv%2F0_1_6
+            // Redirect unversioned/unsigned URIs to signed URIs
+            // e.g. /1/bundle/amd/l/en-US/bi/0/module/mi/c/module -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            // e.g. with importer /1/bundle/amd/l/en-US/bi/0/module/mi/c/module?importer=parent%2Fmodule%2Fv%2F2_1_0 -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            siteConfig.urlRewriteMap.set(normalizedUrl.substring(0, normalizedUrl.indexOf('/v/')), normalizedUrl);
+            // Redirect encoded unversioned/unsigned URIs to UNencoded signed URIs
+            // e.g. /1/bundle/amd/l/en-US/bi/0/module/mi/c%2Fmodule -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            // e.g. with importer /1/bundle/amd/l/en-US/bi/0/module/mi/c%2Fmodule?importer=parent%2Fmodule%2Fv%2F2_1_0 -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf('%2Fv%2F')), normalizedUrl);
         }
         // Recursively traverse dependencies
         const moduleDefinition = context.fs?.metadata?.moduleDefinition; // LinkedModuleDefinition | BundleDefinition
@@ -144,7 +154,9 @@ export default class SiteGenerator {
             const imports = moduleDefinition.linkedModuleRecord?.imports || moduleDefinition.bundleRecord?.imports || [];
             // /1/module/esm/0/l/en-US/mi/lwc
             for (const importModule of imports) {
-                const jsUri = getSpecifier(importModule);
+                const jsUri = importModule.specifier.startsWith('/')
+                    ? importModule.specifier
+                    : getSpecifier(importModule);
                 dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
             }
             // Dynamic imports
@@ -152,7 +164,9 @@ export default class SiteGenerator {
                 moduleDefinition.bundleRecord?.dynamicImports ||
                 [];
             for (const importModule of dynamicImports) {
-                const jsUri = getSpecifier(importModule);
+                const jsUri = importModule.specifier.startsWith('/')
+                    ? importModule.specifier
+                    : getSpecifier(importModule);
                 dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
             }
         }
@@ -219,10 +233,12 @@ export default class SiteGenerator {
         // Default Path (only write once)
         // The default locale is english
         if (siteConfig.locale.toLowerCase().startsWith('en')) {
+            siteConfig.viewPaths.add(filePath);
             await writeResponse(context, filePath);
         }
         // Language path (always write out)
         createDir(localeDir);
+        siteConfig.viewPaths.add(fileLocalePath);
         await writeResponse(context, fileLocalePath);
         // Get the metadata
         const viewDefinition = context.fs?.metadata?.viewDefinition;
@@ -407,6 +423,7 @@ export default class SiteGenerator {
         const experimentalFeatures = this.filterExperimentalFeatures();
         return {
             outputDir,
+            viewPaths: new Set(),
             visitedUrls: new Set(),
             locale,
             urlRewriteMap,
@@ -432,6 +449,7 @@ export default class SiteGenerator {
             siteConfig.viewConfigPath &&
             additionalImportMetadata?.imports &&
             Object.keys(additionalImportMetadata.imports).length > 0) {
+            // Build and stringify the new import metadata
             const imports = additionalImportMetadata.imports
                 ? JSON.stringify(additionalImportMetadata.imports)
                 : '{}';
@@ -442,7 +460,23 @@ export default class SiteGenerator {
                 : '{}';
             const initIndex = `if (!globalThis.LWR.index) { globalThis.LWR.index = {}; }`;
             const mergeIndex = `Object.assign(globalThis.LWR.index, ${index})`;
-            fs.appendFileSync(siteConfig.viewConfigPath, `\n// Appended by Static Site Generator\n${initImports}\n${mergeImports}\n${initIndex}\n${mergeIndex}\n`);
+            // Read in the old config and append the new import metadata
+            const oldConfig = fs.readFileSync(siteConfig.viewConfigPath, 'utf-8');
+            const newConfig = `${oldConfig}\n// Appended by Static Site Generator\n${initImports}\n${mergeImports}\n${initIndex}\n${mergeIndex}\n`;
+            const configHash = hashContent(newConfig);
+            // Write the updated config to a new filepath containing its hash signature, and delete the old config
+            const sigRegex = /\/s\/[a-z0-9]+\/config\.js/i;
+            const configSuffix = `/s/${configHash}/config.js`;
+            const newConfigPath = siteConfig.viewConfigPath.replace(sigRegex, configSuffix);
+            fs.mkdirSync(dirname(newConfigPath), { recursive: true }); // we know this dir does not exist
+            fs.writeFileSync(newConfigPath, newConfig, 'utf-8');
+            fs.rmSync(siteConfig.viewConfigPath);
+            // Update the config script src in the view document(s)
+            siteConfig.viewPaths.forEach((path) => {
+                const oldDoc = fs.readFileSync(path, 'utf-8');
+                const newDoc = oldDoc.toString().replace(sigRegex, configSuffix);
+                fs.writeFileSync(path, newDoc, 'utf-8');
+            });
         }
     }
 }

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

@@ -34,6 +34,7 @@ export interface ViewImportMetadata {
 }
 export interface SiteConfig {
     outputDir: string;
+    viewPaths: Set<string>;
     visitedUrls: Set<string>;
     locale: string;
     urlRewriteMap: Map<string, string>;

package/package.json

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