fix(mv3): CI Builds 🏗️ (#1183)

* fix(mv3): 🩹 package.json * fix(mv3): 🚨 Fix Lint * fix(mv3): 💚 Manifest version * feat: 🩹 temporary building from rc-branch
ipfs · Mar 24, 2023 · f670059 · f670059
1 parent 1ea8b09
commit f670059
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 2,518 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - main
+      - rc/3.0-mv3
 
 env:
   XDG_CACHE_HOME: ${{ github.workspace }}/.cache

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.12.1
+FROM node:18.14.0
 
 ARG USER_ID
 ARG GROUP_ID

diff --git a/add-on/manifest.common.json b/add-on/manifest.common.json
@@ -41,7 +41,7 @@
         "dist/recovery/recovery.js"
       ],
       "matches": [
-        "chrome-extension://*/*"
+        "<all_urls>"
       ]
     }
   ],

diff --git a/add-on/manifest.firefox-beta.json b/add-on/manifest.firefox-beta.json
@@ -1,5 +1,5 @@
 {
-  "applications": {
+  "browser_specific_settings": {
     "gecko": {
       "id": "ipfs-companion-dev-build@ci.ipfs.team",
       "update_url": "https://ipfs-shipyard.github.io/ipfs-companion/ci/firefox/update.json"

diff --git a/add-on/manifest.firefox.json b/add-on/manifest.firefox.json
@@ -5,10 +5,10 @@
   "options_ui": {
     "browser_style": false
   },
-  "applications": {
+  "browser_specific_settings": {
     "gecko": {
       "id": "ipfs-firefox-addon@lidel.org",
-      "strict_min_version": "91.1.0"
+      "strict_min_version": "109.0.0"
     }
   },
   "permissions": [

diff --git a/add-on/src/background/background.js b/add-on/src/background/background.js
@@ -13,4 +13,5 @@ browser.runtime.setUninstallURL(getUninstallURL(browser))
 const init = async () => {
   await createIpfsCompanion()
 }
-init();
+
+init()
diff --git a/add-on/src/lib/ipfs-companion.js b/add-on/src/lib/ipfs-companion.js
@@ -108,7 +108,7 @@ export default async function init (windowedContext = false) {
     throw new Error('IPFS Companion: API client is disabled')
   }
 
-  function registerListeners() {
+  function registerListeners () {
     const onBeforeSendInfoSpec = ['requestHeaders']
     if (browser.webRequest.OnBeforeSendHeadersOptions && 'EXTRA_HEADERS' in browser.webRequest.OnBeforeSendHeadersOptions) {
       // Chrome 72+  requires 'extraHeaders' for accessing all headers
@@ -263,7 +263,7 @@ export default async function init (windowedContext = false) {
           }, 0)
         }
       }
-      info.currentDnslinkFqdn =await dnslinkResolver.findDNSLinkHostname(url)
+      info.currentDnslinkFqdn = await dnslinkResolver.findDNSLinkHostname(url)
       info.currentFqdn = info.currentDnslinkFqdn || safeHostname(url)
       info.currentTabIntegrationsOptOut = !state.activeIntegrations(info.currentFqdn)
       info.isRedirectContext = info.currentFqdn && ipfsPathValidator.isRedirectPageActionsContext(url)
@@ -517,7 +517,7 @@ export default async function init (windowedContext = false) {
       // Try SVG first -- Firefox supports it natively
       await browser.action.setIcon(iconDefinition)
       if (browser.runtime.lastError.message === 'Icon invalid.') {
-        throw browser.runtime.lastError 
+        throw browser.runtime.lastError
       }
     } catch (error) {
       // Fallback!

diff --git a/add-on/src/recovery/recovery.js b/add-on/src/recovery/recovery.js
@@ -3,7 +3,7 @@
 
 import choo from 'choo'
 import html from 'choo/html/index.js'
-import browser, { i18n, runtime } from 'webextension-polyfill'
+import { i18n, runtime } from 'webextension-polyfill'
 import { nodeOffSvg } from '../landing-pages/welcome/page.js'
 import createWelcomePageStore from '../landing-pages/welcome/store.js'
 import { optionsPage } from '../lib/constants.js'