@lwrjs/core 0.6.0 → 0.6.4

package/build/cjs/env-config.cjs

@@ -36,6 +36,7 @@ var import_app_config = __toModule(require("./validation/app-config.cjs"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var PORT = process.env.PORT ? parseInt(process.env.PORT, 10) : 3e3;
 var MODE = process.env.MODE || "dev";
+var DEFAULT_BASE_PATH = "";
 var DEFAULT_API_VERSION = "1";
 var LWR_VERSION = import_package.version;
 var DEFAULT_SERVER_TYPE = "express";
@@ -91,6 +92,7 @@ var DEFAULT_LWR_CONFIG = {
   port: PORT,
   ignoreLwrConfigFile: false,
   lwrConfigFile: DEFAULT_LWR_CONFIG_JSON,
+  basePath: DEFAULT_BASE_PATH,
   rootDir: DEFAULT_ROOT_DIR,
   cacheDir: DEFAULT_CACHE_FOLDER,
   serverMode: MODE,

package/build/cjs/index.cjs

@@ -66,11 +66,12 @@ function initMiddlewares(app, server, serverContext) {
   }
 }
 async function initContext(app, server, rawLwrConfig) {
-  const {apiVersion, lwrVersion, serverMode, globalDataDir, globalData} = rawLwrConfig;
+  const {apiVersion, basePath, lwrVersion, serverMode, globalDataDir, globalData} = rawLwrConfig;
   const rawDataConfig = (0, import_global_data.getGlobalData)(globalDataDir, globalData);
   const rawRuntimeEnvConfig = {
     ...(0, import_env_config.explodeMode)(serverMode),
     apiVersion,
+    basePath,
     lwrVersion,
     debug: false,
     serverMode,
@@ -159,6 +160,7 @@ async function initContext(app, server, rawLwrConfig) {
       routes,
       errorRoutes,
       rootDir,
+      basePath,
       contentDir,
       layoutsDir,
       locker,
@@ -185,7 +187,8 @@ var LwrApp = class {
   constructor(config) {
     this.initialized = false;
     this.config = (0, import_env_config.normalizeConfig)(config);
-    this.app = (0, import_server.createInternalServer)(this.config.serverType);
+    const {basePath} = this.config;
+    this.app = (0, import_server.createInternalServer)(this.config.serverType, {basePath});
     this.server = this.app.createHttpServer();
   }
   setConfig(config) {

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

@@ -332,11 +332,13 @@ function apiMiddleware(app, context) {
   });
   app.all("/:apiVersion/:assetType/:immutable?/s/:signature/" + app.getRegexWildcard(), async (req, res) => {
     const {runtimeEnvironment} = req.getRuntimeContext(defaultRuntimeEnvironment);
+    const {basePath} = runtimeEnvironment;
     const {signature} = req.params;
     const {immutable, assetType: type} = req.params;
     const specifier = req.params[0] ? `/${req.params[0]}` : req.originalUrl;
+    const basePathSpecifier = `${basePath}${specifier}`;
     try {
-      const assetObj = await context.assetRegistry.getAsset({specifier, signature, type}, runtimeEnvironment);
+      const assetObj = await context.assetRegistry.getAsset({specifier: basePathSpecifier, signature, type}, runtimeEnvironment);
       if (immutable) {
       }
       if (assetObj.mime) {

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) => {
@@ -235,8 +237,6 @@ var SiteGenerator = class {
         } else {
           console.warn('[WARN] Unable to fetch mapping for bare specifier or variable dynamic import: "' + jsUri + '"');
         }
-      } else {
-        console.warn('[WARN] Unable to resolve bare specifier or variable dynamic import: "' + jsUri + '"');
       }
     }
   }

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

@@ -63,6 +63,7 @@ var ROOT_ATTRIBUTE_KEYS = createKeys("root", [
   "lwrVersion",
   "moduleProviders",
   "port",
+  "basePath",
   "resourceProviders",
   "rootDir",
   "routes",

package/build/es/env-config.js

@@ -7,6 +7,7 @@ import { validateLwrAppConfig } from './validation/app-config.js';
 import { LwrConfigValidationError } from '@lwrjs/diagnostics';
 const PORT = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
 const MODE = process.env.MODE || 'dev';
+const DEFAULT_BASE_PATH = '';
 const DEFAULT_API_VERSION = '1';
 const LWR_VERSION = version;
 const DEFAULT_SERVER_TYPE = 'express';
@@ -66,6 +67,7 @@ const DEFAULT_LWR_CONFIG = {
     port: PORT,
     ignoreLwrConfigFile: false,
     lwrConfigFile: DEFAULT_LWR_CONFIG_JSON,
+    basePath: DEFAULT_BASE_PATH,
     rootDir: DEFAULT_ROOT_DIR,
     cacheDir: DEFAULT_CACHE_FOLDER,
     serverMode: MODE,

package/build/es/index.js

@@ -41,11 +41,12 @@ function initMiddlewares(app, server, serverContext) {
     }
 }
 async function initContext(app, server, rawLwrConfig) {
-    const { apiVersion, lwrVersion, serverMode, globalDataDir, globalData } = rawLwrConfig;
+    const { apiVersion, basePath, lwrVersion, serverMode, globalDataDir, globalData } = rawLwrConfig;
     const rawDataConfig = getGlobalData(globalDataDir, globalData);
     const rawRuntimeEnvConfig = {
         ...explodeMode(serverMode),
         apiVersion,
+        basePath,
         lwrVersion,
         debug: false,
         serverMode,
@@ -119,6 +120,7 @@ async function initContext(app, server, rawLwrConfig) {
             routes,
             errorRoutes,
             rootDir,
+            basePath,
             contentDir,
             layoutsDir,
             locker,
@@ -150,7 +152,8 @@ export class LwrApp {
     constructor(config) {
         this.initialized = false;
         this.config = normalizeConfig(config);
-        this.app = createInternalServer(this.config.serverType);
+        const { basePath } = this.config;
+        this.app = createInternalServer(this.config.serverType, { basePath });
         this.server = this.app.createHttpServer();
     }
     setConfig(config) {

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

@@ -380,11 +380,13 @@ export default function apiMiddleware(app, context) {
     // Koa routing (Path-To-RegExp) breaks compatibility with Express routing & asterisk wildcards
     app.all('/:apiVersion/:assetType/:immutable?/s/:signature/' + app.getRegexWildcard(), async (req, res) => {
         const { runtimeEnvironment } = req.getRuntimeContext(defaultRuntimeEnvironment);
+        const { basePath } = runtimeEnvironment;
         const { signature } = req.params;
         const { immutable, assetType: type } = req.params;
         const specifier = req.params[0] ? `/${req.params[0]}` : req.originalUrl;
+        const basePathSpecifier = `${basePath}${specifier}`;
         try {
-            const assetObj = await context.assetRegistry.getAsset({ specifier, signature, type: type }, runtimeEnvironment);
+            const assetObj = await context.assetRegistry.getAsset({ specifier: basePathSpecifier, signature, type: type }, runtimeEnvironment);
             if (immutable) {
                 // WIP: ?
             }

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

@@ -1,3 +1,4 @@
+import { performance } from 'perf_hooks';
 import { getSpecifier, getExperimentalFeatures, hashContent } from '@lwrjs/shared-utils';
 import { join, dirname, extname } from 'path';
 import fs from 'fs-extra';
@@ -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
@@ -336,9 +339,6 @@ export default class SiteGenerator {
                         '"');
                 }
             }
-            else {
-                console.warn('[WARN] Unable to resolve bare specifier or variable dynamic import: "' + jsUri + '"');
-            }
         }
     }
     /**

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

@@ -15,7 +15,7 @@ interface ConfigMap {
     bootstrap: NormalizedLwrAppBootstrapConfig;
     locker: RequiredLwrLockerConfig;
 }
-export declare const ROOT_ATTRIBUTE_KEYS: ["amdLoader", "apiVersion", "assets", "assetProviders", "assetTransformers", "bundleConfig", "cacheDir", "contentDir", "environment", "errorRoutes", "esmLoader", "staticSiteGenerator", "globalData", "globalDataDir", "hooks", "ignoreLwrConfigFile", "lwrConfigFile", "layoutsDir", "locker", "lwc", "lwrVersion", "moduleProviders", "port", "resourceProviders", "rootDir", "routes", "serverMode", "serverType", "templateEngine", "viewProviders", "viewTransformers"];
+export declare const ROOT_ATTRIBUTE_KEYS: ["amdLoader", "apiVersion", "assets", "assetProviders", "assetTransformers", "bundleConfig", "cacheDir", "contentDir", "environment", "errorRoutes", "esmLoader", "staticSiteGenerator", "globalData", "globalDataDir", "hooks", "ignoreLwrConfigFile", "lwrConfigFile", "layoutsDir", "locker", "lwc", "lwrVersion", "moduleProviders", "port", "basePath", "resourceProviders", "rootDir", "routes", "serverMode", "serverType", "templateEngine", "viewProviders", "viewTransformers"];
 export declare const ASSET_DIR_ATTRIBUTE_KEYS: ["alias", "dir", "urlPath"];
 export declare const ASSET_FILE_ATTRIBUTE_KEYS: ["alias", "file", "urlPath"];
 export declare const LOCKER_ATTRIBUTE_KEYS: ["enabled", "trustedComponents", "clientOnly"];

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

@@ -30,6 +30,7 @@ export const ROOT_ATTRIBUTE_KEYS = createKeys('root', [
     'lwrVersion',
     'moduleProviders',
     'port',
+    'basePath',
     'resourceProviders',
     'rootDir',
     'routes',

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0",
+    "version": "0.6.4",
     "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",
-        "@lwrjs/asset-registry": "0.6.0",
-        "@lwrjs/asset-transformer": "0.6.0",
-        "@lwrjs/base-template-engine": "0.6.0",
-        "@lwrjs/base-view-provider": "0.6.0",
-        "@lwrjs/base-view-transformer": "0.6.0",
-        "@lwrjs/client-modules": "0.6.0",
-        "@lwrjs/compiler": "0.6.0",
-        "@lwrjs/diagnostics": "0.6.0",
-        "@lwrjs/fs-asset-provider": "0.6.0",
-        "@lwrjs/html-view-provider": "0.6.0",
-        "@lwrjs/loader": "0.6.0",
-        "@lwrjs/lwc-module-provider": "0.6.0",
-        "@lwrjs/lwc-ssr": "0.6.0",
-        "@lwrjs/markdown-view-provider": "0.6.0",
-        "@lwrjs/module-bundler": "0.6.0",
-        "@lwrjs/module-registry": "0.6.0",
-        "@lwrjs/npm-module-provider": "0.6.0",
-        "@lwrjs/nunjucks-view-provider": "0.6.0",
-        "@lwrjs/o11y": "0.6.0",
-        "@lwrjs/resource-registry": "0.6.0",
-        "@lwrjs/router": "0.6.0",
-        "@lwrjs/server": "0.6.0",
-        "@lwrjs/shared-utils": "0.6.0",
-        "@lwrjs/view-registry": "0.6.0",
+        "@lwrjs/app-service": "0.6.4",
+        "@lwrjs/asset-registry": "0.6.4",
+        "@lwrjs/asset-transformer": "0.6.4",
+        "@lwrjs/base-template-engine": "0.6.4",
+        "@lwrjs/base-view-provider": "0.6.4",
+        "@lwrjs/base-view-transformer": "0.6.4",
+        "@lwrjs/client-modules": "0.6.4",
+        "@lwrjs/compiler": "0.6.4",
+        "@lwrjs/diagnostics": "0.6.4",
+        "@lwrjs/fs-asset-provider": "0.6.4",
+        "@lwrjs/html-view-provider": "0.6.4",
+        "@lwrjs/loader": "0.6.4",
+        "@lwrjs/lwc-module-provider": "0.6.4",
+        "@lwrjs/lwc-ssr": "0.6.4",
+        "@lwrjs/markdown-view-provider": "0.6.4",
+        "@lwrjs/module-bundler": "0.6.4",
+        "@lwrjs/module-registry": "0.6.4",
+        "@lwrjs/npm-module-provider": "0.6.4",
+        "@lwrjs/nunjucks-view-provider": "0.6.4",
+        "@lwrjs/o11y": "0.6.4",
+        "@lwrjs/resource-registry": "0.6.4",
+        "@lwrjs/router": "0.6.4",
+        "@lwrjs/server": "0.6.4",
+        "@lwrjs/shared-utils": "0.6.4",
+        "@lwrjs/view-registry": "0.6.4",
         "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"
+        "@lwrjs/types": "0.6.4"
     },
     "peerDependencies": {
         "lwc": ">= 1.x <= 2.x"
@@ -75,5 +75,5 @@
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "31769655f0155ad7e54cf37bccdf72d0baaf44ab"
+    "gitHead": "80b73fe4558dc3db0afcdbe80eb17f5a1464e34e"
 }