Migrate to v3

Author: bakulf

src/js/background/badge.js

@@ -11,9 +11,9 @@ const badge = {
 
     if (MAJOR_VERSIONS.indexOf(extensionInfo.version) > -1 &&
       storage.browserActionBadgesClicked.indexOf(extensionInfo.version) < 0) {
-      browser.browserAction.setBadgeBackgroundColor({ color: "rgb(255, 79, 94)" });
-      browser.browserAction.setBadgeText({ text: "!" });
-      browser.browserAction.setBadgeTextColor({ color: "rgb(255, 255, 255)" });
+      browser.action.setBadgeBackgroundColor({ color: "rgb(255, 79, 94)" });
+      browser.action.setBadgeText({ text: "!" });
+      browser.action.setBadgeTextColor({ color: "rgb(255, 255, 255)" });
     }
   }
 };

src/js/background/index.html

@@ -246,24 +246,23 @@ const messageHandler = {
     const count = await browser.storage.local.get({[key]: 0});
     const countOfContainerTabsOpened = ++count[key];
     browser.storage.local.set({[key]: countOfContainerTabsOpened});
-
     // When the user opens their _ tab, give them the achievement
     if (countOfContainerTabsOpened === 100) {
       const storage = await browser.storage.local.get({achievements: []});
       storage.achievements.push({"name": "manyContainersOpened", "done": false});
       // use set and spread to create a unique array
       const achievements = [...new Set(storage.achievements)];
       browser.storage.local.set({achievements});
-      browser.browserAction.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"});
-      browser.browserAction.setBadgeText({text: "NEW"});
+      browser.action.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"});
+      browser.action.setBadgeText({text: "NEW"});
     }
 
     this.maybePrepareSurveyAchievementOnUpdate(countOfContainerTabsOpened);
   },
 
   async onFocusChangedCallback(windowId) {
     assignManager.removeContextMenu();
-    // browserAction loses background color in new windows ...
+    // Action loses background color in new windows ...
     // https://bugzil.la/1314674
     // https://github.com/mozilla/testpilot-containers/issues/608
     // ... so re-call displayBrowserActionBadge on window changes
@@ -300,8 +299,8 @@ const messageHandler = {
     // Ensure the achievement exists and is pending.
     achievements.push({ name: "surveyFinal", done: false });
     browser.storage.local.set({ achievements });
-    browser.browserAction.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"});
-    browser.browserAction.setBadgeText({text: "NEW"});
+    browser.action.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"});
+    browser.action.setBadgeText({text: "NEW"});
   },
 };
 

src/js/background/messageHandler.js

@@ -189,8 +189,8 @@ const Logic = {
   async clearBrowserActionBadge() {
     const extensionInfo = await getExtensionInfo();
     const storage = await browser.storage.local.get({ browserActionBadgesClicked: [] });
-    browser.browserAction.setBadgeBackgroundColor({ color: "#ffffff" });
-    browser.browserAction.setBadgeText({ text: "" });
+    browser.action.setBadgeBackgroundColor({ color: "#ffffff" });
+    browser.action.setBadgeText({ text: "" });
     storage.browserActionBadgesClicked.push(extensionInfo.version);
     // use set and spread to create a unique array
     const browserActionBadgesClicked = [...new Set(storage.browserActionBadgesClicked)];

src/js/popup.js

@@ -1,5 +1,5 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "Firefox Multi-Account Containers",
   "version": "8.3.5",
   "incognito": "not_allowed",
@@ -10,7 +10,6 @@
   },
   "homepage_url": "https://github.com/mozilla/multi-account-containers#readme",
   "permissions": [
-    "<all_urls>",
     "activeTab",
     "cookies",
     "contextMenus",
@@ -24,6 +23,9 @@
     "webRequestBlocking",
     "webRequest"
   ],
+  "host_permissions": [
+    "<all_urls>"
+  ],
   "optional_permissions": [
     "bookmarks",
     "browsingData",
@@ -33,14 +35,14 @@
   "browser_specific_settings": {
     "gecko": {
       "id": "@testpilot-containers",
-      "strict_min_version": "91.1.0",
+      "strict_min_version": "109.0",
       "data_collection_permissions": {
         "required": ["none"]
       }
     }
   },
   "commands": {
-    "_execute_browser_action": {
+    "_execute_action": {
       "suggested_key": {
         "default": "Ctrl+Period",
         "mac": "MacCtrl+Period"
@@ -111,8 +113,7 @@
       "description": "__MSG_containerShortcut__"
     }
   },
-  "browser_action": {
-    "browser_style": true,
+  "action": {
     "default_icon": "img/multiaccountcontainer-16.svg",
     "default_title": "Firefox Multi-Account Containers",
     "default_popup": "popup.html",
@@ -125,16 +126,18 @@
       }
     ]
   },
-  "page_action": {
-    "browser_style": true,
-    "default_icon": "img/container-openin-16.svg",
-    "default_title": "__MSG_alwaysOpenSiteInContainer__",
-    "default_popup": "pageActionPopup.html",
-    "pinned": false,
-    "show_matches": ["*://*/*"]
-  },
   "background": {
-    "page": "js/background/index.html"
+    "scripts": [
+      "js/utils.js",
+      "js/proxified-containers.js",
+      "js/background/backgroundLogic.js",
+      "js/background/mozillaVpnBackground.js",
+      "js/background/assignManager.js",
+      "js/background/badge.js",
+      "js/background/identityState.js",
+      "js/background/messageHandler.js",
+      "js/background/sync.js"
+    ]
   },
   "content_scripts": [
     {
@@ -152,10 +155,16 @@
   ],
   "default_locale": "en",
   "web_accessible_resources": [
-    "/img/multiaccountcontainer-16.svg"
+    {
+      "resources": [
+        "img/multiaccountcontainer-16.svg"
+      ],
+      "matches": [
+        "<all_urls>"
+      ]
+    }
   ],
   "options_ui": {
-    "page": "options.html",
-    "browser_style": true
+    "page": "options.html"
   }
 }