gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'react-pr' into lint-staged

Browse Source
This commit is contained in:
Andrey Okonetchnikov
2016-09-13 18:50:18 +02:00
parent 056a14425f 811da0f75e
commit 357bcb18cc
10 changed files with 124 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package.json
View File

@ -4,7 +4,7 @@
"description": "Netlify CMS lets content editors work on structured content stored in git",
"main": "index.js",
"scripts": {
"start": "webpack-dev-server -d --inline --config webpack.config.js",
"start": "webpack-dev-server --config webpack.config.js",
"test": "NODE_ENV=test mocha --recursive --compilers js:babel-register --require ./test/setup.js",
"test:watch": "npm test -- --watch",
"build": "webpack --config webpack.config.js",
@ -45,8 +45,6 @@
"eslint": "^3.5.0",
"eslint-plugin-react": "^5.1.1",
"exports-loader": "^0.6.3",
"express": "^4.13.4",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.5",
"immutable": "^3.7.6",
"imports-loader": "^0.6.5",
@ -61,6 +59,7 @@
"pre-commit": "^1.1.3",
"react": "^15.1.0",
"react-dom": "^15.1.0",
"react-hot-loader": "^3.0.0-beta.2",
"react-immutable-proptypes": "^1.6.0",
"react-lazy-load": "^3.0.3",
"react-pure-render": "^1.0.2",
@ -71,8 +70,8 @@
"redux-thunk": "^1.0.3",
"style-loader": "^0.13.0",
"url-loader": "^0.5.7",
"webpack": "^1.12.13",
"webpack-dev-server": "^1.14.1",
"webpack": "^1.13.2",
"webpack-dev-server": "^1.15.1",
"webpack-postcss-tools": "^1.1.1",
"whatwg-fetch": "^1.0.0"
},