Fix the dependency cycle and update packages

This is a regression introduced in commit:
05dc48eac2

The autofocus attribute was removed unexpectedly in a localization
change.

bin/build-addon.sh

@@ -23,4 +23,5 @@ if [[ $# -gt 0 ]]; then
   EXTRA_PARAMS="--filename $1"
 fi
 
-$(npm bin)/web-ext build --overwrite-dest $EXTRA_PARAMS || die
+# Let's include just 'en' for this release
+$(npm bin)/web-ext build --overwrite-dest $EXTRA_PARAMS --ignore-files $(find _locales/* | grep  \/en -v) $(find _locales/* | grep en_) || die

package.json

@@ -2,30 +2,29 @@
   "name": "testpilot-containers",
   "title": "Multi-Account Containers",
   "description": "Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
-  "version": "8.0.0",
+  "version": "8.0.3",
-  "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
+  "author": "Andrea Marchesini, Luke Crouch, Lesley Norton, Kendall Werts, Maxx Crawford, Jonathan Kingston",
   "bugs": {
     "url": "https://github.com/mozilla/multi-account-containers/issues"
   },
-  "dependencies": {},
   "devDependencies": {
     "addons-linter": "^1.3.2",
     "ajv": "^6.6.3",
     "chai": "^4.2.0",
-    "eslint": "^6.6.0",
+    "eslint": "^8.3.0",
     "eslint-plugin-no-unsanitized": "^2.0.0",
     "eslint-plugin-promise": "^3.4.0",
-    "htmllint-cli": "0.0.7",
+    "htmllint-cli": "^0.0.6",
     "json": ">=10.0.0",
-    "mocha": "^6.2.2",
+    "mocha": "^9.1.3",
     "npm-run-all": "^4.0.0",
     "nyc": "^15.0.0",
-    "sinon": "^7.5.0",
+    "sinon": "^8.1.1",
-    "sinon-chai": "^3.3.0",
+    "sinon-chai": "^3.7.0",
     "stylelint": "^13.5.0",
     "stylelint-config-standard": "^20.0.0",
     "stylelint-order": "^4.0.0",
-    "web-ext": "^5.4.1",
+    "web-ext": "^6.6.0",
     "webextensions-jsdom": "^1.2.1"
   },
   "homepage": "https://github.com/mozilla/multi-account-containers#readme",

src/confirm-page.html

@@ -24,7 +24,7 @@
       <br />
       <div class="button-container">
         <button id="deny" class="button" data-message-id="openInContainer" data-message-arg="current-container-name"></button>
-        <button id="confirm" class="button primary" data-message-id="openInContainer" data-message-arg="container-name"></button>
+        <button id="confirm" class="button primary" autofocus data-message-id="openInContainer" data-message-arg="container-name"></button>
       </div>
     </form>
   </main>

src/js/background/assignManager.js

@@ -188,13 +188,13 @@ window.assignManager = {
     // The following blocks potentially dangerous requests for privacy that come without a tabId
 
     if(requestInfo.tabId === -1) {
-      return {type: "direct"};
+      return {};
     }
 
     const tab = await browser.tabs.get(requestInfo.tabId);
     const result = await proxifiedContainers.retrieve(tab.cookieStoreId);
     if (!result || !result.proxy) {
-      return {type: "direct"};
+      return {};
     }
 
     if (!result.proxy.mozProxyEnabled) {

src/js/background/badge.js

@@ -1,4 +1,4 @@
-const MAJOR_VERSIONS = ["2.3.0", "2.4.0", "6.2.0", "8.0.0"];
+const MAJOR_VERSIONS = ["2.3.0", "2.4.0", "6.2.0", "8.0.2"];
 const badge = {
   async init() {
     const currentWindow = await browser.windows.getCurrent();

src/js/popup.js

@@ -1582,7 +1582,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
         this.mozProxyEnabledInput.value = proxyInfo.mozProxyEnabled;
         this.proxyAddressInput.value = `${proxyInfo.type}://${proxyInfo.host}:${proxyInfo.port}`;
 
-        if (typeof(proxyInfo.countryCode) === "undefined" && proxyInfo.type !== "direct") {
+        if (typeof(proxyInfo.countryCode) === "undefined" && proxyInfo.type) {
           // Set custom proxy URL below 'Advanced proxy settings' button label
           this.advancedProxyAddress.textContent = `${proxyInfo.type}://${proxyInfo.host}:${proxyInfo.port}`;
         }
@@ -1929,10 +1929,18 @@ Logic.registerPanel(P_ADVANCED_PROXY_SETTINGS, {
 
   async prepare() {
     const identity = Logic.currentIdentity();
-    console.log(this._advancedProxyInput);
+    const advancedProxyInput = document.getElementById("edit-advanced-proxy-input");
 
     // reset input
-    this._advancedProxyInput.value = "";
+    const resetProxyInput = () => {
+      if (!advancedProxyInput) {
+        return;
+      }
+      advancedProxyInput.value = "";
+    };
+
+    resetProxyInput();
+
     this.hideInvalidEntryWarning();
 
     const setProxyInputPlaceholder = (proxy) => {
@@ -1940,8 +1948,8 @@ Logic.registerPanel(P_ADVANCED_PROXY_SETTINGS, {
     };
 
     const edit_proxy_dom = function(proxy) {
-      if (proxy.type === "direct" || typeof proxy.type === "undefined" || MozillaVPN.proxyIsDisabled(proxy)) {
+      if (!proxy.type || MozillaVPN.proxyIsDisabled(proxy)) {
-        this._advancedProxyInput.value = "";
+        resetProxyInput();
         return;
       }
       return setProxyInputPlaceholder(proxy);
@@ -1951,7 +1959,7 @@ Logic.registerPanel(P_ADVANCED_PROXY_SETTINGS, {
     if (proxyData) {
       edit_proxy_dom(proxyData.proxy);
     } else {
-      this._advancedProxyInput.value = "";
+      resetProxyInput();
     }
     const containerColor = document.querySelector(".proxy-title-container-color");
     containerColor.dataset.identityColor = identity.color;

src/js/proxified-containers.js

@@ -51,7 +51,7 @@ proxifiedContainers = {
     }
 
     if (mozillaVpnData && mozillaVpnData.mozProxyEnabled === undefined) {
-      matches.groups.type = "direct";
+      matches.groups.type = null;
     }
 
     if (!mozillaVpnData) {

src/manifest.json

@@ -1,19 +1,13 @@
 {
   "manifest_version": 2,
   "name": "Firefox Multi-Account Containers",
-  "version": "8.0.0",
+  "version": "8.0.3",
   "incognito": "not_allowed",
   "description": "__MSG_extensionDescription__",
   "icons": {
     "48": "img/container-site-d-48.png",
     "96": "img/container-site-d-96.png"
   },
-  "applications": {
-    "gecko": {
-      "id": "@testpilot-containers",
-      "strict_min_version": "67.0"
-    }
-  },
   "homepage_url": "https://github.com/mozilla/multi-account-containers#readme",
   "permissions": [
     "<all_urls>",
@@ -37,7 +31,8 @@
   ],
   "browser_specific_settings": {
     "gecko": {
-      "id": "@testpilot-containers"
+      "id": "@testpilot-containers",
+      "strict_min_version": "91.1.0"
     }
   },
   "commands": {