@lwrjs/core 0.8.0-alpha.0 → 0.8.0-alpha.10

package/build/cjs/context/hooks.cjs

@@ -27,7 +27,7 @@ __export(exports, {
   runConfigurationsHook: () => runConfigurationsHook
 });
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var import_app_config = __toModule(require("../validation/app-config.cjs"));
+var import_config = __toModule(require("@lwrjs/config"));
 function normalizeRoutesBootstrap({routes, errorRoutes}) {
   [...routes, ...errorRoutes].forEach((route) => {
     if (!route.bootstrap) {
@@ -40,7 +40,7 @@ async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig, runtime
     await hookPlugin.initConfigs(lwrConfig, dataConfig, runtimeConfig);
   }
   try {
-    (0, import_app_config.validateLwrAppConfig)(JSON.stringify(lwrConfig), "post");
+    (0, import_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");

package/build/cjs/index.cjs

@@ -36,7 +36,7 @@ var import_resource_registry = __toModule(require("@lwrjs/resource-registry"));
 var import_asset_registry = __toModule(require("@lwrjs/asset-registry"));
 var import_view_registry = __toModule(require("@lwrjs/view-registry"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
-var import_env_config = __toModule(require("./env-config.cjs"));
+var import_config = __toModule(require("@lwrjs/config"));
 var import_lwr_app_observer = __toModule(require("./lwr-app-observer.cjs"));
 var import_locale_middleware = __toModule(require("./middlewares/locale-middleware.cjs"));
 var import_api_middleware = __toModule(require("./middlewares/api-middleware.cjs"));
@@ -69,7 +69,7 @@ async function initContext(app, server, 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),
+    ...(0, import_config.explodeMode)(serverMode),
     apiVersion,
     basePath,
     lwrVersion,
@@ -95,7 +95,7 @@ async function initContext(app, server, rawLwrConfig) {
     appEmitter,
     runtimeEnvironment: runtimeConfig
   }, lwrConfig);
-  const moduleBundler = new import_module_bundler.LwrModuleBundler({moduleRegistry, appObserver}, lwrConfig);
+  const moduleBundler = new import_module_bundler.LwrModuleBundler({compiler, moduleRegistry, appObserver}, lwrConfig);
   const resourceRegistry = new import_resource_registry.LwrResourceRegistry();
   const viewRegistry = new import_view_registry.LwrViewRegistry({
     moduleRegistry,
@@ -186,13 +186,13 @@ async function initContext(app, server, rawLwrConfig) {
 var LwrApp = class {
   constructor(config) {
     this.initialized = false;
-    this.config = (0, import_env_config.normalizeConfig)(config);
+    this.config = (0, import_config.normalizeConfig)(config);
     const {basePath} = this.config;
     this.app = (0, import_server.createInternalServer)(this.config.serverType, {basePath});
     this.server = this.app.createHttpServer();
   }
   setConfig(config) {
-    this.config = (0, import_env_config.normalizeConfig)(config);
+    this.config = (0, import_config.normalizeConfig)(config);
   }
   getConfig() {
     return this.config;

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

@@ -29,14 +29,14 @@ __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"));
+var import_config = __toModule(require("@lwrjs/config"));
 async function warmupServer(config, internalRequestKey) {
   console.log("[Server Warmup] starting");
   const {routes, staticSiteGenerator, port, apiVersion, basePath, lwrVersion, serverMode} = config;
   staticSiteGenerator.outputDir = import_dir.skipDirCreation;
   const urlRewriteMap = new Map();
   const runtimeEnvironment = {
-    ...(0, import_env_config.explodeMode)(serverMode),
+    ...(0, import_config.explodeMode)(serverMode),
     apiVersion,
     basePath,
     lwrVersion,

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

@@ -33,7 +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 import_config = __toModule(require("@lwrjs/config"));
 var SiteGenerator = class {
   async buildStaticApplication(config, dispatcher) {
     const startTime = import_perf_hooks.performance.now();
@@ -48,7 +48,7 @@ var SiteGenerator = class {
     const urlRewriteMap = new Map();
     const {apiVersion, basePath, lwrVersion, serverMode} = config;
     const runtimeEnvironment = {
-      ...(0, import_env_config.explodeMode)(serverMode),
+      ...(0, import_config.explodeMode)(serverMode),
       apiVersion,
       basePath,
       lwrVersion,
@@ -101,8 +101,8 @@ var SiteGenerator = class {
     const {visitedUrls} = siteConfig;
     if (!visitedUrls.has(url)) {
       visitedUrls.add(url);
-      if (url.indexOf("/:") !== -1) {
-        console.error("Skipped url with variable path segment: " + url);
+      if (url.indexOf("/:") !== -1 || url.indexOf("*") !== -1) {
+        console.error("Skipped generation of url with variable path segment: " + url);
         return;
       }
       let context;
@@ -181,10 +181,17 @@ var SiteGenerator = class {
   }
   async handleHtmlResource(url, context, siteConfig, dispatcher) {
     const {outputDir} = siteConfig;
-    const dir = (0, import_dir.createResourceDir)(url, outputDir);
-    const localeDir = (0, import_dir.createResourceDir)(url, (0, import_path.join)(outputDir, siteConfig.locale));
-    const filePath = (0, import_path.join)(dir, "index.html");
-    const fileLocalePath = (0, import_path.join)(localeDir, "index.html");
+    let fileName = "index.html";
+    let directoryPath = url;
+    if (url.endsWith(".html") || url.endsWith(".xml")) {
+      const lastPathIndex = url.lastIndexOf("/") + 1;
+      fileName = url.substring(lastPathIndex, url.length);
+      directoryPath = url.substring(0, lastPathIndex);
+    }
+    const dir = (0, import_dir.createResourceDir)(directoryPath, outputDir);
+    const localeDir = (0, import_dir.createResourceDir)(directoryPath, (0, import_path.join)(outputDir, siteConfig.locale));
+    const filePath = (0, import_path.join)(dir, fileName);
+    const fileLocalePath = (0, import_path.join)(localeDir, fileName);
     if (siteConfig.locale.toLowerCase().startsWith("en")) {
       siteConfig.viewPaths.add(filePath);
       await (0, import_stream.writeResponse)(context, filePath);
@@ -397,6 +404,8 @@ var ViewImportMetadataImpl = class {
   }
   mergeImportMetadata(targetImportMetdadata, newImportMetadata) {
     Object.assign(targetImportMetdadata.imports, newImportMetadata.imports);
-    Object.assign(targetImportMetdadata.index, newImportMetadata.index);
+    if (targetImportMetdadata.index) {
+      Object.assign(targetImportMetdadata.index, newImportMetadata.index || {});
+    }
   }
 };

package/build/es/context/hooks.js

@@ -1,5 +1,5 @@
 import { DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
-import { validateLwrAppConfig } from '../validation/app-config.js';
+import { validateLwrAppConfig } from '@lwrjs/config';
 // Add missing bootstrap objects to routes
 function normalizeRoutesBootstrap({ routes, errorRoutes }) {
     [...routes, ...errorRoutes].forEach((route) => {

package/build/es/index.js

@@ -6,7 +6,7 @@ import { LwrResourceRegistry } from '@lwrjs/resource-registry';
 import { LwrAssetRegistry } from '@lwrjs/asset-registry';
 import { LwrViewRegistry } from '@lwrjs/view-registry';
 import { LwrServerError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
-import { normalizeConfig, explodeMode } from './env-config.js';
+import { normalizeConfig, explodeMode } from '@lwrjs/config';
 import { LwrApplicationObserver } from './lwr-app-observer.js';
 import localeMiddleware from './middlewares/locale-middleware.js';
 import apiMiddleware from './middlewares/api-middleware.js';
@@ -70,7 +70,7 @@ async function initContext(app, server, rawLwrConfig) {
         appEmitter,
         runtimeEnvironment: runtimeConfig,
     }, lwrConfig);
-    const moduleBundler = new LwrModuleBundler({ moduleRegistry, appObserver }, lwrConfig);
+    const moduleBundler = new LwrModuleBundler({ compiler, moduleRegistry, appObserver }, lwrConfig);
     const resourceRegistry = new LwrResourceRegistry();
     const viewRegistry = new LwrViewRegistry({
         moduleRegistry,

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

@@ -1,7 +1,7 @@
 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';
+import { explodeMode } from '@lwrjs/config';
 export async function warmupServer(config, internalRequestKey) {
     console.log('[Server Warmup] starting');
     const { routes, staticSiteGenerator, port, apiVersion, basePath, lwrVersion, serverMode } = config;

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

@@ -4,7 +4,7 @@ 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';
+import { explodeMode } from '@lwrjs/config';
 export default class SiteGenerator {
     /**
      * Build a static site in the configured directory
@@ -108,8 +108,8 @@ export default class SiteGenerator {
             visitedUrls.add(url); // Maintain a list of visited urls here to avoid potential infinite loops
             // Skip urls with path segment variables (i.e. '/custom/:bar')
             // Users can specify specific urls via the '_additionalRoutePaths' config property
-            if (url.indexOf('/:') !== -1) {
-                console.error('Skipped url with variable path segment: ' + url);
+            if (url.indexOf('/:') !== -1 || url.indexOf('*') !== -1) {
+                console.error('Skipped generation of url with variable path segment: ' + url);
                 return;
             }
             // Generate resource
@@ -253,14 +253,24 @@ export default class SiteGenerator {
      */
     async handleHtmlResource(url, context, siteConfig, dispatcher) {
         const { outputDir } = siteConfig;
-        const dir = createResourceDir(url, outputDir);
-        const localeDir = createResourceDir(url, join(outputDir, siteConfig.locale));
-        // TODO: We assume HTML, revisit this in the future
-        // This fails for routes configured with non-html file extensions.
-        // Example Route: "path": "/mixed_templates.md", (Configured as '/mixed_templates' would work)
+        let fileName = 'index.html';
+        let directoryPath = url;
+        // If we have a route path that ends with a html or xml file extension,
+        // use that last path segment for the file name
+        if (url.endsWith('.html') || url.endsWith('.xml')) {
+            const lastPathIndex = url.lastIndexOf('/') + 1;
+            fileName = url.substring(lastPathIndex, url.length);
+            directoryPath = url.substring(0, lastPathIndex);
+        }
+        const dir = createResourceDir(directoryPath, outputDir);
+        const localeDir = createResourceDir(directoryPath, join(outputDir, siteConfig.locale));
+        // TODO: Should we handle routes with non-html extensions differently?
+        // Example Route: "path": "/mixed_templates.md" (not sure why you would do this)
         //                "contentTemplate": "$contentDir/composed_markdown.md"
-        const filePath = join(dir, 'index.html');
-        const fileLocalePath = join(localeDir, 'index.html');
+        // Today this will get written to  /mixed_templates.md/index.html
+        // Which we workaround by setting "renderSingle": true in serve.json
+        const filePath = join(dir, fileName);
+        const fileLocalePath = join(localeDir, fileName);
         // Default Path (only write once)
         // The default locale is english
         if (siteConfig.locale.toLowerCase().startsWith('en')) {
@@ -566,7 +576,9 @@ export class ViewImportMetadataImpl {
      */
     mergeImportMetadata(targetImportMetdadata, newImportMetadata) {
         Object.assign(targetImportMetdadata.imports, newImportMetadata.imports);
-        Object.assign(targetImportMetdadata.index, newImportMetadata.index);
+        if (targetImportMetdadata.index) {
+            Object.assign(targetImportMetdadata.index, newImportMetadata.index || {});
+        }
     }
 }
 //# sourceMappingURL=static-generation.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.8.0-alpha.0",
+    "version": "0.8.0-alpha.10",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -29,43 +29,42 @@
         "build/**/*.js",
         "build/**/*.cjs",
         "build/**/*.d.ts",
-        "runtime-configs",
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.8.0-alpha.0",
-        "@lwrjs/asset-registry": "0.8.0-alpha.0",
-        "@lwrjs/asset-transformer": "0.8.0-alpha.0",
-        "@lwrjs/base-template-engine": "0.8.0-alpha.0",
-        "@lwrjs/base-view-provider": "0.8.0-alpha.0",
-        "@lwrjs/base-view-transformer": "0.8.0-alpha.0",
-        "@lwrjs/client-modules": "0.8.0-alpha.0",
-        "@lwrjs/compiler": "0.8.0-alpha.0",
-        "@lwrjs/diagnostics": "0.8.0-alpha.0",
-        "@lwrjs/fs-asset-provider": "0.8.0-alpha.0",
-        "@lwrjs/html-view-provider": "0.8.0-alpha.0",
-        "@lwrjs/loader": "0.8.0-alpha.0",
-        "@lwrjs/lwc-module-provider": "0.8.0-alpha.0",
-        "@lwrjs/lwc-ssr": "0.8.0-alpha.0",
-        "@lwrjs/markdown-view-provider": "0.8.0-alpha.0",
-        "@lwrjs/module-bundler": "0.8.0-alpha.0",
-        "@lwrjs/module-registry": "0.8.0-alpha.0",
-        "@lwrjs/npm-module-provider": "0.8.0-alpha.0",
-        "@lwrjs/nunjucks-view-provider": "0.8.0-alpha.0",
-        "@lwrjs/o11y": "0.8.0-alpha.0",
-        "@lwrjs/resource-registry": "0.8.0-alpha.0",
-        "@lwrjs/router": "0.8.0-alpha.0",
-        "@lwrjs/server": "0.8.0-alpha.0",
-        "@lwrjs/shared-utils": "0.8.0-alpha.0",
-        "@lwrjs/view-registry": "0.8.0-alpha.0",
+        "@lwrjs/app-service": "0.8.0-alpha.10",
+        "@lwrjs/asset-registry": "0.8.0-alpha.10",
+        "@lwrjs/asset-transformer": "0.8.0-alpha.10",
+        "@lwrjs/base-template-engine": "0.8.0-alpha.10",
+        "@lwrjs/base-view-provider": "0.8.0-alpha.10",
+        "@lwrjs/base-view-transformer": "0.8.0-alpha.10",
+        "@lwrjs/client-modules": "0.8.0-alpha.10",
+        "@lwrjs/compiler": "0.8.0-alpha.10",
+        "@lwrjs/config": "0.8.0-alpha.10",
+        "@lwrjs/diagnostics": "0.8.0-alpha.10",
+        "@lwrjs/fs-asset-provider": "0.8.0-alpha.10",
+        "@lwrjs/html-view-provider": "0.8.0-alpha.10",
+        "@lwrjs/loader": "0.8.0-alpha.10",
+        "@lwrjs/lwc-module-provider": "0.8.0-alpha.10",
+        "@lwrjs/lwc-ssr": "0.8.0-alpha.10",
+        "@lwrjs/markdown-view-provider": "0.8.0-alpha.10",
+        "@lwrjs/module-bundler": "0.8.0-alpha.10",
+        "@lwrjs/module-registry": "0.8.0-alpha.10",
+        "@lwrjs/npm-module-provider": "0.8.0-alpha.10",
+        "@lwrjs/nunjucks-view-provider": "0.8.0-alpha.10",
+        "@lwrjs/o11y": "0.8.0-alpha.10",
+        "@lwrjs/resource-registry": "0.8.0-alpha.10",
+        "@lwrjs/router": "0.8.0-alpha.10",
+        "@lwrjs/server": "0.8.0-alpha.10",
+        "@lwrjs/shared-utils": "0.8.0-alpha.10",
+        "@lwrjs/view-registry": "0.8.0-alpha.10",
         "fs-extra": "^10.1.0",
-        "jsonc-parser": "^3.0.0",
         "ms": "^2.1.3",
         "path-to-regexp": "^6.2.0",
         "qs": "^6.9.4"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.8.0-alpha.0"
+        "@lwrjs/types": "0.8.0-alpha.10"
     },
     "peerDependencies": {
         "lwc": ">= 1.x <= 2.x"
@@ -73,5 +72,5 @@
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "2e1f60ed13f9f8079f1333af9b614cd24715f3ad"
+    "gitHead": "55922351f484d77784d86ef7b03ebe788fa3e12c"
 }