Skip to content

Commit

Permalink
Upgrade to React 15
Browse files Browse the repository at this point in the history
  • Loading branch information
denis-sokolov committed Jun 9, 2017
1 parent 5f0210b commit f0ddc0a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion client/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ webpackConfig = module.exports = {
},
module: {
loaders: [
{ test: require.resolve("react/addons"), loader: "expose-loader?React" },
{ test: /\.js(x?)$/, include: [/lib/, /client/], exclude: [/node_modules/], loaders: JSX_WITH_HOT_LOEADERS },
{ test: /\.jpg$/, loader: "file-loader" },
{ test: /\.png$/, loader: "url-loader?prefix=/public/&limit=10000&mimetype=image/png"},
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"html-webpack-plugin": "^1.6.1",
"jest-cli": "^0.1.18",
"nib": "^1.1.0",
"react": "^0.14.0-rc1",
"react-dom": "^0.14.0-rc1",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"react-hot-loader": "^1.3.0",
"run-sequence": "^1.0.2",
"style-loader": "^0.12.4",
Expand All @@ -55,7 +55,7 @@
"webpack-dev-server": "^1.6.5"
},
"peerDependencies": {
"react": "^0.14.0-rc1",
"react-dom": "^0.14.0-rc1"
"react": "^15.0.0",
"react-dom": "^15.0.0"
}
}

0 comments on commit f0ddc0a

Please sign in to comment.