diff --git a/.gitignore b/.gitignore index cc290b3..31289d6 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,7 @@ build/Release # Dependency directories node_modules jspm_packages +package-lock.json # Optional npm cache directory .npm diff --git a/karma.conf.js b/karma.conf.js index bd8bdea..75eae96 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -19,6 +19,18 @@ module.exports = function (config) { 'karma-firefox-launcher', 'karma-detect-browsers' ], + browserify: { + 'transform': [ + [ + 'babelify', + { + 'presets': [ + 'env' + ] + } + ] + ] + }, detectBrowsers: { enabled: true, usePhantomJS: false, diff --git a/package.json b/package.json index 06598e4..8c6fab0 100644 --- a/package.json +++ b/package.json @@ -12,18 +12,6 @@ "test:node": "node tests/index.js", "build:docs": "documentation build ./index.js --format md --shallow > ./docs/index.md && documentation build ./from-rpc.js --format md --shallow > ./docs/fromRpc.md" }, - "browserify": { - "transform": [ - [ - "babelify", - { - "presets": [ - "es2015" - ] - } - ] - ] - }, "repository": { "type": "git", "url": "git+https://github.com/ethereumjs/ethereumjs-block.git" @@ -46,20 +34,20 @@ "merkle-patricia-tree": "^2.1.2" }, "devDependencies": { - "babel-preset-es2015": "^6.24.0", - "babelify": "^7.3.0", - "browserify": "^13.0.0", + "babelify": "^8.0.0", + "babel-preset-env": "^1.6.1", + "browserify": "^15.0.0", "coveralls": "^2.11.6", "documentation": "4.0.0-beta16", "ethereumjs-testing": "~1.0.0", "istanbul": "^0.4.2", - "karma": "^1.3.0", + "karma": "^2.0.0", "karma-browserify": "^5.1.0", - "karma-chrome-launcher": "^2.0.0", - "karma-detect-browsers": "^2.2.1", + "karma-chrome-launcher": "^2.2.0", + "karma-detect-browsers": "^2.2.5", "karma-env-preprocessor": "^0.1.1", - "karma-firefox-launcher": "^1.0.0", - "karma-tap": "^3.1.0", + "karma-firefox-launcher": "^1.1.0", + "karma-tap": "^4.0.0", "standard": "^8.4.0", "tape": "^4.2.0" }