npm - @modern-js/prod-server - Versions diffs - 1.21.5 → 2.0.0-beta.1 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (120) hide show

package/CHANGELOG.md +91 -10
package/dist/js/modern/constants.js +0 -2
package/dist/js/modern/index.js +0 -1
package/dist/js/modern/libs/context/context.js +10 -56
package/dist/js/modern/libs/hook-api/index.js +125 -0
package/dist/js/modern/libs/hook-api/route.js +13 -36
package/dist/js/modern/libs/hook-api/template.js +38 -15
package/dist/js/modern/libs/loadConfig.js +3 -10
package/dist/js/modern/libs/metrics.js +6 -6
package/dist/js/modern/libs/proxy.js +7 -12
package/dist/js/modern/libs/render/cache/__tests__/cache.fun.test.js +0 -1
package/dist/js/modern/libs/render/cache/__tests__/cache.test.js +0 -9
package/dist/js/modern/libs/render/cache/index.js +37 -28
package/dist/js/modern/libs/render/cache/page-caches/lru.js +0 -10
package/dist/js/modern/libs/render/cache/spr.js +12 -62
package/dist/js/modern/libs/render/cache/util.js +0 -6
package/dist/js/modern/libs/render/index.js +6 -11
package/dist/js/modern/libs/render/measure.js +7 -10
package/dist/js/modern/libs/render/modern/index.js +2 -13
package/dist/js/modern/libs/render/reader.js +13 -24
package/dist/js/modern/libs/render/ssr.js +24 -12
package/dist/js/modern/libs/render/static.js +6 -9
package/dist/js/modern/libs/render/type.js +0 -1
package/dist/js/modern/libs/route/index.js +8 -19
package/dist/js/modern/libs/route/matcher.js +21 -29
package/dist/js/modern/libs/route/route.js +0 -13
package/dist/js/modern/libs/serve-file.js +13 -6
package/dist/js/modern/server/index.js +27 -43
package/dist/js/modern/server/modern-server-split.js +5 -55
package/dist/js/modern/server/modern-server.js +179 -250
package/dist/js/modern/utils.js +2 -21
package/dist/js/modern/worker-server.js +34 -0
package/dist/js/node/constants.js +0 -2
package/dist/js/node/index.js +0 -10
package/dist/js/node/libs/context/context.js +10 -65
package/dist/js/node/libs/context/index.js +0 -3
package/dist/js/node/libs/hook-api/index.js +136 -0
package/dist/js/node/libs/hook-api/route.js +13 -38
package/dist/js/node/libs/hook-api/template.js +40 -18
package/dist/js/node/libs/loadConfig.js +3 -22
package/dist/js/node/libs/metrics.js +6 -6
package/dist/js/node/libs/proxy.js +7 -17
package/dist/js/node/libs/render/cache/__tests__/cache.fun.test.js +0 -5
package/dist/js/node/libs/render/cache/__tests__/cache.test.js +0 -12
package/dist/js/node/libs/render/cache/index.js +37 -33
package/dist/js/node/libs/render/cache/page-caches/index.js +0 -2
package/dist/js/node/libs/render/cache/page-caches/lru.js +0 -14
package/dist/js/node/libs/render/cache/spr.js +12 -71
package/dist/js/node/libs/render/cache/util.js +0 -18
package/dist/js/node/libs/render/index.js +6 -26
package/dist/js/node/libs/render/measure.js +5 -15
package/dist/js/node/libs/render/modern/index.js +2 -20
package/dist/js/node/libs/render/reader.js +12 -39
package/dist/js/node/libs/render/ssr.js +23 -22
package/dist/js/node/libs/render/static.js +6 -18
package/dist/js/node/libs/render/type.js +0 -1
package/dist/js/node/libs/route/index.js +8 -22
package/dist/js/node/libs/route/matcher.js +18 -34
package/dist/js/node/libs/route/route.js +0 -15
package/dist/js/node/libs/serve-file.js +15 -12
package/dist/js/node/server/index.js +26 -62
package/dist/js/node/server/modern-server-split.js +5 -58
package/dist/js/node/server/modern-server.js +178 -280
package/dist/js/node/utils.js +3 -46
package/dist/js/node/worker-server.js +41 -0
package/dist/js/treeshaking/constants.js +28 -0
package/dist/js/treeshaking/index.js +13 -0
package/dist/js/treeshaking/libs/context/context.js +243 -0
package/dist/js/treeshaking/libs/context/index.js +5 -0
package/dist/js/treeshaking/libs/hook-api/index.js +157 -0
package/dist/js/treeshaking/libs/hook-api/route.js +33 -0
package/dist/js/treeshaking/libs/hook-api/template.js +91 -0
package/dist/js/treeshaking/libs/loadConfig.js +39 -0
package/dist/js/treeshaking/libs/metrics.js +12 -0
package/dist/js/treeshaking/libs/proxy.js +80 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/cache.fun.test.js +124 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/cache.test.js +464 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/cacheable.js +53 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/error-configuration.js +35 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/matched-cache.js +121 -0
package/dist/js/treeshaking/libs/render/cache/index.js +184 -0
package/dist/js/treeshaking/libs/render/cache/page-caches/index.js +30 -0
package/dist/js/treeshaking/libs/render/cache/page-caches/lru.js +46 -0
package/dist/js/treeshaking/libs/render/cache/spr.js +362 -0
package/dist/js/treeshaking/libs/render/cache/type.js +1 -0
package/dist/js/treeshaking/libs/render/cache/util.js +101 -0
package/dist/js/treeshaking/libs/render/index.js +100 -0
package/dist/js/treeshaking/libs/render/measure.js +61 -0
package/dist/js/treeshaking/libs/render/modern/browser-list.js +7 -0
package/dist/js/treeshaking/libs/render/modern/index.js +39 -0
package/dist/js/treeshaking/libs/render/reader.js +191 -0
package/dist/js/treeshaking/libs/render/ssr.js +98 -0
package/dist/js/treeshaking/libs/render/static.js +84 -0
package/dist/js/treeshaking/libs/render/type.js +6 -0
package/dist/js/treeshaking/libs/route/index.js +94 -0
package/dist/js/treeshaking/libs/route/matcher.js +113 -0
package/dist/js/treeshaking/libs/route/route.js +26 -0
package/dist/js/treeshaking/libs/serve-file.js +75 -0
package/dist/js/treeshaking/server/index.js +343 -0
package/dist/js/treeshaking/server/modern-server-split.js +152 -0
package/dist/js/treeshaking/server/modern-server.js +945 -0
package/dist/js/treeshaking/type.js +1 -0
package/dist/js/treeshaking/utils.js +87 -0
package/dist/js/treeshaking/worker-server.js +56 -0
package/dist/types/index.d.ts +0 -2
package/dist/types/libs/context/context.d.ts +0 -3
package/dist/types/libs/hook-api/index.d.ts +5 -0
package/dist/types/libs/hook-api/route.d.ts +9 -14
package/dist/types/libs/hook-api/template.d.ts +19 -9
package/dist/types/libs/loadConfig.d.ts +0 -1
package/dist/types/libs/render/cache/index.d.ts +4 -4
package/dist/types/libs/render/cache/spr.d.ts +0 -2
package/dist/types/libs/render/type.d.ts +3 -1
package/dist/types/libs/serve-file.d.ts +2 -1
package/dist/types/server/index.d.ts +2 -3
package/dist/types/server/modern-server.d.ts +11 -11
package/dist/types/type.d.ts +8 -10
package/dist/types/utils.d.ts +0 -1
package/dist/types/worker-server.d.ts +16 -0
package/package.json +28 -35

