mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-05-20 10:08:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix linter issue on webpack config files

Browse source
This commit is contained in:
Jeremy Benoist 2017-06-20 07:14:04 +02:00 committed by Thomas Citharel
parent 38dd2def20
commit 789c46821d
3 changed files with 40 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/config/webpack/common.js
View file

@ -4,13 +4,12 @@ const StyleLintPlugin = require('stylelint-webpack-plugin');
const rootDir = path.resolve(__dirname, '../../../');
module.exports = function() {
module.exports = function () {
return {
entry: {
material: path.join(rootDir, './app/Resources/static/themes/material/index.js'),
baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'),
},
output: {
filename: '[name].js',
path: path.resolve(rootDir, 'web/bundles/wallabagcore'),
@ -21,7 +20,7 @@ module.exports = function() {
$: 'jquery',
jQuery: 'jquery',
'window.$': 'jquery',
'window.jQuery': 'jquery'
'window.jQuery': 'jquery',
}),
new StyleLintPlugin({
configFile: '.stylelintrc',
@ -33,8 +32,8 @@ module.exports = function() {
],
resolve: {
alias: {
jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js')
}
jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'),
},
},
};
};

23
app/config/webpack/dev.js
View file

@ -1,13 +1,12 @@
const webpackMerge = require('webpack-merge');
const webpack = require('webpack');
const path = require('path');
const commonConfig = require('./common.js');
module.exports = function () {
return webpackMerge(commonConfig(), {
devtool: 'eval-source-map',
output: {
filename: '[name].dev.js'
filename: '[name].dev.js',
},
devServer: {
@ -34,9 +33,9 @@ module.exports = function () {
use: {
loader: 'babel-loader',
options: {
presets: ['env']
}
}
presets: ['env'],
},
},
},
{
test: /\.(s)?css$/,
@ -46,17 +45,17 @@ module.exports = function () {
loader: 'css-loader',
options: {
importLoaders: 1,
}
},
},
'postcss-loader',
'sass-loader'
]
'postcss-loader',
'sass-loader',
],
},
{
test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/,
use: 'url-loader'
use: 'url-loader',
},
]
],
},
})
});
};

50
app/config/webpack/prod.js
View file

@ -5,34 +5,34 @@ const ManifestPlugin = require('webpack-manifest-plugin');
const commonConfig = require('./common.js');
module.exports = function() {
module.exports = function () {
return webpackMerge(commonConfig(), {
output: {
filename: '[name].js'
filename: '[name].js',
},
devtool: 'source-map',
plugins: [
new webpack.DefinePlugin({
'process.env': {
'NODE_ENV': JSON.stringify('production')
}
'NODE_ENV': JSON.stringify('production'),
},
}),
new webpack.optimize.UglifyJsPlugin({
beautify: false,
mangle: {
screw_ie8: true,
keep_fnames: true
keep_fnames: true,
},
compress: {
screw_ie8: true,
warnings: false
warnings: false,
},
comments: false
comments: false,
}),
new ExtractTextPlugin('[name].css'),
new ManifestPlugin({
fileName: 'manifest.json',
})
}),
],
module: {
rules: [
@ -48,9 +48,9 @@ module.exports = function() {
use: {
loader: 'babel-loader',
options: {
presets: ['env']
}
}
presets: ['env'],
},
},
},
{
test: /\.(s)?css$/,
@ -63,17 +63,17 @@ module.exports = function() {
importLoaders: 1,
minimize: {
discardComments: {
removeAll: true
removeAll: true,
},
core: true,
minifyFontValues: true
}
}
minifyFontValues: true,
},
},
},
'postcss-loader',
'sass-loader'
]
})
'sass-loader',
],
}),
},
{
test: /\.(jpg|png|gif|svg)$/,
@ -81,8 +81,8 @@ module.exports = function() {
loader: 'file-loader',
options: {
name: 'img/[name].[ext]',
}
}
},
},
},
{
test: /\.(eot|ttf|woff|woff2)$/,
@ -90,10 +90,10 @@ module.exports = function() {
loader: 'file-loader',
options: {
name: 'fonts/[name].[ext]',
}
}
}
]
},
},
},
],
},
})
});
};