Merge update to Babel 6

This commit is contained in:
Dan Abramov 2015-12-27 00:31:56 +00:00
commit 10319e16e3
8 changed files with 26 additions and 16 deletions

View File

@ -1,4 +1,3 @@
{
"stage": 0,
"loose": "all"
"presets": ["es2015-loose", "stage-0", "react"]
}

View File

@ -1,3 +1,3 @@
{
"stage": 0
"presets": ["es2015-loose", "stage-0", "react"]
}

View File

@ -23,8 +23,12 @@
"redux-thunk": "^1.0.0"
},
"devDependencies": {
"babel-core": "^5.6.18",
"babel-loader": "^5.1.4",
"babel-cli": "^6.3.17",
"babel-core": "^6.3.17",
"babel-loader": "^6.2.0",
"babel-preset-es2015-loose": "^6.1.3",
"babel-preset-react": "6.3.13",
"babel-preset-stage-0": "^6.3.13",
"node-libs-browser": "^0.5.2",
"react-hot-loader": "^1.3.0",
"redux-devtools": "^3.0.0",

View File

@ -19,7 +19,7 @@ export default function configureStore(initialState) {
if (module.hot) {
module.hot.accept('../reducers', () =>
store.replaceReducer(require('../reducers'))
store.replaceReducer(require('../reducers').default)
);
}

View File

@ -1,3 +1,3 @@
{
"stage": 0
"presets": ["es2015-loose", "stage-0", "react"]
}

View File

@ -35,8 +35,12 @@
"redux": "^3.0.0"
},
"devDependencies": {
"babel-core": "^5.6.18",
"babel-loader": "^5.1.4",
"babel-cli": "^6.3.17",
"babel-core": "^6.3.17",
"babel-loader": "^6.2.0",
"babel-preset-es2015-loose": "^6.1.3",
"babel-preset-react": "6.3.13",
"babel-preset-stage-0": "^6.3.13",
"node-libs-browser": "^0.5.2",
"raw-loader": "^0.5.1",
"react-hot-loader": "^1.3.0",

View File

@ -17,7 +17,7 @@ export default function configureStore(initialState) {
if (module.hot) {
module.hot.accept('../reducers', () =>
store.replaceReducer(require('../reducers'))
store.replaceReducer(require('../reducers').default)
);
}

View File

@ -7,8 +7,8 @@
"clean": "rimraf lib",
"build": "babel src --out-dir lib",
"lint": "eslint src test examples",
"test": "NODE_ENV=test mocha --compilers js:babel/register --recursive",
"test:watch": "NODE_ENV=test mocha --compilers js:babel/register --recursive --watch",
"test": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive",
"test:watch": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive --watch",
"test:cov": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha -- --recursive",
"prepublish": "npm run lint && npm run test && npm run clean && npm run build"
},
@ -31,10 +31,13 @@
},
"homepage": "https://github.com/gaearon/redux-devtools",
"devDependencies": {
"babel": "^5.5.8",
"babel-core": "^5.6.18",
"babel-eslint": "^3.1.15",
"babel-loader": "^5.1.4",
"babel-cli": "^6.3.17",
"babel-core": "^6.3.17",
"babel-eslint": "^4.1.6",
"babel-loader": "^6.2.0",
"babel-preset-es2015-loose": "^6.1.3",
"babel-preset-react": "6.3.13",
"babel-preset-stage-0": "^6.3.13",
"eslint": "^0.23",
"eslint-config-airbnb": "0.0.6",
"eslint-plugin-react": "^2.3.0",