@modern-js/server 1.2.1-beta.2 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @modern-js/server
 
+## 1.3.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- 146dcd85: modify server framework plugin hook types and hook context
+- c3d46ee4: fix: test config invalid
+- 146dcd85: modify server framework plugin hook types
+- 146dcd85: fix test case in babel compiler
+- 1ebc7ee2: fix: @babel/core version
+- Updated dependencies [2da09c69]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [146dcd85]
+- Updated dependencies [74ce3bb7]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+- Updated dependencies [146dcd85]
+- Updated dependencies [8e7603ee]
+- Updated dependencies [146dcd85]
+- Updated dependencies [1ebc7ee2]
+  - @modern-js/utils@1.2.0
+  - @modern-js/core@1.3.0
+  - @modern-js/server-utils@1.2.0
+  - @modern-js/hmr-client@1.2.0
+  - @modern-js/bff-utils@1.2.0
+  - @modern-js/server-plugin@1.2.0
+
+## 1.2.1
+
+### Patch Changes
+
+- e51b1db3: feat: support custom sdk, interceptor, headers for bff request
+- Updated dependencies [e51b1db3]
+- Updated dependencies [b7fb82ec]
+  - @modern-js/server-plugin@1.1.4
+  - @modern-js/utils@1.1.6
+
 ## 1.2.0
 
 ### Minor Changes

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

@@ -1,8 +1,8 @@
 import path from 'path';
 import { fs } from '@modern-js/utils';
 import { match } from 'path-to-regexp';
-import getMockData from "./getMockData";
 import { AGGRED_DIR } from "../../constants";
