diff options
| author | Thomas <tmashuang@gmail.com> | 2018-03-22 03:28:03 +0800 |
|---|---|---|
| committer | Thomas <tmashuang@gmail.com> | 2018-03-22 03:28:03 +0800 |
| commit | 775275e1387c140fabb3ddbef5544af0dcbc4df0 (patch) | |
| tree | 85a4973cf35b026b66d133a54cd42fe024d27944 | |
| parent | d646f377416ea6bfcd7682d21e011be5fa65cd3f (diff) | |
| parent | 5f4e96752a97db2fd828caf89edec17f79b67be0 (diff) | |
| download | tangerine-wallet-browser-775275e1387c140fabb3ddbef5544af0dcbc4df0.tar.gz tangerine-wallet-browser-775275e1387c140fabb3ddbef5544af0dcbc4df0.tar.zst tangerine-wallet-browser-775275e1387c140fabb3ddbef5544af0dcbc4df0.zip | |
Merge branch 'master' into selenium-e2e
| -rw-r--r-- | gulpfile.js | 6 | ||||
| -rw-r--r-- | package.json | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/gulpfile.js b/gulpfile.js index dbbb1e4ff..adfb148a9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -408,11 +408,7 @@ function bundleTask(opts) { .pipe(gulpif(debug, sourcemaps.init({ loadMaps: true }))) // Minification .pipe(gulpif(opts.isBuild, uglify({ - mangle: { reserved: [ 'MetamaskInpageProvider' ] }, - }))) - // Transpile to ES5 - .pipe(gulpif(opts.isBuild, babel({ - presets: ['env'] + mangle: { reserved: [ 'MetamaskInpageProvider' ] }, }))) // writes .map file .pipe(gulpif(debug, sourcemaps.write('./'))) diff --git a/package.json b/package.json index bd25111b5..9573d39ba 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,9 @@ "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 && npm run test:es5", + "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:es5": "es-check es5 ./dist/**/*.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", @@ -203,7 +202,6 @@ "envify": "^4.0.0", "enzyme": "^3.3.0", "enzyme-adapter-react-15": "^1.0.5", - "es-check": "^2.0.2", "eslint-plugin-chai": "0.0.1", "eslint-plugin-mocha": "^4.9.0", "eslint-plugin-react": "^7.4.0", |