@lwrjs/view-registry 0.17.2-alpha.29 → 0.17.2-alpha.30

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -110,6 +110,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const viewPreloads = {
     uris: [],
     specifiers: [],
+    includedModules: [],
     groups: new Map(),
     integrities: new Map()
   };
@@ -227,7 +228,9 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       const specifier = graph.graphs[0].specifier;
       const uri = graph.uriMap[specifier];
       const integrity = (0, import_utils2.getBundleIntegrity)(graph, specifier);
-      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads);
+      const bundleDef = graph.linkedDefinitions[specifier];
+      const includedModules = bundleDef?.bundleRecord ? bundleDef.bundleRecord.includedModules : [];
+      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads, includedModules);
       if (bundle) {
         for (const depSpecifier of graph.graphs[0].static) {
           const depUri = getPreloadUri(depSpecifier, graph.uriMap);
@@ -277,7 +280,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       rootComponents,
       serverData,
       ...isAMD && {requiredModules: requiredAmdModules},
-      ...isAMD && {preloadModules: viewPreloads.specifiers}
+      ...isAMD && {preloadModules: (0, import_preload_utils.getPreloadModuleList)(viewPreloads)}
     }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
   }
   if (!isAMD && hmrEnabled) {

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

@@ -24,12 +24,13 @@ var __toModule = (module2) => {
 // packages/@lwrjs/view-registry/src/linkers/preload-utils.ts
 __markAsModule(exports);
 __export(exports, {
+  getPreloadModuleList: () => getPreloadModuleList,
   getPreloadModulesMeta: () => getPreloadModulesMeta,
   setPreloadModulesMeta: () => setPreloadModulesMeta
 });
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
+function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads, includedModules = []) {
   if (!uri) {
     throw new import_diagnostics.LwrInvalidError(import_diagnostics.descriptions.INVALID.PRELOAD_MODULE(specifier));
   }
@@ -40,6 +41,7 @@ function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
   const preloadBundleGroupsMap = preloads.groups;
   const preloadModulesURIs = preloads.uris;
   const preloadModuleIntegrities = preloads.integrities;
+  const preloadModuleIncludedModules = preloads.includedModules;
   preloadModulesSpecifiers.push(specifier);
   const {specifier: unversionedSpecifier} = (0, import_shared_utils.explodeSpecifier)(specifier);
   const groupName = (0, import_shared_utils.getGroupName)(unversionedSpecifier, groups);
@@ -49,6 +51,7 @@ function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
   preloadModulesURIs.push(uri);
   groupName && preloadBundleGroupsMap.set(groupName, true);
   preloadModuleIntegrities.set(uri, integrity);
+  preloadModuleIncludedModules.push(...includedModules);
 }
 async function getPreloadModulesMeta(specifier, viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending) {
   const {exclude = [], external = {}, groups = {}} = bundleConfig;
@@ -92,3 +95,8 @@ async function getPreloadModulesMeta(specifier, viewPreloads, bundleConfig, modu
     }
   }
 }
+function getPreloadModuleList(viewPreloads) {
+  if (process.env.PRELOAD_INCLUDED_MODULES === "true")
+    return [...new Set(viewPreloads.specifiers), ...new Set(viewPreloads.includedModules)];
+  return [...new Set(viewPreloads.specifiers)];
+}

package/build/cjs/linkers/view_bootstrap.cjs

@@ -100,6 +100,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const viewPreloads = {
     uris: [],
     specifiers: [],
+    includedModules: [],
     groups: new Map(),
     integrities: new Map()
   };
@@ -209,7 +210,9 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       const specifier = graph.graphs[0].specifier;
       const uri = graph.uriMap[specifier];
       const integrity = (0, import_utils2.getBundleIntegrity)(graph, specifier);
