Change approach

pmmmwh · Feb 16, 2020 · e59a8ad · e59a8ad
1 parent de4b50a
commit e59a8ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/runtime/WHMEventSource.js b/src/runtime/WHMEventSource.js
@@ -4,12 +4,7 @@
  */
 
 module.exports = function loadWHMEventSource(messageHandler) {
-  let client;
-  try {
-    client = require('webpack-hot-middleware/client');
-  } catch (e) {
-    return false;
-  }
+  const client = require('webpack-hot-middleware/client');
 
   client.useCustomOverlay({
     showProblems(type, data) {

diff --git a/src/runtime/createSocket.js b/src/runtime/createSocket.js
@@ -9,17 +9,19 @@ const loadWHMEventSource = require('./WHMEventSource');
 let SocketClient;
 if (typeof __webpack_dev_server_client__ !== 'undefined') {
   SocketClient = __webpack_dev_server_client__;
-} else {
-  SocketClient = require('./SockJSClient');
+  // } else {
+  //   SocketClient = require('./SockJSClient');
 }
 
 /**
  * Creates a socket server for HMR according to the user's Webpack configuration.
  * @param {function(*): void} messageHandler A handler to consume Webpack compilation messages.
  */
 function createSocket(messageHandler) {
-  const loadedWHMEventSource = loadWHMEventSource(messageHandler);
-  if (loadedWHMEventSource) return;
+  if (!SocketClient) {
+    loadWHMEventSource(messageHandler);
+    return;
+  }
 
   const connection = new SocketClient(
     // TODO: Dynamically generate this to handle resourceQuery