@lwrjs/view-registry 0.8.0-alpha.0 → 0.8.0-alpha.10

package/build/cjs/index.cjs

@@ -37,7 +37,7 @@ var LwrViewRegistry = class {
     this.compiledViews = new Map();
     this.viewDefinitions = new Map();
     this.immutableAssets = new Map();
-    this.pendingViewDefinitions = new Map();
+    this.pendingViewDefinitions = new import_shared_utils.InflightTasks();
     this.name = "lwr-view-registry";
     this.resourceRegistry = context.resourceRegistry;
     this.runtimeEnvironment = context.runtimeEnvironment;
@@ -172,13 +172,7 @@ var LwrViewRegistry = class {
       }
     }
     const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
-    if (this.pendingViewDefinitions.has(pendingViewDefCacheKey)) {
-      return this.pendingViewDefinitions.get(pendingViewDefCacheKey);
-    }
-    const pendingViewDefinition = this.renderView(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions);
-    this.pendingViewDefinitions.set(pendingViewDefCacheKey, pendingViewDefinition);
-    const viewDefinition = await pendingViewDefinition;
-    this.pendingViewDefinitions.delete(pendingViewDefCacheKey);
+    const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => this.renderView(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions));
     if (cacheDisabled === false) {
       this.viewDefinitions.set(viewDefCacheKey, {
         view,

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -58,6 +58,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const rootComponents = [];
   const requiredAmdModules = [];
   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 def = await resourceRegistry.getResource({specifier: shimBundle, version}, runtimeEnvironment, runtimeParams);
@@ -74,14 +75,17 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       requiredResources.push(await (0, import_utils.getModuleResource)({
         specifier: "lwr/loaderLegacy",
         version
-      }, moduleRegistry, runtimeEnvironment, runtimeParams));
+      }, 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 versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
   const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
-  moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment));
+  moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
   if (isAMD) {
     requiredAmdModules.push(versionedSpecifier);
     imports[versionedSpecifier] = uri;
@@ -89,7 +93,7 @@ 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, true));
+        moduleResources.push((0, import_utils.getModuleResourceByUri)(uri2, runtimeEnvironment, {isPreload: true, isSSR}));
         requiredAmdModules.push(staticDep);
       }
     }
@@ -102,7 +106,6 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       }
     }
   }
-  const isSSR = view.bootstrap?.experimentalSSR;
   const customElementsRecords = [];
   const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements, isSSR);
   await Promise.all(flattenedElements.map(async ({tagName: element, props}) => {
@@ -110,7 +113,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     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, true));
+    moduleResources.push((0, import_utils.getModuleResourceByUri)(uri2, runtimeEnvironment, {isPreload: true, isSSR}));
     rootComponents.push(specifier);
     imports[specifier] = uri2;
     if (isAMD) {

package/build/cjs/linkers/link-lwr-resources.cjs

@@ -30,9 +30,7 @@ var import_view_bootstrap = __toModule(require("./view_bootstrap.cjs"));
 var import_legacy_view_bootstrap = __toModule(require("./legacy_view_bootstrap.cjs"));
 async function linkLwrResources(source, view, viewParams, cxt) {
   const {lwrResourcesId, ...resourceContext} = cxt;
-  const {
-    featureFlags: {LEGACY_LOADER}
-  } = resourceContext.runtimeEnvironment;
+  const LEGACY_LOADER = resourceContext.runtimeEnvironment?.featureFlags?.LEGACY_LOADER;
   const {partial, viewRecord} = LEGACY_LOADER ? await (0, import_legacy_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext) : await (0, import_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext);
   return {
     renderedView: source.replace(lwrResourcesId, partial),

package/build/cjs/linkers/view_bootstrap.cjs

@@ -58,6 +58,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const rootComponents = [];
   const requiredAmdModules = [];
   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 def = await resourceRegistry.getResource({specifier: shimBundle, version}, runtimeEnvironment, runtimeParams);
@@ -74,14 +75,16 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       requiredResources.push(await (0, import_utils.getModuleResource)({
         specifier: "lwr/loader",
         version
-      }, moduleRegistry, runtimeEnvironment, runtimeParams));
+      }, 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 versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
   const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
-  moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment));
+  moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
   if (isAMD) {
     requiredAmdModules.push(versionedSpecifier);
     imports[versionedSpecifier] = uri;
@@ -89,7 +92,7 @@ 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, true));
+        moduleResources.push((0, import_utils.getModuleResourceByUri)(uri2, runtimeEnvironment, {isPreload: true, isSSR}));
         requiredAmdModules.push(staticDep);
       }
     }
