@lwrjs/view-registry 0.13.0-alpha.3 → 0.13.0-alpha.30

package/build/cjs/index.cjs

@@ -57,7 +57,7 @@ var LwrViewRegistry = class {
     observer.onAssetSourceChange(({payload}) => this.onAssetSourceChange(payload));
   }
   async onModuleDefinitionChange(moduleDefinition) {
-    if (process.env.MRT_HMR === "true") {
+    if ((0, import_shared_utils.isLocalDev)()) {
       this.viewDefinitions.clear();
       return;
     }
@@ -80,7 +80,7 @@ var LwrViewRegistry = class {
     }
   }
   async onViewSourceChange(compiledView) {
-    if (process.env.MRT_HMR === "true") {
+    if ((0, import_shared_utils.isLocalDev)()) {
       this.viewDefinitions.clear();
       return;
     }
@@ -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,24 +175,26 @@ 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;
         }
       }
+      const updatableViewParams = {...viewParams};
+      (0, import_utils.generateViewNonce)(updatableViewParams);
       const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
       const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => (0, import_instrumentation.getTracer)().trace({
         name: import_instrumentation.ViewSpan.RenderView,
@@ -201,18 +202,18 @@ var LwrViewRegistry = class {
           view: view.id,
           ssr: view.bootstrap?.ssr === true
         }
-      }, () => this.renderView(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions)));
-      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});
-        }
-      }
+      }, () => this.renderView(view, updatableViewParams, runtimeEnvironment, runtimeParams, 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;
+      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) {
@@ -227,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) {
@@ -247,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,
@@ -285,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,
@@ -360,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,12 @@ 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 = [];
   const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements, isSSR);
@@ -125,14 +127,16 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       if (!def.inline && !def.src) {
         throw Error(`Invalid Shim ${shimBundle}: ${JSON.stringify(def)}`);
       }
+      (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");
       }
       if (!errorShimDef.inline && !errorShimDef.src) {
         throw Error(`Invalid Shim lwr-error-shim.js: ${JSON.stringify(errorShimDef)}`);
       }
+      (0, import_utils.addExternalScriptNonce)(errorShimDef, nonce);
       requiredResources.push(errorShimDef);
     }
     const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
@@ -146,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}));
+    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)) {
@@ -187,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);
           }
         }
       }
@@ -211,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,
@@ -235,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}));
+    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 {
@@ -243,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,12 @@ 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: {}};
   const customElementsRecords = [];
@@ -105,14 +107,16 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       if (!def.inline && !def.src) {
         throw Error(`Invalid Shim ${shimBundle}: ${JSON.stringify(def)}`);
       }
+      (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");
       }
       if (!errorShimDef.inline && !errorShimDef.src) {
         throw Error(`Invalid Shim lwr-error-shim.js: ${JSON.stringify(errorShimDef)}`);
       }
+      (0, import_utils.addExternalScriptNonce)(errorShimDef, nonce);
       requiredResources.push(errorShimDef);
     }
     const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
@@ -126,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}));
+    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)) {
@@ -168,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);
           }
         }
       }
@@ -197,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,
@@ -215,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}));
+    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);
@@ -231,6 +246,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       customElements: customElementsRecords,
       endpoints,
       importMetadata,
+      moduleResources,
       bootstrapModule: bootstrapModuleRef
     }
   };

package/build/cjs/utils.cjs

@@ -24,11 +24,14 @@ var __toModule = (module2) => {
 // packages/@lwrjs/view-registry/src/utils.ts
 __markAsModule(exports);
 __export(exports, {
+  addExternalScriptNonce: () => addExternalScriptNonce,
   createJsonModule: () => createJsonModule,
   generateHtmlTag: () => generateHtmlTag,
   generatePageContext: () => generatePageContext,
+  generateViewNonce: () => generateViewNonce,
   getModuleResource: () => getModuleResource,
   getModuleResourceByUri: () => getModuleResourceByUri,
+  getViewNonce: () => getViewNonce,
   isViewResponse: () => isViewResponse,
   normalizeRenderOptions: () => normalizeRenderOptions,
   normalizeRenderedResult: () => normalizeRenderedResult,
@@ -38,17 +41,26 @@ __export(exports, {
 var import_path = __toModule(require("path"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_identity = __toModule(require("@lwrjs/app-service/identity"));
+var import_crypto = __toModule(require("crypto"));
 function generateExternalStyle(src) {
   return `<link rel="stylesheet" href="${src}">`;
 }
-function generateExternalScript(type = "application/javascript", src, async, defer) {
+function generateExternalScript(type = "application/javascript", src, async, defer, nonce, integrity) {
   let scriptLoadOrder = "";
   if (defer) {
     scriptLoadOrder = " defer";
   } else if (async) {
     scriptLoadOrder = " async";
   }
-  return `<script type="${type}"${scriptLoadOrder} 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") {
@@ -57,19 +69,27 @@ function generateLinkPreloadTag({href, type}) {
     return `<link rel="preload" href="${href}" type="${type}" />`;
   }
 }
-function generateExternalTag({type, src = "", async, defer, isPreload}) {
+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);
+    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}"`);
   }
@@ -117,7 +137,6 @@ function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions, baseR
   return {
     skipMetadataCollection: false,
     freezeAssets: runtimeEnvironment.immutableAssets,
-    skipCaching: false,
     viewParamCacheKey: null,
     ...baseRenderOptions,
     ...overrideRenderOptions
@@ -223,14 +242,16 @@ async function getModuleResource(moduleId, runtimeEnvironment, moduleResourceMet
   };
 }
 function getModuleResourceByUri(uri, runtimeEnvironment, moduleResourceMeta) {
-  const {isSSR = false, isPreload = false} = moduleResourceMeta;
+  const {integrity, isSSR = false, isPreload = false, nonce} = moduleResourceMeta;
   const {format} = runtimeEnvironment;
   return {
     src: uri,
     type: format === "amd" ? "application/javascript" : "module",
     async: !isSSR && isPreload,
     defer: isSSR,
-    isPreload: format !== "amd" && isPreload
+    isPreload: format !== "amd" && isPreload,
+    integrity,
+    nonce
   };
 }
 async function createJsonModule(specifier, moduleRegistry, environment, params) {
@@ -252,3 +273,21 @@ async function createJsonModule(specifier, moduleRegistry, environment, params)
     }
   };
 }
+function getViewNonce(viewParams) {
+  return (0, import_shared_utils.getFeatureFlags)().ENABLE_NONCE ? viewParams?.page?.nonce : void 0;
+}
+function generateViewNonce(viewParams) {
+  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 (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;
@@ -148,6 +150,9 @@ var LwrViewHandler = class {
         throw (0, import_diagnostics.createSingleDiagnosticError)({description: import_diagnostics.descriptions.APPLICATION.ROUTE_HANDLER_ERROR(route.id, message)}, import_diagnostics.LwrApplicationError);
       }
     });
+    if (response?.locale) {
+      runtimeParams.locale = response.locale;
+    }
     return response;
   }
   getBoundApi(viewRequest, route, runtimeEnvironment, runtimeParams) {
@@ -164,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;