@modern-js/server 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/js/node/dev-tools/dev-middleware/hmr-client/createSocketUrl.js

@@ -1,17 +1,32 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  createSocketUrl: () => createSocketUrl,
+  formatURL: () => formatURL
 });
-exports.createSocketUrl = createSocketUrl;
-exports.formatURL = formatURL;
-var _constants = require("@modern-js/utils/constants");
+module.exports = __toCommonJS(stdin_exports);
+var import_constants = require("@modern-js/utils/constants");
 function createSocketUrl(resourceQuery) {
-  // ?host=localhost&port=8080&path=modern_js_hmr_ws
-  const searchParams = resourceQuery.substr(1).split('&');
+  const searchParams = resourceQuery.substr(1).split("&");
   const options = {};
   for (const pair of searchParams) {
-    const ary = pair.split('=');
+    const ary = pair.split("=");
     options[ary[0]] = decodeURIComponent(ary[1]);
   }
   const currentLocation = self.location;
@@ -24,30 +39,22 @@ function formatURL({
   pathname
 }) {
   if (window.URL) {
-    // eslint-disable-next-line node/prefer-global/url, node/no-unsupported-features/node-builtins
-    const url = new URL('http://localhost');
+    const url = new URL("http://localhost");
     url.port = port;
     url.hostname = hostname;
     url.protocol = protocol;
     url.pathname = pathname;
     return url.toString();
   }
-
-  // compatible with IE11
-  const colon = protocol.indexOf(':') === -1 ? ':' : '';
+  const colon = protocol.indexOf(":") === -1 ? ":" : "";
   return `${protocol}${colon}//${hostname}:${port}${pathname}`;
 }
 function getSocketUrl(urlParts, location) {
-  const {
-    host,
-    port,
-    path,
-    protocol
-  } = urlParts;
+  const { host, port, path, protocol } = urlParts;
   return formatURL({
-    protocol: protocol || location.protocol === 'https:' ? 'wss' : 'ws',
+    protocol: protocol || location.protocol === "https:" ? "wss" : "ws",
     hostname: host || location.hostname,
     port: port || location.port,
-    pathname: path || _constants.HMR_SOCK_PATH
+    pathname: path || import_constants.HMR_SOCK_PATH
   });
-}
+}

package/dist/js/node/dev-tools/dev-middleware/hmr-client/index.js

@@ -1,167 +1,127 @@
-"use strict";
-
-var _stripAnsi = _interopRequireDefault(require("@modern-js/utils/strip-ansi"));
-var _format = require("@modern-js/utils/format");
-var _createSocketUrl = require("./createSocketUrl");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * This has been adapted from `create-react-app`, authored by Facebook, Inc.
- * see: https://github.com/facebookincubator/create-react-app/tree/master/packages/react-dev-utils
- *
- * Tips: this package will be bundled and running in the browser, do not import from the entry of @modern-js/utils.
- */
-
-// TODO hadRuntimeError should be fixed.
-// We need to keep track of if there has been a runtime error.
-// Essentially, we cannot guarantee application state was not corrupted by the
-// runtime error. To prevent confusing behavior, we forcibly reload the entire
-// application. This is handled below when we are notified of a compile (code
-// change).
-// See https://github.com/facebook/create-react-app/issues/3096
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var import_strip_ansi = __toESM(require("@modern-js/utils/strip-ansi"));
+var import_format = require("@modern-js/utils/format");
+var import_createSocketUrl = require("./createSocketUrl");
 const hadRuntimeError = false;
-
-// Connect to Dev Server
-const socketUrl = (0, _createSocketUrl.createSocketUrl)(__resourceQuery);
+const socketUrl = (0, import_createSocketUrl.createSocketUrl)(__resourceQuery);
 const connection = new WebSocket(socketUrl);
