@modern-js/server 1.5.1 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @modern-js/server
 
+## 1.6.0
+
+### Minor Changes
+
+- 83660b6: chore(server): merge `@modern-js/hmr-client` to `@modern-js/server`
+
+  chore(server): 合并 `@modern-js/hmr-client` 到 `@modern-js/server`
+
+### Patch Changes
+
+- Updated dependencies [1421965]
+- Updated dependencies [02647d2]
+- Updated dependencies [4fc801f]
+- Updated dependencies [9d60891]
+- Updated dependencies [2ed8f7d]
+- Updated dependencies [e4b73b2]
+- Updated dependencies [c8614b8]
+- Updated dependencies [df73691]
+  - @modern-js/webpack@1.12.2
+  - @modern-js/utils@1.8.0
+  - @modern-js/prod-server@1.2.1
+  - @modern-js/server-utils@1.2.11
+
 ## 1.5.1
 
 ### Patch Changes

package/dist/js/modern/dev-tools/dev-server-plugin.js

@@ -18,7 +18,7 @@ export default class DevServerPlugin {
     const host = client.host ? `&host=${client.host}` : '';
     const path = client.path ? `&path=${client.path}` : '';
     const port = client.port ? `&port=${client.port}` : '';
-    const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`; // use a hook to add entries if available
+    const clientEntry = `${require.resolve("../hmr-client")}?${host}${path}${port}`; // use a hook to add entries if available
 
     new EntryPlugin(compiler.context, clientEntry, {
       name: undefined

package/dist/js/modern/hmr-client/createSocketUrl.js

@@ -0,0 +1,49 @@
+import { HMR_SOCK_PATH } from '@modern-js/utils/constants';
+export function createSocketUrl(resourceQuery) {
+  // ?host=localhost&port=8080&path=modern_js_hmr_ws
+  const searchParams = resourceQuery.substr(1).split('&');
+  const options = {};
+
+  for (const pair of searchParams) {
+    const ary = pair.split('=');
+    options[ary[0]] = decodeURIComponent(ary[1]);
+  }
+
+  const currentLocation = self.location;
+  return getSocketUrl(options, currentLocation);
+}
+export function formatURL({
+  port,
+  protocol,
+  hostname,
+  pathname
+}) {
+  if (window.URL) {
+    // eslint-disable-next-line node/prefer-global/url, node/no-unsupported-features/node-builtins
+    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 ? ':' : '';
+  return `${protocol}${colon}//${hostname}:${port}${pathname}`;
+}
+
+function getSocketUrl(urlParts, location) {
+  const {
+    host,
+    port,
+    path,
+    protocol
+  } = urlParts;
+  return formatURL({
+    protocol: protocol || location.protocol === 'https:' ? 'wss' : 'ws',
+    hostname: host || location.hostname,
+    port: port || location.port,
+    pathname: path || HMR_SOCK_PATH
+  });
+}

package/dist/js/modern/hmr-client/index.js

