@lwrjs/view-registry 0.17.6 → 0.17.8

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -90,7 +90,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     }
   } = view;
   const defRegistry = bundle ? moduleBundler : moduleRegistry;
-  const depth = isAMD ? {static: import_shared_utils.GraphDepth.ALL, dynamic: 1} : {static: import_shared_utils.GraphDepth.NONE, dynamic: 0};
+  const depth = isAMD ? {static: import_shared_utils.GraphDepth.ALL, dynamic: (0, import_shared_utils.isMrtBundle)() ? 50 : 1} : {static: import_shared_utils.GraphDepth.NONE, dynamic: 0};
   if (isAMD) {
     depth.includeId = includeIdFactory(bundleConfig);
   }
@@ -181,7 +181,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       const uri2 = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
       if (uri2) {
         const integrity2 = (0, import_utils2.getBundleIntegrity)(bootstrapModuleGraph, depSpecifier);
-        (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, integrity2, groups, viewPreloads);
+        const depDef = bootstrapModuleGraph.linkedDefinitions[depSpecifier];
+        (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, integrity2, groups, viewPreloads, depDef?.bundleRecord?.includedModules);
       }
     }
     if ((0, import_shared_utils.isBundler)(defRegistry)) {
@@ -192,22 +193,25 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     if (isAMD) {
       requiredAmdModules.push(versionedSpecifier);
       imports[versionedSpecifier] = uri;
-      for (const staticDep of bootstrapModuleGraph.graphs[0].static) {
-        const uri2 = bootstrapModuleGraph.uriMap[staticDep];
-        imports[staticDep] = uri2;
-        if (services?.length) {
-          requiredAmdModules.push(staticDep);
+      const levels = (0, import_shared_utils.isMrtBundle)() ? bootstrapModuleGraph.graphs.length : 1;
+      for (let i = 0; i < levels; i++) {
+        for (const staticDep of bootstrapModuleGraph.graphs[i].static) {
+          const uri2 = bootstrapModuleGraph.uriMap[staticDep];
+          imports[staticDep] = uri2;
+          if (services?.length && i === 0) {
+            requiredAmdModules.push(staticDep);
+          }
         }
-      }
-      for (const dynamicDep of bootstrapModuleGraph.graphs[0].dynamicRefs) {
-        const uri2 = bootstrapModuleGraph.uriMap[dynamicDep];
-        if (uri2) {
-          imports[dynamicDep] = uri2;
-        } else {
-          import_diagnostics.logger.warn({
-            label: `view-registry`,
-            message: `Skipping unknown dynamic import: ${dynamicDep}`
-          });
+        for (const dynamicDep of bootstrapModuleGraph.graphs[i].dynamicRefs) {
+          const uri2 = bootstrapModuleGraph.uriMap[dynamicDep];
+          if (uri2) {
+            imports[dynamicDep] = uri2;
+          } else {
+            import_diagnostics.logger.warn({
+              label: `view-registry`,
+              message: `Skipping unknown dynamic import: ${dynamicDep}`
+            });
+          }
         }
       }
     }
@@ -240,20 +244,24 @@ async function getHtmlResources(view, viewParams, resourceContext) {
           const depUri = getPreloadUri(depSpecifier, graph.uriMap);
           if (depUri) {
             const integrity2 = (0, import_utils2.getBundleIntegrity)(graph, depSpecifier);
-            (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, depUri, integrity2, groups, viewPreloads);
+            const depDef = graph.linkedDefinitions[depSpecifier];
+            (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, depUri, integrity2, groups, viewPreloads, depDef?.bundleRecord?.includedModules);
           }
         }
       }
       rootComponents.push(specifier);
       imports[specifier] = uri;
       if (isAMD) {
-        for (const staticDep of graph.graphs[0].static) {
-          const uri2 = graph.uriMap[staticDep];
-          imports[staticDep] = uri2;
-        }
-        for (const dynamicDep of graph.graphs[0].dynamicRefs) {
-          const uri2 = graph.uriMap[dynamicDep];
-          imports[dynamicDep] = uri2;
+        const levels = (0, import_shared_utils.isMrtBundle)() ? graph.graphs.length : 1;
+        for (let i = 0; i < levels; i++) {
+          for (const staticDep of graph.graphs[i].static) {
+            const uri2 = graph.uriMap[staticDep];
+            imports[staticDep] = uri2;
+          }
+          for (const dynamicDep of graph.graphs[i].dynamicRefs) {
+            const uri2 = graph.uriMap[dynamicDep];
+            imports[dynamicDep] = uri2;
+          }
         }
       }
     }

package/build/cjs/utils.cjs

@@ -302,28 +302,31 @@ function addExternalScriptNonce(def, nonce) {
     def.nonce = nonce;
   }
 }
+function findAndApplyMatchingPattern(matchPatterns, path, pattern, assetRef, assetConfig) {
+  for (const filePattern of matchPatterns) {
+    const regex = new RegExp(filePattern);
+    if (regex.test(path)) {
+      if (pattern.dependent) {
+        assetConfig[pattern.dependent.value] = pattern.dependent.attributes;
+      }
+      assetConfig[path] = pattern.attributes || {};
+      if (assetRef.integrity) {
+        assetConfig[path].integrity = assetRef.integrity;
+      }
+      return true;
+    }
+  }
+  return false;
+}
 function generateLinkHeaders(assets, patterns) {
   const assetConfig = {};
   for (const assetRef of assets) {
     const path = assetRef.override?.uri || assetRef.url;
-    let matched = null;
     for (const pattern of patterns) {
       const {match} = pattern;
       const matchPatterns = Array.isArray(match) ? match : [match];
-      for (const filePattern of matchPatterns) {
-        const regex = new RegExp(filePattern);
-        if (regex.test(path)) {
-          matched = pattern.attributes || {};
-          break;
-        }
-      }
-      if (matched)
+      if (findAndApplyMatchingPattern(matchPatterns, path, pattern, assetRef, assetConfig)) {
         break;
-    }
-    if (matched) {
-      assetConfig[path] = matched;
-      if (assetRef.integrity) {
-        assetConfig[path].integrity = assetRef.integrity;
       }
     }
   }

package/build/es/linkers/legacy_view_bootstrap.js

@@ -1,5 +1,5 @@
 import { logger } from '@lwrjs/diagnostics';
-import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, explodeSpecifier, isBundler, getHydrateDirective, isGroupie, isExternalSpecifier, isLocalDev, isLambdaEnv, } from '@lwrjs/shared-utils';
+import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, explodeSpecifier, isBundler, getHydrateDirective, isGroupie, isExternalSpecifier, isLocalDev, isLambdaEnv, isMrtBundle, } from '@lwrjs/shared-utils';
 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';
@@ -64,7 +64,7 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
     }, } = view;
     const defRegistry = bundle ? moduleBundler : moduleRegistry;
     const depth = isAMD