-
-// Unlike WebpackDevServer client, we won't try to reconnect
-// to avoid spamming the console. Disconnect usually happens
-// when developer stops the server.
-connection.onclose = function () {
-  if (typeof console !== 'undefined' && typeof console.info === 'function') {
-    console.info('The development server has disconnected.\nRefresh the page if necessary.');
+connection.onclose = function() {
+  if (typeof console !== "undefined" && typeof console.info === "function") {
+    console.info(
+      "The development server has disconnected. Refresh the page if necessary."
+    );
   }
 };
-
-// Remember some state related to hot module replacement.
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 function clearOutdatedErrors() {
-  // Clean up outdated compile errors, if any.
-  // eslint-disable-next-line node/no-unsupported-features/node-builtins, no-console
-  if (typeof console !== 'undefined' && typeof console.clear === 'function') {
+  if (typeof console !== "undefined" && typeof console.clear === "function") {
     if (hasCompileErrors) {
-      // eslint-disable-next-line node/no-unsupported-features/node-builtins, no-console
       console.clear();
     }
   }
 }
-
-// Successful compilation.
 function handleSuccess() {
   clearOutdatedErrors();
   const isHotUpdate = !isFirstCompilation;
   isFirstCompilation = false;
   hasCompileErrors = false;
-
-  // Attempt to apply hot updates or reload.
   if (isHotUpdate) {
     tryApplyUpdates();
   }
 }
-
-// Compilation with warnings (e.g. ESLint).
 function handleWarnings(warnings) {
   clearOutdatedErrors();
   const isHotUpdate = !isFirstCompilation;
   isFirstCompilation = false;
   hasCompileErrors = false;
   function printWarnings() {
-    // Print warnings to the console.
-    const formatted = (0, _format.formatWebpackMessages)({
+    const formatted = (0, import_format.formatWebpackMessages)({
       warnings,
       errors: []
     });
-    if (typeof console !== 'undefined' && typeof console.warn === 'function') {
+    if (typeof console !== "undefined" && typeof console.warn === "function") {
       for (let i = 0; i < formatted.warnings.length; i++) {
         if (i === 5) {
-          console.warn('There were more warnings in other files.\n' + 'You can find a complete log in the terminal.');
+          console.warn(
+            "There were more warnings in other files. You can find a complete log in the terminal."
+          );
           break;
         }
-        console.warn((0, _stripAnsi.default)(formatted.warnings[i]));
+        console.warn((0, import_strip_ansi.default)(formatted.warnings[i]));
       }
     }
   }
   printWarnings();
-
-  // Attempt to apply hot updates or reload.
   if (isHotUpdate) {
     tryApplyUpdates();
   }
 }
-
-// Compilation with errors (e.g. syntax error or missing modules).
 function handleErrors(errors) {
   clearOutdatedErrors();
   isFirstCompilation = false;
   hasCompileErrors = true;
-
-  // "Massage" webpack messages.
-  const formatted = (0, _format.formatWebpackMessages)({
+  const formatted = (0, import_format.formatWebpackMessages)({
     errors,
     warnings: []
   });
-
-  // Also log them to the console.
-  if (typeof console !== 'undefined' && typeof console.error === 'function') {
+  if (typeof console !== "undefined" && typeof console.error === "function") {
     for (const error of formatted.errors) {
-      console.error((0, _stripAnsi.default)(error));
+      console.error((0, import_strip_ansi.default)(error));
     }
   }
-
-  // Do not attempt to reload now.
-  // We will reload on next success instead.
 }
-
-// There is a newer version of the code available.
 function handleAvailableHash(hash) {
-  // Update last known compilation hash.
   mostRecentCompilationHash = hash;
 }
-
-// Handle messages from the server.
-connection.onmessage = function (e) {
+connection.onmessage = function(e) {
   const message = JSON.parse(e.data);
   switch (message.type) {
-    case 'hash':
+    case "hash":
       handleAvailableHash(message.data);
       break;
-    case 'still-ok':
-    case 'ok':
+    case "still-ok":
+    case "ok":
       handleSuccess();
       break;
-    case 'content-changed':
-      // Triggered when a file from `contentBase` changed.
+    case "content-changed":
       window.location.reload();
       break;
-    case 'warnings':
+    case "warnings":
       handleWarnings(message.data);
       break;
-    case 'errors':
+    case "errors":
       handleErrors(message.data);
       break;
     default:
-    // Do nothing.
   }
 };
-
-// Is there a newer version of this code available?
 function isUpdateAvailable() {
-  // __webpack_hash__ is the hash of the current compilation.
-  // It's a global variable injected by webpack.
   return mostRecentCompilationHash !== __webpack_hash__;
 }
-
-// webpack disallows updates in other states.
 function canApplyUpdates() {
-  return module.hot.status() === 'idle';
+  return module.hot.status() === "idle";
 }
-
-// Attempt to update code on the fly, fall back to a hard reload.
 function tryApplyUpdates() {
   if (!module.hot) {
-    // HotModuleReplacementPlugin is not in webpack configuration.
     window.location.reload();
     return;
   }
@@ -175,20 +135,18 @@ function tryApplyUpdates() {
       return;
     }
     if (isUpdateAvailable()) {
-      // While we were updating, there was a new update! Do it again.
       tryApplyUpdates();
     }
   }
-
-  // https://webpack.github.io/docs/hot-module-replacement.html#check
-  const result = module.hot.check( /* autoApply */true, handleApplyUpdates);
-
-  // // webpack 2 returns a Promise instead of invoking a callback
-  if (result !== null && result !== void 0 && result.then) {
-    result.then(updatedModules => {
-      handleApplyUpdates(null, updatedModules);
-    }, err => {
-      handleApplyUpdates(err, null);
-    });
+  const result = module.hot.check(true, handleApplyUpdates);
+  if (result == null ? void 0 : result.then) {
+    result.then(
+      (updatedModules) => {
+        handleApplyUpdates(null, updatedModules);
+      },
+      (err) => {
+        handleApplyUpdates(err, null);
+      }
+    );
   }
-}
+}

package/dist/js/node/dev-tools/dev-middleware/index.js

@@ -1,72 +1,105 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => DevMiddleware
 });
-exports.default = void 0;
-var _events = require("events");
-var _webpackDevMiddleware = _interopRequireDefault(require("@modern-js/utils/webpack-dev-middleware"));
-var _devServerPlugin = _interopRequireDefault(require("./dev-server-plugin"));
-var _socketServer = _interopRequireDefault(require("./socket-server"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+module.exports = __toCommonJS(stdin_exports);
+var import_events = require("events");
+var import_webpack_dev_middleware = __toESM(require("@modern-js/utils/webpack-dev-middleware"));
+var import_dev_server_plugin = __toESM(require("./dev-server-plugin"));
+var import_socket_server = __toESM(require("./socket-server"));
+var __defProp2 = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp2.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 const noop = () => {
-  // noop
 };
-class DevMiddleware extends _events.EventEmitter {
-  constructor({
-    compiler,
-    dev,
-    devMiddleware
-  }) {
+class DevMiddleware extends import_events.EventEmitter {
+  constructor({ compiler, dev, devMiddleware }) {
     super();
-    _defineProperty(this, "middleware", void 0);
-    _defineProperty(this, "compiler", void 0);
-    _defineProperty(this, "devOptions", void 0);
-    _defineProperty(this, "socketServer", void 0);
     this.compiler = compiler;
     this.devOptions = dev;
-
-    // init socket server
-    this.socketServer = new _socketServer.default(dev);
-
-    // Todo: should remove after abstract dev middleware
+    this.socketServer = new import_socket_server.default(dev);
     if (this.compiler) {
-      // setup compiler in server, also add dev-middleware to handler static file in memory
-      // set up plugin to each compiler
       this.setupDevServerPlugin();
-      // register hooks for each compilation, update socket stats if recompiled
       this.setupHooks();
-      // start dev middleware
       this.middleware = this.setupDevMiddleware(devMiddleware);
     }
   }
   init(app) {
-    app.on('listening', () => {
+    app.on("listening", () => {
       this.socketServer.prepare(app);
     });
-    app.on('close', async () => {
-      var _this$middleware;
-      (_this$middleware = this.middleware) === null || _this$middleware === void 0 ? void 0 : _this$middleware.close(noop);
+    app.on("close", () => __async(this, null, function* () {
+      var _a;
+      (_a = this.middleware) == null ? void 0 : _a.close(noop);
       this.socketServer.close();
-    });
+    }));
   }
   setupDevServerPlugin() {
-    const {
-      devOptions
-    } = this;
-
-    // apply dev server to client compiler, add hmr client to entry.
+    const { devOptions } = this;
     if (this.compiler.compilers) {
-      this.compiler.compilers.forEach(target => {
+      this.compiler.compilers.forEach((target) => {
         if (this.isClientCompiler(target)) {
-          new _devServerPlugin.default(devOptions).apply(target);
+          new import_dev_server_plugin.default(devOptions).apply(target);
         }
       });
     } else {
-      new _devServerPlugin.default(devOptions).apply(this.compiler);
+      new import_dev_server_plugin.default(devOptions).apply(this.compiler);
     }
   }
   sockWrite(type, data) {
@@ -74,22 +107,18 @@ class DevMiddleware extends _events.EventEmitter {
   }
   setupHooks() {
     const invalidPlugin = () => {
-      this.socketServer.sockWrite('invalid');
+      this.socketServer.sockWrite("invalid");
     };
-    const addHooks = compiler => {
-      if (compiler.name === 'server') {
+    const addHooks = (compiler) => {
+      if (compiler.name === "server") {
         return;
       }
-      const {
-        compile,
-        invalid,
-        done
-      } = compiler.hooks;
-      compile.tap('modern-dev-server', invalidPlugin);
-      invalid.tap('modern-dev-server', invalidPlugin);
-      done.tap('modern-dev-server', stats => {
+      const { compile, invalid, done } = compiler.hooks;
+      compile.tap("modern-dev-server", invalidPlugin);
+      invalid.tap("modern-dev-server", invalidPlugin);
+      done.tap("modern-dev-server", (stats) => {
         this.socketServer.updateStats(stats);
-        this.emit('change', stats);
+        this.emit("change", stats);
       });
     };
     if (this.compiler.compilers) {
@@ -98,29 +127,22 @@ class DevMiddleware extends _events.EventEmitter {
       addHooks(this.compiler);
     }
   }
-  setupDevMiddleware(devMiddleware = _webpackDevMiddleware.default) {
-    const {
-      devOptions
-    } = this;
-    const middleware = devMiddleware(this.compiler, _objectSpread({
+  setupDevMiddleware(devMiddleware = import_webpack_dev_middleware.default) {
+    const { devOptions } = this;
+    const middleware = devMiddleware(this.compiler, __spreadValues({
       headers: devOptions.headers,
       stats: false
     }, devOptions.devMiddleware));
     return middleware;
   }
   isClientCompiler(compiler) {
-    const {
-      target
-    } = compiler.options;
-
-    // if target not contains `node`, it's a client compiler
+    const { target } = compiler.options;
     if (target) {
       if (Array.isArray(target)) {
-        return !target.includes('node');
+        return !target.includes("node");
       }
-      return target !== 'node';
+      return target !== "node";
     }
-    return compiler.name === 'client';
+    return compiler.name === "client";
   }
 }
-exports.default = DevMiddleware;