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

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -37,9 +37,10 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     moduleRegistry,
     moduleBundler,
     resourceRegistry,
-    viewMetadata,
-    bundleConfig: {external = {}}
+    viewMetadata
   } = resourceContext;
+  const {bundleConfig} = resourceContext;
+  const {external = {}} = bundleConfig;
   const isExternal = function(rawSpecifier) {
     const {specifier} = (0, import_shared_utils.explodeSpecifier)(rawSpecifier);
     return Object.keys(external).some((e) => specifier === e);
@@ -61,7 +62,6 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     resourceType: import_identity.AppResourceEnum.MODULE
   };
   const bootstrapSpecifier = bootstrapModule || (0, import_identity.getAppSpecifier)(appIdentity);
-  const preloadModuleUris = new Set();
   const moduleResources = [];
   const requiredResources = [];
   const configResources = [];
@@ -69,7 +69,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const imports = {};
   const rootComponents = [];
   const requiredAmdModules = [];
-  const preloadAmdModules = [];
+  const preloadModulesMeta = new Map();
   const isSSR = view.bootstrap?.ssr;
   if (isAMD) {
     const shimBundle = debug || minify === false ? "lwr-loader-shim-legacy.bundle.js" : "lwr-loader-shim-legacy.bundle.min.js";
@@ -92,27 +92,13 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   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);
+      const uri2 = bootstrapModuleGraph.uriMap[depSpecifier];
+      preloadModulesMeta.set(depSpecifier, uri2);
     }
   }
-  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 ((0, import_shared_utils.isBundler)(defRegistry)) {
+    for (const specifier of preloadModules) {
+      await (0, import_utils2.getPreloadModulesMeta)(specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams);
     }
   }
   if (isAMD) {
@@ -141,19 +127,18 @@ 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, {isPreload: true, isSSR}));
+    preloadModulesMeta.set(specifier, uri2);
     if (bundle) {
       for (const depSpecifier of graph.graphs[0].static) {
         if (!isExternal(depSpecifier)) {
-          preloadModuleUris.add(graph.uriMap[depSpecifier]);
-          preloadAmdModules.push(depSpecifier);
+          const uri3 = graph.uriMap[depSpecifier];
+          preloadModulesMeta.set(depSpecifier, uri3);
         }
       }
     }
     rootComponents.push(specifier);
     imports[specifier] = uri2;
     if (isAMD) {
-      preloadAmdModules.push(specifier);
       for (const staticDep of graph.graphs[0].static) {
         const uri3 = graph.uriMap[staticDep];
         imports[staticDep] = uri3;
@@ -164,7 +149,6 @@ 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,
@@ -179,13 +163,13 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     },
     rootComponents,
     ...isAMD && {requiredModules: requiredAmdModules},
-    ...isAMD && {preloadModules: dedupedPreloadAmdModules}
+    ...isAMD && {preloadModules: Array.from(preloadModulesMeta.keys())}
   }, 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}));
+  for (const [, preloadUri] of preloadModulesMeta) {
+    moduleResources.push((0, import_utils.getModuleResourceByUri)(preloadUri, runtimeEnvironment, {isPreload: true, isSSR}));
   }
   const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(import_utils.generateHtmlTag));
   return {

package/build/cjs/linkers/utils.cjs

@@ -25,6 +25,7 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   flattenCustomElements: () => flattenCustomElements,
+  getPreloadModulesMeta: () => getPreloadModulesMeta,
   getViewBootstrapConfigurationResource: () => getViewBootstrapConfigurationResource,
   getViewHmrConfigurationResource: () => getViewHmrConfigurationResource
 });
@@ -120,3 +121,41 @@ function flattenCustomElements(arr, isSSR = false) {
   flatten(arr);
   return ret;
 }
