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

Merge branch 'master' into yarn

Browse Source
This commit is contained in:
Andrey Okonetchnikov
2016-10-14 12:45:44 +02:00
parent 9565b1d68f 6ac9407908
commit d22f49fa01
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
package.json
View File

@ -5,7 +5,7 @@
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"start": "webpack-dev-server --config webpack.dev.js", "start": "webpack-dev-server --config webpack.dev.js",
"test": "NODE_ENV=test npm run lint && jest", "test": "NODE_ENV=test jest",
"test:watch": "NODE_ENV=test jest --watch", "test:watch": "NODE_ENV=test jest --watch",
"build": "webpack --config webpack.config.js", "build": "webpack --config webpack.config.js",
"storybook": "start-storybook -p 9001", "storybook": "start-storybook -p 9001",
@ -22,6 +22,7 @@
"lint-staged": { "lint-staged": {
"*.js": [ "*.js": [
"eslint --fix", "eslint --fix",
"jest --findRelatedTests",
"git add" "git add"
], ],
"*.css": [ "*.css": [
@ -55,8 +56,8 @@
"exports-loader": "^0.6.3", "exports-loader": "^0.6.3",
"file-loader": "^0.8.5", "file-loader": "^0.8.5",
"imports-loader": "^0.6.5", "imports-loader": "^0.6.5",
"jest-cli": "^15.1.1", "jest-cli": "^16.0.1",
"lint-staged": "^3.0.2", "lint-staged": "^3.1.0",
"node-sass": "^3.10.0", "node-sass": "^3.10.0",
"npm-check": "^5.2.3", "npm-check": "^5.2.3",
"postcss-cssnext": "^2.7.0", "postcss-cssnext": "^2.7.0",
@ -82,8 +83,8 @@
"bricks.js": "^1.7.0", "bricks.js": "^1.7.0",
"dateformat": "^1.0.12", "dateformat": "^1.0.12",
"fuzzy": "^0.1.1", "fuzzy": "^0.1.1",
"immutable": "^3.7.6",
"immutability-helper": "^2.0.0", "immutability-helper": "^2.0.0",
"immutable": "^3.7.6",
"js-base64": "^2.1.9", "js-base64": "^2.1.9",
"js-yaml": "^3.5.3", "js-yaml": "^3.5.3",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
@ -96,20 +97,20 @@
"pluralize": "^3.0.0", "pluralize": "^3.0.0",
"prismjs": "^1.5.1", "prismjs": "^1.5.1",
"react": "^15.1.0", "react": "^15.1.0",
"react-dom": "^15.1.0",
"react-hot-loader": "^3.0.0-beta.2",
"react-addons-css-transition-group": "^15.3.1", "react-addons-css-transition-group": "^15.3.1",
"react-datetime": "^2.6.0", "react-datetime": "^2.6.0",
"react-portal": "^2.2.1", "react-dom": "^15.1.0",
"react-simple-dnd": "^0.1.2", "react-hot-loader": "^3.0.0-beta.2",
"react-toolbox": "^1.2.1",
"react-waypoint": "^3.1.3",
"react-immutable-proptypes": "^1.6.0", "react-immutable-proptypes": "^1.6.0",
"react-lazy-load": "^3.0.3", "react-lazy-load": "^3.0.3",
"react-portal": "^2.2.1",
"react-pure-render": "^1.0.2", "react-pure-render": "^1.0.2",
"react-redux": "^4.4.0", "react-redux": "^4.4.0",
"react-router": "^2.5.1", "react-router": "^2.5.1",
"react-router-redux": "^4.0.5", "react-router-redux": "^4.0.5",
"react-simple-dnd": "^0.1.2",
"react-toolbox": "^1.2.1",
"react-waypoint": "^3.1.3",
"redux": "^3.3.1", "redux": "^3.3.1",
"redux-thunk": "^1.0.3", "redux-thunk": "^1.0.3",
"selection-position": "^1.0.0", "selection-position": "^1.0.0",