@lwrjs/view-registry 0.17.2-alpha.8 → 0.17.2

package/build/cjs/index.cjs

@@ -27,6 +27,7 @@ __export(exports, {
   LwrViewHandler: () => import_view_handler.LwrViewHandler,
   LwrViewRegistry: () => LwrViewRegistry
 });
+var import_config = __toModule(require("@lwrjs/config"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_utils = __toModule(require("./utils.cjs"));
@@ -41,7 +42,6 @@ var LwrViewRegistry = class {
     this.compiledViews = new Map();
     this.immutableAssets = new Map();
     this.pendingViewDefinitions = new import_shared_utils.InflightTasks();
-    this.metadataCache = new Map();
     this.name = "lwr-view-registry";
     this.resourceRegistry = context.resourceRegistry;
     this.runtimeEnvironment = context.runtimeEnvironment;
@@ -59,6 +59,12 @@ var LwrViewRegistry = class {
         import_diagnostics.logger.verbose(`View evicted from cache ${key}`);
       }
     });
+    this.metadataCache = new import_lru_cache.LRUCache({
+      max: parseInt(process.env.VIEW_METADATA_CACHE_SIZE ?? "500", 10),
+      dispose: (_value, key) => {
+        import_diagnostics.logger.verbose(`Metadata evicted from cache ${key}`);
+      }
+    });
     observer.onViewSourceChange(({payload}) => this.onViewSourceChange(payload));
     observer.onModuleDefinitionChange(({payload}) => this.onModuleDefinitionChange(payload));
     observer.onAssetSourceChange(({payload}) => this.onAssetSourceChange(payload));
@@ -189,13 +195,14 @@ var LwrViewRegistry = class {
       const updatableViewParams = {...viewParams};
       (0, import_utils.generateViewNonce)(updatableViewParams);
       const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
-      const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => (0, import_instrumentation.getTracer)().trace({
+      const pendingViewDefCacheKeyHashed = (0, import_crypto.createHash)("md5").update(pendingViewDefCacheKey).digest("hex");
+      const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKeyHashed, () => (0, import_instrumentation.getTracer)().trace({
         name: import_instrumentation.ViewSpan.RenderView,
         attributes: {
           view: view.id,
           ssr: view.bootstrap?.ssr === true
         }
-      }, () => this.renderView(view, updatableViewParams, runtimeEnvironment, runtimeParams, pendingViewDefCacheKey, renderOptions)));
+      }, () => this.renderView(view, updatableViewParams, runtimeEnvironment, runtimeParams, pendingViewDefCacheKeyHashed, renderOptions)));
       viewDefinition.nonce = (0, import_utils.getViewNonce)(updatableViewParams);
       const route = this.globalConfig.routes.find((r) => r.id === view.id);
       const maxViewCacheTtl = (0, import_shared_utils.getFeatureFlags)().MAX_VIEW_CACHE_TTL;
@@ -219,9 +226,14 @@ var LwrViewRegistry = class {
       throw new import_diagnostics.LwrServerError(import_diagnostics.descriptions.SERVER.UNEXPECTED_ERROR(message));
     }
   }
+  getLwrResourcesPlaceHolder(view, runtimeEnvironment, runtimeParams) {
+    const resourcesCacheKey = (0, import_utils.getViewDefCacheKey)(view, runtimeEnvironment, true, runtimeParams);
+    const resourcesCacheKeyHashed = (0, import_crypto.createHash)("md5").update(resourcesCacheKey).digest("hex");
+    return `__LWR_RESOURCES__${view.id}${resourcesCacheKeyHashed}`;
+  }
   async renderView(view, viewParams, runtimeEnvironment, runtimeParams, viewCacheKey, renderOptions) {
     const {id, contentTemplate, rootComponent, layoutTemplate} = view;
-    const lwrResourcesId = `__LWR_RESOURCES__${Date.now()}`;
+    const lwrResourcesId = this.getLwrResourcesPlaceHolder(view, runtimeEnvironment, runtimeParams);
     const renderedContent = await this.render({id, contentTemplate, rootComponent}, {...viewParams, lwr_resources: lwrResourcesId}, runtimeParams, runtimeEnvironment);
     let normalizedRenderOptions = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderedContent.options, renderOptions);
     const layout = layoutTemplate || renderedContent.compiledView.layoutTemplate;
