@lwrjs/view-registry 0.13.0-alpha.9 → 0.13.0

package/build/cjs/index.cjs

@@ -136,17 +136,15 @@ var LwrViewRegistry = class {
     }
     throw new Error(`No View provider was able to resolve a view for template: ${viewId.contentTemplate}`);
   }
-  async getView(viewId, skipCaching = false) {
+  async getView(viewId) {
     const {contentTemplate, rootComponent} = viewId;
     const compiledViewCacheKey = (0, import_shared_utils.getCacheKeyFromJson)({contentTemplate, rootComponent});
     import_diagnostics.logger.debug(`[view-registry][getView] compiledViewCacheKey=${compiledViewCacheKey}`);
-    if (!skipCaching && this.compiledViews.has(compiledViewCacheKey)) {
+    if (this.compiledViews.has(compiledViewCacheKey)) {
       return this.compiledViews.get(compiledViewCacheKey);
     }
     const compiledView = await this.delegateGetView(viewId);
-    if (!skipCaching) {
-      this.compiledViews.set(compiledViewCacheKey, compiledView);
-    }
+    this.compiledViews.set(compiledViewCacheKey, compiledView);
     return compiledView;
   }
   hasViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
@@ -161,7 +159,8 @@ var LwrViewRegistry = class {
       freezeAssets,
       locale: runtimeParams?.locale,
       basePath: runtimeParams?.basePath,
-      debug: runtimeEnvironment.debug
+      debug: runtimeEnvironment.debug,
+      nonceEnabled: (0, import_shared_utils.getFeatureFlags)().ENABLE_NONCE
     });
     import_diagnostics.logger.debug(`[view-registry][hasViewDefinition] viewDefId=${viewDefId}`);
     const viewParamKey = viewParamCacheKey ? (0, import_shared_utils.getCacheKeyFromJson)(viewParamCacheKey) : (0, import_shared_utils.getCacheKeyFromJson)(viewParams);
@@ -176,19 +175,19 @@ var LwrViewRegistry = class {
   }
   async getViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
     try {
-      const {skipCaching, freezeAssets, viewParamCacheKey} = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderOptions);
+      const {freezeAssets, viewParamCacheKey} = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderOptions);
       const viewDefCacheKey = (0, import_shared_utils.getCacheKeyFromJson)({
         ...view,
         freezeAssets,
         locale: runtimeParams?.locale,
         basePath: runtimeParams?.basePath,
-        debug: runtimeEnvironment.debug
+        debug: runtimeEnvironment.debug,
+        nonceEnabled: (0, import_shared_utils.getFeatureFlags)().ENABLE_NONCE
       });
       import_diagnostics.logger.debug(`[view-registry][getViewDefinition] viewDefCacheKey=${viewDefCacheKey}`);
       const viewParamKey = viewParamCacheKey ? (0, import_shared_utils.getCacheKeyFromJson)(viewParamCacheKey) : (0, import_shared_utils.getCacheKeyFromJson)(viewParams);
       import_diagnostics.logger.debug(`[view-registry][getViewDefinition] viewParamKey=${viewParamKey}`);
-      const cacheDisabled = process.env.NOCACHE === "true" || skipCaching;
-      if (cacheDisabled === false && this.viewDefinitions.has(viewDefCacheKey)) {
+      if (this.viewDefinitions.has(viewDefCacheKey)) {
         const viewDefinition2 = this.viewDefinitions.get(viewDefCacheKey);
         if (viewDefinition2 && viewDefinition2.paramKey === viewParamKey && viewDefinition2.viewDefinition.immutable) {
           return viewDefinition2.viewDefinition;
@@ -205,17 +204,16 @@ var LwrViewRegistry = class {
         }
       }, () => this.renderView(view, updatableViewParams, runtimeEnvironment, runtimeParams, renderOptions)));
       viewDefinition.nonce = (0, import_utils.getViewNonce)(updatableViewParams);
-      if (cacheDisabled === false) {
-        const route = this.globalConfig.routes.find((r) => r.id === view.id);
-        const ttl = (0, import_shared_utils.shortestTtl)(viewDefinition.cache?.ttl, route?.cache?.ttl);
-        if (ttl !== 0) {
-          this.viewDefinitions.set(viewDefCacheKey, {
-            view,
-            viewDefinition,
-            paramKey: viewParamKey
-          }, {ttl: ttl ? ttl * 1e3 : void 0});
-        }
-      }
+      const route = this.globalConfig.routes.find((r) => r.id === view.id);
+      const maxViewCacheTtl = (0, import_shared_utils.getFeatureFlags)().MAX_VIEW_CACHE_TTL;
+      const maxTtl = maxViewCacheTtl && parseInt(maxViewCacheTtl, 10);
+      const leastTtl = (0, import_shared_utils.shortestTtl)(viewDefinition.cache?.ttl, route?.cache?.ttl, maxTtl);
+      const ttl = leastTtl !== void 0 ? leastTtl === 0 ? 10 : leastTtl * 1e3 : void 0;
+      this.viewDefinitions.set(viewDefCacheKey, {
+        view,
+        viewDefinition,
+        paramKey: viewParamKey
+      }, {ttl});
       return viewDefinition;
     } catch (err) {
       if (err instanceof import_diagnostics.DiagnosticsError) {
@@ -230,7 +228,7 @@ var LwrViewRegistry = class {
   async renderView(view, viewParams, runtimeEnvironment, runtimeParams = {}, renderOptions) {
     const {id, contentTemplate, rootComponent, layoutTemplate} = view;
     const lwrResourcesId = `__LWR_RESOURCES__${Date.now()}`;
-    const renderedContent = await this.render({id, contentTemplate, rootComponent}, {...viewParams, lwr_resources: lwrResourcesId}, runtimeParams, renderOptions);
+    const renderedContent = await this.render({id, contentTemplate, rootComponent}, {...viewParams, lwr_resources: lwrResourcesId}, runtimeParams, runtimeEnvironment, renderOptions);
     let normalizedRenderOptions = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderedContent.options, renderOptions);
     const layout = layoutTemplate || renderedContent.compiledView.layoutTemplate;
     if (!layout) {
@@ -250,7 +248,7 @@ var LwrViewRegistry = class {
       ...viewParams,
       body: renderedContent.renderedView,
       lwr_resources: lwrResourcesId
-    }, runtimeParams);
+    }, runtimeParams, runtimeEnvironment);
     normalizedRenderOptions = (0, import_utils.normalizeRenderOptions)(this.runtimeEnvironment, renderedLayout.options, normalizedRenderOptions);
     const renderedViewDef = await this.link({
       ...renderedLayout,
@@ -288,16 +286,16 @@ var LwrViewRegistry = class {
     });
     return renderedViewDef;
   }
-  async render(viewId, viewParams, runtimeParams, renderOptions) {
+  async render(viewId, viewParams, runtimeParams, runtimeEnvironment, renderOptions) {
     const globalContext = this.globalData;
     const {id, rootComponent, contentTemplate} = viewId;
-    const compiledView = await this.getView({id, contentTemplate, rootComponent}, renderOptions?.skipCaching);
+    const compiledView = await this.getView({id, contentTemplate, rootComponent});
     const result = await compiledView.render({
       ...runtimeParams,
       ...globalContext,
       ...compiledView.properties,
       ...viewParams
-    });
+    }, runtimeEnvironment);
     const normalizedResult = (0, import_utils.normalizeRenderedResult)(result);
     return {
       compiledView,
@@ -363,7 +361,8 @@ var LwrViewRegistry = class {
       renderedView: linkedAssetContent,
       immutable,
       viewRecord: {
-        assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences)
+        assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences),
+        moduleResources: []
       },
       cache: {ttl: pageTtl}
     };

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -49,9 +49,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     resourceRegistry,
     viewMetadata
   } = resourceContext;