-      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads);
+      const bundleDef = graph.linkedDefinitions[specifier];
+      const includedModules = bundleDef?.bundleRecord ? bundleDef.bundleRecord.includedModules : [];
+      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, integrity, groups, viewPreloads, includedModules);
       if (bundle) {
         for (const depSpecifier of graph.graphs[0].static) {
           const depUri = getPreloadUri(depSpecifier, graph.uriMap);
@@ -251,7 +254,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       rootComponents,
       serverData,
       ...isAMD && {requiredModules: requiredAmdModules},
-      ...isAMD && {preloadModules: viewPreloads.specifiers}
+      ...isAMD && {preloadModules: (0, import_preload_utils.getPreloadModuleList)(viewPreloads)}
     }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
   }
   if (!isAMD && hmrEnabled) {

package/build/es/linkers/legacy_view_bootstrap.js

@@ -3,7 +3,7 @@ import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPr
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { addExternalScriptNonce, generateHtmlTag, getModuleResource, getModuleResourceByUri, getViewNonce, getModuleGraphCacheKey, } from '../utils.js';
 import { flattenCustomElements, getBundleIntegrity, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
-import { setPreloadModulesMeta, getPreloadModulesMeta } from './preload-utils.js';
+import { setPreloadModulesMeta, getPreloadModulesMeta, getPreloadModuleList, } from './preload-utils.js';
 import { LRUCache } from 'lru-cache';
 function includeIdFactory(bundleConfig) {
     return (moduleRef) => {
@@ -103,6 +103,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const viewPreloads = {
         uris: [],
         specifiers: [],
+        includedModules: [],
         groups: new Map(),
         integrities: new Map(),
     };
@@ -262,7 +263,9 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             const specifier = graph.graphs[0].specifier;
             const uri = graph.uriMap[specifier];
             const integrity = getBundleIntegrity(graph, specifier);
-            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads);
+            const bundleDef = graph.linkedDefinitions[specifier];
+            const includedModules = bundleDef?.bundleRecord ? bundleDef.bundleRecord.includedModules : [];
+            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads, includedModules);
             // PRELOAD custom element static deps as link resources when bundling is ON
             if (bundle) {
                 for (const depSpecifier of graph.graphs[0].static) {
@@ -319,7 +322,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             serverData,
             ...(isAMD && { requiredModules: requiredAmdModules }),
             // in AMD we need to tell the loader what modules we are preloading
-            ...(isAMD && { preloadModules: viewPreloads.specifiers }),
+            ...(isAMD && { preloadModules: getPreloadModuleList(viewPreloads) }),
         }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
     }
     if (!isAMD && hmrEnabled) {

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

@@ -4,15 +4,17 @@ export type ViewPreloads = {
     uris: string[];
     specifiers: string[];
     integrities: Map<string, string | undefined>;
+    includedModules: string[];
 };
 /**
  * keeps track of preloadModules metadata
  */
-export declare function setPreloadModulesMeta(specifier: string, uri: string, integrity: string | undefined, groups: BundleGroups, preloads: ViewPreloads): void;
+export declare function setPreloadModulesMeta(specifier: string, uri: string, integrity: string | undefined, groups: BundleGroups, preloads: ViewPreloads, includedModules?: string[]): void;
 /**
  * Recursively gets preloadModules metadata starting with a specifier
  * Note: don't call me unless you got bundles
  */
 export declare function getPreloadModulesMeta(specifier: string, // un-versioned specifier
 viewPreloads: ViewPreloads, bundleConfig: BundleConfig, moduleRegistry: ModuleRegistry, defRegistry: ModuleBundler, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, pending?: Map<string, boolean>): Promise<void>;
+export declare function getPreloadModuleList(viewPreloads: ViewPreloads): string[];
 //# sourceMappingURL=preload-utils.d.ts.map

package/build/es/linkers/preload-utils.js

@@ -3,7 +3,7 @@ import { explodeSpecifier, getGroupName, getVersionedModuleId, normalizeVersionT
 /**
  * keeps track of preloadModules metadata
  */
-export function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads) {
+export function setPreloadModulesMeta(specifier, uri, integrity, groups, preloads, includedModules = []) {
     // Throw a very specific error if we get this back and the uri property is not set
     if (!uri) {
         throw new LwrInvalidError(descriptions.INVALID.PRELOAD_MODULE(specifier));
@@ -19,6 +19,7 @@ export function setPreloadModulesMeta(specifier, uri, integrity, groups, preload
     const preloadBundleGroupsMap = preloads.groups;
     const preloadModulesURIs = preloads.uris;
     const preloadModuleIntegrities = preloads.integrities;
+    const preloadModuleIncludedModules = preloads.includedModules;
     preloadModulesSpecifiers.push(specifier);
     const { specifier: unversionedSpecifier } = explodeSpecifier(specifier);
     const groupName = getGroupName(unversionedSpecifier, groups);
@@ -29,6 +30,7 @@ export function setPreloadModulesMeta(specifier, uri, integrity, groups, preload
     preloadModulesURIs.push(uri);
     groupName && preloadBundleGroupsMap.set(groupName, true);
     preloadModuleIntegrities.set(uri, integrity);
+    preloadModuleIncludedModules.push(...includedModules);
 }
 /**
  * Recursively gets preloadModules metadata starting with a specifier
@@ -85,4 +87,9 @@ viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, run
         }
     }
 }
+export function getPreloadModuleList(viewPreloads) {
+    if (process.env.PRELOAD_INCLUDED_MODULES === 'true')
+        return [...new Set(viewPreloads.specifiers), ...new Set(viewPreloads.includedModules)];
+    return [...new Set(viewPreloads.specifiers)];
+}
 //# sourceMappingURL=preload-utils.js.map

package/build/es/linkers/view_bootstrap.js

@@ -5,7 +5,7 @@ import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { addExternalScriptNonce, generateHtmlTag, getModuleResourceByUri, getViewNonce } from '../utils.js';
 import { flattenCustomElements, getBundleIntegrity, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';
 import { getModuleGraphCacheKey } from '../utils.js';
-import { setPreloadModulesMeta, getPreloadModulesMeta } from './preload-utils.js';
+import { setPreloadModulesMeta, getPreloadModulesMeta, getPreloadModuleList, } from './preload-utils.js';
 // `getModuleGraphs` is very expensive and does not need to be recomputed every time.
 // Note: we use the same cache key passed in from the top level view-registry for consistency
 const moduleGraphsCache = new LRUCache({
@@ -87,6 +87,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     const viewPreloads = {
         uris: [],
         specifiers: [],
+        includedModules: [],
         groups: new Map(),
         integrities: new Map(),
     };
@@ -232,7 +233,9 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             const specifier = graph.graphs[0].specifier;
             const uri = graph.uriMap[specifier];
             const integrity = getBundleIntegrity(graph, specifier);
-            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads);
+            const bundleDef = graph.linkedDefinitions[specifier];
+            const includedModules = bundleDef?.bundleRecord ? bundleDef.bundleRecord.includedModules : [];
+            setPreloadModulesMeta(specifier, uri, integrity, groups, viewPreloads, includedModules);
             // PRELOAD custom element static deps as link resources when bundling is ON
             if (bundle) {
                 for (const depSpecifier of graph.graphs[0].static) {
@@ -281,7 +284,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             serverData,
             ...(isAMD && { requiredModules: requiredAmdModules }),
             // in AMD we need to tell the loader what modules we are preloading
-            ...(isAMD && { preloadModules: viewPreloads.specifiers }),
+            ...(isAMD && { preloadModules: getPreloadModuleList(viewPreloads) }),
         }, runtimeEnvironment, runtimeParams, serverDebug?.warnings));
     }
     if (!isAMD && hmrEnabled) {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.2-alpha.29",
+    "version": "0.17.2-alpha.30",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,15 +33,15 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.17.2-alpha.29",
-        "@lwrjs/config": "0.17.2-alpha.29",
-        "@lwrjs/diagnostics": "0.17.2-alpha.29",
-        "@lwrjs/instrumentation": "0.17.2-alpha.29",
-        "@lwrjs/shared-utils": "0.17.2-alpha.29",
+        "@lwrjs/app-service": "0.17.2-alpha.30",
+        "@lwrjs/config": "0.17.2-alpha.30",
+        "@lwrjs/diagnostics": "0.17.2-alpha.30",
+        "@lwrjs/instrumentation": "0.17.2-alpha.30",
+        "@lwrjs/shared-utils": "0.17.2-alpha.30",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.17.2-alpha.29"
+        "@lwrjs/types": "0.17.2-alpha.30"
     },
     "engines": {
         "node": ">=20.0.0"
@@ -49,5 +49,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "c5d23a5a170bb906f66fc3fcbadf1648e87dcf1b"
+    "gitHead": "818bbb13d2d4b14d128c4c4f23229c9ce7458a23"
 }