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

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

@@ -11,10 +11,11 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 /* eslint-disable max-lines */
+import { createServer } from 'http';
 import util from 'util';
 import path from 'path';
 import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
-import { gather, createMiddlewareCollecter } from '@modern-js/server-utils';
+import { createMiddlewareCollecter } from '@modern-js/server-utils';
 import mime from 'mime-types';
 import axios from 'axios';
 import { RouteMatchManager } from "../libs/route";
@@ -25,7 +26,8 @@ import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
 import { AGGRED_DIR, ApiServerMode, ERROR_DIGEST, ERROR_PAGE_TEXT } from "../constants";
-import { createTemplateAPI } from "../libs/hook-api";
+import { createTemplateAPI } from "../libs/hook-api/template";
+import { createRouteAPI } from "../libs/hook-api/route";
 const API_DIR = './api';
 const SERVER_DIR = './server';
 export class ModernServer {
@@ -40,7 +42,7 @@ export class ModernServer {
     staticGenerate,
     logger,
     measure
-  }, runner) {
+  }) {
     this.pwd = void 0;
     this.distDir = void 0;
     this.workDir = void 0;
@@ -48,9 +50,9 @@ export 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;
@@ -67,7 +69,6 @@ export class ModernServer {
     this.distDir = path.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 RouteMatchManager();
@@ -86,9 +87,10 @@ export class ModernServer {
   } // server prepare
 
 
-  async init() {
+  async init(runner) {
     var _conf$bff;
 
+    this.runner = runner;
     const {
       distDir,
       isDev,
@@ -120,12 +122,17 @@ export class ModernServer {
     }
 
     await this.prepareFrameHandler();
+    const {
+      favicon,
+      faviconByEntries
+    } = this.conf.output;
+    const favicons = this.prepareFavicons(favicon, faviconByEntries); // Only work when without setting `assetPrefix`.
+    // Setting `assetPrefix` means these resources should be uploaded to CDN.
+
+    const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''})`);
     this.staticFileHandler = createStaticFileHandler([{
-      path: '/static/',
-      target: path.join(distDir, 'static')
-    }, {
-      path: '/upload/',
-      target: path.join(distDir, 'upload')
+      path: staticPathRegExp,
+      target: distDir
     }]);
     this.routeRenderHandler = createRenderHandler({
       distDir,
@@ -148,6 +155,10 @@ export class ModernServer {
 
   close() {
     reader.close();
+  }
+
+  async createHTTPServer(handler) {
+    return createServer(handler);
   } // warmup ssr function
 
 
@@ -195,12 +206,7 @@ export class ModernServer {
     const {
       workDir,
       runner
-    } = this; // inner tool, gather user inject
-
-    const {
-      api: userAPIExt,
-      web: userWebExt
-    } = gather(workDir); // server hook, gather plugin inject
+    } = this; // server hook, gather plugin inject
 
     const _createMiddlewareColl = createMiddlewareCollecter(),
           {
@@ -217,17 +223,15 @@ export class ModernServer {
     const serverDir = path.join(workDir, SERVER_DIR); // get api or web server handler from server-framework plugin
 
     if (await fs.pathExists(path.join(serverDir))) {
-      const webExtension = mergeExtension(pluginWebExt, userWebExt);
+      const webExtension = mergeExtension(pluginWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
 
     if (fs.existsSync(apiDir)) {
       const mode = fs.existsSync(path.join(apiDir, AGGRED_DIR.lambda)) ? ApiServerMode.frame : ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
 
-      const apiExtension = mergeExtension(pluginAPIExt, mode === ApiServerMode.frame ? [] : userAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, _objectSpread(_objectSpread({}, apiExtension), {}, {
-        modernJsConfig: this.conf
-      }));
+      const apiExtension = mergeExtension(pluginAPIExt);
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
     }
   }
   /* —————————————————————— function will be overwrite —————————————————————— */
@@ -260,7 +264,7 @@ export class ModernServer {
       pwd: workDir,
       mode,
       config: extension,
-      prefix
+      prefix: Array.isArray(prefix) ? prefix[0] : prefix
     }, {
       onLast: () => null
     });
@@ -275,10 +279,30 @@ export class ModernServer {
       conf
     } = this;
     const preMiddleware = await this.runner.preServerInit(conf);
-    preMiddleware.forEach(mid => {
+    preMiddleware.flat().forEach(mid => {
       this.addHandler(mid);
     });
   }
+
+  prepareFavicons(favicon, faviconByEntries) {
+    const faviconNames = [];
+
+    if (favicon) {
+      faviconNames.push(favicon.substring(favicon.lastIndexOf('/') + 1));
+    }
+
+    if (faviconByEntries) {
+      Object.keys(faviconByEntries).forEach(f => {
+        const curFavicon = faviconByEntries[f];
+
+        if (curFavicon) {
+          faviconNames.push(curFavicon.substring(curFavicon.lastIndexOf('/') + 1));
+        }
+      });
+    }
+
+    return faviconNames;
+  }
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
   // eslint-disable-next-line max-statements
@@ -288,7 +312,12 @@ export class ModernServer {
     const {
       req,
       res
-    } = context; // match routes in the route spec
+    } = context;
+    await this.runner.beforeMatch({
+      context
+    }, {
+      onLast: noop
+    }); // match routes in the route spec
 
     const matched = this.router.match(context.url);
 
@@ -297,8 +326,23 @@ export class ModernServer {
       return;
     }
 
-    const route = matched.generate();
-    const params = matched.parseURLParams(context.url);
+    const routeAPI = createRouteAPI(matched, this.router);
+    await this.runner.afterMatch({
+      context,
+      routeAPI
+    }, {
+      onLast: 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) {
@@ -319,6 +363,11 @@ export class ModernServer {
       return;
     }
 
+    await this.runner.beforeRender({
+      context
+    }, {
+      onLast: noop
+    });
     const file = await this.routeRenderHandler(context, route);
 
     if (!file) {

package/dist/js/modern/type.js

@@ -1,2 +1 @@
-export {};
 export {};

package/dist/js/modern/utils.js

@@ -1,7 +1,7 @@
-export const mergeExtension = (users, plugins) => {
+export const mergeExtension = users => {
   const output = [];
   return {
-    middleware: output.concat(users).concat(plugins)
+    middleware: output.concat(users)
   };
 };
 export const toMessage = (dig, e) => {

package/dist/js/node/libs/hook-api/route.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createRouteAPI = void 0;
+
+class RouteAPI {
+  constructor(matched, router) {
+    this.router = void 0;
+    this.current = void 0;
+    this.current = matched;
+    this.router = router;
+  }
+
+  cur() {
+    return this.current.generate();
+  }
+
+  get(entryName) {
+    const {
+      router
+    } = this;
+    const matched = router.matchEntry(entryName);
+    return matched ? matched.generate() : null;
+  }
+
+  use(entryName) {
+    const {
+      router
+    } = this;
+    const matched = router.matchEntry(entryName);
+
+    if (matched) {
+      this.current = matched;
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+}
+
+const createRouteAPI = (matched, router) => new RouteAPI(matched, router);
+
+exports.createRouteAPI = createRouteAPI;

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

@@ -64,6 +64,10 @@ class RouteMatchManager {
     return best;
   }
 
+  matchEntry(entryname) {
+    return this.matchers.find(matcher => matcher.matchEntry(entryname));
+  }
+
   getBundles() {
     const bundles = this.specs.filter(route => route.isSSR).map(route => route.bundle);
     return bundles;

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

@@ -12,7 +12,7 @@ var _pathToRegexp = require("path-to-regexp");
 var _route = require("./route");
 
 // eslint-disable-next-line no-useless-escape
-const regCharsDetector = /[^a-zA-Z\-_0-9\/]/;
+const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
 
 class RouteMatcher {
   constructor(spec) {
@@ -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/libs/serve-file.js

@@ -7,36 +7,35 @@ exports.createStaticFileHandler = void 0;
 
 var _serveStatic = _interopRequireDefault(require("serve-static"));
 
+var _utils = require("@modern-js/utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Todo 看看是不是能 fork 一份，即使命中也返回
-const createStaticFileHandler = rules => {
-  const middlewares = rules.reduce((map, rule) => {
-    map[rule.path] = (0, _serveStatic.default)(rule.target);
-    return map;
-  }, {}); // eslint-disable-next-line consistent-return
-
-  return async (context, next) => {
-    const {
-      url: requestUrl,
-      req,
-      res
-    } = context;
-    const hit = Object.keys(middlewares).find(u => requestUrl.startsWith(u));
-
-    if (hit) {
-      // when matches static resources, delete the first layer of req.url
-      const removed = hit;
-      context.url = requestUrl.slice(removed.length - 1);
-      middlewares[hit](req, res, () => {
-        // will invok next, recover req.url
-        context.url = removed + context.url;
-        next();
-      });
-    } else {
-      return next();
+const createStaticFileHandler = rules => // eslint-disable-next-line consistent-return
+async (context, next) => {
+  const {
+    url: requestUrl,
+    req,
+    res
+  } = context;
+  const hitRule = rules.find(item => {
+    if ((0, _utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
+      return true;
+    } else if ((0, _utils.isRegExp)(item.path) && item.path.test(requestUrl)) {
+      return true;
     }
-  };
+
+    return false;
+  });
+
+  if (hitRule) {
+    (0, _serveStatic.default)(hitRule.target)(req, res, () => {
+      next();
+    });
+  } else {
+    return next();
+  }
 };
 
 exports.createStaticFileHandler = createStaticFileHandler;

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}/!(typings)/**`, `${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");