@modern-js/server 1.21.5 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,33 +1,90 @@
 # @modern-js/server
 
-## 1.21.5
+## 2.0.0-beta.1
 
-### Patch Changes
-
-- @modern-js/prod-server@1.21.5
-- @modern-js/server-utils@1.21.5
-- @modern-js/types@1.21.5
-- @modern-js/utils@1.21.5
+### Major Changes
 
-## 1.21.4
+- dda38c9: chore: v2
 
 ### Patch Changes
 
-- 0889ab2: chore: dev server default cross origin
+- 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 编译
+- ebbeed1: chore: dev server default cross origin
   chore: 开发环境 Server 默认跨域
-  - @modern-js/prod-server@1.21.4
-  - @modern-js/server-utils@1.21.4
-  - @modern-js/types@1.21.4
-  - @modern-js/utils@1.21.4
-
-## 1.21.3
-
-### Patch Changes
-
-- @modern-js/prod-server@1.21.3
-- @modern-js/server-utils@1.21.3
-- @modern-js/types@1.21.3
-- @modern-js/utils@1.21.3
+- 14b712d: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [d032d49]
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [a8642da]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed587]
+- Updated dependencies [87c1ff8]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [73cd29dd9f]
+- Updated dependencies [18aaf42]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/server-utils@2.0.0-beta.1
+  - @modern-js/prod-server@2.0.0-beta.1
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/types@2.0.0-beta.1
+
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- 15bf09d9c: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- 61f21d1e7: fix: ignore the entire distPath for pia ssr bundle
+  fix: dist 目录的产物不应该被 ts-node 编译
+- 14b712d: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [9b915e0c1]
+- Updated dependencies [c9e800d39]
+- Updated dependencies [15bf09d9c]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [6bda14ed7]
+- Updated dependencies [a8642da]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [102d32e4b]
+- Updated dependencies [8b8e1bb57]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [73cd29dd9]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/server-utils@2.0.0-beta.0
+  - @modern-js/prod-server@2.0.0-beta.0
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/types@2.0.0-beta.0
 
 ## 1.21.2
 

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