@@ -316,32 +328,59 @@ var LwrViewRegistry = class {
     const {lwrResourcesId} = contentIds;
     const {moduleRegistry, resourceRegistry, moduleBundler} = this;
     const runtimeEnvironment = {...runtimeEnv, immutableAssets: freezeAssets};
+    const isSSR = view.bootstrap?.ssr === true;
     const {
       renderedView: renderedViewContent,
       metadata: renderedViewMetadata,
       compiledView: {immutable = true}
     } = renderedView;
+    let traceId;
     const {linkedMetadata, stringBuilder} = (0, import_instrumentation.getTracer)().trace({
       name: import_instrumentation.ViewSpan.ParseView,
       attributes: {
         view: view.id,
-        ssr: view.bootstrap?.ssr === true
-      }
-    }, () => {
-      let linkedMetadata2 = renderedViewMetadata;
-      if (!skipMetadataCollection) {
-        const contentHash = (0, import_crypto.createHash)("md5").update(renderedViewContent).digest("hex");
-        const cacheKey = `${view.id}:${contentHash}`;
-        if (this.metadataCache.has(cacheKey)) {
-          linkedMetadata2 = this.metadataCache.get(cacheKey);
-        } else {
-          linkedMetadata2 = (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
-          this.metadataCache.set(cacheKey, linkedMetadata2);
-        }
+        ssr: isSSR
       }
+    }, (span) => {
+      traceId = span.traceId;
       const stringBuilder2 = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
-      return {linkedMetadata: linkedMetadata2, stringBuilder: stringBuilder2};
+      if (skipMetadataCollection) {
+        return {linkedMetadata: renderedViewMetadata, stringBuilder: stringBuilder2};
+      }
+      const contentHash = (0, import_crypto.createHash)("md5").update(renderedViewContent).digest("hex");
+      const cacheKey = `${view.id}:${contentHash}`;
+      let metadata;
+      if (this.metadataCache.has(cacheKey)) {
+        metadata = this.metadataCache.get(cacheKey);
+      } else {
+        metadata = (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
+        this.metadataCache.set(cacheKey, metadata);
+      }
+      return {
+        linkedMetadata: {
+          ...renderedViewMetadata,
+          customElements: metadata.customElements,
+          assetReferences: metadata.assetReferences
+        },
+        stringBuilder: stringBuilder2
+      };
     });
+    if (!(0, import_shared_utils.getFeatureFlags)().DISABLE_B3_TRACING && traceId && runtimeParams.viewSpanID) {
+      const content = `00-${traceId}-${runtimeParams.viewSpanID}-01`;
+      (0, import_shared_utils.addHeadMarkup)([{meta: [{name: "traceparent", content}]}], stringBuilder);
+    }
+    if (isSSR && (0, import_shared_utils.getFeatureFlags)().SSR_COMPILER_ENABLED) {
+      const ssrUtils = await resourceRegistry.getResource({specifier: "register-lwc-style.js", version: import_config.LWC_VERSION}, runtimeEnvironment, runtimeParams);
+      if (!ssrUtils?.src) {
+      } else {
+        (0, import_shared_utils.addToHead)(await (0, import_utils.generateHtmlTag)(ssrUtils), stringBuilder);
+        linkedMetadata.assetReferences.push({
+          url: ssrUtils.src,
+          relative: (0, import_shared_utils.isRelative)(ssrUtils.src),
+          integrity: ssrUtils.integrity
+        });
+      }
+    }
     const mergedViewContext = {
       ...viewContext,
       config: this.globalConfig,
@@ -373,23 +412,24 @@ var LwrViewRegistry = class {
         unsafeEnableViewLinkCaching: this.globalConfig.unsafeEnableViewLinkCaching,
         viewLinkCacheKey: viewCacheKey
       });
+      const assetReferences = [...linkedMetadata.assetReferences];
       if (viewRecord.resources?.length) {
-        linkedMetadata.assetReferences.push(...viewRecord.resources.reduce((res, asset) => {
-          if (!asset.src)
-            return res;
-          res.push({
-            url: asset.src,
-            relative: (0, import_shared_utils.isRelative)(asset.src),
-            integrity: asset.integrity
+        for (const resource of viewRecord.resources) {
+          if (!resource.src) {
+            continue;
+          }
+          assetReferences.push({
+            url: resource.src,
+            relative: (0, import_shared_utils.isRelative)(resource.src),
+            integrity: resource.integrity
           });
-          return res;
-        }, []));
+        }
       }
       return {
         renderedView: linkedView,
         immutable,
         viewRecord: {
-          assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences),
+          assetReferences: (0, import_utils.reduceSourceAssetReferences)(assetReferences),
           ...viewRecord,
           serverBundles: linkedMetadata.serverBundles
         },

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -110,6 +110,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const viewPreloads = {
     uris: [],
     specifiers: [],
+    includedModules: [],
     groups: new Map(),
     integrities: new Map()
   };
@@ -157,6 +158,10 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     if (enableModuleGraphsCache && moduleGraphsCache.has(bootstrapModuleGraphCacheKey)) {
       bootstrapModuleGraph = moduleGraphsCache.get(bootstrapModuleGraphCacheKey);
     } else {
+      import_diagnostics.logger.info({
+        label: "view-registry",
+        message: `Cache miss for ServerGenerate, cache key: ${bootstrapModuleGraphCacheKey}`
+      });
       bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
       enableModuleGraphsCache && moduleGraphsCache.set(bootstrapModuleGraphCacheKey, bootstrapModuleGraph);
     }
@@ -227,7 +232,9 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       const specifier = graph.graphs[0].specifier;
       const uri = graph.uriMap[specifier];
       const integrity = (0, import_utils2.getBundleIntegrity)(graph, specifier);
-      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads);
+      const bundleDef = graph.linkedDefinitions[specifier];
+      const includedModules = bundleDef?.bundleRecord ? bundleDef.bundleRecord.includedModules : [];
+      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads, includedModules);
       if (bundle) {
         for (const depSpecifier of graph.graphs[0].static) {
           const depUri = getPreloadUri(depSpecifier, graph.uriMap);
@@ -277,7 +284,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       rootComponents,
       serverData,
       ...isAMD && {requiredModules: requiredAmdModules},
-      ...isAMD && {preloadModules: viewPreloads.specifiers}
+      ...isAMD && {preloadModules: (0, import_preload_utils.getPreloadModuleList)(viewPreloads)}
     }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
   }
   if (!isAMD && hmrEnabled) {

package/build/cjs/linkers/preload-utils.cjs

@@ -24,12 +24,13 @@ var __toModule = (module2) => {
 // packages/@lwrjs/view-registry/src/linkers/preload-utils.ts
 __markAsModule(exports);
 __export(exports, {
+  getPreloadModuleList: () => getPreloadModuleList,
   getPreloadModulesMeta: () => getPreloadModulesMeta,
   setPreloadModulesMeta: () => setPreloadModulesMeta
 });
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
+function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads, includedModules = []) {
   if (!uri) {
     throw new import_diagnostics.LwrInvalidError(import_diagnostics.descriptions.INVALID.PRELOAD_MODULE(specifier));
   }
@@ -40,6 +41,7 @@ function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
   const preloadBundleGroupsMap = preloads.groups;
   const preloadModulesURIs = preloads.uris;
   const preloadModuleIntegrities = preloads.integrities;
+  const preloadModuleIncludedModules = preloads.includedModules;
   preloadModulesSpecifiers.push(specifier);
   const {specifier: unversionedSpecifier} = (0, import_shared_utils.explodeSpecifier)(specifier);
   const groupName = (0, import_shared_utils.getGroupName)(unversionedSpecifier, groups);
@@ -49,6 +51,7 @@ function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
   preloadModulesURIs.push(uri);
   groupName && preloadBundleGroupsMap.set(groupName, true);
   preloadModuleIntegrities.set(uri, integrity);
+  preloadModuleIncludedModules.push(...includedModules);
 }
 async function getPreloadModulesMeta(specifier, viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending) {
   const {exclude = [], external = {}, groups = {}} = bundleConfig;
@@ -92,3 +95,8 @@ async function getPreloadModulesMeta(specifier, viewPreloads, bundleConfig, modu
     }
   }
 }
+function getPreloadModuleList(viewPreloads) {
+  if (process.env.PRELOAD_INCLUDED_MODULES === "true")
+    return [...new Set(viewPreloads.specifiers), ...new Set(viewPreloads.includedModules)];
+  return [...new Set(viewPreloads.specifiers)];
+}

package/build/cjs/linkers/utils.cjs

@@ -52,6 +52,7 @@ function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironm
   };
   const lwrEnv = {
     SSR: false,
+    SSREnabled: !!viewInfo.ssr,
     ...(0, import_shared_utils.buildEnvironmentContext)(runtimeParams)
   };
   let warnMessages = `console.group('Server-side rendering warnings:');`;

package/build/cjs/linkers/view_bootstrap.cjs

@@ -100,6 +100,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const viewPreloads = {
     uris: [],
     specifiers: [],
+    includedModules: [],
     groups: new Map(),
     integrities: new Map()
   };
@@ -209,7 +210,9 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       const specifier = graph.graphs[0].specifier;
       const uri = graph.uriMap[specifier];
       const integrity = (0, import_utils2.getBundleIntegrity)(graph, specifier);
-      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads);
+      const bundleDef = graph.linkedDefinitions[specifier];
+      const includedModules = bundleDef?.bundleRecord ? bundleDef.bundleRecord.includedModules : [];
+      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads, includedModules);
       if (bundle) {
         for (const depSpecifier of graph.graphs[0].static) {
           const depUri = getPreloadUri(depSpecifier, graph.uriMap);
@@ -251,7 +254,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       rootComponents,
       serverData,
       ...isAMD && {requiredModules: requiredAmdModules},
-      ...isAMD && {preloadModules: viewPreloads.specifiers}
+      ...isAMD && {preloadModules: (0, import_preload_utils.getPreloadModuleList)(viewPreloads)}
     }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
   }
   if (!isAMD && hmrEnabled) {

package/build/es/index.d.ts

@@ -45,6 +45,7 @@ export declare class LwrViewRegistry implements ViewRegistry {
     getView(viewId: ViewIdentity): Promise<CompiledView>;
     hasViewDefinition(view: View, viewParams: ViewParams, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, renderOptions?: RenderOptions): boolean;
     getViewDefinition(view: View, viewParams: ViewParams, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, renderOptions?: RenderOptions): Promise<LinkedViewDefinition>;
+    private getLwrResourcesPlaceHolder;
     private renderView;
     private render;
     private metadataCache;

package/build/es/index.js

@@ -1,6 +1,7 @@
-import { InflightTasks, createStringBuilder, extractMetadataFromHtml, getCacheKeyFromJson, getFeatureFlags, getSpecifier, isLocalDev, normalizeResourcePath, shortestTtl, isRelative, } from '@lwrjs/shared-utils';
+import { LWC_VERSION } from '@lwrjs/config';
+import { InflightTasks, addHeadMarkup, addToHead, createStringBuilder, extractMetadataFromHtml, getCacheKeyFromJson, getFeatureFlags, getSpecifier, isLocalDev, isRelative, normalizeResourcePath, shortestTtl, } from '@lwrjs/shared-utils';
 import { getTracer, ViewSpan } from '@lwrjs/instrumentation';
-import { generateViewNonce, getViewNonce, normalizeRenderOptions, normalizeRenderedResult, reduceSourceAssetReferences, getViewDefCacheKey, } from './utils.js';
+import { generateHtmlTag, generateViewNonce, getViewDefCacheKey, getViewNonce, normalizeRenderOptions, normalizeRenderedResult, reduceSourceAssetReferences, } from './utils.js';
 import { linkLwrResources } from './linkers/link-lwr-resources.js';
 // TODO: investigate perf impact W-16056356
 import { LRUCache } from 'lru-cache';
@@ -8,19 +9,31 @@ import { createHash } from 'crypto';
 import { LwrError, LwrServerError, descriptions, logger } from '@lwrjs/diagnostics';
 export { LwrViewHandler } from './view-handler.js';
 export class LwrViewRegistry {
+    name;
+    viewProviders = [];
+    // Cache of compiled views retrieved from the viewProviders
+    //  Cache key: ViewIdentity
+    compiledViews = new Map();
+    // Cache of linked view definitions, keyed by the View
+    //  Cache key: View
+    viewDefinitions;
+    resourceRegistry;
+    moduleRegistry;
+    moduleBundler;
+    assetRegistry;
+    globalConfig;
+    appEmitter;
+    globalData;
+    runtimeEnvironment;
+    immutableAssets = new Map();
+    viewTransformers;
+    // Cache of unresolved view definitions
+    //  Cache key: View + View Params
+    //
+    // Pending view definitions are tracked to prevent concurrent resolution of the same view.
+    // Subsequent requests for the same view will await the original promise.
+    pendingViewDefinitions = new InflightTasks();
     constructor(context, globalConfig) {
-        this.viewProviders = [];
-        // Cache of compiled views retrieved from the viewProviders
-        //  Cache key: ViewIdentity
-        this.compiledViews = new Map();
-        this.immutableAssets = new Map();
-        // Cache of unresolved view definitions
-        //  Cache key: View + View Params
-        //
-        // Pending view definitions are tracked to prevent concurrent resolution of the same view.
-        // Subsequent requests for the same view will await the original promise.
-        this.pendingViewDefinitions = new InflightTasks();
-        this.metadataCache = new Map();
         this.name = 'lwr-view-registry';
         this.resourceRegistry = context.resourceRegistry;
         this.runtimeEnvironment = context.runtimeEnvironment;
@@ -39,6 +52,12 @@ export class LwrViewRegistry {
                 logger.verbose(`View evicted from cache ${key}`);
             },
         });
+        this.metadataCache = new LRUCache({
+            max: parseInt(process.env.VIEW_METADATA_CACHE_SIZE ?? '500', 10),
+            dispose: (_value, key) => {
+                logger.verbose(`Metadata evicted from cache ${key}`);
+            },
+        });
         // Observers for cached entries external dependencies -- view templates, modules, and assets
         observer.onViewSourceChange(({ payload }) => this.onViewSourceChange(payload));
         observer.onModuleDefinitionChange(({ payload }) => this.onModuleDefinitionChange(payload));
@@ -196,13 +215,16 @@ export class LwrViewRegistry {
             const updatableViewParams = { ...viewParams };
             generateViewNonce(updatableViewParams);
             const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
-            const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => getTracer().trace({
+            const pendingViewDefCacheKeyHashed = createHash('md5')
+                .update(pendingViewDefCacheKey)
+                .digest('hex');
+            const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKeyHashed, () => getTracer().trace({
                 name: ViewSpan.RenderView,
                 attributes: {
                     view: view.id,
                     ssr: view.bootstrap?.ssr === true,
                 },
-            }, () => this.renderView(view, updatableViewParams, runtimeEnvironment, runtimeParams, pendingViewDefCacheKey, renderOptions)));
+            }, () => this.renderView(view, updatableViewParams, runtimeEnvironment, runtimeParams, pendingViewDefCacheKeyHashed, renderOptions)));
             // Once the view is generated add the nonce to the response so it can be cached and then added to the headers
             viewDefinition.nonce = getViewNonce(updatableViewParams);
             const route = this.globalConfig.routes.find((r) => r.id === view.id);
@@ -236,9 +258,17 @@ export class LwrViewRegistry {
             throw new LwrServerError(descriptions.SERVER.UNEXPECTED_ERROR(message));
         }
     }
