@modern-js/server 1.17.0 → 1.18.1-alpha.0

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

@@ -1,23 +1,19 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import http, { Server, IncomingMessage, ServerResponse } from 'http';
+import { IncomingMessage, Server, ServerResponse } from 'http';
 import { ServerHookRunner, ModernServer, BuildOptions } from '@modern-js/prod-server';
 import { WatchEvent } from '../dev-tools/watcher';
-import { ModernDevServerOptions } from '../types';
+import type { ModernDevServerOptions } from '../types';
 export declare class ModernDevServer extends ModernServer {
   private mockHandler;
   private readonly dev;
-  private readonly compiler?;
-  private socketServer;
+  private readonly devMiddleware;
   private watcher?;
-  private devMiddleware;
   constructor(options: ModernDevServerOptions);
   private getDevOptions;
-  onInit(runner: ServerHookRunner): Promise<void>;
-  onClose(): Promise<void>;
+  onInit(runner: ServerHookRunner, app: Server): Promise<void>;
   onRepack(options?: BuildOptions): void;
-  onListening(app: Server): void;
-  createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<http.Server | import("https").Server>;
+  createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server | import("https").Server>;
   protected warmupSSRBundle(): void;
   protected onServerChange({
     filepath,
@@ -26,11 +22,7 @@ export declare class ModernDevServer extends ModernServer {
     filepath: string;
     event: WatchEvent;
   }): void;
-  private setupCompiler;
-  private isClientCompiler;
-  private setupDevServerPlugin;
-  private setupHooks;
-  private setupDevMiddleware;
+  protected createContext(req: IncomingMessage, res: ServerResponse): import("@modern-js/prod-server/src/libs/context").ModernServerContext;
   private setupBeforeDevMiddleware;
   private setupAfterDevMiddleware;
   private cleanSSRCache;

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

@@ -1,5 +1,5 @@
 import { Server } from '@modern-js/prod-server';
-import { ModernDevServerOptions } from '../types';
+import type { ModernDevServerOptions } from '../types';
 export declare class DevServer extends Server {
   constructor(options: ModernDevServerOptions);
 }

package/dist/types/types.d.ts

@@ -1,5 +1,9 @@
 import type webpack from 'webpack';
 import type { ModernServerOptions } from '@modern-js/prod-server';
+export declare type DevServerHttpsOptions = boolean | {
+  key: string;
+  cert: string;
+};
 export declare type DevServerOptions = {
   client: {
     path?: string;
@@ -15,14 +19,11 @@ export declare type DevServerOptions = {
   watch: boolean;
   hot: boolean | string;
   liveReload: boolean;
-  https?: boolean | {
-    key: string;
-    cert: string;
-  };
+  https?: DevServerHttpsOptions;
   [propName: string]: any;
 };
 export declare type ExtraOptions = {
-  dev?: boolean | Partial<DevServerOptions>;
-  compiler?: webpack.MultiCompiler | webpack.Compiler | null;
+  dev: boolean | Partial<DevServerOptions>;
+  compiler: webpack.MultiCompiler | webpack.Compiler | null;
 };
 export declare type ModernDevServerOptions = ModernServerOptions & ExtraOptions;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.17.0",
+  "version": "1.18.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,28 +30,34 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/register": "^7.17.7",
-    "@modern-js/prod-server": "1.17.0",
-    "@modern-js/server-utils": "1.17.0",
-    "@modern-js/utils": "1.17.0",
+    "@modern-js/prod-server": "1.18.1-alpha.0",
+    "@modern-js/server-utils": "1.18.1-alpha.0",
+    "@modern-js/utils": "1.18.1-alpha.0",
     "devcert": "^1.2.2",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.17.0",
-    "@modern-js/server-core": "1.17.0",
-    "@modern-js/types": "1.17.0",
-    "@scripts/build": "1.17.0",
-    "@scripts/jest-config": "1.17.0",
+    "@modern-js/core": "1.18.1-alpha.0",
+    "@modern-js/server-core": "1.18.1-alpha.0",
+    "@modern-js/types": "1.18.1-alpha.0",
+    "@scripts/build": "1.18.1-alpha.0",
+    "@scripts/jest-config": "1.18.1-alpha.0",
     "@types/jest": "^27",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",
     "@types/ws": "^7.4.7",
     "jest": "^27",
+    "ts-node": "^10.1.0",
+    "tsconfig-paths": "3.14.1",
     "typescript": "^4",
-    "websocket": "^1",
-    "webpack": "^5.71.0"
+    "webpack": "^5.71.0",
+    "websocket": "^1"
+  },
+  "peerDependencies": {
+    "ts-node": "^10.1.0",
+    "tsconfig-paths": "3.14.1"
   },
   "sideEffects": false,
   "modernConfig": {

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

@@ -1,33 +0,0 @@
-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 path from 'path';
-import { resolveBabelConfig } from '@modern-js/server-utils';
-const registerDirs = ['./api', './server', './config/mock', './shared'];
-export const enableRegister = (projectRoot, config) => {
-  const TS_CONFIG_FILENAME = `tsconfig.json`;
-  const tsconfigPath = path.resolve(projectRoot, TS_CONFIG_FILENAME);
-  const babelConfig = resolveBabelConfig(projectRoot, config, {
-    tsconfigPath,
-    syntax: 'es6+',
-    type: 'commonjs'
-  });
-  return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
-    only: [function (filePath) {
-      // TODO: wait params
-      // FIXME: 删除hardcode，根据 AppContext 中的 metaName 设置路径
-      if (filePath.includes(`node_modules${path.sep}.modern-js`)) {
-        return true;
-      }
-
-      return registerDirs.some(registerDir => filePath.startsWith(path.join(projectRoot, registerDir)));
-    }],
-    extensions: ['.js', '.ts'],
-    babelrc: false,
-    configFile: false,
-    root: projectRoot
-  }));
-};

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

@@ -1,43 +0,0 @@
-import { RUN_MODE } from '@modern-js/prod-server';
-import { ModernDevServer } from "./dev-server";
-export class ModernSSRDevServer extends ModernDevServer {
-  prepareAPIHandler(_m, _) {
-    return null;
-  }
-
-  filterRoutes(routes) {
-    return routes.filter(route => route.isSSR);
-  }
-
-  async setupBeforeProdMiddleware() {
-    if (this.runMode === RUN_MODE.FULL) {
-      await super.setupBeforeProdMiddleware();
-    }
-  }
-
-  async emitRouteHook(_, _input) {
-    if (this.runMode === RUN_MODE.FULL) {
-      await super.emitRouteHook(_, _input);
-    }
-  }
-
-}
-export class ModernAPIDevServer extends ModernDevServer {
-  prepareWebHandler(_) {
-    return null;
-  }
-
-  filterRoutes(routes) {
-    return routes.filter(route => route.isApi);
-  }
-
-  async setupBeforeProdMiddleware() {
-    if (this.runMode === RUN_MODE.FULL) {
-      await super.setupBeforeProdMiddleware();
-    }
-  }
-
-  async emitRouteHook(_, _input) {// empty
-  }
-
-}

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

@@ -1,49 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.enableRegister = void 0;
-
-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); 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 registerDirs = ['./api', './server', './config/mock', './shared'];
-
-const enableRegister = (projectRoot, config) => {
-  const TS_CONFIG_FILENAME = `tsconfig.json`;
-
-  const tsconfigPath = _path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
-
-  const babelConfig = (0, _serverUtils.resolveBabelConfig)(projectRoot, config, {
-    tsconfigPath,
-    syntax: 'es6+',
-    type: 'commonjs'
-  });
-  return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
-    only: [function (filePath) {
-      // TODO: wait params
-      // FIXME: 删除hardcode，根据 AppContext 中的 metaName 设置路径
-      if (filePath.includes(`node_modules${_path.default.sep}.modern-js`)) {
-        return true;
-      }
-
-      return registerDirs.some(registerDir => filePath.startsWith(_path.default.join(projectRoot, registerDir)));
-    }],
-    extensions: ['.js', '.ts'],
-    babelrc: false,
-    configFile: false,
-    root: projectRoot
-  }));
-};
-
-exports.enableRegister = enableRegister;

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

