aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorKevin Decherf <kevin@kdecherf.com>2017-12-20 21:53:11 +0100
committerKevin Decherf <kevin@kdecherf.com>2017-12-20 21:53:48 +0100
commite8694faad64502f6f20526bb2505de69032ed4a8 (patch)
tree0d6ced87f87c5293cfa844de387c18db0733ef9f /app
parent887073dedc0aea5c63f5d2656b0e88b97d1493d8 (diff)
downloadwallabag-e8694faad64502f6f20526bb2505de69032ed4a8.tar.gz
wallabag-e8694faad64502f6f20526bb2505de69032ed4a8.tar.zst
wallabag-e8694faad64502f6f20526bb2505de69032ed4a8.zip
Remove fixed relative path for assets
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php8
-rw-r--r--app/config/webpack/common.js2
2 files changed, 9 insertions, 1 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 90e9f1d8..c065d282 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -79,6 +79,14 @@ class AppKernel extends Kernel
79 ], 79 ],
80 ]); 80 ]);
81 } 81 }
82 else
83 {
84 $container->loadFromExtension('framework', [
85 'assets' => [
86 'base_url' => $container->getParameter('domain_name'),
87 ]
88 ]);
89 }
82 }); 90 });
83 } 91 }
84} 92}
diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js
index 47113950..233497fd 100644
--- a/app/config/webpack/common.js
+++ b/app/config/webpack/common.js
@@ -14,7 +14,7 @@ module.exports = function () {
14 output: { 14 output: {
15 filename: '[name].js', 15 filename: '[name].js',
16 path: path.resolve(rootDir, 'web/wallassets'), 16 path: path.resolve(rootDir, 'web/wallassets'),
17 publicPath: '/wallassets/', 17 publicPath: '',
18 }, 18 },
19 plugins: [ 19 plugins: [
20 new webpack.ProvidePlugin({ 20 new webpack.ProvidePlugin({