@modern-js/server-core 1.21.3 → 2.0.0-beta.0

package/CHANGELOG.md

@@ -1,11 +1,34 @@
 # @modern-js/server-plugin
 
-## 1.21.3
+## 2.0.0-beta.0
 
-### Patch Changes
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Minor Changes
 
-- @modern-js/plugin@1.21.3
-- @modern-js/utils@1.21.3
+- 543be95: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- 15bf09d9c: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- cc971eabf: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/plugin@2.0.0-beta.0
 
 ## 1.21.2
 

package/dist/js/modern/loadPlugins.js

@@ -1,47 +1,29 @@
-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 { compatRequire, tryResolve } from '@modern-js/utils';
+import { compatRequire, getInternalPlugins, tryResolve } from '@modern-js/utils';
 import { createPlugin } from "./plugin";
-export const loadPlugins = (plugins, appDirectory) => {
-  const resolvePlugin = p => {
-    const isPluginInstance = typeof p !== 'string' && !Array.isArray(p);
-
-    if (isPluginInstance) {
-      return {
-        module: createPlugin(p.setup, p)
-      };
-    }
 
-    const [pkg, options] = typeof p === 'string' ? [p, undefined] : p;
-    const pluginPath = tryResolve(pkg, appDirectory);
-    let module = compatRequire(pluginPath);
-    const useNewSyntax = typeof module === 'function';
-
-    if (useNewSyntax) {
-      const plugin = module(options);
-      module = createPlugin(plugin.setup, plugin);
-    }
+const resolvePlugin = (p, appDirectory) => {
+  const isPluginInstance = typeof p !== 'string';
 
+  if (isPluginInstance) {
     return {
-      pkg,
-      path: pluginPath,
-      module
+      module: createPlugin(p.setup, p)
     };
+  }
+
+  const pluginPath = tryResolve(p, appDirectory);
+  const module = compatRequire(pluginPath);
+  const pluginInstance = module();
+  return {
+    module: createPlugin(pluginInstance.setup, pluginInstance)
   };
+};
 
-  return plugins.map(plugin => {
+export const loadPlugins = (appDirectory, configPlugins, options) => {
+  const loadedPlugins = getInternalPlugins(appDirectory, options.internalPlugins);
+  return [...loadedPlugins, ...configPlugins].map(plugin => {
     const {
-      pkg,
-      path,
       module
-    } = resolvePlugin(plugin);
-    return _objectSpread(_objectSpread({}, module), {}, {
-      pluginPath: path,
-      pkg
-    });
+    } = resolvePlugin(plugin, appDirectory);
+    return module;
   });
 };

package/dist/js/modern/plugin.js

@@ -1,10 +1,10 @@
 import { createContext, createAsyncManager, createAsyncPipeline, createAsyncWaterfall, createParallelWorkflow, createWaterfall } from '@modern-js/plugin';
 // collect all middleware register in server plugins
-const gather = createParallelWorkflow();
-// config
+const gather = createParallelWorkflow(); // config
+
 const config = createWaterfall();
 const prepare = createWaterfall();
-const create = createAsyncPipeline();
+const preparebeforeRouteHandler = createAsyncPipeline();
 const prepareWebServer = createAsyncPipeline();
 const prepareApiServer = createAsyncPipeline();
 const onApiChange = createWaterfall();
@@ -56,7 +56,7 @@ const serverHooks = {
   gather,
   config,
   prepare,
-  create,
+  preparebeforeRouteHandler,
   prepareWebServer,
   prepareApiServer,
   onApiChange,

package/dist/js/node/loadPlugins.js

@@ -9,49 +9,30 @@ var _utils = require("@modern-js/utils");
 
 var _plugin = require("./plugin");
 
-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; }
-
-const loadPlugins = (plugins, appDirectory) => {
-  const resolvePlugin = p => {
-    const isPluginInstance = typeof p !== 'string' && !Array.isArray(p);
-
-    if (isPluginInstance) {
-      return {
-        module: (0, _plugin.createPlugin)(p.setup, p)
-      };
-    }
-
-    const [pkg, options] = typeof p === 'string' ? [p, undefined] : p;
-    const pluginPath = (0, _utils.tryResolve)(pkg, appDirectory);
-    let module = (0, _utils.compatRequire)(pluginPath);
-    const useNewSyntax = typeof module === 'function';
-
-    if (useNewSyntax) {
-      const plugin = module(options);
-      module = (0, _plugin.createPlugin)(plugin.setup, plugin);
-    }
+const resolvePlugin = (p, appDirectory) => {
+  const isPluginInstance = typeof p !== 'string';
 
+  if (isPluginInstance) {
     return {
-      pkg,
-      path: pluginPath,
-      module
+      module: (0, _plugin.createPlugin)(p.setup, p)
     };
+  }
+
+  const pluginPath = (0, _utils.tryResolve)(p, appDirectory);
+  const module = (0, _utils.compatRequire)(pluginPath);
+  const pluginInstance = module();
+  return {
+    module: (0, _plugin.createPlugin)(pluginInstance.setup, pluginInstance)
   };
+};
 
-  return plugins.map(plugin => {
+const loadPlugins = (appDirectory, configPlugins, options) => {
+  const loadedPlugins = (0, _utils.getInternalPlugins)(appDirectory, options.internalPlugins);
+  return [...loadedPlugins, ...configPlugins].map(plugin => {
     const {
-      pkg,
-      path,
       module
-    } = resolvePlugin(plugin);
-    return _objectSpread(_objectSpread({}, module), {}, {
-      pluginPath: path,
-      pkg
-    });
+    } = resolvePlugin(plugin, appDirectory);
+    return module;
   });
 };
 

package/dist/js/node/plugin.js

@@ -8,11 +8,11 @@ exports.useConfigContext = exports.useAppContext = exports.setAppContext = expor
 var _plugin = require("@modern-js/plugin");
 
 // collect all middleware register in server plugins
-const gather = (0, _plugin.createParallelWorkflow)();
-// config
+const gather = (0, _plugin.createParallelWorkflow)(); // config
+
 const config = (0, _plugin.createWaterfall)();
 const prepare = (0, _plugin.createWaterfall)();
-const create = (0, _plugin.createAsyncPipeline)();
+const preparebeforeRouteHandler = (0, _plugin.createAsyncPipeline)();
 const prepareWebServer = (0, _plugin.createAsyncPipeline)();
 const prepareApiServer = (0, _plugin.createAsyncPipeline)();
 const onApiChange = (0, _plugin.createWaterfall)();
@@ -75,7 +75,7 @@ const serverHooks = {
   gather,
   config,
   prepare,
-  create,
+  preparebeforeRouteHandler,
   prepareWebServer,
   prepareApiServer,
   onApiChange,

package/dist/types/loadPlugins.d.ts

@@ -1,4 +1,64 @@
+import { InternalPlugins } from '@modern-js/types';
 import { ServerPlugin } from './plugin';
-declare type Plugin = string | [string, any] | ServerPlugin;
-export declare const loadPlugins: (plugins: Plugin[], appDirectory: string) => any[];
-export {};
+export declare const loadPlugins: (appDirectory: string, configPlugins: ServerPlugin[], options: {
+  internalPlugins?: InternalPlugins;
+}) => import("@modern-js/plugin").AsyncPlugin<{
+  gather: import("@modern-js/plugin").ParallelWorkflow<{
+    addWebMiddleware: (_input: any) => void;
+    addAPIMiddleware: (_input: any) => void;
+  }, unknown>;
+  config: import("@modern-js/plugin").Waterfall<import("./plugin").ServerConfig>;
+  prepare: import("@modern-js/plugin").Waterfall<void>;
+  preparebeforeRouteHandler: import("@modern-js/plugin").AsyncPipeline<{
+    serverRoutes: import("@modern-js/types").ServerRoute[];
+    distDir: string;
+  }, import("./plugin").BeforeRouteHandler>;
+  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<import("./plugin").WebServerStartInput, import("./plugin").WebAdapter>;
+  prepareApiServer: import("@modern-js/plugin").AsyncPipeline<import("./plugin").APIServerStartInput, import("./plugin").Adapter>;
+  onApiChange: import("@modern-js/plugin").Waterfall<{
+    filename: string;
+    event: "add" | "unlink" | "change";
+  }[]>;
+  beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<import("./plugin").ServerOptions, any>;
+  setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
+  afterDevServer: import("@modern-js/plugin").ParallelWorkflow<import("./plugin").ServerOptions, any>;
+  beforeRouteSet: import("@modern-js/plugin").AsyncPipeline<import("./plugin").Route[], import("./plugin").Route[]>;
+  afterRouteSet: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
+  beforeProdServer: import("@modern-js/plugin").ParallelWorkflow<import("./plugin").ServerOptions, any>;
+  afterProdServer: import("@modern-js/plugin").ParallelWorkflow<import("./plugin").ServerOptions, any>;
+  listen: import("@modern-js/plugin").ParallelWorkflow<{
+    ip: string;
+    port: number;
+  }, any[]>;
+  beforeServerReset: import("@modern-js/plugin").ParallelWorkflow<void, unknown>;
+  afterServerReset: import("@modern-js/plugin").ParallelWorkflow<void, unknown>;
+  extendSSRContext: import("@modern-js/plugin").AsyncWaterfall<import("@modern-js/types").BaseSSRServerContext>;
+  extendContext: import("@modern-js/plugin").AsyncPipeline<import("@modern-js/types").ModernServerContext, import("@modern-js/types").ModernServerContext>;
+  handleError: import("@modern-js/plugin").ParallelWorkflow<{
+    error: Error;
+  }, unknown>;
+  beforeMatch: import("@modern-js/plugin").AsyncPipeline<{
+    context: import("@modern-js/types").ModernServerContext;
+  }, any>;
+  afterMatch: import("@modern-js/plugin").AsyncPipeline<import("@modern-js/types").AfterMatchContext, any>;
+  prefetch: import("@modern-js/plugin").ParallelWorkflow<{
+    context: import("./plugin").SSRServerContext;
+  }, unknown>;
+  renderToString: import("@modern-js/plugin").AsyncPipeline<{
+    App: import("react").Component<{}, {}, any>;
+    context: import("./plugin").RenderContext;
+  }, string>;
+  beforeRender: import("@modern-js/plugin").AsyncPipeline<{
+    context: import("@modern-js/types").ModernServerContext;
+  }, any>;
+  afterRender: import("@modern-js/plugin").AsyncPipeline<import("@modern-js/types").AfterRenderContext, any>;
+  beforeSend: import("@modern-js/plugin").AsyncPipeline<import("@modern-js/types").ModernServerContext, import("./plugin").RequestResult>;
+  afterSend: import("@modern-js/plugin").ParallelWorkflow<{
+    context: import("@modern-js/types").ModernServerContext;
+  }, unknown>;
+  reset: import("@modern-js/plugin").ParallelWorkflow<void, unknown>;
+}, {
+  useAppContext: () => import("@modern-js/types").ISAppContext;
+  useConfigContext: () => import("@modern-js/core").UserConfig;
+  setAppContext: (value: import("@modern-js/types").ISAppContext) => void;
+}>[];

package/dist/types/plugin.d.ts

@@ -2,9 +2,8 @@
 import { IncomingMessage, ServerResponse } from 'http';
 import type { Component } from 'react';
 import { CommonAPI, ToThreads, AsyncSetup, PluginOptions } from '@modern-js/plugin';
-import type { ModernServerContext, BaseSSRServerContext, Metrics, Logger } from '@modern-js/types/server';
+import type { ModernServerContext, BaseSSRServerContext, AfterMatchContext, AfterRenderContext, MiddlewareContext, ISAppContext, ServerRoute } from '@modern-js/types';
 import type { NormalizedConfig, UserConfig } from '@modern-js/core';
-import type { ISAppContext } from '@modern-js/types';
 import type { Options } from 'http-proxy-middleware';
 /** The subset of NormalizedConfig, which really need in server */
 
@@ -19,19 +18,13 @@ export declare type ServerOptions = {
   bff: NormalizedConfig['bff'];
   plugins: NormalizedConfig['plugins'];
 };
-declare type ServerInitInput = {
-  loggerOptions: any;
-  metricsOptions: any;
-};
-declare type InitExtension = {
-  logger: Logger;
-  metrics: Metrics;
-};
+export declare type WebAdapter = (ctx: MiddlewareContext) => void | Promise<void>;
 export declare type Adapter = (req: IncomingMessage, res: ServerResponse) => void | Promise<void>;
 export declare type WebServerStartInput = {
   pwd: string;
   config: Record<string, any>;
 };
+export declare type BeforeRouteHandler = (context: ModernServerContext) => Promise<void>;
 export declare type APIServerStartInput = {
   pwd: string;
   prefix?: string;
@@ -74,8 +67,11 @@ declare const serverHooks: {
   }, unknown>;
   config: import("@modern-js/plugin").Waterfall<ServerConfig>;
   prepare: import("@modern-js/plugin").Waterfall<void>;
-  create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
-  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
+  preparebeforeRouteHandler: import("@modern-js/plugin").AsyncPipeline<{
+    serverRoutes: ServerRoute[];
+    distDir: string;
+  }, BeforeRouteHandler>;
+  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
@@ -99,10 +95,7 @@ declare const serverHooks: {
   beforeMatch: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterMatch: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    routeAPI: any;
-  }, any>;
+  afterMatch: import("@modern-js/plugin").AsyncPipeline<AfterMatchContext, any>;
   prefetch: import("@modern-js/plugin").ParallelWorkflow<{
     context: SSRServerContext;
   }, unknown>;
@@ -113,10 +106,7 @@ declare const serverHooks: {
   beforeRender: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterRender: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    templateAPI: any;
-  }, any>;
+  afterRender: import("@modern-js/plugin").AsyncPipeline<AfterRenderContext, any>;
   beforeSend: import("@modern-js/plugin").AsyncPipeline<ModernServerContext, RequestResult>;
   afterSend: import("@modern-js/plugin").ParallelWorkflow<{
     context: ModernServerContext;
@@ -139,8 +129,11 @@ export declare const createServerManager: () => import("@modern-js/plugin").Asyn
   }, unknown>;
   config: import("@modern-js/plugin").Waterfall<ServerConfig>;
   prepare: import("@modern-js/plugin").Waterfall<void>;
-  create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
-  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
+  preparebeforeRouteHandler: import("@modern-js/plugin").AsyncPipeline<{
+    serverRoutes: ServerRoute[];
+    distDir: string;
+  }, BeforeRouteHandler>;
+  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
@@ -164,10 +157,7 @@ export declare const createServerManager: () => import("@modern-js/plugin").Asyn
   beforeMatch: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterMatch: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    routeAPI: any;
-  }, any>;
+  afterMatch: import("@modern-js/plugin").AsyncPipeline<AfterMatchContext, any>;
   prefetch: import("@modern-js/plugin").ParallelWorkflow<{
     context: SSRServerContext;
   }, unknown>;
@@ -178,10 +168,7 @@ export declare const createServerManager: () => import("@modern-js/plugin").Asyn
   beforeRender: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterRender: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    templateAPI: any;
-  }, any>;
+  afterRender: import("@modern-js/plugin").AsyncPipeline<AfterRenderContext, any>;
   beforeSend: import("@modern-js/plugin").AsyncPipeline<ModernServerContext, RequestResult>;
   afterSend: import("@modern-js/plugin").ParallelWorkflow<{
     context: ModernServerContext;
@@ -199,8 +186,11 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
   }, unknown>;
   config: import("@modern-js/plugin").Waterfall<ServerConfig>;
   prepare: import("@modern-js/plugin").Waterfall<void>;
-  create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
-  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
+  preparebeforeRouteHandler: import("@modern-js/plugin").AsyncPipeline<{
+    serverRoutes: ServerRoute[];
+    distDir: string;
+  }, BeforeRouteHandler>;
+  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
@@ -224,10 +214,7 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
   beforeMatch: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterMatch: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    routeAPI: any;
-  }, any>;
+  afterMatch: import("@modern-js/plugin").AsyncPipeline<AfterMatchContext, any>;
   prefetch: import("@modern-js/plugin").ParallelWorkflow<{
     context: SSRServerContext;
   }, unknown>;
@@ -238,10 +225,7 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
   beforeRender: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterRender: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    templateAPI: any;
-  }, any>;
+  afterRender: import("@modern-js/plugin").AsyncPipeline<AfterRenderContext, any>;
   beforeSend: import("@modern-js/plugin").AsyncPipeline<ModernServerContext, RequestResult>;
   afterSend: import("@modern-js/plugin").ParallelWorkflow<{
     context: ModernServerContext;
@@ -268,8 +252,11 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   }, unknown>;
   config: import("@modern-js/plugin").Waterfall<ServerConfig>;
   prepare: import("@modern-js/plugin").Waterfall<void>;
-  create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
-  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
+  preparebeforeRouteHandler: import("@modern-js/plugin").AsyncPipeline<{
+    serverRoutes: ServerRoute[];
+    distDir: string;
+  }, BeforeRouteHandler>;
+  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
@@ -293,10 +280,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   beforeMatch: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterMatch: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    routeAPI: any;
-  }, any>;
+  afterMatch: import("@modern-js/plugin").AsyncPipeline<AfterMatchContext, any>;
   prefetch: import("@modern-js/plugin").ParallelWorkflow<{
     context: SSRServerContext;
   }, unknown>;
@@ -307,10 +291,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   beforeRender: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterRender: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    templateAPI: any;
-  }, any>;
+  afterRender: import("@modern-js/plugin").AsyncPipeline<AfterRenderContext, any>;
   beforeSend: import("@modern-js/plugin").AsyncPipeline<ModernServerContext, RequestResult>;
   afterSend: import("@modern-js/plugin").ParallelWorkflow<{
     context: ModernServerContext;
@@ -327,8 +308,11 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   }, unknown>;
   config: import("@modern-js/plugin").Waterfall<ServerConfig>;
   prepare: import("@modern-js/plugin").Waterfall<void>;
-  create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
-  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
+  preparebeforeRouteHandler: import("@modern-js/plugin").AsyncPipeline<{
+    serverRoutes: ServerRoute[];
+    distDir: string;
+  }, BeforeRouteHandler>;
+  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
@@ -352,10 +336,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   beforeMatch: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterMatch: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    routeAPI: any;
-  }, any>;
+  afterMatch: import("@modern-js/plugin").AsyncPipeline<AfterMatchContext, any>;
   prefetch: import("@modern-js/plugin").ParallelWorkflow<{
     context: SSRServerContext;
   }, unknown>;
@@ -366,10 +347,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   beforeRender: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterRender: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    templateAPI: any;
-  }, any>;
+  afterRender: import("@modern-js/plugin").AsyncPipeline<AfterRenderContext, any>;
   beforeSend: import("@modern-js/plugin").AsyncPipeline<ModernServerContext, RequestResult>;
   afterSend: import("@modern-js/plugin").ParallelWorkflow<{
     context: ModernServerContext;
@@ -382,8 +360,11 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   }, unknown>;
   config: import("@modern-js/plugin").Waterfall<ServerConfig>;
   prepare: import("@modern-js/plugin").Waterfall<void>;
