diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-03-14 02:41:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-14 02:41:13 +0800 |
| commit | 239d7106abe39b3a16871442b30edeac54b1bef4 (patch) | |
| tree | eb7c1060c9e3210db85924bcb58fcae6f625d818 | |
| parent | 15722b4e6c5610e2eb4a59683e5cd3cb3fe8b3f7 (diff) | |
| parent | 9378ac5d6269b6930092a5c49146343504ecb524 (diff) | |
| download | tangerine-wallet-browser-239d7106abe39b3a16871442b30edeac54b1bef4.tar tangerine-wallet-browser-239d7106abe39b3a16871442b30edeac54b1bef4.tar.gz tangerine-wallet-browser-239d7106abe39b3a16871442b30edeac54b1bef4.tar.bz2 tangerine-wallet-browser-239d7106abe39b3a16871442b30edeac54b1bef4.tar.lz tangerine-wallet-browser-239d7106abe39b3a16871442b30edeac54b1bef4.tar.xz tangerine-wallet-browser-239d7106abe39b3a16871442b30edeac54b1bef4.tar.zst tangerine-wallet-browser-239d7106abe39b3a16871442b30edeac54b1bef4.zip | |
Merge pull request #3538 from MetaMask/lazaridiscom-patch-1
cross platform - use 'cross-env' for env-variables within npm scripts
| -rw-r--r-- | package-lock.json | 10 | ||||
| -rw-r--r-- | package.json | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/package-lock.json b/package-lock.json index 55fa5c838..bd3026816 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3611,6 +3611,16 @@ "object-assign": "4.1.1" } }, + "cross-env": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.4.tgz", + "integrity": "sha512-Mx8mw6JWhfpYoEk7PGvHxJMLQwQHORAs8+2bX+C1lGQ4h3GkDb1zbzC2Nw85YH9ZQMlO0BHZxMacgrfPmMFxbg==", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "is-windows": "1.0.2" + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", 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", |