aboutsummaryrefslogtreecommitdiffhomepage
path: root/webpack.config.js
diff options
context:
space:
mode:
authoryude <yudesleepy@gmail.com>2021-01-04 18:51:10 +0900
committerGitHub <noreply@github.com>2021-01-04 18:51:10 +0900
commite6754f2154a79abd8e5e64bd923f6984aa9ad44b (patch)
treef074119530bb59ef155938ea367f719f1e4b70f1 /webpack.config.js
parent5256b4287021342a9f8868967b2a77e481314331 (diff)
parented4ee8f0297941ac83300389b7de6a293312d20e (diff)
downloadShaarli-e6754f2154a79abd8e5e64bd923f6984aa9ad44b.tar.gz
Shaarli-e6754f2154a79abd8e5e64bd923f6984aa9ad44b.tar.zst
Shaarli-e6754f2154a79abd8e5e64bd923f6984aa9ad44b.zip
Merge pull request #2 from shaarli/master
Merge fork source
Diffstat (limited to 'webpack.config.js')
-rw-r--r--webpack.config.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/webpack.config.js b/webpack.config.js
index a73758cc..2c316d32 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -18,8 +18,10 @@ module.exports = [
18 { 18 {
19 mode: 'production', 19 mode: 'production',
20 entry: { 20 entry: {
21 shaare_batch: './assets/common/js/shaare-batch.js',
21 thumbnails: './assets/common/js/thumbnails.js', 22 thumbnails: './assets/common/js/thumbnails.js',
22 thumbnails_update: './assets/common/js/thumbnails-update.js', 23 thumbnails_update: './assets/common/js/thumbnails-update.js',
24 metadata: './assets/common/js/metadata.js',
23 pluginsadmin: './assets/default/js/plugins-admin.js', 25 pluginsadmin: './assets/default/js/plugins-admin.js',
24 shaarli: [ 26 shaarli: [
25 './assets/default/js/base.js', 27 './assets/default/js/base.js',
@@ -99,6 +101,7 @@ module.exports = [
99 ].concat(glob.sync('./assets/vintage/img/*')), 101 ].concat(glob.sync('./assets/vintage/img/*')),
100 markdown: './assets/common/css/markdown.css', 102 markdown: './assets/common/css/markdown.css',
101 thumbnails: './assets/common/js/thumbnails.js', 103 thumbnails: './assets/common/js/thumbnails.js',
104 metadata: './assets/common/js/metadata.js',
102 thumbnails_update: './assets/common/js/thumbnails-update.js', 105 thumbnails_update: './assets/common/js/thumbnails-update.js',
103 }, 106 },
104 output: { 107 output: {
@@ -139,7 +142,8 @@ module.exports = [
139 loader: 'file-loader', 142 loader: 'file-loader',
140 options: { 143 options: {
141 name: '../img/[name].[ext]', 144 name: '../img/[name].[ext]',
142 publicPath: '', 145 // do not add a publicPath here because it's already handled by CSS's publicPath
146 publicPath: '../vintage',
143 } 147 }
144 } 148 }
145 ], 149 ],