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/dev.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/dev.js')
-rw-r--r-- | app/config/webpack/dev.js | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/app/config/webpack/dev.js b/app/config/webpack/dev.js index 771df65b..b6551152 100644 --- a/app/config/webpack/dev.js +++ b/app/config/webpack/dev.js | |||
@@ -1,13 +1,12 @@ | |||
1 | const webpackMerge = require('webpack-merge'); | 1 | const webpackMerge = require('webpack-merge'); |
2 | const webpack = require('webpack'); | 2 | const webpack = require('webpack'); |
3 | const path = require('path'); | ||
4 | const commonConfig = require('./common.js'); | 3 | const commonConfig = require('./common.js'); |
5 | 4 | ||
6 | module.exports = function () { | 5 | module.exports = function () { |
7 | return webpackMerge(commonConfig(), { | 6 | return webpackMerge(commonConfig(), { |
8 | devtool: 'eval-source-map', | 7 | devtool: 'eval-source-map', |
9 | output: { | 8 | output: { |
10 | filename: '[name].dev.js' | 9 | filename: '[name].dev.js', |
11 | }, | 10 | }, |
12 | 11 | ||
13 | devServer: { | 12 | devServer: { |
@@ -34,9 +33,9 @@ module.exports = function () { | |||
34 | use: { | 33 | use: { |
35 | loader: 'babel-loader', | 34 | loader: 'babel-loader', |
36 | options: { | 35 | options: { |
37 | presets: ['env'] | 36 | presets: ['env'], |
38 | } | 37 | }, |
39 | } | 38 | }, |
40 | }, | 39 | }, |
41 | { | 40 | { |
42 | test: /\.(s)?css$/, | 41 | test: /\.(s)?css$/, |
@@ -46,17 +45,17 @@ module.exports = function () { | |||
46 | loader: 'css-loader', | 45 | loader: 'css-loader', |
47 | options: { | 46 | options: { |
48 | importLoaders: 1, | 47 | importLoaders: 1, |
49 | } | 48 | }, |
50 | }, | 49 | }, |
51 | 'postcss-loader', | 50 | 'postcss-loader', |
52 | 'sass-loader' | 51 | 'sass-loader', |
53 | ] | 52 | ], |
54 | }, | 53 | }, |
55 | { | 54 | { |
56 | test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/, | 55 | test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/, |
57 | use: 'url-loader' | 56 | use: 'url-loader', |
58 | }, | 57 | }, |
59 | ] | 58 | ], |
60 | }, | 59 | }, |
61 | }) | 60 | }); |
62 | }; | 61 | }; |