refactor(eslint): make global-require to off

.eslintrc

@@ -15,6 +15,7 @@
     "no-underscore-dangle": "off",
     "prefer-destructuring": ["error", { "object": false, "array": false }],
     "prefer-rest-params": "off",
-    "strict": ["error", "safe"]
+    "strict": ["error", "safe"],
+    "global-require": "off"
   }
 }

bin/options.js

@@ -1,7 +1,6 @@
 'use strict';
 
 /* eslint-disable
-  global-require,
   multiline-ternary,
   space-before-function-paren
 */

client-src/default/utils/reloadApp.js

@@ -13,7 +13,6 @@ function reloadApp(
   }
   if (hot) {
     log.info('[WDS] App hot update...');
-    // eslint-disable-next-line global-require
     const hotEmitter = require('webpack/hot/emitter');
     hotEmitter.emit('webpackHotUpdate', currentHash);
     if (typeof self !== 'undefined' && self.window) {

client-src/live/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-/* eslint import/no-extraneous-dependencies: off, global-require: off */
+/* eslint import/no-extraneous-dependencies: off */
 
 const $ = require('jquery');
 const stripAnsi = require('strip-ansi');

examples/general/proxy-hot-reload/webpack.config.js

@@ -1,6 +1,5 @@
 'use strict';
 
-/* eslint global-require: off */
 const fs = require('fs');
 // our setup function adds behind-the-scenes bits to the config that all of our
 // examples need

lib/Server.js

@@ -665,7 +665,6 @@ class Server {
         // The relevant issues are:
         // https://github.com/spdy-http2/node-spdy/issues/350
         // https://github.com/webpack/webpack-dev-server/issues/1592
-        // eslint-disable-next-line global-require
         this.listeningApp = require('spdy').createServer(
           this.options.https,
           this.app

lib/servers/SockJSServer.js

@@ -11,7 +11,6 @@ const BaseServer = require('./BaseServer');
 // sockjs will remove Origin header, however Origin header is required for checking host.
 // See https://github.com/webpack/webpack-dev-server/issues/1604 for more information
 {
-  // eslint-disable-next-line global-require
   const SockjsSession = require('sockjs/lib/transport').Session;
   const decorateConnection = SockjsSession.prototype.decorateConnection;
   SockjsSession.prototype.decorateConnection = function(req) {

lib/utils/getSocketClientPath.js

@@ -7,14 +7,12 @@ function getSocketClientPath(options) {
     case 'string':
       // could be 'sockjs', 'ws', or a path that should be required
       if (options.clientMode === 'sockjs') {
-        // eslint-disable-next-line global-require
         ClientImplementation = require('../../client/clients/SockJSClient');
       } else if (options.clientMode === 'ws') {
-        // eslint-disable-next-line global-require
         ClientImplementation = require('../../client/clients/WebsocketClient');
       } else {
         try {
-          // eslint-disable-next-line global-require, import/no-dynamic-require
+          // eslint-disable-next-line import/no-dynamic-require
           ClientImplementation = require(options.clientMode);
         } catch (e) {
           clientImplFound = false;

lib/utils/getSocketServerImplementation.js

@@ -7,14 +7,12 @@ function getSocketServerImplementation(options) {
     case 'string':
       // could be 'sockjs', in the future 'ws', or a path that should be required
       if (options.serverMode === 'sockjs') {
-        // eslint-disable-next-line global-require
         ServerImplementation = require('../servers/SockJSServer');
       } else if (options.serverMode === 'ws') {
-        // eslint-disable-next-line global-require
         ServerImplementation = require('../servers/WebsocketServer');
       } else {
         try {
-          // eslint-disable-next-line global-require, import/no-dynamic-require
+          // eslint-disable-next-line import/no-dynamic-require
           ServerImplementation = require(options.serverMode);
         } catch (e) {
           serverImplFound = false;

lib/utils/getVersions.js

@@ -1,7 +1,5 @@
 'use strict';
 
-/* eslint-disable global-require */
-
 function getVersions() {
   return (
     `webpack-dev-server ${require('../../package.json').version}\n` +

lib/utils/runBonjour.js

@@ -1,7 +1,6 @@
 'use strict';
 
 function runBonjour(options) {
-  // eslint-disable-next-line global-require
   const bonjour = require('bonjour')();
 
   bonjour.publish({

test/client/index.test.js

@@ -1,7 +1,6 @@
 'use strict';
 
 /* eslint-disable
-  global-require,
   no-undefined
 */
 /* global self */

test/client/socket-helper.test.js

@@ -8,9 +8,7 @@ describe('socket', () => {
 
   it('should default to SockJSClient when no __webpack_dev_server_client__ set', () => {
     jest.mock('../../client/clients/SockJSClient');
-    // eslint-disable-next-line global-require
     const socket = require('../../client/socket');
-    // eslint-disable-next-line global-require
     const SockJSClient = require('../../client/clients/SockJSClient');
 
     const mockHandler = jest.fn();
@@ -38,9 +36,7 @@ describe('socket', () => {
 
   it('should use __webpack_dev_server_client__ when set', () => {
     jest.mock('../../client/clients/SockJSClient');
-    // eslint-disable-next-line global-require
     const socket = require('../../client/socket');
-    // eslint-disable-next-line global-require
     global.__webpack_dev_server_client__ = require('../../client/clients/SockJSClient');
 
     const mockHandler = jest.fn();

test/client/utils/createSocketUrl.test.js

@@ -21,7 +21,6 @@ describe('createSocketUrl', () => {
       () => () => url
     );
 
-    // eslint-disable-next-line global-require
     const createSocketUrl = require('../../../client-src/default/utils/createSocketUrl');
 
     test(`should return the url when __resourceQuery is ${url}`, () => {

test/client/utils/log.test.js

@@ -6,7 +6,6 @@ describe('log', () => {
 
   beforeEach(() => {
     jest.mock('loglevel');
-    // eslint-disable-next-line global-require
     logMock = require('loglevel');
     logMock.getLogger.mockImplementation(() => {
       return {
@@ -17,7 +16,6 @@ describe('log', () => {
       };
     });
 
-    // eslint-disable-next-line global-require
     setLogLevel = require('../../../client-src/default/utils/log').setLogLevel;
   });
 

test/client/utils/reloadApp.test.js

@@ -15,7 +15,6 @@ describe('reloadApp', () => {
 
     jest.mock('loglevel');
 
-    // eslint-disable-next-line global-require
     log = require('loglevel');
     log.getLogger.mockImplementation(() => {
       return {
@@ -24,7 +23,6 @@ describe('reloadApp', () => {
       };
     });
 
-    // eslint-disable-next-line global-require
     reloadApp = require('../../../client-src/default/utils/reloadApp');
   });
 
@@ -47,7 +45,6 @@ describe('reloadApp', () => {
 
   test('should run hot', () => {
     jest.mock('webpack/hot/emitter');
-    // eslint-disable-next-line global-require
     const emitter = require('webpack/hot/emitter');
     emitter.emit = jest.fn();
 

test/e2e/Progress.test.js

@@ -22,7 +22,6 @@ describe('client progress', () => {
       processStderrMock = jest
         .spyOn(process.stderr, 'write')
         .mockImplementation();
-      // eslint-disable-next-line global-require
       testServer = require('../helpers/test-server');
 
       fs.writeFileSync(

test/server/Server.test.js

@@ -137,7 +137,6 @@ describe('Server', () => {
     it('should be present', () => {
       expect(process.env.WEBPACK_DEV_SERVER).toBeUndefined();
 
-      // eslint-disable-next-line global-require
       require('../../lib/Server');
 
       expect(process.env.WEBPACK_DEV_SERVER).toBe(true);

test/server/clientMode-option.test.js

@@ -29,7 +29,6 @@ describe('clientMode option', () => {
   describe('is passed to getSocketClientPath correctly', () => {
     beforeEach(() => {
       jest.mock('../../lib/utils/getSocketClientPath');
-      // eslint-disable-next-line global-require
       getSocketClientPath = require('../../lib/utils/getSocketClientPath');
     });
 
@@ -42,7 +41,6 @@ describe('clientMode option', () => {
 
     clientModes.forEach((data) => {
       it(data.title, (done) => {
-        // eslint-disable-next-line global-require
         mockedTestServer = require('../helpers/test-server');
         mockedTestServer.start(
           config,
@@ -67,7 +65,6 @@ describe('clientMode option', () => {
   describe('passed to server', () => {
     beforeAll(() => {
       jest.unmock('../../lib/utils/getSocketClientPath');
-      // eslint-disable-next-line global-require
       testServer = require('../helpers/test-server');
     });
 

test/server/http2-option.test.js

@@ -27,9 +27,7 @@ describe('http2 option', () => {
     semver.gte(process.version, '8.8.0') &&
     semver.lt(process.version, '10.0.0')
   ) {
-    /* eslint-disable global-require */
     const http2 = require('http2');
-    /* eslint-enable global-require */
     describe('http2 works with https', () => {
       beforeAll((done) => {
         server = testServer.start(

test/server/serverMode-option.test.js

@@ -57,7 +57,6 @@ describe('serverMode option', () => {
   describe('is passed to getSocketServerImplementation correctly', () => {
     beforeEach(() => {
       jest.mock('../../lib/utils/getSocketServerImplementation');
-      // eslint-disable-next-line global-require
       getSocketServerImplementation = require('../../lib/utils/getSocketServerImplementation');
       getSocketServerImplementation.mockImplementation(() => {
         return class MockServer {
@@ -76,7 +75,6 @@ describe('serverMode option', () => {
 
     serverModes.forEach((data) => {
       it(data.title, (done) => {
-        // eslint-disable-next-line global-require
         mockedTestServer = require('../helpers/test-server');
         mockedTestServer.start(
           config,
@@ -102,7 +100,6 @@ describe('serverMode option', () => {
   describe('passed to server', () => {
     beforeAll(() => {
       jest.unmock('../../lib/utils/getSocketServerImplementation');
-      // eslint-disable-next-line global-require
       testServer = require('../helpers/test-server');
     });
 
@@ -410,9 +407,7 @@ describe('serverMode option', () => {
     let MockSockJSServer;
     beforeEach((done) => {
       jest.mock('../../lib/servers/SockJSServer');
-      // eslint-disable-next-line global-require
       mockedTestServer = require('../helpers/test-server');
-      // eslint-disable-next-line global-require
       MockSockJSServer = require('../../lib/servers/SockJSServer');
 
       server = mockedTestServer.start(

test/server/utils/updateCompiler.test.js

@@ -7,7 +7,6 @@ describe('updateCompiler', () => {
   describe('simple config, inline', () => {
     let compiler;
     beforeAll(() => {
-      // eslint-disable-next-line global-require
       const webpackConfig = require('../../fixtures/simple-config/webpack.config');
       compiler = webpack(webpackConfig);
     });
@@ -44,7 +43,6 @@ describe('updateCompiler', () => {
   describe('simple config, hot and inline', () => {
     let compiler;
     beforeAll(() => {
-      // eslint-disable-next-line global-require
       const webpackConfig = require('../../fixtures/simple-config/webpack.config');
       compiler = webpack(webpackConfig);
     });
@@ -81,7 +79,6 @@ describe('updateCompiler', () => {
   describe('simple config with HMR already, hot and inline', () => {
     let compiler;
     beforeAll(() => {
-      // eslint-disable-next-line global-require
       const webpackConfig = require('../../fixtures/simple-config/webpack.config');
       webpackConfig.plugins = [new webpack.HotModuleReplacementPlugin()];
       compiler = webpack(webpackConfig);
@@ -119,7 +116,6 @@ describe('updateCompiler', () => {
   describe('multi compiler config, hot and inline', () => {
     let multiCompiler;
     beforeAll(() => {
-      // eslint-disable-next-line global-require
       const webpackConfig = require('../../fixtures/multi-compiler-2-config/webpack.config');
       webpackConfig[1].plugins = [new webpack.HotModuleReplacementPlugin()];
       multiCompiler = webpack(webpackConfig);