@lwrjs/view-registry 0.9.0-alpha.3 → 0.9.0-alpha.31

package/build/cjs/index.cjs

@@ -278,8 +278,11 @@ var LwrViewRegistry = class {
       importer: importer || renderedView.compiledView.filePath
     };
     const stringBuilder = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
+    let pageTtl;
     for (const viewTransformer of this.viewTransformers) {
-      await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+      const linkResults = await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+      const ttl = linkResults && linkResults.cache?.ttl;
+      pageTtl = (0, import_shared_utils.shortestTtl)(ttl || void 0, pageTtl);
     }
     const linkedAssetContent = stringBuilder.toString();
     if (linkedAssetContent.includes(lwrResourcesId)) {
@@ -290,7 +293,8 @@ var LwrViewRegistry = class {
         moduleBundler,
         resourceRegistry,
         runtimeEnvironment,
-        runtimeParams
+        runtimeParams,
+        bundleConfig: this.globalConfig.bundleConfig
       });
       return {
         renderedView: linkedView,
@@ -298,7 +302,8 @@ var LwrViewRegistry = class {
         viewRecord: {
           assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences),
           ...viewRecord
-        }
+        },
+        cache: {ttl: pageTtl}
       };
     }
     return {
@@ -306,7 +311,8 @@ var LwrViewRegistry = class {
       immutable,
       viewRecord: {
         assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences)
-      }
+      },
+      cache: {ttl: pageTtl}
     };
   }
 };

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -37,9 +37,20 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     moduleRegistry,
     moduleBundler,
     resourceRegistry,
-    viewMetadata
+    viewMetadata,
+    bundleConfig: {external = {}}
   } = resourceContext;
-  const {id: appName, bootstrap: {services} = {services: []}} = view;
+  const isExternal = function(rawSpecifier) {
+    const {specifier} = (0, import_shared_utils.explodeSpecifier)(rawSpecifier);
+    return Object.keys(external).some((e) => specifier === e);
+  };
+  const {
+    id: appName,
+    bootstrap: {services, module: bootstrapModule, preloadModules = []} = {
+      services: [],
+      preloadModules: []
+    }
+  } = view;
   const {lwrVersion, format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
   const {customElements} = viewMetadata;
   const version = lwrVersion;
@@ -49,7 +60,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     format: runtimeEnvironment.format,
     resourceType: import_identity.AppResourceEnum.MODULE
   };
-  const bootstrapSpecifier = (0, import_identity.getAppSpecifier)(appIdentity);
+  const bootstrapSpecifier = bootstrapModule || (0, import_identity.getAppSpecifier)(appIdentity);
+  const preloadModuleUris = new Set();
   const moduleResources = [];
   const requiredResources = [];
   const configResources = [];
@@ -60,35 +72,49 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const preloadAmdModules = [];
   const isSSR = view.bootstrap?.ssr;
   if (isAMD) {
-    const shimBundle = !bundle ? "lwr-loader-shim-legacy.js" : debug || minify === false ? "lwr-loader-shim-legacy.bundle.js" : "lwr-loader-shim-legacy.bundle.min.js";
+    const shimBundle = debug || minify === false ? "lwr-loader-shim-legacy.bundle.js" : "lwr-loader-shim-legacy.bundle.min.js";
     const def = await resourceRegistry.getResource({specifier: shimBundle, version}, runtimeEnvironment, runtimeParams);
     if (!def) {
       throw Error("Failed to find definition of resource: " + shimBundle);
     }
-    if (def.stream) {
-      def.stream.destroy();
-    }
     requiredResources.push(def);
     const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, runtimeParams);
     if (!errorShimDef) {
       throw Error("Failed to find definition of resource: lwr-error-shim.js");
     }
     requiredResources.push(errorShimDef);
-    if (!bundle) {
-      requiredResources.push(await (0, import_utils.getModuleResource)({
-        specifier: "lwr/loaderLegacy",
-        version
-      }, runtimeEnvironment, {
-        isPreload: false,
-        isSSR
-      }, moduleRegistry, runtimeParams));
-    }
   }
   const depth = isAMD ? {static: import_shared_utils.GraphDepth.ALL, dynamic: 1} : {static: import_shared_utils.GraphDepth.NONE, dynamic: 0};
