fix: move code for migration to the background script #251 (#261)

Robot-Inventor · Oct 21, 2023 · c174a02 · c174a02
1 parent b4a2410
commit c174a02
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/src/ts/background.ts b/src/ts/background.ts
@@ -1,10 +1,13 @@
 import { ONBOARDING_URL, RELEASE_NOTE_URL } from "./common/constants";
 import browser from "webextension-polyfill";
+import { migrateFromV1ToV2 } from "./migrator";
 
 browser.runtime.onInstalled.addListener((details) => {
     const isJapanese = browser.i18n.getUILanguage() === "ja";
 
     if (details.reason === "update") {
+        void migrateFromV1ToV2();
+
         const releaseNoteURL = isJapanese ? RELEASE_NOTE_URL.ja : RELEASE_NOTE_URL.en;
         void browser.tabs.create({ url: releaseNoteURL });
 

diff --git a/src/ts/browserAction.ts b/src/ts/browserAction.ts
@@ -2,7 +2,6 @@ import "@material/web/checkbox/checkbox.js";
 import { DEFAULT_SETTINGS } from "./common/defaultSettings";
 import browser from "webextension-polyfill";
 import { isSettings } from "./@types/common/settings.guard";
-import { migrateFromV1ToV2 } from "./common/migrator";
 
 const translationTargets: NodeListOf<HTMLElement> = document.querySelectorAll("[data-translation]");
 for (const translationTarget of translationTargets) {
@@ -20,22 +19,20 @@ for (const translationLink of translationLinks) {
     translationLink.setAttribute("href", url);
 }
 
-void migrateFromV1ToV2().then(() => {
-    const checkboxElements = document.querySelectorAll("md-checkbox");
+const checkboxElements = document.querySelectorAll("md-checkbox");
 
-    for (const checkbox of checkboxElements) {
-        void browser.storage.local.get(DEFAULT_SETTINGS).then((currentSettings) => {
-            if (!isSettings(currentSettings))
-                // eslint-disable-next-line curly, nonblock-statement-body-position
-                throw new Error(`Failed to get ${checkbox.name} from storage`);
-            checkbox.checked = currentSettings[checkbox.name as keyof typeof DEFAULT_SETTINGS];
-        });
+for (const checkbox of checkboxElements) {
+    void browser.storage.local.get(DEFAULT_SETTINGS).then((currentSettings) => {
+        if (!isSettings(currentSettings))
+            // eslint-disable-next-line curly, nonblock-statement-body-position
+            throw new Error(`Failed to get ${checkbox.name} from storage`);
+        checkbox.checked = currentSettings[checkbox.name as keyof typeof DEFAULT_SETTINGS];
+    });
 
-        checkbox.addEventListener("change", () => {
-            void browser.storage.local.set({ [checkbox.name]: checkbox.checked });
-        });
-    }
-});
+    checkbox.addEventListener("change", () => {
+        void browser.storage.local.set({ [checkbox.name]: checkbox.checked });
+    });
+}
 
 const { version } = browser.runtime.getManifest();
 const versionElement = document.getElementById("version-number");

diff --git a/src/ts/contentScript.ts b/src/ts/contentScript.ts
@@ -2,12 +2,9 @@ import { EVENT_GENERATOR_ID, EVENT_GENERATOR_SETTINGS_ATTRIBUTE } from "./common
 import { DEFAULT_SETTINGS } from "./common/defaultSettings";
 import { Translator } from "./common/translator";
 import browser from "webextension-polyfill";
-import { migrateFromV1ToV2 } from "./common/migrator";
 
 // eslint-disable-next-line max-statements
 const main = async () => {
-    await migrateFromV1ToV2();
-
     const settings = await browser.storage.local.get(DEFAULT_SETTINGS);
 
     const translator = new Translator((key) => browser.i18n.getMessage(key), browser.runtime.getURL("dist/image/"));

diff --git a/src/ts/common/migrator.ts → src/ts/migrator.ts b/src/ts/common/migrator.ts → src/ts/migrator.ts