Merge 'master' into feat/brave-build-with-chrome-sockets

ipfs · Mar 18, 2019 · f4ba231 · f4ba231
2 parents 870a4cb + 9d0d992
commit f4ba231
Show file tree

Hide file tree

Showing 5 changed files with 226 additions and 91 deletions.
diff --git a/add-on/src/lib/state.js b/add-on/src/lib/state.js
@@ -24,7 +24,7 @@ function initState (options) {
   state.dnslinkPolicy = String(options.dnslinkPolicy) === 'false' ? false : options.dnslinkPolicy
   // store info about 'blessed' release of Web UI
   // which should work without setting CORS headers
-  state.webuiCid = 'QmXc9raDM1M5G5fpBnVyQ71vR4gbnskwnB9iMEzBuLgvoZ' // v2.3.3
+  state.webuiCid = 'QmZepbAvvUvCqKmNjgf3dStoSToXCW9uQopx4vd2HFMELR' // v2.4.1
   state.webuiRootUrl = `${state.gwURLString}ipfs/${state.webuiCid}/`
   return state
 }

diff --git a/add-on/src/popup/browser-action/context-actions.js b/add-on/src/popup/browser-action/context-actions.js
@@ -26,7 +26,8 @@ function contextActions ({
   onPin,
   onUnPin
 }) {
-  const activePinControls = active && isIpfsOnline && isApiAvailable && !(isPinning || isUnPinning)
+  const activeCidResolver = active && isIpfsOnline && isApiAvailable
+  const activePinControls = active && isIpfsOnline && isApiAvailable
 
   const renderIpfsContextItems = () => {
     if (!isIpfsContext) return
@@ -41,14 +42,14 @@ function contextActions ({
   })}
   ${navItem({
     text: browser.i18n.getMessage(contextMenuCopyRawCid),
-    disabled: !activePinControls,
+    disabled: !activeCidResolver,
     onClick: () => onCopy(contextMenuCopyRawCid)
   })}
   ${navItem({
     text: browser.i18n.getMessage('panel_pinCurrentIpfsAddress'),
     title: browser.i18n.getMessage('panel_pinCurrentIpfsAddressTooltip'),
     disabled: !activePinControls,
-    switchValue: isPinned,
+    switchValue: (isPinned || isPinning) && !isUnPinning,
     onClick: isPinned ? onUnPin : onPin
   })}
   </div>

diff --git a/ci/firefox/update.json b/ci/firefox/update.json
@@ -3,46 +3,26 @@
         "ipfs-companion-dev-build@ci.ipfs.team": {
             "updates": [
                 {
-                    "version": "2.6.3.12520",
-                    "applications": {
-                        "gecko": {
-                            "strict_min_version": "60"
-                        }
-                    },
-                    "update_hash": "sha256:35d5a45a73931d11907e560e154f12b202096adf8c550a0d9bfb442d7b594b0f",
-                    "update_link": "https://github.com/ipfs-shipyard/ipfs-companion/releases/download/v2.6.3.12520/ipfs_companion_beta_build-2.6.3.12520-an+fx.xpi"
-                },
-                {
-                    "version": "2.7.0.12740",
-                    "applications": {
-                        "gecko": {
-                            "strict_min_version": "60"
-                        }
-                    },
-                    "update_hash": "sha256:e78475cab2f76912c35d10e93d26cdaa691b9958bfb3d92eae5caef1766ae586",
-                    "update_link": "https://github.com/ipfs-shipyard/ipfs-companion/releases/download/v2.7.0.12740/ipfs_companion_beta_build-2.7.0.12740-an+fx.xpi"
-                },
-                {
-                    "version": "2.7.5.748",
+                    "version": "2.7.5.753",
                     "applications": {
                         "gecko": {
                             "strict_min_version": "60"
                         }
                     },
-                    "update_hash": "sha256:7d2f4ab9f79962dc3a6e2fbab07a6aa5c39003dc61c5619e6c8f7689518af20f",
-                    "update_link": "https://github.com/ipfs-shipyard/ipfs-companion/releases/download/v2.7.5.748/ipfs_companion_beta_build-2.7.5.748-an+fx.xpi"
+                    "update_hash": "sha256:e67635ce91b27f91656f286cc9cc243985074d0aa2eff2101a3954003b8d2e74",
+                    "update_link": "https://github.com/ipfs-shipyard/ipfs-companion/releases/download/v2.7.5.753/ipfs_companion_beta_build-2.7.5.753-an+fx.xpi"
                 },
                 {
-                    "version": "2.7.5.753",
+                    "version": "2.7.5.757",
                     "applications": {
                         "gecko": {
                             "strict_min_version": "60"
                         }
                     },
-                    "update_hash": "sha256:e67635ce91b27f91656f286cc9cc243985074d0aa2eff2101a3954003b8d2e74",
-                    "update_link": "https://github.com/ipfs-shipyard/ipfs-companion/releases/download/v2.7.5.753/ipfs_companion_beta_build-2.7.5.753-an+fx.xpi"
+                    "update_hash": "sha256:7bbd7f5d81d1160db73658230a889ea630919321ca7c54053f9b37d4389d5394",
+                    "update_link": "https://github.com/ipfs-shipyard/ipfs-companion/releases/download/v2.7.5.757/ipfs_companion_beta_build-2.7.5.757-an+fx.xpi"
                 }
             ]
         }
     }
-}
+}
diff --git a/package.json b/package.json
@@ -91,18 +91,18 @@
     "sinon-chrome": "2.3.2",
     "standard": "12.0.1",
     "tar": "4.4.8",
-    "terser": "3.16.1",
+    "terser": "3.17.0",
     "terser-webpack-plugin": "1.2.3",
     "transform-loader": "0.2.4",
     "web-ext": "3.0.0",
     "webpack": "4.29.6",
     "webpack-bundle-analyzer": "3.1.0",
-    "webpack-cli": "3.2.3",
+    "webpack-cli": "3.3.0",
     "webpack-merge": "4.2.1"
   },
   "dependencies": {
     "browser-process-hrtime": "1.0.0",
-    "@material/switch": "1.0.0",
+    "@material/switch": "1.0.1",
     "choo": "6.13.1",
     "chrome-dgram": "3.0.1",
     "chrome-net": "3.3.1",
@@ -114,7 +114,7 @@
     "http-node": "1.2.0",
     "ipfs": "0.35.0-rc.0",
     "ipfs-css": "0.12.0",
-    "ipfs-http-client": "29.1.1",
+    "ipfs-http-client": "30.1.0",
     "ipfs-http-response": "0.2.2",
     "ipfs-postmsg-proxy": "3.1.1",
     "ipfsx": "0.17.0",
@@ -123,7 +123,7 @@
     "is-svg": "4.0.0",
     "lru-cache": "5.1.1",
     "mime-types": "2.1.22",
-    "p-queue": "3.2.0",
+    "p-queue": "4.0.0",
     "path-browserify": "1.0.0",
     "piggybacker": "2.0.0",
     "postmsg-rpc": "2.4.0",