Skip to content

Commit 44a73aa

Browse files
nndiozalmoxisus
nndio
authored and
zalmoxisus
committed
Update examples (#621)
1 parent bd0cd29 commit 44a73aa

File tree

27 files changed

+111
-238
lines changed

27 files changed

+111
-238
lines changed

‎examples/counter/.babelrc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"presets": [ "es2015", "stage-0", "react" ],
3-
"plugins": [ "add-module-exports", "transform-decorators-legacy" ]
2+
"presets": [ "es2015", "stage-0", "react" ]
43
}

‎examples/counter/components/Counter.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { Component } from 'react';
22
import PropTypes from 'prop-types';
3-
import { isMonitorAction } from '../store/configureStore';
43

54
class Counter extends Component {
65
render() {

‎examples/counter/package.json‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,25 @@
1717
},
1818
"homepage": "http://rackt.github.io/redux",
1919
"dependencies": {
20-
"prop-types": "^15.5.8",
21-
"react": "^15.5.4",
22-
"react-dom": "^15.5.4",
23-
"react-redux": "^4.4.5",
24-
"redux": "^3.5.2",
25-
"redux-devtools-extension": "^1.0.0",
26-
"redux-thunk": "^2.1.0"
20+
"prop-types": "^15.6.2",
21+
"react": "^16.7.0",
22+
"react-dom": "^16.7.0",
23+
"react-redux": "^6.0.0",
24+
"redux": "^4.0.1",
25+
"redux-devtools-extension": "^2.13.7",
26+
"redux-thunk": "^2.3.0"
2727
},
2828
"devDependencies": {
29-
"babel-core": "^6.3.15",
30-
"babel-loader": "^6.2.0",
31-
"babel-plugin-add-module-exports": "^0.1.1",
32-
"babel-plugin-react-transform": "^2.0.0",
33-
"babel-plugin-transform-decorators-legacy": "^1.2.0",
34-
"babel-polyfill": "^6.3.14",
35-
"babel-preset-es2015": "^6.3.13",
36-
"babel-preset-react": "^6.3.13",
37-
"babel-preset-react-hmre": "^1.0.1",
29+
"babel-cli": "^6.3.17",
30+
"babel-core": "^6.3.17",
31+
"babel-loader": "^7.0.0",
32+
"babel-preset-es2015": "^6.0.0",
33+
"babel-preset-react": "6.3.13",
3834
"babel-preset-stage-0": "^6.3.13",
39-
"expect": "^1.6.0",
4035
"express": "^4.13.3",
41-
"jsdom": "^5.6.1",
42-
"mocha": "^2.2.5",
43-
"node-libs-browser": "^0.5.2",
44-
"react-addons-test-utils": "^15.1.0",
45-
"react-transform-hmr": "^1.0.0",
46-
"redux-immutable-state-invariant": "^1.1.1",
47-
"webpack": "^1.13.1",
48-
"webpack-dev-middleware": "^1.2.0",
36+
"redux-immutable-state-invariant": "^2.1.0",
37+
"webpack": "^4.0.0",
38+
"webpack-dev-server": "^3.0.0",
4939
"webpack-hot-middleware": "^2.2.0"
5040
}
5141
}

‎examples/counter/store/configureStore.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import invariant from 'redux-immutable-state-invariant';
55
import reducer from '../reducers';
66
import * as actionCreators from '../actions/counter';
77

