@lwrjs/core 0.7.0-alpha.6 → 0.7.0-alpha.7

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,7 +248,7 @@ 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 {
@@ -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,19 +306,26 @@ 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) {
+  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,
+      endpoints,
       ...featureFlags
     };
   }

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
      */

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

@@ -1,9 +1,10 @@
 import { performance } from 'perf_hooks';
-import { getSpecifier, getFeatureFlags, 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,7 +349,7 @@ 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);
         }
@@ -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,14 +453,22 @@ export default class SiteGenerator {
     /**
      * Create a new site config for the current view
      */
-    createSiteConfig(outputDir, locale, urlRewriteMap) {
+    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,
+            endpoints,
             // Only include LEGACY_LOADER if true
             ...featureFlags,
         };

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

@@ -42,5 +42,6 @@ export interface SiteConfig {
     importMetadata?: ViewImportMetadata;
     viewConfigPath?: string;
     featureFlags?: FeatureFlags;
+    legacyDefaultMappingEndpoint?: string;
 }
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.7.0-alpha.6",
+    "version": "0.7.0-alpha.7",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,31 +33,31 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.7.0-alpha.6",
-        "@lwrjs/asset-registry": "0.7.0-alpha.6",
-        "@lwrjs/asset-transformer": "0.7.0-alpha.6",
-        "@lwrjs/base-template-engine": "0.7.0-alpha.6",
-        "@lwrjs/base-view-provider": "0.7.0-alpha.6",
-        "@lwrjs/base-view-transformer": "0.7.0-alpha.6",
-        "@lwrjs/client-modules": "0.7.0-alpha.6",
-        "@lwrjs/compiler": "0.7.0-alpha.6",
-        "@lwrjs/diagnostics": "0.7.0-alpha.6",
-        "@lwrjs/fs-asset-provider": "0.7.0-alpha.6",
-        "@lwrjs/html-view-provider": "0.7.0-alpha.6",
-        "@lwrjs/loader": "0.7.0-alpha.6",
-        "@lwrjs/lwc-module-provider": "0.7.0-alpha.6",
-        "@lwrjs/lwc-ssr": "0.7.0-alpha.6",
-        "@lwrjs/markdown-view-provider": "0.7.0-alpha.6",
-        "@lwrjs/module-bundler": "0.7.0-alpha.6",
-        "@lwrjs/module-registry": "0.7.0-alpha.6",
-        "@lwrjs/npm-module-provider": "0.7.0-alpha.6",
-        "@lwrjs/nunjucks-view-provider": "0.7.0-alpha.6",
-        "@lwrjs/o11y": "0.7.0-alpha.6",
-        "@lwrjs/resource-registry": "0.7.0-alpha.6",
-        "@lwrjs/router": "0.7.0-alpha.6",
-        "@lwrjs/server": "0.7.0-alpha.6",
-        "@lwrjs/shared-utils": "0.7.0-alpha.6",
-        "@lwrjs/view-registry": "0.7.0-alpha.6",
+        "@lwrjs/app-service": "0.7.0-alpha.7",
+        "@lwrjs/asset-registry": "0.7.0-alpha.7",
+        "@lwrjs/asset-transformer": "0.7.0-alpha.7",
+        "@lwrjs/base-template-engine": "0.7.0-alpha.7",
+        "@lwrjs/base-view-provider": "0.7.0-alpha.7",
+        "@lwrjs/base-view-transformer": "0.7.0-alpha.7",
+        "@lwrjs/client-modules": "0.7.0-alpha.7",
+        "@lwrjs/compiler": "0.7.0-alpha.7",
+        "@lwrjs/diagnostics": "0.7.0-alpha.7",
+        "@lwrjs/fs-asset-provider": "0.7.0-alpha.7",
+        "@lwrjs/html-view-provider": "0.7.0-alpha.7",
+        "@lwrjs/loader": "0.7.0-alpha.7",
+        "@lwrjs/lwc-module-provider": "0.7.0-alpha.7",
+        "@lwrjs/lwc-ssr": "0.7.0-alpha.7",
+        "@lwrjs/markdown-view-provider": "0.7.0-alpha.7",
+        "@lwrjs/module-bundler": "0.7.0-alpha.7",
+        "@lwrjs/module-registry": "0.7.0-alpha.7",
+        "@lwrjs/npm-module-provider": "0.7.0-alpha.7",
+        "@lwrjs/nunjucks-view-provider": "0.7.0-alpha.7",
+        "@lwrjs/o11y": "0.7.0-alpha.7",
+        "@lwrjs/resource-registry": "0.7.0-alpha.7",
+        "@lwrjs/router": "0.7.0-alpha.7",
+        "@lwrjs/server": "0.7.0-alpha.7",
+        "@lwrjs/shared-utils": "0.7.0-alpha.7",
+        "@lwrjs/view-registry": "0.7.0-alpha.7",
         "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.7.0-alpha.6"
+        "@lwrjs/types": "0.7.0-alpha.7"
     },
     "peerDependencies": {
         "lwc": ">= 1.x <= 2.x"
@@ -75,5 +75,5 @@
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "d536e1f978f13c4fa171b5f643f61a876e746da0"
+    "gitHead": "37d42307c304716834ce39944d5677e95d04a63a"
 }