-  const {lwrVersion, format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
+  const {format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
   const {customElements, serverData, serverDebug} = viewMetadata;
-  const version = lwrVersion;
   const isAMD = format === "amd";
   const {bundleConfig} = resourceContext;
   const {external = {}, exclude = []} = bundleConfig;
@@ -98,9 +97,11 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const viewPreloads = {
     uris: [],
     specifiers: [],
-    groups: new Map()
+    groups: new Map(),
+    integrities: new Map()
   };
   const isSSR = view.bootstrap?.ssr;
+  const version = view.bootstrap?.lwrVersion;
   const nonce = (0, import_utils.getViewNonce)(viewParams);
   let bootstrapModuleRef, versionedSpecifier = bootstrapSpecifier;
   const customElementsRecords = [];
@@ -128,7 +129,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       }
       (0, import_utils.addExternalScriptNonce)(def, nonce);
       requiredResources.push(def);
-      const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, runtimeParams);
+      const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, {...runtimeParams, ignoreDebug: true});
       if (!errorShimDef) {
         throw Error("Failed to find definition of resource: lwr-error-shim.js");
       }
@@ -149,11 +150,13 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     if (!uri) {
       throw Error(`Invalid Module Resource ${versionedSpecifier}`);
     }
-    moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR, nonce}));
+    const integrity = (0, import_utils2.getBundleIntegrity)(bootstrapModuleGraph, versionedSpecifier);
+    moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {integrity, isPreload: false, isSSR, nonce}));
     for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
       const uri2 = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
       if (uri2) {
-        (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
+        const integrity2 = (0, import_utils2.getBundleIntegrity)(bootstrapModuleGraph, depSpecifier);
+        (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, integrity2, groups, viewPreloads);
       }
     }
     if ((0, import_shared_utils.isBundler)(defRegistry)) {
@@ -190,12 +193,14 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     if (!isSSR || (0, import_shared_utils.getHydrateDirective)(props)) {
       const specifier = graph.graphs[0].specifier;
       const uri = graph.uriMap[specifier];
-      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, groups, viewPreloads);
+      const integrity = (0, import_utils2.getBundleIntegrity)(graph, specifier);
+      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads);
       if (bundle) {
         for (const depSpecifier of graph.graphs[0].static) {
-          const uri2 = getPreloadUri(depSpecifier, graph.uriMap);
-          if (uri2) {
-            (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
+          const depUri = getPreloadUri(depSpecifier, graph.uriMap);
+          if (depUri) {
+            const integrity2 = (0, import_utils2.getBundleIntegrity)(graph, depSpecifier);
+            (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, depUri, integrity2, groups, viewPreloads);
           }
         }
       }
@@ -214,11 +219,19 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     }
   }));
   if (viewContainsLiveElements) {
+    if ((0, import_shared_utils.isLocalDev)()) {
+      const localDevSpecifier = "lwr_local_dev/bootstrap";
+      rootComponents.push(localDevSpecifier);
+      const localDevMod = await (0, import_utils.getModuleResource)({specifier: localDevSpecifier, version: ""}, runtimeEnvironment, {}, moduleRegistry, runtimeParams);
+      if (localDevMod.src)
+        imports[localDevSpecifier] = localDevMod.src;
+    }
     configResources.unshift((0, import_utils2.getViewBootstrapConfigurationResource)({
       id: view.id,
       url: viewParams?.page?.url,
       configAsSrc: view.bootstrap?.configAsSrc || false,
-      mixedMode: view.bootstrap?.mixedMode || false
+      mixedMode: view.bootstrap?.mixedMode || false,
+      nonce: viewParams?.page?.nonce
     }, {
       appId: appIdentity.appName,
       bootstrapModule: versionedSpecifier,
@@ -238,7 +251,13 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   }
   const dedupedUris = [...new Set(viewPreloads.uris)];
   for (const preloadUri of dedupedUris) {
-    moduleResources.push((0, import_utils.getModuleResourceByUri)(preloadUri, runtimeEnvironment, {isPreload: true, isSSR, nonce}));
+    const integrity = viewPreloads.integrities.get(preloadUri);
+    moduleResources.push((0, import_utils.getModuleResourceByUri)(preloadUri, runtimeEnvironment, {
+      integrity,
+      isPreload: true,
+      isSSR,
+      nonce
+    }));
   }
   const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(import_utils.generateHtmlTag));
   return {
@@ -246,6 +265,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     viewRecord: {
       resources: requiredResources,
       customElements: customElementsRecords,
+      moduleResources,
       bootstrapModule: bootstrapModuleRef
     }
   };

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

@@ -29,7 +29,7 @@ __export(exports, {
 });
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-function setPreloadModulesMeta(specifier, uri, groups, preloads) {
+function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
   if (!uri) {
     throw (0, import_diagnostics.createSingleDiagnosticError)({
       description: import_diagnostics.descriptions.UNRESOLVABLE.PRELOAD_MODULE(specifier)
@@ -41,6 +41,7 @@ function setPreloadModulesMeta(specifier, uri, groups, preloads) {
   const preloadModulesSpecifiers = preloads.specifiers;
   const preloadBundleGroupsMap = preloads.groups;
   const preloadModulesURIs = preloads.uris;
+  const preloadModuleIntegrities = preloads.integrities;
   preloadModulesSpecifiers.push(specifier);
   const {specifier: unversionedSpecifier} = (0, import_shared_utils.explodeSpecifier)(specifier);
   const groupName = (0, import_shared_utils.getGroupName)(unversionedSpecifier, groups);
@@ -49,6 +50,7 @@ function setPreloadModulesMeta(specifier, uri, groups, preloads) {
   }
   preloadModulesURIs.push(uri);
   groupName && preloadBundleGroupsMap.set(groupName, true);
+  preloadModuleIntegrities.set(uri, integrity);
 }
 async function getPreloadModulesMeta(specifier, viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending) {
   const {exclude = [], external = {}, groups = {}} = bundleConfig;
@@ -72,9 +74,10 @@ async function getPreloadModulesMeta(specifier, viewPreloads, bundleConfig, modu
     });
     const uri = await defRegistry.resolveModuleUri(versionedModuleId, runtimeEnvironment, runtimeParams);
     const normalizedSpecifier = versionedModuleId.version === import_shared_utils.VERSION_NOT_PROVIDED ? specifier : versionedModuleSpecifier;
-    setPreloadModulesMeta(normalizedSpecifier, uri, groups, viewPreloads);
+    const preloadModuleRecord = await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams);
+    const {integrity} = preloadModuleRecord;
+    setPreloadModulesMeta(normalizedSpecifier, uri, integrity, groups, viewPreloads);
     if (exclude.length || Object.keys(groups).length) {
-      const preloadModuleRecord = await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams);
       const {imports} = preloadModuleRecord.bundleRecord;
       if (imports) {
         if (!pending) {

package/build/cjs/linkers/utils.cjs

@@ -25,6 +25,7 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   flattenCustomElements: () => flattenCustomElements,
+  getBundleIntegrity: () => getBundleIntegrity,
   getViewBootstrapConfigurationResource: () => getViewBootstrapConfigurationResource,
   getViewHmrConfigurationResource: () => getViewHmrConfigurationResource
 });
@@ -72,6 +73,7 @@ function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironm
       type: CONTENT_TYPE,
       content: configString,
       inline: false,
+      nonce: viewInfo.nonce,
       src: url
     };
   } else {
@@ -129,3 +131,8 @@ function flattenCustomElements(arr, isSSR = false) {
   flatten(arr);
   return ret;
 }
+function getBundleIntegrity(bootstrapModuleGraph, versionedSpecifier) {
+  const def = bootstrapModuleGraph.linkedDefinitions[versionedSpecifier];
+  const integrity = def?.integrity;
+  return integrity;
+}

package/build/cjs/linkers/view_bootstrap.cjs

@@ -41,10 +41,9 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     resourceRegistry,
     viewMetadata
   } = resourceContext;
-  const {lwrVersion, format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
+  const {format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
   const {customElements, serverData, serverDebug} = viewMetadata;
   const defRegistry = bundle ? moduleBundler : moduleRegistry;
-  const version = lwrVersion;
   const isAMD = format === "amd";
   const depth = isAMD ? {static: import_shared_utils.GraphDepth.ALL, dynamic: 1} : {static: import_shared_utils.GraphDepth.NONE, dynamic: 1};
   const {bundleConfig} = resourceContext;
@@ -87,9 +86,11 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const viewPreloads = {
     uris: [],
     specifiers: [],
-    groups: new Map()
+    groups: new Map(),
+    integrities: new Map()
   };
   const isSSR = view.bootstrap?.ssr;
+  const version = view.bootstrap?.lwrVersion;
   const nonce = (0, import_utils.getViewNonce)(viewParams);
   let bootstrapModuleRef, versionedSpecifier = bootstrapSpecifier;
   let importMetadata = {imports: {}};
@@ -108,7 +109,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       }
       (0, import_utils.addExternalScriptNonce)(def, nonce);
       requiredResources.push(def);
-      const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, runtimeParams);
+      const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, {...runtimeParams, ignoreDebug: true});
       if (!errorShimDef) {
         throw Error("Failed to find definition of resource: lwr-error-shim.js");
       }
@@ -129,11 +130,13 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     if (!uri) {
       throw Error(`Invalid Module Resource ${versionedSpecifier}`);
     }
-    moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR, nonce}));
+    const integrity = (0, import_utils2.getBundleIntegrity)(bootstrapModuleGraph, versionedSpecifier);
+    moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {integrity, isPreload: false, isSSR, nonce}));
     for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
       const uri2 = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
       if (uri2) {
-        (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
+        const integrity2 = (0, import_utils2.getBundleIntegrity)(bootstrapModuleGraph, depSpecifier);
+        (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, integrity2, groups, viewPreloads);
       }
     }
     if ((0, import_shared_utils.isBundler)(defRegistry)) {
@@ -171,12 +174,14 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     if (!isSSR || (0, import_shared_utils.getHydrateDirective)(props)) {
       const specifier = graph.graphs[0].specifier;
       const uri = graph.uriMap[specifier];
-      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, groups, viewPreloads);
+      const integrity = (0, import_utils2.getBundleIntegrity)(graph, specifier);
+      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads);
       if (bundle) {
         for (const depSpecifier of graph.graphs[0].static) {
-          const uri2 = getPreloadUri(depSpecifier, graph.uriMap);
-          if (uri2) {
-            (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
+          const depUri = getPreloadUri(depSpecifier, graph.uriMap);
+          if (depUri) {
+            const integrity2 = (0, import_utils2.getBundleIntegrity)(graph, depSpecifier);
+            (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, depUri, integrity2, groups, viewPreloads);
           }
         }
       }
@@ -200,7 +205,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       id: view.id,
       url: viewParams?.page?.url,
       configAsSrc: view.bootstrap?.configAsSrc || false,
-      mixedMode: view.bootstrap?.mixedMode || false
+      mixedMode: view.bootstrap?.mixedMode || false,
+      nonce: viewParams?.page?.nonce
     }, {
       appId: appIdentity.appName,
       bootstrapModule: versionedSpecifier,
@@ -218,7 +224,13 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   }
   const dedupedUris = [...new Set(viewPreloads.uris)];
   for (const preloadUri of dedupedUris) {
-    moduleResources.push((0, import_utils.getModuleResourceByUri)(preloadUri, runtimeEnvironment, {isPreload: true, isSSR, nonce}));
+    const integrity = viewPreloads.integrities.get(preloadUri);
+    moduleResources.push((0, import_utils.getModuleResourceByUri)(preloadUri, runtimeEnvironment, {
+      integrity,
+      isPreload: true,
+      isSSR,
+      nonce
+    }));
   }
   const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(import_utils.generateHtmlTag));
   const mapping = (0, import_shared_utils.getMappingUriPrefix)(runtimeEnvironment, runtimeParams);
