Skip to content

Commit 628f46a

Browse files
committed
Modernize counter example setup
1 parent 7387504 commit 628f46a

File tree

14 files changed

+82
-77
lines changed

14 files changed

+82
-77
lines changed

examples/counter/.babelrc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
{
2-
"presets": ["es2015", "react"],
3-
"env": {
4-
"development": {
5-
"presets": ["react-hmre"]
6-
}
7-
}
2+
"presets": ["es2015-webpack", "react"],
3+
"plugins": ["transform-object-rest-spread"]
84
}

examples/counter/index.html

Lines changed: 0 additions & 11 deletions
This file was deleted.

examples/counter/package.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"version": "0.0.0",
44
"description": "Redux counter example",
55
"scripts": {
6-
"start": "node server.js",
6+
"start": "node server.dev.js",
7+
"build": "webpack --config webpack.config.prod.js",
78
"test": "cross-env NODE_ENV=test mocha --recursive --compilers js:babel-register",
89
"test:watch": "npm test -- --watch"
910
},
@@ -25,19 +26,20 @@
2526
"devDependencies": {
2627
"babel-core": "^6.3.15",
2728
"babel-loader": "^6.2.0",
28-
"babel-preset-es2015": "^6.3.13",
29+
"babel-plugin-transform-object-rest-spread": "^6.8.0",
30+
"babel-preset-es2015-webpack": "^6.4.1",
2931
"babel-preset-react": "^6.3.13",
30-
"babel-preset-react-hmre": "^1.1.1",
3132
"babel-register": "^6.3.13",
3233
"cross-env": "^1.0.7",
3334
"enzyme": "^2.0.0",
3435
"expect": "^1.6.0",
3536
"express": "^4.13.3",
37+
"html-webpack-plugin": "^2.21.0",
3638
"mocha": "^2.2.5",
3739
"node-libs-browser": "^0.5.2",
3840
"react-addons-test-utils": "^0.14.7",
39-
"webpack": "^1.9.11",
40-
"webpack-dev-middleware": "^1.2.0",
41-
"webpack-hot-middleware": "^2.9.1"
41+
"webpack": "^2.1.0-beta.13",
42+
"webpack-dev-middleware": "^1.6.1",
43+
"webpack-hot-middleware": "^2.10.0"
4244
}
4345
}

examples/counter/server.dev.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
const webpack = require('webpack')
2+
const express = require('express')
3+
const webpackDevMiddleware = require('webpack-dev-middleware')
4+
const webpackHotMiddleware = require('webpack-hot-middleware')
5+
const config = require('./webpack.config.dev')
6+
7+
const app = express()
8+
const port = 3000
9+
const compiler = webpack(config)
10+
11+
app.use(webpackDevMiddleware(compiler, {
12+
noInfo: true,
13+
publicPath: config.output.publicPath
14+
}))
15+
app.use(webpackHotMiddleware(compiler))
16+
17+
app.listen(port, (error) => {
18+
if (error) {
19+
console.error(error)
20+
} else {
21+
console.info('🌎 Open http://localhost:%s/ in a web browser', port)
22+
}
23+
})

examples/counter/server.js

Lines changed: 0 additions & 23 deletions
This file was deleted.
File renamed without changes.

examples/counter/index.js renamed to examples/counter/src/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import { createStore } from 'redux'
44
import Counter from './components/Counter'
55
import counter from './reducers'
66

7+
const rootEl = document.createElement('div')
8+
document.body.appendChild(rootEl)
9+
710
const store = createStore(counter)
8-
const rootEl = document.getElementById('root')
911

1012
function render() {
1113
ReactDOM.render(
@@ -14,7 +16,7 @@ function render() {
1416
onIncrement={() => store.dispatch({ type: 'INCREMENT' })}
1517
onDecrement={() => store.dispatch({ type: 'DECREMENT' })}
1618
/>,
17-
rootEl
19+
rootEl
1820
)
1921
}
2022

File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)