@@ -103,7 +106,6 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     }
   }
   let importMetadata = await (0, import_shared_utils.toImportMetadata)(bootstrapModuleGraph, {imports: {}, index: {}}, moduleRegistry, runtimeEnvironment, runtimeParams);
-  const isSSR = view.bootstrap?.experimentalSSR;
   const customElementsRecords = [];
   const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements, isSSR);
   await Promise.all(flattenedElements.map(async ({tagName: element, props}) => {
@@ -111,7 +113,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     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, true));
+    moduleResources.push((0, import_utils.getModuleResourceByUri)(uri2, runtimeEnvironment, {isPreload: true, isSSR}));
     rootComponents.push(specifier);
     imports[specifier] = uri2;
     if (isAMD) {

package/build/cjs/utils.cjs

@@ -53,9 +53,14 @@ function streamToString(stream) {
 function generateExternalStyle(src) {
   return `<link rel="stylesheet" href="${src}">`;
 }
-function generateExternalScript(type = "application/javascript", src, async) {
-  const asyncStr = async ? " async" : "";
-  return `<script type="${type}"${asyncStr} src="${src}"></script>`;
+function generateExternalScript(type = "application/javascript", src, async, defer) {
+  let scriptLoadOrder = "";
+  if (defer) {
+    scriptLoadOrder = " defer";
+  } else if (async) {
+    scriptLoadOrder = " async";
+  }
+  return `<script type="${type}"${scriptLoadOrder} src="${src}"></script>`;
 }
 function generateLinkPreloadTag({href, type}) {
   if (type === "module") {
@@ -64,13 +69,13 @@ function generateLinkPreloadTag({href, type}) {
     return `<link rel="preload" href="${href}" type="${type}" />`;
   }
 }
-function generateExternalTag({type, src = "", async, isPreload}) {
+function generateExternalTag({type, src = "", async, defer, isPreload}) {
   if (isPreload) {
     return generateLinkPreloadTag({href: src, type});
   } else if (type === "text/css") {
     return generateExternalStyle(src);
   } else {
-    return generateExternalScript(type, src, async);
+    return generateExternalScript(type, src, async, defer);
   }
 }
 async function generateInlineTag({specifier, type, content, stream, nonce}) {
@@ -224,22 +229,26 @@ async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEnvironme
     }
   };
 }
-async function getModuleResource(moduleId, moduleRegistry, runtimeEnvironment, runtimeParams, isPreload) {
-  const moduleUri = await moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
+async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, moduleRegistry, runtimeParams) {
   const {format} = runtimeEnvironment;
+  const {isSSR = false, isPreload = false} = moduleResouceMeta;
+  const moduleUri = await moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
   return {
     src: moduleUri,
     type: format === "amd" ? "application/javascript" : "module",
-    async: isPreload,
+    async: !isSSR && isPreload,
+    defer: isSSR,
     isPreload: format !== "amd" && isPreload
   };
 }
-function getModuleResourceByUri(moduleUri, runtimeEnvironment, isPreload) {
+function getModuleResourceByUri(uri, runtimeEnvironment, moduleResouceMeta) {
+  const {isSSR = false, isPreload = false} = moduleResouceMeta;
   const {format} = runtimeEnvironment;
   return {
-    src: moduleUri,
+    src: uri,
     type: format === "amd" ? "application/javascript" : "module",
-    async: isPreload,
+    async: !isSSR && isPreload,
+    defer: isSSR,
     isPreload: format !== "amd" && isPreload
   };
 }

package/build/es/index.js

@@ -1,4 +1,4 @@
-import { extractMetadataFromHtml, getCacheKeyFromJson, getSpecifier, normalizeResourcePath, createStringBuilder, } from '@lwrjs/shared-utils';
+import { extractMetadataFromHtml, getCacheKeyFromJson, getSpecifier, normalizeResourcePath, createStringBuilder, 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';
@@ -17,8 +17,7 @@ export class LwrViewRegistry {
         //
         // Pending view definitions are tracked to prevent concurrent resolution of the same view.
         // Subsequent requests for the same view will await the original promise.
-        // Cache entries will be removed once the view is resolved.
-        this.pendingViewDefinitions = new Map();
+        this.pendingViewDefinitions = new InflightTasks();
         this.name = 'lwr-view-registry';
         this.resourceRegistry = context.resourceRegistry;
         this.runtimeEnvironment = context.runtimeEnvironment;
@@ -179,13 +178,7 @@ export class LwrViewRegistry {
             }
         }
         const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
-        if (this.pendingViewDefinitions.has(pendingViewDefCacheKey)) {
-            return this.pendingViewDefinitions.get(pendingViewDefCacheKey);
-        }
-        const pendingViewDefinition = this.renderView(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions);
-        this.pendingViewDefinitions.set(pendingViewDefCacheKey, pendingViewDefinition);
-        const viewDefinition = await pendingViewDefinition;
-        this.pendingViewDefinitions.delete(pendingViewDefCacheKey);
+        const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => this.renderView(view, viewParams, runtimeEnvironment, runtimeParams, renderOptions));
         if (cacheDisabled === false) {
             this.viewDefinitions.set(viewDefCacheKey, {
                 view,

package/build/es/linkers/legacy_view_bootstrap.js

@@ -39,6 +39,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const requiredAmdModules = [];
     // Collection of modules that will be loaded in the view
     const preloadAmdModules = [];
+    // Determine if server side rendering view modules
+    const isSSR = view.bootstrap?.ssr;
     // ------ AMD Required module resources
     if (isAMD) {
         // Keep shim format in sync with view_bootstrap.ts
@@ -64,7 +66,10 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             requiredResources.push(await getModuleResource({
                 specifier: 'lwr/loaderLegacy',
                 version,
-            }, moduleRegistry, runtimeEnvironment, runtimeParams));
+            }, runtimeEnvironment, {
+                isPreload: false,
+                isSSR,
+            }, moduleRegistry, runtimeParams));
         }
     }
     // ------- Application Bootstrap module
@@ -78,7 +83,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     // ADD bootstrap module uri as a script resource
     const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
     const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
-    moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment));
+    moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR }));
     if (isAMD) {
         // ADD bootstrap module as required
         requiredAmdModules.push(versionedSpecifier);
@@ -92,7 +97,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             // ADD bootstrap module static deps to requiredAmdModules if services, otherwise preloadModules
             if (services && services.length) {
                 // get the graphs for the bs static deps
-                moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, true));
+                moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
                 requiredAmdModules.push(staticDep);
             }
         }
