diff --git a/package.json b/package.json index ec341261e34..f6097f38888 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@elastic/eui", "description": "Elastic UI Component Library", - "version": "0.0.14", + "version": "0.0.13", "main": "lib", "module": "src", "types": "src/index.d.ts", @@ -77,12 +77,12 @@ "postcss-loader": "^2.0.8", "pre-commit": "^1.2.2", "raw-loader": "^0.5.1", - "react": "^16.0.0", - "react-dom": "^16.0.0", + "react": "^16.2.0", + "react-dom": "^16.2.0", "react-redux": "^5.0.6", "react-router": "^3.2.0", "react-router-redux": "^4.0.8", - "react-test-renderer": "^16.0.0", + "react-test-renderer": "^16.2.0", "redux": "^3.7.2", "redux-thunk": "^2.2.0", "sass-loader": "^6.0.6", @@ -94,6 +94,65 @@ "yo": "^2.0.0" }, "peerDependencies": { - "react": "^16.0.0-rc || ^16.0" + "react": "^16.2.0 || ^16.2" + } +} + "autoprefixer": "7.1.5", + "babel-cli": "6.26.0", + "babel-eslint": "8.0.1", + "babel-jest": "21.0.0", + "babel-loader": "7.1.2", + "babel-plugin-add-module-exports": "0.2.1", + "babel-plugin-inline-react-svg": "0.5.2", + "babel-plugin-transform-async-generator-functions": "6.24.1", + "babel-plugin-transform-class-properties": "6.24.1", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-preset-env": "1.6.1", + "babel-preset-react": "6.24.1", + "chokidar": "1.7.0", + "css-loader": "0.28.7", + "enzyme": "3.1.0", + "enzyme-adapter-react-16": "1.0.2", + "enzyme-to-json": "3.1.4", + "eslint": "4.9.0", + "eslint-import-resolver-webpack": "0.8.3", + "eslint-plugin-babel": "4.1.2", + "eslint-plugin-import": "2.8.0", + "eslint-plugin-jsx-a11y": "6.0.2", + "eslint-plugin-mocha": "4.11.0", + "eslint-plugin-prefer-object-spread": "1.2.1", + "eslint-plugin-react": "7.4.0", + "file-loader": "1.1.5", + "html-loader": "0.5.1", + "html-webpack-plugin": "2.30.1", + "jest": "21.2.1", + "jest-cli": "21.2.1", + "lodash": "4.17.4", + "node-sass": "4.5.3", + "npm-run": "4.1.2", + "postcss-cli": "4.1.1", + "postcss-inline-svg": "3.0.0", + "postcss-loader": "2.0.8", + "pre-commit": "1.2.2", + "raw-loader": "0.5.1", + "react": "16.2.0", + "react-dom": "16.2.0", + "react-redux": "5.0.6", + "react-router": "3.2.0", + "react-router-redux": "4.0.8", + "react-test-renderer": "16.2.0", + "redux": "3.7.2", + "redux-thunk": "2.2.0", + "sass-loader": "6.0.6", + "sinon": "4.0.1", + "style-loader": "0.19.0", + "webpack": "3.8.1", + "webpack-dev-server": "2.9.2", + "yeoman-generator": "2.0.1", + "yo": "2.0.0" +>>>>>>> Upgrade react to 16.2.0. + }, + "peerDependencies": { + "react": "^16.2.0 || ^16.2" } } diff --git a/yarn.lock b/yarn.lock index d259e749e0a..f8faf3d3df7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6983,6 +6983,7 @@ react-ace@^5.5.0: lodash.isequal "^4.1.1" prop-types "^15.5.8" +<<<<<<< HEAD react-dom@^16.0.0: version "16.2.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" @@ -6995,6 +6996,11 @@ react-dom@^16.0.0: react-reconciler@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d" +======= +react-dom@16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" +>>>>>>> Upgrade react to 16.2.0. dependencies: fbjs "^0.8.16" loose-envify "^1.1.0" @@ -7028,7 +7034,11 @@ react-router@^3.2.0: prop-types "^15.5.6" warning "^3.0.0" +<<<<<<< HEAD react-test-renderer@^16.0.0: +======= +react-test-renderer@16.2.0: +>>>>>>> Upgrade react to 16.2.0. version "16.2.0" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211" dependencies: @@ -7043,7 +7053,11 @@ react-test-renderer@^16.0.0-0: fbjs "^0.8.16" object-assign "^4.1.1" +<<<<<<< HEAD react@^16.0.0: +======= +react@16.2.0: +>>>>>>> Upgrade react to 16.2.0. version "16.2.0" resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" dependencies: