@lwrjs/core 0.7.2 → 0.7.3

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

@@ -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);

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

@@ -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')) {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.7.2",
+    "version": "0.7.3",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,31 +33,31 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.7.2",
-        "@lwrjs/asset-registry": "0.7.2",
-        "@lwrjs/asset-transformer": "0.7.2",
-        "@lwrjs/base-template-engine": "0.7.2",
-        "@lwrjs/base-view-provider": "0.7.2",
-        "@lwrjs/base-view-transformer": "0.7.2",
-        "@lwrjs/client-modules": "0.7.2",
-        "@lwrjs/compiler": "0.7.2",
-        "@lwrjs/diagnostics": "0.7.2",
-        "@lwrjs/fs-asset-provider": "0.7.2",
-        "@lwrjs/html-view-provider": "0.7.2",
-        "@lwrjs/loader": "0.7.2",
-        "@lwrjs/lwc-module-provider": "0.7.2",
-        "@lwrjs/lwc-ssr": "0.7.2",
-        "@lwrjs/markdown-view-provider": "0.7.2",
-        "@lwrjs/module-bundler": "0.7.2",
-        "@lwrjs/module-registry": "0.7.2",
-        "@lwrjs/npm-module-provider": "0.7.2",
-        "@lwrjs/nunjucks-view-provider": "0.7.2",
-        "@lwrjs/o11y": "0.7.2",
-        "@lwrjs/resource-registry": "0.7.2",
-        "@lwrjs/router": "0.7.2",
-        "@lwrjs/server": "0.7.2",
-        "@lwrjs/shared-utils": "0.7.2",
-        "@lwrjs/view-registry": "0.7.2",
+        "@lwrjs/app-service": "0.7.3",
+        "@lwrjs/asset-registry": "0.7.3",
+        "@lwrjs/asset-transformer": "0.7.3",
+        "@lwrjs/base-template-engine": "0.7.3",
+        "@lwrjs/base-view-provider": "0.7.3",
+        "@lwrjs/base-view-transformer": "0.7.3",
+        "@lwrjs/client-modules": "0.7.3",
+        "@lwrjs/compiler": "0.7.3",
+        "@lwrjs/diagnostics": "0.7.3",
+        "@lwrjs/fs-asset-provider": "0.7.3",
+        "@lwrjs/html-view-provider": "0.7.3",
+        "@lwrjs/loader": "0.7.3",
+        "@lwrjs/lwc-module-provider": "0.7.3",
+        "@lwrjs/lwc-ssr": "0.7.3",
+        "@lwrjs/markdown-view-provider": "0.7.3",
+        "@lwrjs/module-bundler": "0.7.3",
+        "@lwrjs/module-registry": "0.7.3",
+        "@lwrjs/npm-module-provider": "0.7.3",
+        "@lwrjs/nunjucks-view-provider": "0.7.3",
+        "@lwrjs/o11y": "0.7.3",
+        "@lwrjs/resource-registry": "0.7.3",
+        "@lwrjs/router": "0.7.3",
+        "@lwrjs/server": "0.7.3",
+        "@lwrjs/shared-utils": "0.7.3",
+        "@lwrjs/view-registry": "0.7.3",
         "fs-extra": "^10.1.0",
         "jsonc-parser": "^3.0.0",
         "ms": "^2.1.3",
@@ -65,7 +65,7 @@
         "qs": "^6.9.4"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.7.2"
+        "@lwrjs/types": "0.7.3"
     },
     "peerDependencies": {
         "lwc": ">= 1.x <= 2.x"
@@ -73,5 +73,5 @@
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "1467a95aa5dcf6901e1122f6025ffd4f22237a3f"
+    "gitHead": "579f94fac6c6c923dcab1e51d9d9169af7fedd1d"
 }