@lwrjs/view-registry 0.11.4 → 0.11.6

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -101,11 +101,17 @@ async function getHtmlResources(view, viewParams, resourceContext) {
           throw Error("Failed to find definition of resource: " + shimBundle);
         }
       }
+      if (!def.inline && !def.src) {
+        throw Error(`Invalid Shim ${shimBundle}: ${JSON.stringify(def)}`);
+      }
       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");
       }
+      if (!errorShimDef.inline && !errorShimDef.src) {
+        throw Error(`Invalid Shim lwr-error-shim.js: ${JSON.stringify(errorShimDef)}`);
+      }
       requiredResources.push(errorShimDef);
     }
     const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
@@ -116,6 +122,9 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     };
     versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
     const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
+    if (!uri) {
+      throw Error(`Invalid Module Resource ${versionedSpecifier}`);
+    }
     moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
     for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
       if (!isExternal(depSpecifier)) {
@@ -143,7 +152,10 @@ async function getHtmlResources(view, viewParams, resourceContext) {
         if (uri2) {
           imports[dynamicDep] = uri2;
         } else {
-          import_diagnostics.logger.warn("Skipping unknown dynamic import " + dynamicDep);
+          import_diagnostics.logger.warn({
+            label: `view-registry`,
+            message: `Skipping unknown dynamic import: ${dynamicDep}`
+          });
         }
       }
     }

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

