@modern-js/server 1.1.2 → 1.1.3-beta.0

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

@@ -68,6 +68,10 @@ class RouteMatcher {
 
       return false;
     }
+  }
+
+  matchEntry(entryName) {
+    return this.spec.entryName === entryName;
   } // compiler urlPath to regexp if necessary
 
 

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

@@ -3,31 +3,26 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.APIModernServer = exports.APIModernDevServer = void 0;
+exports.WebModernDevServer = exports.APIModernDevServer = void 0;
 
 var _devServer = require("./dev-server");
 
-var _modernServer = require("./modern-server");
-
-class APIModernServer extends _modernServer.ModernServer {
-  prepareWebHandler(_) {
+class WebModernDevServer extends _devServer.ModernDevServer {
+  prepareAPIHandler(_m, _) {
     return null;
   }
 
-  async prepareAPIHandler(mode, extension) {
-    return super.prepareAPIHandler(mode, extension);
+  async prepareWebHandler(extension) {
+    return super.prepareWebHandler(extension);
   }
 
   filterRoutes(routes) {
-    return routes.filter(route => route.isApi);
-  }
-
-  async preServerInit() {// noop
+    return routes.filter(route => route.entryName);
   }
 
 }
 
-exports.APIModernServer = APIModernServer;
+exports.WebModernDevServer = WebModernDevServer;
 
 class APIModernDevServer extends _devServer.ModernDevServer {
   prepareWebHandler(_) {

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

@@ -5,31 +5,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ModernDevServer = void 0;
 
+var _http = require("http");
+
 var _path = _interopRequireDefault(require("path"));
 
+var _https = require("https");
+
 var _utils = require("@modern-js/utils");
 
 var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middleware"));
 
-var _mock = require("../dev-tools/mock");
+var _modernServer = require("../modern-server");
 
-var _proxy = require("../libs/proxy");
+var _mock = require("../../dev-tools/mock");
 
-var _socketServer = _interopRequireDefault(require("../dev-tools/socket-server"));
+var _proxy = require("../../libs/proxy");
 
-var _devServerPlugin = _interopRequireDefault(require("../dev-tools/dev-server-plugin"));
+var _socketServer = _interopRequireDefault(require("../../dev-tools/socket-server"));
 
-var _launchEditor = require("../dev-tools/launch-editor");
+var _devServerPlugin = _interopRequireDefault(require("../../dev-tools/dev-server-plugin"));
 
-var _register = require("../dev-tools/babel/register");
+var _launchEditor = require("../../dev-tools/launch-editor");
 
-var reader = _interopRequireWildcard(require("../libs/render/reader"));
+var _register = require("../../dev-tools/babel/register");
 
-var _watcher = _interopRequireDefault(require("../dev-tools/watcher"));
+var reader = _interopRequireWildcard(require("../../libs/render/reader"));
 
-var _modernServer = require("./modern-server");
+var _watcher = _interopRequireDefault(require("../../dev-tools/watcher"));
 
-var _constants = require("../constants");
+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); }
 
@@ -54,8 +58,8 @@ const DEFAULT_DEV_OPTIONS = {
 };
 
 class ModernDevServer extends _modernServer.ModernServer {
-  constructor(options, runner) {
-    super(options, runner); // set webpack compiler
+  constructor(options) {
+    super(options); // set webpack compiler
 
     this.devProxyHandler = null;
     this.mockHandler = null;
@@ -67,18 +71,18 @@ class ModernDevServer extends _modernServer.ModernServer {
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
     this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : options.dev;
+    (0, _register.enableRegister)(this.pwd, this.conf);
   } // Complete the preparation of services
 
 
-  async init() {
+  async init(runner) {
     var _conf$tools, _conf$tools$devServer;
 
     const {
       conf,
       pwd,
       compiler
-    } = this;
-    (0, _register.enableRegister)(pwd, conf); // mock handler
+    } = this; // mock handler
 
     this.mockHandler = (0, _mock.createMockHandler)({
       pwd
@@ -113,7 +117,7 @@ class ModernDevServer extends _modernServer.ModernServer {
       this.addHandler(devMiddlewareHandler);
     }
 
-    await super.init(); // watch mock/ server/ api/ dir file change
+    await super.init(runner); // watch mock/ server/ api/ dir file change
 
     this.startWatcher();
   }
@@ -124,6 +128,7 @@ class ModernDevServer extends _modernServer.ModernServer {
     this.cleanSSRCache(); // reset static file
 
     reader.updateFile();
+    this.runner.reset();
   }
 
   onListening(app) {
@@ -140,6 +145,24 @@ class ModernDevServer extends _modernServer.ModernServer {
         resolve();
       });
     });
+  }
+
+  async createHTTPServer(handler) {
+    const {
+      dev
+    } = this;
+    const devHttpsOption = typeof dev === 'object' && dev.https;
+
+    if (devHttpsOption) {
+      const {
+        genHttpsOptions
+      } = require("../../dev-tools/https");
+
+      const httpsOptions = await genHttpsOptions(devHttpsOption);
+      return (0, _https.createServer)(httpsOptions, handler);
+    } else {
+      return (0, _http.createServer)(handler);
+    }
   } // set up plugin to each compiler
   // register hooks for each compilation, update socket stats if recompiled
   // start dev middleware
@@ -234,18 +257,16 @@ class ModernDevServer extends _modernServer.ModernServer {
       pwd
     } = this;
     const {
-      mock,
-      server,
-      api,
-      shared
+      mock
     } = _constants.AGGRED_DIR;
-    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${server}/**/*`, `${pwd}/${api}/**/*`, `${pwd}/${shared}/**/*`];
+    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${_utils.SERVER_DIR}/**/*`, `${pwd}/${_utils.API_DIR}/**/*`, `${pwd}/${_utils.SHARED_DIR}/**/*`];
     const watcher = new _watcher.default();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 
     watcher.listen(defaultWatched, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
+      this.runner.reset();
 
       if (filepath.startsWith(`${pwd}/${mock}`)) {
         this.mockHandler = (0, _mock.createMockHandler)({

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

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "APIModernDevServer", {
+  enumerable: true,
+  get: function () {
+    return _devServerSplit.APIModernDevServer;
+  }
+});
+Object.defineProperty(exports, "ModernDevServer", {
+  enumerable: true,
+  get: function () {
+    return _devServer.ModernDevServer;
+  }
+});
+Object.defineProperty(exports, "WebModernDevServer", {
+  enumerable: true,
+  get: function () {
+    return _devServerSplit.WebModernDevServer;
+  }
+});
+
+var _devServerSplit = require("./dev-server-split");
+
+var _devServer = require("./dev-server");

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

@@ -5,30 +5,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Server = void 0;
 
-var _http = require("http");
-
-var _https = require("https");
+var _path = _interopRequireDefault(require("path"));
 
 var _serverPlugin = require("@modern-js/server-plugin");
 
 var _utils = require("@modern-js/utils");
 
+var _core = require("@modern-js/core");
+
 var _modernServer = require("./modern-server");
 
+var _modernServerSplit = require("./modern-server-split");
+
 var _measure = require("../libs/measure");
 
+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; }
+
+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) {
-    var _options$plugins;
-
     this.options = void 0;
     this.server = void 0;
     this.app = void 0;
     this.runner = void 0;
     this.options = options;
-    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
-      _serverPlugin.serverManager.usePlugin(p);
-    });
   }
 
   getRequestHandler() {
@@ -46,40 +51,20 @@ class Server {
     const {
       options
     } = this;
-    this.runner = await _serverPlugin.serverManager.init({});
-    const {
-      logger,
-      measure
-    } = await this.runner.create({
-      loggerOptions: options.logger,
-      measureOptions: options.measure
-    }, {
-      onLast: () => ({})
-    });
-    options.logger = options.logger || logger || _utils.logger;
-    options.measure = options.measure || measure || _measure.measure;
+    options.logger = options.logger || _utils.logger;
+    options.measure = options.measure || _measure.measure; // initialize server
 
     if (options.dev) {
-      this.server = this.createDevServer(); // check if https is configured when start dev server
-
-      const devHttpsOption = typeof options.dev === 'object' && options.dev.https;
-
-      if (devHttpsOption) {
-        const {
-          genHttpsOptions
-        } = require("../dev-tools/https");
-
-        const httpsOptions = await genHttpsOptions(devHttpsOption);
-        this.app = (0, _https.createServer)(httpsOptions, this.getRequestHandler());
-      } else {
-        this.app = (0, _http.createServer)(this.getRequestHandler());
-      }
+      this.server = this.createDevServer();
     } else {
       this.server = this.createProdServer();
-      this.app = (0, _http.createServer)(this.getRequestHandler());
-    }
+    } // 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();
+    await this.server.init(this.runner);
     return this;
   }
 
@@ -110,19 +95,11 @@ class Server {
     } = this;
 
     if (options.apiOnly) {
-      const {
-        APIModernServer
-      } = require("./api-server");
-
-      return new APIModernServer(options, this.runner);
+      return new _modernServerSplit.APIModernServer(options);
     } else if (options.webOnly) {
-      const {
-        WebModernServer
-      } = require("./web-server");
-
-      return new WebModernServer(options, this.runner);
+      return new _modernServerSplit.WebModernServer(options);
     } else {
-      return new _modernServer.ModernServer(options, this.runner);
+      return new _modernServer.ModernServer(options);
     }
   }
 
@@ -131,27 +108,54 @@ class Server {
       options
     } = this;
 
-    if (options.apiOnly) {
-      const {
-        APIModernDevServer
-      } = require("./api-server");
+    const {
+      APIModernDevServer,
+      WebModernDevServer,
+      ModernDevServer
+    } = require("./dev-server");
 
-      return new APIModernDevServer(options, this.runner);
+    if (options.apiOnly) {
+      return new APIModernDevServer(options);
     } else if (options.webOnly) {
-      const {
-        WebModernDevServer
-      } = require("./web-server");
-
-      return new WebModernDevServer(options, this.runner);
+      return new WebModernDevServer(options);
     } else {
-      const {
-        ModernDevServer
-      } = require("./dev-server");
-
-      return new ModernDevServer(options, this.runner);
+      return new ModernDevServer(options);
     }
   }
 
+  async createHookRunner() {
+    var _options$plugins;
+
+    const {
+      options
+    } = this;
+    const appContext = await this.initAppContext();
+
+    _serverPlugin.serverManager.run(() => {
+      _core.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
+        distDirectory: _path.default.join(options.pwd, options.config.output.path || 'dist')
+      }));
+    });
+
+    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
+      _serverPlugin.serverManager.usePlugin(p);
+    });
+    return _serverPlugin.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;

