diff --git a/package.json b/package.json index 355b2d1..b60f88b 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "redux-thunk": "^2.1.0" }, "devDependencies": { - "autoprefixer": "^6.4.1", + "autoprefixer-loader": "^3.2.0", "babel-cli": "^6.14.0", "babel-core": "^6.14.0", "babel-eslint": "^6.1.2", @@ -69,10 +69,9 @@ "eslint-plugin-react": "^6.2.2", "extract-text-webpack-plugin": "^2.0.0-beta", "ignore-styles": "^5.0.1", - "postcss-import": "8.1.0", - "postcss-loader": "^0.13.0", - "precss": "^1.4.0", + "node-sass": "^3.10.0", "progress-bar-webpack-plugin": "^1.9.0", + "sass-loader": "^4.0.2", "style-loader": "^0.13.1", "webpack": "^2.1.0-beta.4", "webpack-dev-middleware": "^1.7.0", diff --git a/webpack/build.js b/webpack/build.js index a9cebea..e473ecc 100644 --- a/webpack/build.js +++ b/webpack/build.js @@ -22,7 +22,7 @@ export default { test: /\.scss$/, loader: ExtractTextPlugin.extract({ fallbackLoader: 'style', - loader: 'css!postcss', + loader: 'css!sass!autoprefixer', }), exclude: /node_modules/, }], @@ -48,8 +48,6 @@ export default { ], - progress: true, - stats: { colors: true, reasons: false, diff --git a/webpack/config.js b/webpack/config.js index 0380230..292b31a 100644 --- a/webpack/config.js +++ b/webpack/config.js @@ -1,8 +1,5 @@ import webpack from 'webpack' import path from 'path' -import precss from 'precss' -import autoprefixer from 'autoprefixer' -import postcssImport from 'postcss-import' const env = process.env.NODE_ENV || 'development' const dist = path.resolve(__dirname, '../dist') @@ -17,8 +14,6 @@ export default { publicPath: '/dist/', }, - postcss: wp => [postcssImport({ addDependencyTo: wp }), precss, autoprefixer], - plugins: [ new webpack.DefinePlugin({ diff --git a/webpack/dev.js b/webpack/dev.js index a535a22..81ce6e5 100644 --- a/webpack/dev.js +++ b/webpack/dev.js @@ -23,7 +23,7 @@ export default { query: { presets: ['react-hmre'] }, }, { test: /\.scss$/, - loaders: ['style', 'css', 'postcss'], + loaders: ['style', 'css', 'sass', 'autoprefixer'], include: src, }], },