1 files changed, 4 insertions, 8 deletions

diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index 88a3639d2..882013a9e 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -142,15 +142,11 @@ module.exports = function (options) {
         },
 
         {
-          test: /\.scss$/,
-          exclude: /node_modules/,
-          loaders: [ 'raw-loader', 'sass-loader' ]
-        },
-
-        {
-          test: /\.(woff2?|ttf|eot|svg)$/,
-          loader: 'url?limit=10000&name=assets/fonts/[hash].[ext]'
+          test: /\.(sass|scss)$/,
+          loaders: ['css-to-string-loader', 'css-loader?sourceMap', 'resolve-url', 'sass-loader?sourceMap']
         },
+        { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: 'url?limit=10000&minetype=application/font-woff' },
+        { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: 'file' },
 
         /* Raw loader support for *.html
          * Returns file content as string