From b4a686a5c686de76c9cc8787f1aa4b825c645b9d Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 9 Mar 2018 11:51:03 -0800 Subject: deps - bump pump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index fd2554f73..70537c12c 100644 --- a/package.json +++ b/package.json @@ -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", -- cgit From c4f697d87f1a2dabd695472f23cd2b08fca1d086 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 6 Mar 2018 16:57:10 +0000 Subject: chore(package): update browserify to version 16.1.1 Closes #2861 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 70537c12c..ac7ba2cc3 100644 --- a/package.json +++ b/package.json @@ -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", -- cgit From 85d48b4fb71b03d20b906a194da5797e271366a2 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 9 Mar 2018 11:53:44 -0800 Subject: deps - remove unused missippi dep --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index ac7ba2cc3..034a22e63 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,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", -- cgit From c05b220024b002cf3e5a5e2802ae613c75ad564f Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 28 Feb 2018 09:34:06 +0000 Subject: fix(package): update gulp-autoprefixer to version 5.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 034a22e63..4e8ee99dd 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,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", -- cgit From 16050f4aeb5d7cc1842bef28af0f37990a212fde Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 1 Mar 2018 14:27:13 +0000 Subject: chore(package): update stylelint-config-standard to version 18.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 4e8ee99dd..7ebe77bfd 100644 --- a/package.json +++ b/package.json @@ -243,7 +243,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", -- cgit From ce139db99b842c0c69706c849760e2a40b6a2d63 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sat, 3 Mar 2018 15:19:16 +0000 Subject: chore(package): update gulp-stylelint to version 7.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7ebe77bfd..7a7a62277 100644 --- a/package.json +++ b/package.json @@ -211,7 +211,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", -- cgit From 35801966508355d4aaf819d9bbf2c570a2a445f3 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 9 Mar 2018 13:48:48 -0800 Subject: test - breakout npm script for building for integration tests --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index fd2554f73..e5efe6ef5 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", -- cgit From 0e28e8fa3dff1b97751d34c0d76d069a0b1f4298 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 14 Mar 2018 00:15:19 +1100 Subject: Moved mock-dev.js and ui-dev.js to development folder. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index c5d9d3c45..8921cc1b4 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "scripts": { "start": "npm run dev", "dev": "gulp dev --debug", - "ui": "npm run test:flat:build:states && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", - "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", + "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", + "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", "mascara": "gulp build && METAMASK_DEBUG=true node ./mascara/example/server", "dist": "npm run dist:clear && npm install && gulp dist", @@ -23,7 +23,7 @@ "test:flat:build": "npm run test:flat:build:ui && npm run test:flat:build:tests", "test:flat:build:tests": "node test/integration/index.js", "test:flat:build:states": "node development/genStates.js", - "test:flat:build:ui": "npm run test:flat:build:states && browserify ./mock-dev.js -o ./development/bundle.js", + "test:flat:build:ui": "npm run test:flat:build:states && browserify ./development/mock-dev.js -o ./development/bundle.js", "test:mascara": "npm run test:mascara:build && karma start test/mascara.conf.js", "test:mascara:build": "mkdir -p dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests", "test:mascara:build:ui": "browserify mascara/test/test-ui.js -o dist/mascara/ui.js", -- cgit From af4116cf398ee6864b714c304b07e4ef14b371a4 Mon Sep 17 00:00:00 2001 From: Lazaridis Date: Tue, 13 Mar 2018 13:38:05 +0200 Subject: use 'cross-env' for env-variables within npm scripts, re #3426 --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8921cc1b4..a80b7e28e 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,12 @@ "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", - "mascara": "gulp build && METAMASK_DEBUG=true node ./mascara/example/server", + "mascara": "gulp build && cross-env METAMASK_DEBUG=true node ./mascara/example/server", "dist": "npm run dist:clear && npm install && gulp dist", "dist:clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect", "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:unit": "cross-env METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"", + "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js", "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", @@ -193,6 +193,7 @@ "chai": "^4.1.0", "compression": "^1.7.1", "coveralls": "^3.0.0", + "cross-env": "^5.1.4", "deep-freeze-strict": "^1.1.1", "del": "^3.0.0", "envify": "^4.0.0", -- cgit