-  const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
+  const defRegistry = bundle ? moduleBundler : moduleRegistry;
+  const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
   const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
   const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
   moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
+  for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
+    if (!isExternal(depSpecifier)) {
+      preloadModuleUris.add(bootstrapModuleGraph.uriMap[depSpecifier]);
+      preloadAmdModules.push(depSpecifier);
+    }
+  }
+  for (let i = 0; i < preloadModules.length; i++) {
+    const specifier = preloadModules[i];
+    if (isExternal(specifier)) {
+      import_shared_utils.logger.warn(`"${specifier}" is configured in both bundleConfig.externals and bootstrap.preloadModules. We are treating it as external.`);
+    } else {
+      const versionedModuleId = await (0, import_shared_utils.getVersionedModuleId)(specifier, moduleRegistry);
+      const versionedModuleSpecifier = (0, import_shared_utils.getSpecifier)({
+        specifier,
+        version: (0, import_shared_utils.normalizeVersionToUri)(versionedModuleId.version)
+      });
+      const uri2 = bootstrapModuleGraph.uriMap[versionedModuleSpecifier] || await defRegistry.resolveModuleUri(versionedModuleId, runtimeEnvironment, runtimeParams);
+      preloadModuleUris.add(uri2);
+      if (versionedModuleId.version == import_shared_utils.VERSION_NOT_PROVIDED) {
+        preloadAmdModules.push(specifier);
+      } else {
+        preloadAmdModules.push(versionedModuleSpecifier);
+      }
+    }
+  }
   if (isAMD) {
     requiredAmdModules.push(versionedSpecifier);
     imports[versionedSpecifier] = uri;
@@ -96,7 +122,6 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       const uri2 = bootstrapModuleGraph.uriMap[staticDep];
       imports[staticDep] = uri2;
       if (services && services.length) {
-        moduleResources.push((0, import_utils.getModuleResourceByUri)(uri2, runtimeEnvironment, {isPreload: true, isSSR}));
         requiredAmdModules.push(staticDep);
       }
     }
@@ -112,11 +137,19 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const customElementsRecords = [];
   const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements, isSSR);
   await Promise.all(flattenedElements.map(async ({tagName: element, props}) => {
-    const graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabCaseToModuleSpecifer)(element), {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
+    const graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabCaseToModuleSpecifier)(element), {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
     customElementsRecords.push({elementName: element, flatGraph: graph});
     const specifier = graph.graphs[0].specifier;
     const uri2 = graph.uriMap[specifier];
     moduleResources.push((0, import_utils.getModuleResourceByUri)(uri2, runtimeEnvironment, {isPreload: true, isSSR}));
+    if (bundle) {
+      for (const depSpecifier of graph.graphs[0].static) {
+        if (!isExternal(depSpecifier)) {
+          preloadModuleUris.add(graph.uriMap[depSpecifier]);
+          preloadAmdModules.push(depSpecifier);
+        }
+      }
+    }
     rootComponents.push(specifier);
     imports[specifier] = uri2;
     if (isAMD) {
@@ -131,6 +164,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       }
     }
   }));
+  const dedupedPreloadAmdModules = [...new Set(preloadAmdModules)];
   configResources.unshift(await (0, import_utils2.getViewBootstrapConfigurationResource)({
     id: view.id,
     url: viewParams?.page?.url,
@@ -145,11 +179,14 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     },
     rootComponents,
     ...isAMD && {requiredModules: requiredAmdModules},
-    ...isAMD && {preloadModules: preloadAmdModules}
+    ...isAMD && {preloadModules: dedupedPreloadAmdModules}
   }, runtimeEnvironment, runtimeParams));
   if (!isAMD && hmrEnabled) {
     configResources.unshift(await (0, import_utils2.getViewHmrConfigurationResource)(view, viewMetadata));
   }