package/dist/js/treeshaking/type.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ import { IncomingMessage } from 'http';

package/dist/js/treeshaking/utils.js ADDED Viewed

@@ -0,0 +1,87 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { createDebugger, isProd } from '@modern-js/utils';
+export var debug = createDebugger('prod-server');
+export var mergeExtension = function mergeExtension(users) {
+  var output = [];
+  return {
+    middleware: output.concat(users)
+  };
+};
+export var noop = function noop() {
+  // noop
+};
+export var createErrorDocument = function createErrorDocument(status, text) {
+  var title = "".concat(status, ": ").concat(text);
+  return "<!DOCTYPE html>\n  <html lang=\"en\">\n  <head>\n    <meta charset=\"utf-8\">\n    <meta name=\"viewport\" content=\"width=device-width\">\n    <title>".concat(title, "</title>\n    <style>\n      html,body {\n        margin: 0;\n      }\n\n      .page-container {\n        color: #000;\n        background: #fff;\n        height: 100vh;\n        text-align: center;\n        display: flex;\n        flex-direction: column;\n        align-items: center;\n        justify-content: center;\n      }\n    </style>\n  </head>\n  <body>\n    <div class=\"page-container\">\n    <h1>").concat(status, "</h1>\n    <div>").concat(text, "</div>\n  </body>\n  </html>\n  ");
+};
+export var createMiddlewareCollecter = function createMiddlewareCollecter() {
+  var webMiddlewares = [];
+  var apiMiddlewares = [];
+  var addWebMiddleware = function addWebMiddleware(input) {
+    webMiddlewares.push(input);
+  };
+  var addAPIMiddleware = function addAPIMiddleware(input) {
+    apiMiddlewares.push(input);
+  };
+  var getMiddlewares = function getMiddlewares() {
+    return {
+      web: webMiddlewares,
+      api: apiMiddlewares
+    };
+  };
+  return {
+    getMiddlewares: getMiddlewares,
+    addWebMiddleware: addWebMiddleware,
+    addAPIMiddleware: addAPIMiddleware
+  };
+};
+export var useLocalPrefix = function useLocalPrefix(url) {
+  return isProd() && !url.includes('.');
+};
+export var getStaticReg = function getStaticReg() {
+  var output = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var favicon = output.favicon,
+    faviconByEntries = output.faviconByEntries,
+    cssPath = output.cssPath,
+    jsPath = output.jsPath,
+    mediaPath = output.mediaPath,
+    _output$assetPrefix = output.assetPrefix,
+    assetPrefix = _output$assetPrefix === void 0 ? '/' : _output$assetPrefix;
+  var prefix = useLocalPrefix(assetPrefix) ? assetPrefix : '';
+  var favicons = prepareFavicons(favicon, faviconByEntries);
+  var staticFiles = [cssPath, jsPath, mediaPath].filter(function (v) {
+    return Boolean(v);
+  });
+  var staticReg = ['static/', 'upload/'].concat(_toConsumableArray(staticFiles));
+  var iconReg = ['favicon.ico', 'icon.png'].concat(_toConsumableArray(favicons));
+  var regPrefix = prefix.endsWith('/') ? prefix : "".concat(prefix, "/");
+  var staticPathRegExp = new RegExp("^".concat(regPrefix, "(").concat([].concat(_toConsumableArray(staticReg), _toConsumableArray(iconReg)).join('|'), ")"));
+  return staticPathRegExp;
+};
+export var prepareFavicons = function prepareFavicons(favicon, faviconByEntries) {
+  var faviconNames = [];
+  if (favicon) {
+    faviconNames.push(favicon.substring(favicon.lastIndexOf('/') + 1));
+  }
+  if (faviconByEntries) {
+    Object.keys(faviconByEntries).forEach(function (f) {
+      var curFavicon = faviconByEntries[f];
+      if (curFavicon) {
+        faviconNames.push(curFavicon.substring(curFavicon.lastIndexOf('/') + 1));
+      }
+    });
+  }
+  return faviconNames;
+};
+export var headersWithoutCookie = function headersWithoutCookie(headers) {
+  if (typeof headers.cookie !== 'undefined') {
+    var safeHeaders = _objectSpread({}, headers);
+    delete safeHeaders.cookie;
+    return safeHeaders;
+  }
+  return headers;
+};
+export var isRedirect = function isRedirect(code) {
+  return [301, 302, 307, 308].includes(code);
+};

