@lwrjs/loader 0.24.2 → 0.24.3

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.3 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -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.3 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -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.3",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -61,16 +61,16 @@
     },
     "devDependencies": {
         "@locker/trusted-types": "0.29.2",
-        "@lwrjs/diagnostics": "0.24.2",
-        "@lwrjs/types": "0.24.2",
+        "@lwrjs/diagnostics": "0.24.3",
+        "@lwrjs/types": "0.24.3",
         "@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.3",
+        "@lwrjs/shared-utils": "0.24.3"
     },
     "lwc": {
         "modules": [
@@ -90,5 +90,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "7492ce779f3b7e91617c4644a1aa567eff01db58"
+    "gitHead": "ed415a8f04d5558cac756fbc2a0e454a373e31c1"
 }