@lwrjs/core 0.8.0-alpha.9 → 0.9.0-alpha.0

package/build/cjs/context/hooks.cjs

@@ -43,7 +43,7 @@ async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig, runtime
     (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");
+      import_shared_utils.logger.warn("ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution");
       console.dir(e, {depth: null});
     } else {
       throw e;

package/build/cjs/index.cjs

@@ -37,7 +37,7 @@ 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_config = __toModule(require("@lwrjs/config"));
-var import_lwr_app_observer = __toModule(require("./lwr-app-observer.cjs"));
+var import_shared_utils2 = __toModule(require("@lwrjs/shared-utils"));
 var import_locale_middleware = __toModule(require("./middlewares/locale-middleware.cjs"));
 var import_api_middleware = __toModule(require("./middlewares/api-middleware.cjs"));
 var import_ui_middleware = __toModule(require("./middlewares/ui-middleware.cjs"));
@@ -80,7 +80,7 @@ async function initContext(app, server, rawLwrConfig) {
   const hookProviders = await getServices(rawLwrConfig.hooks, void 0, rawLwrConfig);
   const {lwrConfig, dataConfig, runtimeConfig} = await (0, import_hooks.runConfigurationsHook)(hookProviders, rawLwrConfig, rawDataConfig, rawRuntimeEnvConfig);
   const assetTransformers = await getServices(rawLwrConfig.assetTransformers, void 0, rawLwrConfig);
-  const appObserver = new import_lwr_app_observer.LwrApplicationObserver();
+  const appObserver = new import_shared_utils2.LwrApplicationObserver();
   const appEmitter = appObserver.createLwrEmitter();
   const compiler = new import_compiler.LwrCompiler();
   const assetRegistry = new import_asset_registry.LwrAssetRegistry({
@@ -264,7 +264,7 @@ async function generateStaticSite(config) {
   config.serverType = "fs";
   const {serverMode} = config;
   if (serverMode === "dev" || serverMode === "compat") {
-    console.warn("[WARN] static generation in `dev` or `compat` mode is currently not fully supported");
+    import_shared_utils.logger.warn("static generation in `dev` or `compat` mode is currently not fully supported");
   }
   const lwrApp = createServer(config);
   overrideConfigAsSrc(lwrApp);

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/hmr-middleware.cjs

@@ -42,7 +42,7 @@ var Hmr = class {
   }
   setupHotModuleReload() {
     const {server} = this;
-    const wss = new import_ws.default.Server({server});
+    const wss = new import_ws.WebSocketServer({server});
     const connectedClients = new Map();
     this.connectedClients = connectedClients;
     wss.on("connection", function connection(ws, req) {

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/server-warmup.cjs

@@ -30,8 +30,12 @@ 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_config = __toModule(require("@lwrjs/config"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 async function warmupServer(config, internalRequestKey) {
-  console.log("[Server Warmup] starting");
+  if (!import_shared_utils.logger.currentLevel || import_shared_utils.logger.currentLevel == import_shared_utils.WARN || import_shared_utils.logger.currentLevel == import_shared_utils.INFO) {
+    import_shared_utils.logger.setOptions({dedupe: new Set([import_shared_utils.WARN])});
+  }
+  import_shared_utils.logger.info("[Server Warmup] starting");
   const {routes, staticSiteGenerator, port, apiVersion, basePath, lwrVersion, serverMode} = config;
   staticSiteGenerator.outputDir = import_dir.skipDirCreation;
   const urlRewriteMap = new Map();
@@ -44,5 +48,5 @@ async function warmupServer(config, internalRequestKey) {
     serverMode
   };
   await new import_static_generation.default().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, new import_network_dispatcher.default(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
-  console.log("[Server Warmup] complete");
+  import_shared_utils.logger.info("[Server Warmup] complete");
 }

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

@@ -37,13 +37,16 @@ var import_config = __toModule(require("@lwrjs/config"));
 var SiteGenerator = class {
   async buildStaticApplication(config, dispatcher) {
     const startTime = import_perf_hooks.performance.now();
-    console.log("[Static Generation] starting");
+    import_shared_utils.logger.info("[Static Generation] starting");
+    if (!import_shared_utils.logger.currentLevel || import_shared_utils.logger.currentLevel == import_shared_utils.WARN || import_shared_utils.logger.currentLevel == import_shared_utils.INFO) {
+      import_shared_utils.logger.setOptions({dedupe: new Set([import_shared_utils.WARN])});
+    }
     const {routes, staticSiteGenerator, rootDir, assets} = config;
     if (!staticSiteGenerator.outputDir) {
       staticSiteGenerator.outputDir = "__generated_site__";
     }
     const outputDir = (0, import_path.join)(rootDir, staticSiteGenerator.outputDir);
-    console.log(`[INFO] Clear Output Location: ${outputDir}`);
+    import_shared_utils.logger.info(`Clear Output Location: ${outputDir}`);
     import_fs_extra.default.rmSync(outputDir, {recursive: true, force: true});
     const urlRewriteMap = new Map();
     const {apiVersion, basePath, lwrVersion, serverMode} = config;
@@ -60,7 +63,7 @@ var SiteGenerator = class {
     this.copyAssets(assets, outputDir);
     const endTime = import_perf_hooks.performance.now();
     const timeDiff = (endTime - startTime) / 1e3;
-    console.log(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
+    import_shared_utils.logger.info(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
   }
   async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap = new Map()) {
     if (!staticSiteGenerator.locales) {
@@ -90,10 +93,10 @@ var SiteGenerator = class {
   createGenerateURLFunction(dispatcher) {
     const generateRoute = async (uri, siteConfig) => {
       const locale = siteConfig.locale;
-      console.log(`[INFO] Start Generate: ${locale} ${uri}`);
+      import_shared_utils.logger.info(`Start Generate: ${locale} ${uri}`);
       await this.dispatchResourceRecursive(uri, dispatcher, {resourceType: "route"}, siteConfig);
       this.addAdditionalImportMetadataToViewConfig(siteConfig);
-      console.log(`[INFO] End Generate ${locale} ${uri}`);
+      import_shared_utils.logger.info(`End Generate ${locale} ${uri}`);
     };
     return generateRoute.bind(this);
   }
@@ -102,7 +105,7 @@ var SiteGenerator = class {
     if (!visitedUrls.has(url)) {
       visitedUrls.add(url);
       if (url.indexOf("/:") !== -1 || url.indexOf("*") !== -1) {
-        console.error("Skipped generation of url with variable path segment: " + url);
+        import_shared_utils.logger.warn("Skipped generation of url with variable path segment: " + url);
         return;
       }
       let context;
@@ -117,7 +120,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") {
@@ -176,7 +179,7 @@ var SiteGenerator = class {
       await Promise.all(dispatchRequests);
     } else {
       const body = context.fs?.body;
-      console.warn(`[WARN] Failed to fetch ${url}: (${statusCode}) ${body}`);
+      import_shared_utils.logger.warn(`Failed to fetch ${url}: (${statusCode}) ${body}`);
     }
   }
   async handleHtmlResource(url, context, siteConfig, dispatcher) {
@@ -212,7 +215,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));
       }
     }
@@ -240,7 +243,7 @@ var SiteGenerator = class {
             siteConfig.viewConfigPath = this.getResourcePathFromUrl(siteConfig, resourceUri);
           }
         } else {
-          console.warn("Skipped inline bootstrap resource: %j", resource);
+          import_shared_utils.logger.warn("Skipped inline bootstrap resource: %j", resource);
         }
       }
     }
@@ -250,7 +253,7 @@ var SiteGenerator = class {
       if (resourceUri.startsWith("/")) {
         dispatchRequests.push(this.dispatchResourceRecursive(resourceUri, dispatcher, {resourceType: "resource"}, siteConfig));
       } else {
-        console.warn("Skipped resource: %j", resource);
+        import_shared_utils.logger.warn("Skipped resource: %j", resource);
       }
     }
     await Promise.all(dispatchRequests);
@@ -266,7 +269,7 @@ var SiteGenerator = class {
           const mappingURL = siteConfig.endpoints?.uris?.mapping + encodeURIComponent(jsUri);
           await this.dispatchResourceRecursive(mappingURL, dispatcher, {resourceType: "mapping"}, siteConfig);
         } else {
-          console.warn('[WARN] Unable to fetch mapping for bare specifier or variable dynamic import: "' + jsUri + '"');
+          import_shared_utils.logger.warn('Unable to fetch mapping for bare specifier or variable dynamic import: "' + jsUri + '"');
         }
       } else if (isAdditionalModulesRequest) {
         const uri = `${siteConfig.endpoints?.uris.legacyDefault}${encodeURIComponent(jsUri)}`;
@@ -274,9 +277,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 reference => ${refUrl} from ${url}`, err);
+      }));
+    }
+    return Promise.all(dispatchRequests);
   }
   getResourcePathFromUrl(siteConfig, url) {
     const {outputDir} = siteConfig;
@@ -310,11 +323,10 @@ 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);
+          import_shared_utils.logger.warn("Could not find assets to copy at path: " + assetSrcDir);
         }
       } catch (e) {
-        console.error("Error occurred processing asset config: " + JSON.stringify(asset));
-        console.error(e);
+        import_shared_utils.logger.error("Error occurred processing asset config: " + JSON.stringify(asset), e);
       }
     }
   }

package/build/es/context/hooks.js

@@ -1,4 +1,4 @@
-import { DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
+import { DEFAULT_LWR_BOOTSTRAP_CONFIG, logger } from '@lwrjs/shared-utils';
 import { validateLwrAppConfig } from '@lwrjs/config';
 // Add missing bootstrap objects to routes
 function normalizeRoutesBootstrap({ routes, errorRoutes }) {
@@ -19,7 +19,7 @@ export async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig,
     catch (e) {
         // TODO: temporary workaround for https://github.com/salesforce/lwr/issues/825
         if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === 'true') {
-            console.warn('ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution');
+            logger.warn('ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution');
             console.dir(e, { depth: null });
         }
         else {

package/build/es/index.js

@@ -1,4 +1,4 @@
-import { deepFreeze, getFeatureFlags, DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
+import { deepFreeze, getFeatureFlags, DEFAULT_LWR_BOOTSTRAP_CONFIG, logger } from '@lwrjs/shared-utils';
 import { LwrCompiler } from '@lwrjs/compiler';
 import { LwrModuleBundler } from '@lwrjs/module-bundler';
 import { LwrModuleRegistry } from '@lwrjs/module-registry';
@@ -7,7 +7,7 @@ import { LwrAssetRegistry } from '@lwrjs/asset-registry';
 import { LwrViewRegistry } from '@lwrjs/view-registry';
 import { LwrServerError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
 import { normalizeConfig, explodeMode } from '@lwrjs/config';
-import { LwrApplicationObserver } from './lwr-app-observer.js';
+import { LwrApplicationObserver } from '@lwrjs/shared-utils';
 import localeMiddleware from './middlewares/locale-middleware.js';
 import apiMiddleware from './middlewares/api-middleware.js';
 import uiMiddleware from './middlewares/ui-middleware.js';
@@ -235,7 +235,7 @@ export async function generateStaticSite(config) {
     if (serverMode === 'dev' || serverMode === 'compat') {
         // TODO: dynamic imports are not generated in dev mode
         // https://github.com/salesforce/lwr/issues/1111
-        console.warn('[WARN] static generation in `dev` or `compat` mode is currently not fully supported');
+        logger.warn('static generation in `dev` or `compat` mode is currently not fully supported');
     }
     const lwrApp = createServer(config);
     overrideConfigAsSrc(lwrApp);

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/hmr-middleware.js

@@ -1,4 +1,4 @@
-import WebSocket from 'ws';
+import { WebSocketServer } from 'ws';
 import { getCacheKeyFromJson } from '@lwrjs/shared-utils';
 import { getRequestProperties } from './utils.js';
 let hmr;
@@ -14,7 +14,7 @@ class Hmr {
     }
     setupHotModuleReload() {
         const { server } = this;
-        const wss = new WebSocket.Server({ server });
+        const wss = new WebSocketServer({ server });
         const connectedClients = new Map();
         this.connectedClients = connectedClients;
         wss.on('connection', function connection(ws, req) {

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/server-warmup.js

@@ -2,8 +2,13 @@ import SiteGenerator from './static-generation.js';
 import { skipDirCreation } from './utils/dir.js';
 import NetworkDispatcher from './utils/network-dispatcher.js';
 import { explodeMode } from '@lwrjs/config';
+import { logger, WARN, INFO } from '@lwrjs/shared-utils';
 export async function warmupServer(config, internalRequestKey) {
-    console.log('[Server Warmup] starting');
+    // De-duplicate warming messages if log level is warn or info
+    if (!logger.currentLevel || logger.currentLevel == WARN || logger.currentLevel == INFO) {
+        logger.setOptions({ dedupe: new Set([WARN]) });
+    }
+    logger.info('[Server Warmup] starting');
     const { routes, staticSiteGenerator, port, apiVersion, basePath, lwrVersion, serverMode } = config;
     staticSiteGenerator.outputDir = skipDirCreation;
     const urlRewriteMap = new Map();
@@ -17,6 +22,6 @@ export async function warmupServer(config, internalRequestKey) {
     };
     // For each locale, generate all the modules
     await new SiteGenerator().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, new NetworkDispatcher(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
-    console.log('[Server Warmup] complete');
+    logger.info('[Server Warmup] complete');
 }
 //# sourceMappingURL=server-warmup.js.map

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, WARN, INFO, } from '@lwrjs/shared-utils';
 import { join, dirname, extname } from 'path';
 import fs from 'fs-extra';
 import { writeResponse } from './utils/stream.js';
@@ -16,13 +16,17 @@ export default class SiteGenerator {
      */
     async buildStaticApplication(config, dispatcher) {
         const startTime = performance.now();
-        console.log('[Static Generation] starting');
+        logger.info('[Static Generation] starting');
+        // De-duplicate warming messages if log level is warn or info
+        if (!logger.currentLevel || logger.currentLevel == WARN || logger.currentLevel == INFO) {
+            logger.setOptions({ dedupe: new Set([WARN]) });
+        }
         const { routes, staticSiteGenerator, rootDir, assets } = config;
         if (!staticSiteGenerator.outputDir) {
             staticSiteGenerator.outputDir = '__generated_site__';
         }
         const outputDir = join(rootDir, staticSiteGenerator.outputDir);
-        console.log(`[INFO] Clear Output Location: ${outputDir}`);
+        logger.info(`Clear Output Location: ${outputDir}`);
         fs.rmSync(outputDir, { recursive: true, force: true });
         const urlRewriteMap = new Map();
         const { apiVersion, basePath, lwrVersion, serverMode } = config;
@@ -42,7 +46,7 @@ export default class SiteGenerator {
         this.copyAssets(assets, outputDir);
         const endTime = performance.now();
         const timeDiff = (endTime - startTime) / 1000;
-        console.log(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
+        logger.info(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
     }
     /**
      * Crawl all view routes for a site
@@ -85,12 +89,12 @@ export default class SiteGenerator {
     createGenerateURLFunction(dispatcher) {
         const generateRoute = async (uri, siteConfig) => {
             const locale = siteConfig.locale;
-            console.log(`[INFO] Start Generate: ${locale} ${uri}`);
+            logger.info(`Start Generate: ${locale} ${uri}`);
             // Kick off site generation for the current route
             await this.dispatchResourceRecursive(uri, dispatcher, { resourceType: 'route' }, siteConfig);
             // If there is a view config add any extra collected import metadata to the config
             this.addAdditionalImportMetadataToViewConfig(siteConfig);
-            console.log(`[INFO] End Generate ${locale} ${uri}`);
+            logger.info(`End Generate ${locale} ${uri}`);
         };
         return generateRoute.bind(this);
     }
@@ -109,7 +113,7 @@ export default class SiteGenerator {
             // Skip urls with path segment variables (i.e. '/custom/:bar')
             // Users can specify specific urls via the '_additionalRoutePaths' config property
             if (url.indexOf('/:') !== -1 || url.indexOf('*') !== -1) {
-                console.error('Skipped generation of url with variable path segment: ' + url);
+                logger.warn('Skipped generation of url with variable path segment: ' + url);
                 return;
             }
             // Generate resource
@@ -129,7 +133,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') {
@@ -240,7 +244,7 @@ export default class SiteGenerator {
         }
         else {
             const body = context.fs?.body;
-            console.warn(`[WARN] Failed to fetch ${url}: (${statusCode}) ${body}`);
+            logger.warn(`Failed to fetch ${url}: (${statusCode}) ${body}`);
         }
     }
     /**
@@ -306,8 +310,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));
             }
         }
@@ -341,7 +345,7 @@ export default class SiteGenerator {
                     }
                 }
                 else {
-                    console.warn('Skipped inline bootstrap resource: %j', resource);
+                    logger.warn('Skipped inline bootstrap resource: %j', resource);
                 }
             }
         }
@@ -353,7 +357,7 @@ export default class SiteGenerator {
                 dispatchRequests.push(this.dispatchResourceRecursive(resourceUri, dispatcher, { resourceType: 'resource' }, siteConfig));
             }
             else {
-                console.warn('Skipped resource: %j', resource);
+                logger.warn('Skipped resource: %j', resource);
             }
         }
         // -- Dispatch dependencies
@@ -373,7 +377,7 @@ export default class SiteGenerator {
                     await this.dispatchResourceRecursive(mappingURL, dispatcher, { resourceType: 'mapping' }, siteConfig);
                 }
                 else {
-                    console.warn('[WARN] Unable to fetch mapping for bare specifier or variable dynamic import: "' +
+                    logger.warn('Unable to fetch mapping for bare specifier or variable dynamic import: "' +
                         jsUri +
                         '"');
                 }
@@ -394,9 +398,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 reference => ${refUrl} from ${url}`, err);
+            }));
+        }
+        return Promise.all(dispatchRequests);
     }
     getResourcePathFromUrl(siteConfig, url) {
         const { outputDir } = siteConfig;
@@ -451,12 +467,11 @@ export default class SiteGenerator {
                     fs.copySync(assetSrcDir, assetOutputDir);
                 }
                 else {
-                    throw new Error('Could not find assets to copy at path: ' + assetSrcDir);
+                    logger.warn('Could not find assets to copy at path: ' + assetSrcDir);
                 }
             }
             catch (e) {
-                console.error('Error occurred processing asset config: ' + JSON.stringify(asset));
-                console.error(e);
+                logger.error('Error occurred processing asset config: ' + JSON.stringify(asset), 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.9",
+    "version": "0.9.0-alpha.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -32,45 +32,47 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.8.0-alpha.9",
-        "@lwrjs/asset-registry": "0.8.0-alpha.9",
-        "@lwrjs/asset-transformer": "0.8.0-alpha.9",
-        "@lwrjs/base-template-engine": "0.8.0-alpha.9",
-        "@lwrjs/base-view-provider": "0.8.0-alpha.9",
-        "@lwrjs/base-view-transformer": "0.8.0-alpha.9",
-        "@lwrjs/client-modules": "0.8.0-alpha.9",
-        "@lwrjs/compiler": "0.8.0-alpha.9",
-        "@lwrjs/config": "0.8.0-alpha.9",
-        "@lwrjs/diagnostics": "0.8.0-alpha.9",
-        "@lwrjs/fs-asset-provider": "0.8.0-alpha.9",
-        "@lwrjs/html-view-provider": "0.8.0-alpha.9",
-        "@lwrjs/loader": "0.8.0-alpha.9",
-        "@lwrjs/lwc-module-provider": "0.8.0-alpha.9",
-        "@lwrjs/lwc-ssr": "0.8.0-alpha.9",
-        "@lwrjs/markdown-view-provider": "0.8.0-alpha.9",
-        "@lwrjs/module-bundler": "0.8.0-alpha.9",
-        "@lwrjs/module-registry": "0.8.0-alpha.9",
-        "@lwrjs/npm-module-provider": "0.8.0-alpha.9",
-        "@lwrjs/nunjucks-view-provider": "0.8.0-alpha.9",
-        "@lwrjs/o11y": "0.8.0-alpha.9",
-        "@lwrjs/resource-registry": "0.8.0-alpha.9",
-        "@lwrjs/router": "0.8.0-alpha.9",
-        "@lwrjs/server": "0.8.0-alpha.9",
-        "@lwrjs/shared-utils": "0.8.0-alpha.9",
-        "@lwrjs/view-registry": "0.8.0-alpha.9",
+        "@lwrjs/app-service": "0.9.0-alpha.0",
+        "@lwrjs/asset-registry": "0.9.0-alpha.0",
+        "@lwrjs/asset-transformer": "0.9.0-alpha.0",
+        "@lwrjs/base-template-engine": "0.9.0-alpha.0",
+        "@lwrjs/base-view-provider": "0.9.0-alpha.0",
+        "@lwrjs/base-view-transformer": "0.9.0-alpha.0",
+        "@lwrjs/client-modules": "0.9.0-alpha.0",
+        "@lwrjs/compiler": "0.9.0-alpha.0",
+        "@lwrjs/config": "0.9.0-alpha.0",
+        "@lwrjs/diagnostics": "0.9.0-alpha.0",
+        "@lwrjs/fs-asset-provider": "0.9.0-alpha.0",
+        "@lwrjs/html-view-provider": "0.9.0-alpha.0",
+        "@lwrjs/loader": "0.9.0-alpha.0",
+        "@lwrjs/lwc-module-provider": "0.9.0-alpha.0",
+        "@lwrjs/lwc-ssr": "0.9.0-alpha.0",
+        "@lwrjs/markdown-view-provider": "0.9.0-alpha.0",
+        "@lwrjs/module-bundler": "0.9.0-alpha.0",
+        "@lwrjs/module-registry": "0.9.0-alpha.0",
+        "@lwrjs/npm-module-provider": "0.9.0-alpha.0",
+        "@lwrjs/nunjucks-view-provider": "0.9.0-alpha.0",
+        "@lwrjs/o11y": "0.9.0-alpha.0",
+        "@lwrjs/resource-registry": "0.9.0-alpha.0",
+        "@lwrjs/router": "0.9.0-alpha.0",
+        "@lwrjs/server": "0.9.0-alpha.0",
+        "@lwrjs/shared-utils": "0.9.0-alpha.0",
+        "@lwrjs/view-registry": "0.9.0-alpha.0",
         "fs-extra": "^10.1.0",
         "ms": "^2.1.3",
         "path-to-regexp": "^6.2.0",
-        "qs": "^6.9.4"
+        "qs": "^6.9.4",
+        "ws": "^8.8.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.8.0-alpha.9"
+        "@lwrjs/types": "0.9.0-alpha.0",
+        "@types/ws": "^8.5.3"
     },
     "peerDependencies": {
-        "lwc": ">= 1.x <= 2.x"
+        "lwc": "2.x"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "037c471903c6753fc6866ef598571b0df83e58f9"
+    "gitHead": "6890d8619b295a49ee1ed8253a372337d83863be"
 }

package/build/cjs/lwr-app-observer.cjs

@@ -1,82 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
-};
-var __exportStar = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-
-// packages/@lwrjs/core/src/lwr-app-observer.ts
-__markAsModule(exports);
-__export(exports, {
-  LwrApplicationObserver: () => LwrApplicationObserver
-});
-var import_events = __toModule(require("events"));
-var MODULE_DEF_CHANGED_EVENT = "module_definition_changed";
-var MODULE_SOURCE_CHANGED_EVENT = "module_source_changed";
-var VIEW_SOURCE_CHANGED_EVENT = "view_source_changed";
-var ASSET_SOURCE_CHANGED_EVENT = "asset_source_changed";
-var LwrEmitter = class {
-  constructor(observer) {
-    this.observer = observer;
-  }
-  notifyAssetSourceChanged(payload) {
-    this.observer.emit(ASSET_SOURCE_CHANGED_EVENT, {
-      eventType: ASSET_SOURCE_CHANGED_EVENT,
-      payload
-    });
-  }
-  notifyViewSourceChanged(payload) {
-    this.observer.emit(VIEW_SOURCE_CHANGED_EVENT, {
-      eventType: VIEW_SOURCE_CHANGED_EVENT,
-      payload
-    });
-  }
-  notifyModuleDefinitionChanged(payload) {
-    this.observer.emit(MODULE_DEF_CHANGED_EVENT, {
-      eventType: MODULE_DEF_CHANGED_EVENT,
-      payload
-    });
-  }
-  notifyModuleSourceChanged(payload) {
-    this.observer.emit(MODULE_SOURCE_CHANGED_EVENT, {
-      eventType: MODULE_SOURCE_CHANGED_EVENT,
-      payload
-    });
-  }
-};
-var LwrApplicationObserver = class extends import_events.EventEmitter {
-  constructor() {
-    super();
-  }
-  onModuleDefinitionChange(listener) {
-    this.on(MODULE_DEF_CHANGED_EVENT, listener);
-  }
-  onModuleSourceChange(listener) {
-    this.on(MODULE_SOURCE_CHANGED_EVENT, listener);
-  }
-  onViewSourceChange(listener) {
-    this.on(VIEW_SOURCE_CHANGED_EVENT, listener);
-  }
-  onAssetSourceChange(listener) {
-    this.on(ASSET_SOURCE_CHANGED_EVENT, listener);
-  }
-  createLwrEmitter() {
-    return new LwrEmitter(this);
-  }
-};

package/build/es/lwr-app-observer.d.ts

@@ -1,21 +0,0 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
-import { ModuleCompiled, LwrAppEmitter, LwrAppObserver, ModuleDefinitionChangedEvent, ModuleSourceChangedEvent, CompiledView, AssetSource, AssetSourceChangedEvent, ViewSourceChangedEvent } from '@lwrjs/types';
-declare class LwrEmitter implements LwrAppEmitter {
-    observer: LwrApplicationObserver;
-    constructor(observer: LwrApplicationObserver);
-    notifyAssetSourceChanged(payload: AssetSource): void;
-    notifyViewSourceChanged(payload: CompiledView): void;
-    notifyModuleDefinitionChanged(payload: ModuleCompiled): void;
-    notifyModuleSourceChanged(payload: ModuleCompiled): void;
-}
-export declare class LwrApplicationObserver extends EventEmitter implements LwrAppObserver {
-    constructor();
-    onModuleDefinitionChange(listener: (event: ModuleDefinitionChangedEvent) => void): void;
-    onModuleSourceChange(listener: (event: ModuleSourceChangedEvent) => void): void;
-    onViewSourceChange(listener: (event: ViewSourceChangedEvent) => void): void;
-    onAssetSourceChange(listener: (event: AssetSourceChangedEvent) => void): void;
-    createLwrEmitter(): LwrEmitter;
-}
-export {};
-//# sourceMappingURL=lwr-app-observer.d.ts.map

package/build/es/lwr-app-observer.js

@@ -1,55 +0,0 @@
-import { EventEmitter } from 'events';
-const MODULE_DEF_CHANGED_EVENT = 'module_definition_changed';
-const MODULE_SOURCE_CHANGED_EVENT = 'module_source_changed';
-const VIEW_SOURCE_CHANGED_EVENT = 'view_source_changed';
-const ASSET_SOURCE_CHANGED_EVENT = 'asset_source_changed';
-class LwrEmitter {
-    constructor(observer) {
-        this.observer = observer;
-    }
-    notifyAssetSourceChanged(payload) {
-        this.observer.emit(ASSET_SOURCE_CHANGED_EVENT, {
-            eventType: ASSET_SOURCE_CHANGED_EVENT,
-            payload,
-        });
-    }
-    notifyViewSourceChanged(payload) {
-        this.observer.emit(VIEW_SOURCE_CHANGED_EVENT, {
-            eventType: VIEW_SOURCE_CHANGED_EVENT,
-            payload,
-        });
-    }
-    notifyModuleDefinitionChanged(payload) {
-        this.observer.emit(MODULE_DEF_CHANGED_EVENT, {
-            eventType: MODULE_DEF_CHANGED_EVENT,
-            payload,
-        });
-    }
-    notifyModuleSourceChanged(payload) {
-        this.observer.emit(MODULE_SOURCE_CHANGED_EVENT, {
-            eventType: MODULE_SOURCE_CHANGED_EVENT,
-            payload,
-        });
-    }
-}
-export class LwrApplicationObserver extends EventEmitter {
-    constructor() {
-        super();
-    }
-    onModuleDefinitionChange(listener) {
-        this.on(MODULE_DEF_CHANGED_EVENT, listener);
-    }
-    onModuleSourceChange(listener) {
-        this.on(MODULE_SOURCE_CHANGED_EVENT, listener);
-    }
-    onViewSourceChange(listener) {
-        this.on(VIEW_SOURCE_CHANGED_EVENT, listener);
-    }
-    onAssetSourceChange(listener) {
-        this.on(ASSET_SOURCE_CHANGED_EVENT, listener);
-    }
-    createLwrEmitter() {
-        return new LwrEmitter(this);
-    }
-}
-//# sourceMappingURL=lwr-app-observer.js.map