-  create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
-  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
+  preparebeforeRouteHandler: import("@modern-js/plugin").AsyncPipeline<{
+    serverRoutes: ServerRoute[];
+    distDir: string;
+  }, BeforeRouteHandler>;
+  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
@@ -407,10 +388,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   beforeMatch: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterMatch: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    routeAPI: any;
-  }, any>;
+  afterMatch: import("@modern-js/plugin").AsyncPipeline<AfterMatchContext, any>;
   prefetch: import("@modern-js/plugin").ParallelWorkflow<{
     context: SSRServerContext;
   }, unknown>;
@@ -421,10 +399,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   beforeRender: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterRender: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    templateAPI: any;
-  }, any>;
+  afterRender: import("@modern-js/plugin").AsyncPipeline<AfterRenderContext, any>;
   beforeSend: import("@modern-js/plugin").AsyncPipeline<ModernServerContext, RequestResult>;
   afterSend: import("@modern-js/plugin").ParallelWorkflow<{
     context: ModernServerContext;
@@ -434,15 +409,18 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   useAppContext: () => ISAppContext;
   useConfigContext: () => UserConfig;
   setAppContext: (value: ISAppContext) => void;
-}>> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
+}>, Record<string, unknown>> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
   gather: import("@modern-js/plugin").ParallelWorkflow<{
     addWebMiddleware: (_input: any) => void;
     addAPIMiddleware: (_input: any) => void;
   }, unknown>;
   config: import("@modern-js/plugin").Waterfall<ServerConfig>;
   prepare: import("@modern-js/plugin").Waterfall<void>;