@@ -234,6 +246,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       customElements: customElementsRecords,
       endpoints,
       importMetadata,
+      moduleResources,
       bootstrapModule: bootstrapModuleRef
     }
   };

package/build/cjs/utils.cjs

@@ -45,15 +45,22 @@ var import_crypto = __toModule(require("crypto"));
 function generateExternalStyle(src) {
   return `<link rel="stylesheet" href="${src}">`;
 }
-function generateExternalScript(type = "application/javascript", src, async, defer, nonce) {
+function generateExternalScript(type = "application/javascript", src, async, defer, nonce, integrity) {
   let scriptLoadOrder = "";
   if (defer) {
     scriptLoadOrder = " defer";
   } else if (async) {
     scriptLoadOrder = " async";
   }
-  const nonceAttr = nonce ? ` nonce="${nonce}"` : "";
-  return `<script type="${type}"${scriptLoadOrder}${nonceAttr} src="${src}"></script>`;
+  let cspHashAttr = "";
+  if ((0, import_shared_utils.getFeatureFlags)().ENABLE_NONCE) {
+    if (integrity) {
+      cspHashAttr = ` integrity="${integrity}"`;
+    } else if (nonce) {
+      cspHashAttr = ` nonce="${nonce}"`;
+    }
+  }
+  return `<script type="${type}"${scriptLoadOrder}${cspHashAttr} src="${src}"></script>`;
 }
 function generateLinkPreloadTag({href, type}) {
   if (type === "module") {
@@ -62,19 +69,27 @@ function generateLinkPreloadTag({href, type}) {
     return `<link rel="preload" href="${href}" type="${type}" />`;
   }
 }
-function generateExternalTag({type, src = "", async, defer, isPreload, nonce}) {
+function generateExternalTag({
+  type,
+  src = "",
+  async,
+  defer,
+  isPreload,
+  nonce,
+  integrity
+}) {
   if (isPreload) {
     return generateLinkPreloadTag({href: src, type});
   } else if (type === "text/css") {
     return generateExternalStyle(src);
   } else {
-    return generateExternalScript(type, src, async, defer, nonce);
+    return generateExternalScript(type, src, async, defer, nonce, integrity);
   }
 }
 async function generateInlineTag({specifier, type, content, stream, nonce}) {
   const typeStr = type === "text/css" ? "" : ` type="${type}"`;
   const tag = type === "text/css" ? "style" : "script";
-  const nonceStr = nonce ? ` nonce="${nonce}"` : "";
+  const nonceStr = (0, import_shared_utils.getFeatureFlags)().ENABLE_NONCE && nonce && nonce ? ` nonce="${nonce}"` : "";
   if (!content && !stream) {
     throw new Error(`Invalid inline Resource Definition: must have either "content" or "stream": "${specifier}"`);
   }
@@ -122,7 +137,6 @@ function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions, baseR
   return {
     skipMetadataCollection: false,
     freezeAssets: runtimeEnvironment.immutableAssets,
-    skipCaching: false,
     viewParamCacheKey: null,
     ...baseRenderOptions,
     ...overrideRenderOptions
@@ -228,7 +242,7 @@ async function getModuleResource(moduleId, runtimeEnvironment, moduleResourceMet
   };
 }
 function getModuleResourceByUri(uri, runtimeEnvironment, moduleResourceMeta) {
-  const {isSSR = false, isPreload = false, nonce} = moduleResourceMeta;
+  const {integrity, isSSR = false, isPreload = false, nonce} = moduleResourceMeta;
   const {format} = runtimeEnvironment;
   return {
     src: uri,
@@ -236,6 +250,7 @@ function getModuleResourceByUri(uri, runtimeEnvironment, moduleResourceMeta) {
     async: !isSSR && isPreload,
     defer: isSSR,
     isPreload: format !== "amd" && isPreload,
+    integrity,
     nonce
   };
 }
@@ -259,18 +274,20 @@ async function createJsonModule(specifier, moduleRegistry, environment, params)
   };
 }
 function getViewNonce(viewParams) {
-  return viewParams?.page?.nonce;
+  return (0, import_shared_utils.getFeatureFlags)().ENABLE_NONCE ? viewParams?.page?.nonce : void 0;
 }
 function generateViewNonce(viewParams) {
-  const nonce = import_crypto.default.randomBytes(16).toString("base64");
-  if (!viewParams.page) {
-    viewParams.page = {nonce};
-  } else {
-    viewParams.page.nonce = nonce;
+  if ((0, import_shared_utils.getFeatureFlags)().ENABLE_NONCE) {
+    const nonce = import_crypto.default.randomBytes(16).toString("base64");
+    if (!viewParams.page) {
+      viewParams.page = {nonce};
+    } else {
+      viewParams.page.nonce = nonce;
+    }
   }
 }
 function addExternalScriptNonce(def, nonce) {
-  if (!def.inline) {
+  if (nonce && (0, import_shared_utils.getFeatureFlags)().ENABLE_NONCE && !def.inline) {
     def.nonce = nonce;
   }
 }

package/build/cjs/view-handler.cjs

@@ -130,6 +130,8 @@ var LwrViewHandler = class {
     const paths = {rootDir, assets, contentDir, layoutsDir};
     const locale = runtimeParams.locale;
     const basePath = runtimeParams.basePath;
+    const assetBasePath = runtimeParams.assetBasePath;
+    const uiBasePath = runtimeParams.assetBasePath;
     const viewApi = this.getBoundApi(viewRequest, route, runtimeEnvironment, runtimeParams);
     const response = await (0, import_instrumentation.getTracer)().trace({
       name: import_instrumentation.ViewSpan.ExecuteRouteHandler,
@@ -139,7 +141,7 @@ var LwrViewHandler = class {
       }
     }, async () => {
       try {
-        return await routeHandlerFn({...viewRequest, locale, basePath}, {route, viewApi, ...paths}, routeHandlerOptions);
+        return await routeHandlerFn({...viewRequest, locale, basePath, assetBasePath, uiBasePath}, {route, viewApi, ...paths}, routeHandlerOptions);
       } catch (err) {
         if (err instanceof import_diagnostics.DiagnosticsError) {
           throw err;
@@ -167,6 +169,9 @@ var LwrViewHandler = class {
   async getViewResponse(viewRequest, route, runtimeEnvironment, runtimeParams = {}, view, viewParams, renderOptions) {
     const {id, bootstrap} = route;
     const managedView = {...view, id, bootstrap};
+    if (view.locale) {
+      runtimeParams.locale = view.locale;
+    }
     const viewResponse = {
       view: managedView,
       viewParams,

package/build/es/index.d.ts

@@ -42,7 +42,7 @@ export declare class LwrViewRegistry implements ViewRegistry {
     addViewTransformers(transformers: ViewTransformPlugin[]): void;
     initializeViewProviders(): Promise<void[]>;
     delegateGetView(viewId: ViewIdentity): Promise<CompiledView>;
-    getView(viewId: ViewIdentity, skipCaching?: boolean): Promise<CompiledView>;
+    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 renderView;

package/build/es/index.js

@@ -1,7 +1,8 @@
-import { InflightTasks, createStringBuilder, extractMetadataFromHtml, getCacheKeyFromJson, getSpecifier, isLocalDev, normalizeResourcePath, shortestTtl, } from '@lwrjs/shared-utils';
+import { InflightTasks, createStringBuilder, extractMetadataFromHtml, getCacheKeyFromJson, getFeatureFlags, getSpecifier, isLocalDev, normalizeResourcePath, shortestTtl, } from '@lwrjs/shared-utils';
 import { getTracer, ViewSpan } from '@lwrjs/instrumentation';
 import { generateViewNonce, 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';
 import { DiagnosticsError, LwrServerError, createSingleDiagnosticError, descriptions, logger, } from '@lwrjs/diagnostics';
 export { LwrViewHandler } from './view-handler.js';
@@ -122,19 +123,16 @@ export class LwrViewRegistry {
         }
         throw new Error(`No View provider was able to resolve a view for template: ${viewId.contentTemplate}`);
     }
-    async getView(viewId, skipCaching = false) {
+    async getView(viewId) {
         const { contentTemplate, rootComponent } = viewId;
         const compiledViewCacheKey = getCacheKeyFromJson({ contentTemplate, rootComponent });
         logger.debug(`[view-registry][getView] compiledViewCacheKey=${compiledViewCacheKey}`);
         // use cached compiledView if available
-        if (!skipCaching && this.compiledViews.has(compiledViewCacheKey)) {
+        if (this.compiledViews.has(compiledViewCacheKey)) {
             return this.compiledViews.get(compiledViewCacheKey);
         }
         const compiledView = await this.delegateGetView(viewId);
-        // cache the compiled view
-        if (!skipCaching) {
-            this.compiledViews.set(compiledViewCacheKey, compiledView);
-        }
+        this.compiledViews.set(compiledViewCacheKey, compiledView);
         return compiledView;
     }
     hasViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
@@ -150,6 +148,8 @@ export class LwrViewRegistry {
             locale: runtimeParams?.locale,
             basePath: runtimeParams?.basePath,
             debug: runtimeEnvironment.debug,
+            // Add a variable on if the nonce is enabled
+            nonceEnabled: getFeatureFlags().ENABLE_NONCE,
         });
         logger.debug(`[view-registry][hasViewDefinition] viewDefId=${viewDefId}`);
         // viewParams is an unbounded object and can be very large (17MB/view for developer.salesforce.com). Allowing consumers
@@ -170,13 +170,15 @@ export class LwrViewRegistry {
     }
     async getViewDefinition(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions) {
         try {
-            const { skipCaching, freezeAssets, viewParamCacheKey } = normalizeRenderOptions(this.runtimeEnvironment, renderOptions);
+            const { freezeAssets, viewParamCacheKey } = normalizeRenderOptions(this.runtimeEnvironment, renderOptions);
             const viewDefCacheKey = getCacheKeyFromJson({
                 ...view,
                 freezeAssets,
                 locale: runtimeParams?.locale,
                 basePath: runtimeParams?.basePath,
                 debug: runtimeEnvironment.debug,
+                // Add a variable on if the nonce is enabled
+                nonceEnabled: getFeatureFlags().ENABLE_NONCE,
             });
             logger.debug(`[view-registry][getViewDefinition] viewDefCacheKey=${viewDefCacheKey}`);
             // viewParams is an unbounded object and can be very large (17MB/view for developer.salesforce.com). Allowing consumers
@@ -186,9 +188,8 @@ export class LwrViewRegistry {
                 ? getCacheKeyFromJson(viewParamCacheKey)
                 : getCacheKeyFromJson(viewParams);
             logger.debug(`[view-registry][getViewDefinition] viewParamKey=${viewParamKey}`);
-            const cacheDisabled = process.env.NOCACHE === 'true' || skipCaching;
             // important: cache key does not include the unbounded viewParams
-            if (cacheDisabled === false && this.viewDefinitions.has(viewDefCacheKey)) {
+            if (this.viewDefinitions.has(viewDefCacheKey)) {
                 const viewDefinition = this.viewDefinitions.get(viewDefCacheKey);
                 if (viewDefinition &&
                     viewDefinition.paramKey === viewParamKey &&
@@ -209,20 +210,19 @@ export class LwrViewRegistry {
             }, () => this.renderView(view, updatableViewParams, runtimeEnvironment, runtimeParams, 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);
-            if (cacheDisabled === false) {
-                const route = this.globalConfig.routes.find((r) => r.id === view.id);
-                const ttl = shortestTtl(viewDefinition.cache?.ttl, route?.cache?.ttl);
-                if (ttl !== 0) {
-                    // cache view definition for the shortest ttl or until it is the least recently used when ttl is undefined
-                    this.viewDefinitions.set(viewDefCacheKey, {
-                        view,
-                        viewDefinition,
-                        paramKey: viewParamKey,
-                    }, 
-                    // s -> ms
-                    { ttl: ttl ? ttl * 1000 : undefined });
-                }
-            }
+            const route = this.globalConfig.routes.find((r) => r.id === view.id);
+            const maxViewCacheTtl = getFeatureFlags().MAX_VIEW_CACHE_TTL;
+            // optionally set a max TTL on the view registry cache
+            // use a very low TTL if the shortest is 0, to allow the view to be fetched > once during a single request
+            const maxTtl = maxViewCacheTtl && parseInt(maxViewCacheTtl, 10);
+            const leastTtl = shortestTtl(viewDefinition.cache?.ttl, route?.cache?.ttl, maxTtl);
+            const ttl = leastTtl !== undefined ? (leastTtl === 0 ? 10 : leastTtl * 1000) : undefined;
+            // cache view definition for the shortest ttl or until it is the least recently used when ttl is undefined
+            this.viewDefinitions.set(viewDefCacheKey, {
+                view,
+                viewDefinition,
+                paramKey: viewParamKey,
+            }, { ttl });
             return viewDefinition;
         }
         catch (err) {
@@ -238,7 +238,7 @@ export class LwrViewRegistry {
     async renderView(view, viewParams, runtimeEnvironment, runtimeParams = {}, renderOptions) {
         const { id, contentTemplate, rootComponent, layoutTemplate } = view;
         const lwrResourcesId = `__LWR_RESOURCES__${Date.now()}`;
-        const renderedContent = await this.render({ id, contentTemplate, rootComponent }, { ...viewParams, lwr_resources: lwrResourcesId }, runtimeParams, renderOptions);
+        const renderedContent = await this.render({ id, contentTemplate, rootComponent }, { ...viewParams, lwr_resources: lwrResourcesId }, runtimeParams, runtimeEnvironment, renderOptions);
         // normalize the renderOptions provided by the CompiledView content with the request options.
         let normalizedRenderOptions = normalizeRenderOptions(this.runtimeEnvironment, renderedContent.options, renderOptions);
         const layout = layoutTemplate || renderedContent.compiledView.layoutTemplate;
@@ -262,7 +262,7 @@ export class LwrViewRegistry {
             ...viewParams,
             body: renderedContent.renderedView,
             lwr_resources: lwrResourcesId,
-        }, runtimeParams);
+        }, runtimeParams, runtimeEnvironment);
         normalizedRenderOptions = normalizeRenderOptions(this.runtimeEnvironment, renderedLayout.options, normalizedRenderOptions);
         const renderedViewDef = await this.link({
             ...renderedLayout,
@@ -306,10 +306,10 @@ export class LwrViewRegistry {
         });
         return renderedViewDef;
     }
-    async render(viewId, viewParams, runtimeParams, renderOptions) {
+    async render(viewId, viewParams, runtimeParams, runtimeEnvironment, renderOptions) {
         const globalContext = this.globalData;
         const { id, rootComponent, contentTemplate } = viewId;
-        const compiledView = await this.getView({ id, contentTemplate, rootComponent }, renderOptions?.skipCaching);
+        const compiledView = await this.getView({ id, contentTemplate, rootComponent });
         // Get content/body of the view
         /*
             When rendering the compiled view, a collection variable properties can be passed to the render() to be rendered in
@@ -325,7 +325,7 @@ export class LwrViewRegistry {
             ...globalContext,
             ...compiledView.properties,
             ...viewParams,
-        });
+        }, runtimeEnvironment);
         const normalizedResult = normalizeRenderedResult(result);
         return {
             compiledView,
@@ -350,6 +350,7 @@ export class LwrViewRegistry {
             importer: importer || renderedView.compiledView.filePath,
         };
         const stringBuilder = createStringBuilder(renderedViewContent);
+        // Note: this is the TTL for the page NOT for the view registry cache
         let pageTtl = renderedView.cache.ttl;
         for (const viewTransformer of this.viewTransformers) {
             // eslint-disable-next-line no-await-in-loop
@@ -389,6 +390,7 @@ export class LwrViewRegistry {
             immutable,
             viewRecord: {
                 assetReferences: reduceSourceAssetReferences(linkedMetadata.assetReferences),
+                moduleResources: [],
             },
             cache: { ttl: pageTtl },
         };

package/build/es/linkers/legacy_view_bootstrap.js

@@ -1,8 +1,8 @@
 import { logger } from '@lwrjs/diagnostics';
-import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, explodeSpecifier, isBundler, getHydrateDirective, isGroupie, isExternalSpecifier, } from '@lwrjs/shared-utils';
+import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, explodeSpecifier, isBundler, getHydrateDirective, isGroupie, isExternalSpecifier, isLocalDev, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
-import { addExternalScriptNonce, generateHtmlTag, getModuleResourceByUri, getViewNonce } from '../utils.js';
-import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
+import { addExternalScriptNonce, generateHtmlTag, getModuleResource, getModuleResourceByUri, getViewNonce, } from '../utils.js';
+import { flattenCustomElements, getBundleIntegrity, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
 import { setPreloadModulesMeta, getPreloadModulesMeta } from './preload-utils.js';
 function includeIdFactory(bundleConfig) {
     return (moduleRef) => {
@@ -17,9 +17,8 @@ function includeIdFactory(bundleConfig) {
 }
 export async function getHtmlResources(view, viewParams, resourceContext) {
     const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
-    const { lwrVersion, format, hmrEnabled, bundle, debug, minify } = runtimeEnvironment;
+    const { format, hmrEnabled, bundle, debug, minify } = runtimeEnvironment;
     const { customElements, serverData, serverDebug } = viewMetadata;
-    const version = lwrVersion;
     const isAMD = format === 'amd';
     const { bundleConfig } = resourceContext;
     const { external = {}, exclude = [] } = bundleConfig;
@@ -89,9 +88,12 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         uris: [],
         specifiers: [],
         groups: new Map(),
+        integrities: new Map(),
     };
     // Determine if server side rendering view modules
     const isSSR = view.bootstrap?.ssr;
+    // Determine the LWR client version
+    const version = view.bootstrap?.lwrVersion;
     // Page level nonce for script tags
     const nonce = getViewNonce(viewParams);
     // ABS module and custom element references
@@ -109,7 +111,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             let def = (await resourceRegistry.getResource({ specifier: shimBundle, version }, runtimeEnvironment, runtimeParams));
             if (!def) {
                 // HACK: fallback to looking for the other shim.
-                // TODO: remove this once we solve debug mode in MRT
+                // TODO: remove this once KJ fixes W-15953000
                 let fallbackShimBundle;
                 if (shimBundle === 'lwr-loader-shim-legacy.bundle.js') {
                     fallbackShimBundle = 'lwr-loader-shim-legacy.bundle.min.js';
@@ -131,7 +133,10 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             addExternalScriptNonce(def, nonce);
             requiredResources.push(def);
             // Always inline the error shim script after the shim
-            const errorShimDef = (await resourceRegistry.getResource({ specifier: 'lwr-error-shim.js', version }, runtimeEnvironment, runtimeParams));
+            const errorShimDef = (await resourceRegistry.getResource({ specifier: 'lwr-error-shim.js', version }, runtimeEnvironment, 
+            // Hack there is only a prod version of the error shim  so forcing ignore debug
+            // So we never check the debug metadata
+            { ...runtimeParams, ignoreDebug: true }));
             if (!errorShimDef) {
                 throw Error('Failed to find definition of resource: lwr-error-shim.js');
             }
@@ -159,12 +164,14 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         if (!uri) {
             throw Error(`Invalid Module Resource ${versionedSpecifier}`);
         }
-        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR, nonce }));
+        const integrity = getBundleIntegrity(bootstrapModuleGraph, versionedSpecifier);
+        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { integrity, isPreload: false, isSSR, nonce }));
         // PRELOAD the bootstrap module static dependencies as preloaded script resources
         for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
             const uri = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
             if (uri) {
-                setPreloadModulesMeta(depSpecifier, uri, groups, viewPreloads);
+                const integrity = getBundleIntegrity(bootstrapModuleGraph, depSpecifier);
+                setPreloadModulesMeta(depSpecifier, uri, integrity, groups, viewPreloads);
             }
         }
         // PRELOAD configured preloadModules as preloaded script resources
@@ -214,13 +221,15 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             // PRELOAD the custom element module as a link resource
             const specifier = graph.graphs[0].specifier;
             const uri = graph.uriMap[specifier];
-            setPreloadModulesMeta(specifier, uri, groups, viewPreloads);
+            const integrity = getBundleIntegrity(graph, specifier);
+            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads);
             // PRELOAD custom element static deps as link resources when bundling is ON
             if (bundle) {
                 for (const depSpecifier of graph.graphs[0].static) {
-                    const uri = getPreloadUri(depSpecifier, graph.uriMap);
-                    if (uri) {
-                        setPreloadModulesMeta(depSpecifier, uri, groups, viewPreloads);
+                    const depUri = getPreloadUri(depSpecifier, graph.uriMap);
+                    if (depUri) {
+                        const integrity = getBundleIntegrity(graph, depSpecifier);
+                        setPreloadModulesMeta(depSpecifier, depUri, integrity, groups, viewPreloads);
                     }
                 }
             }
@@ -242,12 +251,21 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         }
     }));
     if (viewContainsLiveElements) {
+        if (isLocalDev()) {
+            // ADD the client-side bootstrap module and mapping for local-dev
+            const localDevSpecifier = 'lwr_local_dev/bootstrap';
+            rootComponents.push(localDevSpecifier);
+            const localDevMod = await getModuleResource({ specifier: localDevSpecifier, version: '' }, runtimeEnvironment, {}, moduleRegistry, runtimeParams);
+            if (localDevMod.src)
+                imports[localDevSpecifier] = localDevMod.src;
+        }
         // ADD configuration of the bootstrapModule
         configResources.unshift(getViewBootstrapConfigurationResource({
             id: view.id,
             url: viewParams?.page?.url,
             configAsSrc: view.bootstrap?.configAsSrc || false,
             mixedMode: view.bootstrap?.mixedMode || false,
+            nonce: viewParams?.page?.nonce,
         }, {
             appId: appIdentity.appName,
             bootstrapModule: versionedSpecifier,
@@ -269,7 +287,13 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const dedupedUris = [...new Set(viewPreloads.uris)];
     // PRELOAD script resources for preload module URIs after the bootstrap module
     for (const preloadUri of dedupedUris) {
-        moduleResources.push(getModuleResourceByUri(preloadUri, runtimeEnvironment, { isPreload: true, isSSR, nonce }));
+        const integrity = viewPreloads.integrities.get(preloadUri);
+        moduleResources.push(getModuleResourceByUri(preloadUri, runtimeEnvironment, {
+            integrity,
+            isPreload: true,
+            isSSR,
+            nonce,
+        }));
     }
     // generate html partial
     const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(generateHtmlTag));
@@ -278,6 +302,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         viewRecord: {
             resources: requiredResources,
             customElements: customElementsRecords,
+            moduleResources,
             bootstrapModule: bootstrapModuleRef,
         },
     };

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

@@ -3,11 +3,12 @@ export type ViewPreloads = {
     groups: Map<string, boolean>;
     uris: string[];
     specifiers: string[];
+    integrities: Map<string, string | undefined>;
 };
 /**
  * keeps track of preloadModules metadata
  */
-export declare function setPreloadModulesMeta(specifier: string, uri: string, groups: BundleGroups, preloads: ViewPreloads): void;
+export declare function setPreloadModulesMeta(specifier: string, uri: string, integrity: string | undefined, groups: BundleGroups, preloads: ViewPreloads): void;
 /**
  * Recursively gets preloadModules metadata starting with a specifier
  * Note: don't call me unless you got bundles

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, groups, preloads) {
+export function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
     // Throw a very specific error if we get this back and the uri property is not set
     if (!uri) {
         throw createSingleDiagnosticError({
@@ -20,6 +20,7 @@ export function setPreloadModulesMeta(specifier, uri, groups, preloads) {
     const preloadModulesSpecifiers = preloads.specifiers;
     const preloadBundleGroupsMap = preloads.groups;
     const preloadModulesURIs = preloads.uris;
+    const preloadModuleIntegrities = preloads.integrities;
     preloadModulesSpecifiers.push(specifier);
     const { specifier: unversionedSpecifier } = explodeSpecifier(specifier);
     const groupName = getGroupName(unversionedSpecifier, groups);
@@ -29,6 +30,7 @@ export function setPreloadModulesMeta(specifier, uri, groups, preloads) {
     // With bundling groups, we only want to include one URI
     preloadModulesURIs.push(uri);
     groupName && preloadBundleGroupsMap.set(groupName, true);
+    preloadModuleIntegrities.set(uri, integrity);
 }
 /**
  * Recursively gets preloadModules metadata starting with a specifier
@@ -60,12 +62,13 @@ viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, run
         const uri = 
         // eslint-disable-next-line no-await-in-loop
         await defRegistry.resolveModuleUri(versionedModuleId, runtimeEnvironment, runtimeParams);
-        // fallback to unversioned specifier if needed
+        // fallback to un-versioned specifier if needed
         const normalizedSpecifier = versionedModuleId.version === VERSION_NOT_PROVIDED ? specifier : versionedModuleSpecifier;
-        setPreloadModulesMeta(normalizedSpecifier, uri, groups, viewPreloads);
+        // Will set the integrity after loading the record below
+        const preloadModuleRecord = await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams);
+        const { integrity } = preloadModuleRecord;
+        setPreloadModulesMeta(normalizedSpecifier, uri, integrity, groups, viewPreloads);
         if (exclude.length || Object.keys(groups).length) {
-            // check if we need to also preload any excluded dependencies of this preload module
-            const preloadModuleRecord = await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams);
             const { imports } = preloadModuleRecord.bundleRecord;
             if (imports) {
                 if (!pending) {

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

@@ -1,5 +1,6 @@
-import type { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata, CustomElementReference, View, ViewInfo } from '@lwrjs/types';
+import type { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata, CustomElementReference, View, ViewInfo, FlattenedModuleGraphs } from '@lwrjs/types';
 export declare function getViewBootstrapConfigurationResource(viewInfo: ViewInfo, config: ClientBootstrapConfig, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, debugMessage?: string): ResourceDefinition;
 export declare function getViewHmrConfigurationResource(view: View, viewMetadata: RenderedViewMetadata): ResourceDefinition;
 export declare function flattenCustomElements(arr: CustomElementReference[], isSSR?: boolean): CustomElementReference[];
+export declare function getBundleIntegrity(bootstrapModuleGraph: FlattenedModuleGraphs, versionedSpecifier: string): string | undefined;
 //# sourceMappingURL=utils.d.ts.map

package/build/es/linkers/utils.js

@@ -49,6 +49,10 @@ export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeE
             type: CONTENT_TYPE,
             content: configString,
             inline: false,
+            // TODO do not create an integrity for config as src.  We modify this script
+            // for HMR and fingerprints
+            // integrity: createIntegrityHash(configString),
+            nonce: viewInfo.nonce,
             src: url,
         };
     }
@@ -111,4 +115,9 @@ export function flattenCustomElements(arr, isSSR = false) {
     flatten(arr);
     return ret;
 }
+export function getBundleIntegrity(bootstrapModuleGraph, versionedSpecifier) {
+    const def = bootstrapModuleGraph.linkedDefinitions[versionedSpecifier];
+    const integrity = def?.integrity;
+    return integrity;
+}
 //# sourceMappingURL=utils.js.map

package/build/es/linkers/view_bootstrap.js

@@ -2,14 +2,13 @@ import { logger } from '@lwrjs/diagnostics';
 import { kebabCaseToModuleSpecifier, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, explodeSpecifier, isBundler, getHydrateDirective, isGroupie, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { addExternalScriptNonce, generateHtmlTag, getModuleResourceByUri, getViewNonce } from '../utils.js';
-import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
+import { flattenCustomElements, getBundleIntegrity, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
 import { setPreloadModulesMeta, getPreloadModulesMeta } from './preload-utils.js';
 export async function getHtmlResources(view, viewParams, resourceContext) {
     const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
-    const { lwrVersion, format, hmrEnabled, bundle, debug, minify } = runtimeEnvironment;
+    const { format, hmrEnabled, bundle, debug, minify } = runtimeEnvironment;
     const { customElements, serverData, serverDebug } = viewMetadata;
     const defRegistry = bundle ? moduleBundler : moduleRegistry;
-    const version = lwrVersion;
     const isAMD = format === 'amd';
     const depth = isAMD
         ? { static: GraphDepth.ALL, dynamic: 1 }
@@ -72,9 +71,12 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         uris: [],
         specifiers: [],
         groups: new Map(),
+        integrities: new Map(),
     };
     // Determine if server side rendering view modules
     const isSSR = view.bootstrap?.ssr;
+    // Determine the LWR client version
+    const version = view.bootstrap?.lwrVersion;
     // Page level nonce for script tags
     const nonce = getViewNonce(viewParams);
     // ABS module and custom element references
@@ -99,7 +101,10 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             addExternalScriptNonce(def, nonce);
             requiredResources.push(def);
             // Always inline the error shim script after the shim
-            const errorShimDef = (await resourceRegistry.getResource({ specifier: 'lwr-error-shim.js', version }, runtimeEnvironment, runtimeParams));
+            const errorShimDef = (await resourceRegistry.getResource({ specifier: 'lwr-error-shim.js', version }, runtimeEnvironment, 
+            // Hack there is only a prod version of the error shim  so forcing ignore debug
+            // So we never check the debug metadata
+            { ...runtimeParams, ignoreDebug: true }));
             if (!errorShimDef) {
                 throw Error('Failed to find definition of resource: lwr-error-shim.js');
             }
@@ -126,12 +131,14 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         if (!uri) {
             throw Error(`Invalid Module Resource ${versionedSpecifier}`);
         }
-        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR, nonce }));
+        const integrity = getBundleIntegrity(bootstrapModuleGraph, versionedSpecifier);
+        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { integrity, isPreload: false, isSSR, nonce }));
         // PRELOAD the bootstrap module static dependencies as preloaded script resources
         for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
             const uri = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
             if (uri) {
-                setPreloadModulesMeta(depSpecifier, uri, groups, viewPreloads);
+                const integrity = getBundleIntegrity(bootstrapModuleGraph, depSpecifier);
+                setPreloadModulesMeta(depSpecifier, uri, integrity, groups, viewPreloads);
             }
         }
         // PRELOAD configured preloadModules as preloaded script resources
@@ -183,13 +190,15 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             // PRELOAD the custom element module as a link resource
             const specifier = graph.graphs[0].specifier;
             const uri = graph.uriMap[specifier];
-            setPreloadModulesMeta(specifier, uri, groups, viewPreloads);
+            const integrity = getBundleIntegrity(graph, specifier);
+            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads);
             // PRELOAD custom element static deps as link resources when bundling is ON
             if (bundle) {
                 for (const depSpecifier of graph.graphs[0].static) {
-                    const uri = getPreloadUri(depSpecifier, graph.uriMap);
-                    if (uri) {
-                        setPreloadModulesMeta(depSpecifier, uri, groups, viewPreloads);
+                    const depUri = getPreloadUri(depSpecifier, graph.uriMap);
+                    if (depUri) {
+                        const integrity = getBundleIntegrity(graph, depSpecifier);
+                        setPreloadModulesMeta(depSpecifier, depUri, integrity, groups, viewPreloads);
                     }
                 }
             }
@@ -219,6 +228,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             url: viewParams?.page?.url,
             configAsSrc: view.bootstrap?.configAsSrc || false,
             mixedMode: view.bootstrap?.mixedMode || false,
+            nonce: viewParams?.page?.nonce,
         }, {
             appId: appIdentity.appName,
             bootstrapModule: versionedSpecifier,
@@ -238,7 +248,13 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     // PRELOAD script resources for preload module URIs after the bootstrap module
     const dedupedUris = [...new Set(viewPreloads.uris)];
     for (const preloadUri of dedupedUris) {
-        moduleResources.push(getModuleResourceByUri(preloadUri, runtimeEnvironment, { isPreload: true, isSSR, nonce }));
+        const integrity = viewPreloads.integrities.get(preloadUri);
+        moduleResources.push(getModuleResourceByUri(preloadUri, runtimeEnvironment, {
+            integrity,
+            isPreload: true,
+            isSSR,
+            nonce,
+        }));
     }
     // generate html partial
     const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(generateHtmlTag));
@@ -255,6 +271,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             customElements: customElementsRecords,
             endpoints,
             importMetadata,
+            moduleResources,
             bootstrapModule: bootstrapModuleRef,
         },
     };

package/build/es/utils.d.ts

@@ -13,7 +13,7 @@ export declare function createJsonModule(specifier: string, moduleRegistry: Publ
 /**
  * Get the nonce set on the page context of the view params
  */
-export declare function getViewNonce(viewParams: ViewParams): string;
+export declare function getViewNonce(viewParams: ViewParams): string | undefined;
 /**
  * Generate a nonce in the page context of the view params
  */
@@ -21,5 +21,5 @@ export declare function generateViewNonce(viewParams: ViewParams): void;
 /**
  * Add a nonce to a script definition in view if it is external (not inline)
  */
-export declare function addExternalScriptNonce(def: ResourceDefinition, nonce: string): void;
+export declare function addExternalScriptNonce(def: ResourceDefinition, nonce?: string): void;
 //# sourceMappingURL=utils.d.ts.map

package/build/es/utils.js

@@ -1,11 +1,12 @@
 import { basename, extname } from 'path';
-import { explodeSpecifier, getMappingUriPrefix, getSpecifier, getClientBootstrapConfigurationUri, mimeLookup, DEFAULT_TITLE, streamToString, } from '@lwrjs/shared-utils';
+import { explodeSpecifier, getMappingUriPrefix, getSpecifier, getClientBootstrapConfigurationUri, mimeLookup, DEFAULT_TITLE, streamToString, getFeatureFlags, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier, ResourceIdentityTypes, } from '@lwrjs/app-service/identity';
 import crypto from 'crypto';
 function generateExternalStyle(src) {
     return `<link rel="stylesheet" href="${src}">`;
 }
-function generateExternalScript(type = 'application/javascript', src, async, defer, nonce) {
+function generateExternalScript(type = 'application/javascript', src, async, defer, nonce, integrity) {
+    // add script loader order attribute
     let scriptLoadOrder = '';
     if (defer) {
         scriptLoadOrder = ' defer';
@@ -13,8 +14,19 @@ function generateExternalScript(type = 'application/javascript', src, async, def
     else if (async) {
         scriptLoadOrder = ' async';
     }
-    const nonceAttr = nonce ? ` nonce="${nonce}"` : '';
-    return `<script type="${type}"${scriptLoadOrder}${nonceAttr} src="${src}"></script>`;
+    // add the right CSP header attribute
+    let cspHashAttr = '';
+    // For now use the ENABLE_NONCE to gate adding nonce or integrity
+    // W-15868505 is open to create a better config
+    if (getFeatureFlags().ENABLE_NONCE) {
+        if (integrity) {
+            cspHashAttr = ` integrity="${integrity}"`;
+        }
+        else if (nonce) {
+            cspHashAttr = ` nonce="${nonce}"`;
+        }
+    }
+    return `<script type="${type}"${scriptLoadOrder}${cspHashAttr} src="${src}"></script>`;
 }
 function generateLinkPreloadTag({ href, type }) {
     if (type === 'module') {
@@ -24,7 +36,7 @@ function generateLinkPreloadTag({ href, type }) {
         return `<link rel="preload" href="${href}" type="${type}" />`;
     }
 }
-function generateExternalTag({ type, src = '', async, defer, isPreload, nonce }) {
+function generateExternalTag({ type, src = '', async, defer, isPreload, nonce, integrity, }) {
     if (isPreload) {
         return generateLinkPreloadTag({ href: src, type: type });
     }
@@ -32,13 +44,13 @@ function generateExternalTag({ type, src = '', async, defer, isPreload, nonce })
         return generateExternalStyle(src);
     }
     else {
-        return generateExternalScript(type, src, async, defer, nonce);
+        return generateExternalScript(type, src, async, defer, nonce, integrity);
     }
 }
 async function generateInlineTag({ specifier, type, content, stream, nonce }) {
     const typeStr = type === 'text/css' ? '' : ` type="${type}"`;
     const tag = type === 'text/css' ? 'style' : 'script';
-    const nonceStr = nonce ? ` nonce="${nonce}"` : '';
+    const nonceStr = getFeatureFlags().ENABLE_NONCE && nonce && nonce ? ` nonce="${nonce}"` : '';
     if (!content && !stream) {
         throw new Error(`Invalid inline Resource Definition: must have either "content" or "stream": "${specifier}"`);
     }
@@ -83,7 +95,6 @@ export function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions
         // Default render options
         skipMetadataCollection: false,
         freezeAssets: runtimeEnvironment.immutableAssets,
-        skipCaching: false,
         viewParamCacheKey: null,
         ...baseRenderOptions,
         ...overrideRenderOptions,
@@ -205,7 +216,7 @@ export async function getModuleResource(moduleId, runtimeEnvironment, moduleReso
     };
 }
 export function getModuleResourceByUri(uri, runtimeEnvironment, moduleResourceMeta) {
-    const { isSSR = false, isPreload = false, nonce } = moduleResourceMeta;
+    const { integrity, isSSR = false, isPreload = false, nonce } = moduleResourceMeta;
     const { format } = runtimeEnvironment;
     return {
         src: uri,
@@ -215,6 +226,7 @@ export function getModuleResourceByUri(uri, runtimeEnvironment, moduleResourceMe
         // only use link preload for ESM for compat reasons.
         // AMD should use regular script tags for preloading
         isPreload: format !== 'amd' && isPreload,
+        integrity,
         nonce,
     };
 }
@@ -243,25 +255,29 @@ export async function createJsonModule(specifier, moduleRegistry, environment, p
  * Get the nonce set on the page context of the view params
  */
 export function getViewNonce(viewParams) {
-    return viewParams?.page?.nonce;
+    return getFeatureFlags().ENABLE_NONCE
+        ? viewParams?.page?.nonce
+        : undefined;
 }
 /**
  * Generate a nonce in the page context of the view params
  */
 export function generateViewNonce(viewParams) {
-    const nonce = crypto.randomBytes(16).toString('base64');
-    if (!viewParams.page) {
-        viewParams.page = { nonce };
-    }
-    else {
-        viewParams.page.nonce = nonce;
+    if (getFeatureFlags().ENABLE_NONCE) {
+        const nonce = crypto.randomBytes(16).toString('base64');
+        if (!viewParams.page) {
+            viewParams.page = { nonce };
+        }
+        else {
+            viewParams.page.nonce = nonce;
+        }
     }
 }
 /**
  * Add a nonce to a script definition in view if it is external (not inline)
  */
 export function addExternalScriptNonce(def, nonce) {
-    if (!def.inline) {
+    if (nonce && getFeatureFlags().ENABLE_NONCE && !def.inline) {
         def.nonce = nonce;
     }
 }

package/build/es/view-handler.js

@@ -146,6 +146,8 @@ export class LwrViewHandler {
         const paths = { rootDir, assets, contentDir, layoutsDir };
         const locale = runtimeParams.locale;
         const basePath = runtimeParams.basePath;
+        const assetBasePath = runtimeParams.assetBasePath;
+        const uiBasePath = runtimeParams.assetBasePath;
         const viewApi = this.getBoundApi(viewRequest, route, runtimeEnvironment, runtimeParams);
         const response = await getTracer().trace({
             name: ViewSpan.ExecuteRouteHandler,
@@ -155,7 +157,7 @@ export class LwrViewHandler {
             },
         }, async () => {
             try {
-                return await routeHandlerFn({ ...viewRequest, locale, basePath }, { route: route, viewApi, ...paths }, routeHandlerOptions);
+                return await routeHandlerFn({ ...viewRequest, locale, basePath, assetBasePath, uiBasePath }, { route: route, viewApi, ...paths }, routeHandlerOptions);
             }
             catch (err) {
                 if (err instanceof DiagnosticsError) {
@@ -195,6 +197,11 @@ export class LwrViewHandler {
     view, viewParams, renderOptions) {
         const { id, bootstrap } = route;
         const managedView = { ...view, id, bootstrap };
+        // If this is a localized view request (could have come from a route handler)
+        // Update the runtime params
+        if (view.locale) {
+            runtimeParams.locale = view.locale;
+        }
         const viewResponse = {
             view: managedView,
             viewParams,

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.13.0-alpha.9",
+    "version": "0.13.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -29,18 +29,21 @@
         "build/**/*.cjs",
         "build/**/*.d.ts"
     ],
+    "scripts": {
+        "build": "tsc -b"
+    },
     "dependencies": {
-        "@lwrjs/app-service": "0.13.0-alpha.9",
-        "@lwrjs/diagnostics": "0.13.0-alpha.9",
-        "@lwrjs/instrumentation": "0.13.0-alpha.9",
-        "@lwrjs/shared-utils": "0.13.0-alpha.9",
-        "lru-cache": "^10.2.2"
+        "@lwrjs/app-service": "0.13.0",
+        "@lwrjs/diagnostics": "0.13.0",
+        "@lwrjs/instrumentation": "0.13.0",
+        "@lwrjs/shared-utils": "0.13.0",
+        "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.13.0-alpha.9"
+        "@lwrjs/types": "0.13.0"
     },
     "engines": {
         "node": ">=18.0.0"
     },
-    "gitHead": "a2a9e1dbf39a7b04c7a43433e004895b6f4c51a3"
+    "gitHead": "21dc6b8ffd2e633f36b46daf9e1563992c5143b9"
 }