Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
lidel committed Oct 5, 2018
1 parent 99b910d commit a4dc33b
Show file tree
Hide file tree
Showing 4 changed files with 2,744 additions and 548 deletions.
2 changes: 1 addition & 1 deletion add-on/src/popup/browser-action/icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const browser = require('webextension-polyfill')

function icon ({ svg, title, active, action }) {
return html`
<button class="pa0 ma0 dib bn bg-transparent pointer transition-all ${active ? 'fill-aqua hover-fill-snow' : 'fill-gray hover-fill-snow-muted'}"
<button class="pa0 ma0 dib bn bg-transparent pointer transition-all ${active ? 'aqua hover-snow' : 'gray hover-snow-muted'}"
style="outline:none;"
title="${browser.i18n.getMessage(title)}"
onclick=${action}>
Expand Down
2 changes: 1 addition & 1 deletion ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ timeout(time: 1, unit: 'HOURS') { parallel(
// remove node_modules if any
bat 'del /s /q node_modules >nul 2>&1'
// https://github.com/yarnpkg/yarn/issues/3110#issuecomment-293347341
bat 'npx yarn@1.9.4 config set msvs_version 2015 --global'
bat 'npx yarn@1.10.1 config set msvs_version 2015 --global'
// run developer build as a smoke-test for windows
bat 'npm run dev-build'
bat 'dir /s /b /o:gn build'
Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
"firefox": "web-ext run --url about:debugging",
"get-firefox-nightly": "shx test -e ./firefox/firefox || get-firefox -b nightly -e",
"ci": "run-s ci:*",
"ci:install": "npx yarn@1.9.4 install --frozen-lockfile || npx yarn@1.9.4 install --frozen-lockfile",
"ci:test": "npx yarn@1.9.4 test",
"ci:build": "./ci/update-manifest.sh ; npx yarn@1.9.4 build ; chmod -R ugo+rwX build/ add-on/",
"ci:install": "npx yarn@1.10.1 install --frozen-lockfile || npx yarn@1.10.1 install --frozen-lockfile",
"ci:test": "npx yarn@1.10.1 test",
"ci:build": "./ci/update-manifest.sh ; npx yarn@1.10.1 build ; chmod -R ugo+rwX build/ add-on/",
"beta-build": "docker build -t ipfs-companion . && docker run -it -e RELEASE_CHANNEL=beta -v $(pwd)/build:/usr/src/app/build ipfs-companion yarn ci:build",
"release-build": "docker build -t ipfs-companion . && docker run -it -e RELEASE_CHANNEL=stable -v $(pwd)/build:/usr/src/app/build ipfs-companion yarn ci:build",
"dev-build": "npx yarn@1.9.4 && npx yarn@1.9.4 build",
"dev-build": "npx yarn@1.10.1 && npx yarn@1.10.1 build",
"yarn-build": "run-s dev-build"
},
"private": true,
Expand All @@ -69,17 +69,17 @@
"uglify-es": "npm:terser"
},
"devDependencies": {
"@babel/core": "7.0.0",
"@babel/preset-env": "7.0.0",
"babel-loader": "8.0.0",
"@babel/core": "7.1.2",
"@babel/preset-env": "7.1.0",
"babel-loader": "8.0.4",
"babel-plugin-syntax-async-generators": "6.13.0",
"chai": "4.1.2",
"chai": "4.2.0",
"cross-env": "5.2.0",
"download-cli": "1.1.1",
"fakefile": "0.0.9",
"fs-promise": "2.0.3",
"get-firefox": "2.2.0",
"husky": "0.14.3",
"get-firefox": "2.2.1",
"husky": "1.1.0",
"ignore-styles": "5.0.1",
"json": "9.0.6",
"mem-storage-area": "1.0.3",
Expand All @@ -91,16 +91,16 @@
"request-progress": "3.0.0",
"shx": "0.3.2",
"simple-progress-webpack-plugin": "1.1.2",
"sinon": "6.1.5",
"sinon": "6.3.5",
"sinon-chrome": "2.3.2",
"standard": "12.0.1",
"tar": "4.4.6",
"terser": "3.8.2",
"terser": "3.9.2",
"transform-loader": "0.2.4",
"web-ext": "2.9.1",
"webpack": "4.17.1",
"webpack-bundle-analyzer": "2.13.1",
"webpack-cli": "3.1.0",
"webpack": "4.20.2",
"webpack-bundle-analyzer": "3.0.2",
"webpack-cli": "3.1.2",
"webpack-merge": "4.1.4"
},
"dependencies": {
Expand All @@ -109,12 +109,12 @@
"drag-and-drop-files": "0.0.1",
"file-type": "9.0.0",
"filesize": "3.6.1",
"ipfs": "0.31.7",
"ipfs-api": "24.0.1",
"ipfs-css": "0.8.0",
"ipfs-http-response": "0.1.4",
"ipfs": "0.32.3",
"ipfs-api": "24.0.2",
"ipfs-css": "0.11.0",
"ipfs-http-response": "0.2.0",
"ipfs-postmsg-proxy": "3.1.1",
"is-ipfs": "0.4.2",
"is-ipfs": "0.4.7",
"is-svg": "3.0.0",
"lru-cache": "4.1.3",
"mime-types": "2.1.20",
Expand Down
Loading

0 comments on commit a4dc33b

Please sign in to comment.