Merge remote-tracking branch 'origin/master' into 2.5.0

app/config/wallabag.yml

@@ -1,5 +1,5 @@
 wallabag_core:
-    version: 2.4.1
+    version: 2.4.3
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -21,6 +21,7 @@ wallabag_core:
         zh: '简体中文'
         uk: 'Українська'
         hr: 'Hrvatski'
+        cs: 'Čeština'
     items_on_page: 12
     theme: material
     language: '%locale%'

app/config/webpack/common.js

@@ -23,7 +23,7 @@ module.exports = {
       'window.jQuery': 'jquery',
     }),
     new StyleLintPlugin({
-      configFile: '.stylelintrc',
+      configFile: 'stylelint.config.js',
       failOnError: false,
       quiet: false,
       context: 'app/Resources/static/themes',

app/config/webpack/dev.js

@@ -1,6 +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',
@@ -9,22 +9,15 @@ module.exports = merge(commonConfig, {
   },
   mode: 'development',
   devServer: {
-    hot: true,
-    // enable HMR on the server
-    contentBase: './web',
-    // match the output path
+    static: {
+      directory: './web',
+    },
   },
   plugins: [
-    new webpack.HotModuleReplacementPlugin(),
+    new ESLintPlugin(),
   ],
   module: {
     rules: [
-      {
-        enforce: 'pre',
-        test: /\.js$/,
-        loader: 'eslint-loader',
-        exclude: /node_modules/,
-      },
       {
         test: /\.js$/,
         exclude: /(node_modules)/,
@@ -58,7 +51,7 @@ module.exports = merge(commonConfig, {
       },
       {
         test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
-        use: 'url-loader',
+        type: 'asset/inline',
       },
     ],
   },

app/config/webpack/prod.js

@@ -1,10 +1,11 @@
 const webpack = require('webpack');
 const { merge } = require('webpack-merge');
+const ESLintPlugin = require('eslint-webpack-plugin');
 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: {
@@ -27,6 +28,7 @@ module.exports = merge(commonConfig, {
     ],
   },
   plugins: [
+    new ESLintPlugin(),
     new MiniCssExtractPlugin(),
     new webpack.DefinePlugin({
       'process.env': {
@@ -40,12 +42,6 @@ module.exports = merge(commonConfig, {
   ],
   module: {
     rules: [
-      {
-        enforce: 'pre',
-        test: /\.js$/,
-        loader: 'eslint-loader',
-        exclude: /node_modules/,
-      },
       {
         test: /\.js$/,
         exclude: /(node_modules)/,
@@ -80,31 +76,24 @@ module.exports = merge(commonConfig, {
       {
         test: /\.(jpg|png|gif|svg|ico)$/,
         include: /node_modules/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: 'img/[name].[ext]',
-          },
+        type: 'asset/resource',
+        generator: {
+          filename: 'img/[name][ext]',
         },
       },
       {
         test: /\.(jpg|png|gif|svg|ico)$/,
         exclude: /node_modules/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            context: 'app/Resources/static',
-            name: '[path][name].[ext]',
-          },
+        type: 'asset/resource',
+        generator: {
+          filename: (content) => content.filename.replace('app/Resources/static/', ''),
         },
       },
       {
         test: /\.(eot|ttf|woff|woff2)$/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: 'fonts/[name].[ext]',
-          },
+        type: 'asset/resource',
+        generator: {
+          filename: 'fonts/[name][ext]',
         },
       },
     ],