package/dist/js/node/server/{web-server.js → modern-server-split.js}

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WebModernServer = exports.WebModernDevServer = void 0;
-
-var _devServer = require("./dev-server");
+exports.WebModernServer = exports.APIModernServer = void 0;
 
 var _modernServer = require("./modern-server");
 
@@ -26,19 +24,22 @@ class WebModernServer extends _modernServer.ModernServer {
 
 exports.WebModernServer = WebModernServer;
 
-class WebModernDevServer extends _devServer.ModernDevServer {
-  prepareAPIHandler(_m, _) {
+class APIModernServer extends _modernServer.ModernServer {
+  prepareWebHandler(_) {
     return null;
   }
 
-  async prepareWebHandler(extension) {
-    return super.prepareWebHandler(extension);
+  async prepareAPIHandler(mode, extension) {
+    return super.prepareAPIHandler(mode, extension);
   }
 
   filterRoutes(routes) {
-    return routes.filter(route => route.entryName);
+    return routes.filter(route => route.isApi);
+  }
+
+  async preServerInit() {// noop
   }
 
 }
 
-exports.WebModernDevServer = WebModernDevServer;
+exports.APIModernServer = APIModernServer;

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ModernServer = void 0;
 
+var _http = require("http");
+
 var _util = _interopRequireDefault(require("util"));
 
 var _path = _interopRequireDefault(require("path"));
@@ -33,7 +35,9 @@ var _context = require("../libs/context");
 
 var _constants = require("../constants");
 
-var _hookApi = require("../libs/hook-api");
+var _template = require("../libs/hook-api/template");
+
+var _route2 = require("../libs/hook-api/route");
 
 const _excluded = ["getMiddlewares"];
 
@@ -68,7 +72,7 @@ class ModernServer {
     staticGenerate,
     logger,
     measure
-  }, runner) {
+  }) {
     this.pwd = void 0;
     this.distDir = void 0;
     this.workDir = void 0;
@@ -76,9 +80,9 @@ class ModernServer {
     this.conf = void 0;
     this.handlers = [];
     this.presetRoutes = void 0;
+    this.runner = void 0;
     this.logger = void 0;
     this.measure = void 0;
-    this.runner = void 0;
     this.isDev = false;
     this.staticFileHandler = void 0;
     this.routeRenderHandler = void 0;
@@ -95,7 +99,6 @@ class ModernServer {
     this.distDir = _path.default.join(pwd, config.output.path || '');
     this.workDir = this.isDev ? pwd : this.distDir;
     this.conf = config;
-    this.runner = runner;
     this.logger = logger;
     this.measure = measure;
     this.router = new _route.RouteMatchManager();
@@ -114,9 +117,10 @@ class ModernServer {
   } // server prepare
 
 
-  async init() {
+  async init(runner) {
     var _conf$bff;
 
+    this.runner = runner;
     const {
       distDir,
       isDev,
@@ -181,6 +185,10 @@ class ModernServer {
 
   close() {
     reader.close();
+  }
+
+  async createHTTPServer(handler) {
+    return (0, _http.createServer)(handler);
   } // warmup ssr function
 
 
@@ -230,12 +238,7 @@ class ModernServer {
     const {
       workDir,
       runner
-    } = this; // inner tool, gather user inject
-
-    const {
-      api: userAPIExt,
-      web: userWebExt
-    } = (0, _serverUtils.gather)(workDir); // server hook, gather plugin inject
+    } = this; // server hook, gather plugin inject
 
     const _createMiddlewareColl = (0, _serverUtils.createMiddlewareCollecter)(),
           {
@@ -255,15 +258,17 @@ class ModernServer {
 
 
     if (await _utils.fs.pathExists(_path.default.join(serverDir))) {
-      const webExtension = (0, _utils2.mergeExtension)(pluginWebExt, userWebExt);
+      const webExtension = (0, _utils2.mergeExtension)(pluginWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
 
     if (_utils.fs.existsSync(apiDir)) {
       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);
+      const apiExtension = (0, _utils2.mergeExtension)(pluginAPIExt);
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, _objectSpread(_objectSpread({}, apiExtension), {}, {
+        modernJsConfig: this.conf
+      }));
     }
   }
   /* —————————————————————— function will be overwrite —————————————————————— */
@@ -296,7 +301,7 @@ class ModernServer {
       pwd: workDir,
       mode,
       config: extension,
-      prefix
+      prefix: Array.isArray(prefix) ? prefix[0] : prefix
     }, {
       onLast: () => null
     });
@@ -311,7 +316,7 @@ class ModernServer {
       conf
     } = this;
     const preMiddleware = await this.runner.preServerInit(conf);
-    preMiddleware.forEach(mid => {
+    preMiddleware.flat().forEach(mid => {
       this.addHandler(mid);
     });
   }
@@ -344,7 +349,12 @@ class ModernServer {
     const {
       req,
       res
-    } = context; // match routes in the route spec
+    } = context;
+    await this.runner.beforeMatch({
+      context
+    }, {
+      onLast: _utils2.noop
+    }); // match routes in the route spec
 
     const matched = this.router.match(context.url);
 
@@ -353,8 +363,23 @@ class ModernServer {
       return;
     }
 
-    const route = matched.generate();
-    const params = matched.parseURLParams(context.url);
+    const routeAPI = (0, _route2.createRouteAPI)(matched, this.router);
+    await this.runner.afterMatch({
+      context,
+      routeAPI
+    }, {
+      onLast: _utils2.noop
+    });
+
+    if (res.headersSent) {
+      return;
+    }
+
+    const {
+      current
+    } = routeAPI;
+    const route = current.generate();
+    const params = current.parseURLParams(context.url);
     context.setParams(params); // route is api service
 
     if (route.isApi) {
@@ -375,6 +400,11 @@ class ModernServer {
       return;
     }
 
+    await this.runner.beforeRender({
+      context
+    }, {
+      onLast: _utils2.noop
+    });
     const file = await this.routeRenderHandler(context, route);
 
     if (!file) {
@@ -392,7 +422,7 @@ class ModernServer {
     let response = file.content;
 
     if (route.entryName) {
-      const templateAPI = (0, _hookApi.createTemplateAPI)(file.content.toString());
+      const templateAPI = (0, _template.createTemplateAPI)(file.content.toString());
       await this.runner.afterRender({
         context,
         templateAPI

package/dist/js/node/utils.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toMessage = exports.noop = exports.mergeExtension = exports.createErrorDocument = void 0;
 
-const mergeExtension = (users, plugins) => {
+const mergeExtension = users => {
   const output = [];
   return {
-    middleware: output.concat(users).concat(plugins)
+    middleware: output.concat(users)
   };
 };
 

package/dist/types/libs/hook-api/route.d.ts

@@ -0,0 +1,13 @@
+import { RouteMatchManager, RouteMatcher } from '../route';
+
+declare class RouteAPI {
+  private readonly router;
+  private current;
+  constructor(matched: RouteMatcher, router: RouteMatchManager);
+  cur(): import("../route").ModernRoute;
+  get(entryName: string): import("../route").ModernRoute | null;
+  use(entryName: string): boolean;
+}
+
+export declare const createRouteAPI: (matched: RouteMatcher, router: RouteMatchManager) => RouteAPI;
+export {};

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

@@ -8,6 +8,7 @@ export declare class RouteMatchManager {
   private best;
   reset(specs: ModernRouteInterface[]): void;
   match(pathname: string): RouteMatcher | undefined;
+  matchEntry(entryname: string): RouteMatcher | undefined;
   getBundles(): (string | undefined)[];
 }
 export type { ModernRouteInterface, RouteMatcher, ModernRoute };

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

@@ -10,5 +10,6 @@ export declare class RouteMatcher {
   parseURLParams(pathname: string): Record<string, string>;
   matchLength(pathname: string): number | null;
   matchUrlPath(requestUrl: string): boolean;
+  matchEntry(entryName: string): boolean;
   private setupUrlPath;
 }