Skip to content

Commit 10319e1

Browse files
committed
Merge update to Babel 6
2 parents ccbccd6 + cd80dad commit 10319e1

File tree

8 files changed

+26
-16
lines changed

8 files changed

+26
-16
lines changed

.babelrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"stage": 0,
3-
"loose": "all"
2+
"presets": ["es2015-loose", "stage-0", "react"]
43
}

examples/counter/.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"stage": 0
2+
"presets": ["es2015-loose", "stage-0", "react"]
33
}

examples/counter/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@
2323
"redux-thunk": "^1.0.0"
2424
},
2525
"devDependencies": {
26-
"babel-core": "^5.6.18",
27-
"babel-loader": "^5.1.4",
26+
"babel-cli": "^6.3.17",
27+
"babel-core": "^6.3.17",
28+
"babel-loader": "^6.2.0",
29+
"babel-preset-es2015-loose": "^6.1.3",
30+
"babel-preset-react": "6.3.13",
31+
"babel-preset-stage-0": "^6.3.13",
2832
"node-libs-browser": "^0.5.2",
2933
"react-hot-loader": "^1.3.0",
3034
"redux-devtools": "^3.0.0",

examples/counter/src/store/configureStore.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default function configureStore(initialState) {
1919

2020
if (module.hot) {
2121
module.hot.accept('../reducers', () =>
22-
store.replaceReducer(require('../reducers'))
22+
store.replaceReducer(require('../reducers').default)
2323
);
2424
}
2525

examples/todomvc/.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"stage": 0
2+
"presets": ["es2015-loose", "stage-0", "react"]
33
}

examples/todomvc/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@
3535
"redux": "^3.0.0"
3636
},
3737
"devDependencies": {
38-
"babel-core": "^5.6.18",
39-
"babel-loader": "^5.1.4",
38+
"babel-cli": "^6.3.17",
39+
"babel-core": "^6.3.17",
40+
"babel-loader": "^6.2.0",
41+
"babel-preset-es2015-loose": "^6.1.3",
42+
"babel-preset-react": "6.3.13",
43+
"babel-preset-stage-0": "^6.3.13",
4044
"node-libs-browser": "^0.5.2",
4145
"raw-loader": "^0.5.1",
4246
"react-hot-loader": "^1.3.0",

examples/todomvc/store/configureStore.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function configureStore(initialState) {
1717

1818
if (module.hot) {
1919
module.hot.accept('../reducers', () =>
20-
store.replaceReducer(require('../reducers'))
20+
store.replaceReducer(require('../reducers').default)
2121
);
2222
}
2323

package.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"clean": "rimraf lib",
88
"build": "babel src --out-dir lib",
99
"lint": "eslint src test examples",
10-
"test": "NODE_ENV=test mocha --compilers js:babel/register --recursive",
11-
"test:watch": "NODE_ENV=test mocha --compilers js:babel/register --recursive --watch",
10+
"test": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive",
11+
"test:watch": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive --watch",
1212
"test:cov": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha -- --recursive",
1313
"prepublish": "npm run lint && npm run test && npm run clean && npm run build"
1414
},
@@ -31,10 +31,13 @@
3131
},
3232
"homepage": "https://github.com/gaearon/redux-devtools",
3333
"devDependencies": {
34-
"babel": "^5.5.8",
35-
"babel-core": "^5.6.18",
36-
"babel-eslint": "^3.1.15",
37-
"babel-loader": "^5.1.4",
34+
"babel-cli": "^6.3.17",
35+
"babel-core": "^6.3.17",
36+
"babel-eslint": "^4.1.6",
37+
"babel-loader": "^6.2.0",
38+
"babel-preset-es2015-loose": "^6.1.3",
39+
"babel-preset-react": "6.3.13",
40+
"babel-preset-stage-0": "^6.3.13",
3841
"eslint": "^0.23",
3942
"eslint-config-airbnb": "0.0.6",
4043
"eslint-plugin-react": "^2.3.0",

0 commit comments

Comments
 (0)