package/dist/js/treeshaking/worker-server.js ADDED Viewed

@@ -0,0 +1,56 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { RouteMatchManager } from "./libs/route";
+export var createHandler = function createHandler(manifest) {
+  var routeMgr = new RouteMatchManager();
+  var pages = manifest.pages,
+    routes = manifest.routes;
+  routeMgr.reset(routes);
+  return /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ctx) {
+      var _ctx$request, _ctx$request$query, _ctx$request2, _ctx$request2$pathnam, _ctx$request3, _ctx$request3$params;
+      var pageMatch, page, params;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              pageMatch = routeMgr.match(ctx.url);
+              if (pageMatch) {
+                _context.next = 5;
+                break;
+              }
+              ctx.body = '404: Page not found';
+              ctx.status = 404;
+              return _context.abrupt("return");
+            case 5:
+              page = pages[pageMatch.spec.urlPath];
+              (_ctx$request$query = (_ctx$request = ctx.request).query) !== null && _ctx$request$query !== void 0 ? _ctx$request$query : _ctx$request.query = ctx.query;
+              (_ctx$request2$pathnam = (_ctx$request2 = ctx.request).pathname) !== null && _ctx$request2$pathnam !== void 0 ? _ctx$request2$pathnam : _ctx$request2.pathname = ctx.pathname;
+              (_ctx$request3$params = (_ctx$request3 = ctx.request).params) !== null && _ctx$request3$params !== void 0 ? _ctx$request3$params : _ctx$request3.params = ctx.params;
+              params = pageMatch.parseURLParams(ctx.url);
+              _context.next = 12;
+              return page.serverRender({
+                template: page.template,
+                query: ctx.query,
+                request: ctx.request,
+                response: ctx.response,
+                pathname: ctx.pathname,
+                req: ctx.request,
+                res: ctx.response,
+                params: ctx.params || params || {}
+              });
+            case 12:
+              ctx.body = _context.sent;
+              ctx.status = 200;
+            case 14:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+};

