@lwrjs/core 0.6.1 → 0.6.5

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

@@ -237,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

@@ -339,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.1",
+    "version": "0.6.5",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,31 +33,31 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@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",
+        "@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",
         "dompurify": "^2.3.0",
         "fs-extra": "^10.0.0",
         "jsdom": "^16.7.0",
@@ -67,13 +67,12 @@
         "qs": "^6.9.4"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.1"
+        "@lwrjs/types": "0.6.5"
     },
     "peerDependencies": {
         "lwc": ">= 1.x <= 2.x"
     },
     "engines": {
         "node": ">=14.15.4 <17"
-    },
-    "gitHead": "4d7c44dfae958fe24ef1c94b0f60aa2b15e12f24"
+    }
 }

package/LICENSE

@@ -1,10 +0,0 @@
-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.