@lwrjs/loader 0.24.2 → 0.24.4

package/build/cjs/modules/lwr/loaderLegacy/utils/validation.cjs

@@ -1,34 +1,30 @@
-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 __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __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});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, 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);
+  return to;
 };
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/loader/src/modules/lwr/loaderLegacy/utils/validation.ts
-__markAsModule(exports);
-__export(exports, {
+var validation_exports = {};
+__export(validation_exports, {
   validateAndConvertImportMapUpdate: () => validateAndConvertImportMapUpdate,
   validateMappingUri: () => validateMappingUri,
   validateSpecifier: () => validateSpecifier
 });
-var import_dom = __toModule(require("../utils/dom.cjs"));
+module.exports = __toCommonJS(validation_exports);
+var import_dom = require("../utils/dom.cjs");
 function validateMappingUri(uri, specifier) {
   const lowerUri = uri.toLowerCase();
   if (lowerUri.startsWith("blob:")) {
@@ -67,7 +63,9 @@ function validateAndConvertImportMapUpdate(update) {
       validateSpecifier(moduleName);
       if (moduleName in convertedImports) {
         if (import_dom.hasConsole) {
-          console.warn(`LWR.importMap(): duplicate module "${moduleName}" \u2014 already mapped to "${convertedImports[moduleName]}", ignoring mapping to "${moduleScriptURL}"`);
+          console.warn(
+            `LWR.importMap(): duplicate module "${moduleName}" \u2014 already mapped to "${convertedImports[moduleName]}", ignoring mapping to "${moduleScriptURL}"`
+          );
         }
       } else {
         convertedImports[moduleName] = moduleScriptURL;

package/build/cjs/types.cjs

@@ -1,5 +1,17 @@
 var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/loader/src/types.ts
-__markAsModule(exports);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/build/modules/lwr/esmLoader/esmLoader.js

@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: MIT
 * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
 */
-/* LWR ESM Module Loader v0.24.2 */
+/* LWR ESM Module Loader v0.24.4 */
 function _optionalChain$1(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 

package/build/modules/lwr/loader/hooks/resolveAndLoadHook.js

@@ -10,6 +10,12 @@ if (hasDocument) {
         lastWindowError = evt.error;
     });
 }
+// Clear via a function so `lastWindowError` stays in the "assigned in a closure" category (like the
+// listener above): that keeps its declared `null | Error` type at the check below and lets us reset
+// the latch around each eval without leaving flow analysis thinking it is always null.
+function resetLastWindowError() {
+    lastWindowError = null;
+}
 // eslint-disable-next-line lwr/no-unguarded-apis
 if (process.env.NODE_ENV !== 'production') {
     if (!hasSetTimeout && hasConsole) {
@@ -52,6 +58,12 @@ export async function evaluateLoadHookResponse(response, id) {
             throw new LoaderError(FAIL_LOAD, [`empty code for ${id}`]);
         }
         code = `${code}\n//# sourceURL=${id}`; // append sourceURL for debugging
+        // Reset before eval so we only attribute window errors raised synchronously by THIS
+        // module's evaluation, and so a stale error from an earlier point in the page's life
+        // cannot poison this (or any subsequent) load. There is no `await` between here and the
+        // check below, so on the single-threaded runtime only a synchronous eval-time error can
+        // be observed; any later async error is cleared by the next load's reset.
+        resetLastWindowError();
         try {
             // TODO eval source maps for debugging
             eval(trusted.createScript(code));
@@ -65,9 +77,9 @@ export async function evaluateLoadHookResponse(response, id) {
             throw new LoaderError(FAIL_LOAD, [`"${id}": ${e instanceof Error ? e.message : String(e)}`]);
         }
         if (lastWindowError) {
-            throw new LoaderError(FAIL_LOAD, [
-                `"${id}": window error ${lastWindowError instanceof Error ? lastWindowError.message : String(lastWindowError)}`,
-            ]);
+            const message = lastWindowError instanceof Error ? lastWindowError.message : String(lastWindowError);
+            resetLastWindowError(); // clear on the failure path too, so it can't poison later loads
+            throw new LoaderError(FAIL_LOAD, [`"${id}": window error ${message}`]);
         }
         return true;
     });

package/build/modules/lwr/loader/loader.js

@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: MIT
 * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
 */
-/* LWR Module Loader v0.24.2 */
+/* LWR Module Loader v0.24.4 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -721,7 +721,7 @@ try {
   // swallow
 }
 const trusted = createPolicy('trusted', policyOptions);
-/*! version: 0.29.2 */
+/*! version: 0.29.3 */
 
 /* global console,process */
 
@@ -732,6 +732,12 @@ if (hasDocument) {
         lastWindowError = evt.error;
     });
 }
+// Clear via a function so `lastWindowError` stays in the "assigned in a closure" category (like the
+// listener above): that keeps its declared `null | Error` type at the check below and lets us reset
+// the latch around each eval without leaving flow analysis thinking it is always null.
+function resetLastWindowError() {
+    lastWindowError = null;
+}
 
 // eslint-disable-next-line lwr/no-unguarded-apis
 if (process.env.NODE_ENV !== 'production') {
@@ -789,6 +795,12 @@ async function evaluateLoadHookResponse(response, id) {
         }
 
         code = `${code}\n//# sourceURL=${id}`; // append sourceURL for debugging
+        // Reset before eval so we only attribute window errors raised synchronously by THIS
+        // module's evaluation, and so a stale error from an earlier point in the page's life
+        // cannot poison this (or any subsequent) load. There is no `await` between here and the
+        // check below, so on the single-threaded runtime only a synchronous eval-time error can
+        // be observed; any later async error is cleared by the next load's reset.
+        resetLastWindowError();
         try {
             // TODO eval source maps for debugging
             eval(trusted.createScript(code) );
@@ -802,9 +814,10 @@ async function evaluateLoadHookResponse(response, id) {
         }
 
         if (lastWindowError) {
-            throw new LoaderError(FAIL_LOAD, [
-                `"${id}": window error ${lastWindowError instanceof Error ? lastWindowError.message : String(lastWindowError)}`,
-            ]);
+            const message =
+                lastWindowError instanceof Error ? lastWindowError.message : String(lastWindowError);
+            resetLastWindowError(); // clear on the failure path too, so it can't poison later loads
+            throw new LoaderError(FAIL_LOAD, [`"${id}": window error ${message}`]);
         }
         return true;
     });

package/build/modules/lwr/loaderLegacy/hooks/resolveAndLoadHook.js

@@ -10,6 +10,12 @@ if (hasDocument) {
         lastWindowError = evt.error;
     });
 }
+// Clear via a function so `lastWindowError` stays in the "assigned in a closure" category (like the
+// listener above): that keeps its declared `null | Error` type at the check below and lets us reset
+// the latch around each eval without leaving flow analysis thinking it is always null.
+function resetLastWindowError() {
+    lastWindowError = null;
+}
 // eslint-disable-next-line lwr/no-unguarded-apis
 if (process.env.NODE_ENV !== 'production') {
     if (!hasSetTimeout && hasConsole) {
@@ -52,6 +58,12 @@ export async function evaluateLoadHookResponse(response, id) {
             throw new LoaderError(FAIL_LOAD, [`empty code for ${id}`]);
         }
         code = `${code}\n//# sourceURL=${id}`; // append sourceURL for debugging
+        // Reset before eval so we only attribute window errors raised synchronously by THIS
+        // module's evaluation, and so a stale error from an earlier point in the page's life
+        // cannot poison this (or any subsequent) load. There is no `await` between here and the
+        // check below, so on the single-threaded runtime only a synchronous eval-time error can
+        // be observed; any later async error is cleared by the next load's reset.
+        resetLastWindowError();
         try {
             // TODO eval source maps for debugging
             eval(trusted.createScript(code));
@@ -65,9 +77,9 @@ export async function evaluateLoadHookResponse(response, id) {
             throw new LoaderError(FAIL_LOAD, [`"${id}": ${e instanceof Error ? e.message : String(e)}`]);
         }
         if (lastWindowError) {
-            throw new LoaderError(FAIL_LOAD, [
-                `"${id}": window error ${lastWindowError instanceof Error ? lastWindowError.message : String(lastWindowError)}`,
-            ]);
+            const message = lastWindowError instanceof Error ? lastWindowError.message : String(lastWindowError);
+            resetLastWindowError(); // clear on the failure path too, so it can't poison later loads
+            throw new LoaderError(FAIL_LOAD, [`"${id}": window error ${message}`]);
         }
         return true;
     });

package/build/modules/lwr/loaderLegacy/loaderLegacy.js

@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: MIT
 * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
 */
-/* LWR Legacy Module Loader v0.24.2 */
+/* LWR Legacy Module Loader v0.24.4 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -425,7 +425,7 @@ try {
   // swallow
 }
 const trusted = createPolicy('trusted', policyOptions);
-/*! version: 0.29.2 */
+/*! version: 0.29.3 */
 
 /* global console,process */
 
@@ -436,6 +436,12 @@ if (hasDocument) {
         lastWindowError = evt.error;
     });
 }
+// Clear via a function so `lastWindowError` stays in the "assigned in a closure" category (like the
+// listener above): that keeps its declared `null | Error` type at the check below and lets us reset
+// the latch around each eval without leaving flow analysis thinking it is always null.
+function resetLastWindowError() {
+    lastWindowError = null;
+}
 
 // eslint-disable-next-line lwr/no-unguarded-apis
 if (process.env.NODE_ENV !== 'production') {
@@ -493,6 +499,12 @@ async function evaluateLoadHookResponse(response, id) {
         }
 
         code = `${code}\n//# sourceURL=${id}`; // append sourceURL for debugging
+        // Reset before eval so we only attribute window errors raised synchronously by THIS
+        // module's evaluation, and so a stale error from an earlier point in the page's life
+        // cannot poison this (or any subsequent) load. There is no `await` between here and the
+        // check below, so on the single-threaded runtime only a synchronous eval-time error can
+        // be observed; any later async error is cleared by the next load's reset.
+        resetLastWindowError();
         try {
             // TODO eval source maps for debugging
             eval(trusted.createScript(code) );
@@ -506,9 +518,10 @@ async function evaluateLoadHookResponse(response, id) {
         }
 
         if (lastWindowError) {
-            throw new LoaderError(FAIL_LOAD, [
-                `"${id}": window error ${lastWindowError instanceof Error ? lastWindowError.message : String(lastWindowError)}`,
-            ]);
+            const message =
+                lastWindowError instanceof Error ? lastWindowError.message : String(lastWindowError);
+            resetLastWindowError(); // clear on the failure path too, so it can't poison later loads
+            throw new LoaderError(FAIL_LOAD, [`"${id}": window error ${message}`]);
         }
         return true;
     });

package/package.json

@@ -5,7 +5,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.24.2",
+    "version": "0.24.4",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -60,17 +60,17 @@
         "build": "yarn build:ts && yarn build:error-shim && yarn build:shim && yarn build:loader && yarn build:shim:bundle && yarn build:shim:bundle:minify"
     },
     "devDependencies": {
-        "@locker/trusted-types": "0.29.2",
-        "@lwrjs/diagnostics": "0.24.2",
-        "@lwrjs/types": "0.24.2",
+        "@locker/trusted-types": "0.29.3",
+        "@lwrjs/diagnostics": "0.24.4",
+        "@lwrjs/types": "0.24.4",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-sucrase": "^5.1.0",
         "@rollup/plugin-terser": "^0.4.4",
         "rollup": "^2.80.0"
     },
     "dependencies": {
-        "@lwrjs/client-modules": "0.24.2",
-        "@lwrjs/shared-utils": "0.24.2"
+        "@lwrjs/client-modules": "0.24.4",
+        "@lwrjs/shared-utils": "0.24.4"
     },
     "lwc": {
         "modules": [
@@ -90,5 +90,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "7492ce779f3b7e91617c4644a1aa567eff01db58"
+    "gitHead": "63feabb6eea1340e80a82146cc1c24bfc4f2d518"
 }