Merge branch 'master' into jest-update

This commit is contained in:
Andrey Okonetchnikov
2016-10-13 13:40:15 +02:00
32 changed files with 698 additions and 277 deletions

View File

@ -5,7 +5,7 @@
"main": "index.js",
"scripts": {
"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",
"build": "webpack --config webpack.config.js",
"storybook": "start-storybook -p 9001",
@ -40,7 +40,6 @@
"license": "MIT",
"devDependencies": {
"@kadira/storybook": "^1.36.0",
"autoprefixer": "^6.3.3",
"babel-core": "^6.5.1",
"babel-loader": "^6.2.2",
"babel-plugin-lodash": "^3.2.0",
@ -56,30 +55,15 @@
"expect": "^1.20.2",
"exports-loader": "^0.6.3",
"file-loader": "^0.8.5",
"immutable": "^3.7.6",
"imports-loader": "^0.6.5",
"jest-cli": "^16.0.1",
"js-yaml": "^3.5.3",
"lint-staged": "^4.0.0-beta-2",
"moment": "^2.11.2",
"lint-staged": "^3.0.2",
"node-sass": "^3.10.0",
"normalizr": "^2.0.0",
"npm-check": "^5.2.3",
"postcss-cssnext": "^2.7.0",
"postcss-import": "^8.1.2",
"postcss-loader": "^0.9.1",
"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",
"react-redux": "^4.4.0",
"react-router": "^2.5.1",
"react-router-redux": "^4.0.5",
"redux": "^3.3.1",
"redux-thunk": "^1.0.3",
"sass-loader": "^4.0.2",
"style-loader": "^0.13.0",
"stylefmt": "^4.3.1",
@ -92,30 +76,46 @@
"webpack": "^1.13.2",
"webpack-dev-server": "^1.15.1",
"webpack-merge": "^0.14.1",
"webpack-postcss-tools": "^1.1.1",
"whatwg-fetch": "^1.0.0"
"webpack-postcss-tools": "^1.1.1"
},
"dependencies": {
"autoprefixer": "^6.3.3",
"bricks.js": "^1.7.0",
"dateformat": "^1.0.12",
"fuzzy": "^0.1.1",
"immutable": "^3.7.6",
"immutability-helper": "^2.0.0",
"js-base64": "^2.1.9",
"js-yaml": "^3.5.3",
"json-loader": "^0.5.4",
"localforage": "^1.4.2",
"lodash": "^4.13.1",
"markup-it": "git+https://github.com/cassiozen/markup-it.git",
"material-design-icons": "^3.0.1",
"moment": "^2.11.2",
"normalize.css": "^4.2.0",
"pluralize": "^3.0.0",
"prismjs": "^1.5.1",
"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-datetime": "^2.6.0",
"react-portal": "^2.2.1",
"react-toolbox": "^1.2.1",
"react-simple-dnd": "^0.1.2",
"react-toolbox": "^1.2.1",
"react-waypoint": "^3.1.3",
"react-immutable-proptypes": "^1.6.0",
"react-lazy-load": "^3.0.3",
"react-pure-render": "^1.0.2",
"react-redux": "^4.4.0",
"react-router": "^2.5.1",
"react-router-redux": "^4.0.5",
"redux": "^3.3.1",
"redux-thunk": "^1.0.3",
"selection-position": "^1.0.0",
"semaphore": "^1.0.5",
"slate": "^0.13.6"
"slate": "^0.13.6",
"whatwg-fetch": "^1.0.0"
}
}