fix: disable socket injection when hot & liveReload are disabled

.eslintignore

@@ -1,5 +1,4 @@
 /client
 !/test/client
 coverage
-client-src/live/web_modules/
 node_modules

.prettierignore

@@ -1,6 +1,5 @@
 /client
 !/test/client
 coverage
-client-src/live/web_modules/
 node_modules
 CHANGELOG.md

azure-pipelines.yml

@@ -52,12 +52,6 @@ jobs:
         node-10:
           node_version: ^10.13.0
           webpack_version: latest
-        node-8:
-          node_version: ^8.9.0
-          webpack_version: latest
-        node-6:
-          node_version: ^6.9.0
-          webpack_version: latest
         node-10-canary:
           node_version: ^10.13.0
           webpack_version: next
@@ -111,12 +105,6 @@ jobs:
         node-10:
           node_version: ^10.13.0
           webpack_version: latest
-        node-8:
-          node_version: ^8.9.0
-          webpack_version: latest
-        node-6:
-          node_version: ^6.9.0
-          webpack_version: latest
         node-10-canary:
           node_version: ^10.13.0
           webpack_version: next
@@ -170,12 +158,6 @@ jobs:
         node-10:
           node_version: ^10.13.0
           webpack_version: latest
-        node-8:
-          node_version: ^8.9.0
-          webpack_version: latest
-        node-6:
-          node_version: ^6.9.0
-          webpack_version: latest
         node-10-canary:
           node_version: ^10.13.0
           webpack_version: next

bin/cli-flags.js

@@ -14,11 +14,6 @@ module.exports = {
       type: Boolean,
       describe: 'Broadcasts the server via ZeroConf networking on start',
     },
