Merge pull request #865 from NordicSemiconductor/fix/main-thread-pers…

…istent-store fix: allow main thread code to import persistent store (and through t…
NordicSemiconductor · Jan 16, 2024 · 6a5e860 · 6a5e860
2 parents 2ef4582 + 06235a6
commit 6a5e860
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -13,6 +13,15 @@ every new version is a new major version.
 
 -   `openFile` export.
 
+### Changed
+
+-   Updated `es6` -> `es2021` in eslint config `env`.
+
+### Fixed
+
+-   Make new `isVerboseLogging` persistent setting get/set compatible with Main
+    thread code (by using `globalThis` instead of `window`).
+
 ## 148.0.0 - 2024-01-16
 
 ### Added

diff --git a/config/eslintrc.js b/config/eslintrc.js
@@ -179,7 +179,7 @@ module.exports = {
         'md',
     ],
     env: {
-        es6: true,
+        es2021: true,
         browser: true,
         node: true,
         jasmine: true,

diff --git a/src/utils/persistentStore.ts b/src/utils/persistentStore.ts
@@ -189,9 +189,9 @@ export const getIsLoggingVerbose = () =>
     );
 
 const resetIsLoggingVerbose = () => persistIsLoggingVerbose(false);
-window.addEventListener('beforeunload', resetIsLoggingVerbose);
+globalThis.addEventListener?.('beforeunload', resetIsLoggingVerbose);
 export const doNotResetVerboseLogginOnRestart = () =>
-    window.removeEventListener('beforeunload', resetIsLoggingVerbose);
+    globalThis.removeEventListener?.('beforeunload', resetIsLoggingVerbose);
 
 export const getPersistedLogVisible = () =>
     getAppSpecificStore<SharedAppSpecificStoreSchema>().get(`isLogVisible`);