@modern-js/server 1.4.1 → 1.4.4

package/dist/js/node/server/{dev-server/dev-server.js → dev-server.js}

@@ -15,29 +15,19 @@ var _utils = require("@modern-js/utils");
 
 var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middleware"));
 
-var _modernServer = require("../modern-server");
+var _prodServer = require("@modern-js/prod-server");
 
-var _mock = require("../../dev-tools/mock");
+var _mock = require("../dev-tools/mock");
 
-var _proxy = require("../../libs/proxy");
+var _socketServer = _interopRequireDefault(require("../dev-tools/socket-server"));
 
-var _socketServer = _interopRequireDefault(require("../../dev-tools/socket-server"));
+var _devServerPlugin = _interopRequireDefault(require("../dev-tools/dev-server-plugin"));
 
-var _devServerPlugin = _interopRequireDefault(require("../../dev-tools/dev-server-plugin"));
+var _launchEditor = require("../dev-tools/launch-editor");
 
-var _launchEditor = require("../../dev-tools/launch-editor");
+var _register = require("../dev-tools/babel/register");
 
-var _register = require("../../dev-tools/babel/register");
-
-var reader = _interopRequireWildcard(require("../../libs/render/reader"));
-
-var _watcher = _interopRequireDefault(require("../../dev-tools/watcher"));
-
-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; }
+var _watcher = _interopRequireDefault(require("../dev-tools/watcher"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -64,10 +54,9 @@ const DEFAULT_DEV_OPTIONS = {
   liveReload: true
 };
 
-class ModernDevServer extends _modernServer.ModernServer {
+class ModernDevServer extends _prodServer.ModernServer {
   constructor(options) {
-    super(options); // set webpack compiler
-
+    super(options);
     this.devProxyHandler = null;
     this.mockHandler = null;
     this.dev = void 0;
@@ -75,6 +64,8 @@ class ModernDevServer extends _modernServer.ModernServer {
     this.socketServer = void 0;
     this.watcher = void 0;
     this.devMiddleware = void 0;
+    this.workDir = this.pwd; // set webpack compiler
+
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
     this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS), options.dev);
@@ -105,7 +96,7 @@ class ModernDevServer extends _modernServer.ModernServer {
       }
     }); // dev proxy handler, each proxy has own handler
 
-    this.devProxyHandler = (0, _proxy.createProxyHandler)((_conf$tools = conf.tools) === null || _conf$tools === void 0 ? void 0 : (_conf$tools$devServer = _conf$tools.devServer) === null || _conf$tools$devServer === void 0 ? void 0 : _conf$tools$devServer.proxy);
+    this.devProxyHandler = (0, _prodServer.createProxyHandler)((_conf$tools = conf.tools) === null || _conf$tools === void 0 ? void 0 : (_conf$tools$devServer = _conf$tools.devServer) === null || _conf$tools$devServer === void 0 ? void 0 : _conf$tools$devServer.proxy);
 
     if (this.devProxyHandler) {
       this.devProxyHandler.forEach(handler => {
@@ -136,7 +127,7 @@ class ModernDevServer extends _modernServer.ModernServer {
     this.router.reset(this.filterRoutes(options.routes || this.presetRoutes || []));
     this.cleanSSRCache(); // reset static file
 
-    reader.updateFile();
+    this.reader.updateFile();
     this.runner.reset();
   }
 
@@ -172,13 +163,16 @@ class ModernDevServer extends _modernServer.ModernServer {
     if (devHttpsOption) {
       const {
         genHttpsOptions
-      } = require("../../dev-tools/https");
+      } = require("../dev-tools/https");
 
       const httpsOptions = await genHttpsOptions(devHttpsOption);
       return (0, _https.createServer)(httpsOptions, handler);
     } else {
       return (0, _http.createServer)(handler);
     }
+  }
+
+  warmupSSRBundle() {// empty
   } // set up plugin to each compiler
   // register hooks for each compilation, update socket stats if recompiled
   // start dev middleware
@@ -212,6 +206,10 @@ class ModernDevServer extends _modernServer.ModernServer {
     };
 
     const addHooks = compiler => {
+      if (compiler.name === 'server') {
+        return;
+      }
+
       const {
         compile,
         invalid,
@@ -274,7 +272,7 @@ class ModernDevServer extends _modernServer.ModernServer {
     } = this;
     const {
       mock
-    } = _constants.AGGRED_DIR;
+    } = _prodServer.AGGRED_DIR;
     const defaultWatched = [`${mock}/**/*`, `${_utils.SERVER_DIR}/**/*`, `${_utils.API_DIR}/**`, `${_utils.SHARED_DIR}/**/*`];
     const defaultWatchedPaths = defaultWatched.map(p => _path.default.normalize(_path.default.join(pwd, p)));
 

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

@@ -3,168 +3,33 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Server = void 0;
+exports.DevServer = void 0;
 
-var _path = _interopRequireDefault(require("path"));
+var _prodServer = require("@modern-js/prod-server");
 
-var _serverCore = require("@modern-js/server-core");
+var _devServer = require("./dev-server");
 
-var _utils = require("@modern-js/utils");
+var _devServerSplit = require("./dev-server-split");
 
-var _core = require("@modern-js/core");
-
-var _metrics = require("../libs/metrics");
-
-var _modernServer = require("./modern-server");
-
-var _modernServerSplit = require("./modern-server-split");
-
-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; }
-
-class Server {
-  constructor(options) {
-    this.options = void 0;
-    this.server = void 0;
-    this.app = void 0;
-    this.runner = void 0;
-    this.options = options;
-  }
-
-  getRequestHandler() {
-    return (req, res, next) => {
-      const requestHandler = this.server.getRequestHandler();
-      return requestHandler(req, res, next);
-    };
+const createDevServer = options => {
+  if (options.apiOnly) {
+    return new _devServerSplit.ModernAPIDevServer(options);
+  } else if (options.ssrOnly) {
+    return new _devServerSplit.ModernSSRDevServer(options);
+  } else {
+    return new _devServer.ModernDevServer(options);
   }
+};
 
-  ready(readyOptions = {}) {
-    this.server.ready(readyOptions);
-  }
-
-  async init() {
-    const {
-      options
-    } = this;
-    options.logger = options.logger || _utils.logger;
-    options.metrics = options.metrics || _metrics.metrics; // initialize server
+class DevServer extends _prodServer.Server {
+  constructor(options) {
+    super(options);
 
     if (options.dev) {
-      this.server = this.createDevServer();
-    } else {
-      this.server = this.createProdServer();
-    } // check if https is configured when start dev server
-
-
-    this.app = await this.server.createHTTPServer(this.getRequestHandler());
-    this.runner = await this.createHookRunner(); // runner can only be used after server init
-
-    await this.server.init(this.runner);
-    return this;
-  }
-
-  listen(port = 8080, listener) {
-    this.app.listen(process.env.PORT || port, () => {
-      if (listener) {
-        listener();
-      }
-
-      this.listener(this.app);
-    });
-  }
-
-  listener(app) {
-    this.server.onListening(app);
-  }
-
-  async close() {
-    await this.server.close();
-    await new Promise(resolve => this.app.close(() => {
-      resolve();
-    }));
-  }
-
-  createProdServer() {
-    const {
-      options
-    } = this;
-
-    if (options.apiOnly) {
-      return new _modernServerSplit.ModernAPIServer(options);
-    } else if (options.ssrOnly) {
-      return new _modernServerSplit.ModernSSRServer(options);
-    } else if (options.webOnly) {
-      return new _modernServerSplit.ModernWebServer(options);
-    } else {
-      return new _modernServer.ModernServer(options);
+      this.serverImpl = createDevServer;
     }
   }
 
-  createDevServer() {
-    const {
-      options
-    } = this;
-
-    const {
-      ModernAPIDevServer,
-      ModernSSRDevServer,
-      ModernDevServer
-    } = require("./dev-server");
-
-    if (options.apiOnly) {
-      return new ModernAPIDevServer(options);
-    } else if (options.ssrOnly) {
-      return new ModernSSRDevServer(options);
-    } else {
-      return new ModernDevServer(options);
-    }
-  }
-
-  async createHookRunner() {
-    var _options$plugins;
-
-    const {
-      options
-    } = this;
-
-    _serverCore.serverManager.clear();
-
-    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
-      _serverCore.serverManager.usePlugin((0, _utils.compatRequire)(p.pluginPath));
-    });
-    const appContext = await this.initAppContext();
-
-    _serverCore.serverManager.run(() => {
-      var _options$config$outpu;
-
-      _serverCore.ConfigContext.set(this.options.config);
-
-      _serverCore.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-        distDirectory: _path.default.join(options.pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist')
-      }));
-    });
-
-    return _serverCore.serverManager.init({});
-  }
-
-  async initAppContext() {
-    var _this$options$plugins;
-
-    const appDirectory = await (0, _core.initAppDir)();
-    const loaded = await (0, _core.loadUserConfig)(appDirectory);
-    const plugins = (_this$options$plugins = this.options.plugins) === null || _this$options$plugins === void 0 ? void 0 : _this$options$plugins.map(p => ({
-      server: p,
-      cli: undefined
-    }));
-    const appContext = (0, _core.initAppContext)(appDirectory, plugins || [], loaded.filePath);
-    return appContext;
-  }
-
 }
 
-exports.Server = Server;
+exports.DevServer = DevServer;

package/dist/types/dev-tools/babel/register.d.ts

@@ -1,2 +1,2 @@
-import { ModernServerOptions } from '../../type';
+import { ModernServerOptions } from '@modern-js/prod-server';
 export declare const enableRegister: (projectRoot: string, config: ModernServerOptions['config']) => any;

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

@@ -1,5 +1,5 @@
 import Webpack from 'webpack';
-import { DevServerOptions } from '../type';
+import { DevServerOptions } from '../types';
 export default class DevServerPlugin {
   private readonly options;
   constructor(options: DevServerOptions);

package/dist/types/dev-tools/launch-editor/index.d.ts

@@ -1,3 +1,2 @@
-import { ModernServerContext } from '../../libs/context';
-import { NextFunction } from '../../type';
+import { ModernServerContext, NextFunction } from '@modern-js/types';
 export declare const createLaunchEditorHandler: () => (ctx: ModernServerContext, next: NextFunction) => void;

package/dist/types/dev-tools/mock/getMockData.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
-import { NextFunction } from '../../type';
-import { ModernServerContext } from '../../libs/context';
+import { ModernServerContext, NextFunction } from '@modern-js/types';
 export declare type MockConfig = Record<string, {
   data: any;
 } | ((req: IncomingMessage, res: ServerResponse, next: NextFunction) => Promise<void>)>;

package/dist/types/dev-tools/mock/index.d.ts

@@ -1,5 +1,4 @@
-import { NextFunction } from '../../type';
-import { ModernServerContext } from '../../libs/context';
+import { ModernServerContext, NextFunction } from '@modern-js/types';
 export declare const createMockHandler: ({
   pwd
 }: {

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

@@ -1,18 +1,22 @@
 /// <reference types="node" />
 import { Server } from 'http';
+import ws from 'ws';
 import type { Stats } from 'webpack';
-import { DevServerOptions } from '../type';
+import { DevServerOptions } from '../types';
 export default class SocketServer {
   private wsServer;
   private readonly sockets;
   private readonly options;
   private app?;
   private stats?;
+  private timer;
   constructor(options: DevServerOptions);
   prepare(app: Server): void;
   updateStats(stats: Stats): void;
   sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
+  singleWrite(socket: ws, type: string, data?: Record<string, any> | string | boolean): void;
   close(): void;
+  private onConnect;
   private getStats;
   private sendStats;
   private send;

package/dist/types/index.d.ts

@@ -1,9 +1,8 @@
-import { ModernServerOptions } from './type';
-import { Server } from './server';
-export type { SSRServerContext } from './libs/render/type';
+import { DevServer as Server } from './server';
+import { ModernDevServerOptions } from './types';
 export { Server };
-export type { ModernServerOptions };
+export type { ModernDevServerOptions };
 
-declare const _default: (options: ModernServerOptions) => Promise<Server>;
+declare const _default: (options: ModernDevServerOptions) => Promise<Server>;
 
 export default _default;

package/dist/types/server/{dev-server/dev-server-split.d.ts → dev-server-split.d.ts}

@@ -1,11 +1,12 @@
 import type { APIServerStartInput } from '@modern-js/server-core';
-import { mergeExtension } from '../../utils';
-import { ModernRouteInterface } from '../../libs/route';
-import { ApiServerMode } from '../../constants';
+import { ServerRoute as ModernRouteInterface } from '@modern-js/types';
+import { ApiServerMode } from '@modern-js/prod-server';
 import { ModernDevServer } from './dev-server';
 export declare class ModernSSRDevServer extends ModernDevServer {
   protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
-  protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-core").Adapter>;
+  protected prepareWebHandler(extension: {
+    middleware: any[];
+  }): Promise<import("@modern-js/server-core").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
 }
 export declare class ModernAPIDevServer extends ModernDevServer {

package/dist/types/server/{dev-server/dev-server.d.ts → 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';
+import { ServerHookRunner, ReadyOptions, ModernServer } from '@modern-js/prod-server';
+import { ModernDevServerOptions } from '../types';
 export declare class ModernDevServer extends ModernServer {
   private devProxyHandler;
   private mockHandler;
@@ -10,12 +10,13 @@ export declare class ModernDevServer extends ModernServer {
   private socketServer;
   private watcher;
   private devMiddleware;
-  constructor(options: ModernServerOptions);
+  constructor(options: ModernDevServerOptions);
   init(runner: ServerHookRunner): Promise<void>;
   ready(options?: ReadyOptions): void;
   onListening(app: Server): void;
   close(): Promise<void>;
   createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<http.Server | import("https").Server>;
+  protected warmupSSRBundle(): void;
   private setupCompiler;
   private setupDevServerPlugin;
   private setupHooks;

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

@@ -1,20 +1,5 @@
-/// <reference types="node" />
-import { IncomingMessage, ServerResponse, Server as httpServer } from 'http';
-import { ModernServerOptions, ReadyOptions } from '../type';
-export declare class Server {
-  options: ModernServerOptions;
-  private server;
-  private app;
-  private runner;
-  constructor(options: ModernServerOptions);
-  getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: (() => void) | undefined) => void;
-  ready(readyOptions?: ReadyOptions): void;
-  init(): Promise<this>;
-  listen(port: number | undefined, listener: any): void;
-  listener(app: httpServer): void;
-  close(): Promise<void>;
-  private createProdServer;
-  private createDevServer;
-  private createHookRunner;
-  private initAppContext;
+import { Server } from '@modern-js/prod-server';
+import { ModernDevServerOptions } from '../types';
+export declare class DevServer extends Server {
+  constructor(options: ModernDevServerOptions);
 }

package/dist/types/types.d.ts

@@ -0,0 +1,28 @@
+import { ModernServerOptions } from '@modern-js/prod-server';
+import type Webpack from 'webpack';
+export declare type DevServerOptions = {
+  client: {
+    port: string;
+    overlay: boolean;
+    logging: string;
+    path: string;
+    host: string;
+    progress?: boolean;
+  };
+  dev: {
+    writeToDisk: boolean | ((filename: string) => boolean);
+  };
+  watch: boolean;
+  hot: boolean | string;
+  liveReload: boolean;
+  https?: boolean | {
+    key: string;
+    cert: string;
+  };
+  [propName: string]: any;
+};
+export declare type ExtraOptions = {
+  dev?: boolean | Partial<DevServerOptions>;
+  compiler?: Webpack.MultiCompiler | Webpack.Compiler | null;
+};
+export declare type ModernDevServerOptions = ModernServerOptions & ExtraOptions;

package/modern.config.js

@@ -1,2 +1,6 @@
 /** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {};
+module.exports = {
+  output: {
+    disableSourceMap: true,
+  },
+};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.1",
+  "version": "1.4.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,63 +28,32 @@
     }
   },
   "dependencies": {
-    "@babel/core": "7.16.7",
-    "@babel/compat-data": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/preset-typescript": "^7.15.0",
+    "@modern-js/prod-server": "^1.0.1",
     "@babel/register": "^7.15.3",
-    "@babel/runtime": "^7",
-    "@modern-js/core": "^1.4.1",
-    "@modern-js/hmr-client": "^1.2.1",
-    "@modern-js/server-core": "^1.2.2",
+    "@modern-js/hmr-client": "^1.2.2",
     "@modern-js/server-utils": "^1.2.1",
-    "@modern-js/bff-utils": "^1.2.2",
-    "@modern-js/utils": "^1.3.1",
-    "axios": "^0.24.0",
-    "babel-plugin-module-resolver": "^4.1.0",
+    "@modern-js/utils": "^1.3.3",
     "chokidar": "^3.5.2",
-    "compare-versions": "^3.6.0",
     "devcert": "^1.1.3",
-    "fs-extra": "^10.0.0",
-    "http-proxy-middleware": "^2.0.1",
-    "ignore-styles": "^5.0.1",
     "launch-editor": "^2.2.1",
-    "lru-cache": "^6.0.0",
-    "mime-types": "^2.1.32",
     "minimatch": "^3.0.4",
-    "parseurl": "^1.3.3",
     "path-to-regexp": "^6.2.0",
-    "serialize-javascript": "^6.0.0",
-    "serve-static": "^1.14.1",
     "tsconfig-paths": "^3.11.0",
-    "ua-parser-js": "^0.7.28",
     "webpack-dev-middleware": "^5.0.0",
-    "ws": "^8.2.0",
-    "lodash.clone": "^4.5.0",
-    "cookie": "^0.4.2"
+    "ws": "^8.2.0"
   },
   "devDependencies": {
+    "@modern-js/server-core": "^1.2.2",
+    "@modern-js/core": "^1.4.4",
     "@scripts/build": "0.0.0",
-    "@modern-js/types": "^1.3.1",
+    "@modern-js/types": "^1.3.4",
     "@types/jest": "^26",
-    "@types/lru-cache": "^5.1.1",
-    "@types/mime-types": "^2.1.0",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",
-    "@types/parseurl": "^1.3.1",
-    "@types/react": "^17",
-    "@types/react-dom": "^17",
-    "@types/serialize-javascript": "^5.0.1",
-    "@types/serve-static": "^1.13.10",
-    "@types/ua-parser-js": "^0.7.36",
     "@types/webpack-dev-middleware": "^5.0.2",
     "@types/ws": "^7.4.7",
-    "@types/lodash.clone": "^4",
-    "@types/cookie": "^0.4.1",
     "typescript": "^4",
     "webpack": "^5.54.0",
-    "node-mocks-http": "^1.11.0",
-    "portfinder": "^1.0.28",
     "jest": "^27",
     "@scripts/jest-config": "0.0.0",
     "websocket": "^1"

package/tests/dev.test.ts

@@ -53,14 +53,31 @@ describe('test dev tools', () => {
 
     const socket = {
       state: 1,
+      readyState: 1,
+      data: '',
       close() {
         socket.state = 0;
+      },
+      send(data: string) {
+        socket.data = data;
+      },
+      on() {
         // empty
       },
     };
+
+    socketServer.onConnect(socket);
+
     socketServer.sockets = [socket];
+    socketServer.sockWrite('test');
+    expect(socket.data).toBe(JSON.stringify({ type: 'test' }));
+
+    socketServer.singleWrite(socket, 'single');
+    expect(socket.data).toBe(JSON.stringify({ type: 'single' }));
+
     socketServer.close();
     expect(socket.state).toBe(0);
+    app.close();
   });
 
   test('should dev server plugin work correctly', () => {