refactor(client): make use of ESM instead of CJS (#1967)

Author: hiroppy

.eslintrc

@@ -2,7 +2,11 @@
   "extends": ["webpack", "prettier"],
   "globals": {
     "document": true,
-    "window": true
+    "window": true,
+    "self": true,
+    "WorkerGlobalScope": true,
+    "__resourceQuery": true,
+    "__webpack_dev_server_client__": true
   },
   "parserOptions": {
     "sourceType": "script",

client-src/.eslintrc

@@ -0,0 +1,5 @@
+{
+  "parserOptions": {
+    "sourceType": "module"
+  }
+}

client-src/clients/BaseClient.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /* eslint-disable
   no-unused-vars
 */

client-src/clients/SockJSClient.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /* eslint-disable
   no-unused-vars
 */

client-src/clients/WebsocketClient.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /* global WebSocket */
 
 /* eslint-disable

client-src/default/index.js

@@ -1,14 +1,14 @@
-'use strict';
-
-/* global __resourceQuery WorkerGlobalScope self */
 /* eslint prefer-destructuring: off */
-const stripAnsi = require('strip-ansi');
-const socket = require('./socket');
-const overlay = require('./overlay');
-const { log, setLogLevel } = require('./utils/log');
-const sendMessage = require('./utils/sendMessage');
-const reloadApp = require('./utils/reloadApp');
-const createSocketUrl = require('./utils/createSocketUrl');
+import stripAnsi from 'strip-ansi';
+import socket from './socket';
+import {
+  clear as clearOverlay,
+  showMessage as showMessageOverlay,
+} from './overlay';
+import { log, setLogLevel } from './utils/log';
+import sendMessage from './utils/sendMessage';
+import reloadApp from './utils/reloadApp';
+import createSocketUrl from './utils/createSocketUrl';
 
 const status = {
   isUnloading: false,
@@ -47,7 +47,7 @@ const onSocketMessage = {
     log.info('[WDS] App updated. Recompiling...');
     // fixes #1042. overlay doesn't clear if errors are fixed but warnings remain.
     if (options.useWarningOverlay || options.useErrorOverlay) {
-      overlay.clear();
+      clearOverlay();
     }
     sendMessage('Invalid');
   },
@@ -57,7 +57,7 @@ const onSocketMessage = {
   'still-ok': function stillOk() {
     log.info('[WDS] Nothing changed.');
     if (options.useWarningOverlay || options.useErrorOverlay) {
-      overlay.clear();
+      clearOverlay();
     }
     sendMessage('StillOk');
   },
@@ -93,7 +93,7 @@ const onSocketMessage = {
   ok() {
     sendMessage('Ok');
     if (options.useWarningOverlay || options.useErrorOverlay) {
-      overlay.clear();
+      clearOverlay();
     }
     if (options.initial) {
       return (options.initial = false);
@@ -112,7 +112,7 @@ const onSocketMessage = {
       log.warn(strippedWarnings[i]);
     }
     if (options.useWarningOverlay) {
-      overlay.showMessage(warnings);
+      showMessageOverlay(warnings);
     }
 
     if (options.initial) {
@@ -128,7 +128,7 @@ const onSocketMessage = {
       log.error(strippedErrors[i]);
     }
     if (options.useErrorOverlay) {
-      overlay.showMessage(errors);
+      showMessageOverlay(errors);
     }
     options.initial = false;
   },

client-src/default/overlay.js

@@ -1,12 +1,10 @@
-'use strict';
-
 // The error overlay is inspired (and mostly copied) from Create React App (https://github.com/facebookincubator/create-react-app)
 // They, in turn, got inspired by webpack-hot-middleware (https://github.com/glenjamin/webpack-hot-middleware).
 
-const ansiHTML = require('ansi-html');
-const { AllHtmlEntities } = require('html-entities');
+import ansiHTML from 'ansi-html';
+import { AllHtmlEntities as Entities } from 'html-entities';
 
-const entities = new AllHtmlEntities();
+const entities = new Entities();
 const colors = {
   reset: ['transparent', 'transparent'],
   black: '181818',
@@ -95,8 +93,8 @@ function ensureOverlayDivExists(onOverlayDivReady) {
   document.body.appendChild(overlayIframe);
 }
 
-// Successful compilation.
-function clear() {
+// successful compilation.
+export function clear() {
   if (!overlayDiv) {
     // It is not there in the first place.
     return;
@@ -110,7 +108,7 @@ function clear() {
 }
 
 // Compilation with errors (e.g. syntax error or missing modules).
-function showMessage(messages) {
+export function showMessage(messages) {
   ensureOverlayDivExists((div) => {
     // Make it look similar to our terminal.
     div.innerHTML = `<span style="color: #${
@@ -120,8 +118,3 @@ function showMessage(messages) {
     )}`;
   });
 }
-
-module.exports = {
-  clear,
-  showMessage,
-};

client-src/default/socket.js

@@ -1,6 +1,3 @@
-'use strict';
-
-/* global __webpack_dev_server_client__ */
 /* eslint-disable
   camelcase
 */
@@ -58,4 +55,4 @@ const socket = function initSocket(url, handlers) {
   });
 };
 
-module.exports = socket;
+export default socket;

client-src/default/utils/createSocketUrl.js

@@ -1,9 +1,6 @@
-'use strict';
-
-/* global self */
-
-const url = require('url');
-const getCurrentScriptSource = require('./getCurrentScriptSource');
+import url from 'url';
+import querystring from 'querystring';
+import getCurrentScriptSource from './getCurrentScriptSource';
 
 function createSocketUrl(resourceQuery, currentLocation) {
   let urlParts;
@@ -94,4 +91,4 @@ function getSocketUrl(urlParts, loc) {
   });
 }
 
-module.exports = createSocketUrl;
+export default createSocketUrl;

client-src/default/utils/getCurrentScriptSource.js

@@ -1,5 +1,3 @@
-'use strict';
-
 function getCurrentScriptSource() {
   // `document.currentScript` is the most accurate way to find the current script,
   // but is not supported in all browsers.
@@ -17,4 +15,4 @@ function getCurrentScriptSource() {
   throw new Error('[WDS] Failed to get current script source.');
 }
 
-module.exports = getCurrentScriptSource;
+export default getCurrentScriptSource;