Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-09 22:55:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'BenJuan26/feature/fix-tests' into develop

Browse Source
This commit is contained in:
Unknown
2017-11-09 17:15:06 +00:00
parent 56ae1378da cee5b297ac
commit c6726cf020
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.babelrc
View File

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

7
package.json
View File

@@ -39,6 +39,7 @@
"<rootDir>/node_modules/lodash", "<rootDir>/node_modules/lodash",
"<rootDir>/node_modules/react", "<rootDir>/node_modules/react",
"<rootDir>/node_modules/react-dom", "<rootDir>/node_modules/react-dom",
"<rootDir>/node_modules/react-transition-group",
"<rootDir>/node_modules/react-testutils-additions", "<rootDir>/node_modules/react-testutils-additions",
"<rootDir>/node_modules/fbjs", "<rootDir>/node_modules/fbjs",
"<rootDir>/node_modules/fbemitter", "<rootDir>/node_modules/fbemitter",
@@ -60,9 +61,10 @@
"babel-eslint": "*", "babel-eslint": "*",
"babel-jest": "*", "babel-jest": "*",
"babel-loader": "*", "babel-loader": "*",
"babel-preset-es2015": "*", "babel-preset-env": "*",
"babel-preset-react": "*", "babel-preset-react": "*",
"babel-preset-stage-0": "*", "babel-preset-stage-0": "*",
"create-react-class": "^15.6.2",
"css-loader": "^0.28.0", "css-loader": "^0.28.0",
"d3-selection": "1", "d3-selection": "1",
"eslint": "3.19.0", "eslint": "3.19.0",
@@ -72,7 +74,7 @@
"extract-text-webpack-plugin": "2.1.0", "extract-text-webpack-plugin": "2.1.0",
"file-loader": "^0.11.1", "file-loader": "^0.11.1",
"html-webpack-plugin": "^2.28.0", "html-webpack-plugin": "^2.28.0",
"jest-cli": "^19.0.2", "jest-cli": "^21.2.1",
"jsen": "^0.6.4", "jsen": "^0.6.4",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"less": "^2.7.2", "less": "^2.7.2",
@@ -80,6 +82,7 @@
"react-addons-perf": "^15.4.2", "react-addons-perf": "^15.4.2",
"react-measure": "^1.4.7", "react-measure": "^1.4.7",
"react-testutils-additions": "^15.2.0", "react-testutils-additions": "^15.2.0",
"react-transition-group": "^1.1.2",
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
"rollup": "0.41", "rollup": "0.41",
"rollup-plugin-node-resolve": "3", "rollup-plugin-node-resolve": "3",