+import getMockData from "./getMockData";
 
 const getMatched = (context, mockApiList) => {
   const {

package/dist/js/modern/libs/render/cache/index.js

@@ -4,9 +4,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 { ERROR_DIGEST } from "../../../constants";
 import { createCache } from "./spr";
 import { namespaceHash, withCoalescedInvoke } from "./util";
-import { ERROR_DIGEST } from "../../../constants";
 export default ((renderFn, ctx) => {
   const sprCache = createCache();
 

package/dist/js/modern/libs/render/index.js

@@ -1,11 +1,11 @@
 import path from 'path';
 import { fs } from '@modern-js/utils';
 import mime from 'mime-types';
+import { ERROR_DIGEST } from "../../constants";
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
 import { supportModern, getModernEntry } from "./modern";
-import { ERROR_DIGEST } from "../../constants";
 export const createRenderHandler = ({
   distDir,
   staticGenerate

package/dist/js/modern/libs/render/modern/index.js

@@ -1,7 +1,9 @@
 import Parser from 'ua-parser-js';
-import nativeModules from '@babel/compat-data/native-modules';
 import compareVersions from 'compare-versions';
 import { NativeModuleNameMap } from "./browser-list";
+
+const nativeModules = require('@babel/compat-data/native-modules');
+
 export const supportModern = context => {
   if (context.query.modern_es6) {
     return true;

package/dist/js/modern/server/index.js

@@ -8,9 +8,9 @@ import path from 'path';
 import { serverManager } from '@modern-js/server-plugin';
 import { logger as defaultLogger } from '@modern-js/utils';
 import { AppContext, initAppContext, initAppDir, loadUserConfig, ConfigContext } from '@modern-js/core';
+import { metrics as defaultMetrics } from "../libs/metrics";
 import { ModernServer } from "./modern-server";
 import { ModernAPIServer, ModernSSRServer, ModernWebServer } from "./modern-server-split";
-import { metrics as defaultMetrics } from "../libs/metrics";
 export class Server {
   constructor(options) {
     this.options = void 0;

package/dist/js/modern/server/modern-server.js

@@ -15,13 +15,13 @@ import { createServer } from 'http';
 import util from 'util';
 import path from 'path';
 import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
-import { createMiddlewareCollecter } from '@modern-js/server-utils';
 import mime from 'mime-types';
 import axios from 'axios';
+import clone from 'lodash.clone';
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler } from "../libs/serve-file";
-import { createErrorDocument, mergeExtension, noop } from "../utils";
+import { createErrorDocument, createMiddlewareCollecter, mergeExtension, noop } from "../utils";
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
@@ -273,6 +273,7 @@ export class ModernServer {
   }
 
   async emitRouteHook(eventName, input) {
+    input.context = clone(input.context);
     return this.runner[eventName](input, {
       onLast: noop
     });

package/dist/js/modern/utils.js

@@ -47,4 +47,27 @@ export const createErrorDocument = (status, text) => {
   </body>
   </html>
   `;
+};
+export const createMiddlewareCollecter = () => {
+  const webMiddlewares = [];
+  const apiMiddlewares = [];
+
+  const addWebMiddleware = input => {
+    webMiddlewares.push(input);
+  };
+
+  const addAPIMiddleware = input => {
+    apiMiddlewares.push(input);
+  };
+
+  const getMiddlewares = () => ({
+    web: webMiddlewares,
+    api: apiMiddlewares
+  });
+
+  return {
+    getMiddlewares,
+    addWebMiddleware,
+    addAPIMiddleware
+  };
 };

package/dist/js/node/dev-tools/mock/index.js

@@ -11,10 +11,10 @@ var _utils = require("@modern-js/utils");
 
 var _pathToRegexp = require("path-to-regexp");
 
-var _getMockData = _interopRequireDefault(require("./getMockData"));
-
 var _constants = require("../../constants");
 
+var _getMockData = _interopRequireDefault(require("./getMockData"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const getMatched = (context, mockApiList) => {

package/dist/js/node/libs/render/cache/index.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _constants = require("../../../constants");
+
 var _spr = require("./spr");
 
 var _util = require("./util");
 
-var _constants = require("../../../constants");
-
 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; }

package/dist/js/node/libs/render/index.js

@@ -11,6 +11,8 @@ var _utils = require("@modern-js/utils");
 
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
 
+var _constants = require("../../constants");
+
 var _static = require("./static");
 
 var _reader = require("./reader");
@@ -19,8 +21,6 @@ var ssr = _interopRequireWildcard(require("./ssr"));
 
 var _modern = require("./modern");
 
-var _constants = require("../../constants");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/dist/js/node/libs/render/modern/index.js

@@ -7,14 +7,14 @@ exports.supportModern = exports.getModernEntry = void 0;
 
 var _uaParserJs = _interopRequireDefault(require("ua-parser-js"));
 
-var _nativeModules = _interopRequireDefault(require("@babel/compat-data/native-modules"));
-
 var _compareVersions = _interopRequireDefault(require("compare-versions"));
 
 var _browserList = require("./browser-list");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const nativeModules = require('@babel/compat-data/native-modules');
+
 const supportModern = context => {
   if (context.query.modern_es6) {
     return true;
@@ -41,7 +41,7 @@ const supportModern = context => {
     return false;
   }
 
-  const version = _nativeModules.default['es6.module'][nativeUAName];
+  const version = nativeModules['es6.module'][nativeUAName];
 
   if (!version) {
     return false;

package/dist/js/node/server/index.js

@@ -13,12 +13,12 @@ var _utils = require("@modern-js/utils");
 
 var _core = require("@modern-js/core");
 
+var _metrics = require("../libs/metrics");
+
 var _modernServer = require("./modern-server");
 
 var _modernServerSplit = require("./modern-server-split");
 
-var _metrics = require("../libs/metrics");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }

package/dist/js/node/server/modern-server.js

@@ -13,12 +13,12 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _serverUtils = require("@modern-js/server-utils");
-
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
 
 var _axios = _interopRequireDefault(require("axios"));
 
+var _lodash = _interopRequireDefault(require("lodash.clone"));
+
 var _route = require("../libs/route");
 
 var _render = require("../libs/render");
@@ -232,7 +232,7 @@ class ModernServer {
       runner
     } = this; // server hook, gather plugin inject
 
-    const _createMiddlewareColl = (0, _serverUtils.createMiddlewareCollecter)(),
+    const _createMiddlewareColl = (0, _utils2.createMiddlewareCollecter)(),
           {
       getMiddlewares
     } = _createMiddlewareColl,
@@ -307,6 +307,7 @@ class ModernServer {
   }
 
   async emitRouteHook(eventName, input) {
+    input.context = (0, _lodash.default)(input.context);
     return this.runner[eventName](input, {
       onLast: _utils2.noop
     });

package/dist/js/node/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toMessage = exports.noop = exports.mergeExtension = exports.createErrorDocument = void 0;
+exports.toMessage = exports.noop = exports.mergeExtension = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
 
 const mergeExtension = users => {
   const output = [];
@@ -65,4 +65,30 @@ const createErrorDocument = (status, text) => {
   `;
 };
 
-exports.createErrorDocument = createErrorDocument;
+exports.createErrorDocument = createErrorDocument;
+
+const createMiddlewareCollecter = () => {
+  const webMiddlewares = [];
+  const apiMiddlewares = [];
+
+  const addWebMiddleware = input => {
+    webMiddlewares.push(input);
+  };
+
+  const addAPIMiddleware = input => {
+    apiMiddlewares.push(input);
+  };
+
+  const getMiddlewares = () => ({
+    web: webMiddlewares,
+    api: apiMiddlewares
+  });
+
+  return {
+    getMiddlewares,
+    addWebMiddleware,
+    addAPIMiddleware
+  };
+};
+
+exports.createMiddlewareCollecter = createMiddlewareCollecter;

package/dist/types/libs/metrics.d.ts

@@ -1,3 +1,3 @@
-import { Metrics } from "../type.d";
+import { Metrics } from '../type';
 declare const metrics: Metrics;
 export { metrics };

package/dist/types/libs/render/index.d.ts

@@ -1,7 +1,6 @@
-import { RenderResult } from '../../type';
+import { RenderResult, ServerHookRunner } from '../../type';
 import { ModernRoute } from '../route';
 import { ModernServerContext } from '../context';
-import { ServerHookRunner } from "../../type.d";
 export declare const createRenderHandler: ({
   distDir,
   staticGenerate

package/dist/types/libs/render/ssr.d.ts

@@ -1,6 +1,5 @@
 import { ModernServerContext } from '../context';
-import { RenderResult } from '../../type';
-import { ServerHookRunner } from "../../type.d";
+import { RenderResult, ServerHookRunner } from '../../type';
 export declare const render: (ctx: ModernServerContext, renderOptions: {
   distDir: string;
   bundle: string;

package/dist/types/server/dev-server/dev-server-split.d.ts

@@ -1,8 +1,8 @@
 import type { APIServerStartInput } from '@modern-js/server-plugin';
+import { mergeExtension } from '../../utils';
+import { ModernRouteInterface } from '../../libs/route';
+import { ApiServerMode } from '../../constants';
 import { ModernDevServer } from './dev-server';
-import { mergeExtension } from "../../utils.d";
-import { ModernRouteInterface } from "../../libs/route";
-import { ApiServerMode } from "../../constants.d";
 export declare class ModernSSRDevServer extends ModernDevServer {
   protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
   protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;

package/dist/types/server/dev-server/dev-server.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import http, { Server, IncomingMessage, ServerResponse } from 'http';
 import { ModernServer } from '../modern-server';
-import { ModernServerOptions, ServerHookRunner, ReadyOptions } from "../../type.d";
+import { ModernServerOptions, ServerHookRunner, ReadyOptions } from '../../type';
 export declare class ModernDevServer extends ModernServer {
   private devProxyHandler;
   private mockHandler;

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse, Server as httpServer } from 'http';
-import { ModernServerOptions, ReadyOptions } from "../type.d";
+import { ModernServerOptions, ReadyOptions } from '../type';
 export declare class Server {
   options: ModernServerOptions;
   private server;

package/dist/types/server/modern-server-split.d.ts

@@ -1,9 +1,9 @@
 import { APIServerStartInput } from '@modern-js/server-plugin';
+import { mergeExtension } from '../utils';
+import { ModernRoute, ModernRouteInterface, RouteMatcher } from '../libs/route';
+import { ApiServerMode } from '../constants';
+import { ModernServerContext } from '../libs/context';
 import { ModernServer } from './modern-server';
-import { mergeExtension } from "../utils.d";
-import { ModernRoute, ModernRouteInterface, RouteMatcher } from "../libs/route";
-import { ApiServerMode } from "../constants.d";
-import { ModernServerContext } from "../libs/context";
 export declare class ModernSSRServer extends ModernServer {
   protected warmupSSRBundle(): Promise<void>;
   protected verifyMatch(context: ModernServerContext, matched: RouteMatcher): void;

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

@@ -2,11 +2,11 @@
 import { IncomingMessage, ServerResponse, Server } from 'http';
 import { Adapter, APIServerStartInput } from '@modern-js/server-plugin';
 import type { NormalizedConfig } from '@modern-js/core';
-import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ReadyOptions } from "../type.d";
-import { RouteMatchManager, ModernRouteInterface, ModernRoute, RouteMatcher } from "../libs/route";
-import { mergeExtension } from "../utils.d";
-import { ModernServerContext } from "../libs/context";
-import { ApiServerMode } from "../constants.d";
+import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ReadyOptions } from '../type';
+import { RouteMatchManager, ModernRouteInterface, ModernRoute, RouteMatcher } from '../libs/route';
+import { mergeExtension } from '../utils';
+import { ModernServerContext } from '../libs/context';
+import { ApiServerMode } from '../constants';
 declare type ModernServerHandler = (context: ModernServerContext, next: NextFunction) => Promise<void> | void;
 declare type ModernServerAsyncHandler = (context: ModernServerContext, next: NextFunction) => Promise<void>;
 export declare class ModernServer {
@@ -53,11 +53,14 @@ export declare class ModernServer {
   protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<Adapter>;
   protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
-  protected emitRouteHook(eventName: 'beforeMatch' | 'afterMatch' | 'beforeRender' | 'afterRender', input: any): Promise<any>;
+  protected emitRouteHook(eventName: 'beforeMatch' | 'afterMatch' | 'beforeRender' | 'afterRender', input: {
+    context: ModernServerContext;
+    [propsName: string]: any;
+  }): Promise<any>;
   protected warmupSSRBundle(): void;
   protected preServerInit(): Promise<void>;
   protected handleAPI(context: ModernServerContext): Promise<void>;
-  protected handleWeb(context: ModernServerContext, route: ModernRoute): Promise<import("@/type").RenderResult | null>;
+  protected handleWeb(context: ModernServerContext, route: ModernRoute): Promise<import("../type").RenderResult | null>;
   protected verifyMatch(_c: ModernServerContext, _m: RouteMatcher): void;
   private routeHandler;
   private injectMicroFE;

package/dist/types/utils.d.ts

@@ -3,4 +3,13 @@ export declare const mergeExtension: (users: any[]) => {
 };
 export declare const toMessage: (dig: string, e: Error | string) => string;
 export declare const noop: () => void;
-export declare const createErrorDocument: (status: number, text: string) => string;
+export declare const createErrorDocument: (status: number, text: string) => string;
+export declare type CollectMiddlewaresResult = {
+  web: any[];
+  api: any[];
+};
+export declare const createMiddlewareCollecter: () => {
+  getMiddlewares: () => CollectMiddlewaresResult;
+  addWebMiddleware: (input: any) => void;
+  addAPIMiddleware: (input: any) => void;
+};

package/jest.config.js

@@ -0,0 +1,8 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  // eslint-disable-next-line node/no-unsupported-features/es-syntax
+  ...sharedConfig,
+  rootDir: __dirname,
+};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.1-beta.2",
+  "version": "1.3.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -20,6 +20,7 @@
   "exports": {
     ".": {
       "node": {
+        "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
@@ -27,18 +28,18 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.15.0",
+    "@babel/core": "7.16.7",
     "@babel/compat-data": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.2.0",
-    "@modern-js/hmr-client": "^1.1.1",
-    "@modern-js/server-plugin": "^1.1.3",
-    "@modern-js/server-utils": "^1.1.2",
-    "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/utils": "^1.1.5",
+    "@modern-js/core": "^1.3.0",
+    "@modern-js/hmr-client": "^1.2.0",
+    "@modern-js/server-plugin": "^1.2.0",
+    "@modern-js/server-utils": "^1.2.0",
+    "@modern-js/bff-utils": "^1.2.0",
+    "@modern-js/utils": "^1.2.0",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -58,12 +59,12 @@
     "tsconfig-paths": "^3.11.0",
     "ua-parser-js": "^0.7.28",
     "webpack-dev-middleware": "^5.0.0",
-    "ws": "^8.2.0"
+    "ws": "^8.2.0",
+    "lodash.clone": "^4.5.0"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^1.1.3",
-    "@modern-js/plugin-testing": "^1.2.0",
-    "@modern-js/types": "^1.1.4",
+    "@scripts/build": "0.0.0",
+    "@modern-js/types": "^1.2.0",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",
@@ -77,10 +78,14 @@
     "@types/ua-parser-js": "^0.7.36",
     "@types/webpack-dev-middleware": "^5.0.2",
     "@types/ws": "^7.4.7",
+    "@types/lodash.clone": "^4",
     "typescript": "^4",
     "webpack": "^5.54.0",
     "node-mocks-http": "^1.11.0",
-    "portfinder": "^1.0.28"
+    "portfinder": "^1.0.28",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0",
+    "websocket": "^1"
   },
   "peerDependencies": {
     "webpack": "^5.54.0"
@@ -93,13 +98,14 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
     "dev": "modern build --watch",
-    "test": "modern test"
+    "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/src/dev-tools/mock/index.ts

@@ -3,8 +3,8 @@ import { fs } from '@modern-js/utils';
 import { match } from 'path-to-regexp';
 import { NextFunction } from '../../type';
 import { ModernServerContext } from '../../libs/context';
+import { AGGRED_DIR } from '../../constants';
 import getMockData, { MockApi } from './getMockData';
-import { AGGRED_DIR } from '@/constants';
 
 const getMatched = (context: ModernServerContext, mockApiList: MockApi[]) => {
   const { path: targetPathname, method: targetMethod } = context;

package/src/dev-tools/socket-server.ts

@@ -4,7 +4,7 @@ import ws from 'ws';
 import type { Stats } from 'webpack';
 import { logger } from '@modern-js/utils';
 import { DevServerOptions } from '../type';
-import { noop } from '@/utils';
+import { noop } from '../utils';
 
 interface ExtWebSocket extends ws {
   isAlive: boolean;

package/src/libs/metrics.ts

@@ -1,4 +1,4 @@
-import { Metrics } from '@/type';
+import { Metrics } from '../type';
 
 const metrics: Metrics = {
   gauges() {

package/src/libs/render/cache/index.ts

@@ -1,9 +1,9 @@
 import { ModernServerContext } from '../../context';
 import { RenderFunction, SSRServerContext } from '../type';
+import { ERROR_DIGEST } from '../../../constants';
 import { createCache } from './spr';
 import { namespaceHash, withCoalescedInvoke } from './util';
 import { CacheContext } from './type';
-import { ERROR_DIGEST } from '@/constants';
 
 export default (renderFn: RenderFunction, ctx: ModernServerContext) => {
   const sprCache = createCache();

package/src/libs/render/index.ts

@@ -1,15 +1,14 @@
 import path from 'path';
 import { fs } from '@modern-js/utils';
 import mime from 'mime-types';
-import { RenderResult } from '../../type';
+import { RenderResult, ServerHookRunner } from '../../type';
 import { ModernRoute } from '../route';
 import { ModernServerContext } from '../context';
+import { ERROR_DIGEST } from '../../constants';
 import { handleDirectory } from './static';
 import { readFile } from './reader';
 import * as ssr from './ssr';
 import { supportModern, getModernEntry } from './modern';
-import { ERROR_DIGEST } from '@/constants';
-import { ServerHookRunner } from '@/type';
 
 export const createRenderHandler = ({
   distDir,

package/src/libs/render/modern/index.ts

@@ -1,9 +1,10 @@
 import Parser from 'ua-parser-js';
-import nativeModules from '@babel/compat-data/native-modules';
 import compareVersions from 'compare-versions';
 import { ModernServerContext } from '../../context';
 import { NativeModuleNameMap } from './browser-list';
 
+const nativeModules = require('@babel/compat-data/native-modules');
+
 export const supportModern = (context: ModernServerContext) => {
   if (context.query.modern_es6) {
     return true;

package/src/libs/render/ssr.ts

@@ -2,10 +2,9 @@ import path from 'path';
 import { SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
 import mime from 'mime-types';
 import { ModernServerContext } from '../context';
-import { RenderResult } from '../../type';
+import { RenderResult, ServerHookRunner } from '../../type';
 import cache from './cache';
 import { SSRServerContext } from './type';
-import { ServerHookRunner } from '@/type';
 
 export const render = async (
   ctx: ModernServerContext,

package/src/server/dev-server/dev-server-split.ts

@@ -1,8 +1,8 @@
 import type { APIServerStartInput } from '@modern-js/server-plugin';
+import { mergeExtension } from '../../utils';
+import { ModernRouteInterface } from '../../libs/route';
+import { ApiServerMode } from '../../constants';
 import { ModernDevServer } from './dev-server';
-import { mergeExtension } from '@/utils';
-import { ModernRouteInterface } from '@/libs/route';
-import { ApiServerMode } from '@/constants';
 
 export class ModernSSRDevServer extends ModernDevServer {
   protected prepareAPIHandler(

package/src/server/dev-server/dev-server.ts

@@ -15,23 +15,23 @@ import {
 import type { MultiCompiler, Compiler } from 'webpack';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import { ModernServer } from '../modern-server';
-import { createMockHandler } from '@/dev-tools/mock';
-import { createProxyHandler, ProxyOptions } from '@/libs/proxy';
+import { createMockHandler } from '../../dev-tools/mock';
+import { createProxyHandler, ProxyOptions } from '../../libs/proxy';
 import {
   DevServerOptions,
   ModernServerOptions,
   NextFunction,
   ServerHookRunner,
   ReadyOptions,
-} from '@/type';
-import SocketServer from '@/dev-tools/socket-server';
-import DevServerPlugin from '@/dev-tools/dev-server-plugin';
-import { ModernServerContext } from '@/libs/context';
-import { createLaunchEditorHandler } from '@/dev-tools/launch-editor';
-import { enableRegister } from '@/dev-tools/babel/register';
-import * as reader from '@/libs/render/reader';
-import Watcher from '@/dev-tools/watcher';
-import { AGGRED_DIR } from '@/constants';
+} from '../../type';
+import SocketServer from '../../dev-tools/socket-server';
+import DevServerPlugin from '../../dev-tools/dev-server-plugin';
+import { ModernServerContext } from '../../libs/context';
+import { createLaunchEditorHandler } from '../../dev-tools/launch-editor';
+import { enableRegister } from '../../dev-tools/babel/register';
+import * as reader from '../../libs/render/reader';
+import Watcher from '../../dev-tools/watcher';
+import { AGGRED_DIR } from '../../constants';
 
 const DEFAULT_DEV_OPTIONS: DevServerOptions = {
   client: {
@@ -166,7 +166,7 @@ export class ModernDevServer extends ModernServer {
     const { dev } = this;
     const devHttpsOption = typeof dev === 'object' && dev.https;
     if (devHttpsOption) {
-      const { genHttpsOptions } = require('@/dev-tools/https');
+      const { genHttpsOptions } = require('../../dev-tools/https');
       const httpsOptions = await genHttpsOptions(devHttpsOption);
       return createHttpsServer(httpsOptions, handler);
     } else {

package/src/server/index.ts

@@ -10,6 +10,8 @@ import {
   ConfigContext,
   UserConfig,
 } from '@modern-js/core';
+import { ModernServerOptions, ServerHookRunner, ReadyOptions } from '../type';
+import { metrics as defaultMetrics } from '../libs/metrics';
 import { ModernServer } from './modern-server';
 import type { ModernDevServer } from './dev-server';
 import {
@@ -17,8 +19,6 @@ import {
   ModernSSRServer,
   ModernWebServer,
 } from './modern-server-split';
-import { ModernServerOptions, ServerHookRunner, ReadyOptions } from '@/type';
-import { metrics as defaultMetrics } from '@/libs/metrics';
 
 export class Server {
   public options: ModernServerOptions;

package/src/server/modern-server-split.ts

@@ -1,9 +1,9 @@
 import { APIServerStartInput } from '@modern-js/server-plugin';
+import { mergeExtension } from '../utils';
+import { ModernRoute, ModernRouteInterface, RouteMatcher } from '../libs/route';
+import { ApiServerMode } from '../constants';
+import { ModernServerContext } from '../libs/context';
 import { ModernServer } from './modern-server';
-import { mergeExtension } from '@/utils';
-import { ModernRoute, ModernRouteInterface, RouteMatcher } from '@/libs/route';
-import { ApiServerMode } from '@/constants';
-import { ModernServerContext } from '@/libs/context';
 
 export class ModernSSRServer extends ModernServer {
   // Todo should not invoke any route hook in modernSSRServer

package/src/server/modern-server.ts

@@ -4,10 +4,10 @@ import util from 'util';
 import path from 'path';
 import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
 import { Adapter, APIServerStartInput } from '@modern-js/server-plugin';
-import { createMiddlewareCollecter } from '@modern-js/server-utils';
 import type { NormalizedConfig } from '@modern-js/core';
 import mime from 'mime-types';
 import axios from 'axios';
+import clone from 'lodash.clone';
 import {
   ModernServerOptions,
   NextFunction,
@@ -16,27 +16,32 @@ import {
   Logger,
   ReadyOptions,
   ConfWithBFF,
-} from '@/type';
+} from '../type';
 import {
   RouteMatchManager,
   ModernRouteInterface,
   ModernRoute,
   RouteMatcher,
-} from '@/libs/route';
-import { createRenderHandler } from '@/libs/render';
-import { createStaticFileHandler } from '@/libs/serve-file';
-import { createErrorDocument, mergeExtension, noop } from '@/utils';
-import * as reader from '@/libs/render/reader';
-import { createProxyHandler, ProxyOptions } from '@/libs/proxy';
-import { createContext, ModernServerContext } from '@/libs/context';
+} from '../libs/route';
+import { createRenderHandler } from '../libs/render';
+import { createStaticFileHandler } from '../libs/serve-file';
+import {
+  createErrorDocument,
+  createMiddlewareCollecter,
+  mergeExtension,
+  noop,
+} from '../utils';
+import * as reader from '../libs/render/reader';
+import { createProxyHandler, ProxyOptions } from '../libs/proxy';
+import { createContext, ModernServerContext } from '../libs/context';
 import {
   AGGRED_DIR,
   ApiServerMode,
   ERROR_DIGEST,
   ERROR_PAGE_TEXT,
-} from '@/constants';
-import { createTemplateAPI } from '@/libs/hook-api/template';
-import { createRouteAPI } from '@/libs/hook-api/route';
+} from '../constants';
+import { createTemplateAPI } from '../libs/hook-api/template';
+import { createRouteAPI } from '../libs/hook-api/route';
 
 type ModernServerHandler = (
   context: ModernServerContext,
@@ -319,9 +324,13 @@ export class ModernServer {
 
   protected async emitRouteHook(
     eventName: 'beforeMatch' | 'afterMatch' | 'beforeRender' | 'afterRender',
-    input: any,
+    input: {
+      context: ModernServerContext;
+      [propsName: string]: any;
+    },
   ) {
-    return this.runner[eventName](input, { onLast: noop as any });
+    input.context = clone(input.context);
+    return this.runner[eventName](input as any, { onLast: noop as any });
   }
 
   // warmup ssr function

package/src/utils.ts

@@ -49,3 +49,31 @@ export const createErrorDocument = (status: number, text: string) => {
   </html>
   `;
 };
+
+export type CollectMiddlewaresResult = {
+  web: any[];
+  api: any[];
+};
+
+export const createMiddlewareCollecter = () => {
+  const webMiddlewares: any[] = [];
+  const apiMiddlewares: any[] = [];
+
+  const addWebMiddleware = (input: any) => {
+    webMiddlewares.push(input);
+  };
+
+  const addAPIMiddleware = (input: any) => {
+    apiMiddlewares.push(input);
+  };
+
+  const getMiddlewares = (): CollectMiddlewaresResult => ({
+    web: webMiddlewares,
+    api: apiMiddlewares,
+  });
+  return {
+    getMiddlewares,
+    addWebMiddleware,
+    addAPIMiddleware,
+  };
+};

package/tests/dev.test.ts

@@ -0,0 +1,39 @@
+import http from 'http';
+import SocketServer from '../src/dev-tools/socket-server';
+
+describe('test dev tools', () => {
+  test('should socket server work correctly', () => {
+    const socketServer: any = new SocketServer({
+      client: {
+        port: '8080',
+        overlay: false,
+        logging: 'error',
+        path: '/',
+        host: '127.0.0.1',
+      },
+      dev: {
+        writeToDisk: false,
+      },
+      watch: true,
+      hot: true,
+      liveReload: true,
+    });
+    const app = http
+      .createServer((req, res) => {
+        res.end();
+      })
+      .listen(8080);
+
+    socketServer.prepare(app);
+    expect(socketServer.app).toBe(app);
+    expect(socketServer.stats).toBeUndefined();
+
+    const mockStats = {
+      toJson: () => ({}),
+    };
+    socketServer.updateStats(mockStats);
+    expect(socketServer.stats).toBe(mockStats);
+
+    app.close();
+  });
+});

package/tests/fixtures/pure/tsconfig.json

@@ -5,7 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "paths": {
-      "@/*": ["./src/*"],
+      ,
       "@shared/*": ["./shared/*"]
     }
   },

package/tests/middleware.test.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-nested-callbacks */
 import path from 'path';
 import EventEmitter from 'events';
 import { Readable } from 'stream';
@@ -66,12 +65,15 @@ describe('test middleware create factory', () => {
     let sourceServerPort = 8080;
     let sourceServer: Server | null = null;
     beforeAll(async () => {
+      let done: any;
+      const promise = new Promise(resolve => (done = resolve));
       sourceServerPort = await portfinder.getPortPromise();
       sourceServer = createServer((req, res) => {
         res.setHeader('Access-Control-Allow-Origin', '*');
         res.write(req.url?.slice(1));
         res.end();
-      }).listen(sourceServerPort);
+      }).listen(sourceServerPort, done);
+      return promise;
     });
 
     afterAll(() => {
@@ -83,7 +85,7 @@ describe('test middleware create factory', () => {
     test('should proxy correctly use simply options', async () => {
       const port = await portfinder.getPortPromise();
       const middlewares = createProxyHandler({
-        '/simple': `http://127.0.0.1:${sourceServerPort}`,
+        '/simple': `http://localhost:${sourceServerPort}`,
       });
       const proxyHandler = middlewares![0];
 
@@ -95,7 +97,7 @@ describe('test middleware create factory', () => {
       }).listen(port);
 
       try {
-        const { data } = await axios.get(`http://127.0.0.1:${port}/simple`);
+        const { data } = await axios.get(`http://localhost:${port}/simple`);
         expect(data).toBe('simple');
       } finally {
         server.close();
@@ -106,7 +108,7 @@ describe('test middleware create factory', () => {
       const port = await portfinder.getPortPromise();
       const middlewares = createProxyHandler({
         '/simple-obj': {
-          target: `http://127.0.0.1:${sourceServerPort}`,
+          target: `http://localhost:${sourceServerPort}`,
         },
       });
       const proxyHandler = middlewares![0];
@@ -119,7 +121,7 @@ describe('test middleware create factory', () => {
       }).listen(port);
 
       try {
-        const { data } = await axios.get(`http://127.0.0.1:${port}/simple-obj`);
+        const { data } = await axios.get(`http://localhost:${port}/simple-obj`);
         expect(data).toBe('simple-obj');
       } finally {
         server.close();
@@ -130,7 +132,7 @@ describe('test middleware create factory', () => {
       const port = await portfinder.getPortPromise();
       const middlewares = createProxyHandler({
         context: '/context',
-        target: `http://127.0.0.1:${sourceServerPort}`,
+        target: `http://localhost:${sourceServerPort}`,
       });
       const proxyHandler = middlewares![0];
 
@@ -142,7 +144,7 @@ describe('test middleware create factory', () => {
       }).listen(port);
 
       try {
-        const { data } = await axios.get(`http://127.0.0.1:${port}/context`);
+        const { data } = await axios.get(`http://localhost:${port}/context`);
         expect(data).toBe('context');
       } finally {
         server.close();
@@ -154,7 +156,7 @@ describe('test middleware create factory', () => {
       const middlewares = createProxyHandler([
         {
           context: '/array',
-          target: `http://127.0.0.1:${sourceServerPort}`,
+          target: `http://localhost:${sourceServerPort}`,
         },
       ]);
       const proxyHandler = middlewares![0];
@@ -167,7 +169,7 @@ describe('test middleware create factory', () => {
       }).listen(port);
 
       try {
-        const { data } = await axios.get(`http://127.0.0.1:${port}/array`);
+        const { data } = await axios.get(`http://localhost:${port}/array`);
         expect(data).toBe('array');
       } finally {
         server.close();
@@ -175,4 +177,3 @@ describe('test middleware create factory', () => {
     });
   });
 });
-/* eslint-enable max-nested-callbacks */

package/tests/server.test.ts

@@ -2,6 +2,7 @@ import path from 'path';
 import { defaultsConfig, NormalizedConfig } from '@modern-js/core';
 import { ModernServerContext, NextFunction } from '@modern-js/types';
 import createServer, { Server } from '../src';
+import { ModernServer } from '../src/server/modern-server';
 
 describe('test server', () => {
   test('should throw error when ', resolve => {
@@ -58,7 +59,7 @@ describe('test server', () => {
         config: defaultsConfig as NormalizedConfig,
         pwd: appDirectory,
       });
-      const modernServer = server.server as any;
+      const modernServer = (server as any).server;
 
       const len = modernServer.handlers.length;
 
@@ -85,5 +86,16 @@ describe('test server', () => {
       expect(newLen + 1).toBe(nextLen);
       expect(modernServer.handlers[nextLen - 1]).toBe(asyncHandler);
     });
+
+    test('should get request handler correctly', async () => {
+      const server = await createServer({
+        config: defaultsConfig as NormalizedConfig,
+        pwd: appDirectory,
+      });
+
+      const modernServer: ModernServer = (server as any).server;
+      const handler = modernServer.getRequestHandler();
+      expect(typeof handler === 'function').toBeTruthy();
+    });
   });
 });

package/tests/tsconfig.json

@@ -7,8 +7,6 @@
     "isolatedModules": true,
     "sourceMap": true
   },
-  "paths": {
-    "@/*": ["../src/*"]
-  },
+  "paths": {},
   "exclude": ["src/__test__/fixtures/**"]
 }

package/tests/utils.test.ts

@@ -3,6 +3,7 @@ import {
   mergeExtension,
   toMessage,
   createErrorDocument,
+  createMiddlewareCollecter,
 } from '../src/utils';
 
 describe('test server utils', () => {
@@ -37,4 +38,34 @@ describe('test server utils', () => {
     expect(doc).toMatch('redirect');
     expect(doc).toMatch('302: redirect');
   });
+
+  describe('test middleware collector', () => {
+    test('shoule return web middleware correctly', () => {
+      const { addWebMiddleware, getMiddlewares } = createMiddlewareCollecter();
+
+      const before = getMiddlewares();
+      expect(before.web).toEqual([]);
+
+      const middleware = async () => {
+        // empty
+      };
+      addWebMiddleware(middleware);
+      const after = getMiddlewares();
+      expect(after.web).toEqual([middleware]);
+    });
+
+    test('shoule return api middleware correctly', () => {
+      const { addAPIMiddleware, getMiddlewares } = createMiddlewareCollecter();
+
+      const before = getMiddlewares();
+      expect(before.web).toEqual([]);
+
+      const middleware = async () => {
+        // empty
+      };
+      addAPIMiddleware(middleware);
+      const after = getMiddlewares();
+      expect(after.api).toEqual([middleware]);
+    });
+  });
 });

package/tsconfig.json

@@ -5,9 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "esModuleInterop": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }