update version modules in package.json. Edit config babel-loader in webpack.config.js for compatibility with the latest stable version. Fix code in test/unit/simulateDOM.js

ilyjs · ilyjs · commit 096f0d27d5d0 · 2018-01-05T03:36:36.000+03:00
diff --git a/package.json b/package.json
@@ -24,8 +24,8 @@
     "url": "https://github.com/kirjs/react-highcharts"
   },
   "peerDependencies": {
-    "react": "~0.14 || ^15.0.0 || ^16.0.0",
-    "react-dom": "~0.14 || ^15.0.0 || ^16.0.0"
+    "react": "~0.14 || ^15.0.0 || ^16.2.0",
+    "react-dom": "~0.14 || ^15.0.0 || ^16.2.0"
   },
   "bugs": "https://github.com/kirjs/react-highcharts/issues",
   "keywords": [
@@ -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
@@ -13,9 +13,9 @@
  */
 
 var jsdom = require('jsdom');
-
-global.document = jsdom.jsdom('<!doctype html><html><body><div id="test"></div></body></html>');
-var win = global.document.defaultView;
+const {JSDOM} = jsdom;
+const {document} = (new JSDOM('<!doctype html><html><body><div id="test"></div></body></html>')).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
@@ -84,15 +84,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'],
                         }
-                    }],
-
-
+                    }
                 }
             ]
         },

Original file line number	Diff line number	Diff line change
`@@ -84,15 +84,13 @@ module.exports = function (env) {`
`84`	`84`	`rules: [`
`85`	`85`	`{`
`86`	`86`	`test: /\.jsx$/,`
`87`		`- use: [{`
	`87`	`+`
	`88`	`+ use: {`
`88`	`89`	`loader: 'babel-loader',`
`89`		`- query: {`
`90`		`- cacheDirectory: true,`
`91`		`- presets: ['react', 'es2015', 'stage-2']`
	`90`	`+ options: {`
	`91`	`+ presets: ['env', 'react', 'stage-2'],`
`92`	`92`	`}`
`93`		`- }],`
`94`		`-`
`95`		`-`
	`93`	`+ }`
`96`	`94`	`}`
`97`	`95`	`]`
`98`	`96`	`},`