+async function getPreloadModulesMeta(specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending) {
+  const {exclude = [], external = {}} = bundleConfig;
+  const isExternal = function(rawSpecifier) {
+    const {specifier: specifier2} = (0, import_shared_utils.explodeSpecifier)(rawSpecifier);
+    return Object.keys(external).includes(specifier2);
+  };
+  const isExclude = function(specifier2) {
+    return exclude.includes(specifier2);
+  };
+  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 uri = await defRegistry.resolveModuleUri(versionedModuleId, runtimeEnvironment, runtimeParams);
+    const normalizedSpecifier = versionedModuleId.version === import_shared_utils.VERSION_NOT_PROVIDED ? specifier : versionedModuleSpecifier;
+    preloadModulesMeta.set(normalizedSpecifier, uri);
+    if (exclude.length) {
+      const preloadModuleRecord = await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams);
+      const {imports} = preloadModuleRecord.bundleRecord;
+      if (imports) {
+        if (!pending) {
+          pending = new Map();
+        }
+        for (let i = 0; i < imports.length; i++) {
+          const imp = imports[i];
+          if (!pending.has(imp.specifier) && isExclude(imp.specifier)) {
+            pending.set(imp.specifier, true);
+            await getPreloadModulesMeta(imp.specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending);
+          }
+        }
+      }
+    }
+  }
+}

package/build/cjs/linkers/view_bootstrap.cjs

@@ -37,9 +37,10 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     moduleRegistry,
     moduleBundler,
     resourceRegistry,
-    viewMetadata,
-    bundleConfig: {external = {}}
+    viewMetadata
   } = resourceContext;
+  const {bundleConfig} = resourceContext;
+  const {external = {}} = bundleConfig;
   const isExternal = function(rawSpecifier) {
     const {specifier} = (0, import_shared_utils.explodeSpecifier)(rawSpecifier);
     return Object.keys(external).some((e) => specifier === e);
@@ -62,7 +63,6 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     resourceType: import_identity.AppResourceEnum.MODULE
   };
   const bootstrapSpecifier = bootstrapModule || (0, import_identity.getAppSpecifier)(appIdentity);
-  const preloadModuleUris = new Set();
   const moduleResources = [];
   const requiredResources = [];
   const configResources = [];
@@ -70,7 +70,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const imports = {};
   const rootComponents = [];
   const requiredAmdModules = [];
-  const preloadAmdModules = [];
+  const preloadModulesMeta = new Map();
   const isSSR = view.bootstrap?.ssr;
   if (isAMD) {
     const shimBundle = debug || minify === false ? "lwr-loader-shim.bundle.js" : "lwr-loader-shim.bundle.min.js";
@@ -92,27 +92,13 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   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);
+      const uri2 = bootstrapModuleGraph.uriMap[depSpecifier];
+      preloadModulesMeta.set(depSpecifier, uri2);
     }
   }
-  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 ((0, import_shared_utils.isBundler)(defRegistry)) {
+    for (const specifier of preloadModules) {
+      await (0, import_utils2.getPreloadModulesMeta)(specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams);
     }
   }
   if (isAMD) {
@@ -142,19 +128,18 @@ 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, {isPreload: true, isSSR}));
+    preloadModulesMeta.set(specifier, uri2);
     if (bundle) {
       for (const depSpecifier of graph.graphs[0].static) {
         if (!isExternal(depSpecifier)) {
-          preloadModuleUris.add(graph.uriMap[depSpecifier]);
-          preloadAmdModules.push(depSpecifier);
+          const uri3 = graph.uriMap[depSpecifier];
+          preloadModulesMeta.set(depSpecifier, uri3);
         }
       }
     }
     rootComponents.push(specifier);
     imports[specifier] = uri2;
     if (isAMD) {
-      preloadAmdModules.push(specifier);
       for (const staticDep of graph.graphs[0].static) {
         const uri3 = graph.uriMap[staticDep];
         imports[staticDep] = uri3;
@@ -166,7 +151,6 @@ 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,
@@ -179,13 +163,13 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     index: importMetadata?.index,
     rootComponents,
     ...isAMD && {requiredModules: requiredAmdModules},
-    ...isAMD && {preloadModules: dedupedPreloadAmdModules}
+    ...isAMD && {preloadModules: Array.from(preloadModulesMeta.keys())}
   }, 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}));