-        ? { static: GraphDepth.ALL, dynamic: 1 }
+        ? { static: GraphDepth.ALL, dynamic: isMrtBundle() ? 50 : 1 }
         : { static: GraphDepth.NONE, dynamic: 0 };
     if (isAMD) {
         depth.includeId = includeIdFactory(bundleConfig);
@@ -202,7 +202,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             const uri = getPreloadUri(depSpecifier, bootstrapModuleGraph.uriMap);
             if (uri) {
                 const integrity = getBundleIntegrity(bootstrapModuleGraph, depSpecifier);
-                setPreloadModulesMeta(depSpecifier, uri, integrity, groups, viewPreloads);
+                const depDef = bootstrapModuleGraph.linkedDefinitions[depSpecifier];
+                setPreloadModulesMeta(depSpecifier, uri, integrity, groups, viewPreloads, depDef?.bundleRecord?.includedModules);
             }
         }
         // PRELOAD configured preloadModules as preloaded script resources
@@ -217,27 +218,30 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             requiredAmdModules.push(versionedSpecifier);
             // AMD ADD bootstrap module uri addressability
             imports[versionedSpecifier] = uri;
-            // PRELOAD bootstrap module static deps as link resource
-            for (const staticDep of bootstrapModuleGraph.graphs[0].static) {
-                const uri = bootstrapModuleGraph.uriMap[staticDep];
-                // AMD ADD static module dep uri addressability
-                imports[staticDep] = uri;
-                // ADD bootstrap module static deps to requiredAmdModules if services, otherwise preloadModules
-                if (services?.length) {
-                    requiredAmdModules.push(staticDep);
-                }
-            }
-            // AMD Add import mappings for known dynamic imports
-            for (const dynamicDep of bootstrapModuleGraph.graphs[0].dynamicRefs) {
-                const uri = bootstrapModuleGraph.uriMap[dynamicDep];
-                if (uri) {
-                    imports[dynamicDep] = uri;
+            const levels = isMrtBundle() ? bootstrapModuleGraph.graphs.length : 1;
+            for (let i = 0; i < levels; i++) {
+                // PRELOAD bootstrap module static deps as link resource
+                for (const staticDep of bootstrapModuleGraph.graphs[i].static) {
+                    const uri = bootstrapModuleGraph.uriMap[staticDep];
+                    // AMD ADD static module dep uri addressability
+                    imports[staticDep] = uri;
+                    // ADD bootstrap module static deps to requiredAmdModules if services, otherwise preloadModules
+                    if (services?.length && i === 0) {
+                        requiredAmdModules.push(staticDep);
+                    }
                 }
-                else {
-                    logger.warn({
-                        label: `view-registry`,
-                        message: `Skipping unknown dynamic import: ${dynamicDep}`,
-                    });
+                // AMD Add import mappings for known dynamic imports
+                for (const dynamicDep of bootstrapModuleGraph.graphs[i].dynamicRefs) {
+                    const uri = bootstrapModuleGraph.uriMap[dynamicDep];
+                    if (uri) {
+                        imports[dynamicDep] = uri;
+                    }
+                    else {
+                        logger.warn({
+                            label: `view-registry`,
+                            message: `Skipping unknown dynamic import: ${dynamicDep}`,
+                        });
+                    }
                 }
             }
         }
@@ -276,7 +280,8 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
                     const depUri = getPreloadUri(depSpecifier, graph.uriMap);
                     if (depUri) {
                         const integrity = getBundleIntegrity(graph, depSpecifier);
-                        setPreloadModulesMeta(depSpecifier, depUri, integrity, groups, viewPreloads);
+                        const depDef = graph.linkedDefinitions[depSpecifier];
+                        setPreloadModulesMeta(depSpecifier, depUri, integrity, groups, viewPreloads, depDef?.bundleRecord?.includedModules);
                     }
                 }
             }
