diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-03-12 22:50:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 22:50:55 +0800 |
| commit | b7c7083a112ea6908e8c5990886ab388200a51f4 (patch) | |
| tree | bf7e0f880b5a3ce32cd0b0e680f62e0f5068df8d /package.json | |
| parent | 174f57b4646b3d320850c6286189a146cf0e23b0 (diff) | |
| parent | ddc85354d3df508cbecc016fc0213a6560d885e1 (diff) | |
| download | tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.tar tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.tar.gz tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.tar.bz2 tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.tar.lz tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.tar.xz tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.tar.zst tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.zip | |
Merge branch 'master' into i18n
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package.json b/package.json index de3d559c7..c5d9d3c45 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "test": "npm run lint && npm run test:coverage && npm run test:integration", "test:unit": "METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"", "test:single": "METAMASK_ENV=test mocha --require test/helper.js", - "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara", + "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara", + "test:integration:build": "gulp build:scss", "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload", "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi", "test:flat": "npm run test:flat:build && karma start test/flat.conf.js", @@ -105,7 +106,7 @@ "fast-levenshtein": "^2.0.6", "fuse.js": "^3.2.0", "gulp": "github:gulpjs/gulp#4.0", - "gulp-autoprefixer": "^4.0.0", + "gulp-autoprefixer": "^5.0.0", "gulp-eslint": "^4.0.0", "gulp-sass": "^3.1.0", "hat": "0.0.3", @@ -125,7 +126,6 @@ "loglevel": "^1.4.1", "metamascara": "^2.0.0", "metamask-logo": "^2.1.2", - "mississippi": "^1.2.0", "mkdirp": "^0.5.1", "multiplex": "^6.7.0", "number-to-bn": "^1.7.0", @@ -139,7 +139,7 @@ "post-message-stream": "^3.0.0", "promise-filter": "^1.1.0", "promise-to-callback": "^1.0.0", - "pump": "^1.0.2", + "pump": "^3.0.0", "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", "ramda": "^0.24.1", @@ -189,7 +189,7 @@ "babelify": "^8.0.0", "beefy": "^2.1.5", "brfs": "^1.4.3", - "browserify": "^14.4.0", + "browserify": "^16.1.1", "chai": "^4.1.0", "compression": "^1.7.1", "coveralls": "^3.0.0", @@ -212,7 +212,7 @@ "gulp-replace": "^0.6.1", "gulp-sourcemaps": "^2.6.0", "gulp-stylefmt": "^1.1.0", - "gulp-stylelint": "^4.0.0", + "gulp-stylelint": "^7.0.0", "gulp-uglify": "^3.0.0", "gulp-uglify-es": "^1.0.1", "gulp-util": "^3.0.7", @@ -222,7 +222,7 @@ "jsdom": "^11.1.0", "jsdom-global": "^3.0.2", "jshint-stylish": "~2.2.1", - "karma": "^1.7.1", + "karma": "^2.0.0", "karma-chrome-launcher": "^2.2.0", "karma-cli": "^1.0.1", "karma-firefox-launcher": "^1.0.1", @@ -244,7 +244,7 @@ "react-testutils-additions": "^15.2.0", "redux-test-utils": "^0.2.2", "sinon": "^4.0.0", - "stylelint-config-standard": "^17.0.0", + "stylelint-config-standard": "^18.2.0", "tape": "^4.5.1", "testem": "^2.0.0", "uglifyify": "^4.0.2", |