diff --git a/webpack/dev.babel.js b/webpack/dev.babel.js index ef2a39f5..21e25db7 100644 --- a/webpack/dev.babel.js +++ b/webpack/dev.babel.js @@ -1,4 +1,5 @@ import webpack from 'webpack'; +import path from 'path'; import GitRevisionPlugin from 'git-revision-webpack-plugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; import WebpackBuildNotifierPlugin from 'webpack-build-notifier'; @@ -86,6 +87,7 @@ module.exports = { resolve: { alias: { public: PUBLIC, + react: path.resolve('./node_modules/react'), }, modules: [SRC, 'node_modules'], symlinks: false, diff --git a/yarn.lock b/yarn.lock index f5c4b767..9780960c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9109,16 +9109,7 @@ react-base16-styling@^0.6.0: lodash.flow "^3.3.0" pure-color "^1.2.0" -"react-dom@^15.4.2 || ^16.0.0": - version "16.2.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" - dependencies: - fbjs "^0.8.16" - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.0" - -react-dom@^16.8.6: +react-dom@16.8.6: version "16.8.6" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f" integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA== @@ -9128,6 +9119,15 @@ react-dom@^16.8.6: prop-types "^15.6.2" scheduler "^0.13.6" +"react-dom@^15.4.2 || ^16.0.0": + version "16.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.0" + react-hot-loader@^4.8.4: version "4.8.4" resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.8.4.tgz#357ba342e367fd42d6a870a9c0601c23fa0730c6" @@ -9325,16 +9325,7 @@ react-window@^1.7.1: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -"react@^15.4.2 || ^16.0.0": - version "16.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" - dependencies: - fbjs "^0.8.16" - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.0" - -react@^16.8.6: +react@16.8.6: version "16.8.6" resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe" integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw== @@ -9344,6 +9335,15 @@ react@^16.8.6: prop-types "^15.6.2" scheduler "^0.13.6" +"react@^15.4.2 || ^16.0.0": + version "16.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.0" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"