@@ -108,7 +113,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         }
     }
     // ------- View related custom element moduleResources
-    const isSSR = view.bootstrap?.experimentalSSR;
     const customElementsRecords = [];
     const flattenedElements = flattenCustomElements(customElements, isSSR);
     await Promise.all(flattenedElements.map(async ({ tagName: element, props }) => {
@@ -118,7 +122,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         // PRELOAD custom element static deps as link resource
         const specifier = graph.graphs[0].specifier;
         const uri = graph.uriMap[specifier];
-        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, true));
+        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
         // ADD register custom elements as a uri addressable rootComponents
         rootComponents.push(specifier);
         imports[specifier] = uri;

package/build/es/linkers/link-lwr-resources.js

@@ -2,7 +2,7 @@ import { getHtmlResources } from './view_bootstrap.js';
 import { getHtmlResources as getLegacyHtmlResource } from './legacy_view_bootstrap.js';
 export async function linkLwrResources(source, view, viewParams, cxt) {
     const { lwrResourcesId, ...resourceContext } = cxt;
-    const { featureFlags: { LEGACY_LOADER }, } = resourceContext.runtimeEnvironment;
+    const LEGACY_LOADER = resourceContext.runtimeEnvironment?.featureFlags?.LEGACY_LOADER;
     const { partial, viewRecord } = LEGACY_LOADER
         ? await getLegacyHtmlResource(view, viewParams, resourceContext)
         : await getHtmlResources(view, viewParams, resourceContext);

package/build/es/linkers/view_bootstrap.js

@@ -39,6 +39,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const requiredAmdModules = [];
     // Collection of modules that will be loaded in the view
     const preloadAmdModules = [];
+    // Determine if server side rendering view modules
+    const isSSR = view.bootstrap?.ssr;
     // ------ AMD Required module resources
     if (isAMD) {
         // Keep shim format in sync with legacy_view_bootstrap.ts
@@ -64,7 +66,9 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             requiredResources.push(await getModuleResource({
                 specifier: 'lwr/loader',
                 version,
-            }, moduleRegistry, runtimeEnvironment, runtimeParams));
+            }, runtimeEnvironment, {
+                isSSR,
+            }, moduleRegistry, runtimeParams));
         }
     }
     // ------- Application Bootstrap module
@@ -77,7 +81,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     // ADD bootstrap module uri as a script resource
     const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
     const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
-    moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment));
+    moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR }));
     if (isAMD) {
         // ADD bootstrap module as required
         requiredAmdModules.push(versionedSpecifier);
@@ -91,7 +95,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             // ADD bootstrap module static deps to requiredAmdModules if services, otherwise preloadModules
             if (services && services.length) {
                 // get the graphs for the bs static deps
-                moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, true));
+                moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
                 requiredAmdModules.push(staticDep);
             }
         }
@@ -108,7 +112,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     }
     let importMetadata = await toImportMetadata(bootstrapModuleGraph, { imports: {}, index: {} }, moduleRegistry, runtimeEnvironment, runtimeParams);
     // ------- View related custom element moduleResources
-    const isSSR = view.bootstrap?.experimentalSSR;
     const customElementsRecords = [];
     const flattenedElements = flattenCustomElements(customElements, isSSR);
     await Promise.all(flattenedElements.map(async ({ tagName: element, props }) => {
@@ -118,7 +121,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         // PRELOAD custom element static deps as link resource
         const specifier = graph.graphs[0].specifier;
         const uri = graph.uriMap[specifier];
-        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, true));
+        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
         // ADD register custom elements as a uri addressable rootComponents
         rootComponents.push(specifier);
         imports[specifier] = uri;

package/build/es/utils.d.ts

@@ -1,4 +1,4 @@
-import { NormalizedRenderingResult, RenderingResult, ResourceDefinition, AssetReference, RenderedAssetReference, RenderOptions, ModuleId, ViewPageContext, JsonCompatible } from '@lwrjs/types';
+import { NormalizedRenderingResult, RenderingResult, ResourceDefinition, AssetReference, RenderedAssetReference, RenderOptions, ModuleId, ViewModuleResourceContext, ViewPageContext, JsonCompatible } from '@lwrjs/types';
 import { PublicModuleRegistry, RuntimeEnvironment, RuntimeParams, ModuleJson, RouteHandlerViewResponse, ViewResponse, RouteHandlerFunction, LwrRoute, LwrErrorRoute, ViewRequest, LinkedViewDefinition, ModuleRegistry } from 'packages/@lwrjs/types/src';
 export declare type HTMLResource = Partial<ResourceDefinition>;
 export declare function generateHtmlTag(definition: HTMLResource): Promise<string>;
@@ -18,8 +18,8 @@ interface RouteHandlerContext {
  */
 export declare function getRouteHandler(path: string, { cacheDir, rootDir }: RouteHandlerContext): Promise<RouteHandlerFunction>;
 export declare function toJsonFormat(viewRequest: ViewRequest, viewDefinition: LinkedViewDefinition, route: LwrRoute | LwrErrorRoute, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, moduleRegistry: ModuleRegistry): Promise<ViewResponse>;
-export declare function getModuleResource(moduleId: Pick<ModuleId, 'specifier' | 'version'>, moduleRegistry: ModuleRegistry, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, isPreload?: boolean): Promise<ResourceDefinition>;
-export declare function getModuleResourceByUri(moduleUri: string, runtimeEnvironment: RuntimeEnvironment, isPreload?: boolean): ResourceDefinition;
+export declare function getModuleResource(moduleId: Pick<ModuleId, 'specifier' | 'version'>, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext, moduleRegistry: ModuleRegistry, runtimeParams?: RuntimeParams): Promise<ResourceDefinition>;
+export declare function getModuleResourceByUri(uri: string, runtimeEnvironment: RuntimeEnvironment, moduleResouceMeta: ViewModuleResourceContext): ResourceDefinition;
 export declare function createJsonModule(specifier: string, moduleRegistry: PublicModuleRegistry, environment: RuntimeEnvironment, params?: RuntimeParams): Promise<ModuleJson>;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/build/es/utils.js

@@ -15,9 +15,15 @@ function streamToString(stream) {
 function generateExternalStyle(src) {
     return `<link rel="stylesheet" href="${src}">`;
 }
-function generateExternalScript(type = 'application/javascript', src, async) {
-    const asyncStr = async ? ' async' : '';
-    return `<script type="${type}"${asyncStr} src="${src}"></script>`;
+function generateExternalScript(type = 'application/javascript', src, async, defer) {
+    let scriptLoadOrder = '';
+    if (defer) {
+        scriptLoadOrder = ' defer';
+    }
+    else if (async) {
+        scriptLoadOrder = ' async';
+    }
+    return `<script type="${type}"${scriptLoadOrder} src="${src}"></script>`;
 }
 function generateLinkPreloadTag({ href, type }) {
     if (type === 'module') {
@@ -27,7 +33,7 @@ function generateLinkPreloadTag({ href, type }) {
         return `<link rel="preload" href="${href}" type="${type}" />`;
     }
 }
-function generateExternalTag({ type, src = '', async, isPreload }) {
+function generateExternalTag({ type, src = '', async, defer, isPreload }) {
     if (isPreload) {
         return generateLinkPreloadTag({ href: src, type: type });
     }
@@ -35,7 +41,7 @@ function generateExternalTag({ type, src = '', async, isPreload }) {
         return generateExternalStyle(src);
     }
     else {
-        return generateExternalScript(type, src, async);
+        return generateExternalScript(type, src, async, defer);
     }
 }
 async function generateInlineTag({ specifier, type, content, stream, nonce }) {
@@ -207,24 +213,28 @@ export async function toJsonFormat(viewRequest, viewDefinition, route, runtimeEn
         },
     };
 }
-export async function getModuleResource(moduleId, moduleRegistry, runtimeEnvironment, runtimeParams, isPreload) {
-    const moduleUri = await moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
+export async function getModuleResource(moduleId, runtimeEnvironment, moduleResouceMeta, moduleRegistry, runtimeParams) {
     const { format } = runtimeEnvironment;
+    const { isSSR = false, isPreload = false } = moduleResouceMeta;
+    const moduleUri = await moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
     return {
         src: moduleUri,
         type: format === 'amd' ? 'application/javascript' : 'module',
-        async: isPreload,
+        async: !isSSR && isPreload,
+        defer: isSSR,
         // only use link preload for ESM for compat reasons.
         // AMD should use regular script tags for preloading
         isPreload: format !== 'amd' && isPreload,
     };
 }
-export function getModuleResourceByUri(moduleUri, runtimeEnvironment, isPreload) {
+export function getModuleResourceByUri(uri, runtimeEnvironment, moduleResouceMeta) {
+    const { isSSR = false, isPreload = false } = moduleResouceMeta;
     const { format } = runtimeEnvironment;
     return {
-        src: moduleUri,
+        src: uri,
         type: format === 'amd' ? 'application/javascript' : 'module',
-        async: isPreload,
+        async: !isSSR && isPreload,
+        defer: isSSR,
         // only use link preload for ESM for compat reasons.
         // AMD should use regular script tags for preloading
         isPreload: format !== 'amd' && isPreload,

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.8.0-alpha.0",
+    "version": "0.8.0-alpha.10",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,15 +30,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.8.0-alpha.0",
-        "@lwrjs/diagnostics": "0.8.0-alpha.0",
-        "@lwrjs/shared-utils": "0.8.0-alpha.0"
+        "@lwrjs/app-service": "0.8.0-alpha.10",
+        "@lwrjs/diagnostics": "0.8.0-alpha.10",
+        "@lwrjs/shared-utils": "0.8.0-alpha.10"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.8.0-alpha.0"
+        "@lwrjs/types": "0.8.0-alpha.10"
     },
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "2e1f60ed13f9f8079f1333af9b614cd24715f3ad"
+    "gitHead": "55922351f484d77784d86ef7b03ebe788fa3e12c"
 }