package/dist/types/index.d.ts CHANGED Viewed

@@ -6,7 +6,5 @@ export { ModernServer } from './server/modern-server';
 export { createProxyHandler } from './libs/proxy';
 export * from './type';
 export * from './constants';
 declare const _default: (options: ModernServerOptions) => Promise<Server>;
 export default _default;

package/dist/types/libs/context/context.d.ts CHANGED Viewed

@@ -20,12 +20,10 @@ export declare class ModernServerContext implements ModernServerContextInterface
   /**
    * http response
    */
   res: ServerResponse;
   /**
    * url params
    */
   params: Record<string, string>;
   get logger(): import("@modern-js/types").Logger;
   get metrics(): import("@modern-js/types").Metrics;
@@ -56,7 +54,6 @@ export declare class ModernServerContext implements ModernServerContextInterface
   /**
    * 判断链接是否已经关闭
    */
   resHasHandled(): boolean;
   error(dig: string, e?: Error | string): void;
 }

package/dist/types/libs/hook-api/index.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+import type { ModernServerContext, HookContext, AfterMatchContext, AfterRenderContext, MiddlewareContext } from '@modern-js/types';
+export declare const base: (context: ModernServerContext) => HookContext;
+export declare const createAfterMatchContext: (context: ModernServerContext, entryName: string) => AfterMatchContext;
+export declare const createAfterRenderContext: (context: ModernServerContext, content: string) => AfterRenderContext;
+export declare const createMiddlewareContext: (context: ModernServerContext) => MiddlewareContext;

package/dist/types/libs/hook-api/route.d.ts CHANGED Viewed

@@ -1,14 +1,9 @@
-import { RouteMatchManager, RouteMatcher } from '../route';
-declare class RouteAPI {
-  private readonly router;
-  private current;
-  private readonly url;
-  constructor(matched: RouteMatcher, router: RouteMatchManager, url: string);
-  cur(): import("../route").ModernRoute;
-  get(entryName: string): import("../route").ModernRoute | null;
-  use(entryName: string): boolean;
-}
-export declare const createRouteAPI: (matched: RouteMatcher, router: RouteMatchManager, url: string) => RouteAPI;
-export {};
+export declare class RouteAPI {
+  current: string;
+  status: number;
+  url: string;
+  constructor(entryName: string);
+  redirect(url: string, status?: number): void;
+  rewrite(entryName: string): void;
+  use(entryName: string): void;
+}

package/dist/types/libs/hook-api/template.d.ts CHANGED Viewed

