@modern-js/server 1.1.4-rc.0 → 1.2.0

package/CHANGELOG.md

@@ -1,6 +1,26 @@
 # @modern-js/server
 
-## 1.1.4-rc.0
+## 1.2.0
+
+### Minor Changes
+
+- 5a4c557e: feat: support bff test
+
+### Patch Changes
+
+- e04914ce: add route types, fix metrics types
+- e04914ce: add route types, fix metrics types
+- Updated dependencies [90eeb72c]
+- Updated dependencies [e04914ce]
+- Updated dependencies [5a4c557e]
+- Updated dependencies [e04914ce]
+- Updated dependencies [ca7dcb32]
+- Updated dependencies [ecb344dc]
+  - @modern-js/core@1.2.0
+  - @modern-js/server-plugin@1.1.3
+  - @modern-js/utils@1.1.5
+
+## 1.1.4
 
 ### Patch Changes
 
@@ -16,12 +36,8 @@
 - Updated dependencies [d73ff455]
 - Updated dependencies [d73ff455]
 - Updated dependencies [d73ff455]
-  - @modern-js/utils@1.1.4-rc.0
-  - @modern-js/core@1.1.4-rc.0
-  - @modern-js/bff-utils@1.1.2-rc.0
-  - @modern-js/hmr-client@1.1.2-rc.0
-  - @modern-js/server-utils@1.1.3-rc.0
-  - @modern-js/server-plugin@1.1.2
+  - @modern-js/utils@1.1.4
+  - @modern-js/core@1.1.4
 
 ## 1.1.3
 

package/dist/js/modern/libs/context/context.js

