refactor: use methods to get client entries

lib/Server.js

@@ -794,14 +794,13 @@
       }
 
       additionalEntries.push(
-        `${require.resolve("../client/index.js")}?${webSocketURLStr}`,
+        `${this.getClientEntry()}?${webSocketURLStr}`,
       );
     }
 
-    if (this.options.hot === "only") {
-      additionalEntries.push(require.resolve("webpack/hot/only-dev-server"));
-    } else if (this.options.hot) {
-      additionalEntries.push(require.resolve("webpack/hot/dev-server"));
+    const clientHotEntry = this.getClientHotEntry();
+    if (clientHotEntry) {
+      additionalEntries.push(clientHotEntry);
     }
 
     const webpack = compiler.webpack || require("webpack");
@@ -1676,6 +1675,26 @@
     return implementation;
   }
 
+  /**
+   * @private
+   * @returns {string}
+   */
+  getClientEntry() {
+    return require.resolve("../client/index.js");
+  }
+
+  /**
+   * @private
+   * @returns {string | void}
+   */
+  getClientHotEntry() {
+    if (this.options.hot === "only") {
+      return require.resolve("webpack/hot/only-dev-server");
+    } else if (this.options.hot) {
+      return require.resolve("webpack/hot/dev-server");
+    }
+  }
+
   /**
    * @private
    * @returns {void}

test/e2e/__snapshots__/client.test.js.snap.webpack5

@@ -12,6 +12,8 @@ exports[`client option default behaviour responds with a 200 status code for /ws
 
 exports[`client option default behaviour responds with a 200 status code for /ws path: response status 1`] = `200`;
 
+exports[`client option override client entry should disable client entry: response status 1`] = `200`;
+
 exports[`client option should respect path option responds with a 200 status code for /foo/test/bar path: console messages 1`] = `[]`;
 
 exports[`client option should respect path option responds with a 200 status code for /foo/test/bar path: page errors 1`] = `[]`;

test/e2e/client.test.js

@@ -193,6 +193,60 @@ describe("client option", () => {
     });
   });
 
+  describe("override client entry", () => {
+    let compiler;
+    let server;
+    let page;
+    let browser;
+
+    class OverrideServer extends Server {
+      // eslint-disable-next-line class-methods-use-this
+      getClientEntry() {
+        return require.resolve(
+          "../fixtures/custom-client/CustomClientEntry.js",
+        );
+      }
+      // eslint-disable-next-line class-methods-use-this
+      getClientHotEntry() {
+        return require.resolve(
+          "../fixtures/custom-client/CustomClientHotEntry.js",
+        );
+      }
+    }
+
+    beforeEach(async () => {
+      compiler = webpack(config);
+
+      server = new OverrideServer(
+        {
+          port,
+        },
+        compiler,
+      );
+
+      await server.start();
+
+      ({ page, browser } = await runBrowser());
+    });
+
+    afterEach(async () => {
+      await browser.close();
+      await server.stop();
+    });
+
+    it("should disable client entry", async () => {
+      const response = await page.goto(`http://127.0.0.1:${port}/main.js`, {
+        waitUntil: "networkidle0",
+      });
+
+      expect(response.status()).toMatchSnapshot("response status");
+
+      const content = await response.text();
+      expect(content).toContain("CustomClientEntry.js");
+      expect(content).toContain("CustomClientHotEntry.js");
+    });
+  });
+
   describe("webSocketTransport", () => {
     const clientModes = [
       {

test/fixtures/custom-client/CustomClientEntry.js

@@ -0,0 +1,3 @@
+"use strict";
+
+console.log("custom client entry");

test/fixtures/custom-client/CustomClientHotEntry.js

@@ -0,0 +1,3 @@
+"use strict";
+
+console.log("custom client hot entry");

types/lib/Server.d.ts

@@ -1230,6 +1230,16 @@ declare class Server<
    * @returns {T}
    */
   private getServerTransport;
+  /**
+   * @private
+   * @returns {string}
+   */
+  private getClientEntry;
+  /**
+   * @private
+   * @returns {string | void}
+   */
+  private getClientHotEntry;
   /**
    * @private
    * @returns {void}