test: more

Author: alexander-akait

client-src/index.js

@@ -44,11 +44,19 @@ self.addEventListener('beforeunload', () => {
 
 const onSocketMessage = {
   hot() {
+    if (parsedResourceQuery.hot === 'false') {
+      return;
+    }
+
     options.hot = true;
 
     log.info('Hot Module Replacement enabled.');
   },
   liveReload() {
+    if (parsedResourceQuery['live-reload'] === 'false') {
+      return;
+    }
+
     options.liveReload = true;
 
     log.info('Live Reloading enabled.');

test/e2e/__snapshots__/hot-and-live-reload.test.js.snap.webpack4

@@ -308,3 +308,26 @@ Array [
 `;
 
 exports[`hot and live reload should work and refresh content using live reload when live reload enabled and hot disabled (ws): page errors 1`] = `Array []`;
+
+exports[`hot and live reload should work with manual client setup (default): console messages 1`] = `
+Array [
+  "[HMR] Waiting for update signal from WDS...",
+  "[webpack-dev-server] Hot Module Replacement enabled.",
+  "[webpack-dev-server] Live Reloading enabled.",
+]
+`;
+
+exports[`hot and live reload should work with manual client setup (default): page errors 1`] = `Array []`;
+
+exports[`hot and live reload should work with manual client setup and allow to disable hot module replacement (default): console messages 1`] = `
+Array [
+  "[HMR] Waiting for update signal from WDS...",
+  "[webpack-dev-server] Live Reloading enabled.",
+]
+`;
+
+exports[`hot and live reload should work with manual client setup and allow to disable hot module replacement (default): page errors 1`] = `Array []`;
+
+exports[`hot and live reload should work with manual client setup and allow to disable live reload (default): console messages 1`] = `Array []`;
+
+exports[`hot and live reload should work with manual client setup and allow to disable live reload (default): page errors 1`] = `Array []`;

test/e2e/__snapshots__/hot-and-live-reload.test.js.snap.webpack5

@@ -308,3 +308,26 @@ Array [
 `;
 
 exports[`hot and live reload should work and refresh content using live reload when live reload enabled and hot disabled (ws): page errors 1`] = `Array []`;
+
+exports[`hot and live reload should work with manual client setup (default): console messages 1`] = `
+Array [
+  "[HMR] Waiting for update signal from WDS...",
+  "[webpack-dev-server] Hot Module Replacement enabled.",
+  "[webpack-dev-server] Live Reloading enabled.",
+]
+`;
+
+exports[`hot and live reload should work with manual client setup (default): page errors 1`] = `Array []`;
+
+exports[`hot and live reload should work with manual client setup and allow to disable hot module replacement (default): console messages 1`] = `
+Array [
+  "[HMR] Waiting for update signal from WDS...",
+  "[webpack-dev-server] Live Reloading enabled.",
+]
+`;
+
+exports[`hot and live reload should work with manual client setup and allow to disable hot module replacement (default): page errors 1`] = `Array []`;
+
+exports[`hot and live reload should work with manual client setup and allow to disable live reload (default): console messages 1`] = `Array []`;
+
+exports[`hot and live reload should work with manual client setup and allow to disable live reload (default): page errors 1`] = `Array []`;

test/e2e/hot-and-live-reload.test.js

@@ -215,6 +215,51 @@ describe('hot and live reload', () => {
         hot: true,
       },
     },
+    {
+      title: 'should work with manual client setup',
+      webpackOptions: {
+        entry: [
+          require.resolve('../../client-src/index.js'),
+          require.resolve('../fixtures/reload-config/foo.js'),
+        ],
+      },
+      options: {
+        client: false,
+        liveReload: true,
+        hot: true,
+      },
+    },
+    // TODO we still output logs from webpack, need to improve this
+    {
+      title:
+        'should work with manual client setup and allow to disable hot module replacement',
+      webpackOptions: {
+        entry: [
+          `${require.resolve('../../client-src/index.js')}?hot=false`,
+          require.resolve('../fixtures/reload-config/foo.js'),
+        ],
+      },
+      options: {
+        client: false,
+        liveReload: true,
+        hot: true,
+      },
+    },
+    {
+      title:
+        'should work with manual client setup and allow to disable live reload',
+      webpackOptions: {
+        entry: [
+          `${require.resolve('../../client-src/index.js')}?live-reload=false`,
+          require.resolve('../fixtures/reload-config/foo.js'),
+        ],
+      },
+      options: {
+        client: false,
+        liveReload: true,
+        hot: false,
+      },
+    },
   ];
 
   modes.forEach((mode) => {
@@ -229,7 +274,8 @@ describe('hot and live reload', () => {
         'body { background-color: rgb(0, 0, 255); }'
       );
 
-      const compiler = webpack(reloadConfig);
+      const webpackOptions = { ...reloadConfig, ...mode.webpackOptions };
+      const compiler = webpack(webpackOptions);
       const devServerOptions = {
         host: '0.0.0.0',
         port,
@@ -407,10 +453,31 @@ describe('hot and live reload', () => {
       let doNothing = false;
 
       const query = mode.query || '';
-      const allowToHotModuleReplacement =
-        query.indexOf('webpack-dev-server-hot=false') === -1;
-      const allowToLiveReload =
-        query.indexOf('webpack-dev-server-live-reload=false') === -1;
+      let allowToHotModuleReplacement = true;
+
+      if (query.indexOf('webpack-dev-server-hot=false') !== -1) {
+        allowToHotModuleReplacement = false;
+      }
+
+      if (
+        Array.isArray(webpackOptions.entry) &&
+        webpackOptions.entry.map((item) => item.includes('hot=false'))
+      ) {
+        allowToHotModuleReplacement = false;
+      }
+
+      let allowToLiveReload = true;
+
+      if (query.indexOf('webpack-dev-server-live-reload=false') !== -1) {
+        allowToLiveReload = false;
+      }
+
+      if (
+        Array.isArray(webpackOptions.entry) &&
+        webpackOptions.entry.map((item) => item.includes('live-reload=false'))
+      ) {
+        allowToLiveReload = false;
+      }
 
       if (
         allowToHotModuleReplacement &&

test/e2e/web-socket-server-and-transport.test.js

@@ -358,49 +358,6 @@ describe('web socket server and transport', () => {
     });
   });
 
-  it.only('should allow to disable default client', async () => {
-    const compiler = webpack(defaultConfig);
-    const devServerOptions = {
-      port,
-      client: false,
-    };
-    const server = new Server(devServerOptions, compiler);
-
-    await new Promise((resolve, reject) => {
-      server.listen(devServerOptions.port, devServerOptions.host, (error) => {
-        if (error) {
-          reject(error);
-
-          return;
-        }
-
-        resolve();
-      });
-    });
-
-    const { page, browser } = await runBrowser();
-
-    const consoleMessages = [];
-
-    page.on('console', (message) => {
-      consoleMessages.push(message);
-    });
-
-    await page.goto(`http://localhost:${port}/main`, {
-      waitUntil: 'networkidle0',
-    });
-
-    expect(consoleMessages.map((message) => message.text())).toMatchSnapshot();
-
-    await browser.close();
-
-    await new Promise((resolve) => {
-      server.close(() => {
-        resolve();
-      });
-    });
-  });
-
   it('should use custom web socket server when specify path to class', async () => {
     const compiler = webpack(defaultConfig);
     const devServerOptions = {