@lwrjs/core 0.6.0-alpha.15 → 0.6.0-alpha.16

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

@@ -159,9 +159,11 @@ var SiteGenerator = class {
     const filePath = (0, import_path.join)(dir, "index.html");
     const fileLocalePath = (0, import_path.join)(localeDir, "index.html");
     if (siteConfig.locale.toLowerCase().startsWith("en")) {
+      siteConfig.viewPaths.add(filePath);
       await (0, import_stream.writeResponse)(context, filePath);
     }
     (0, import_dir.createDir)(localeDir);
+    siteConfig.viewPaths.add(fileLocalePath);
     await (0, import_stream.writeResponse)(context, fileLocalePath);
     const viewDefinition = context.fs?.metadata?.viewDefinition;
     if (viewDefinition) {
@@ -286,6 +288,7 @@ var SiteGenerator = class {
     const experimentalFeatures = this.filterExperimentalFeatures();
     return {
       outputDir,
+      viewPaths: new Set(),
       visitedUrls: new Set(),
       locale,
       urlRewriteMap,
@@ -309,13 +312,26 @@ var SiteGenerator = class {
       const index = additionalImportMetadata.index ? JSON.stringify(additionalImportMetadata.index) : "{}";
       const initIndex = `if (!globalThis.LWR.index) { globalThis.LWR.index = {}; }`;
       const mergeIndex = `Object.assign(globalThis.LWR.index, ${index})`;
-      import_fs_extra.default.appendFileSync(siteConfig.viewConfigPath, `
+      const oldConfig = import_fs_extra.default.readFileSync(siteConfig.viewConfigPath, "utf-8");
+      const newConfig = `${oldConfig}
 // Appended by Static Site Generator
 ${initImports}
 ${mergeImports}
 ${initIndex}
 ${mergeIndex}
-`);
+`;
+      const configHash = (0, import_shared_utils.hashContent)(newConfig);
+      const sigRegex = /\/s\/[a-z0-9]+\/config\.js/i;
+      const configSuffix = `/s/${configHash}/config.js`;
+      const newConfigPath = siteConfig.viewConfigPath.replace(sigRegex, configSuffix);
+      import_fs_extra.default.mkdirSync((0, import_path.dirname)(newConfigPath), {recursive: true});
+      import_fs_extra.default.writeFileSync(newConfigPath, newConfig, "utf-8");
+      import_fs_extra.default.rmSync(siteConfig.viewConfigPath);
+      siteConfig.viewPaths.forEach((path) => {
+        const oldDoc = import_fs_extra.default.readFileSync(path, "utf-8");
+        const newDoc = oldDoc.toString().replace(sigRegex, configSuffix);
+        import_fs_extra.default.writeFileSync(path, newDoc, "utf-8");
+      });
     }
   }
 };

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

@@ -1,4 +1,4 @@
-import { getSpecifier, getExperimentalFeatures } from '@lwrjs/shared-utils';
+import { getSpecifier, getExperimentalFeatures, hashContent } from '@lwrjs/shared-utils';
 import { join, dirname, extname } from 'path';
 import fs from 'fs-extra';
 import { writeResponse } from './utils/stream.js';
@@ -230,10 +230,12 @@ export default class SiteGenerator {
         // Default Path (only write once)
         // The default locale is english
         if (siteConfig.locale.toLowerCase().startsWith('en')) {
+            siteConfig.viewPaths.add(filePath);
             await writeResponse(context, filePath);
         }
         // Language path (always write out)
         createDir(localeDir);
+        siteConfig.viewPaths.add(fileLocalePath);
         await writeResponse(context, fileLocalePath);
         // Get the metadata
         const viewDefinition = context.fs?.metadata?.viewDefinition;
@@ -418,6 +420,7 @@ export default class SiteGenerator {
         const experimentalFeatures = this.filterExperimentalFeatures();
         return {
             outputDir,
+            viewPaths: new Set(),
             visitedUrls: new Set(),
             locale,
             urlRewriteMap,
@@ -443,6 +446,7 @@ export default class SiteGenerator {
             siteConfig.viewConfigPath &&
             additionalImportMetadata?.imports &&
             Object.keys(additionalImportMetadata.imports).length > 0) {
+            // Build and stringify the new import metadata
             const imports = additionalImportMetadata.imports
                 ? JSON.stringify(additionalImportMetadata.imports)
                 : '{}';
@@ -453,7 +457,23 @@ export default class SiteGenerator {
                 : '{}';
             const initIndex = `if (!globalThis.LWR.index) { globalThis.LWR.index = {}; }`;
             const mergeIndex = `Object.assign(globalThis.LWR.index, ${index})`;
-            fs.appendFileSync(siteConfig.viewConfigPath, `\n// Appended by Static Site Generator\n${initImports}\n${mergeImports}\n${initIndex}\n${mergeIndex}\n`);
+            // Read in the old config and append the new import metadata
+            const oldConfig = fs.readFileSync(siteConfig.viewConfigPath, 'utf-8');
+            const newConfig = `${oldConfig}\n// Appended by Static Site Generator\n${initImports}\n${mergeImports}\n${initIndex}\n${mergeIndex}\n`;
+            const configHash = hashContent(newConfig);
+            // Write the updated config to a new filepath containing its hash signature, and delete the old config
+            const sigRegex = /\/s\/[a-z0-9]+\/config\.js/i;
+            const configSuffix = `/s/${configHash}/config.js`;
+            const newConfigPath = siteConfig.viewConfigPath.replace(sigRegex, configSuffix);
+            fs.mkdirSync(dirname(newConfigPath), { recursive: true }); // we know this dir does not exist
+            fs.writeFileSync(newConfigPath, newConfig, 'utf-8');
+            fs.rmSync(siteConfig.viewConfigPath);
+            // Update the config script src in the view document(s)
+            siteConfig.viewPaths.forEach((path) => {
+                const oldDoc = fs.readFileSync(path, 'utf-8');
+                const newDoc = oldDoc.toString().replace(sigRegex, configSuffix);
+                fs.writeFileSync(path, newDoc, 'utf-8');
+            });
         }
     }
 }

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

@@ -34,6 +34,7 @@ export interface ViewImportMetadata {
 }
 export interface SiteConfig {
     outputDir: string;
+    viewPaths: Set<string>;
     visitedUrls: Set<string>;
     locale: string;
     urlRewriteMap: Map<string, string>;

package/package.json

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