diff --git a/package.json b/package.json index ea97819..fbaec2a 100644 --- a/package.json +++ b/package.json @@ -35,31 +35,31 @@ "graph" ], "devDependencies": { - "babel-cli": "^6.18.0", + "babel-cli": "^6.26.0", "babel-core": "^6.24.0", - "babel-loader": "^6.2.10", - "babel-preset-es2015": "^6.18.0", - "babel-preset-react": "^6.16.0", - "babel-preset-stage-2": "^6.18.0", - "create-react-class": "^15.5.2", - "exports-loader": "^0.6.2", - "file-loader": "^0.10.1", - "highlight.js": "^9.10.0", + "babel-loader": "^7.1.2", + "babel-preset-env": "^1.6.1", + "babel-preset-react": "^6.24.1", + "babel-preset-stage-2": "^6.24.1", + "create-react-class": "^15.6.2", + "exports-loader": "^0.6.4", + "file-loader": "^1.1.6", + "highlight.js": "^9.12.0", "imports-loader": "^0.7.1", - "jsdom": "^9.9.1", - "mocha": "^3.2.0", - "mock-require": "^2.0.1", - "nightwatch": "^0.9.6", - "prop-types": "^15.5.8", + "jsdom": "^11.5.1", + "mocha": "^4.1.0", + "mock-require": "^2.0.2", + "nightwatch": "^0.9.19", + "prop-types": "^15.6.0", "raw-loader": "^0.5.1", - "react": "^15.5.4", - "react-dom": "^15.5.4", - "react-highlight": "^0.9.0", - "sinon": "^2.0.0", - "webpack": "^2.2.1", - "webpack-dev-server": "^2.4.2" + "react": "^16.2.0", + "react-dom": "^16.2.0", + "react-highlight": "^0.10.0", + "sinon": "^4.1.3", + "webpack": "^3.10.0", + "webpack-dev-server": "^2.9.6" }, "dependencies": { - "highcharts": "^6.0.0" + "highcharts": "^6.0.4" } } diff --git a/test/unit/simulateDOM.js b/test/unit/simulateDOM.js index ba50631..57d5fb4 100644 --- a/test/unit/simulateDOM.js +++ b/test/unit/simulateDOM.js @@ -13,9 +13,9 @@ */ var jsdom = require('jsdom'); - -global.document = jsdom.jsdom('
'); -var win = global.document.defaultView; +const {JSDOM} = jsdom; +const {document} = (new JSDOM('
')).window; +var win = document.defaultView; global.window = global; for( var i in win ){ if( i !== 'window' && win.hasOwnProperty(i)){ diff --git a/webpack.config.js b/webpack.config.js index 9ecf880..a7f7041 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -74,15 +74,13 @@ module.exports = function (env) { rules: [ { test: /\.jsx$/, - use: [{ + + use: { loader: 'babel-loader', - query: { - cacheDirectory: true, - presets: ['react', 'es2015', 'stage-2'] + options: { + presets: ['env', 'react', 'stage-2'], } - }], - - + } } ] },