@modern-js/server 0.0.0-windows-2021101123127 → 0.0.0-windows-20211056953

package/CHANGELOG.md

@@ -1,18 +1,18 @@
 # @modern-js/server
 
-## 0.0.0-windows-2021101123127
+## 0.0.0-windows-20211056953
 
 ### Patch Changes
 
 - test windows
 - Updated dependencies [undefined]
-  - @modern-js/core@0.0.0-windows-2021101123127
-  - @modern-js/utils@0.0.0-windows-2021101123127
-  - @modern-js/bff-utils@0.0.0-windows-2021101123127
-  - @modern-js/hmr-client@0.0.0-windows-2021101123127
-  - @modern-js/server-plugin@0.0.0-windows-2021101123127
-  - @modern-js/plugin-polyfill@0.0.0-windows-2021101123127
-  - @modern-js/server-utils@0.0.0-windows-2021101123127
+  - @modern-js/core@0.0.0-windows-20211056953
+  - @modern-js/bff-utils@0.0.0-windows-20211056953
+  - @modern-js/hmr-client@0.0.0-windows-20211056953
+  - @modern-js/server-plugin@0.0.0-windows-20211056953
+  - @modern-js/plugin-polyfill@0.0.0-windows-20211056953
+  - @modern-js/server-utils@0.0.0-windows-20211056953
+  - @modern-js/utils@0.0.0-windows-20211056953
 
 ## 1.0.0
 

package/dist/js/modern/dev-tools/babel/register.js

