oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Update to ESLint 8

Browse source 
And run it:
- `yarn eslint app/**/*.js --fix`
- `yarn eslint web/**/*.js --fix`
This commit is contained in:
Jeremy Benoist 2022-01-05 21:37:45 +01:00
parent c32d136cd2
commit 01609f8514
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
10 changed files with 287 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Resources/static/themes/_global/js/bookmarklet.js
View file

@ -1,5 +1,4 @@
top['bookmarklet-url@wallabag.org'] =
'<!DOCTYPE html><html><head><title>bag it!</title>' +
'<link rel="icon" href="tpl/img/favicon.ico" />' +
'</head><body><script>window.onload=function(){window.setTimeout' +
'(function(){history.back();},250);};</script></body></html>';
top['bookmarklet-url@wallabag.org'] = '<!DOCTYPE html><html><head><title>bag it!</title>'
+ '<link rel="icon" href="tpl/img/favicon.ico" />'
+ '</head><body><script>window.onload=function(){window.setTimeout'
+ '(function(){history.back();},250);};</script></body></html>';

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

@ -1,7 +1,6 @@
const { merge } = require('webpack-merge');
const webpack = require('webpack');
const commonConfig = require('./common.js');
const ESLintPlugin = require('eslint-webpack-plugin');
const commonConfig = require('./common');
module.exports = merge(commonConfig, {
devtool: 'eval-source-map',
@ -52,7 +51,7 @@ module.exports = merge(commonConfig, {
},
{
test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
use: 'url-loader',
type: 'asset/inline',
},
],
},

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

@ -5,7 +5,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
const TerserPlugin = require('terser-webpack-plugin');
const commonConfig = require('./common.js');
const commonConfig = require('./common');
module.exports = merge(commonConfig, {
output: {
@ -78,7 +78,7 @@ module.exports = merge(commonConfig, {
include: /node_modules/,
type: 'asset/resource',
generator: {
filename: 'img/[name][ext]'
filename: 'img/[name][ext]',
},
},
{
@ -86,16 +86,14 @@ module.exports = merge(commonConfig, {
exclude: /node_modules/,
type: 'asset/resource',
generator: {
filename: content => {
return content.filename.replace('app/Resources/static/', '')
}
}
filename: (content) => content.filename.replace('app/Resources/static/', ''),
},
},
{
test: /\.(eot|ttf|woff|woff2)$/,
type: 'asset/resource',
generator: {
filename: 'fonts/[name][ext]'
filename: 'fonts/[name][ext]',
},
},
],