Merge pull request #389 from tableflip/feat/upgrade-deps

Upgrades all the dependencies!

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

@@ -75,9 +75,9 @@ module.exports = async function init () {
     browser.tabs.onActivated.addListener(onActivatedTab)
     browser.runtime.onMessage.addListener(onRuntimeMessage)
     browser.runtime.onConnect.addListener(onRuntimeConnect)
-   // browser.protocol exists only in Brave
+
     if (runtime.hasNativeProtocolHandler) {
-      console.log(`[ipfs-companion] registerStringProtocol available. Adding ipfs:// handler`)
+      console.log('[ipfs-companion] registerStringProtocol available. Adding ipfs:// handler')
       browser.protocol.registerStringProtocol('ipfs', createIpfsUrlProtocolHandler(() => ipfs))
     } else {
       console.log('[ipfs-companion] browser.protocol.registerStringProtocol not available, native protocol will not be registered')
@@ -158,7 +158,11 @@ module.exports = async function init () {
     const info = {
       ipfsNodeType: state.ipfsNodeType,
       peerCount: state.peerCount,
-      repoStats: state.repoStats,
+      // Convert big.js numbers into strings before sending.
+      // Chrome uses JSON.stringify to send objects over port.postMessage whereas
+      // Firefox uses structured clone. It means that on the other side FF gets
+      // a weird object (not a big.js number object) unless we stringify first.
+      repoStats: JSON.parse(JSON.stringify(state.repoStats)),
       gwURLString: state.gwURLString,
       pubGwURLString: state.pubGwURLString,
       currentTab: await browser.tabs.query({active: true, currentWindow: true}).then(tabs => tabs[0])
@@ -402,7 +406,7 @@ module.exports = async function init () {
 
   async function updateBrowserActionBadge () {
     if (typeof browser.browserAction.setBadgeBackgroundColor === 'undefined') {
-     // Firefox for Android does not have this UI, so we just skip it
+      // Firefox for Android does not have this UI, so we just skip it
       return
     }
 

add-on/src/popup/browser-action/browser-action.css

@@ -1,4 +1,5 @@
 @import url('../../../ui-kit/tachyons.css');
+@import url('../heartbeat.css');
 @import url('mdc.switch.css');
 
 .bg-near-white--hover:hover {

add-on/src/popup/browser-action/store.js

@@ -156,13 +156,13 @@ module.exports = (state, emitter) => {
   async function updatePageActionsState (status) {
     // IPFS contexts require access to background page
     // which is denied in Private Browsing mode
-    const bg = await getBackgroundPage(status)
+    const bg = await getBackgroundPage()
 
     // Check if current page is an IPFS one
     const ipfsContext = bg && status && status.ipfsPageActionsContext
 
     state.isIpfsContext = !!ipfsContext
-    state.currentTabUrl = status.currentTab.url
+    state.currentTabUrl = status.currentTab ? status.currentTab.url : null
 
     if (state.isIpfsContext) {
       // There is no point in displaying actions that require API interaction if API is down

package.json

@@ -52,11 +52,9 @@
   "preferGlobal": false,
   "devDependencies": {
     "babel-preset-env": "1.6.1",
-    "babel-preset-es2015": "6.24.1",
-    "babel-preset-es2017": "6.24.1",
     "babelify": "8.0.0",
     "brfs": "1.4.4",
-    "browserify": "14.5.0",
+    "browserify": "16.1.0",
     "browserify-package-json": "1.0.1",
     "chai": "4.1.2",
     "cross-env": "5.1.3",
@@ -67,34 +65,34 @@
     "husky": "0.14.3",
     "ignore-styles": "5.0.1",
     "mem-storage-area": "1.0.3",
-    "mocha": "4.0.1",
+    "mocha": "5.0.1",
     "mocha-jenkins-reporter": "0.3.10",
-    "nodemon": "1.14.11",
+    "nodemon": "1.15.1",
     "npm-run-all": "4.1.2",
     "nyc": "11.4.1",
     "shx": "0.2.2",
-    "sinon": "4.1.2",
-    "sinon-chrome": "2.2.1",
+    "sinon": "4.3.0",
+    "sinon-chrome": "2.2.4",
     "standard": "10.0.3",
     "uglifyify": "4.0.5",
-    "watchify": "3.9.0",
-    "web-ext": "2.3.2"
+    "watchify": "3.10.0",
+    "web-ext": "2.4.0"
   },
   "dependencies": {
-    "choo": "6.6.1",
+    "choo": "6.8.0",
     "doc-sniff": "1.0.1",
-    "file-type": "7.3.0",
-    "ipfs": "0.27.6",
-    "ipfs-api": "17.2.7",
-    "ipfs-css": "0.1.0",
-    "ipfs-postmsg-proxy": "2.7.0",
+    "file-type": "7.6.0",
+    "ipfs": "0.27.7",
+    "ipfs-api": "18.1.1",
+    "ipfs-css": "0.2.0",
+    "ipfs-postmsg-proxy": "2.8.0",
     "is-ipfs": "0.3.2",
-    "is-svg": "2.1.0",
+    "is-svg": "3.0.0",
     "lru_map": "0.3.3",
-    "mime-types": "2.1.17",
+    "mime-types": "2.1.18",
     "p-queue": "2.3.0",
     "prundupify": "1.0.0",
-    "tachyons": "4.9.0",
+    "tachyons": "4.9.1",
     "webextension-polyfill": "0.1.2"
   }
 }