diff --git a/misc b/misc index 3384cc9e..b7b444a1 100644 --- a/misc +++ b/misc @@ -35,19 +35,9 @@ git tag -a v6.6.2 0c0d1fb -m "ExtReact v6.6.2" git push upstream --tags -git checkout v6.6.0 - - - git fetch upstream git merge upstream/master -git merge upstream/ext-react-6.7.x -:ga! - - - -git merge upstream/ext-6.6.x - +git merge upstream/ext-react-7.0.x git remote add upstream https://github.com/sencha/guides.git diff --git a/packages/ext-react-modern-boilerplate/package.json b/packages/ext-react-modern-boilerplate/package.json index ae92033a..75dad162 100644 --- a/packages/ext-react-modern-boilerplate/package.json +++ b/packages/ext-react-modern-boilerplate/package.json @@ -34,6 +34,7 @@ "history": "~4.9.0", "prop-types": "~15.7.2", "react": "~16.8.6", + "react-dom": "16.8.6", "react-redux": "~7.1.0", "react-router-dom": "~5.0.1", "redux": "~4.0.4" @@ -54,7 +55,7 @@ "@babel/preset-react": "^7.0.0", "@sencha/ext-react-babel-plugin": "~7.0.0", "@sencha/ext-webpack-plugin": "~7.0.0", - + "babel-loader": "^8.0.6", "base-href-webpack-plugin": "~2.0.0", "copy-webpack-plugin": "^5.0.3",