Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update examples #621

Merged
merged 1 commit into from
Jan 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions examples/counter/.babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"presets": [ "es2015", "stage-0", "react" ],
"plugins": [ "add-module-exports", "transform-decorators-legacy" ]
"presets": [ "es2015", "stage-0", "react" ]
}
1 change: 0 additions & 1 deletion examples/counter/components/Counter.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { isMonitorAction } from '../store/configureStore';

class Counter extends Component {
render() {
Expand Down
40 changes: 15 additions & 25 deletions examples/counter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,25 @@
},
"homepage": "http://rackt.github.io/redux",
"dependencies": {
"prop-types": "^15.5.8",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-redux": "^4.4.5",
"redux": "^3.5.2",
"redux-devtools-extension": "^1.0.0",
"redux-thunk": "^2.1.0"
"prop-types": "^15.6.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-redux": "^6.0.0",
"redux": "^4.0.1",
"redux-devtools-extension": "^2.13.7",
"redux-thunk": "^2.3.0"
},
"devDependencies": {
"babel-core": "^6.3.15",
"babel-loader": "^6.2.0",
"babel-plugin-add-module-exports": "^0.1.1",
"babel-plugin-react-transform": "^2.0.0",
"babel-plugin-transform-decorators-legacy": "^1.2.0",
"babel-polyfill": "^6.3.14",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-react-hmre": "^1.0.1",
"babel-cli": "^6.3.17",
"babel-core": "^6.3.17",
"babel-loader": "^7.0.0",
"babel-preset-es2015": "^6.0.0",
"babel-preset-react": "6.3.13",
"babel-preset-stage-0": "^6.3.13",
"expect": "^1.6.0",
"express": "^4.13.3",
"jsdom": "^5.6.1",
"mocha": "^2.2.5",
"node-libs-browser": "^0.5.2",
"react-addons-test-utils": "^15.1.0",
"react-transform-hmr": "^1.0.0",
"redux-immutable-state-invariant": "^1.1.1",
"webpack": "^1.13.1",
"webpack-dev-middleware": "^1.2.0",
"redux-immutable-state-invariant": "^2.1.0",
"webpack": "^4.0.0",
"webpack-dev-server": "^3.0.0",
"webpack-hot-middleware": "^2.2.0"
}
}
4 changes: 1 addition & 3 deletions examples/counter/store/configureStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import invariant from 'redux-immutable-state-invariant';
import reducer from '../reducers';
import * as actionCreators from '../actions/counter';

