Skip to content

Commit f670059

Browse files
authored
fix(mv3): CI Builds 🏗️ (#1183)
* fix(mv3): 🩹 package.json * fix(mv3): 🚨 Fix Lint * fix(mv3): 💚 Manifest version * feat: 🩹 temporary building from rc-branch
1 parent 1ea8b09 commit f670059

10 files changed

+39
-2518
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
pull_request:
1010
branches:
1111
- main
12+
- rc/3.0-mv3
1213

1314
env:
1415
XDG_CACHE_HOME: ${{ github.workspace }}/.cache

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18.12.1
1+
FROM node:18.14.0
22

33
ARG USER_ID
44
ARG GROUP_ID

add-on/manifest.common.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"dist/recovery/recovery.js"
4242
],
4343
"matches": [
44-
"chrome-extension://*/*"
44+
"<all_urls>"
4545
]
4646
}
4747
],

add-on/manifest.firefox-beta.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"applications": {
2+
"browser_specific_settings": {
33
"gecko": {
44
"id": "ipfs-companion-dev-build@ci.ipfs.team",
55
"update_url": "https://ipfs-shipyard.github.io/ipfs-companion/ci/firefox/update.json"

add-on/manifest.firefox.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"options_ui": {
66
"browser_style": false
77
},
8-
"applications": {
8+
"browser_specific_settings": {
99
"gecko": {
1010
"id": "ipfs-firefox-addon@lidel.org",
11-
"strict_min_version": "91.1.0"
11+
"strict_min_version": "109.0.0"
1212
}
1313
},
1414
"permissions": [

add-on/src/background/background.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ browser.runtime.setUninstallURL(getUninstallURL(browser))
1313
const init = async () => {
1414
await createIpfsCompanion()
1515
}
16-
init();
16+
17+
init()

add-on/src/lib/ipfs-companion.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export default async function init (windowedContext = false) {
108108
throw new Error('IPFS Companion: API client is disabled')
109109
}
110110

111-
function registerListeners() {
111+
function registerListeners () {
112112
const onBeforeSendInfoSpec = ['requestHeaders']
113113
if (browser.webRequest.OnBeforeSendHeadersOptions && 'EXTRA_HEADERS' in browser.webRequest.OnBeforeSendHeadersOptions) {
114114
// Chrome 72+ requires 'extraHeaders' for accessing all headers
@@ -263,7 +263,7 @@ export default async function init (windowedContext = false) {
263263
}, 0)
264264
}
265265
}
266-
info.currentDnslinkFqdn =await dnslinkResolver.findDNSLinkHostname(url)
266+
info.currentDnslinkFqdn = await dnslinkResolver.findDNSLinkHostname(url)
267267
info.currentFqdn = info.currentDnslinkFqdn || safeHostname(url)
268268
info.currentTabIntegrationsOptOut = !state.activeIntegrations(info.currentFqdn)
269269
info.isRedirectContext = info.currentFqdn && ipfsPathValidator.isRedirectPageActionsContext(url)
@@ -517,7 +517,7 @@ export default async function init (windowedContext = false) {
517517
// Try SVG first -- Firefox supports it natively
518518
await browser.action.setIcon(iconDefinition)
519519
if (browser.runtime.lastError.message === 'Icon invalid.') {
520-
throw browser.runtime.lastError
520+
throw browser.runtime.lastError
521521
}
522522
} catch (error) {
523523
// Fallback!

add-on/src/recovery/recovery.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import choo from 'choo'
55
import html from 'choo/html/index.js'
6-
import browser, { i18n, runtime } from 'webextension-polyfill'
6+
import { i18n, runtime } from 'webextension-polyfill'
77
import { nodeOffSvg } from '../landing-pages/welcome/page.js'
88
import createWelcomePageStore from '../landing-pages/welcome/store.js'
99
import { optionsPage } from '../lib/constants.js'

0 commit comments

Comments
 (0)