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

package/CHANGELOG.md

@@ -1,5 +1,153 @@
 # @modern-js/server
 
+## 2.0.0-beta.4
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- b710adb843: feat: extract the data loader
+  feat: 提取 data loader
+
+### Patch Changes
+
+- 7879e8f: refactor: remove enableModernMode config
+
+  refactor: 不再支持 enableModernMode 配置项
+
+- d4e8e6fb90: fix: modernjs dev server can't start normaly
+  fix: modernjs dev 服务端不能正常启动
+- 15bf09d9c8: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- 61f21d1e77: fix: ignore the entire distPath for pia ssr bundle
+  fix: dist 目录的产物不应该被 ts-node 编译
+- 4f277fe: fix(server): remove peer dependencies warning
+
+  fix(server): 修复 peer dependencies 出现 warning 提示的问题
+
+- cce8ecee2d: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- ea7cf06: chore: bump webpack/babel-loader/postcss-loader/tsconfig-paths
+
+  chore: 升级 webpack/babel-loader/postcss-loader/tsconfig-paths 版本
+
+- ebbeed1ece: chore: dev server default cross origin
+  chore: 开发环境 Server 默认跨域
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [7879e8f]
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [d4e8e6fb90]
+- Updated dependencies [d032d49e09]
+- Updated dependencies [6aca875]
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12c]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [a8642da58f]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [87c1ff86b9]
+- Updated dependencies [c2bb0f1745]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [73cd29dd9f]
+- Updated dependencies [b710adb843]
+- Updated dependencies [cce8ecee2d]
+- Updated dependencies [18aaf42249]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-utils@2.0.0-beta.4
+  - @modern-js/prod-server@2.0.0-beta.4
+  - @modern-js/types@2.0.0-beta.4
+  - @modern-js/utils@2.0.0-beta.4
+
+## 2.0.0-beta.3
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- b710adb: feat: extract the data loader
+  feat: 提取 data loader
+
+### Patch Changes
+
+- d4e8e6f: fix: modernjs dev server can't start normaly
+  fix: modernjs dev 服务端不能正常启动
+- 15bf09d9c8: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- 61f21d1e77: fix: ignore the entire distPath for pia ssr bundle
+  fix: dist 目录的产物不应该被 ts-node 编译
+- cce8ece: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- ea7cf06: chore: bump webpack/babel-loader/postcss-loader/tsconfig-paths
+
+  chore: 升级 webpack/babel-loader/postcss-loader/tsconfig-paths 版本
+
+- ebbeed1ece: chore: dev server default cross origin
+  chore: 开发环境 Server 默认跨域
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [d4e8e6f]
+- Updated dependencies [d032d49e09]
+- Updated dependencies [6aca875]
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [2e60319]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [a8642da58f]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [87c1ff86b9]
+- Updated dependencies [c2bb0f1]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [73cd29dd9f]
+- Updated dependencies [b710adb]
+- Updated dependencies [cce8ece]
+- Updated dependencies [18aaf42249]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-utils@2.0.0-beta.3
+  - @modern-js/prod-server@2.0.0-beta.3
+  - @modern-js/utils@2.0.0-beta.3
+  - @modern-js/types@2.0.0-beta.3
+
 ## 2.0.0-beta.2
 
 ### Major Changes

package/dist/js/modern/constants.js

@@ -1,18 +1,19 @@
-import { getIpv4Interfaces, HMR_SOCK_PATH } from '@modern-js/utils';
-export const getDefaultDevOptions = () => {
-  const network = getIpv4Interfaces().find(item => !item.internal);
+import { getIpv4Interfaces, HMR_SOCK_PATH } from "@modern-js/utils";
+const getDefaultDevOptions = () => {
+  const network = getIpv4Interfaces().find((item) => !item.internal);
   return {
     client: {
-      port: '8080',
+      port: "8080",
       path: HMR_SOCK_PATH,
-      host: (network === null || network === void 0 ? void 0 : network.address) || 'localhost'
+      host: (network == null ? void 0 : network.address) || "localhost"
     },
     https: false,
-    devMiddleware: {
-      writeToDisk: true
-    },
+    devMiddleware: { writeToDisk: true },
     watch: true,
     hot: true,
     liveReload: true
   };
-};
+};
+export {
+  getDefaultDevOptions
+};

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