@@ -0,0 +1,201 @@
+/**
+ * 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.
+ */
+import stripAnsi from '@modern-js/utils/strip-ansi';
+import { formatWebpackMessages } from '@modern-js/utils/format';
+import { createSocketUrl } from "./createSocketUrl"; // declare any to fix the type of `module.hot`
+
+// 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
+const hadRuntimeError = false; // Connect to Dev Server
+
+const socketUrl = 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.');
+  }
+}; // 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 (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 = formatWebpackMessages({
+      warnings,
+      errors: []
+    });
+
+    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.');
+          break;
+        }
+
+        console.warn(stripAnsi(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 = formatWebpackMessages({
+    errors,
+    warnings: []
+  }); // Also log them to the console.
+
+  if (typeof console !== 'undefined' && typeof console.error === 'function') {
+    for (const error of formatted.errors) {
+      console.error(stripAnsi(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) {
+  const message = JSON.parse(e.data);
+
+  switch (message.type) {
+    case 'hash':
+      handleAvailableHash(message.data);
+      break;
+
+    case 'still-ok':
+    case 'ok':
+      handleSuccess();
+      break;
+
+    case 'content-changed':
+      // Triggered when a file from `contentBase` changed.
+      window.location.reload();
+      break;
+
+    case 'warnings':
+      handleWarnings(message.data);
+      break;
+
+    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';
+} // 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;
+  }
+
+  if (!isUpdateAvailable() || !canApplyUpdates()) {
+    return;
+  }
+
+  function handleApplyUpdates(err, updatedModules) {
+    // NOTE: This var is injected by Webpack's DefinePlugin, and is a boolean instead of string.
+    const hasReactRefresh = process.env.FAST_REFRESH;
+    const wantsForcedReload = err || !updatedModules || hadRuntimeError; // React refresh can handle hot-reloading over errors.
+
+    if (!hasReactRefresh && wantsForcedReload) {
+      window.location.reload();
+      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);
+    });
+  }
+}

package/dist/js/node/dev-tools/dev-server-plugin.js

@@ -27,7 +27,7 @@ class DevServerPlugin {
     const host = client.host ? `&host=${client.host}` : '';
     const path = client.path ? `&path=${client.path}` : '';
     const port = client.port ? `&port=${client.port}` : '';
-    const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`; // use a hook to add entries if available
+    const clientEntry = `${require.resolve("../hmr-client")}?${host}${path}${port}`; // use a hook to add entries if available
 
     new EntryPlugin(compiler.context, clientEntry, {
       name: undefined

package/dist/js/node/hmr-client/createSocketUrl.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createSocketUrl = createSocketUrl;
+exports.formatURL = formatURL;
+
+var _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 options = {};
+
+  for (const pair of searchParams) {
+    const ary = pair.split('=');
+    options[ary[0]] = decodeURIComponent(ary[1]);
+  }
+
+  const currentLocation = self.location;
+  return getSocketUrl(options, currentLocation);
+}
+
+function formatURL({
+  port,
+  protocol,
+  hostname,
+  pathname
+}) {
+  if (window.URL) {
+    // eslint-disable-next-line node/prefer-global/url, node/no-unsupported-features/node-builtins
+    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 ? ':' : '';
+  return `${protocol}${colon}//${hostname}:${port}${pathname}`;
+}
+
+function getSocketUrl(urlParts, location) {
+  const {
+    host,
+    port,
+    path,
+    protocol
+  } = urlParts;
+  return formatURL({
+    protocol: protocol || location.protocol === 'https:' ? 'wss' : 'ws',
+    hostname: host || location.hostname,
+    port: port || location.port,
+    pathname: path || _constants.HMR_SOCK_PATH
+  });
+}

package/dist/js/node/hmr-client/index.js

@@ -0,0 +1,207 @@
+"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.
+ */
+// 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
+const hadRuntimeError = false; // Connect to Dev Server
+
+const socketUrl = (0, _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.');
+  }
+}; // 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 (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)({
+      warnings,
+      errors: []
+    });
+
+    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.');
+          break;
+        }
+
+        console.warn((0, _stripAnsi.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)({
+    errors,
+    warnings: []
+  }); // Also log them to the console.
+
+  if (typeof console !== 'undefined' && typeof console.error === 'function') {
+    for (const error of formatted.errors) {
+      console.error((0, _stripAnsi.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) {
+  const message = JSON.parse(e.data);
+
+  switch (message.type) {
+    case 'hash':
+      handleAvailableHash(message.data);
+      break;
+
+    case 'still-ok':
+    case 'ok':
+      handleSuccess();
+      break;
+
+    case 'content-changed':
+      // Triggered when a file from `contentBase` changed.
+      window.location.reload();
+      break;
+
+    case 'warnings':
+      handleWarnings(message.data);
+      break;
+
+    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';
+} // 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;
+  }
+
+  if (!isUpdateAvailable() || !canApplyUpdates()) {
+    return;
+  }
+
+  function handleApplyUpdates(err, updatedModules) {
+    // NOTE: This var is injected by Webpack's DefinePlugin, and is a boolean instead of string.
+    const hasReactRefresh = process.env.FAST_REFRESH;
+    const wantsForcedReload = err || !updatedModules || hadRuntimeError; // React refresh can handle hot-reloading over errors.
+
+    if (!hasReactRefresh && wantsForcedReload) {
+      window.location.reload();
+      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);
+    });
+  }
+}

package/dist/types/hmr-client/createSocketUrl.d.ts

@@ -0,0 +1,12 @@
+export declare function createSocketUrl(resourceQuery: string): string;
+export declare function formatURL({
+  port,
+  protocol,
+  hostname,
+  pathname
+}: {
+  port: string;
+  protocol: string;
+  hostname: string;
+  pathname: string;
+}): string;

package/dist/types/hmr-client/index.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.5.1",
+  "version": "1.6.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,18 +30,17 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/register": "^7.17.7",
-    "@modern-js/hmr-client": "^1.2.8",
-    "@modern-js/prod-server": "^1.2.0",
+    "@modern-js/prod-server": "^1.2.1",
     "@modern-js/server-utils": "^1.2.11",
-    "@modern-js/webpack": "^1.12.0",
-    "@modern-js/utils": "^1.7.12",
+    "@modern-js/webpack": "^1.12.2",
+    "@modern-js/utils": "^1.8.0",
     "devcert": "^1.2.2",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.13.0",
+    "@modern-js/core": "1.13.1",
     "@modern-js/server-core": "1.4.1",
     "@modern-js/types": "1.6.0",
     "@scripts/build": "0.0.0",
@@ -52,7 +51,8 @@
     "@types/ws": "^7.4.7",
     "jest": "^27",
     "typescript": "^4",
-    "websocket": "^1"
+    "websocket": "^1",
+    "webpack": "^5.71.0"
   },
   "sideEffects": false,
   "modernConfig": {