8-
export let isMonitorAction;
98
export default function configureStore(preloadedState) {
109
const composeEnhancers = composeWithDevTools({ actionCreators, trace: true, traceLimit: 25 });
1110
const store = createStore(reducer, preloadedState, composeEnhancers(
@@ -15,8 +14,7 @@ export default function configureStore(preloadedState) {
1514
if (module.hot) {
1615
// Enable Webpack hot module replacement for reducers
1716
module.hot.accept('../reducers', () => {
18-
const nextReducer = require('../reducers');
19-
store.replaceReducer(nextReducer);
17+
store.replaceReducer(require('../reducers').default)
2018
});
2119
}
2220

‎examples/counter/webpack.config.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var path = require('path');
22
var webpack = require('webpack');
33

44
module.exports = {
5+
mode: 'development',
56
devtool: 'source-map',
67
entry: [
78
'webpack-hot-middleware/client',
@@ -13,16 +14,13 @@ module.exports = {
1314
publicPath: '/static/'
1415
},
1516
plugins: [
16-
new webpack.optimize.OccurenceOrderPlugin(),
17-
new webpack.HotModuleReplacementPlugin(),
18-
new webpack.NoErrorsPlugin()
17+
new webpack.HotModuleReplacementPlugin()
1918
],
2019
module: {
21-
loaders: [{
20+
rules: [{
2221
test: /\.js$/,
23-
loaders: ['babel'],
24-
exclude: /node_modules/,
25-
include: __dirname
22+
loaders: ['babel-loader'],
23+
exclude: /node_modules/
2624
}]
2725
}
2826
};

‎examples/react-counter-messaging/.babelrc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"presets": [ "es2015", "stage-0", "react" ],
3-
"plugins": [ "add-module-exports", "transform-decorators-legacy" ]
2+
"presets": [ "es2015", "stage-0", "react" ]
43
}

‎examples/react-counter-messaging/components/Counter.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
22

33
const withDevTools = (
44
// process.env.NODE_ENV === 'development' &&
5-
typeof window !== 'undefined' && window.devToolsExtension
5+
typeof window !== 'undefined' && window.__REDUX_DEVTOOLS_EXTENSION__
66
);
77

88
class Counter extends Component {
@@ -16,7 +16,7 @@ class Counter extends Component {
1616

1717
componentWillMount() {
1818
if (withDevTools) {
19-
this.devTools = window.devToolsExtension.connect();
19+
this.devTools = window.__REDUX_DEVTOOLS_EXTENSION__.connect();
2020
this.unsubscribe = this.devTools.subscribe((message) => {
2121
// Implement monitors actions.
2222
// For example time traveling:
@@ -30,7 +30,7 @@ class Counter extends Component {
3030
componentWillUnmount() {
3131
if (withDevTools) {
3232
this.unsubscribe(); // Use if you have other subscribers from other components.
33-
window.devToolsExtension.disconnect(); // If there aren't other subscribers.
33+
window.__REDUX_DEVTOOLS_EXTENSION__.disconnect(); // If there aren't other subscribers.
3434
}
3535
}
3636

‎examples/react-counter-messaging/package.json‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"description": "React counter example",
55
"scripts": {
6-
"start": "node server.js"
6+
"start": "webpack-dev-server --progress"
77
},
88
"repository": {
99
"type": "git",
@@ -15,29 +15,19 @@
1515
},
1616
"homepage": "https://github.com/zalmoxisus/redux-devtools-extension",
1717
"dependencies": {
18-
"react": "^15.1.0",
19-
"react-dom": "^15.1.0"
18+
"react": "^16.0.0",
19+
"react-dom": "^16.0.0"
2020
},
2121
"devDependencies": {
22-
"babel-core": "^6.3.15",
23-
"babel-loader": "^6.2.0",
24-
"babel-plugin-add-module-exports": "^0.1.1",
25-
"babel-plugin-react-transform": "^2.0.0",
26-
"babel-plugin-transform-decorators-legacy": "^1.2.0",
27-
"babel-polyfill": "^6.3.14",
28-
"babel-preset-es2015": "^6.3.13",
29-
"babel-preset-react": "^6.3.13",
30-
"babel-preset-react-hmre": "^1.0.1",
22+
"babel-cli": "^6.3.17",
23+
"babel-core": "^6.3.17",
24+
"babel-loader": "^7.0.0",
25+
"babel-preset-es2015": "^6.0.0",
26+
"babel-preset-react": "6.3.13",
3127
"babel-preset-stage-0": "^6.3.13",
32-
"expect": "^1.6.0",
33-
"express": "^4.13.3",
34-
"jsdom": "^5.6.1",
35-
"mocha": "^2.2.5",
36-
"node-libs-browser": "^0.5.2",
37-
"react-addons-test-utils": "^15.1.0",
38-
"react-transform-hmr": "^1.0.0",
39-
"webpack": "^1.13.1",
40-
"webpack-dev-middleware": "^1.2.0",
28+
"webpack": "^4.0.0",
29+
"webpack-cli": "^3.2.0",
30+
"webpack-dev-server": "^3.0.0",
4131
"webpack-hot-middleware": "^2.2.0"
4232
}
4333
}

‎examples/react-counter-messaging/server.js‎

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

‎examples/react-counter-messaging/webpack.config.js‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,24 @@ var path = require('path');
22
var webpack = require('webpack');
33

44
module.exports = {
5-
devtool: 'cheap-module-eval-source-map',
5+
mode: 'development',
6+
devtool: 'source-map',
67
entry: [
7-
'webpack-hot-middleware/client',
88
'./index'
99
],
1010
output: {
1111
path: path.join(__dirname, 'dist'),
1212
filename: 'bundle.js',
1313
publicPath: '/static/'
1414
},
15-
plugins: [
16-
new webpack.optimize.OccurenceOrderPlugin(),
17-
new webpack.HotModuleReplacementPlugin(),
18-
new webpack.NoErrorsPlugin()
19-
],
2015
module: {
21-
loaders: [{
16+
rules: [{
2217
test: /\.js$/,
23-
loaders: ['babel'],
24-
exclude: /node_modules/,
25-
include: __dirname
18+
loaders: ['babel-loader'],
19+
exclude: /node_modules/
2620
}]
21+
},
22+
devServer: {
23+
port: 4004
2724
}
2825
};

0 commit comments

Comments
 (0)