@@ -1,38 +1,32 @@
-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; }
-export default class DevServerPlugin {
+class DevServerPlugin {
   constructor(options) {
-    _defineProperty(this, "options", void 0);
     this.options = options;
   }
   injectHMRClient(compiler) {
-    const {
-      client
-    } = this.options;
-    const host = client !== null && client !== void 0 && client.host ? `&host=${client.host}` : '';
-    const path = client !== null && client !== void 0 && client.path ? `&path=${client.path}` : '';
-    const port = client !== null && client !== void 0 && client.port ? `&port=${client.port}` : '';
+    const { client } = this.options;
+    const host = (client == null ? void 0 : client.host) ? `&host=${client.host}` : "";
+    const path = (client == null ? void 0 : client.path) ? `&path=${client.path}` : "";
+    const port = (client == null ? void 0 : client.port) ? `&port=${client.port}` : "";
     const clientEntry = `${require.resolve("./hmr-client")}?${host}${path}${port}`;
-
-    // use a hook to add entries if available
     new compiler.webpack.EntryPlugin(compiler.context, clientEntry, {
-      name: undefined
+      name: void 0
     }).apply(compiler);
   }
   apply(compiler) {
     if (this.options.hot || this.options.liveReload) {
       this.injectHMRClient(compiler);
     }
-
-    // Todo remove, client must inject.
     const compilerOptions = compiler.options;
-    const {
-      HotModuleReplacementPlugin
-    } = compiler.webpack;
+    const { HotModuleReplacementPlugin } = compiler.webpack;
     compilerOptions.plugins = compilerOptions.plugins || [];
-    if (!compilerOptions.plugins.find(p => p.constructor === HotModuleReplacementPlugin)) {
-      // apply the HMR plugin, if it didn't exist before.
+    if (!compilerOptions.plugins.find(
+      (p) => p.constructor === HotModuleReplacementPlugin
+    )) {
       const plugin = new HotModuleReplacementPlugin();
       plugin.apply(compiler);
     }
   }
-}
+}
+export {
+  DevServerPlugin as default
+};

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

@@ -1,46 +1,41 @@
-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('&');
+import { HMR_SOCK_PATH } from "@modern-js/utils/constants";
+function createSocketUrl(resourceQuery) {
+  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;
   return getSocketUrl(options, currentLocation);
 }
-export function formatURL({
+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');
+    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 || HMR_SOCK_PATH
   });
-}
+}
+export {
+  createSocketUrl,
+  formatURL
+};

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

@@ -1,193 +1,143 @@
-/**
- * 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`
-
-// 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
-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.');
-  }
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-
-// 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();
+import stripAnsi from "@modern-js/utils/strip-ansi";
+import { formatWebpackMessages } from "@modern-js/utils/format";
+import { createSocketUrl } from "./createSocketUrl";
+var require_hmr_client = __commonJS({
+  "src/dev-tools/dev-middleware/hmr-client/index.ts"(exports, module) {
+    const hadRuntimeError = false;
+    const socketUrl = createSocketUrl(__resourceQuery);
+    const connection = new WebSocket(socketUrl);
+    connection.onclose = function() {
+      if (typeof console !== "undefined" && typeof console.info === "function") {
+        console.info(
+          "The development server has disconnected. Refresh the page if necessary."
+        );
+      }
+    };
+    let isFirstCompilation = true;
+    let mostRecentCompilationHash = null;
+    let hasCompileErrors = false;
+    function clearOutdatedErrors() {
+      if (typeof console !== "undefined" && typeof console.clear === "function") {
+        if (hasCompileErrors) {
+          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;
+    function handleSuccess() {
+      clearOutdatedErrors();
+      const isHotUpdate = !isFirstCompilation;
+      isFirstCompilation = false;
+      hasCompileErrors = false;
+      if (isHotUpdate) {
+        tryApplyUpdates();
+      }
+    }
+    function handleWarnings(warnings) {
+      clearOutdatedErrors();
+      const isHotUpdate = !isFirstCompilation;
+      isFirstCompilation = false;
+      hasCompileErrors = false;
+      function printWarnings() {
+        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. You can find a complete log in the terminal."
+              );
+              break;
+            }
+            console.warn(stripAnsi(formatted.warnings[i]));
+          }
         }
-        console.warn(stripAnsi(formatted.warnings[i]));
+      }
+      printWarnings();
+      if (isHotUpdate) {
+        tryApplyUpdates();
       }
     }
-  }
-  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));
+    function handleErrors(errors) {
+      clearOutdatedErrors();
+      isFirstCompilation = false;
+      hasCompileErrors = true;
+      const formatted = formatWebpackMessages({
+        errors,
+        warnings: []
+      });
+      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) {
-    const wantsForcedReload = err || !updatedModules || hadRuntimeError;
-    if (wantsForcedReload) {
-      window.location.reload();
-      return;
+    function handleAvailableHash(hash) {
+      mostRecentCompilationHash = hash;
+    }
+    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":
+          window.location.reload();
+          break;
+        case "warnings":
+          handleWarnings(message.data);
+          break;
+        case "errors":
+          handleErrors(message.data);
+          break;
+        default:
+      }
+    };
+    function isUpdateAvailable() {
+      return mostRecentCompilationHash !== __webpack_hash__;
     }
-    if (isUpdateAvailable()) {
-      // While we were updating, there was a new update! Do it again.
-      tryApplyUpdates();
+    function canApplyUpdates() {
+      return module.hot.status() === "idle";
+    }
+    function tryApplyUpdates() {
+      if (!module.hot) {
+        window.location.reload();
+        return;
+      }
+      if (!isUpdateAvailable() || !canApplyUpdates()) {
+        return;
+      }
+      function handleApplyUpdates(err, updatedModules) {
+        const wantsForcedReload = err || !updatedModules || hadRuntimeError;
+        if (wantsForcedReload) {
+          window.location.reload();
+          return;
+        }
+        if (isUpdateAvailable()) {
+          tryApplyUpdates();
+        }
+      }
+      const result = module.hot.check(true, handleApplyUpdates);
+      if (result == null ? void 0 : result.then) {
+        result.then(
+          (updatedModules) => {
+            handleApplyUpdates(null, updatedModules);
+          },
+          (err) => {
+            handleApplyUpdates(err, null);
+          }
+        );
+      }
     }
   }
-
-  // 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);
-    });
-  }
-}
+});
+export default require_hmr_client();