-    {
-      name: 'lazy',
-      type: Boolean,
-      describe: 'Lazy',
-    },
     {
       name: 'liveReload',
       type: Boolean,
@@ -31,13 +26,6 @@ module.exports = {
       describe: 'Enables/Disables serveIndex middleware',
       defaultValue: true,
     },
-    {
-      name: 'inline',
-      type: Boolean,
-      defaultValue: true,
-      describe:
-        'Inline mode (set to false to disable including client scripts like livereload)',
-    },
     {
       name: 'profile',
       type: Boolean,
@@ -96,36 +84,6 @@ module.exports = {
       group: SSL_GROUP,
       describe: 'HTTP/2, must be used with HTTPS',
     },
-    {
-      name: 'key',
-      type: String,
-      describe: 'Path to a SSL key.',
-      group: SSL_GROUP,
-    },
-    {
-      name: 'cert',
-      type: String,
-      describe: 'Path to a SSL certificate.',
-      group: SSL_GROUP,
-    },
-    {
-      name: 'cacert',
-      type: String,
-      describe: 'Path to a SSL CA certificate.',
-      group: SSL_GROUP,
-    },
-    {
-      name: 'pfx',
-      type: String,
-      describe: 'Path to a SSL pfx file.',
-      group: SSL_GROUP,
-    },
-    {
-      name: 'pfx-passphrase',
-      type: String,
-      describe: 'Passphrase for pfx file.',
-      group: SSL_GROUP,
-    },
     {
       name: 'content-base',
       type: String,

bin/options.js

@@ -16,10 +16,6 @@ const options = {
     type: 'boolean',
     describe: 'Broadcasts the server via ZeroConf networking on start',
   },
-  lazy: {
-    type: 'boolean',
-    describe: 'Lazy',
-  },
   liveReload: {
     type: 'boolean',
     describe: 'Enables/Disables live reloading on changing files',
@@ -30,12 +26,6 @@ const options = {
     describe: 'Enables/Disables serveIndex middleware',
     default: true,
   },
-  inline: {
-    type: 'boolean',
-    default: true,
-    describe:
-      'Inline mode (set to false to disable including client scripts like livereload)',
-  },
   profile: {
     type: 'boolean',
     describe: 'Print compilation profile data for progress steps',
@@ -106,31 +96,6 @@ const options = {
     group: SSL_GROUP,
     describe: 'HTTP/2, must be used with HTTPS',
   },
-  key: {
-    type: 'string',
-    describe: 'Path to a SSL key.',
-    group: SSL_GROUP,
-  },
-  cert: {
-    type: 'string',
-    describe: 'Path to a SSL certificate.',
-    group: SSL_GROUP,
-  },
-  cacert: {
-    type: 'string',
-    describe: 'Path to a SSL CA certificate.',
-    group: SSL_GROUP,
-  },
-  pfx: {
-    type: 'string',
-    describe: 'Path to a SSL pfx file.',
-    group: SSL_GROUP,
-  },
-  'pfx-passphrase': {
-    type: 'string',
-    describe: 'Passphrase for pfx file.',
-    group: SSL_GROUP,
-  },
   'content-base': {
     type: 'string',
     describe: 'A directory or URL to serve HTML content from.',

client-src/default/index.js

@@ -136,7 +136,11 @@ const onSocketMessage = {
     log.error(error);
   },
   close() {
-    log.error('[WDS] Disconnected!');
+    if (options.hot || options.liveReload) {
+      log.error('[WDS] Disconnected!');
+    } else {
+      log.error('[WDS] Hot Module Replacement & Live Reloading are disabled!');
+    }
     sendMessage('Close');
   },
 };

client-src/default/overlay.js

@@ -113,11 +113,9 @@ function clear() {
 function showMessage(messages) {
   ensureOverlayDivExists((div) => {
     // Make it look similar to our terminal.
-    div.innerHTML = `<span style="color: #${
-      colors.red
-    }">Failed to compile.</span><br><br>${ansiHTML(
-      entities.encode(messages[0])
-    )}`;
+    const text = ansiHTML(entities.encode(messages[0]));
+
+    div.innerHTML = `<span style="color: #${colors.red}">Failed to compile.</span><br><br>${text}`;
   });
 }
 

client-src/default/socket.js

@@ -5,18 +5,13 @@
   camelcase
 */
 
-// this SockJSClient is here as a default fallback, in case inline mode
-// is off or the client is not injected. This will be switched to
-// WebsocketClient when it becomes the default
-
-// important: the path to SockJSClient here is made to work in the 'client'
-// directory, but is updated via the webpack compilation when compiled from
-// the 'client-src' directory
+// this WebsocketClient is here as a default fallback,
+//  in case the client is not injected
 const Client =
   typeof __webpack_dev_server_client__ !== 'undefined'
     ? __webpack_dev_server_client__
     : // eslint-disable-next-line import/no-unresolved
-      require('./clients/SockJSClient');
+      require('../clients/WebsocketClient');
 
 let retries = 0;
 let client = null;

client-src/default/utils/createSocketUrl.js

@@ -75,7 +75,7 @@ function getSocketUrl(urlParts, loc) {
   // resourceQuery, so we need to fall back to the default if
   // they are not provided
   const sockHost = query.sockHost || hostname;
-  const sockPath = query.sockPath || '/sockjs-node';
+  const sockPath = query.sockPath || '/ws';
   let sockPort = query.sockPort || port;
 
   if (sockPort === 'location') {

client-src/default/webpack.config.js

@@ -1,9 +1,14 @@
 'use strict';
 
-const webpack = require('webpack');
+const path = require('path');
 
 module.exports = {
   mode: 'production',
+  entry: path.join(__dirname, 'index.js'),
+  output: {
+    path: path.resolve(__dirname, '../../client/default'),
+    filename: 'index.bundle.js',
+  },
   module: {
     rules: [
       {
@@ -17,17 +22,4 @@ module.exports = {
       },
     ],
   },
-  plugins: [
-    new webpack.NormalModuleReplacementPlugin(
-      /^\.\/clients\/SockJSClient$/,
-      (resource) => {
-        if (resource.context.startsWith(process.cwd())) {
-          resource.request = resource.request.replace(
-            /^\.\/clients\/SockJSClient$/,
-            '../clients/SockJSClient'
-          );
-        }
-      }
-    ),
-  ],
 };