@@ -1,57 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ModernSSRDevServer = exports.ModernAPIDevServer = void 0;
-
-var _prodServer = require("@modern-js/prod-server");
-
-var _devServer = require("./dev-server");
-
-class ModernSSRDevServer extends _devServer.ModernDevServer {
-  prepareAPIHandler(_m, _) {
-    return null;
-  }
-
-  filterRoutes(routes) {
-    return routes.filter(route => route.isSSR);
-  }
-
-  async setupBeforeProdMiddleware() {
-    if (this.runMode === _prodServer.RUN_MODE.FULL) {
-      await super.setupBeforeProdMiddleware();
-    }
-  }
-
-  async emitRouteHook(_, _input) {
-    if (this.runMode === _prodServer.RUN_MODE.FULL) {
-      await super.emitRouteHook(_, _input);
-    }
-  }
-
-}
-
-exports.ModernSSRDevServer = ModernSSRDevServer;
-
-class ModernAPIDevServer extends _devServer.ModernDevServer {
-  prepareWebHandler(_) {
-    return null;
-  }
-
-  filterRoutes(routes) {
-    return routes.filter(route => route.isApi);
-  }
-
-  async setupBeforeProdMiddleware() {
-    if (this.runMode === _prodServer.RUN_MODE.FULL) {
-      await super.setupBeforeProdMiddleware();
-    }
-  }
-
-  async emitRouteHook(_, _input) {// empty
-  }
-
-}
-
-exports.ModernAPIDevServer = ModernAPIDevServer;

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

@@ -1,16 +0,0 @@
-import type { APIServerStartInput } from '@modern-js/server-core';
-import { ServerRoute as ModernRouteInterface } from '@modern-js/types';
-import { ApiServerMode, HookNames } from '@modern-js/prod-server';
-import { ModernDevServer } from './dev-server';
-export declare class ModernSSRDevServer extends ModernDevServer {
-  protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
-  protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
-  protected setupBeforeProdMiddleware(): Promise<void>;
-  protected emitRouteHook(_: HookNames, _input: any): Promise<void>;
-}
-export declare class ModernAPIDevServer extends ModernDevServer {
-  protected prepareWebHandler(_: APIServerStartInput['config']): any;
-  protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
-  protected setupBeforeProdMiddleware(): Promise<void>;
-  protected emitRouteHook(_: HookNames, _input: any): Promise<void>;
-}