+  for (const [, preloadUri] of preloadModulesMeta) {
+    moduleResources.push((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);

package/build/es/linkers/legacy_view_bootstrap.js

@@ -1,9 +1,11 @@
-import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, logger, getVersionedModuleId, explodeSpecifier, getSpecifier, normalizeVersionToUri, VERSION_NOT_PROVIDED, } from '@lwrjs/shared-utils';
+import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, logger, explodeSpecifier, isBundler, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { generateHtmlTag, getModuleResourceByUri } from '../utils.js';
-import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
+import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, getPreloadModulesMeta, } from './utils.js';
 export async function getHtmlResources(view, viewParams, resourceContext) {
-    const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, bundleConfig: { external = {} }, } = resourceContext;
+    const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
+    const { bundleConfig } = resourceContext;
+    const { external = {} } = bundleConfig;
     const isExternal = function (rawSpecifier) {
         const { specifier } = explodeSpecifier(rawSpecifier);
         return Object.keys(external).some((e) => specifier === e);
@@ -28,7 +30,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     /*
         Internal module and module dependency related resources used by the view to render view related components.
      */
-    const preloadModuleUris = new Set();
     const moduleResources = [];
     /*
         External resources that the view depends. These resources include ones that an ViewDefinition client are required to load
@@ -49,7 +50,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const requiredAmdModules = [];
     // Collection of modules that will be preloaded. For AMD, it will be part of
     // the preloadModules client bootstrap config
-    const preloadAmdModules = [];
+    const preloadModulesMeta = new Map();
     // Determine if server side rendering view modules
     const isSSR = view.bootstrap?.ssr;
     // ------ AMD Required module resources
@@ -86,36 +87,15 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     // PRELOAD the bootstrap module static dependencies as preloaded script resources
     for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
         if (!isExternal(depSpecifier)) {
-            preloadModuleUris.add(bootstrapModuleGraph.uriMap[depSpecifier]);
-            // in AMD, we also need to tell the loader it's being preloaded
-            preloadAmdModules.push(depSpecifier);
+            const uri = bootstrapModuleGraph.uriMap[depSpecifier];
+            preloadModulesMeta.set(depSpecifier, uri);
         }
     }
     // PRELOAD configured preloadModules as preloaded script resources
-    for (let i = 0; i < preloadModules.length; i++) {
-        const specifier = preloadModules[i];
-        if (isExternal(specifier)) {
-            logger.warn(`"${specifier}" is configured in both bundleConfig.externals and bootstrap.preloadModules. We are treating it as external.`);
-        }
-        else {
+    if (isBundler(defRegistry)) {
+        for (const specifier of preloadModules) {
             // eslint-disable-next-line no-await-in-loop
-            const versionedModuleId = await getVersionedModuleId(specifier, moduleRegistry);
-            const versionedModuleSpecifier = getSpecifier({
-                specifier,
-                version: normalizeVersionToUri(versionedModuleId.version),
-            });
-            const uri = bootstrapModuleGraph.uriMap[versionedModuleSpecifier] ||
-                // eslint-disable-next-line no-await-in-loop
-                (await defRegistry.resolveModuleUri(versionedModuleId, runtimeEnvironment, runtimeParams));
-            preloadModuleUris.add(uri);
-            // in AMD, we also need to tell the loader it's being preloaded
-            if (versionedModuleId.version == VERSION_NOT_PROVIDED) {
-                // If this is explicitly a non versioned specifier from static metadata key off the non versioned specifier
-                preloadAmdModules.push(specifier);
-            }
-            else {
-                preloadAmdModules.push(versionedModuleSpecifier);
-            }
+            await getPreloadModulesMeta(specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams);
         }
     }
     if (isAMD) {
@@ -154,14 +134,13 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         // PRELOAD the custom element module as a link resource
         const specifier = graph.graphs[0].specifier;
         const uri = graph.uriMap[specifier];
-        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
+        preloadModulesMeta.set(specifier, uri);
         // PRELOAD custom element static deps as link resources when bundling is ON
         if (bundle) {
             for (const depSpecifier of graph.graphs[0].static) {
                 if (!isExternal(depSpecifier)) {
-                    preloadModuleUris.add(graph.uriMap[depSpecifier]);
-                    // in AMD, we also need to tell the loader it's being preloaded
-                    preloadAmdModules.push(depSpecifier);
+                    const uri = graph.uriMap[depSpecifier];
+                    preloadModulesMeta.set(depSpecifier, uri);
                 }
             }
         }
@@ -169,7 +148,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         rootComponents.push(specifier);
         imports[specifier] = uri;
         if (isAMD) {
-            preloadAmdModules.push(specifier);
             for (const staticDep of graph.graphs[0].static) {
                 const uri = graph.uriMap[staticDep];
                 // AMD ADD static module dep uri addressability
@@ -182,7 +160,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             }
         }
     }));
-    const dedupedPreloadAmdModules = [...new Set(preloadAmdModules)];
     // ADD configuration of the bootstrapModule
     configResources.unshift(await getViewBootstrapConfigurationResource({
         id: view.id,
@@ -198,14 +175,15 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         },
         rootComponents,
         ...(isAMD && { requiredModules: requiredAmdModules }),
-        ...(isAMD && { preloadModules: dedupedPreloadAmdModules }),
+        // in AMD we need to tell the loader what modules we are preloading
+        ...(isAMD && { preloadModules: Array.from(preloadModulesMeta.keys()) }),
     }, runtimeEnvironment, runtimeParams));
     if (!isAMD && hmrEnabled) {
         configResources.unshift(await getViewHmrConfigurationResource(view, viewMetadata));
     }
-    // PRELOAD script resources for preload module URIs at the top (ie: bootstrap and root component static dependencies)
-    for (const preloadUri of preloadModuleUris) {
-        moduleResources.unshift(getModuleResourceByUri(preloadUri, runtimeEnvironment, { isPreload: true, isSSR }));
+    // PRELOAD script resources for preload module URIs after the bootstrap module
+    for (const [, preloadUri] of preloadModulesMeta) {
+        moduleResources.push(getModuleResourceByUri(preloadUri, runtimeEnvironment, { isPreload: true, isSSR }));
     }
     // generate html partial
     const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(generateHtmlTag));

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

@@ -1,6 +1,12 @@
-import { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata, CustomElementReference } from '@lwrjs/types';
+import { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata, CustomElementReference, BundleConfig, ModuleBundler, ModuleRegistry } from '@lwrjs/types';
 import { View, ViewInfo } from '@lwrjs/types';
 export declare function getViewBootstrapConfigurationResource(viewInfo: ViewInfo, config: ClientBootstrapConfig, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): ResourceDefinition;
 export declare function getViewHmrConfigurationResource(view: View, viewMetadata: RenderedViewMetadata): ResourceDefinition;
 export declare function flattenCustomElements(arr: CustomElementReference[], isSSR?: boolean): CustomElementReference[];
+/**
+ * Recursively gets preloadModules metadata starting with a specifer
+ * Note: don't call me unless you got bundles
+ */
+export declare function getPreloadModulesMeta(specifier: string, // unversioned specifier
+preloadModulesMeta: Map<string, string>, bundleConfig: BundleConfig, moduleRegistry: ModuleRegistry, defRegistry: ModuleBundler, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, pending?: Map<string, boolean>): Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

package/build/es/linkers/utils.js

@@ -1,4 +1,4 @@
-import { getMappingUriPrefix, getModuleUriPrefix, getClientBootstrapConfigurationUri, hashContent, } from '@lwrjs/shared-utils';
+import { getMappingUriPrefix, getModuleUriPrefix, getClientBootstrapConfigurationUri, hashContent, getVersionedModuleId, normalizeVersionToUri, logger, VERSION_NOT_PROVIDED, explodeSpecifier, getSpecifier, } from '@lwrjs/shared-utils';
 const CONTENT_TYPE = 'application/javascript';
 export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironment, runtimeParams) {
     const { compat, debug, hmrEnabled, apiVersion, format } = runtimeEnvironment;
@@ -100,4 +100,54 @@ export function flattenCustomElements(arr, isSSR = false) {
     flatten(arr);
     return ret;
 }
+/**
+ * Recursively gets preloadModules metadata starting with a specifer
+ * Note: don't call me unless you got bundles
+ */
+export async function getPreloadModulesMeta(specifier, // unversioned specifier
+preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending) {
+    const { exclude = [], external = {} } = bundleConfig;
+    const isExternal = function (rawSpecifier) {
+        const { specifier } = explodeSpecifier(rawSpecifier);
+        return Object.keys(external).includes(specifier);
+    };
+    const isExclude = function (specifier) {
+        return exclude.includes(specifier);
+    };
+    if (isExternal(specifier)) {
+        logger.warn(`"${specifier}" is configured in both bundleConfig.externals and bootstrap.preloadModules. We are treating it as external.`);
+    }
+    else {
+        // eslint-disable-next-line no-await-in-loop
+        const versionedModuleId = await getVersionedModuleId(specifier, moduleRegistry); // TODO replace moduleRegistry with defRegistry
+        const versionedModuleSpecifier = getSpecifier({
+            specifier,
+            version: normalizeVersionToUri(versionedModuleId.version),
+        });
+        const uri = 
+        // eslint-disable-next-line no-await-in-loop
+        await defRegistry.resolveModuleUri(versionedModuleId, runtimeEnvironment, runtimeParams);
+        // fallback to unversioned specifier if needed
+        const normalizedSpecifier = versionedModuleId.version === VERSION_NOT_PROVIDED ? specifier : versionedModuleSpecifier;
+        preloadModulesMeta.set(normalizedSpecifier, uri);
+        if (exclude.length) {
+            // check if we need to also preload any excluded dependencies of this preload module
+            const preloadModuleRecord = await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams);
+            const { imports } = preloadModuleRecord.bundleRecord;
+            if (imports) {
+                if (!pending) {
+                    pending = new Map();
+                }
+                for (let i = 0; i < imports.length; i++) {
+                    const imp = imports[i];
+                    if (!pending.has(imp.specifier) && isExclude(imp.specifier)) {
+                        pending.set(imp.specifier, true); // prevent dupe calls
+                        // eslint-disable-next-line no-await-in-loop
+                        await getPreloadModulesMeta(imp.specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending);
+                    }
+                }
+            }
+        }
+    }
+}
 //# sourceMappingURL=utils.js.map

