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

package/CHANGELOG.md

@@ -1,18 +1,18 @@
 # @modern-js/server
 
-## 0.0.0-windows-202110385642
+## 0.0.0-windows-20211056953
 
 ### Patch Changes
 
-- windows
+- test windows
 - Updated dependencies [undefined]
-  - @modern-js/core@0.0.0-windows-202110385642
-  - @modern-js/bff-utils@0.0.0-windows-202110385642
-  - @modern-js/server-utils@0.0.0-windows-202110385642
-  - @modern-js/utils@0.0.0-windows-202110385642
-  - @modern-js/hmr-client@0.0.0-windows-202110385642
-  - @modern-js/server-plugin@0.0.0-windows-202110385642
-  - @modern-js/plugin-polyfill@0.0.0-windows-202110385642
+  - @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/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/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/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/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

@@ -454,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,
@@ -462,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/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/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/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/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

@@ -487,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,
@@ -495,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-202110385642",
+  "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-202110385642",
-    "@modern-js/hmr-client": "^0.0.0-windows-202110385642",
-    "@modern-js/plugin-polyfill": "^0.0.0-windows-202110385642",
-    "@modern-js/server-plugin": "^0.0.0-windows-202110385642",
-    "@modern-js/server-utils": "^0.0.0-windows-202110385642",
-    "@modern-js/bff-utils": "^0.0.0-windows-202110385642",
-    "@modern-js/utils": "^0.0.0-windows-202110385642",
+    "@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-202110385642",
-    "@modern-js/plugin-testing": "^0.0.0-windows-202110385642",
-    "@modern-js/types": "^0.0.0-windows-202110385642",
+    "@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/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/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/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/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

@@ -478,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,
@@ -486,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 */