diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 07:18:48 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 07:18:48 +0800 |
| commit | ba23843f91ca5046400cea14cea4c0d256578fec (patch) | |
| tree | e29ef2a930930d4256bd7f59aa3d0274563bc4cf /package.json | |
| parent | bdc4a6964ae83faa8229c50870e3bcc9b9074989 (diff) | |
| parent | 8e0f39353dd47c4a201aaf2ee160912846f2e68b (diff) | |
| download | tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar.gz tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar.bz2 tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar.lz tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar.xz tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar.zst tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.zip | |
Fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/package.json b/package.json index a0408213b..92f43337b 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,9 @@ "public": false, "private": true, "scripts": { - "start": "npm run dev", - "dev": "gulp dev --debug", - "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 && 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", + "start": "gulp dev:extension", + "mascara": "gulp dev:mascara & cross-env METAMASK_DEBUG=true node ./mascara/example/server", + "dist": "gulp dist", "test": "npm run test:unit && npm run test:integration && npm run lint", "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", @@ -41,6 +36,9 @@ "sentry:upload:maps": "sentry-cli releases --org 'metamask' --project 'metamask' files $RELEASE upload-sourcemaps ./dist/sourcemaps/ --url-prefix 'sourcemaps' --rewrite", "lint": "gulp lint", "lint:fix": "gulp lint:fix", + "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\"", "disc": "gulp disc --debug", "announce": "node development/announcer.js", "version:bump": "node development/run-version-bump.js", @@ -78,7 +76,6 @@ "browserify-derequire": "^0.9.4", "browserify-unibabel": "^3.0.0", "classnames": "^2.2.5", - "client-sw-ready-event": "^3.3.0", "clone": "^2.1.1", "copy-to-clipboard": "^3.0.8", "debounce": "^1.0.0", @@ -118,6 +115,7 @@ "fuse.js": "^3.2.0", "gulp": "github:gulpjs/gulp#4.0", "gulp-autoprefixer": "^5.0.0", + "gulp-debug": "^3.2.0", "gulp-eslint": "^4.0.0", "gulp-sass": "^3.1.0", "hat": "0.0.3", @@ -182,7 +180,8 @@ "semaphore": "^1.0.5", "semver": "^5.4.1", "shallow-copy": "0.0.1", - "sw-stream": "^2.0.0", + "sw-controller": "^1.0.3", + "sw-stream": "^2.0.2", "textarea-caret": "^3.0.1", "through2": "^2.0.3", "valid-url": "^1.0.9", @@ -260,8 +259,8 @@ "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.6.2", "react-testutils-additions": "^15.2.0", - "selenium-webdriver": "^3.5.0", "redux-test-utils": "^0.2.2", + "selenium-webdriver": "^3.5.0", "sinon": "^5.0.0", "stylelint-config-standard": "^18.2.0", "tape": "^4.5.1", |