@@ -1,14 +1,24 @@
-declare class TemplateAPI {
+/// <reference types="node" />
+import { Transform } from 'stream';
+export declare class TemplateAPI {
   private content;
   constructor(content: string);
   get(): string;
   set(content: string): void;
-  prependHead(fragment: string): this;
-  appendHead(fragment: string): this;
-  prependBody(fragment: string): this;
-  appendBody(fragment: string): this;
-  replace(reg: RegExp | string, text: string): this;
+  prependHead(fragment: string): void;
+  appendHead(fragment: string): void;
+  prependBody(fragment: string): void;
+  appendBody(fragment: string): void;
+  private replace;
 }
-export declare const createTemplateAPI: (content: string) => TemplateAPI;
-export {};
+export declare const templateInjectableStream: ({
+  prependHead,
+  appendHead,
+  prependBody,
+  appendBody
+}: {
+  prependHead?: string | undefined;
+  appendHead?: string | undefined;
+  prependBody?: string | undefined;
+  appendBody?: string | undefined;
+}) => Transform;

package/dist/types/libs/loadConfig.d.ts CHANGED Viewed

@@ -6,7 +6,6 @@ export declare const requireConfig: (serverConfigPath: string) => any;
  * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
  * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
  */
 export declare const loadConfig: ({
   cliConfig,
   serverConfig,

package/dist/types/libs/render/cache/index.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
+/// <reference types="node" />
+import { Readable } from 'stream';
 import type { ModernServerContext } from '@modern-js/types';
-import { RenderFunction } from '../type';
-declare const _default: (renderFn: RenderFunction, ctx: ModernServerContext) => RenderFunction;
+import { RenderFunction, SSRServerContext } from '../type';
+declare const _default: (renderFn: RenderFunction, ctx: ModernServerContext) => (context: SSRServerContext) => Promise<string | Readable>;
 export default _default;

package/dist/types/libs/render/cache/spr.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import LRUCache from 'lru-cache';
 import { CacheContent, CacheManagerOptions, CacheResult, CacheContext, CacheConfig } from './type';
 declare class CacheManager {
   cache: LRUCache<string, CacheContent>;
   cacheOptions: CacheManagerOptions;
@@ -18,7 +17,6 @@ declare class CacheManager {
   set(context: CacheContext, html: string, cacheConfig: CacheConfig, sync?: boolean): Promise<any>;
   del(context: CacheContext, cacheHash: string): Promise<void>;
 }
 export declare function createCache(): CacheManager;
 export declare function destroyCache(): void;
 export {};

package/dist/types/libs/render/type.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
 /// <reference types="react" />
+/// <reference types="node" />
+import { Writable, Readable } from 'stream';
 import { BaseSSRServerContext } from '@modern-js/types';
 declare type MetaKeyMap = {
   header?: string[];
@@ -30,5 +32,5 @@ export declare type ModernSSRReactComponent = React.ComponentType<any> & {
   init: (context: SSRServerContext) => Promise<void>;
   prefetch: (context: SSRServerContext) => Promise<Record<string, any>>;
 };
-export declare type RenderFunction = (context: SSRServerContext) => Promise<string>;
+export declare type RenderFunction = (context: SSRServerContext) => Promise<string | ((writable: Writable) => Promise<Readable>)>;
 export {};

package/dist/types/libs/serve-file.d.ts CHANGED Viewed

@@ -1,9 +1,10 @@
 import { ServerOptions } from '@modern-js/server-core';
 import type { ModernServerContext } from '@modern-js/types';
-import { NextFunction } from '../type';
+import { NextFunction, ModernServerHandler } from '../type';
 declare type Rule = {
   path: string | RegExp;
   target: string;
 };
+export declare const faviconFallbackHandler: ModernServerHandler;
 export declare const createStaticFileHandler: (rules: Rule[], output?: ServerOptions['output']) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
 export {};

package/dist/types/server/index.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
 import type { ListenOptions } from 'net';
 import { ModernServerOptions, ServerConstructor } from '../type';
@@ -24,14 +25,12 @@ export declare class Server {
    * - 执行 prepare hook
    * - 执行 server init
    */
   init(): Promise<this>;
   /**
    * Execute config hooks
    * @param runner
    * @param options
    */
   private runConfigHook;
   private runPrepareHook;
   private initServerConfig;
@@ -39,11 +38,11 @@ export declare class Server {
    *
    * merge cliConfig and serverConfig
    */
   private initConfig;
   close(): Promise<void>;
   listen<T extends number | ListenOptions | undefined>(options: T, listener: any): void;
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;
+  render(req: IncomingMessage, res: ServerResponse, url?: string): Promise<string | null>;
   private createHookRunner;
   private injectContext;
   private initAppContext;

package/dist/types/server/modern-server.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse, Server } from 'http';
-import { Adapter, APIServerStartInput, ServerOptions } from '@modern-js/server-core';
-import type { ModernServerContext } from '@modern-js/types';
+import { Adapter, WebAdapter, APIServerStartInput, ServerOptions } from '@modern-js/server-core';
+import type { ModernServerContext, ServerRoute } from '@modern-js/types';
 import type { ContextOptions } from '../libs/context';
-import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ModernServerInterface, HookNames, BuildOptions, ModernServerHandler } from '../type';
+import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ModernServerInterface, BuildOptions, ModernServerHandler } from '../type';
 import { RouteMatchManager, ModernRouteInterface, ModernRoute } from '../libs/route';
 import { mergeExtension } from '../utils';
 import * as reader from '../libs/render/reader';
@@ -24,6 +24,7 @@ export declare class ModernServer implements ModernServerInterface {
   protected readonly proxyTarget: ModernServerOptions['proxyTarget'];
   private staticFileHandler;
   private routeRenderHandler;
+  private beforeRouteHandler;
   private frameWebHandler;
   private frameAPIHandler;
   private proxyHandler;
@@ -41,27 +42,26 @@ export declare class ModernServer implements ModernServerInterface {
   }: ModernServerOptions);
   onInit(runner: ServerHookRunner, app: Server): Promise<void>;
   onRepack(_: BuildOptions): void;
+  addBeforeRouteHandler(): void;
   protected onServerChange({
     filepath
   }: {
     filepath: string;
   }): void;
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void | ServerResponse;
+  render(req: IncomingMessage, res: ServerResponse, url?: string): Promise<string | null>;
   createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server>;
-  protected getRoutes(): ModernRouteInterface[];
+  protected getRoutes(): ServerRoute[];
   protected addHandler(handler: ModernServerHandler): void;
   protected render404(context: ModernServerContext): void;
+  protected prepareBeforeRouteHandler(specs: ServerRoute[], distDir: string): Promise<void>;
   protected prepareFrameHandler(options?: {
     onlyApi: boolean;
     onlyWeb: boolean;
   }): Promise<void>;
-  protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<Adapter>;
+  protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<WebAdapter>;
   protected prepareAPIHandler(extension: APIServerStartInput['config']): Promise<Adapter>;
-  protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
-  protected emitRouteHook(eventName: HookNames, input: {
-    context: ModernServerContext;
-    [propsName: string]: any;
-  }): Promise<any>;
+  protected filterRoutes(routes: ModernRouteInterface[]): ServerRoute[];
   protected setupBeforeProdMiddleware(): Promise<void>;
   protected handleAPI(context: ModernServerContext): Promise<void>;
   protected handleWeb(context: ModernServerContext, route: ModernRoute): Promise<import("../type").RenderResult | null>;
@@ -70,9 +70,9 @@ export declare class ModernServer implements ModernServerInterface {
   protected createContext(req: IncomingMessage, res: ServerResponse, options?: ContextOptions): import("../libs/context").ModernServerContext;
   private routeHandler;
   private isSend;
-  private injectMicroFE;
   private compose;
   private requestHandler;
+  private redirect;
   private onError;
   private renderErrorPage;
 }

package/dist/types/type.d.ts CHANGED Viewed

@@ -1,9 +1,11 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { IncomingMessage, Server, ServerResponse } from 'http';
+import { Readable } from 'stream';
 import { serverManager, ServerOptions } from '@modern-js/server-core';
 import type { ServerPlugin } from '@modern-js/server-core';
-import type { Metrics, Logger, NextFunction, ModernServerContext } from '@modern-js/types';
+import type { Metrics, Logger, NextFunction, ModernServerContext, InternalPlugins } from '@modern-js/types';
 import type { ModernRouteInterface } from './libs/route';
 declare module 'http' {
   interface IncomingMessage {
@@ -11,30 +13,25 @@ declare module 'http' {
     metrics: Metrics;
   }
 }
-declare type Plugin = string | [string, any] | ServerPlugin;
 export declare type ModernServerOptions = {
   pwd: string;
   config: ServerOptions;
-  plugins?: Plugin[];
+  plugins?: ServerPlugin[];
+  internalPlugins?: InternalPlugins;
   routes?: ModernRouteInterface[];
   staticGenerate?: boolean;
-  loggerOptions?: Record<string, string>;
-  metricsOptions?: Record<string, string>;
   logger?: Logger;
   metrics?: Metrics;
   apiOnly?: boolean;
   ssrOnly?: boolean;
   webOnly?: boolean;
-  proxyTarget?: {
-    ssr?: string;
-    api?: string;
-  };
   runMode?: string;
   [propName: string]: any;
 };
 export declare type RenderResult = {
   content: string | Buffer;
   contentType: string;
+  contentStream?: Readable;
   statusCode?: number;
   redirect?: boolean;
 };
@@ -49,7 +46,7 @@ export declare type BuildOptions = {
   routes?: ModernRouteInterface[];
 };
 export type { Metrics, Logger, NextFunction };
-export declare type HookNames = 'beforeMatch' | 'afterMatch' | 'beforeRender' | 'afterRender';
+export declare type HookNames = 'afterMatch' | 'afterRender';
 export interface ModernServerInterface {
   pwd: string;
   distDir: string;
@@ -57,6 +54,7 @@ export interface ModernServerInterface {
   onRepack: (options: BuildOptions) => void;
   getRequestHandler: () => (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;
   createHTTPServer: (handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void) => Promise<Server>;
+  render: (req: IncomingMessage, res: ServerResponse, url?: string) => Promise<string | null>;
 }
 export declare type ServerConstructor = (options: ModernServerOptions) => ModernServerInterface;
 export declare type ModernServerHandler = (context: ModernServerContext, next: NextFunction) => Promise<void> | void;

package/dist/types/utils.d.ts CHANGED Viewed

@@ -18,7 +18,6 @@ export declare const createMiddlewareCollecter: () => {
   addWebMiddleware: (input: any) => void;
   addAPIMiddleware: (input: any) => void;
 };
-export declare const toPath: (reg: string, params: Record<string, any>) => string;
 export declare const useLocalPrefix: (url: string) => boolean;
 export declare const getStaticReg: (output?: NormalizedConfig['output']) => RegExp;
 export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];

package/dist/types/worker-server.d.ts ADDED Viewed

@@ -0,0 +1,16 @@
+import { ModernRouteInterface } from './libs/route';
+export declare type Context = Record<string, any>;
+export interface UrlQuery {
+  [key: string]: string;
+}
+export declare type Manifest = {
+  pages: Record<string,
+  // path
+  {
+    entryName: string;
+    template: string;
+    serverRender: (ctx: Record<string, any>) => Promise<string>;
+  }>;
+  routes: ModernRouteInterface[];
+};
+export declare const createHandler: (manifest: Manifest) => (ctx: Context) => Promise<void>;

package/package.json CHANGED Viewed

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.5",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -25,6 +25,24 @@
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/index.js"
+    },
+    "./worker": {
+      "node": {
+        "jsnext:source": "./src/worker-server.ts",
+        "import": "./dist/js/modern/worker-server.js",
+        "require": "./dist/js/node/worker-server.js"
+      },
+      "default": "./dist/js/treeshaking/worker-server.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      ".": [
+        "./dist/types/index.d.ts"
+      ],
+      "worker": [
+        "./dist/types/worker-server.d.ts"
+      ]
     }
   },
   "dependencies": {
@@ -41,8 +59,8 @@
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
     "ua-parser-js": "^0.7.28",
-    "@modern-js/utils": "1.21.5",
-    "@modern-js/server-core": "1.21.5"
+    "@modern-js/utils": "2.0.0-beta.1",
+    "@modern-js/server-core": "2.0.0-beta.1"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -58,48 +76,23 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^4",
-    "@modern-js/types": "1.21.5",
-    "@modern-js/core": "1.21.5",
-    "@scripts/jest-config": "1.21.5",
-    "@scripts/build": "1.21.5"
+    "@modern-js/types": "2.0.0-beta.1",
+    "@modern-js/core": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1",
+    "@scripts/build": "2.0.0-beta.1"
   },
   "sideEffects": false,
   "modernConfig": {
-    "output": {
-      "packageMode": "node-js"
-    }
+    "output": {}
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
+    "build": "modern build",
     "dev": "modern build --watch",
-    "test": "wireit"
+    "test": "jest"
   }
 }