@@ -1,12 +1,9 @@
 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 {
   constructor(options) {
     _defineProperty(this, "options", void 0);
-
     this.options = options;
   }
-
   injectHMRClient(compiler) {
     const {
       client
@@ -14,30 +11,28 @@ export default class DevServerPlugin {
     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 clientEntry = `${require.resolve("./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 compiler.webpack.EntryPlugin(compiler.context, clientEntry, {
       name: undefined
     }).apply(compiler);
   }
-
   apply(compiler) {
     if (this.options.hot || this.options.liveReload) {
       this.injectHMRClient(compiler);
-    } // Todo remove, client must inject.
-
+    }
 
+    // Todo remove, client must inject.
     const compilerOptions = compiler.options;
     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.
       const plugin = new HotModuleReplacementPlugin();
       plugin.apply(compiler);
     }
   }
-
 }

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

@@ -3,12 +3,10 @@ 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);
 }
@@ -26,13 +24,12 @@ export function formatURL({
     url.protocol = protocol;
     url.pathname = pathname;
     return url.toString();
-  } // compatible with IE11
-
+  }
 
+  // compatible with IE11
   const colon = protocol.indexOf(':') === -1 ? ':' : '';
   return `${protocol}${colon}//${hostname}:${port}${pathname}`;
 }
-
 function getSocketUrl(urlParts, location) {
   const {
     host,

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

@@ -6,7 +6,9 @@
  */
 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`
+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.
@@ -15,24 +17,25 @@ import { createSocketUrl } from "./createSocketUrl"; // declare any to fix the t
 // 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 hadRuntimeError = false;
 
+// Connect to Dev Server
 const socketUrl = createSocketUrl(__resourceQuery);
-const connection = new WebSocket(socketUrl); // Unlike WebpackDevServer client, we won't try to reconnect
+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.
-
+};
 
+// 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
@@ -42,154 +45,144 @@ function clearOutdatedErrors() {
       console.clear();
     }
   }
-} // Successful compilation.
-
+}
 
+// Successful compilation.
 function handleSuccess() {
   clearOutdatedErrors();
   const isHotUpdate = !isFirstCompilation;
   isFirstCompilation = false;
-  hasCompileErrors = false; // Attempt to apply hot updates or reload.
+  hasCompileErrors = false;
 
+  // Attempt to apply hot updates or reload.
   if (isHotUpdate) {
     tryApplyUpdates();
   }
-} // Compilation with warnings (e.g. ESLint).
-
+}
 
+// 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();
 
-  printWarnings(); // Attempt to apply hot updates or reload.
-
+  // Attempt to apply hot updates or reload.
   if (isHotUpdate) {
     tryApplyUpdates();
   }
-} // Compilation with errors (e.g. syntax error or missing modules).
-
+}
 
+// Compilation with errors (e.g. syntax error or missing modules).
 function handleErrors(errors) {
   clearOutdatedErrors();
   isFirstCompilation = false;
-  hasCompileErrors = true; // "Massage" webpack messages.
+  hasCompileErrors = true;
 
+  // "Massage" webpack messages.
   const formatted = formatWebpackMessages({
     errors,
     warnings: []
-  }); // Also log them to the console.
+  });
 
+  // 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.
+  }
 
+  // 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.
-
+}
 
+// 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.
-
+    default:
+    // Do nothing.
   }
-}; // Is there a newer version of this code available?
-
+};
 
+// 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.
-
+}
 
+// 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.
-
+}
 
+// 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;
     }
-
     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
+  // 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);

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

@@ -1,17 +1,13 @@
 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; }
-
 import { EventEmitter } from 'events';
 import webpackDevMiddleware from '@modern-js/utils/webpack-dev-middleware';
 import DevServerPlugin from "./dev-server-plugin";
 import SocketServer from "./socket-server";
-
-const noop = () => {// noop
+const noop = () => {
+  // noop
 };
-
 export default class DevMiddleware extends EventEmitter {
   constructor({
     compiler,
@@ -19,48 +15,43 @@ export default class DevMiddleware extends EventEmitter {
     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.devOptions = dev;
 
-    this.socketServer = new SocketServer(dev); // Todo: should remove after abstract dev middleware
+    // init socket server
+    this.socketServer = new SocketServer(dev);
 
+    // Todo: should remove after abstract dev middleware
     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.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', () => {
       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);
       this.socketServer.close();
     });
   }
-
   setupDevServerPlugin() {
     const {
       devOptions
-    } = this; // apply dev server to client compiler, add hmr client to entry.
+    } = this;
 
+    // apply dev server to client compiler, add hmr client to entry.
     if (this.compiler.compilers) {
       this.compiler.compilers.forEach(target => {
         if (this.isClientCompiler(target)) {
@@ -71,21 +62,17 @@ export default class DevMiddleware extends EventEmitter {
       new DevServerPlugin(devOptions).apply(this.compiler);
     }
   }
-
   sockWrite(type, data) {
     this.socketServer.sockWrite(type, data);
   }
-
   setupHooks() {
     const invalidPlugin = () => {
       this.socketServer.sockWrite('invalid');
     };
-
     const addHooks = compiler => {
       if (compiler.name === 'server') {
         return;
       }
-
       const {
         compile,
         invalid,
@@ -98,14 +85,12 @@ export default class DevMiddleware extends EventEmitter {
         this.emit('change', stats);
       });
     };
-
     if (this.compiler.compilers) {
       this.compiler.compilers.forEach(addHooks);
     } else {
       addHooks(this.compiler);
     }
   }
-
   setupDevMiddleware(devMiddleware = webpackDevMiddleware) {
     const {
       devOptions
@@ -116,21 +101,18 @@ export default class DevMiddleware extends EventEmitter {
     }, devOptions.devMiddleware));
     return middleware;
   }
-
   isClientCompiler(compiler) {
     const {
       target
-    } = compiler.options; // if target not contains `node`, it's a client compiler
+    } = compiler.options;
 
+    // if target not contains `node`, it's a client compiler
     if (target) {
       if (Array.isArray(target)) {
         return !target.includes('node');
       }
-
       return target !== 'node';
     }
-
     return compiler.name === 'client';
   }
-
 }