@lwrjs/core 0.8.0-alpha.11 → 0.8.0-alpha.13

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

@@ -342,7 +342,7 @@ function apiMiddleware(app, context) {
     const specifier = req.params[0] ? `/${req.params[0]}` : req.originalUrl;
     const basePathSpecifier = `${basePath}${specifier}`;
     try {
-      const assetObj = await context.assetRegistry.getAsset({specifier: basePathSpecifier, signature, type}, runtimeEnvironment);
+      const assetObj = await context.assetRegistry.getAsset({specifier: basePathSpecifier, signature, type}, runtimeEnvironment, req.isSiteGeneration());
       if (immutable) {
       }
       if (assetObj.mime) {

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

@@ -31,6 +31,7 @@ var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_view_registry = __toModule(require("@lwrjs/view-registry"));
 var import_utils = __toModule(require("./utils.cjs"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+var import_router = __toModule(require("@lwrjs/router"));
 function uiMiddleware(app, context) {
   const {viewRegistry, moduleRegistry, runtimeEnvironment: defaultRuntimeEnvironment} = context;
   const {environment: environmentConfig, routes, errorRoutes} = context.appConfig;
@@ -145,16 +146,25 @@ function uiMiddleware(app, context) {
         await sendViewResponse(req, res, route);
       });
     } else {
-      app.get(route.path, async (req, res) => {
-        await sendViewResponse(req, res, route);
-      });
-      app.get([
-        `/:apiVersion/application/:format/l/:locale/ai/:appId${route.path}`,
-        `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId${route.path}`,
-        `/:apiVersion/application/:format/ai/:appId${route.path}`,
-        `/:apiVersion/application/:format/e/:environment/ai/:appId${route.path}`
-      ], async (req, res) => {
-        await sendViewResponse(req, res, route);
+      const serverPath = route.path;
+      const paths = [serverPath];
+      const subRoutes = route.subRoutes ? (0, import_router.getClientRoutes)(route.subRoutes) : void 0;
+      if (subRoutes) {
+        const prefix = serverPath === "/" ? "" : serverPath;
+        subRoutes.routes.forEach((r) => paths.push(`${prefix}${r.uri}`));
+      }
+      paths.forEach((path) => {
+        app.get(path, async (req, res) => {
+          await sendViewResponse(req, res, route);
+        });
+        app.get([
+          `/:apiVersion/application/:format/l/:locale/ai/:appId${path}`,
+          `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId${path}`,
+          `/:apiVersion/application/:format/ai/:appId${path}`,
+          `/:apiVersion/application/:format/e/:environment/ai/:appId${path}`
+        ], async (req, res) => {
+          await sendViewResponse(req, res, route);
+        });
       });
     }
   });

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

@@ -117,7 +117,7 @@ var SiteGenerator = class {
       if (resourceType === "route") {
         await this.handleHtmlResource(url, context, siteConfig, dispatcher);
       } else if (resourceType === "asset" || resourceType === "resource") {
-        await this.handleAssetOrResource(url, context, siteConfig);
+        await this.handleAssetOrResource(url, context, siteConfig, dispatcher);
       } else if (resourceType == "mapping") {
         await this.handleMappingResource(url, context, siteConfig, dispatcher);
       } else if (resourceType === "js") {
@@ -212,7 +212,7 @@ var SiteGenerator = class {
     const assets = viewDefinition.viewRecord.assetReferences || [];
     for (const asset of assets) {
       const assetUrl = asset.override?.uri || asset.url;
-      if (assetUrl && !assetUrl.startsWith("data:")) {
+      if (assetUrl && !(0, import_shared_utils.isSelfUrl)(assetUrl)) {
         dispatchRequests.push(this.dispatchResourceRecursive(assetUrl, dispatcher, {resourceType: "asset", asset}, siteConfig));
       }
     }
@@ -274,9 +274,19 @@ var SiteGenerator = class {
       }
     }
   }
-  async handleAssetOrResource(url, context, siteConfig) {
+  async handleAssetOrResource(url, context, siteConfig, dispatcher) {
+    const metadata = context.fs?.metadata;
     const fullPath = this.getResourcePathFromUrl(siteConfig, url);
     await (0, import_stream.writeResponse)(context, fullPath);
+    const assetReferences = metadata?.asset?.metadata?.assetReferences || [];
+    const dispatchRequests = [];
+    for (const ref of assetReferences) {
+      const refUrl = ref.override?.uri || ref.url;
+      dispatchRequests.push(this.dispatchResourceRecursive(refUrl, dispatcher, {resourceType: "asset", asset: metadata?.asset}, siteConfig).catch((err) => {
+        import_shared_utils.logger.warn(`Failed to fetch asset refrence => ${refUrl} from ${url}`, err);
+      }));
+    }
+    return Promise.all(dispatchRequests);
   }
   getResourcePathFromUrl(siteConfig, url) {
     const {outputDir} = siteConfig;
@@ -310,7 +320,7 @@ var SiteGenerator = class {
         if (assetSrcDir && import_fs_extra.default.existsSync(assetSrcDir)) {
           import_fs_extra.default.copySync(assetSrcDir, assetOutputDir);
         } else {
-          throw new Error("Could not find assets to copy at path: " + assetSrcDir);
+          console.warn("[WARN] Could not find assets to copy at path: " + assetSrcDir);
         }
       } catch (e) {
         console.error("Error occurred processing asset config: " + JSON.stringify(asset));

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

@@ -390,7 +390,7 @@ export default function apiMiddleware(app, context) {
         const specifier = req.params[0] ? `/${req.params[0]}` : req.originalUrl;
         const basePathSpecifier = `${basePath}${specifier}`;
         try {
-            const assetObj = await context.assetRegistry.getAsset({ specifier: basePathSpecifier, signature, type: type }, runtimeEnvironment);
+            const assetObj = await context.assetRegistry.getAsset({ specifier: basePathSpecifier, signature, type: type }, runtimeEnvironment, req.isSiteGeneration());
             if (immutable) {
                 // WIP: ?
             }

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

@@ -3,6 +3,7 @@ import { DiagnosticsError } from '@lwrjs/diagnostics';
 import { LwrViewHandler } from '@lwrjs/view-registry';
 import { isSupportedEnvironment } from './utils.js';
 import { decodeViewPath, getClientBootstrapConfigurationRoutes, extractRequestParams, } from '@lwrjs/shared-utils';
+import { getClientRoutes } from '@lwrjs/router';
 export default function uiMiddleware(app, context) {
     const { viewRegistry, moduleRegistry, runtimeEnvironment: defaultRuntimeEnvironment } = context;
     const { environment: environmentConfig, routes, errorRoutes } = context.appConfig;
@@ -135,18 +136,30 @@ export default function uiMiddleware(app, context) {
             });
         }
         else {
-            // vanity urls
-            app.get(route.path, async (req, res) => {
-                await sendViewResponse(req, res, route);
-            });
-            // canonical URL
-            app.get([
-                `/:apiVersion/application/:format/l/:locale/ai/:appId${route.path}`,
-                `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId${route.path}`,
-                `/:apiVersion/application/:format/ai/:appId${route.path}`,
-                `/:apiVersion/application/:format/e/:environment/ai/:appId${route.path}`,
-            ], async (req, res) => {
-                await sendViewResponse(req, res, route);
+            // Get the client-side routes
+            const serverPath = route.path;
+            const paths = [serverPath];
+            const subRoutes = route.subRoutes ? getClientRoutes(route.subRoutes) : undefined;
+            if (subRoutes) {
+                // Concatenate each client uri to the server route.path, creating the full list of composite paths
+                const prefix = serverPath === '/' ? '' : serverPath;
+                subRoutes.routes.forEach((r) => paths.push(`${prefix}${r.uri}`));
+            }
+            // Register the server route.path and each composite client path, to enable full page refreshes of client pages
+            paths.forEach((path) => {
+                // vanity urls
+                app.get(path, async (req, res) => {
+                    await sendViewResponse(req, res, route);
+                });
+                // canonical URL
+                app.get([
+                    `/:apiVersion/application/:format/l/:locale/ai/:appId${path}`,
+                    `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId${path}`,
+                    `/:apiVersion/application/:format/ai/:appId${path}`,
+                    `/:apiVersion/application/:format/e/:environment/ai/:appId${path}`,
+                ], async (req, res) => {
+                    await sendViewResponse(req, res, route);
+                });
             });
         }
     });

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

@@ -1,5 +1,5 @@
 import { performance } from 'perf_hooks';
-import { getSpecifier, getFeatureFlags, hashContent, getModuleUriPrefix, getMappingUriPrefix, } from '@lwrjs/shared-utils';
+import { getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, logger, } from '@lwrjs/shared-utils';
 import { join, dirname, extname } from 'path';
 import fs from 'fs-extra';
 import { writeResponse } from './utils/stream.js';
@@ -129,7 +129,7 @@ export default class SiteGenerator {
                 // -- Process Assets (css, images, ...) && Resources (lwr-loader-shim ...)
             }
             else if (resourceType === 'asset' || resourceType === 'resource') {
-                await this.handleAssetOrResource(url, context, siteConfig);
+                await this.handleAssetOrResource(url, context, siteConfig, dispatcher);
                 // -- Import Metadata Mappings
             }
             else if (resourceType == 'mapping') {
@@ -306,8 +306,8 @@ export default class SiteGenerator {
         const assets = viewDefinition.viewRecord.assetReferences || [];
         for (const asset of assets) {
             const assetUrl = asset.override?.uri || asset.url;
-            // skip empty asset urls / data urls (i.e. <img src="" /> <img src="data:image/png;base64, iVBORw0..." />)
-            if (assetUrl && !assetUrl.startsWith('data:')) {
+            // skip self referential asset urls / data urls (i.e. <img src="" /> <img src="data:image/png;base64, iVBORw0..." />)
+            if (assetUrl && !isSelfUrl(assetUrl)) {
                 dispatchRequests.push(this.dispatchResourceRecursive(assetUrl, dispatcher, { resourceType: 'asset', asset }, siteConfig));
             }
         }
@@ -394,9 +394,21 @@ export default class SiteGenerator {
      * @param context - Response Context
      * @param siteConfig - Global metadata about the site
      */
-    async handleAssetOrResource(url, context, siteConfig) {
+    async handleAssetOrResource(url, context, siteConfig, dispatcher) {
+        const metadata = context.fs?.metadata;
         const fullPath = this.getResourcePathFromUrl(siteConfig, url);
         await writeResponse(context, fullPath);
+        // Call and referenced assets...
+        const assetReferences = metadata?.asset?.metadata?.assetReferences || [];
+        const dispatchRequests = [];
+        for (const ref of assetReferences) {
+            const refUrl = ref.override?.uri || ref.url;
+            dispatchRequests.push(this.dispatchResourceRecursive(refUrl, dispatcher, { resourceType: 'asset', asset: metadata?.asset }, siteConfig).catch((err) => {
+                // Warn the user that the we failed to fetch a referenced asset
+                logger.warn(`Failed to fetch asset refrence => ${refUrl} from ${url}`, err);
+            }));
+        }
+        return Promise.all(dispatchRequests);
     }
     getResourcePathFromUrl(siteConfig, url) {
         const { outputDir } = siteConfig;
@@ -451,7 +463,7 @@ export default class SiteGenerator {
                     fs.copySync(assetSrcDir, assetOutputDir);
                 }
                 else {
-                    throw new Error('Could not find assets to copy at path: ' + assetSrcDir);
+                    console.warn('[WARN] Could not find assets to copy at path: ' + assetSrcDir);
                 }
             }
             catch (e) {

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

@@ -8,7 +8,7 @@ export interface RouteResourceOpts extends BaseResourceContextOpts {
 }
 export interface AssetResourceOpts extends BaseResourceContextOpts {
     resourceType: 'asset';
-    asset: RenderedAssetReference;
+    asset?: RenderedAssetReference;
 }
 export interface JsResourceOpts extends BaseResourceContextOpts {
     resourceType: 'js';

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.8.0-alpha.11",
+    "version": "0.8.0-alpha.13",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -32,32 +32,32 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.8.0-alpha.11",
-        "@lwrjs/asset-registry": "0.8.0-alpha.11",
-        "@lwrjs/asset-transformer": "0.8.0-alpha.11",
-        "@lwrjs/base-template-engine": "0.8.0-alpha.11",
-        "@lwrjs/base-view-provider": "0.8.0-alpha.11",
-        "@lwrjs/base-view-transformer": "0.8.0-alpha.11",
-        "@lwrjs/client-modules": "0.8.0-alpha.11",
-        "@lwrjs/compiler": "0.8.0-alpha.11",
-        "@lwrjs/config": "0.8.0-alpha.11",
-        "@lwrjs/diagnostics": "0.8.0-alpha.11",
-        "@lwrjs/fs-asset-provider": "0.8.0-alpha.11",
-        "@lwrjs/html-view-provider": "0.8.0-alpha.11",
-        "@lwrjs/loader": "0.8.0-alpha.11",
-        "@lwrjs/lwc-module-provider": "0.8.0-alpha.11",
-        "@lwrjs/lwc-ssr": "0.8.0-alpha.11",
-        "@lwrjs/markdown-view-provider": "0.8.0-alpha.11",
-        "@lwrjs/module-bundler": "0.8.0-alpha.11",
-        "@lwrjs/module-registry": "0.8.0-alpha.11",
-        "@lwrjs/npm-module-provider": "0.8.0-alpha.11",
-        "@lwrjs/nunjucks-view-provider": "0.8.0-alpha.11",
-        "@lwrjs/o11y": "0.8.0-alpha.11",
-        "@lwrjs/resource-registry": "0.8.0-alpha.11",
-        "@lwrjs/router": "0.8.0-alpha.11",
-        "@lwrjs/server": "0.8.0-alpha.11",
-        "@lwrjs/shared-utils": "0.8.0-alpha.11",
-        "@lwrjs/view-registry": "0.8.0-alpha.11",
+        "@lwrjs/app-service": "0.8.0-alpha.13",
+        "@lwrjs/asset-registry": "0.8.0-alpha.13",
+        "@lwrjs/asset-transformer": "0.8.0-alpha.13",
+        "@lwrjs/base-template-engine": "0.8.0-alpha.13",
+        "@lwrjs/base-view-provider": "0.8.0-alpha.13",
+        "@lwrjs/base-view-transformer": "0.8.0-alpha.13",
+        "@lwrjs/client-modules": "0.8.0-alpha.13",
+        "@lwrjs/compiler": "0.8.0-alpha.13",
+        "@lwrjs/config": "0.8.0-alpha.13",
+        "@lwrjs/diagnostics": "0.8.0-alpha.13",
+        "@lwrjs/fs-asset-provider": "0.8.0-alpha.13",
+        "@lwrjs/html-view-provider": "0.8.0-alpha.13",
+        "@lwrjs/loader": "0.8.0-alpha.13",
+        "@lwrjs/lwc-module-provider": "0.8.0-alpha.13",
+        "@lwrjs/lwc-ssr": "0.8.0-alpha.13",
+        "@lwrjs/markdown-view-provider": "0.8.0-alpha.13",
+        "@lwrjs/module-bundler": "0.8.0-alpha.13",
+        "@lwrjs/module-registry": "0.8.0-alpha.13",
+        "@lwrjs/npm-module-provider": "0.8.0-alpha.13",
+        "@lwrjs/nunjucks-view-provider": "0.8.0-alpha.13",
+        "@lwrjs/o11y": "0.8.0-alpha.13",
+        "@lwrjs/resource-registry": "0.8.0-alpha.13",
+        "@lwrjs/router": "0.8.0-alpha.13",
+        "@lwrjs/server": "0.8.0-alpha.13",
+        "@lwrjs/shared-utils": "0.8.0-alpha.13",
+        "@lwrjs/view-registry": "0.8.0-alpha.13",
         "fs-extra": "^10.1.0",
         "ms": "^2.1.3",
         "path-to-regexp": "^6.2.0",
@@ -65,7 +65,7 @@
         "ws": "^8.8.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.8.0-alpha.11",
+        "@lwrjs/types": "0.8.0-alpha.13",
         "@types/ws": "^8.5.3"
     },
     "peerDependencies": {
@@ -74,5 +74,5 @@
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "e8a2c6811e4a52227219f2d94648e0eae9800fbc"
+    "gitHead": "cc4bc856f34d2ec15df550503dd7463fa31b30e5"
 }