+  for (const preloadUri of preloadModuleUris) {
+    moduleResources.unshift((0, import_utils.getModuleResourceByUri)(preloadUri, runtimeEnvironment, {isPreload: true, isSSR}));
+  }
   const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(import_utils.generateHtmlTag));
   return {
     partial: htmlResources.join("\n"),

package/build/cjs/linkers/view_bootstrap.cjs

@@ -37,11 +37,23 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     moduleRegistry,
     moduleBundler,
     resourceRegistry,
-    viewMetadata
+    viewMetadata,
+    bundleConfig: {external = {}}
   } = resourceContext;
-  const {id: appName, bootstrap: {services} = {services: []}} = view;
+  const isExternal = function(rawSpecifier) {
+    const {specifier} = (0, import_shared_utils.explodeSpecifier)(rawSpecifier);
+    return Object.keys(external).some((e) => specifier === e);
+  };
+  const {
+    id: appName,
+    bootstrap: {services, module: bootstrapModule, preloadModules = []} = {
+      services: [],
+      preloadModules: []
+    }
+  } = view;
   const {lwrVersion, format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
   const {customElements} = viewMetadata;
+  const defRegistry = bundle ? moduleBundler : moduleRegistry;
   const version = lwrVersion;
   const isAMD = format === "amd";
   const appIdentity = {
@@ -49,7 +61,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     format: runtimeEnvironment.format,
     resourceType: import_identity.AppResourceEnum.MODULE
   };
-  const bootstrapSpecifier = (0, import_identity.getAppSpecifier)(appIdentity);
+  const bootstrapSpecifier = bootstrapModule || (0, import_identity.getAppSpecifier)(appIdentity);
+  const preloadModuleUris = new Set();
   const moduleResources = [];
   const requiredResources = [];
   const configResources = [];
@@ -60,34 +73,48 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const preloadAmdModules = [];
   const isSSR = view.bootstrap?.ssr;
   if (isAMD) {
-    const shimBundle = !bundle ? "lwr-loader-shim.js" : debug || minify === false ? "lwr-loader-shim.bundle.js" : "lwr-loader-shim.bundle.min.js";
+    const shimBundle = debug || minify === false ? "lwr-loader-shim.bundle.js" : "lwr-loader-shim.bundle.min.js";
     const def = await resourceRegistry.getResource({specifier: shimBundle, version}, runtimeEnvironment, runtimeParams);
     if (!def) {
       throw Error("Failed to find definition of resource: " + shimBundle);
     }
-    if (def.stream) {
-      def.stream.destroy();
-    }
     requiredResources.push(def);
     const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, runtimeParams);
     if (!errorShimDef) {
       throw Error("Failed to find definition of resource: lwr-error-shim.js");
     }
     requiredResources.push(errorShimDef);
-    if (!bundle) {
-      requiredResources.push(await (0, import_utils.getModuleResource)({
-        specifier: "lwr/loader",
-        version
-      }, runtimeEnvironment, {
-        isSSR
-      }, moduleRegistry, runtimeParams));
-    }
   }
   const depth = isAMD ? {static: import_shared_utils.GraphDepth.ALL, dynamic: 1} : {static: import_shared_utils.GraphDepth.NONE, dynamic: 1};
-  const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
+  const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
   const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
   const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
   moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
+  for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
+    if (!isExternal(depSpecifier)) {
+      preloadModuleUris.add(bootstrapModuleGraph.uriMap[depSpecifier]);
+      preloadAmdModules.push(depSpecifier);
+    }
+  }
+  for (let i = 0; i < preloadModules.length; i++) {
+    const specifier = preloadModules[i];
+    if (isExternal(specifier)) {
+      import_shared_utils.logger.warn(`"${specifier}" is configured in both bundleConfig.externals and bootstrap.preloadModules. We are treating it as external.`);
+    } else {
+      const versionedModuleId = await (0, import_shared_utils.getVersionedModuleId)(specifier, moduleRegistry);
+      const versionedModuleSpecifier = (0, import_shared_utils.getSpecifier)({
+        specifier,
+        version: (0, import_shared_utils.normalizeVersionToUri)(versionedModuleId.version)
+      });
+      const uri2 = bootstrapModuleGraph.uriMap[versionedModuleSpecifier] || await defRegistry.resolveModuleUri(versionedModuleId, runtimeEnvironment, runtimeParams);
+      preloadModuleUris.add(uri2);
+      if (versionedModuleId.version == import_shared_utils.VERSION_NOT_PROVIDED) {
+        preloadAmdModules.push(specifier);
+      } else {
+        preloadAmdModules.push(versionedModuleSpecifier);
+      }
+    }
+  }
   if (isAMD) {
     requiredAmdModules.push(versionedSpecifier);
     imports[versionedSpecifier] = uri;
@@ -95,7 +122,6 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       const uri2 = bootstrapModuleGraph.uriMap[staticDep];
       imports[staticDep] = uri2;
       if (services && services.length) {
-        moduleResources.push((0, import_utils.getModuleResourceByUri)(uri2, runtimeEnvironment, {isPreload: true, isSSR}));
         requiredAmdModules.push(staticDep);
       }
     }
