Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

3 files changed, 5 insertions, 2 deletions

diff --git a/config/helpers/incremental_webpack_compiler.js b/config/helpers/incremental_webpack_compiler.js
index 786bb6071fa..5d4f9bd040d 100644
--- a/config/helpers/incremental_webpack_compiler.js
+++ b/config/helpers/incremental_webpack_compiler.js
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file, no-underscore-dangle */
 const fs = require('fs');
 const path = require('path');
 
@@ -7,6 +8,7 @@ const log = (msg, ...rest) => console.log(`IncrementalWebpackCompiler: ${msg}`,
 // Five seconds seem to work fine and the user can read the message
 const TIMEOUT = 5000;
 
+/* eslint-disable class-methods-use-this */
 class NoopCompiler {
   constructor() {
     this.enabled = false;
@@ -20,6 +22,7 @@ class NoopCompiler {
 
   setupMiddleware() {}
 }
+/* eslint-enable class-methods-use-this */
 
 class IncrementalWebpackCompiler {
   constructor(historyFilePath) {
diff --git a/config/helpers/is_eslint.js b/config/helpers/is_eslint.js
index 60528796962..9a3a9bfca12 100644
--- a/config/helpers/is_eslint.js
+++ b/config/helpers/is_eslint.js
@@ -2,7 +2,7 @@
  * Returns true if the given module is required from eslint
  */
 const isESLint = (mod) => {
-  let parent = mod.parent;
+  let { parent } = mod;
 
   while (parent) {
     if (parent.filename && parent.filename.includes('/eslint')) {
diff --git a/config/helpers/vendor_dll_hash.js b/config/helpers/vendor_dll_hash.js
index 2df97e7b95d..cdbaebc9789 100644
--- a/config/helpers/vendor_dll_hash.js
+++ b/config/helpers/vendor_dll_hash.js
@@ -1,6 +1,6 @@
 const fs = require('fs');
-const path = require('path');
 const crypto = require('crypto');
+const path = require('path');
 
 const CACHE_PATHS = [
   './config/webpack.config.js',