diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-22 15:34:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-22 15:34:46 +0200 |
commit | 29714661b1df78871ceaf0e079f11041a8641d4b (patch) | |
tree | a3132b8f83fc8fdc95e860b1d11e854743d589b4 /app/config/webpack/common.js | |
parent | 9416053bfcefa1cce94ea23eee93f0fabf1af2f8 (diff) | |
parent | 151f45db0ef6d0a4737eb220b0803b3ccfd0b6f5 (diff) | |
download | wallabag-29714661b1df78871ceaf0e079f11041a8641d4b.tar.gz wallabag-29714661b1df78871ceaf0e079f11041a8641d4b.tar.zst wallabag-29714661b1df78871ceaf0e079f11041a8641d4b.zip |
Merge pull request #3204 from wallabag/better-export-page
Better public sharing page
Diffstat (limited to 'app/config/webpack/common.js')
-rw-r--r-- | app/config/webpack/common.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js index 4f5739f0..c497689a 100644 --- a/app/config/webpack/common.js +++ b/app/config/webpack/common.js | |||
@@ -4,13 +4,13 @@ const StyleLintPlugin = require('stylelint-webpack-plugin'); | |||
4 | 4 | ||
5 | const rootDir = path.resolve(__dirname, '../../../'); | 5 | const rootDir = path.resolve(__dirname, '../../../'); |
6 | 6 | ||
7 | module.exports = function() { | 7 | module.exports = function () { |
8 | return { | 8 | return { |
9 | entry: { | 9 | entry: { |
10 | material: path.join(rootDir, './app/Resources/static/themes/material/index.js'), | 10 | material: path.join(rootDir, './app/Resources/static/themes/material/index.js'), |
11 | baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'), | 11 | baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'), |
12 | public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'), | ||
12 | }, | 13 | }, |
13 | |||
14 | output: { | 14 | output: { |
15 | filename: '[name].js', | 15 | filename: '[name].js', |
16 | path: path.resolve(rootDir, 'web/bundles/wallabagcore'), | 16 | path: path.resolve(rootDir, 'web/bundles/wallabagcore'), |
@@ -21,7 +21,7 @@ module.exports = function() { | |||
21 | $: 'jquery', | 21 | $: 'jquery', |
22 | jQuery: 'jquery', | 22 | jQuery: 'jquery', |
23 | 'window.$': 'jquery', | 23 | 'window.$': 'jquery', |
24 | 'window.jQuery': 'jquery' | 24 | 'window.jQuery': 'jquery', |
25 | }), | 25 | }), |
26 | new StyleLintPlugin({ | 26 | new StyleLintPlugin({ |
27 | configFile: '.stylelintrc', | 27 | configFile: '.stylelintrc', |
@@ -33,8 +33,8 @@ module.exports = function() { | |||
33 | ], | 33 | ], |
34 | resolve: { | 34 | resolve: { |
35 | alias: { | 35 | alias: { |
36 | jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js') | 36 | jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'), |
37 | } | 37 | }, |
38 | }, | 38 | }, |
39 | }; | 39 | }; |
40 | }; | 40 | }; |