chore(deps): update eslint-config-prettier (#2919)

hiroppy · web-flow · commit 3225863e2943 · 2020-12-18T15:30:22.000+03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "body-parser": "^1.19.0",
     "css-loader": "^5.0.1",
     "eslint": "^7.15.0",
-    "eslint-config-prettier": "^6.15.0",
+    "eslint-config-prettier": "^7.0.0",
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.22.1",
     "execa": "^5.0.0",
diff --git a/test/cli/cli.test.js b/test/cli/cli.test.js
@@ -23,9 +23,7 @@ runCLITest('CLI', () => {
    * @param {string} str String to quote
    * @returns {string} Escaped string
    */
-  const quotemeta = (str) => {
-    return str.replace(/[-[\]\\/{}()*+?.^$|]/g, '\\$&');
-  };
+  const quotemeta = (str) => str.replace(/[-[\]\\/{}()*+?.^$|]/g, '\\$&');
 
   const normalizeOutput = (output) =>
     output
diff --git a/test/e2e/Progress.test.js b/test/e2e/Progress.test.js
@@ -70,9 +70,7 @@ describe('client progress', () => {
                 browser.close().then(() => {
                   // check that there is some percentage progress output
                   const regExp = /^\[webpack-dev-server\] [0-9]{1,3}% - /;
-                  const match = res.find((line) => {
-                    return regExp.test(line);
-                  });
+                  const match = res.find((line) => regExp.test(line));
                   // eslint-disable-next-line no-undefined
                   expect(match).not.toEqual(undefined);
                   done();
diff --git a/test/e2e/ProvidePlugin.test.js b/test/e2e/ProvidePlugin.test.js
@@ -25,9 +25,7 @@ describe('ProvidePlugin', () => {
           page.waitForNavigation({ waitUntil: 'load' }).then(() => {
             page.waitForTimeout(beforeBrowserCloseDelay).then(() => {
               page
-                .evaluate(() => {
-                  return window.injectedClient === window.expectedClient;
-                })
+                .evaluate(() => window.injectedClient === window.expectedClient)
                 .then((isCorrectClient) => {
                   browser.close().then(() => {
                     expect(isCorrectClient).toBeTruthy();
@@ -60,9 +58,7 @@ describe('ProvidePlugin', () => {
           page.waitForNavigation({ waitUntil: 'load' }).then(() => {
             page.waitForTimeout(beforeBrowserCloseDelay).then(() => {
               page
-                .evaluate(() => {
-                  return window.injectedClient === window.expectedClient;
-                })
+                .evaluate(() => window.injectedClient === window.expectedClient)
                 .then((isCorrectClient) => {
                   browser.close().then(() => {
                     expect(isCorrectClient).toBeTruthy();
diff --git a/test/fixtures/entry-as-function/webpack.config.js b/test/fixtures/entry-as-function/webpack.config.js
@@ -3,9 +3,7 @@
 module.exports = {
   mode: 'development',
   context: __dirname,
-  entry: () => {
-    return './foo.js';
-  },
+  entry: () => './foo.js',
   plugins: [
     {
       apply(compiler) {
diff --git a/test/fixtures/promise-config/webpack.config.js b/test/fixtures/promise-config/webpack.config.js
@@ -2,11 +2,10 @@
 
 const { join } = require('path');
 
-module.exports = () => {
-  return new Promise((resolve) => {
+module.exports = () =>
+  new Promise((resolve) => {
     resolve({
       mode: 'development',
       entry: join(__dirname, 'foo.js'),
     });
   });
-};
diff --git a/test/options.test.js b/test/options.test.js
@@ -93,19 +93,20 @@ describe('options', () => {
               expect(false).toBeTruthy();
             }
           })
-          .then(() => {
-            return new Promise((resolve) => {
-              if (server) {
-                server.close(() => {
-                  compiler = null;
-                  server = null;
+          .then(
+            () =>
+              new Promise((resolve) => {
+                if (server) {
+                  server.close(() => {
+                    compiler = null;
+                    server = null;
+                    resolve();
+                  });
+                } else {
                   resolve();
-                });
-              } else {
-                resolve();
-              }
-            });
-          })
+                }
+              })
+          )
           .then(() => {
             current += 1;
           });
@@ -495,9 +496,7 @@ describe('options', () => {
     };
 
     Object.keys(cases).forEach((key) => {
-      it(key, () => {
-        return validateOption(key, cases[key]);
-      });
+      it(key, () => validateOption(key, cases[key]));
     });
   });
 });
diff --git a/test/server/Server.test.js b/test/server/Server.test.js
@@ -34,15 +34,15 @@ describe('Server', () => {
           (compilation) => {
             const mainDeps = compilation.entries.get('main').dependencies;
             const globalDeps = compilation.globalEntry.dependencies;
-            entries = globalDeps.concat(mainDeps).map((dep) => {
-              return relative('.', dep.request).split(sep);
-            });
+            entries = globalDeps
+              .concat(mainDeps)
+              .map((dep) => relative('.', dep.request).split(sep));
           }
         );
       } else {
-        entries = server.middleware.context.compiler.options.entry.map((p) => {
-          return relative('.', p).split(sep);
-        });
+        entries = server.middleware.context.compiler.options.entry.map((p) =>
+          relative('.', p).split(sep)
+        );
       }
     }
 
diff --git a/test/server/onAfterSetupMiddleware-option.test.js b/test/server/onAfterSetupMiddleware-option.test.js
@@ -39,23 +39,21 @@ describe('onAfterSetupMiddleware option', () => {
 
   afterAll(testServer.close);
 
-  it('should handle after route', () => {
-    return req
+  it('should handle after route', () =>
+    req
       .get('/after/some/path')
       .expect('Content-Type', 'text/html; charset=utf-8')
       .expect(200)
       .then((response) => {
         expect(response.text).toBe('after');
-      });
-  });
+      }));
 
-  it('should handle POST requests to after route', () => {
-    return req
+  it('should handle POST requests to after route', () =>
+    req
       .post('/after/some/path')
       .expect('Content-Type', 'text/html; charset=utf-8')
       .expect(200)
       .then((response) => {
         expect(response.text).toBe('after POST');
-      });
-  });
+      }));
 });
diff --git a/test/server/onBeforeSetupMiddleware-option.test.js b/test/server/onBeforeSetupMiddleware-option.test.js
@@ -35,13 +35,12 @@ describe('onBeforeSetupMiddleware option', () => {
 
   afterAll(testServer.close);
 
-  it('should handle before route', () => {
-    return req
+  it('should handle before route', () =>
+    req
       .get('/before/some/path')
       .expect('Content-Type', 'text/html; charset=utf-8')
       .expect(200)
       .then((response) => {
         expect(response.text).toBe('before');
-      });
-  });
+      }));
 });
diff --git a/test/server/stats-option.test.js b/test/server/stats-option.test.js
@@ -18,26 +18,31 @@ describe('stats option', () => {
       },
     ];
 
-    return allStats.reduce((p, stats) => {
-      return p.then(() => {
-        return new Promise((resolve) => {
-          const compiler = webpack(Object.assign({}, config, { stats }));
-          const server = new Server(compiler, {
-            static: false,
-            port,
-          });
+    return allStats.reduce(
+      (p, stats) =>
+        p.then(
+          () =>
+            new Promise((resolve) => {
+              const compiler = webpack(Object.assign({}, config, { stats }));
+              const server = new Server(compiler, {
+                static: false,
+                port,
+              });
 
-          compiler.hooks.done.tap('webpack-dev-server', (s) => {
-            expect(Object.keys(server.getStats(s)).sort()).toMatchSnapshot();
+              compiler.hooks.done.tap('webpack-dev-server', (s) => {
+                expect(
+                  Object.keys(server.getStats(s)).sort()
+                ).toMatchSnapshot();
 
-            server.close(resolve);
-          });
+                server.close(resolve);
+              });
 
-          compiler.run(() => {});
-          server.listen(port, 'localhost');
-        });
-      });
-    }, Promise.resolve());
+              compiler.run(() => {});
+              server.listen(port, 'localhost');
+            })
+        ),
+      Promise.resolve()
+    );
   });
 
   it('should respect warningsFilter', (done) => {
diff --git a/test/server/transportMode-option.test.js b/test/server/transportMode-option.test.js
@@ -58,12 +58,13 @@ describe('transportMode', () => {
       beforeEach(() => {
         jest.mock('../../lib/utils/getSocketServerImplementation');
         getSocketServerImplementation = require('../../lib/utils/getSocketServerImplementation');
-        getSocketServerImplementation.mockImplementation(() => {
-          return class MockServer {
-            // eslint-disable-next-line no-empty-function
-            onConnection() {}
-          };
-        });
+        getSocketServerImplementation.mockImplementation(
+          () =>
+            class MockServer {
+              // eslint-disable-next-line no-empty-function
+              onConnection() {}
+            }
+        );
       });
 
       afterEach((done) => {
diff --git a/test/server/utils/findPort.test.js b/test/server/utils/findPort.test.js
@@ -11,28 +11,34 @@ describe('findPort', () => {
     delete process.env.DEFAULT_PORT_RETRY;
 
     return dummyServers
-      .reduce((p, server) => {
-        return p.then(() => {
-          return new Promise((resolve) => {
-            server.close(resolve);
-          });
-        });
-      }, Promise.resolve())
+      .reduce(
+        (p, server) =>
+          p.then(
+            () =>
+              new Promise((resolve) => {
+                server.close(resolve);
+              })
+          ),
+        Promise.resolve()
+      )
       .then(() => {
         dummyServers = [];
       });
   });
 
   function createDummyServers(n) {
-    return (Array.isArray(n) ? n : [...new Array(n)]).reduce((p, _, i) => {
-      return p.then(() => {
-        return new Promise((resolve) => {
-          const server = http.createServer();
-          dummyServers.push(server);
-          server.listen(8080 + i, resolve);
-        });
-      });
-    }, Promise.resolve());
+    return (Array.isArray(n) ? n : [...new Array(n)]).reduce(
+      (p, _, i) =>
+        p.then(
+          () =>
+            new Promise((resolve) => {
+              const server = http.createServer();
+              dummyServers.push(server);
+              server.listen(8080 + i, resolve);
+            })
+        ),
+      Promise.resolve()
+    );
   }
 
   it('should returns the port when the port is specified', () => {
@@ -111,9 +117,7 @@ describe('findPort', () => {
 
     const spy = jest
       .spyOn(portfinder, 'getPort')
-      .mockImplementation((callback) => {
-        return callback(new Error('busy'));
-      });
+      .mockImplementation((callback) => callback(new Error('busy')));
 
     const retryCount = 1;
 
diff --git a/test/server/utils/runOpen.test.js b/test/server/utils/runOpen.test.js
diff --git a/test/testSequencer.js b/test/testSequencer.js