@@ -15,17 +15,29 @@ export class ModernServerContext {
    */
   constructor(req, res, {
     logger,
-    measure
+    metrics
   }) {
     this.req = void 0;
     this.res = void 0;
     this.params = {};
     this.logger = void 0;
-    this.measure = void 0;
+    this.metrics = void 0;
     this.req = req;
     this.res = res;
     this.logger = logger;
-    this.measure = measure;
+    this.metrics = metrics;
+    this.bind();
+  }
+
+  bind() {
+    const {
+      req,
+      res
+    } = this;
+
+    req.get = key => this.getReqHeader(key);
+
+    res.set = (key, value) => this.res.setHeader(key, value);
   }
 
   setParams(params) {
@@ -54,10 +66,6 @@ export class ModernServerContext {
     return this.req.headers;
   }
 
-  set headers(val) {
-    this.req.headers = val;
-  }
-
   get method() {
     return this.req.method;
   }

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

@@ -1,9 +1,9 @@
 import { ModernServerContext } from "./context";
 export const createContext = (req, res, {
   logger,
-  measure
+  metrics
 }) => new ModernServerContext(req, res, {
   logger,
-  measure
+  metrics
 });
 export { ModernServerContext };

package/dist/js/modern/libs/{measure.js → metrics.js}

@@ -1,4 +1,4 @@
-const measure = {
+const metrics = {
   gauges() {// no impl
   },
 
@@ -9,4 +9,4 @@ const measure = {
   }
 
 };
-export { measure };
+export { metrics };

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

@@ -25,7 +25,7 @@ export const render = async (ctx, renderOptions) => {
     distDir,
     staticGenerate,
     logger: ctx.logger,
-    measure: ctx.measure
+    metrics: ctx.metrics
   };
 
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];

package/dist/js/modern/libs/route/route.js

@@ -10,7 +10,7 @@ export class ModernRoute {
     this.isSSR = void 0;
     this.isSPA = void 0;
     this.enableModernMode = void 0;
-    this.entryName = routeSpec.entryName;
+    this.entryName = routeSpec.entryName || '';
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
     this.isSSR = routeSpec.isSSR || false;

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

@@ -1,3 +1,9 @@
+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 { createServer } from 'http';
 import path from 'path';
 import { createServer as createHttpsServer } from 'https';
@@ -25,6 +31,7 @@ const DEFAULT_DEV_OPTIONS = {
   dev: {
     writeToDisk: true
   },
+  watch: true,
   hot: true,
   liveReload: true
 };
@@ -41,7 +48,7 @@ export class ModernDevServer extends ModernServer {
     this.devMiddleware = void 0;
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
-    this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : options.dev;
+    this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS), options.dev);
     enableRegister(this.pwd, this.conf);
   } // Complete the preparation of services
 
@@ -90,7 +97,9 @@ export class ModernDevServer extends ModernServer {
 
     await super.init(runner); // watch mock/ server/ api/ dir file change
 
-    this.startWatcher();
+    if (this.dev.watch) {
+      this.startWatcher();
+    }
   }
 
   ready(options = {}) {

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

@@ -10,7 +10,7 @@ import { logger as defaultLogger } from '@modern-js/utils';
 import { AppContext, initAppContext, initAppDir, loadUserConfig, ConfigContext } from '@modern-js/core';
 import { ModernServer } from "./modern-server";
 import { ModernAPIServer, ModernSSRServer, ModernWebServer } from "./modern-server-split";
-import { measure as defaultMeasure } from "../libs/measure";
+import { metrics as defaultMetrics } from "../libs/metrics";
 export class Server {
   constructor(options) {
     this.options = void 0;
@@ -36,7 +36,7 @@ export class Server {
       options
     } = this;
     options.logger = options.logger || defaultLogger;
-    options.measure = options.measure || defaultMeasure; // initialize server
+    options.metrics = options.metrics || defaultMetrics; // initialize server
 
     if (options.dev) {
       this.server = this.createDevServer();

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

@@ -41,7 +41,7 @@ export class ModernServer {
     routes,
     staticGenerate,
     logger,
-    measure,
+    metrics,
     proxyTarget
   }) {
     this.pwd = void 0;
@@ -53,7 +53,7 @@ export class ModernServer {
     this.presetRoutes = void 0;
     this.runner = void 0;
     this.logger = void 0;
-    this.measure = void 0;
+    this.metrics = void 0;
     this.proxyTarget = void 0;
     this.isDev = false;
     this.staticFileHandler = void 0;
@@ -72,7 +72,7 @@ export class ModernServer {
     this.workDir = this.isDev ? pwd : this.distDir;
     this.conf = config;
     this.logger = logger;
-    this.measure = measure;
+    this.metrics = metrics;
     this.router = new RouteMatchManager();
     this.presetRoutes = routes;
     this.proxyTarget = proxyTarget;
@@ -522,7 +522,7 @@ export class ModernServer {
     res.statusCode = 200;
     const context = createContext(req, res, {
       logger: this.logger,
-      measure: this.measure
+      metrics: this.metrics
     });
 
     try {

package/dist/js/node/libs/context/context.js

@@ -27,17 +27,29 @@ class ModernServerContext {
    */
   constructor(req, res, {
     logger,
-    measure
+    metrics
   }) {
     this.req = void 0;
     this.res = void 0;
     this.params = {};
     this.logger = void 0;
-    this.measure = void 0;
+    this.metrics = void 0;
     this.req = req;
     this.res = res;
     this.logger = logger;
-    this.measure = measure;
+    this.metrics = metrics;
+    this.bind();
+  }
+
+  bind() {
+    const {
+      req,
+      res
+    } = this;
+
+    req.get = key => this.getReqHeader(key);
+
+    res.set = (key, value) => this.res.setHeader(key, value);
   }
 
   setParams(params) {
@@ -66,10 +78,6 @@ class ModernServerContext {
     return this.req.headers;
   }
 
-  set headers(val) {
-    this.req.headers = val;
-  }
-
   get method() {
     return this.req.method;
   }

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

@@ -15,10 +15,10 @@ var _context = require("./context");
 
 const createContext = (req, res, {
   logger,
-  measure
+  metrics
 }) => new _context.ModernServerContext(req, res, {
   logger,
-  measure
+  metrics
 });
 
 exports.createContext = createContext;

package/dist/js/node/libs/{measure.js → metrics.js}

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.measure = void 0;
-const measure = {
+exports.metrics = void 0;
+const metrics = {
   gauges() {// no impl
   },
 
@@ -15,4 +15,4 @@ const measure = {
   }
 
 };
-exports.measure = measure;
+exports.metrics = metrics;

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

@@ -40,7 +40,7 @@ const render = async (ctx, renderOptions) => {
     distDir,
     staticGenerate,
     logger: ctx.logger,
-    measure: ctx.measure
+    metrics: ctx.metrics
   };
 
   const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];

package/dist/js/node/libs/route/route.js

@@ -17,7 +17,7 @@ class ModernRoute {
     this.isSSR = void 0;
     this.isSPA = void 0;
     this.enableModernMode = void 0;
-    this.entryName = routeSpec.entryName;
+    this.entryName = routeSpec.entryName || '';
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
     this.isSSR = routeSpec.isSSR || false;

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

@@ -41,6 +41,12 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 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 DEFAULT_DEV_OPTIONS = {
   client: {
     port: '8080',
@@ -53,6 +59,7 @@ const DEFAULT_DEV_OPTIONS = {
   dev: {
     writeToDisk: true
   },
+  watch: true,
   hot: true,
   liveReload: true
 };
@@ -70,7 +77,7 @@ class ModernDevServer extends _modernServer.ModernServer {
     this.devMiddleware = void 0;
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
-    this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : options.dev;
+    this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS), options.dev);
     (0, _register.enableRegister)(this.pwd, this.conf);
   } // Complete the preparation of services
 
@@ -119,7 +126,9 @@ class ModernDevServer extends _modernServer.ModernServer {
 
     await super.init(runner); // watch mock/ server/ api/ dir file change
 
-    this.startWatcher();
+    if (this.dev.watch) {
+      this.startWatcher();
+    }
   }
 
   ready(options = {}) {

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

@@ -17,7 +17,7 @@ var _modernServer = require("./modern-server");
 
 var _modernServerSplit = require("./modern-server-split");
 
-var _measure = require("../libs/measure");
+var _metrics = require("../libs/metrics");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -52,7 +52,7 @@ class Server {
       options
     } = this;
     options.logger = options.logger || _utils.logger;
-    options.measure = options.measure || _measure.measure; // initialize server
+    options.metrics = options.metrics || _metrics.metrics; // initialize server
 
     if (options.dev) {
       this.server = this.createDevServer();

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

@@ -71,7 +71,7 @@ class ModernServer {
     routes,
     staticGenerate,
     logger,
-    measure,
+    metrics,
     proxyTarget
   }) {
     this.pwd = void 0;
@@ -83,7 +83,7 @@ class ModernServer {
     this.presetRoutes = void 0;
     this.runner = void 0;
     this.logger = void 0;
-    this.measure = void 0;
+    this.metrics = void 0;
     this.proxyTarget = void 0;
     this.isDev = false;
     this.staticFileHandler = void 0;
@@ -102,7 +102,7 @@ class ModernServer {
     this.workDir = this.isDev ? pwd : this.distDir;
     this.conf = config;
     this.logger = logger;
-    this.measure = measure;
+    this.metrics = metrics;
     this.router = new _route.RouteMatchManager();
     this.presetRoutes = routes;
     this.proxyTarget = proxyTarget;
@@ -557,7 +557,7 @@ class ModernServer {
     res.statusCode = 200;
     const context = (0, _context.createContext)(req, res, {
       logger: this.logger,
-      measure: this.measure
+      metrics: this.metrics
     });
 
     try {

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

@@ -2,7 +2,7 @@
 import { IncomingMessage, ServerResponse } from 'http';
 import { URL } from 'url';
 import qs from 'querystring';
-import type { ModernServerContext as ModernServerContextInterface, Measure, Logger } from '@modern-js/types/server';
+import type { ModernServerContext as ModernServerContextInterface, Metrics, Logger } from '@modern-js/types/server';
 export declare class ModernServerContext implements ModernServerContextInterface {
   /**
    * http request
@@ -19,18 +19,18 @@ export declare class ModernServerContext implements ModernServerContextInterface
 
   params: Record<string, string>;
   logger: Logger;
-  measure?: Measure;
+  metrics?: Metrics;
   constructor(req: IncomingMessage, res: ServerResponse, {
     logger,
-    measure
+    metrics
   }: {
     logger: Logger;
-    measure: Measure;
+    metrics: Metrics;
   });
+  private bind;
   setParams(params: Record<string, string>): void;
   getReqHeader(key: string): string | string[];
   get headers(): import("http").IncomingHttpHeaders;
-  set headers(val: import("http").IncomingHttpHeaders);
   get method(): string;
   get url(): string;
   set url(val: string);

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

@@ -1,11 +1,11 @@
 import { IncomingMessage, ServerResponse } from 'http';
-import { Measure, Logger } from '../../type';
+import { Metrics, Logger } from '../../type';
 import { ModernServerContext } from './context';
 export declare const createContext: (req: IncomingMessage, res: ServerResponse, {
   logger,
-  measure
+  metrics
 }: {
   logger: Logger;
-  measure: Measure;
+  metrics: Metrics;
 }) => ModernServerContext;
 export { ModernServerContext };

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

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

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="react" />
 import { IncomingHttpHeaders } from 'http';
-import { Measure, Logger } from '../../type';
+import { Metrics, Logger } from '../../type';
 declare type MetaKeyMap = {
   header?: string[];
   query?: string[];
@@ -40,7 +40,7 @@ export declare type SSRServerContext = {
   template: string;
   entryName: string;
   logger: Logger;
-  measure?: Measure;
+  metrics?: Metrics;
   loadableManifest?: string;
   cacheConfig?: CacheConfig;
   staticGenerate?: boolean;

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

@@ -1,13 +1,5 @@
-export interface ModernRouteInterface {
-  entryName: string;
-  urlPath: string;
-  entryPath?: string;
-  isSPA?: boolean;
-  isSSR?: boolean;
-  isApi?: boolean;
-  bundle?: string;
-  enableModernMode?: boolean;
-}
+import { ServerRoute as ModernRouteInterface } from '@modern-js/types';
+export type { ModernRouteInterface };
 export declare class ModernRoute implements ModernRouteInterface {
   entryName: string;
   urlPath: string;

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

@@ -2,7 +2,7 @@
 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, Measure, Logger, ReadyOptions } from "../type.d";
+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";
@@ -19,7 +19,7 @@ export declare class ModernServer {
   protected presetRoutes?: ModernRouteInterface[];
   protected runner: ServerHookRunner;
   protected readonly logger: Logger;
-  protected readonly measure: Measure;
+  protected readonly metrics: Metrics;
   protected readonly proxyTarget: ModernServerOptions['proxyTarget'];
   private readonly isDev;
   private staticFileHandler;
@@ -36,7 +36,7 @@ export declare class ModernServer {
     routes,
     staticGenerate,
     logger,
-    measure,
+    metrics,
     proxyTarget
   }: ModernServerOptions);
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;

package/dist/types/type.d.ts

@@ -2,7 +2,7 @@
 import type Webpack from 'webpack';
 import { serverManager } from '@modern-js/server-plugin';
 import type { NormalizedConfig } from '@modern-js/core';
-import type { Measure, Logger, NextFunction } from '@modern-js/types/server';
+import type { Metrics, Logger, NextFunction } from '@modern-js/types/server';
 import { ModernRouteInterface } from './libs/route';
 declare module '@modern-js/core' {
   interface UserConfig {
@@ -23,6 +23,7 @@ export declare type DevServerOptions = {
   dev: {
     writeToDisk: boolean | ((filename: string) => boolean);
   };
+  watch: boolean;
   hot: boolean | string;
   liveReload: boolean;
   https?: boolean | {
@@ -35,15 +36,15 @@ export declare type ModernServerOptions = {
   pwd: string;
   config: NormalizedConfig;
   plugins?: any[];
-  dev?: boolean | DevServerOptions;
+  dev?: boolean | Partial<DevServerOptions>;
   compiler?: Webpack.MultiCompiler | Webpack.Compiler;
   routes?: ModernRouteInterface[];
   staticGenerate?: boolean;
   customServer?: boolean;
   loggerOptions?: Record<string, string>;
-  measureOptions?: Record<string, string>;
+  metricsOptions?: Record<string, string>;
   logger?: Logger;
-  measure?: Measure;
+  metrics?: Metrics;
   apiOnly?: boolean;
   ssrOnly?: boolean;
   webOnly?: boolean;
@@ -68,4 +69,4 @@ export declare type ServerHookRunner = Then<ReturnType<typeof serverManager.init
 export declare type ReadyOptions = {
   routes?: ModernRouteInterface[];
 };
-export type { Measure, Logger, NextFunction };
+export type { Metrics, Logger, NextFunction };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.4-rc.0",
+  "version": "1.2.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -33,12 +33,12 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.1.4-rc.0",
-    "@modern-js/hmr-client": "^1.1.2-rc.0",
-    "@modern-js/server-plugin": "^1.1.2",
-    "@modern-js/server-utils": "^1.1.3-rc.0",
-    "@modern-js/bff-utils": "^1.1.2-rc.0",
-    "@modern-js/utils": "^1.1.4-rc.0",
+    "@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",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -61,9 +61,9 @@
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.2",
     "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/types": "^1.1.3-rc.0",
+    "@modern-js/types": "^1.1.4",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",

package/src/libs/context/context.ts

@@ -3,7 +3,7 @@ import { URL } from 'url';
 import qs from 'querystring';
 import type {
   ModernServerContext as ModernServerContextInterface,
-  Measure,
+  Metrics,
   Logger,
 } from '@modern-js/types/server';
 import { toMessage } from '../../utils';
@@ -26,17 +26,25 @@ export class ModernServerContext implements ModernServerContextInterface {
 
   public logger: Logger;
 
-  public measure?: Measure;
+  public metrics?: Metrics;
 
   constructor(
     req: IncomingMessage,
     res: ServerResponse,
-    { logger, measure }: { logger: Logger; measure: Measure },
+    { logger, metrics }: { logger: Logger; metrics: Metrics },
   ) {
     this.req = req;
     this.res = res;
     this.logger = logger;
-    this.measure = measure;
+    this.metrics = metrics;
+
+    this.bind();
+  }
+
+  private bind() {
+    const { req, res } = this as any;
+    req.get = (key: string) => this.getReqHeader(key);
+    res.set = (key: string, value: any) => this.res.setHeader(key, value);
   }
 
   public setParams(params: Record<string, string>) {
@@ -60,10 +68,6 @@ export class ModernServerContext implements ModernServerContextInterface {
     return this.req.headers;
   }
 
-  public set headers(val) {
-    this.req.headers = val;
-  }
-
   public get method(): string {
     return this.req.method!;
   }

package/src/libs/context/index.ts

@@ -1,11 +1,11 @@
 import { IncomingMessage, ServerResponse } from 'http';
-import { Measure, Logger } from '../../type';
+import { Metrics, Logger } from '../../type';
 import { ModernServerContext } from './context';
 
 export const createContext = (
   req: IncomingMessage,
   res: ServerResponse,
-  { logger, measure }: { logger: Logger; measure: Measure },
-) => new ModernServerContext(req, res, { logger, measure });
+  { logger, metrics }: { logger: Logger; metrics: Metrics },
+) => new ModernServerContext(req, res, { logger, metrics });
 
 export { ModernServerContext };

package/src/libs/{measure.ts → metrics.ts}

@@ -1,6 +1,6 @@
-import { Measure } from '@/type';
+import { Metrics } from '@/type';
 
-const measure: Measure = {
+const metrics: Metrics = {
   gauges() {
     // no impl
   },
@@ -12,4 +12,4 @@ const measure: Measure = {
   },
 };
 
-export { measure };
+export { metrics };

package/src/libs/render/ssr.ts

@@ -34,7 +34,7 @@ export const render = async (
     distDir,
     staticGenerate,
     logger: ctx.logger,
-    measure: ctx.measure,
+    metrics: ctx.metrics,
   };
 
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];

package/src/libs/render/type.ts

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders } from 'http';
-import { Measure, Logger } from '../../type';
+import { Metrics, Logger } from '../../type';
 
 type MetaKeyMap = {
   header?: string[];
@@ -39,7 +39,7 @@ export type SSRServerContext = {
   template: string;
   entryName: string;
   logger: Logger;
-  measure?: Measure;
+  metrics?: Metrics;
   loadableManifest?: string;
   cacheConfig?: CacheConfig;
   staticGenerate?: boolean;

package/src/libs/route/route.ts

@@ -1,22 +1,6 @@
-export interface ModernRouteInterface {
-  // modern js web entry name
-  entryName: string;
-  // the url path for request match
-  urlPath: string;
-  // the default resource file to response to route
-  entryPath?: string;
-  // if route is spa page
-  isSPA?: boolean;
-  // if route is ssr page
-  isSSR?: boolean;
-  // if route is api service
-  isApi?: boolean;
-  // ssr js bundle for ssr page
-  bundle?: string;
-  // if route has modern product
-  enableModernMode?: boolean;
-  // specialHeader?: SpecialHeader[];
-}
+import { ServerRoute as ModernRouteInterface } from '@modern-js/types';
+
+export type { ModernRouteInterface };
 
 export class ModernRoute implements ModernRouteInterface {
   public entryName: string;
@@ -36,7 +20,7 @@ export class ModernRoute implements ModernRouteInterface {
   public enableModernMode?: boolean;
 
   constructor(routeSpec: ModernRouteInterface) {
-    this.entryName = routeSpec.entryName;
+    this.entryName = routeSpec.entryName || '';
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
     this.isSSR = routeSpec.isSSR || false;

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

@@ -43,9 +43,11 @@ const DEFAULT_DEV_OPTIONS: DevServerOptions = {
   },
   https: false,
   dev: { writeToDisk: true },
+  watch: true,
   hot: true,
   liveReload: true,
 };
+
 export class ModernDevServer extends ModernServer {
   private devProxyHandler: ReturnType<typeof createProxyHandler> = null;
 
@@ -72,7 +74,9 @@ export class ModernDevServer extends ModernServer {
 
     // set dev server options, like webpack-dev-server
     this.dev =
-      typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : options.dev!;
+      typeof options.dev === 'boolean'
+        ? DEFAULT_DEV_OPTIONS
+        : { ...DEFAULT_DEV_OPTIONS, ...options.dev };
 
     enableRegister(this.pwd, this.conf);
   }
@@ -120,7 +124,9 @@ export class ModernDevServer extends ModernServer {
     await super.init(runner);
 
     // watch mock/ server/ api/ dir file change
-    this.startWatcher();
+    if (this.dev.watch) {
+      this.startWatcher();
+    }
   }
 
   public ready(options: ReadyOptions = {}) {

package/src/server/index.ts

@@ -18,7 +18,7 @@ import {
   ModernWebServer,
 } from './modern-server-split';
 import { ModernServerOptions, ServerHookRunner, ReadyOptions } from '@/type';
-import { measure as defaultMeasure } from '@/libs/measure';
+import { metrics as defaultMetrics } from '@/libs/metrics';
 
 export class Server {
   public options: ModernServerOptions;
@@ -48,7 +48,7 @@ export class Server {
     const { options } = this;
 
     options.logger = options.logger || defaultLogger;
-    options.measure = options.measure || defaultMeasure;
+    options.metrics = options.metrics || defaultMetrics;
 
     // initialize server
     if (options.dev) {

package/src/server/modern-server.ts

@@ -12,7 +12,7 @@ import {
   ModernServerOptions,
   NextFunction,
   ServerHookRunner,
-  Measure,
+  Metrics,
   Logger,
   ReadyOptions,
   ConfWithBFF,
@@ -73,7 +73,7 @@ export class ModernServer {
 
   protected readonly logger: Logger;
 
-  protected readonly measure: Measure;
+  protected readonly metrics: Metrics;
 
   protected readonly proxyTarget: ModernServerOptions['proxyTarget'];
 
@@ -100,7 +100,7 @@ export class ModernServer {
     routes,
     staticGenerate,
     logger,
-    measure,
+    metrics,
     proxyTarget,
   }: ModernServerOptions) {
     require('ignore-styles');
@@ -111,7 +111,7 @@ export class ModernServer {
     this.workDir = this.isDev ? pwd : this.distDir;
     this.conf = config;
     this.logger = logger!;
-    this.measure = measure!;
+    this.metrics = metrics!;
     this.router = new RouteMatchManager();
     this.presetRoutes = routes;
     this.proxyTarget = proxyTarget;
@@ -548,7 +548,7 @@ export class ModernServer {
     res.statusCode = 200;
     const context: ModernServerContext = createContext(req, res, {
       logger: this.logger,
-      measure: this.measure,
+      metrics: this.metrics,
     });
 
     try {

package/src/type.ts

@@ -2,7 +2,7 @@ import { Buffer } from 'buffer';
 import type Webpack from 'webpack';
 import { serverManager } from '@modern-js/server-plugin';
 import type { NormalizedConfig } from '@modern-js/core';
-import type { Measure, Logger, NextFunction } from '@modern-js/types/server';
+import type { Metrics, Logger, NextFunction } from '@modern-js/types/server';
 import { ModernRouteInterface } from './libs/route';
 
 declare module '@modern-js/core' {
@@ -26,6 +26,8 @@ export type DevServerOptions = {
   dev: {
     writeToDisk: boolean | ((filename: string) => boolean);
   };
+  // 是否监听文件变化
+  watch: boolean;
   // 是否开启 hot reload
   hot: boolean | string;
   // 是否开启 page reload
@@ -39,15 +41,15 @@ export type ModernServerOptions = {
   pwd: string;
   config: NormalizedConfig;
   plugins?: any[];
-  dev?: boolean | DevServerOptions;
+  dev?: boolean | Partial<DevServerOptions>;
   compiler?: Webpack.MultiCompiler | Webpack.Compiler;
   routes?: ModernRouteInterface[];
   staticGenerate?: boolean;
   customServer?: boolean;
   loggerOptions?: Record<string, string>;
-  measureOptions?: Record<string, string>;
+  metricsOptions?: Record<string, string>;
   logger?: Logger;
-  measure?: Measure;
+  metrics?: Metrics;
   apiOnly?: boolean;
   ssrOnly?: boolean;
   webOnly?: boolean;
@@ -76,4 +78,4 @@ export type ServerHookRunner = Then<ReturnType<typeof serverManager.init>>;
 
 export type ReadyOptions = { routes?: ModernRouteInterface[] };
 
-export type { Measure, Logger, NextFunction };
+export type { Metrics, Logger, NextFunction };

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

@@ -1,3 +0,0 @@
-import { Measure } from "../type.d";
-declare const measure: Measure;
-export { measure };