+    getLwrResourcesPlaceHolder(view, runtimeEnvironment, runtimeParams) {
+        // Unlike the view definiton cache key which is a lot more open ended, we only
+        // need this cache key to vary for critical items like ?debug, locale, basePath, etc
+        // Note: hardcoding freeze assets here because it shouldn't matter for this key.
+        const resourcesCacheKey = getViewDefCacheKey(view, runtimeEnvironment, true, runtimeParams);
+        const resourcesCacheKeyHashed = createHash('md5').update(resourcesCacheKey).digest('hex');
+        return `__LWR_RESOURCES__${view.id}${resourcesCacheKeyHashed}`;
+    }
     async renderView(view, viewParams, runtimeEnvironment, runtimeParams, viewCacheKey, renderOptions) {
         const { id, contentTemplate, rootComponent, layoutTemplate } = view;
-        const lwrResourcesId = `__LWR_RESOURCES__${Date.now()}`;
+        const lwrResourcesId = this.getLwrResourcesPlaceHolder(view, runtimeEnvironment, runtimeParams);
         const renderedContent = await this.render({ id, contentTemplate, rootComponent }, { ...viewParams, lwr_resources: lwrResourcesId }, runtimeParams, runtimeEnvironment);
         // normalize the renderOptions provided by the CompiledView content with the request options.
         let normalizedRenderOptions = normalizeRenderOptions(this.runtimeEnvironment, renderedContent.options, renderOptions);
@@ -339,37 +369,71 @@ export class LwrViewRegistry {
             ...normalizedResult,
         };
     }
