diff options
author | ArthurHoaro <arthur@hoa.ro> | 2019-05-25 15:52:27 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-01-18 09:55:59 +0100 |
commit | cf92b4dd1521241eefc58eaf6dcd202cd83969d8 (patch) | |
tree | 9d6f6f4dc9eabe111c3ba5609eea8b22cd5a23aa /webpack.config.js | |
parent | 336a28fa4a09b968ce4705900bf57693e672f0bf (diff) | |
download | Shaarli-cf92b4dd1521241eefc58eaf6dcd202cd83969d8.tar.gz Shaarli-cf92b4dd1521241eefc58eaf6dcd202cd83969d8.tar.zst Shaarli-cf92b4dd1521241eefc58eaf6dcd202cd83969d8.zip |
Apply the new system (Bookmark + Service) to the whole code base
See https://github.com/shaarli/Shaarli/issues/1307
Diffstat (limited to 'webpack.config.js')
-rw-r--r-- | webpack.config.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webpack.config.js b/webpack.config.js index ed548c73..602147e5 100644 --- a/webpack.config.js +++ b/webpack.config.js | |||
@@ -30,6 +30,7 @@ module.exports = [ | |||
30 | './assets/default/js/base.js', | 30 | './assets/default/js/base.js', |
31 | './assets/default/scss/shaarli.scss', | 31 | './assets/default/scss/shaarli.scss', |
32 | ].concat(glob.sync('./assets/default/img/*')), | 32 | ].concat(glob.sync('./assets/default/img/*')), |
33 | markdown: './assets/common/css/markdown.css', | ||
33 | }, | 34 | }, |
34 | output: { | 35 | output: { |
35 | filename: '[name].min.js', | 36 | filename: '[name].min.js', |
@@ -50,7 +51,7 @@ module.exports = [ | |||
50 | } | 51 | } |
51 | }, | 52 | }, |
52 | { | 53 | { |
53 | test: /\.scss/, | 54 | test: /\.s?css/, |
54 | use: extractCssDefault.extract({ | 55 | use: extractCssDefault.extract({ |
55 | use: [{ | 56 | use: [{ |
56 | loader: "css-loader", | 57 | loader: "css-loader", |
@@ -97,6 +98,7 @@ module.exports = [ | |||
97 | './assets/vintage/css/reset.css', | 98 | './assets/vintage/css/reset.css', |
98 | './assets/vintage/css/shaarli.css', | 99 | './assets/vintage/css/shaarli.css', |
99 | ].concat(glob.sync('./assets/vintage/img/*')), | 100 | ].concat(glob.sync('./assets/vintage/img/*')), |
101 | markdown: './assets/common/css/markdown.css', | ||
100 | thumbnails: './assets/common/js/thumbnails.js', | 102 | thumbnails: './assets/common/js/thumbnails.js', |
101 | thumbnails_update: './assets/common/js/thumbnails-update.js', | 103 | thumbnails_update: './assets/common/js/thumbnails-update.js', |
102 | }, | 104 | }, |