@@ -111,12 +137,20 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   let importMetadata = await (0, import_shared_utils.toImportMetadata)(bootstrapModuleGraph, {imports: {}, index: {}}, moduleRegistry, runtimeEnvironment, runtimeParams);
   const customElementsRecords = [];
   const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements, isSSR);
-  await Promise.all(flattenedElements.map(async ({tagName: element, props}) => {
-    const graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabCaseToModuleSpecifer)(element), {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
+  for (const {tagName: element} of flattenedElements) {
+    const graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabCaseToModuleSpecifier)(element), {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
     customElementsRecords.push({elementName: element, flatGraph: graph});
     const specifier = graph.graphs[0].specifier;
     const uri2 = graph.uriMap[specifier];
     moduleResources.push((0, import_utils.getModuleResourceByUri)(uri2, runtimeEnvironment, {isPreload: true, isSSR}));
+    if (bundle) {
+      for (const depSpecifier of graph.graphs[0].static) {
+        if (!isExternal(depSpecifier)) {
+          preloadModuleUris.add(graph.uriMap[depSpecifier]);
+          preloadAmdModules.push(depSpecifier);
+        }
+      }
+    }
     rootComponents.push(specifier);
     imports[specifier] = uri2;
     if (isAMD) {
@@ -131,7 +165,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       }
     }
     importMetadata = await (0, import_shared_utils.toImportMetadata)(graph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
-  }));
+  }
+  const dedupedPreloadAmdModules = [...new Set(preloadAmdModules)];
   configResources.unshift(await (0, import_utils2.getViewBootstrapConfigurationResource)({
     id: view.id,
     url: viewParams?.page?.url,
@@ -144,11 +179,14 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     index: importMetadata?.index,
     rootComponents,
     ...isAMD && {requiredModules: requiredAmdModules},
-    ...isAMD && {preloadModules: preloadAmdModules}
+    ...isAMD && {preloadModules: dedupedPreloadAmdModules}
   }, runtimeEnvironment, runtimeParams));
   if (!isAMD && hmrEnabled) {
     configResources.unshift(await (0, import_utils2.getViewHmrConfigurationResource)(view, viewMetadata));
   }