-  create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
-  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
+  preparebeforeRouteHandler: import("@modern-js/plugin").AsyncPipeline<{
+    serverRoutes: ServerRoute[];
+    distDir: string;
+  }, BeforeRouteHandler>;
+  prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
@@ -466,10 +444,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   beforeMatch: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterMatch: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    routeAPI: any;
-  }, any>;
+  afterMatch: import("@modern-js/plugin").AsyncPipeline<AfterMatchContext, any>;
   prefetch: import("@modern-js/plugin").ParallelWorkflow<{
     context: SSRServerContext;
   }, unknown>;
@@ -480,10 +455,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   beforeRender: import("@modern-js/plugin").AsyncPipeline<{
     context: ModernServerContext;
   }, any>;
-  afterRender: import("@modern-js/plugin").AsyncPipeline<{
-    context: ModernServerContext;
-    templateAPI: any;
-  }, any>;
+  afterRender: import("@modern-js/plugin").AsyncPipeline<AfterRenderContext, any>;
   beforeSend: import("@modern-js/plugin").AsyncPipeline<ModernServerContext, RequestResult>;
   afterSend: import("@modern-js/plugin").ParallelWorkflow<{
     context: ModernServerContext;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.3",
+  "version": "2.0.0-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -29,14 +29,14 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "1.21.3",
-    "@modern-js/utils": "1.21.3"
+    "@modern-js/plugin": "2.0.0-beta.0",
+    "@modern-js/utils": "2.0.0-beta.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.21.3",
-    "@modern-js/types": "1.21.3",
-    "@scripts/build": "1.21.3",
-    "@scripts/jest-config": "1.21.3",
+    "@modern-js/core": "2.0.0-beta.0",
+    "@modern-js/types": "2.0.0-beta.0",
+    "@scripts/build": "2.0.0-beta.0",
+    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "http-proxy-middleware": "^2.0.4",
@@ -54,32 +54,10 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
-    "test": "wireit"
+    "dev": "modern build --watch",
+    "build": "modern build",
+    "test": "jest --passWithNoTests"
   }
 }