aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-10-16 09:02:47 +0200
committerGitHub <noreply@github.com>2017-10-16 09:02:47 +0200
commit7f5d03a98d59afa171ccc003a48715f13fa3b116 (patch)
tree5ef7704ef5fa6f227b62bb4497a0931643a915e8 /app/config
parent393020100350140e421d991a3fc7d12eaf69a8b7 (diff)
parent3f29386cb797a8cc9b4eff8dc9b0a75f201366a5 (diff)
downloadwallabag-7f5d03a98d59afa171ccc003a48715f13fa3b116.tar.gz
wallabag-7f5d03a98d59afa171ccc003a48715f13fa3b116.tar.zst
wallabag-7f5d03a98d59afa171ccc003a48715f13fa3b116.zip
Merge pull request #3383 from Kdecherf/fix-webpack-and-login
Fix webpack and login screen
Diffstat (limited to 'app/config')
-rw-r--r--app/config/webpack/dev.js2
-rw-r--r--app/config/webpack/prod.js14
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 () {
52 ], 52 ],
53 }, 53 },
54 { 54 {
55 test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/, 55 test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
56 use: 'url-loader', 56 use: 'url-loader',
57 }, 57 },
58 ], 58 ],
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 () {
76 }), 76 }),
77 }, 77 },
78 { 78 {
79 test: /\.(jpg|png|gif|svg)$/, 79 test: /\.(jpg|png|gif|svg|ico)$/,
80 include: /node_modules/,
80 use: { 81 use: {
81 loader: 'file-loader', 82 loader: 'file-loader',
82 options: { 83 options: {
@@ -85,6 +86,17 @@ module.exports = function () {
85 }, 86 },
86 }, 87 },
87 { 88 {
89 test: /\.(jpg|png|gif|svg|ico)$/,
90 exclude: /node_modules/,
91 use: {
92 loader: 'file-loader',
93 options: {
94 context: 'app/Resources/static',
95 name: '[path][name].[ext]',
96 },
97 },
98 },
99 {
88 test: /\.(eot|ttf|woff|woff2)$/, 100 test: /\.(eot|ttf|woff|woff2)$/,
89 use: { 101 use: {
90 loader: 'file-loader', 102 loader: 'file-loader',