@lwrjs/view-registry 0.10.0-alpha.13 → 0.10.0-alpha.14

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -30,6 +30,7 @@ var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_identity = __toModule(require("@lwrjs/app-service/identity"));
 var import_utils = __toModule(require("../utils.cjs"));
 var import_utils2 = __toModule(require("./utils.cjs"));
+var import_preload_utils = __toModule(require("./preload-utils.cjs"));
 async function getHtmlResources(view, viewParams, resourceContext) {
   const {
     runtimeEnvironment,
@@ -39,8 +40,13 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     resourceRegistry,
     viewMetadata
   } = resourceContext;
+  const {lwrVersion, format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
+  const {customElements} = viewMetadata;
+  const version = lwrVersion;
+  const isAMD = format === "amd";
   const {bundleConfig} = resourceContext;
   const {external = {}} = bundleConfig;
+  const groups = isAMD ? bundleConfig.groups || {} : {};
   const isExternal = function(rawSpecifier) {
     const {specifier} = (0, import_shared_utils.explodeSpecifier)(rawSpecifier);
     return Object.keys(external).some((e) => specifier === e);
@@ -52,10 +58,8 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       preloadModules: []
     }
   } = view;
-  const {lwrVersion, format, hmrEnabled, bundle, debug, minify} = runtimeEnvironment;
-  const {customElements} = viewMetadata;
-  const version = lwrVersion;
-  const isAMD = format === "amd";
+  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 appIdentity = {
     appName,
     format: runtimeEnvironment.format,
@@ -69,116 +73,132 @@ async function getHtmlResources(view, viewParams, resourceContext) {
   const imports = {};
   const rootComponents = [];
   const requiredAmdModules = [];
-  const preloadModulesMeta = new Map();
+  const viewPreloads = {
+    uris: [],
+    specifiers: [],
+    groups: 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";
-    let def = await resourceRegistry.getResource({specifier: shimBundle, version}, runtimeEnvironment, runtimeParams);
-    if (!def) {
-      let fallbackShimBundle;
-      if (shimBundle === "lwr-loader-shim-legacy.bundle.js") {
-        fallbackShimBundle = "lwr-loader-shim-legacy.bundle.min.js";
-        def = await resourceRegistry.getResource({specifier: fallbackShimBundle, version}, runtimeEnvironment, runtimeParams);
-      } else {
-        fallbackShimBundle = "lwr-loader-shim-legacy.bundle.js";
-        def = await resourceRegistry.getResource({specifier: fallbackShimBundle, version}, runtimeEnvironment, runtimeParams);
-      }
+  let bootstrapModuleRef, versionedSpecifier = bootstrapSpecifier;
+  const customElementsRecords = [];
+  const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements, isSSR);
+  const viewContainsHydratedElements = !isSSR || flattenedElements.some(({props}) => (0, import_shared_utils.hasHydrateDirective)(props));
+  if (viewContainsHydratedElements) {
+    if (isAMD) {
+      const shimBundle = debug || minify === false ? "lwr-loader-shim-legacy.bundle.js" : "lwr-loader-shim-legacy.bundle.min.js";
+      let def = await resourceRegistry.getResource({specifier: shimBundle, version}, runtimeEnvironment, runtimeParams);
       if (!def) {
-        throw Error("Failed to find definition of resource: " + shimBundle);
+        let fallbackShimBundle;
+        if (shimBundle === "lwr-loader-shim-legacy.bundle.js") {
+          fallbackShimBundle = "lwr-loader-shim-legacy.bundle.min.js";
+          def = await resourceRegistry.getResource({specifier: fallbackShimBundle, version}, runtimeEnvironment, runtimeParams);
+        } else {
+          fallbackShimBundle = "lwr-loader-shim-legacy.bundle.js";
+          def = await resourceRegistry.getResource({specifier: fallbackShimBundle, version}, runtimeEnvironment, runtimeParams);
+        }
+        if (!def) {
+          throw Error("Failed to find definition of resource: " + shimBundle);
+        }
       }
+      requiredResources.push(def);
+      const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, runtimeParams);
+      if (!errorShimDef) {
+        throw Error("Failed to find definition of resource: lwr-error-shim.js");
+      }
+      requiredResources.push(errorShimDef);
     }
-    requiredResources.push(def);
-    const errorShimDef = await resourceRegistry.getResource({specifier: "lwr-error-shim.js", version}, runtimeEnvironment, runtimeParams);
-    if (!errorShimDef) {
-      throw Error("Failed to find definition of resource: lwr-error-shim.js");
-    }
-    requiredResources.push(errorShimDef);
-  }
-  const depth = isAMD ? {static: import_shared_utils.GraphDepth.ALL, dynamic: 1} : {static: import_shared_utils.GraphDepth.NONE, dynamic: 0};
-  const defRegistry = bundle ? moduleBundler : moduleRegistry;
-  const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
-  const versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
-  const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
-  moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
-  for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
-    if (!isExternal(depSpecifier)) {
-      const uri2 = bootstrapModuleGraph.uriMap[depSpecifier];
-      preloadModulesMeta.set(depSpecifier, uri2);
-    }
-  }
-  if ((0, import_shared_utils.isBundler)(defRegistry)) {
-    for (const specifier of preloadModules) {
-      await (0, import_utils2.getPreloadModulesMeta)(specifier, preloadModulesMeta, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams);
+    const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
+    bootstrapModuleRef = {
+      specifier: bootstrapModuleGraph.graphs[0].specifier,
+      flatGraph: bootstrapModuleGraph,
+      resources: configResources
+    };
+    versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
+    const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
+    moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
+    for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
+      if (!isExternal(depSpecifier)) {
+        const uri2 = bootstrapModuleGraph.uriMap[depSpecifier];
+        (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
+      }
     }
-  }
-  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 && services.length) {
-        requiredAmdModules.push(staticDep);
+    if ((0, import_shared_utils.isBundler)(defRegistry)) {
+      for (const specifier of preloadModules) {
+        await (0, import_preload_utils.getPreloadModulesMeta)(specifier, viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams);
       }
     }
-    for (const dynamicDep of bootstrapModuleGraph.graphs[0].dynamicRefs) {
-      const uri2 = bootstrapModuleGraph.uriMap[dynamicDep];
-      if (uri2) {
-        imports[dynamicDep] = uri2;
-      } else {
-        import_shared_utils.logger.warn("Skipping unknown dynamic import " + dynamicDep);
+    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 && services.length) {
+          requiredAmdModules.push(staticDep);
+        }
+      }
+      for (const dynamicDep of bootstrapModuleGraph.graphs[0].dynamicRefs) {
+        const uri2 = bootstrapModuleGraph.uriMap[dynamicDep];
+        if (uri2) {
+          imports[dynamicDep] = uri2;
+        } else {
+          import_shared_utils.logger.warn("Skipping unknown dynamic import " + dynamicDep);
+        }
       }
     }
   }
-  const customElementsRecords = [];
-  const flattenedElements = (0, import_utils2.flattenCustomElements)(customElements, isSSR);
   await Promise.all(flattenedElements.map(async ({tagName: element, props}) => {
     const graph = await (0, import_shared_utils.getModuleGraphs)((0, import_shared_utils.kebabCaseToModuleSpecifier)(element), {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams ? runtimeParams : {}, visitedCache);
     customElementsRecords.push({elementName: element, flatGraph: graph});
-    const specifier = graph.graphs[0].specifier;
-    const uri2 = graph.uriMap[specifier];
-    preloadModulesMeta.set(specifier, uri2);
-    if (bundle) {
-      for (const depSpecifier of graph.graphs[0].static) {
-        if (!isExternal(depSpecifier)) {
-          const uri3 = graph.uriMap[depSpecifier];
-          preloadModulesMeta.set(depSpecifier, uri3);
+    if (!isSSR || (0, import_shared_utils.hasHydrateDirective)(props)) {
+      const specifier = graph.graphs[0].specifier;
+      const uri = graph.uriMap[specifier];
+      (0, import_preload_utils.setPreloadModulesMeta)(specifier, uri, groups, viewPreloads);
+      if (bundle) {
+        for (const depSpecifier of graph.graphs[0].static) {
+          if (!isExternal(depSpecifier)) {
+            const uri2 = graph.uriMap[depSpecifier];
+            (0, import_preload_utils.setPreloadModulesMeta)(depSpecifier, uri2, groups, viewPreloads);
+          }
         }
       }
-    }
-    rootComponents.push(specifier);
-    imports[specifier] = uri2;
-    if (isAMD) {
-      for (const staticDep of graph.graphs[0].static) {
-        const uri3 = graph.uriMap[staticDep];
-        imports[staticDep] = uri3;
-      }
-      for (const dynamicDep of graph.graphs[0].dynamicRefs) {
-        const uri3 = graph.uriMap[dynamicDep];
-        imports[dynamicDep] = uri3;
+      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;
+        }
       }
     }
   }));
-  configResources.unshift(await (0, import_utils2.getViewBootstrapConfigurationResource)({
-    id: view.id,
-    url: viewParams?.page?.url,
-    configAsSrc: view.bootstrap?.configAsSrc || false
-  }, {
-    appId: appIdentity.appName,
-    bootstrapModule: versionedSpecifier,
-    autoBoot: view.bootstrap?.autoBoot === false ? false : true,
-    importMappings: {
-      imports,
-      default: (0, import_shared_utils.getModuleUriPrefix)(runtimeEnvironment, runtimeParams)
-    },
-    rootComponents,
-    ...isAMD && {requiredModules: requiredAmdModules},
-    ...isAMD && {preloadModules: Array.from(preloadModulesMeta.keys())}
-  }, runtimeEnvironment, runtimeParams));
+  if (viewContainsHydratedElements) {
+    configResources.unshift((0, import_utils2.getViewBootstrapConfigurationResource)({
+      id: view.id,
+      url: viewParams?.page?.url,
+      configAsSrc: view.bootstrap?.configAsSrc || false
+    }, {
+      appId: appIdentity.appName,
+      bootstrapModule: versionedSpecifier,
+      autoBoot: view.bootstrap?.autoBoot === false ? false : true,
+      importMappings: {
+        imports,
+        default: (0, import_shared_utils.getModuleUriPrefix)(runtimeEnvironment, runtimeParams)
+      },
+      rootComponents,
+      ...isAMD && {requiredModules: requiredAmdModules},
+      ...isAMD && {preloadModules: viewPreloads.specifiers}
+    }, runtimeEnvironment, runtimeParams));
+  }
   if (!isAMD && hmrEnabled) {
-    configResources.unshift(await (0, import_utils2.getViewHmrConfigurationResource)(view, viewMetadata));
+    configResources.unshift((0, import_utils2.getViewHmrConfigurationResource)(view, viewMetadata));
   }
-  for (const [, preloadUri] of preloadModulesMeta) {
+  const dedupedUris = [...new Set(viewPreloads.uris)];
+  for (const preloadUri of dedupedUris) {
     moduleResources.push((0, import_utils.getModuleResourceByUri)(preloadUri, runtimeEnvironment, {isPreload: true, isSSR}));
   }
   const htmlResources = await Promise.all([...configResources, ...requiredResources, ...moduleResources].map(import_utils.generateHtmlTag));
@@ -187,11 +207,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     viewRecord: {
       resources: requiredResources,
       customElements: customElementsRecords,
-      bootstrapModule: {
-        specifier: bootstrapModuleGraph.graphs[0].specifier,
-        flatGraph: bootstrapModuleGraph,
-        resources: configResources
-      }
+      bootstrapModule: bootstrapModuleRef
     }
   };
 }

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

@@ -0,0 +1,81 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
+
+// packages/@lwrjs/view-registry/src/linkers/preload-utils.ts
+__markAsModule(exports);
+__export(exports, {
+  getPreloadModulesMeta: () => getPreloadModulesMeta,
+  setPreloadModulesMeta: () => setPreloadModulesMeta
+});
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+function setPreloadModulesMeta(specifier, uri, groups, preloads) {
+  const preloadModulesSpecifiers = preloads.specifiers;
+  const preloadBundleGroupsMap = preloads.groups;
+  const preloadModulesURIs = preloads.uris;
+  preloadModulesSpecifiers.push(specifier);
+  const {specifier: unversionedSpecifier} = (0, import_shared_utils.explodeSpecifier)(specifier);
+  const groupName = (0, import_shared_utils.getGroupName)(unversionedSpecifier, groups);
+  if (groupName && preloadBundleGroupsMap.has(groupName)) {
+    return;
+  }
+  preloadModulesURIs.push(uri);
+  groupName && preloadBundleGroupsMap.set(groupName, true);
+}
+async function getPreloadModulesMeta(specifier, viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending) {
+  const {exclude = [], external = {}, groups = {}} = 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;
+    setPreloadModulesMeta(normalizedSpecifier, uri, groups, viewPreloads);
+    if (exclude.length || Object.keys(groups).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) || (0, import_shared_utils.isGroupie)(imp.specifier, groups))) {
+            pending.set(imp.specifier, true);
+            await getPreloadModulesMeta(imp.specifier, viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, pending);
+          }
+        }
+      }
+    }
+  }
+}

package/build/cjs/linkers/utils.cjs

@@ -25,7 +25,6 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   flattenCustomElements: () => flattenCustomElements,
-  getPreloadModulesMeta: () => getPreloadModulesMeta,
   getViewBootstrapConfigurationResource: () => getViewBootstrapConfigurationResource,
   getViewHmrConfigurationResource: () => getViewHmrConfigurationResource
 });
@@ -121,41 +120,3 @@ 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);
-          }
-        }
-      }
-    }
-  }
-}