diff --git a/config/webpack.common.js b/config/webpack.common.js index e252374..8f80d0f 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -2,7 +2,6 @@ const webpack = require('webpack'); const HtmlWebpackPlugin = require('html-webpack-plugin'); -const ExtractTextPlugin = require('extract-text-webpack-plugin'); const helpers = require('./helpers'); module.exports = { @@ -78,21 +77,19 @@ module.exports = { loader: 'html-loader' }, { test: /\.css$/, - exclude: helpers.root('src'), - loader: ExtractTextPlugin.extract({ - fallback: 'style-loader', - use: 'css-loader?sourceMap' - }) - }, { - test: /\.css$/, - include: helpers.root('src'), - loader: 'css-loader' + //include: helpers.root('src'), + use: [ + 'style-loader', + 'css-loader', + 'resolve-url-loader' + ] }, { test: /\.scss$/, use: [ 'style-loader', 'css-loader', - 'sass-loader', + 'resolve-url-loader', + 'sass-loader?sourceMap' ] }, { test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/, diff --git a/package.json b/package.json index a54c090..088b489 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "node-sass": "^4.7.2", "null-loader": "^0.1.1", "raw-loader": "^0.5.1", + "resolve-url-loader": "^2.3.0", "sass-loader": "^7.0.2", "script-ext-html-webpack-plugin": "^2.0.1", "style-loader": "^0.21.0",