@@ -30,6 +30,9 @@ __export(exports, {
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function setPreloadModulesMeta(specifier, uri, groups, preloads) {
+  if (!uri) {
+    throw Error(`Invalid Preload Module ${specifier}`);
+  }
   const [removedVersion, version] = specifier.split("/v/");
   const normalizedSpecifier = version === import_shared_utils.VERSION_NOT_PROVIDED ? removedVersion : specifier;
   specifier = normalizedSpecifier;
@@ -55,7 +58,10 @@ async function getPreloadModulesMeta(specifier, viewPreloads, bundleConfig, modu
     return exclude.includes(specifier2);
   };
   if (isExternal(specifier)) {
-    import_diagnostics.logger.warn(`"${specifier}" is configured in both bundleConfig.externals and bootstrap.preloadModules. We are treating it as external.`);
+    import_diagnostics.logger.warn({
+      label: `view-registry`,
+      message: `"${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, runtimeParams);
     const versionedModuleSpecifier = (0, import_shared_utils.getSpecifier)({

package/build/cjs/linkers/view_bootstrap.cjs

@@ -92,11 +92,17 @@ async function getHtmlResources(view, viewParams, resourceContext) {
       if (!def) {
         throw Error("Failed to find definition of resource: " + shimBundle);
       }
+      if (!def.inline && !def.src) {
+        throw Error(`Invalid Shim ${shimBundle}: ${JSON.stringify(def)}`);
+      }
       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");
       }
+      if (!errorShimDef.inline && !errorShimDef.src) {
+        throw Error(`Invalid Shim lwr-error-shim.js: ${JSON.stringify(errorShimDef)}`);
+      }
       requiredResources.push(errorShimDef);
     }
     const bootstrapModuleGraph = await (0, import_shared_utils.getModuleGraphs)(bootstrapSpecifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visitedCache);
@@ -107,6 +113,9 @@ async function getHtmlResources(view, viewParams, resourceContext) {
     };
     versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
     const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
+    if (!uri) {
+      throw Error(`Invalid Module Resource ${versionedSpecifier}`);
+    }
     moduleResources.push((0, import_utils.getModuleResourceByUri)(uri, runtimeEnvironment, {isPreload: false, isSSR}));
     for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
       if (!isExternal(depSpecifier)) {
@@ -134,7 +143,10 @@ async function getHtmlResources(view, viewParams, resourceContext) {
         if (uri2) {
           imports[dynamicDep] = uri2;
         } else {
-          import_diagnostics.logger.warn("Skipping unknown dynamic import " + dynamicDep);
+          import_diagnostics.logger.warn({
+            label: `view-registry`,
+            message: `Skipping unknown dynamic import: ${dynamicDep}`
+          });
         }
       }
     }

package/build/es/linkers/legacy_view_bootstrap.js

@@ -94,12 +94,20 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
                     throw Error('Failed to find definition of resource: ' + shimBundle);
                 }
             }
+            // Throw a very specific error if we get this back and the src or inline properties are not set
+            if (!def.inline && !def.src) {
+                throw Error(`Invalid Shim ${shimBundle}: ${JSON.stringify(def)}`);
+            }
             requiredResources.push(def);
             // Always inline the error shim script after the shim
             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');
             }
+            // Throw a very specific error if we get this back and the src or inline properties are not set
+            if (!errorShimDef.inline && !errorShimDef.src) {
+                throw Error(`Invalid Shim lwr-error-shim.js: ${JSON.stringify(errorShimDef)}`);
+            }
             requiredResources.push(errorShimDef);
         }
         // ------- Application Bootstrap module
@@ -115,6 +123,10 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         // ADD bootstrap module uri as a script resource
         versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
         const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
+        // Throw a very specific error if we get this back and the uri property is not set
+        if (!uri) {
+            throw Error(`Invalid Module Resource ${versionedSpecifier}`);
+        }
         moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR }));
         // PRELOAD the bootstrap module static dependencies as preloaded script resources
         for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
@@ -152,7 +164,10 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
                     imports[dynamicDep] = uri;
                 }
                 else {
-                    logger.warn('Skipping unknown dynamic import ' + dynamicDep);
+                    logger.warn({
+                        label: `view-registry`,
+                        message: `Skipping unknown dynamic import: ${dynamicDep}`,
+                    });
                 }
             }
         }

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

@@ -4,6 +4,10 @@ import { explodeSpecifier, getGroupName, getVersionedModuleId, normalizeVersionT
  * keeps track of preloadModules metadata
  */
 export function setPreloadModulesMeta(specifier, uri, groups, preloads) {
+    // Throw a very specific error if we get this back and the uri property is not set
+    if (!uri) {
+        throw Error(`Invalid Preload Module ${specifier}`);
+    }
     // We need to support version-less preloadModules, including version-less rootComponents.
     // Removing the "/v/version_not_provided" hack from the preloadModules specifier
     // because otherwise the loader will wait for that module that will never get defined.
@@ -39,7 +43,10 @@ viewPreloads, bundleConfig, moduleRegistry, defRegistry, runtimeEnvironment, run
         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.`);
+        logger.warn({
+            label: `view-registry`,
+            message: `"${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

package/build/es/linkers/view_bootstrap.js

@@ -79,12 +79,20 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
             if (!def) {
                 throw Error('Failed to find definition of resource: ' + shimBundle);
             }
+            // Throw a very specific error if we get this back and the src or inline properties are not set
+            if (!def.inline && !def.src) {
+                throw Error(`Invalid Shim ${shimBundle}: ${JSON.stringify(def)}`);
+            }
             requiredResources.push(def);
             // Always inline the error shim script after the shim
             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');
             }
+            // Throw a very specific error if we get this back and the src or inline properties are not set
+            if (!errorShimDef.inline && !errorShimDef.src) {
+                throw Error(`Invalid Shim lwr-error-shim.js: ${JSON.stringify(errorShimDef)}`);
+            }
             requiredResources.push(errorShimDef);
         }
         // ------- Application Bootstrap module
@@ -99,6 +107,10 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
         // ADD bootstrap module uri as a script resource
         versionedSpecifier = bootstrapModuleGraph.graphs[0].specifier;
         const uri = bootstrapModuleGraph.uriMap[versionedSpecifier];
+        // Throw a very specific error if we get this back and the uri property is not set
+        if (!uri) {
+            throw Error(`Invalid Module Resource ${versionedSpecifier}`);
+        }
         moduleResources.push(getModuleResourceByUri(uri, runtimeEnvironment, { isPreload: false, isSSR }));
         // PRELOAD the bootstrap module static dependencies as preloaded script resources
         for (const depSpecifier of bootstrapModuleGraph.graphs[0].static) {
@@ -136,7 +148,10 @@ export async function getHtmlResources(view, viewParams, resourceContext) {
                     imports[dynamicDep] = uri;
                 }
                 else {
-                    logger.warn('Skipping unknown dynamic import ' + dynamicDep);
+                    logger.warn({
+                        label: `view-registry`,
+                        message: `Skipping unknown dynamic import: ${dynamicDep}`,
+                    });
                 }
             }
         }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.4",
+    "version": "0.11.6",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,17 +30,17 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.11.4",
-        "@lwrjs/diagnostics": "0.11.4",
-        "@lwrjs/instrumentation": "0.11.4",
-        "@lwrjs/shared-utils": "0.11.4",
+        "@lwrjs/app-service": "0.11.6",
+        "@lwrjs/diagnostics": "0.11.6",
+        "@lwrjs/instrumentation": "0.11.6",
+        "@lwrjs/shared-utils": "0.11.6",
         "lru-cache": "^10.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.4"
+        "@lwrjs/types": "0.11.6"
     },
     "engines": {
         "node": ">=16.0.0"
     },
-    "gitHead": "5528cfc12174d4800ff42db1691d14c5d194f7d6"
+    "gitHead": "415e25c05b4b1a0356fb89801f1242e8f73143e3"
 }