Merge pull request #3383 from Kdecherf/fix-webpack-and-login

Fix webpack and login screen

2 files changed, 14 insertions, 2 deletions

diff --git a/app/config/webpack/dev.js b/app/config/webpack/dev.js
index b6551152..97abc5eb 100644
--- a/app/config/webpack/dev.js
+++ b/app/config/webpack/dev.js
@@ -52,7 +52,7 @@ module.exports = function () {
           ],
         },
         {
-          test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/,
+          test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
           use: 'url-loader',
         },
       ],
diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js
index 44961cc5..17b8c384 100644
--- a/app/config/webpack/prod.js
+++ b/app/config/webpack/prod.js
@@ -76,7 +76,8 @@ module.exports = function () {
           }),
         },
         {
-          test: /\.(jpg|png|gif|svg)$/,
+          test: /\.(jpg|png|gif|svg|ico)$/,
+          include: /node_modules/,
           use: {
             loader: 'file-loader',
             options: {
@@ -85,6 +86,17 @@ module.exports = function () {
           },
         },
         {
+          test: /\.(jpg|png|gif|svg|ico)$/,
+          exclude: /node_modules/,
+          use: {
+            loader: 'file-loader',
+            options: {
+              context: 'app/Resources/static',
+              name: '[path][name].[ext]',
+            },
+          },
+        },
+        {
           test: /\.(eot|ttf|woff|woff2)$/,
           use: {
             loader: 'file-loader',