@@ -284,15 +289,18 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             rootComponents.push(specifier);
             imports[specifier] = uri;
             if (isAMD) {
-                for (const staticDep of graph.graphs[0].static) {
-                    const uri = graph.uriMap[staticDep];
-                    // AMD ADD static module dep uri addressability
-                    imports[staticDep] = uri;
-                }
-                // AMD ADD dynamic imports module dep uri addressability
-                for (const dynamicDep of graph.graphs[0].dynamicRefs) {
-                    const uri = graph.uriMap[dynamicDep];
-                    imports[dynamicDep] = uri;
+                const levels = isMrtBundle() ? graph.graphs.length : 1;
+                for (let i = 0; i < levels; i++) {
+                    for (const staticDep of graph.graphs[i].static) {
+                        const uri = graph.uriMap[staticDep];
+                        // AMD ADD static module dep uri addressability
+                        imports[staticDep] = uri;
+                    }
+                    // AMD ADD dynamic imports module dep uri addressability
+                    for (const dynamicDep of graph.graphs[i].dynamicRefs) {
+                        const uri = graph.uriMap[dynamicDep];
+                        imports[dynamicDep] = uri;
+                    }
                 }
             }
         }

package/build/es/utils.js

@@ -288,30 +288,33 @@ export function addExternalScriptNonce(def, nonce) {
         def.nonce = nonce;
     }
 }
+function findAndApplyMatchingPattern(matchPatterns, path, pattern, assetRef, assetConfig) {
+    for (const filePattern of matchPatterns) {
+        const regex = new RegExp(filePattern);
+        if (regex.test(path)) {
+            if (pattern.dependent) {
+                assetConfig[pattern.dependent.value] = pattern.dependent.attributes;
+            }
+            assetConfig[path] = pattern.attributes || {};
+            if (assetRef.integrity) {
+                // always add the integrity attribute, if it exists
+                assetConfig[path].integrity = assetRef.integrity;
+            }
+            return true;
+        }
+    }
+    return false;
+}
 export function generateLinkHeaders(assets, patterns) {
     // store each Path's config in this config
     const assetConfig = {};
     for (const assetRef of assets) {
         const path = assetRef.override?.uri || assetRef.url;
-        let matched = null;
         for (const pattern of patterns) {
             const { match } = pattern;
             const matchPatterns = Array.isArray(match) ? match : [match];
-            for (const filePattern of matchPatterns) {
-                const regex = new RegExp(filePattern);
-                if (regex.test(path)) {
-                    matched = pattern.attributes || {};
-                    break;
-                }
-            }
-            if (matched)
+            if (findAndApplyMatchingPattern(matchPatterns, path, pattern, assetRef, assetConfig)) {
                 break;
-        }
-        if (matched) {
-            assetConfig[path] = matched;
-            if (assetRef.integrity) {
-                // always add the integrity attribute, if it exists
-                assetConfig[path].integrity = assetRef.integrity;
             }
         }
     }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.6",
+    "version": "0.17.8",
     "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.6",
-        "@lwrjs/config": "0.17.6",
-        "@lwrjs/diagnostics": "0.17.6",
-        "@lwrjs/instrumentation": "0.17.6",
-        "@lwrjs/shared-utils": "0.17.6",
+        "@lwrjs/app-service": "0.17.8",
+        "@lwrjs/config": "0.17.8",
+        "@lwrjs/diagnostics": "0.17.8",
+        "@lwrjs/instrumentation": "0.17.8",
+        "@lwrjs/shared-utils": "0.17.8",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.17.6"
+        "@lwrjs/types": "0.17.8"
     },
     "engines": {
         "node": ">=20.0.0"
@@ -49,5 +49,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "7d557651747a0f08a96deb074c7cd1bb6752488c"
+    "gitHead": "a8b449fc6fc78841913b6e36bfbc04e3336541a7"
 }