@@ -4,7 +4,7 @@ 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 { path } from '@modern-js/utils';
+import path from 'path';
 import { resolveBabelConfig } from '@modern-js/server-utils';
 const registerDirs = ['./api', './server', './config/mock', './shared'];
 export const enableRegister = (projectRoot, config) => {
@@ -18,7 +18,7 @@ export const enableRegister = (projectRoot, config) => {
   return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
     only: [function (filePath) {
       // TODO: wait params
-      if (filePath.includes('node_modules/.modern-js')) {
+      if (filePath.includes(`node_modules${path.sep}.modern-js`)) {
         return true;
       }
 

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

@@ -1,4 +1,5 @@
-import { fs, path } from '@modern-js/utils';
+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";

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

@@ -221,7 +221,8 @@ class CacheManager {
     let data = this.cache.get(cacheKey);
 
     if (!data) {
-      const caches = await createPageCaches(MAX_CACHE_EACH_REQ);
+      const caches = await createPageCaches(MAX_CACHE_EACH_REQ); // eslint-disable-next-line require-atomic-updates
+
       data = this.createCacheContent(cacheConfig, caches);
     }
 

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

@@ -1 +1,2 @@
+export {};
 export {};

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

@@ -1,4 +1,5 @@
-import { fs, path } from '@modern-js/utils';
+import path from 'path';
+import { fs } from '@modern-js/utils';
 import mime from 'mime-types';
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";

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

@@ -1,4 +1,5 @@
-import { path, SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
+import path from 'path';
+import { SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
 import mime from 'mime-types';
 import cache from "./cache";
 export const render = async (ctx, renderOptions) => {

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

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import mime from 'mime-types';
 import { readFile } from "./reader";
 export async function handleDirectory(ctx, entryPath, urlPath) {

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

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import { ModernDevServer } from "./dev-server";
 import { ModernServer } from "./modern-server";
 export class APIModernServer extends ModernServer {
@@ -34,5 +33,4 @@ export class APIModernDevServer extends ModernDevServer {
   async preServerInit() {// noop
   }
 
-}
-/* eslint-enable max-classes-per-file */
+}

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

@@ -1,4 +1,5 @@
-import { path, HMR_SOCK_PATH } from '@modern-js/utils';
+import path from 'path';
+import { HMR_SOCK_PATH } from '@modern-js/utils';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import { createMockHandler } from "../dev-tools/mock";
 import { createProxyHandler } from "../libs/proxy";

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

@@ -27,9 +27,9 @@ export class Server {
   }
 
   getRequestHandler() {
-    return (req, res) => {
+    return (req, res, next) => {
       const requestHandler = this.server.getRequestHandler();
-      return requestHandler(req, res);
+      return requestHandler(req, res, next);
     };
   }
 

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

@@ -12,7 +12,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 /* eslint-disable max-lines */
 import util from 'util';
-import { path, fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
+import path from 'path';
+import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
 import { gather, createMiddlewareCollecter } from '@modern-js/server-utils';
 import mime from 'mime-types';
 import axios from 'axios';
@@ -453,7 +454,8 @@ export class ModernServer {
     };
   }
 
-  requestHandler(req, res) {
+  requestHandler(req, res, next = () => {// empty
+  }) {
     res.statusCode = 200;
     const context = createContext(req, res, {
       logger: this.logger,
@@ -461,8 +463,7 @@ export class ModernServer {
     });
 
     try {
-      this._handler(context, () => {// empty
-      });
+      this._handler(context, next);
     } catch (err) {
       this.onError(context, err);
     }

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

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import { ModernDevServer } from "./dev-server";
 import { ModernServer } from "./modern-server";
 export class WebModernServer extends ModernServer {
@@ -28,5 +27,4 @@ export class WebModernDevServer extends ModernDevServer {
     return routes.filter(route => route.entryName);
   }
 
-}
-/* eslint-enable max-classes-per-file */
+}

package/dist/js/modern/type.js

@@ -1 +1,2 @@
+export {};
 export {};

package/dist/js/node/dev-tools/babel/register.js

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.enableRegister = void 0;
 
-var _utils = require("@modern-js/utils");
+var _path = _interopRequireDefault(require("path"));
 
 var _serverUtils = require("@modern-js/server-utils");
 
+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); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -20,7 +22,7 @@ const registerDirs = ['./api', './server', './config/mock', './shared'];
 const enableRegister = (projectRoot, config) => {
   const TS_CONFIG_FILENAME = `tsconfig.json`;
 
-  const tsconfigPath = _utils.path.resolve(projectRoot, TS_CONFIG_FILENAME);
+  const tsconfigPath = _path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
 
   const babelConfig = (0, _serverUtils.resolveBabelConfig)(projectRoot, config, {
     tsconfigPath,
@@ -30,11 +32,11 @@ const enableRegister = (projectRoot, config) => {
   return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
     only: [function (filePath) {
       // TODO: wait params
-      if (filePath.includes('node_modules/.modern-js')) {
+      if (filePath.includes(`node_modules${_path.default.sep}.modern-js`)) {
         return true;
       }
 
-      return registerDirs.some(registerDir => filePath.startsWith(_utils.path.join(projectRoot, registerDir)));
+      return registerDirs.some(registerDir => filePath.startsWith(_path.default.join(projectRoot, registerDir)));
     }],
     extensions: ['.js', '.ts'],
     babelrc: false,

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createMockHandler = void 0;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _pathToRegexp = require("path-to-regexp");
@@ -45,7 +47,7 @@ const createMockHandler = ({
   let filepath = '';
 
   for (const ext of exts) {
-    const maybeMatch = _utils.path.join(pwd, `${_constants.AGGRED_DIR.mock}/index${ext}`);
+    const maybeMatch = _path.default.join(pwd, `${_constants.AGGRED_DIR.mock}/index${ext}`);
 
     if (_utils.fs.existsSync(maybeMatch)) {
       filepath = maybeMatch;

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

@@ -237,7 +237,8 @@ class CacheManager {
     let data = this.cache.get(cacheKey);
 
     if (!data) {
-      const caches = await (0, _pageCaches.createPageCaches)(MAX_CACHE_EACH_REQ);
+      const caches = await (0, _pageCaches.createPageCaches)(MAX_CACHE_EACH_REQ); // eslint-disable-next-line require-atomic-updates
+
       data = this.createCacheContent(cacheConfig, caches);
     }
 

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createRenderHandler = void 0;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
@@ -38,7 +40,7 @@ const createRenderHandler = ({
     urlPath
   } = route;
 
-  const entry = _utils.path.join(distDir, entryPath);
+  const entry = _path.default.join(distDir, entryPath);
 
   if (!route.isSPA) {
     const result = await (0, _static.handleDirectory)(ctx, entry, urlPath);
@@ -77,7 +79,7 @@ const createRenderHandler = ({
 
   return {
     content,
-    contentType: _mimeTypes.default.contentType(_utils.path.extname(templateHTML))
+    contentType: _mimeTypes.default.contentType(_path.default.extname(templateHTML))
   };
 };
 

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.render = void 0;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
@@ -22,7 +24,7 @@ const render = async (ctx, renderOptions) => {
     staticGenerate
   } = renderOptions;
 
-  const bundleJS = _utils.path.join(distDir, bundle);
+  const bundleJS = _path.default.join(distDir, bundle);
 
   const context = {
     request: {

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleDirectory = handleDirectory;
 
-var _utils = require("@modern-js/utils");
+var _path = _interopRequireDefault(require("path"));
 
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
 
@@ -18,12 +18,12 @@ async function handleDirectory(ctx, entryPath, urlPath) {
     path: pathname
   } = ctx;
 
-  const filepath = _utils.path.join(entryPath, trimLeft(pathname, urlPath)); // If can match accurately, always return the one that matches accurately
+  const filepath = _path.default.join(entryPath, trimLeft(pathname, urlPath)); // If can match accurately, always return the one that matches accurately
 
 
   let content = await (0, _reader.readFile)(filepath);
 
-  let contentType = _mimeTypes.default.contentType(_utils.path.extname(filepath) || ''); // automatic addressing
+  let contentType = _mimeTypes.default.contentType(_path.default.extname(filepath) || ''); // automatic addressing
 
 
   if (!content) {

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

@@ -9,7 +9,6 @@ var _devServer = require("./dev-server");
 
 var _modernServer = require("./modern-server");
 
-/* eslint-disable max-classes-per-file */
 class APIModernServer extends _modernServer.ModernServer {
   prepareWebHandler(_) {
     return null;
@@ -47,7 +46,5 @@ class APIModernDevServer extends _devServer.ModernDevServer {
   }
 
 }
-/* eslint-enable max-classes-per-file */
-
 
 exports.APIModernDevServer = APIModernDevServer;

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ModernDevServer = void 0;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middleware"));
@@ -219,7 +221,7 @@ class ModernDevServer extends _modernServer.ModernServer {
     } = this;
     const bundles = this.router.getBundles();
     bundles.forEach(bundle => {
-      const filepath = _utils.path.join(distDir, bundle);
+      const filepath = _path.default.join(distDir, bundle);
 
       if (require.cache[filepath]) {
         delete require.cache[filepath];

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

@@ -44,9 +44,9 @@ class Server {
   }
 
   getRequestHandler() {
-    return (req, res) => {
+    return (req, res, next) => {
       const requestHandler = this.server.getRequestHandler();
-      return requestHandler(req, res);
+      return requestHandler(req, res, next);
     };
   }
 

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

@@ -7,6 +7,8 @@ exports.ModernServer = void 0;
 
 var _util = _interopRequireDefault(require("util"));
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _serverUtils = require("@modern-js/server-utils");
@@ -90,7 +92,7 @@ class ModernServer {
 
     this.isDev = Boolean(dev);
     this.pwd = pwd;
-    this.distDir = _utils.path.join(pwd, config.output.path || '');
+    this.distDir = _path.default.join(pwd, config.output.path || '');
     this.workDir = this.isDev ? pwd : this.distDir;
     this.conf = config;
     this.runner = runner;
@@ -148,10 +150,10 @@ class ModernServer {
     await this.prepareFrameHandler();
     this.staticFileHandler = (0, _serveFile.createStaticFileHandler)([{
       path: '/static/',
-      target: _utils.path.join(distDir, 'static')
+      target: _path.default.join(distDir, 'static')
     }, {
       path: '/upload/',
-      target: _utils.path.join(distDir, 'upload')
+      target: _path.default.join(distDir, 'upload')
     }]);
     this.routeRenderHandler = (0, _render.createRenderHandler)({
       distDir,
@@ -183,7 +185,7 @@ class ModernServer {
     } = this;
     const bundles = this.router.getBundles();
     bundles.forEach(bundle => {
-      const filepath = _utils.path.join(distDir, bundle); // if error, just throw and let process die
+      const filepath = _path.default.join(distDir, bundle); // if error, just throw and let process die
 
 
       require(filepath);
@@ -192,7 +194,7 @@ class ModernServer {
 
 
   readRouteSpec() {
-    const file = _utils.path.join(this.distDir, _utils.ROUTE_SPEC_FILE);
+    const file = _path.default.join(this.distDir, _utils.ROUTE_SPEC_FILE);
 
     if (_utils.fs.existsSync(file)) {
       const content = _utils.fs.readJSONSync(file);
@@ -242,18 +244,18 @@ class ModernServer {
       web: pluginWebExt
     } = getMiddlewares();
 
-    const apiDir = _utils.path.join(workDir, API_DIR);
+    const apiDir = _path.default.join(workDir, API_DIR);
 
-    const serverDir = _utils.path.join(workDir, SERVER_DIR); // get api or web server handler from server-framework plugin
+    const serverDir = _path.default.join(workDir, SERVER_DIR); // get api or web server handler from server-framework plugin
 
 
-    if (await _utils.fs.pathExists(_utils.path.join(serverDir))) {
+    if (await _utils.fs.pathExists(_path.default.join(serverDir))) {
       const webExtension = (0, _utils2.mergeExtension)(pluginWebExt, userWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
 
     if (_utils.fs.existsSync(apiDir)) {
-      const mode = _utils.fs.existsSync(_utils.path.join(apiDir, _constants.AGGRED_DIR.lambda)) ? _constants.ApiServerMode.frame : _constants.ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
+      const mode = _utils.fs.existsSync(_path.default.join(apiDir, _constants.AGGRED_DIR.lambda)) ? _constants.ApiServerMode.frame : _constants.ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
 
       const apiExtension = (0, _utils2.mergeExtension)(pluginAPIExt, mode === _constants.ApiServerMode.frame ? [] : userAPIExt);
       this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
@@ -485,7 +487,8 @@ class ModernServer {
     };
   }
 
-  requestHandler(req, res) {
+  requestHandler(req, res, next = () => {// empty
+  }) {
     res.statusCode = 200;
     const context = (0, _context.createContext)(req, res, {
       logger: this.logger,
@@ -493,8 +496,7 @@ class ModernServer {
     });
 
     try {
-      this._handler(context, () => {// empty
-      });
+      this._handler(context, next);
     } catch (err) {
       this.onError(context, err);
     }

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

@@ -9,7 +9,6 @@ var _devServer = require("./dev-server");
 
 var _modernServer = require("./modern-server");
 
-/* eslint-disable max-classes-per-file */
 class WebModernServer extends _modernServer.ModernServer {
   prepareAPIHandler(_m, _) {
     return null;
@@ -41,7 +40,5 @@ class WebModernDevServer extends _devServer.ModernDevServer {
   }
 
 }
-/* eslint-enable max-classes-per-file */
-
 
 exports.WebModernDevServer = WebModernDevServer;

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

@@ -7,7 +7,7 @@ export declare class Server {
   private app;
   private runner;
   constructor(options: ModernServerOptions);
-  getRequestHandler(): (req: IncomingMessage, res: ServerResponse) => void;
+  getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: (() => void) | undefined) => void;
   ready(readyOptions?: ReadyOptions): void;
   init(): Promise<this>;
   listen(port: number | undefined, listener: any): void;

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

@@ -37,7 +37,7 @@ export declare class ModernServer {
     logger,
     measure
   }: ModernServerOptions, runner: ServerHookRunner);
-  getRequestHandler(): (req: IncomingMessage, res: ServerResponse) => void;
+  getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;
   init(): Promise<void>;
   ready(_: ReadyOptions): void;
   onListening(_: Server): void;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-windows-2021101123127",
+  "version": "0.0.0-windows-20211056953",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -33,13 +33,13 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^0.0.0-windows-2021101123127",
-    "@modern-js/hmr-client": "^0.0.0-windows-2021101123127",
-    "@modern-js/plugin-polyfill": "^0.0.0-windows-2021101123127",
-    "@modern-js/server-plugin": "^0.0.0-windows-2021101123127",
-    "@modern-js/server-utils": "^0.0.0-windows-2021101123127",
-    "@modern-js/bff-utils": "^0.0.0-windows-2021101123127",
-    "@modern-js/utils": "^0.0.0-windows-2021101123127",
+    "@modern-js/core": "^0.0.0-windows-20211056953",
+    "@modern-js/hmr-client": "^0.0.0-windows-20211056953",
+    "@modern-js/plugin-polyfill": "^0.0.0-windows-20211056953",
+    "@modern-js/server-plugin": "^0.0.0-windows-20211056953",
+    "@modern-js/server-utils": "^0.0.0-windows-20211056953",
+    "@modern-js/bff-utils": "^0.0.0-windows-20211056953",
+    "@modern-js/utils": "^0.0.0-windows-20211056953",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -62,9 +62,9 @@
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^0.0.0-windows-2021101123127",
-    "@modern-js/plugin-testing": "^0.0.0-windows-2021101123127",
-    "@modern-js/types": "^0.0.0-windows-2021101123127",
+    "@modern-js/module-tools": "^0.0.0-windows-20211056953",
+    "@modern-js/plugin-testing": "^0.0.0-windows-20211056953",
+    "@modern-js/types": "^0.0.0-windows-20211056953",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",

package/src/dev-tools/babel/register.ts

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import { resolveBabelConfig } from '@modern-js/server-utils';
 import { ModernServerOptions } from '../../type';
 
@@ -22,7 +22,7 @@ export const enableRegister = (
     only: [
       function (filePath: string) {
         // TODO: wait params
-        if (filePath.includes('node_modules/.modern-js')) {
+        if (filePath.includes(`node_modules${path.sep}.modern-js`)) {
           return true;
         }
         return registerDirs.some(registerDir =>

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

@@ -1,4 +1,5 @@
-import { fs, path } from '@modern-js/utils';
+import path from 'path';
+import { fs } from '@modern-js/utils';
 import { match } from 'path-to-regexp';
 import { NextFunction } from '../../type';
 import { ModernServerContext } from '../../libs/context';

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

@@ -236,6 +236,7 @@ class CacheManager {
     let data = this.cache.get(cacheKey);
     if (!data) {
       const caches = await createPageCaches(MAX_CACHE_EACH_REQ);
+      // eslint-disable-next-line require-atomic-updates
       data = this.createCacheContent(cacheConfig, caches);
     }
 

package/src/libs/render/index.ts

@@ -1,4 +1,5 @@
-import { fs, path } from '@modern-js/utils';
+import path from 'path';
+import { fs } from '@modern-js/utils';
 import mime from 'mime-types';
 import { RenderResult } from '../../type';
 import { ModernRoute } from '../route';

package/src/libs/render/ssr.ts

@@ -1,4 +1,5 @@
-import { path, SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
+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';

package/src/libs/render/static.ts

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import mime from 'mime-types';
 import { RenderResult } from '../../type';
 import { ModernServerContext } from '../context';

package/src/server/api-server.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import { ModernDevServer } from './dev-server';
 import { ModernServer } from './modern-server';
 import { mergeExtension } from '@/utils';
@@ -46,5 +45,3 @@ export class APIModernDevServer extends ModernDevServer {
     // noop
   }
 }
-
-/* eslint-enable max-classes-per-file */

package/src/server/dev-server.ts

@@ -1,5 +1,6 @@
 import http, { Server } from 'http';
-import { path, HMR_SOCK_PATH } from '@modern-js/utils';
+import path from 'path';
+import { HMR_SOCK_PATH } from '@modern-js/utils';
 import type { MultiCompiler, Compiler } from 'webpack';
 import webpackDevMiddleware, {
   WebpackDevMiddleware,

package/src/server/index.ts

@@ -36,9 +36,9 @@ export class Server {
   }
 
   public getRequestHandler() {
-    return (req: IncomingMessage, res: ServerResponse) => {
+    return (req: IncomingMessage, res: ServerResponse, next?: () => void) => {
       const requestHandler = this.server.getRequestHandler();
-      return requestHandler(req, res);
+      return requestHandler(req, res, next);
     };
   }
 

package/src/server/modern-server.ts

@@ -1,7 +1,8 @@
 /* eslint-disable max-lines */
 import { IncomingMessage, ServerResponse, Server } from 'http';
 import util from 'util';
-import { path, fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
+import path from 'path';
+import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
 import { Adapter } from '@modern-js/server-plugin';
 import { gather, createMiddlewareCollecter } from '@modern-js/server-utils';
 import type { NormalizedConfig } from '@modern-js/core';
@@ -477,7 +478,13 @@ export class ModernServer {
     };
   }
 
-  private requestHandler(req: IncomingMessage, res: ServerResponse) {
+  private requestHandler(
+    req: IncomingMessage,
+    res: ServerResponse,
+    next = () => {
+      // empty
+    },
+  ) {
     res.statusCode = 200;
     const context: ModernServerContext = createContext(req, res, {
       logger: this.logger,
@@ -485,9 +492,7 @@ export class ModernServer {
     });
 
     try {
-      this._handler(context, () => {
-        // empty
-      });
+      this._handler(context, next);
     } catch (err) {
       this.onError(context, err as Error);
     }

package/src/server/web-server.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import { ModernDevServer } from './dev-server';
 import { ModernServer } from './modern-server';
 import { mergeExtension } from '@/utils';
@@ -42,4 +41,3 @@ export class WebModernDevServer extends ModernDevServer {
     return routes.filter(route => route.entryName);
   }
 }
-/* eslint-enable max-classes-per-file */