diff --git a/package.json b/package.json index 993dded..c331bb2 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "babel-polyfill": "^6.3.14", "classnames": "^2.1.3", - "history": "^3.0.0", + "history": "^2.0.0", "intl": "^1.2.2", "intl-format-cache": "^2.0.4", "intl-messageformat": "^1.1.0", @@ -50,7 +50,6 @@ "babel-runtime": "^6.0.0", "bundle-loader": "^0.5.4", "chai": "^3.0.0", - "chokidar": "^1.2.0", "css-loader": "^0.23.0", "cssnano": "^3.4.0", "enzyme": "^2.2.0", @@ -58,13 +57,13 @@ "eslint-plugin-react": "^5.0.0", "exports-loader": "^0.6.3", "extract-text-webpack-plugin": "^1.0.0", - "file-loader": "^0.8.5", + "file-loader": "^0.9.0", "fontgen-loader": "^0.2.1", "html-loader": "^0.4.3", "html-webpack-plugin": "^2.0.0", "imports-loader": "^0.6.5", "json-loader": "^0.5.4", - "karma": "*", + "karma": "^1.1.0", "karma-chai": "*", "karma-mocha": "^1.0.0", "karma-nyan-reporter": "^0.2.3", @@ -72,8 +71,6 @@ "karma-sinon": "^1.0.4", "karma-sourcemap-loader": "*", "karma-webpack": "^1.5.1", - "less": "^2.4.0", - "less-loader": "^2.0.0", "mocha": "^2.2.5", "node-sass": "^3.4.2", "phantomjs-prebuilt": "^2.0.0", @@ -84,7 +81,7 @@ "redux-devtools": "^3.3.1", "redux-devtools-dock-monitor": "^1.1.1", "redux-devtools-log-monitor": "^1.0.11", - "sass-loader": "^3.1.2", + "sass-loader": "^4.0.0", "sinon": "^1.15.3", "style-loader": "^0.13.0", "url-loader": "^0.5.7", diff --git a/webpack.config.js b/webpack.config.js index 6cfda7d..a4ba294 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -9,6 +9,8 @@ var cssnano = require('cssnano'); var cssUrl = require("postcss-url"); var iconfontImporter = require('./webpack/node-sass-iconfont-importer'); +var vendor = Object.keys(require('./package.json').dependencies); + /** * TODO: https://babeljs.io/docs/plugins/ * TODO: отдельные конфиги для env (аля https://github.com/davezuko/react-redux-starter-kit) @@ -52,24 +54,7 @@ var rootPath = path.resolve('./src'); var webpackConfig = { entry: { app: path.join(__dirname, 'src'), - vendor: [ - 'babel-polyfill', - 'whatwg-fetch', - 'classnames', - 'history', - 'intl-format-cache', - 'intl-messageformat', - 'react', - 'react-dom', - 'react-helmet', - 'react-intl', - 'react-motion', - 'react-redux', - 'react-router', - 'react-router-redux', - 'redux', - 'redux-thunk' - ] + vendor: vendor }, output: {