+  for (const preloadUri of preloadModuleUris) {
+    moduleResources.unshift((0, import_utils.getModuleResourceByUri)(preloadUri, runtimeEnvironment, {isPreload: true, isSSR}));
+  }
   const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(import_utils.generateHtmlTag));
   const mapping = (0, import_shared_utils.getMappingUriPrefix)(runtimeEnvironment, runtimeParams);
   const endpoints = {

package/build/cjs/utils.cjs

@@ -29,19 +29,15 @@ __export(exports, {
   generatePageContext: () => generatePageContext,
   getModuleResource: () => getModuleResource,
   getModuleResourceByUri: () => getModuleResourceByUri,
-  getRouteHandler: () => getRouteHandler,
   isViewResponse: () => isViewResponse,
   normalizeRenderOptions: () => normalizeRenderOptions,
   normalizeRenderedResult: () => normalizeRenderedResult,
   reduceSourceAssetReferences: () => reduceSourceAssetReferences,
   toJsonFormat: () => toJsonFormat
 });
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
-var import_path2 = __toModule(require("path"));
-var import_shared_utils2 = __toModule(require("@lwrjs/shared-utils"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_identity = __toModule(require("@lwrjs/app-service/identity"));
-var import_shared_utils3 = __toModule(require("@lwrjs/shared-utils"));
 function streamToString(stream) {
   const chunks = [];
   return new Promise((resolve, reject) => {
@@ -85,7 +81,7 @@ async function generateInlineTag({specifier, type, content, stream, nonce}) {
   if (!content && !stream) {
     throw new Error(`Invalid inline Resource Definition: must have either "content" or "stream": "${specifier}"`);
   }
-  const code = content ? content : await streamToString(stream);
+  const code = stream ? await streamToString(stream()) : content;
   return `<${tag}${typeStr}${nonceStr}>${code}</${tag}>`;
 }
 async function generateHtmlTag(definition) {
@@ -132,7 +128,7 @@ function normalizeRenderOptions(runtimeEnvironment, overrideRenderOptions, baseR
   };
 }
 function getTitleFromFilePath(filePath) {
-  return filePath ? (0, import_path2.basename)(filePath, (0, import_path2.extname)(filePath)) : import_shared_utils.DEFAULT_TITLE;
+  return filePath ? (0, import_path.basename)(filePath, (0, import_path.extname)(filePath)) : import_shared_utils.DEFAULT_TITLE;
 }
 function generatePageContext({requestPath: url}, {id, contentTemplate, properties}) {
   const title = properties?.title || getTitleFromFilePath(contentTemplate);
@@ -141,19 +137,6 @@ function generatePageContext({requestPath: url}, {id, contentTemplate, propertie
 function isViewResponse(response) {
   return response.body !== void 0;
 }
-async function getRouteHandler(path, {cacheDir, rootDir}) {
-  try {
-    const fullPath = (0, import_shared_utils.resolveFileExtension)(path);
-    if (fullPath.endsWith(".ts")) {
-      path = await (0, import_shared_utils.transpileTs)(path, {rootDir, cacheDir: import_path.default.join(cacheDir, "routeHandlers")});
-    }
-    const moduleEntry = await Promise.resolve().then(() => __toModule(require(path)));
-    return moduleEntry.default || moduleEntry;
-  } catch (err) {
-    console.log(err);
-    throw new Error(`Unable to get routeHandler: ${path}`);
-  }
-}
 async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironment, runtimeParams, moduleRegistry) {
   const {viewRecord} = viewDefinition;
   const {bootstrap, id: appName} = route;
@@ -186,7 +169,7 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
     });
     resources.push({
       type: "application/javascript",
-      src: (0, import_shared_utils3.getClientBootstrapConfigurationUri)({url: viewRequest.url, id: route.id}, runtimeEnvironment, runtimeParams)
+      src: (0, import_shared_utils.getClientBootstrapConfigurationUri)({url: viewRequest.url, id: route.id}, runtimeEnvironment, runtimeParams)
     });
   }
   const mappingUrl = (0, import_shared_utils.getMappingUriPrefix)(runtimeEnvironment, runtimeParams);
@@ -206,7 +189,7 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
   });
   viewRecord.assetReferences?.forEach((asset) => {
     if (asset.override?.uri) {
-      const type = (0, import_shared_utils2.mimeLookup)(asset.override?.uri);
+      const type = (0, import_shared_utils.mimeLookup)(asset.override?.uri);
       resources.push({type, src: asset.override?.uri});
     }
   });
@@ -229,10 +212,10 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
     }
   };
 }
-async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, moduleRegistry, runtimeParams) {
+async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, defRegistry, runtimeParams) {
   const {format} = runtimeEnvironment;
   const {isSSR = false, isPreload = false} = moduleResouceMeta;
-  const moduleUri = await moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
+  const moduleUri = await defRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
   return {
     src: moduleUri,
     type: format === "amd" ? "application/javascript" : "module",
@@ -267,7 +250,7 @@ async function createJsonModule(specifier, moduleRegistry, environment, params)
     version,
     ownHash,
     links: {
-      self: moduleRegistry.resolveModuleUri(moduleIdentifier, environment, params, ownHash)
+      self: await moduleRegistry.resolveModuleUri(moduleIdentifier, environment, params, ownHash)
     }
   };
 }

