Merge pull request #180 from colinmeinke/next

Update to Babel 6
This commit is contained in:
Dan Abramov 2015-12-27 00:13:51 +00:00
commit cd80dad9da
7 changed files with 28 additions and 17 deletions

View File

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

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" "redux-thunk": "^1.0.0"
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^5.6.18", "babel-cli": "^6.3.17",
"babel-loader": "^5.1.4", "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", "node-libs-browser": "^0.5.2",
"react-hot-loader": "^1.3.0", "react-hot-loader": "^1.3.0",
"redux-devtools": "^3.0.0", "redux-devtools": "^3.0.0",

View File

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

View File

@ -35,8 +35,12 @@
"redux": "^3.0.0" "redux": "^3.0.0"
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^5.6.18", "babel-cli": "^6.3.17",
"babel-loader": "^5.1.4", "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", "node-libs-browser": "^0.5.2",
"raw-loader": "^0.5.1", "raw-loader": "^0.5.1",
"react-hot-loader": "^1.3.0", "react-hot-loader": "^1.3.0",

View File

@ -7,8 +7,8 @@
"clean": "rimraf lib", "clean": "rimraf lib",
"build": "babel src --out-dir lib", "build": "babel src --out-dir lib",
"lint": "eslint src test examples", "lint": "eslint src test examples",
"test": "NODE_ENV=test mocha --compilers js:babel/register --recursive", "test": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive",
"test:watch": "NODE_ENV=test mocha --compilers js:babel/register --recursive --watch", "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", "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" "prepublish": "npm run lint && npm run test && npm run clean && npm run build"
}, },
@ -31,10 +31,13 @@
}, },
"homepage": "https://github.com/gaearon/redux-devtools", "homepage": "https://github.com/gaearon/redux-devtools",
"devDependencies": { "devDependencies": {
"babel": "^5.5.8", "babel-cli": "^6.3.17",
"babel-core": "^5.6.18", "babel-core": "^6.3.17",
"babel-eslint": "^3.1.15", "babel-eslint": "^4.1.6",
"babel-loader": "^5.1.4", "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": "^0.23",
"eslint-config-airbnb": "0.0.6", "eslint-config-airbnb": "0.0.6",
"eslint-plugin-react": "^2.3.0", "eslint-plugin-react": "^2.3.0",

View File

@ -11,7 +11,7 @@ export default function createDevTools(children) {
Monitor.update(monitorProps, state, action) Monitor.update(monitorProps, state, action)
); );
return class DevTools extends Component { class DevTools extends Component {
static contextTypes = { static contextTypes = {
store: PropTypes.object store: PropTypes.object
}; };
@ -37,6 +37,7 @@ export default function createDevTools(children) {
store={this.liftedStore} /> store={this.liftedStore} />
); );
} }
};
} }
return DevTools;
}