package/build/es/linkers/view_bootstrap.js

@@ -1,9 +1,11 @@
-import { kebabCaseToModuleSpecifier, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, logger, getVersionedModuleId, explodeSpecifier, getSpecifier, normalizeVersionToUri, VERSION_NOT_PROVIDED, } from '@lwrjs/shared-utils';
+import { kebabCaseToModuleSpecifier, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, logger, explodeSpecifier, isBundler, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { generateHtmlTag, getModuleResourceByUri } from '../utils.js';
-import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
+import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, getPreloadModulesMeta, } from './utils.js';
 export async function getHtmlResources(view, viewParams, resourceContext) {
-    const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, bundleConfig: { external = {} }, } = resourceContext;
+    const { runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler, resourceRegistry, viewMetadata, } = resourceContext;
+    const { bundleConfig } = resourceContext;
+    const { external = {} } = bundleConfig;
     const isExternal = function (rawSpecifier) {
         const { specifier } = explodeSpecifier(rawSpecifier);
         return Object.keys(external).some((e) => specifier === e);
@@ -29,7 +31,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     /*
         Internal module and module dependency related resources used by the view to render view related components.
      */
-    const preloadModuleUris = new Set();
     const moduleResources = [];
     /*
         External resources that the view depends. These resources include ones that an ViewDefinition client are required to load
@@ -50,7 +51,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const requiredAmdModules = [];
     // Collection of modules that will be preloaded. For AMD, it will be part of
     // the preloadModules client bootstrap config
-    const preloadAmdModules = [];
+    const preloadModulesMeta = new Map();
     // Determine if server side rendering view modules
     const isSSR = view.bootstrap?.ssr;
     // ------ AMD Required module resources
@@ -83,36 +84,15 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     // PRELOAD the bootstrap module static dependencies as preloaded script resources
     for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
         if (!isExternal(depSpecifier)) {
-            preloadModuleUris.add(bootstrapModuleGraph.uriMap[depSpecifier]);
-            // in AMD, we also need to tell the loader it's being preloaded
-            preloadAmdModules.push(depSpecifier);
+            const uri = bootstrapModuleGraph.uriMap[depSpecifier];
+            preloadModulesMeta.set(depSpecifier, uri);
         }
     }
     // PRELOAD configured preloadModules as preloaded script resources
-    for (let i = 0; i < preloadModules.length; i++) {
-        const specifier = preloadModules[i];
-        if (isExternal(specifier)) {
-            logger.warn(`"${specifier}" is configured in both bundleConfig.externals and bootstrap.preloadModules. We are treating it as external.`);
-        }
-        else {
+    if (isBundler(defRegistry)) {
+        for (const specifier of preloadModules) {
             // eslint-disable-next-line no-await-in-loop
-            const versionedModuleId = await getVersionedModuleId(specifier, moduleRegistry);
-            const versionedModuleSpecifier = getSpecifier({
-                specifier,
-                version: normalizeVersionToUri(versionedModuleId.version),
-            });
-            const uri = bootstrapModuleGraph.uriMap[versionedModuleSpecifier] ||
-                // eslint-disable-next-line no-await-in-loop
-                (await defRegistry.resolveModuleUri(versionedModuleId, runtimeEnvironment, runtimeParams));
-            preloadModuleUris.add(uri);
-            // in AMD, we also need to tell the loader it's being preloaded
-            if (versionedModuleId.version == VERSION_NOT_PROVIDED) {
-                // If this is explicitly a non versioned specifier from static metadata key off the non versioned specifier
-                preloadAmdModules.push(specifier);
-            }
-            else {
-                preloadAmdModules.push(versionedModuleSpecifier);
-            }
+            await getPreloadModulesMeta(specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams);
         }
     }
     if (isAMD) {
@@ -153,14 +133,13 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         // PRELOAD the custom element module as a link resource
         const specifier = graph.graphs[0].specifier;
         const uri = graph.uriMap[specifier];
-        moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: true, isSSR }));
+        preloadModulesMeta.set(specifier, uri);
         // PRELOAD custom element static deps as link resources when bundling is ON
         if (bundle) {
             for (const depSpecifier of graph.graphs[0].static) {
                 if (!isExternal(depSpecifier)) {
-                    preloadModuleUris.add(graph.uriMap[depSpecifier]);
-                    // in AMD, we also need to tell the loader it's being preloaded
-                    preloadAmdModules.push(depSpecifier);
+                    const uri = graph.uriMap[depSpecifier];
+                    preloadModulesMeta.set(depSpecifier, uri);
                 }
             }
         }
@@ -168,7 +147,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         rootComponents.push(specifier);
         imports[specifier] = uri;
         if (isAMD) {
-            preloadAmdModules.push(specifier);
             for (const staticDep of graph.graphs[0].static) {
                 const uri = graph.uriMap[staticDep];
                 // AMD ADD static module dep uri addressability
@@ -183,7 +161,6 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         // eslint-disable-next-line no-await-in-loop
         importMetadata = await toImportMetadata(graph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
     }
-    const dedupedPreloadAmdModules = [...new Set(preloadAmdModules)];
     // ADD configuration of the bootstrapModule
     configResources.unshift(await getViewBootstrapConfigurationResource({
         id: view.id,
@@ -197,14 +174,15 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         index: importMetadata?.index,
         rootComponents,
         ...(isAMD && { requiredModules: requiredAmdModules }),
-        ...(isAMD && { preloadModules: dedupedPreloadAmdModules }),
+        // in AMD we need to tell the loader what modules we are preloading
+        ...(isAMD && { preloadModules: Array.from(preloadModulesMeta.keys()) }),
     }, runtimeEnvironment, runtimeParams));
     if (!isAMD && hmrEnabled) {
         configResources.unshift(await getViewHmrConfigurationResource(view, viewMetadata));
     }
-    // PRELOAD script resources for preload module URIs at the top (ie: bootstrap and root component static dependencies)
-    for (const preloadUri of preloadModuleUris) {
-        moduleResources.unshift(getModuleResourceByUri(preloadUri, runtimeEnvironment, { isPreload: true, isSSR }));
+    // PRELOAD script resources for preload module URIs after the bootstrap module
+    for (const [, preloadUri] of preloadModulesMeta) {
+        moduleResources.push(getModuleResourceByUri(preloadUri, runtimeEnvironment, { isPreload: true, isSSR }));
     }
     // generate html partial
     const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(generateHtmlTag));

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.31",
+    "version": "0.9.0-alpha.33",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,15 +30,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.9.0-alpha.31",
-        "@lwrjs/diagnostics": "0.9.0-alpha.31",
-        "@lwrjs/shared-utils": "0.9.0-alpha.31"
+        "@lwrjs/app-service": "0.9.0-alpha.33",
+        "@lwrjs/diagnostics": "0.9.0-alpha.33",
+        "@lwrjs/shared-utils": "0.9.0-alpha.33"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.31"
+        "@lwrjs/types": "0.9.0-alpha.33"
     },
     "engines": {
         "node": ">=16.0.0 <20"
     },
-    "gitHead": "be668a80891cd00d1fb689aa99037b0f05cc4061"
+    "gitHead": "5700e9661fe6946d4b7b78c5ecd86348c08f0559"
 }