package/build/cjs/view-handler.cjs

@@ -31,15 +31,13 @@ var import_utils = __toModule(require("./utils.cjs"));
 var import_path = __toModule(require("path"));
 var LwrViewHandler = class {
   constructor(context, globalConfig) {
-    this.inflightRouteHandlerEvalMap = new Map();
-    this.routeHandlerFunctionMap = new Map();
-    this.viewRegistry = context.viewRegistry;
     this.globalConfig = globalConfig;
+    this.routeHandlers = context.routeHandlers;
+    this.viewRegistry = context.viewRegistry;
     this.moduleRegistry = context.moduleRegistry;
   }
   async getViewContent(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
-    const {routeHandler} = route;
-    if (routeHandler) {
+    if (route.routeHandler) {
       const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
       if ((0, import_utils.isViewResponse)(response)) {
         return response;
@@ -55,7 +53,8 @@ var LwrViewHandler = class {
         body: viewDefinition2.renderedView,
         metadata: {
           viewDefinition: viewDefinition2
-        }
+        },
+        cache: {ttl: (0, import_shared_utils.shortestTtl)(response.cache?.ttl, viewDefinition2.cache?.ttl)}
       };
     }
     const viewDefinition = await this.getDefaultRouteViewDefinition(viewRequest, route, runtimeEnvironment, runtimeParams);
@@ -63,12 +62,12 @@ var LwrViewHandler = class {
       body: viewDefinition.renderedView,
       metadata: {
         viewDefinition
-      }
+      },
+      cache: viewDefinition.cache
     };
   }
   async getViewJson(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
-    const {routeHandler} = route;
-    if (routeHandler) {
+    if (route.routeHandler) {
       const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
       if ((0, import_utils.isViewResponse)(response)) {
         return response;
@@ -84,9 +83,8 @@ var LwrViewHandler = class {
     return await (0, import_utils.toJsonFormat)(viewRequest, viewDefinition, route, runtimeEnvironment, runtimeParams, this.moduleRegistry);
   }
   async getViewConfiguration(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
-    const {routeHandler} = route;
     let viewDefinition;
-    if (routeHandler) {
+    if (route.routeHandler) {
       const response = await this.getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams);
       if ((0, import_utils.isViewResponse)(response)) {
         return;
@@ -126,28 +124,18 @@ var LwrViewHandler = class {
     return viewDefinition;
   }
   async getRouteHandlerResponse(viewRequest, route, runtimeEnvironment, runtimeParams = {}) {
-    const {rootDir, assets, contentDir, layoutsDir, cacheDir} = this.globalConfig;
-    const paths = {rootDir, assets, contentDir, layoutsDir};
-    const {routeHandler} = route;
-    if (!routeHandler) {
-      throw new Error("Route Handler is required for a CustomView");
+    if (!route.routeHandler) {
+      throw new Error("Route handler is required for a CustomView");
     }
-    let routeHandlerFunction = this.routeHandlerFunctionMap.get(routeHandler);
-    if (!routeHandlerFunction) {
-      const inflightRouteHandlerPromise = this.inflightRouteHandlerEvalMap.get(routeHandler);
-      if (inflightRouteHandlerPromise) {
-        routeHandlerFunction = await inflightRouteHandlerPromise;
-      } else {
-        const handlerPromise = (0, import_utils.getRouteHandler)(routeHandler, {cacheDir, rootDir});
-        this.inflightRouteHandlerEvalMap.set(routeHandler, handlerPromise);
-        routeHandlerFunction = await handlerPromise;
-      }
-      this.routeHandlerFunctionMap.set(routeHandler, routeHandlerFunction);
-      this.inflightRouteHandlerEvalMap.delete(routeHandler);
+    const routeHandler = this.routeHandlers[route.routeHandler];
+    if (!routeHandler) {
+      throw new Error(`Route handler does not exist for id: ${route.routeHandler}`);
     }
+    const {rootDir, assets, contentDir, layoutsDir} = this.globalConfig;
+    const paths = {rootDir, assets, contentDir, layoutsDir};
     const locale = runtimeParams.locale;
     const viewApi = this.getBoundApi(route, runtimeEnvironment, runtimeParams);
-    const response = await routeHandlerFunction({...viewRequest, locale}, {route, viewApi, ...paths});
+    const response = await routeHandler({...viewRequest, locale}, {route, viewApi, ...paths});
     return response;
   }
   getBoundApi(route, runtimeEnvironment, runtimeParams) {
@@ -169,7 +157,8 @@ var LwrViewHandler = class {
       body: viewDefinition.renderedView,
       metadata: {
         viewDefinition
-      }
+      },
+      cache: viewDefinition.cache
     };
   }
 };

package/build/es/index.js

@@ -1,4 +1,4 @@
-import { extractMetadataFromHtml, getCacheKeyFromJson, getSpecifier, normalizeResourcePath, createStringBuilder, InflightTasks, } from '@lwrjs/shared-utils';
+import { extractMetadataFromHtml, getCacheKeyFromJson, getSpecifier, normalizeResourcePath, createStringBuilder, shortestTtl, InflightTasks, } from '@lwrjs/shared-utils';
 import { normalizeRenderOptions, normalizeRenderedResult, reduceSourceAssetReferences } from './utils.js';
 import { linkLwrResources } from './linkers/link-lwr-resources.js';
 export { LwrViewHandler } from './view-handler.js';
@@ -295,9 +295,13 @@ export class LwrViewRegistry {
             importer: importer || renderedView.compiledView.filePath,
         };
         const stringBuilder = createStringBuilder(renderedViewContent);
+        let pageTtl;
         for (const viewTransformer of this.viewTransformers) {
             // eslint-disable-next-line no-await-in-loop
-            await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+            const linkResults = await viewTransformer.link?.(stringBuilder, mergedViewContext, linkedMetadata);
+            // Keep track of the shortest TTL from each view transformer (e.g. lwcSsrViewTranformer)
+            const ttl = linkResults && linkResults.cache?.ttl;
+            pageTtl = shortestTtl(ttl || undefined, pageTtl);
         }
         const linkedAssetContent = stringBuilder.toString();
         // Link LWR related resources
@@ -312,6 +316,7 @@ export class LwrViewRegistry {
                 resourceRegistry,
                 runtimeEnvironment,
                 runtimeParams,
+                bundleConfig: this.globalConfig.bundleConfig,
             });
             return {
                 // ...viewDefinition,
@@ -321,6 +326,7 @@ export class LwrViewRegistry {
                     assetReferences: reduceSourceAssetReferences(linkedMetadata.assetReferences),
                     ...viewRecord,
                 },
+                cache: { ttl: pageTtl },
             };
         }
         return {
@@ -329,6 +335,7 @@ export class LwrViewRegistry {
             viewRecord: {
                 assetReferences: reduceSourceAssetReferences(linkedMetadata.assetReferences),
             },
+            cache: { ttl: pageTtl },
         };
     }
 }

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

@@ -1,4 +1,4 @@
-import { ModuleRegistry, RenderedViewMetadata, RenderedViewRecord, ResourceRegistry, RuntimeEnvironment, RuntimeParams, View, ViewParams, ModuleBundler } from '@lwrjs/types';
+import { BundleConfig, ModuleRegistry, RenderedViewMetadata, RenderedViewRecord, ResourceRegistry, RuntimeEnvironment, RuntimeParams, View, ViewParams, ModuleBundler } from '@lwrjs/types';
 export interface LwrResourcesLinkedContext extends ResourceContext {
     lwrResourcesId: string;
 }
@@ -9,6 +9,7 @@ interface ResourceContext {
     moduleRegistry: ModuleRegistry;
     moduleBundler: ModuleBundler;
     resourceRegistry: ResourceRegistry;
+    bundleConfig: BundleConfig;
 }
 export declare function getHtmlResources(view: View, viewParams: ViewParams, resourceContext: ResourceContext): Promise<{
     partial: string;