+    metadataCache;
     async link(renderedView, viewContext) {
         const { view, viewParams, runtimeEnvironment: runtimeEnv, runtimeParams, renderOptions, contentIds, importer, viewCacheKey, } = viewContext;
         const { skipMetadataCollection, freezeAssets } = renderOptions;
         const { lwrResourcesId } = contentIds;
         const { moduleRegistry, resourceRegistry, moduleBundler } = this;
         const runtimeEnvironment = { ...runtimeEnv, immutableAssets: freezeAssets };
+        const isSSR = view.bootstrap?.ssr === true;
         // normalize/extract metadata
         const { renderedView: renderedViewContent, metadata: renderedViewMetadata, compiledView: { immutable = true }, } = renderedView;
+        let traceId;
         const { linkedMetadata, stringBuilder } = getTracer().trace({
             name: ViewSpan.ParseView,
             attributes: {
                 view: view.id,
-                ssr: view.bootstrap?.ssr === true,
+                ssr: isSSR,
             },
-        }, () => {
-            let linkedMetadata = renderedViewMetadata;
-            if (!skipMetadataCollection) {
-                // Create a unique key based on view ID and content hash
-                const contentHash = createHash('md5').update(renderedViewContent).digest('hex');
-                const cacheKey = `${view.id}:${contentHash}`;
-                if (this.metadataCache.has(cacheKey)) {
-                    linkedMetadata = this.metadataCache.get(cacheKey);
-                }
-                else {
-                    linkedMetadata = extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
-                    this.metadataCache.set(cacheKey, linkedMetadata);
-                }
-            }
+        }, (span) => {
+            traceId = span.traceId;
             const stringBuilder = createStringBuilder(renderedViewContent);
-            return { linkedMetadata, stringBuilder };
+            if (skipMetadataCollection) {
+                return { linkedMetadata: renderedViewMetadata, stringBuilder };
+            }
+            // Create a unique key based on view ID and content hash
+            const contentHash = createHash('md5').update(renderedViewContent).digest('hex');
+            const cacheKey = `${view.id}:${contentHash}`;
+            let metadata;
+            if (this.metadataCache.has(cacheKey)) {
+                metadata = this.metadataCache.get(cacheKey);
+            }
+            else {
+                metadata = extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
+                this.metadataCache.set(cacheKey, metadata);
+            }
+            return {
+                linkedMetadata: {
+                    ...renderedViewMetadata,
+                    customElements: metadata.customElements,
+                    assetReferences: metadata.assetReferences,
+                },
+                stringBuilder,
+            };
         });
+        // Add distributed tracing meta tag to pass tracing info to the client
+        // {version}-{traceId}-{spanId}-{sampleDecision} and version is always 00
+        if (!getFeatureFlags().DISABLE_B3_TRACING && traceId && runtimeParams.viewSpanID) {
+            const content = `00-${traceId}-${runtimeParams.viewSpanID}-01`;
+            addHeadMarkup([{ meta: [{ name: 'traceparent', content }] }], stringBuilder);
+        }
+        // If the SSR compiler is enabled then inline the @lwc/ssr-client-utils/register-lwc-style script for style de-duplication
+        // re-enable logger.error below with W-18004123 after the app has integrated the register-lwc-style resource
+        if (isSSR && getFeatureFlags().SSR_COMPILER_ENABLED) {
+            const ssrUtils = await resourceRegistry.getResource({ specifier: 'register-lwc-style.js', version: LWC_VERSION }, runtimeEnvironment, runtimeParams);
+            if (!ssrUtils?.src) {
+                // logger.error('Failed to find script: register-lwc-style.js');
+            }
+            else {
+                addToHead(await generateHtmlTag(ssrUtils), stringBuilder);
+                linkedMetadata.assetReferences.push({
+                    url: ssrUtils.src,
+                    relative: isRelative(ssrUtils.src),
+                    integrity: ssrUtils.integrity,
+                });
+            }
+        }
         const mergedViewContext = {
             ...viewContext,
             config: this.globalConfig,
@@ -408,24 +472,25 @@ export class LwrViewRegistry {
                 // Use the same cache key for the link stage
                 viewLinkCacheKey: viewCacheKey,
             });
+            const assetReferences = [...linkedMetadata.assetReferences];
             if (viewRecord.resources?.length) {
-                linkedMetadata.assetReferences.push(...viewRecord.resources.reduce((res, asset) => {
-                    if (!asset.src)
-                        return res;
-                    res.push({
-                        url: asset.src,
-                        relative: isRelative(asset.src),
-                        integrity: asset.integrity,
+                for (const resource of viewRecord.resources) {
+                    if (!resource.src) {
+                        continue;
+                    }
+                    assetReferences.push({
+                        url: resource.src,
+                        relative: isRelative(resource.src),
+                        integrity: resource.integrity,
                     });
-                    return res;
-                }, []));
+                }
             }
             return {
                 // ...viewDefinition,
                 renderedView: linkedView,
                 immutable,
                 viewRecord: {
-                    assetReferences: reduceSourceAssetReferences(linkedMetadata.assetReferences),
+                    assetReferences: reduceSourceAssetReferences(assetReferences),
                     ...viewRecord,
                     serverBundles: linkedMetadata.serverBundles,
                 },

package/build/es/linkers/legacy_view_bootstrap.js

@@ -3,7 +3,7 @@ import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPr
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { addExternalScriptNonce, generateHtmlTag, getModuleResource, getModuleResourceByUri, getViewNonce, getModuleGraphCacheKey, } from '../utils.js';
 import { flattenCustomElements, getBundleIntegrity, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
-import { setPreloadModulesMeta, getPreloadModulesMeta } from './preload-utils.js';
+import { setPreloadModulesMeta, getPreloadModulesMeta, getPreloadModuleList, } from './preload-utils.js';
 import { LRUCache } from 'lru-cache';
 function includeIdFactory(bundleConfig) {
     return (moduleRef) => {
@@ -103,6 +103,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const viewPreloads = {
         uris: [],
         specifiers: [],
+        includedModules: [],
         groups: new Map(),
         integrities: new Map(),
     };
@@ -174,6 +175,10 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             bootstrapModuleGraph = moduleGraphsCache.get(bootstrapModuleGraphCacheKey);
         }
         else {
+            logger.info({
+                label: 'view-registry',
+                message: `Cache miss for ServerGenerate, cache key: ${bootstrapModuleGraphCacheKey}`,
+            });
             bootstrapModuleGraph = await getModuleGraphs(bootstrapSpecifier, { includeUris: true, includeLinkedDefinitions: true, depth }, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
             enableModuleGraphsCache &&
                 moduleGraphsCache.set(bootstrapModuleGraphCacheKey, bootstrapModuleGraph);
@@ -262,7 +267,9 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             const specifier = graph.graphs[0].specifier;
             const uri = graph.uriMap[specifier];
             const integrity = getBundleIntegrity(graph, specifier);
-            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads);
+            const bundleDef = graph.linkedDefinitions[specifier];
+            const includedModules = bundleDef?.bundleRecord ? bundleDef.bundleRecord.includedModules : [];
+            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads, includedModules);
             // PRELOAD custom element static deps as link resources when bundling is ON
             if (bundle) {
                 for (const depSpecifier of graph.graphs[0].static) {
@@ -319,7 +326,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             serverData,
             ...(isAMD && { requiredModules: requiredAmdModules }),
             // in AMD we need to tell the loader what modules we are preloading
-            ...(isAMD && { preloadModules: viewPreloads.specifiers }),
+            ...(isAMD && { preloadModules: getPreloadModuleList(viewPreloads) }),
         }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
     }
     if (!isAMD && hmrEnabled) {

package/build/es/linkers/preload-utils.d.ts

@@ -4,15 +4,17 @@ export type ViewPreloads = {
     uris: string[];
     specifiers: string[];
     integrities: Map<string, string | undefined>;
+    includedModules: string[];
 };
 /**
  * keeps track of preloadModules metadata
  */
-export declare function setPreloadModulesMeta(specifier: string, uri: string, integrity: string | undefined, groups: BundleGroups, preloads: ViewPreloads): void;
+export declare function setPreloadModulesMeta(specifier: string, uri: string, integrity: string | undefined, groups: BundleGroups, preloads: ViewPreloads, includedModules?: string[]): void;
 /**
  * Recursively gets preloadModules metadata starting with a specifier
  * Note: don't call me unless you got bundles
  */
 export declare function getPreloadModulesMeta(specifier: string, // un-versioned specifier
 viewPreloads: ViewPreloads, bundleConfig: BundleConfig, moduleRegistry: ModuleRegistry, defRegistry: ModuleBundler, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, pending?: Map<string, boolean>): Promise<void>;
+export declare function getPreloadModuleList(viewPreloads: ViewPreloads): string[];
 //# sourceMappingURL=preload-utils.d.ts.map

package/build/es/linkers/preload-utils.js

@@ -3,7 +3,7 @@ import { explodeSpecifier, getGroupName, getVersionedModuleId, normalizeVersionT
 /**
  * keeps track of preloadModules metadata
  */
-export function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
+export function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads, includedModules = []) {
     // Throw a very specific error if we get this back and the uri property is not set
     if (!uri) {
         throw new LwrInvalidError(descriptions.INVALID.PRELOAD_MODULE(specifier));
@@ -19,6 +19,7 @@ export function setPreloadModulesMeta(specifier, uri, integrity, groups, preload
     const preloadBundleGroupsMap = preloads.groups;
     const preloadModulesURIs = preloads.uris;
     const preloadModuleIntegrities = preloads.integrities;
+    const preloadModuleIncludedModules = preloads.includedModules;
     preloadModulesSpecifiers.push(specifier);
     const { specifier: unversionedSpecifier } = explodeSpecifier(specifier);
     const groupName = getGroupName(unversionedSpecifier, groups);
@@ -29,6 +30,7 @@ export function setPreloadModulesMeta(specifier, uri, integrity, groups, preload
     preloadModulesURIs.push(uri);
     groupName && preloadBundleGroupsMap.set(groupName, true);
     preloadModuleIntegrities.set(uri, integrity);
+    preloadModuleIncludedModules.push(...includedModules);
 }
 /**
  * Recursively gets preloadModules metadata starting with a specifier
@@ -85,4 +87,9 @@ viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, run
         }
     }
 }
+export function getPreloadModuleList(viewPreloads) {
+    if (process.env.PRELOAD_INCLUDED_MODULES === 'true')
+        return [...new Set(viewPreloads.specifiers), ...new Set(viewPreloads.includedModules)];
+    return [...new Set(viewPreloads.specifiers)];
+}
 //# sourceMappingURL=preload-utils.js.map

package/build/es/linkers/utils.js

@@ -25,6 +25,7 @@ export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeE
     const lwrEnv = {
         // Note: SSR is always false because this script is executed on the client
         SSR: false,
+        SSREnabled: !!viewInfo.ssr,
         // Used by `lwr/environment`
         ...buildEnvironmentContext(runtimeParams),
     };

package/build/es/linkers/view_bootstrap.js

@@ -5,7 +5,7 @@ import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { addExternalScriptNonce, generateHtmlTag, getModuleResourceByUri, getViewNonce } from '../utils.js';
 import { flattenCustomElements, getBundleIntegrity, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
 import { getModuleGraphCacheKey } from '../utils.js';
-import { setPreloadModulesMeta, getPreloadModulesMeta } from './preload-utils.js';
+import { setPreloadModulesMeta, getPreloadModulesMeta, getPreloadModuleList, } from './preload-utils.js';
 // `getModuleGraphs` is very expensive and does not need to be recomputed every time.
 // Note: we use the same cache key passed in from the top level view-registry for consistency
 const moduleGraphsCache = new LRUCache({
@@ -87,6 +87,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const viewPreloads = {
         uris: [],
         specifiers: [],
+        includedModules: [],
         groups: new Map(),
         integrities: new Map(),
     };
@@ -232,7 +233,9 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             const specifier = graph.graphs[0].specifier;
             const uri = graph.uriMap[specifier];
             const integrity = getBundleIntegrity(graph, specifier);
-            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads);
+            const bundleDef = graph.linkedDefinitions[specifier];
+            const includedModules = bundleDef?.bundleRecord ? bundleDef.bundleRecord.includedModules : [];
+            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads, includedModules);
             // PRELOAD custom element static deps as link resources when bundling is ON
             if (bundle) {
                 for (const depSpecifier of graph.graphs[0].static) {
@@ -281,7 +284,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             serverData,
             ...(isAMD && { requiredModules: requiredAmdModules }),
             // in AMD we need to tell the loader what modules we are preloading
-            ...(isAMD && { preloadModules: viewPreloads.specifiers }),
+            ...(isAMD && { preloadModules: getPreloadModuleList(viewPreloads) }),
         }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
     }
     if (!isAMD && hmrEnabled) {

package/build/es/view-handler.js

@@ -4,6 +4,10 @@ import { getTracer, ViewSpan } from '@lwrjs/instrumentation';
 import { generateHtmlTag, generateLinkHeaders, generatePageContext, isViewResponse, isViewDefinitionResponse, toJsonFormat, } from './utils.js';
 import { LwrApplicationError, LwrError, descriptions } from '@lwrjs/diagnostics';
 export class LwrViewHandler {
+    globalConfig;
+    routeHandlers;
+    viewRegistry;
+    moduleRegistry;
     constructor(context, globalConfig) {
         this.globalConfig = globalConfig;
         this.routeHandlers = context.routeHandlers;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.2-alpha.8",
+    "version": "0.17.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,20 +33,21 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.17.2-alpha.8",
-        "@lwrjs/diagnostics": "0.17.2-alpha.8",
-        "@lwrjs/instrumentation": "0.17.2-alpha.8",
-        "@lwrjs/shared-utils": "0.17.2-alpha.8",
+        "@lwrjs/app-service": "0.17.2",
+        "@lwrjs/config": "0.17.2",
+        "@lwrjs/diagnostics": "0.17.2",
+        "@lwrjs/instrumentation": "0.17.2",
+        "@lwrjs/shared-utils": "0.17.2",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.17.2-alpha.8"
+        "@lwrjs/types": "0.17.2"
     },
     "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
     },
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "ee1182e7d876cf92e579ee88c48b25047486b4f8"
+    "gitHead": "d64d8888a28da36c05e3d8d9baf51416551863a9"
 }