Merge pull request #5326 from wallabag/updates

Update dependencies

.eslintrc.json

@@ -1,6 +1,6 @@
 {
     "extends": "airbnb-base",
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
     "env": {
         "browser": true,
         "es6": true

app/config/webpack/dev.js

@@ -1,6 +1,7 @@
 const { merge } = require('webpack-merge');
 const webpack = require('webpack');
 const commonConfig = require('./common.js');
+const ESLintPlugin = require('eslint-webpack-plugin');
 
 module.exports = merge(commonConfig, {
   devtool: 'eval-source-map',
@@ -15,16 +16,11 @@ module.exports = merge(commonConfig, {
     // match the output path
   },
   plugins: [
+    new ESLintPlugin(),
     new webpack.HotModuleReplacementPlugin(),
   ],
   module: {
     rules: [
-      {
-        enforce: 'pre',
-        test: /\.js$/,
-        loader: 'eslint-loader',
-        exclude: /node_modules/,
-      },
       {
         test: /\.js$/,
         exclude: /(node_modules)/,

app/config/webpack/prod.js

@@ -1,5 +1,6 @@
 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');
@@ -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)/,

package.json

@@ -37,19 +37,19 @@
   },
   "devDependencies": {
     "@babel/core": "^7.13.14",
-    "@babel/preset-env": "^7.13.12",
+    "@babel/eslint-parser": "^7.13.14",
+    "@babel/preset-env": "^7.14.4",
     "autoprefixer": "^10.2.5",
-    "babel-eslint": "^10.1.0",
     "babel-loader": "^8.2.2",
-    "css-loader": "^5.2.0",
-    "eslint": "^7.23.0",
+    "css-loader": "^5.2.6",
+    "eslint": "^7.27.0",
     "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-loader": "^4.0.2",
     "eslint-plugin-import": "^2.22.1",
+    "eslint-webpack-plugin": "^2.5.4",
     "file-loader": "^6.2.0",
     "lato-font": "^3.0.0",
     "mini-css-extract-plugin": "^1.4.0",
-    "node-sass": "^5.0.0",
+    "node-sass": "^6.0.0",
     "postcss": "^8.2.7",
     "postcss-loader": "^5.2.0",
     "sass": "^1.32.8",

phpstan.neon

@@ -8,6 +8,6 @@ parameters:
         container_xml_path: %rootDir%/../../../var/cache/test/appTestDebugProjectContainer.xml
 
     bootstrapFiles:
-        - vendor/bin/.phpunit/phpunit-8.3-0/vendor/autoload.php
+        - vendor/bin/.phpunit/phpunit-8.5-0/vendor/autoload.php
 
     inferPrivatePropertyTypeFromConstructor: true

src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php

@@ -87,5 +87,7 @@ class UsernameFeedTokenConverter implements ParamConverterInterface
 
         // Map found user to the route's parameter
         $request->attributes->set($configuration->getName(), $user);
+
+        return true;
     }
 }

src/Wallabag/UserBundle/Entity/User.php

@@ -373,13 +373,15 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
     /**
      * Only used by the API when creating a new user it'll also return the first client (which was also created at the same time).
      *
-     * @return Client
+     * @return Client|false
      */
     public function getFirstClient()
     {
         if (!empty($this->clients)) {
             return $this->clients->first();
         }
+
+        return false;
     }
 
     /**

web/wallassets/manifest.json

@@ -3,14 +3,8 @@
   "baggy.css.map": "baggy.css.map",
   "baggy.js": "baggy.js",
   "baggy.js.map": "baggy.js.map",
-  "material.ttf": "fonts/MaterialIcons-Regular.ttf",
-  "baggy.ttf": "fonts/MaterialIcons-Regular.ttf",
   "fonts/IcoMoon-Free.ttf": "fonts/IcoMoon-Free.ttf",
-  "material.woff": "fonts/Roboto-Thin.woff",
-  "baggy.woff": "fonts/MaterialIcons-Regular.woff",
   "fonts/lato-black-italic.woff": "fonts/lato-black-italic.woff",
-  "material.woff2": "fonts/Roboto-Thin.woff2",
-  "baggy.woff2": "fonts/MaterialIcons-Regular.woff2",
   "fonts/lato-black-italic.woff2": "fonts/lato-black-italic.woff2",
   "fonts/lato-black.woff": "fonts/lato-black.woff",
   "fonts/lato-black.woff2": "fonts/lato-black.woff2",
@@ -46,8 +40,6 @@
   "fonts/lato-thin-italic.woff2": "fonts/lato-thin-italic.woff2",
   "fonts/lato-thin.woff": "fonts/lato-thin.woff",
   "fonts/lato-thin.woff2": "fonts/lato-thin.woff2",
-  "material.eot": "fonts/MaterialIcons-Regular.eot",
-  "baggy.eot": "fonts/MaterialIcons-Regular.eot",
   "fonts/MaterialIcons-Regular.eot": "fonts/MaterialIcons-Regular.eot",
   "fonts/MaterialIcons-Regular.ttf": "fonts/MaterialIcons-Regular.ttf",
   "fonts/MaterialIcons-Regular.woff": "fonts/MaterialIcons-Regular.woff",
@@ -62,8 +54,6 @@
   "fonts/Roboto-Regular.woff2": "fonts/Roboto-Regular.woff2",
   "fonts/Roboto-Thin.woff": "fonts/Roboto-Thin.woff",
   "fonts/Roboto-Thin.woff2": "fonts/Roboto-Thin.woff2",
-  "material.png": "themes/_global/img/icons/unmark-icon--black.png",
-  "baggy.png": "themes/_global/img/table.png",
   "img/annotator-glyph-sprite.png?embed": "img/annotator-glyph-sprite.png",
   "img/annotator-icon-sprite.png?embed": "img/annotator-icon-sprite.png",
   "material.css": "material.css",
@@ -76,7 +66,6 @@
   "themes/_global/img/bg-select.png": "themes/_global/img/bg-select.png",
   "themes/_global/img/icons/carrot-icon--black.png": "themes/_global/img/icons/carrot-icon--black.png",
   "themes/_global/img/icons/carrot-icon--white.png": "themes/_global/img/icons/carrot-icon--white.png",
-  "baggy.svg": "themes/_global/img/icons/Diaspora-asterisk.svg",
   "themes/_global/img/icons/Diaspora-asterisk.svg": "themes/_global/img/icons/Diaspora-asterisk.svg",
   "themes/_global/img/icons/diaspora-icon--black.png": "themes/_global/img/icons/diaspora-icon--black.png",
   "themes/_global/img/icons/scuttle.png": "themes/_global/img/icons/scuttle.png",