export let isMonitorAction;
export default function configureStore(preloadedState) {
const composeEnhancers = composeWithDevTools({ actionCreators, trace: true, traceLimit: 25 });
const store = createStore(reducer, preloadedState, composeEnhancers(
Expand All @@ -15,8 +14,7 @@ export default function configureStore(preloadedState) {
if (module.hot) {
// Enable Webpack hot module replacement for reducers
module.hot.accept('../reducers', () => {
const nextReducer = require('../reducers');
store.replaceReducer(nextReducer);
store.replaceReducer(require('../reducers').default)
});
}

Expand Down
12 changes: 5 additions & 7 deletions examples/counter/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ var path = require('path');
var webpack = require('webpack');

module.exports = {
mode: 'development',
devtool: 'source-map',
entry: [
'webpack-hot-middleware/client',
Expand All @@ -13,16 +14,13 @@ module.exports = {
publicPath: '/static/'
},
plugins: [
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin()
new webpack.HotModuleReplacementPlugin()
],
module: {
loaders: [{
rules: [{
test: /\.js$/,
loaders: ['babel'],
exclude: /node_modules/,
include: __dirname
loaders: ['babel-loader'],
exclude: /node_modules/
}]
}
};
3 changes: 1 addition & 2 deletions examples/react-counter-messaging/.babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"presets": [ "es2015", "stage-0", "react" ],
"plugins": [ "add-module-exports", "transform-decorators-legacy" ]
"presets": [ "es2015", "stage-0", "react" ]
}
8 changes: 4 additions & 4 deletions examples/react-counter-messaging/components/Counter.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';

const withDevTools = (
// process.env.NODE_ENV === 'development' &&
typeof window !== 'undefined' && window.devToolsExtension
typeof window !== 'undefined' && window.__REDUX_DEVTOOLS_EXTENSION__
);

class Counter extends Component {
Expand All @@ -16,7 +16,7 @@ class Counter extends Component {

componentWillMount() {
if (withDevTools) {
this.devTools = window.devToolsExtension.connect();
this.devTools = window.__REDUX_DEVTOOLS_EXTENSION__.connect();
this.unsubscribe = this.devTools.subscribe((message) => {
// Implement monitors actions.
// For example time traveling:
Expand All @@ -30,7 +30,7 @@ class Counter extends Component {
componentWillUnmount() {
if (withDevTools) {
this.unsubscribe(); // Use if you have other subscribers from other components.
window.devToolsExtension.disconnect(); // If there aren't other subscribers.
window.__REDUX_DEVTOOLS_EXTENSION__.disconnect(); // If there aren't other subscribers.
}
}

Expand Down
32 changes: 11 additions & 21 deletions examples/react-counter-messaging/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.0",
"description": "React counter example",
"scripts": {
"start": "node server.js"
"start": "webpack-dev-server --progress"
},
"repository": {
"type": "git",
Expand All @@ -15,29 +15,19 @@
},
"homepage": "https://github.com/zalmoxisus/redux-devtools-extension",
"dependencies": {
"react": "^15.1.0",
"react-dom": "^15.1.0"
"react": "^16.0.0",
"react-dom": "^16.0.0"
},
"devDependencies": {
"babel-core": "^6.3.15",
"babel-loader": "^6.2.0",
"babel-plugin-add-module-exports": "^0.1.1",
"babel-plugin-react-transform": "^2.0.0",
"babel-plugin-transform-decorators-legacy": "^1.2.0",
"babel-polyfill": "^6.3.14",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-react-hmre": "^1.0.1",
"babel-cli": "^6.3.17",
"babel-core": "^6.3.17",
"babel-loader": "^7.0.0",
"babel-preset-es2015": "^6.0.0",
"babel-preset-react": "6.3.13",
"babel-preset-stage-0": "^6.3.13",
"expect": "^1.6.0",
"express": "^4.13.3",
"jsdom": "^5.6.1",
"mocha": "^2.2.5",
"node-libs-browser": "^0.5.2",
"react-addons-test-utils": "^15.1.0",
"react-transform-hmr": "^1.0.0",
"webpack": "^1.13.1",
"webpack-dev-middleware": "^1.2.0",
"webpack": "^4.0.0",
"webpack-cli": "^3.2.0",
"webpack-dev-server": "^3.0.0",
"webpack-hot-middleware": "^2.2.0"
}
}
23 changes: 0 additions & 23 deletions examples/react-counter-messaging/server.js

This file was deleted.

19 changes: 8 additions & 11 deletions examples/react-counter-messaging/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,24 @@ var path = require('path');
var webpack = require('webpack');

module.exports = {
devtool: 'cheap-module-eval-source-map',
mode: 'development',
devtool: 'source-map',
entry: [
'webpack-hot-middleware/client',
'./index'
],
output: {
path: path.join(__dirname, 'dist'),
filename: 'bundle.js',
publicPath: '/static/'
},
plugins: [
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin()
],
module: {
loaders: [{
rules: [{
test: /\.js$/,
loaders: ['babel'],
exclude: /node_modules/,
include: __dirname
loaders: ['babel-loader'],
exclude: /node_modules/
}]
},
devServer: {
port: 4004
}
};
3 changes: 3 additions & 0 deletions examples/saga-counter/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": [ "es2015", "stage-0", "react" ]
}
42 changes: 15 additions & 27 deletions examples/saga-counter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"version": "0.0.0",
"description": "Redux counter example",
"scripts": {
"start": "node server.js",
"test": "NODE_ENV=test mocha --recursive --compilers js:babel-core/register --require ./test/setup.js",
"test:watch": "npm test -- --watch"
"start": "webpack-dev-server --progress"
},
"repository": {
"type": "git",
Expand All @@ -17,33 +15,23 @@
},
"homepage": "http://rackt.github.io/redux",
"dependencies": {
"react": "^15.1.0",
"react-dom": "^15.1.0",
"react-redux": "^4.4.5",
"redux": "^3.5.2",
"prop-types": "^15.6.2",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-redux": "^6.0.0",
"redux": "^4.0.0",
"redux-saga": "^0.10.5"
},
"devDependencies": {
"babel-core": "^6.3.15",
"babel-loader": "^6.2.0",
"babel-plugin-add-module-exports": "^0.1.1",
"babel-plugin-react-transform": "^2.0.0",
"babel-plugin-transform-decorators-legacy": "^1.2.0",
"babel-polyfill": "^6.3.14",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-react-hmre": "^1.0.1",
"babel-cli": "^6.3.17",
"babel-core": "^6.3.17",
"babel-loader": "^7.0.0",
"babel-preset-es2015": "^6.0.0",
"babel-preset-react": "6.3.13",
"babel-preset-stage-0": "^6.3.13",
"expect": "^1.6.0",
"express": "^4.13.3",
"jsdom": "^5.6.1",
"mocha": "^2.2.5",
"node-libs-browser": "^0.5.2",
"react-addons-test-utils": "^15.1.0",
"react-transform-hmr": "^1.0.0",
"redux-immutable-state-invariant": "^1.1.1",
"webpack": "^1.13.1",
"webpack-dev-middleware": "^1.2.0",
"webpack-hot-middleware": "^2.2.0"
"webpack": "^4.0.0",
"webpack-cli": "^3.2.0",
"webpack-dev-server": "^3.1.0",
"webpack-hot-middleware": "^2.24.0"
}
}
23 changes: 0 additions & 23 deletions examples/saga-counter/server.js

This file was deleted.

4 changes: 2 additions & 2 deletions examples/saga-counter/src/components/Counter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*eslint-disable no-unused-vars */
import React, { Component, PropTypes } from 'react'
import React from 'react'
import PropTypes from 'prop-types'

const Counter = ({ value, onIncrement, onIncrementAsync, onDecrement, onIncrementIfOdd }) =>
<p>
Expand Down
1 change: 0 additions & 1 deletion examples/saga-counter/src/main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/*eslint-disable no-unused-vars*/
import "babel-polyfill"

import React from 'react'
Expand Down
29 changes: 0 additions & 29 deletions examples/saga-counter/test/sagas.js

This file was deleted.

Loading