@modern-js/server 1.3.1-beta.0 → 1.4.1

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

@@ -32,6 +32,7 @@ const enableRegister = (projectRoot, config) => {
   return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
     only: [function (filePath) {
       // TODO: wait params
+      // FIXME: 删除hardcode，根据 AppContext 中的 metaName 设置路径
       if (filePath.includes(`node_modules${_path.default.sep}.modern-js`)) {
         return true;
       }

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

@@ -25,8 +25,7 @@ class DevServerPlugin {
     } = this;
     const host = `&host=${options.client.host || 'localhost'}`;
     const path = `&path=${options.client.path}`;
-    const port = `&port=${options.client.port}`; // Todo @songzhenwei
-
+    const port = `&port=${options.client.port}`;
     const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
 
     const hotEntry = require.resolve('webpack/hot/dev-server');

package/dist/js/node/dev-tools/mock/getMockData.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.getMatched = exports.default = void 0;
 
 var _utils = require("@modern-js/utils");
 
+var _pathToRegexp = require("path-to-regexp");
+
 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; }
@@ -91,4 +93,29 @@ var _default = filepath => {
   return data;
 };
 
-exports.default = _default;
+exports.default = _default;
+
+const getMatched = (context, mockApiList) => {
+  const {
+    path: targetPathname,
+    method: targetMethod
+  } = context;
+  const matched = mockApiList.find(mockApi => {
+    const {
+      method,
+      path: pathname
+    } = mockApi;
+
+    if (method.toLowerCase() === targetMethod.toLowerCase()) {
+      return (0, _pathToRegexp.match)(pathname, {
+        encode: encodeURI,
+        decode: decodeURIComponent
+      })(targetPathname);
+    }
+
+    return false;
+  });
+  return matched;
+};
+
+exports.getMatched = getMatched;

package/dist/js/node/dev-tools/mock/index.js

@@ -9,36 +9,15 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _pathToRegexp = require("path-to-regexp");
-
 var _constants = require("../../constants");
 
-var _getMockData = _interopRequireDefault(require("./getMockData"));
+var _getMockData = _interopRequireWildcard(require("./getMockData"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
 
-const getMatched = (context, mockApiList) => {
-  const {
-    path: targetPathname,
-    method: targetMethod
-  } = context;
-  const matched = mockApiList.find(mockApi => {
-    const {
-      method,
-      path: pathname
-    } = mockApi;
-
-    if (method.toLowerCase() === targetMethod.toLowerCase()) {
-      return (0, _pathToRegexp.match)(pathname, {
-        encode: encodeURI,
-        decode: decodeURIComponent
-      })(targetPathname);
-    }
+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; }
 
-    return false;
-  });
-  return matched;
-};
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const createMockHandler = ({
   pwd
@@ -69,7 +48,7 @@ const createMockHandler = ({
     const {
       res
     } = context;
-    const matched = getMatched(context, apiList);
+    const matched = (0, _getMockData.getMatched)(context, apiList);
 
     if (!matched) {
       return next();

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

@@ -118,8 +118,10 @@ class SocketServer {
     });
   }
 
-  close(connection) {
-    connection.close();
+  close() {
+    this.sockets.forEach(socket => {
+      socket.close();
+    });
   } // get standard stats
 
 

package/dist/js/node/dev-tools/watcher/index.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.getWatchedFiles = exports.default = void 0;
+
+var _path = _interopRequireDefault(require("path"));
 
 var _chokidar = _interopRequireDefault(require("chokidar"));
 
@@ -18,12 +20,14 @@ const getWatchedFiles = watcher => {
   const files = [];
   Object.keys(watched).forEach(dir => {
     watched[dir].forEach(fileName => {
-      files.push(`${dir}/${fileName}`);
+      files.push(_path.default.join(dir, fileName));
     });
   });
   return files;
 };
 
+exports.getWatchedFiles = getWatchedFiles;
+
 class Watcher {
   constructor() {
     this.dependencyTree = null;
@@ -32,9 +36,7 @@ class Watcher {
 
   listen(files, options, callback) {
     const watched = files.filter(Boolean);
-    const filenames = watched.map(filename => filename.replace(/\\/g, '/')); // eslint-disable-next-line no-console
-
-    console.log('watched files:', filenames);
+    const filenames = watched.map(filename => filename.replace(/\\/g, '/'));
     const cache = new _statsCache.StatsCache();
 
     const watcher = _chokidar.default.watch(filenames, options);

package/dist/js/node/dev-tools/watcher/stats-cache.js

@@ -7,24 +7,29 @@ exports.StatsCache = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _crypto = _interopRequireDefault(require("crypto"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class StatsCache {
   constructor() {
-    this.cachedStats = {};
+    this.cachedHash = {};
+    this.cachedSize = {};
   }
 
   add(files) {
     const {
-      cachedStats
+      cachedHash,
+      cachedSize
     } = this;
 
     for (const filename of files) {
       if (_fs.default.existsSync(filename)) {
-        const stat = _fs.default.statSync(filename);
+        const stats = _fs.default.statSync(filename);
 
-        if (stat.isFile() && !cachedStats[filename]) {
-          cachedStats[filename] = this.sign(stat);
+        if (stats.isFile() && !cachedHash[filename]) {
+          cachedHash[filename] = this.hash(stats, filename);
+          cachedSize[filename] = stats.size;
         }
       }
     }
@@ -32,34 +37,43 @@ class StatsCache {
 
   refresh(filename) {
     const {
-      cachedStats
+      cachedHash,
+      cachedSize
     } = this;
 
     if (_fs.default.existsSync(filename)) {
-      const stat = _fs.default.statSync(filename);
+      const stats = _fs.default.statSync(filename);
 
-      if (stat.isFile()) {
-        cachedStats[filename] = this.sign(stat);
+      if (stats.isFile()) {
+        cachedHash[filename] = this.hash(stats, filename);
+        cachedSize[filename] = stats.size;
       }
     }
   }
 
   del(filename) {
-    if (this.cachedStats[filename]) {
-      delete this.cachedStats[filename];
+    if (this.cachedHash[filename]) {
+      delete this.cachedHash[filename];
+      delete this.cachedSize[filename];
     }
   }
 
   isDiff(filename) {
     const {
-      cachedStats
+      cachedHash,
+      cachedSize
     } = this;
 
-    const stat = _fs.default.statSync(filename);
+    const stats = _fs.default.statSync(filename);
+
+    const hash = cachedHash[filename];
+    const size = cachedSize[filename];
 
-    const cachedStat = cachedStats[filename];
+    if (stats.size !== size) {
+      return true;
+    }
 
-    if (this.sign(stat) !== cachedStat) {
+    if (this.hash(stats, filename) !== hash) {
       return true;
     }
 
@@ -67,12 +81,11 @@ class StatsCache {
   }
 
   has(filename) {
-    return Boolean(this.cachedStats[filename]);
-  } // Todo size 其实有点问题，修改单个字符会导致触发不了 change
-
+    return Boolean(this.cachedHash[filename]);
+  }
 
-  sign(stat) {
-    return stat.size;
+  hash(stats, filename) {
+    return _crypto.default.createHash('md5').update(_fs.default.readFileSync(filename)).digest('hex');
   }
 
 }

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

@@ -31,10 +31,12 @@ class ModernServerContext {
     this.params = {};
     this.logger = void 0;
     this.metrics = void 0;
+    this.serverData = void 0;
     this.req = req;
     this.res = res;
     this.logger = req.logger;
     this.metrics = req.metrics;
+    this.serverData = {};
     this.bind();
   }
 
@@ -53,6 +55,10 @@ class ModernServerContext {
     this.params = params;
   }
 
+  setServerData(key, value) {
+    this.serverData[key] = value;
+  }
+
   getReqHeader(key) {
     const {
       req

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

@@ -6,15 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.createRouteAPI = void 0;
 
 class RouteAPI {
-  constructor(matched, router) {
+  constructor(matched, router, url) {
     this.router = void 0;
     this.current = void 0;
+    this.url = void 0;
     this.current = matched;
     this.router = router;
+    this.url = url;
   }
 
   cur() {
-    return this.current.generate();
+    return this.current.generate(this.url);
   }
 
   get(entryName) {
@@ -22,7 +24,7 @@ class RouteAPI {
       router
     } = this;
     const matched = router.matchEntry(entryName);
-    return matched ? matched.generate() : null;
+    return matched ? matched.generate(this.url) : null;
   }
 
   use(entryName) {
@@ -41,6 +43,6 @@ class RouteAPI {
 
 }
 
-const createRouteAPI = (matched, router) => new RouteAPI(matched, router);
+const createRouteAPI = (matched, router, url) => new RouteAPI(matched, router, url);
 
 exports.createRouteAPI = createRouteAPI;

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

@@ -64,6 +64,7 @@ const createRenderHandler = ({
       const result = await ssr.render(ctx, {
         distDir,
         entryName: route.entryName,
+        urlPath: route.urlPath,
         bundle: route.bundle,
         template: templateHTML,
         staticGenerate

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateFile = exports.readFile = exports.init = exports.close = void 0;
+exports.updateFile = exports.readFile = exports.init = exports.close = exports.LruReader = void 0;
 
 var _utils = require("@modern-js/utils");
 
@@ -110,6 +110,7 @@ class LruReader {
 
 }
 
+exports.LruReader = LruReader;
 const reader = new LruReader();
 
 const readFile = async filepath => {

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

@@ -11,12 +11,15 @@ var _utils = require("@modern-js/utils");
 
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
 
+var _cookie = _interopRequireDefault(require("cookie"));
+
 var _cache = _interopRequireDefault(require("./cache"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const render = async (ctx, renderOptions, runner) => {
   const {
+    urlPath,
     bundle,
     distDir,
     template,
@@ -28,11 +31,14 @@ const render = async (ctx, renderOptions, runner) => {
 
   const context = {
     request: {
+      baseUrl: urlPath,
       params: ctx.params,
       pathname: ctx.path,
+      host: ctx.host,
       query: ctx.query,
-      headers: ctx.headers,
-      cookie: ctx.headers.cookie
+      url: ctx.href,
+      cookieMap: _cookie.default.parse(ctx.headers.cookie || ''),
+      headers: ctx.headers
     },
     redirection: {},
     template,

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

@@ -23,7 +23,6 @@ class RouteMatchManager {
 
   filter(pathname) {
     return this.matchers.reduce((matches, matcher) => {
-      // 非网关来的，或网关匹配上之后，内部再进行一次自己的匹配
       if (matcher.matchUrlPath(pathname)) {
         matches.push(matcher);
       }

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

@@ -9,6 +9,8 @@ var _utils = require("@modern-js/utils");
 
 var _pathToRegexp = require("path-to-regexp");
 
+var _utils2 = require("../../utils");
+
 var _route = require("./route");
 
 // eslint-disable-next-line no-useless-escape
@@ -25,8 +27,16 @@ class RouteMatcher {
   } // generate modern route object
 
 
-  generate() {
-    return new _route.ModernRoute(this.spec);
+  generate(url) {
+    const route = new _route.ModernRoute(this.spec);
+
+    if (this.urlPath) {
+      const params = this.parseURLParams(url);
+      route.urlPath = (0, _utils2.toPath)(route.urlPath, params);
+      route.params = params;
+    }
+
+    return route;
   }
 
   parseURLParams(pathname) {
@@ -84,9 +94,12 @@ class RouteMatcher {
 
     if (useReg) {
       this.urlMatcher = (0, _pathToRegexp.match)(urlPath, {
+        end: false,
         decode: decodeURIComponent
       });
-      this.urlReg = (0, _pathToRegexp.pathToRegexp)(urlPath);
+      this.urlReg = (0, _pathToRegexp.pathToRegexp)(urlPath, [], {
+        end: false
+      });
     }
   }
 

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

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

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

@@ -147,6 +147,8 @@ class ModernDevServer extends _modernServer.ModernServer {
   }
 
   async close() {
+    var _this$socketServer2;
+
     super.close();
     await this.watcher.close();
     await new Promise(resolve => {
@@ -158,6 +160,7 @@ class ModernDevServer extends _modernServer.ModernServer {
         resolve();
       }
     });
+    (_this$socketServer2 = this.socketServer) === null || _this$socketServer2 === void 0 ? void 0 : _this$socketServer2.close();
   }
 
   async createHTTPServer(handler) {

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

@@ -7,7 +7,7 @@ exports.Server = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _serverPlugin = require("@modern-js/server-plugin");
+var _serverCore = require("@modern-js/server-core");
 
 var _utils = require("@modern-js/utils");
 
@@ -131,22 +131,25 @@ class Server {
     const {
       options
     } = this;
+
+    _serverCore.serverManager.clear();
+
     (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
-      _serverPlugin.serverManager.usePlugin(p);
+      _serverCore.serverManager.usePlugin((0, _utils.compatRequire)(p.pluginPath));
     });
     const appContext = await this.initAppContext();
 
-    _serverPlugin.serverManager.run(() => {
+    _serverCore.serverManager.run(() => {
       var _options$config$outpu;
 
-      _core.ConfigContext.set(this.options.config);
+      _serverCore.ConfigContext.set(this.options.config);
 
-      _core.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
+      _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 _serverPlugin.serverManager.init({});
+    return _serverCore.serverManager.init({});
   }
 
   async initAppContext() {

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

@@ -13,7 +13,7 @@ class ModernSSRServer extends _modernServer.ModernServer {
   }
 
   verifyMatch(context, matched) {
-    if (matched.generate().isApi) {
+    if (matched.generate(context.url).isApi) {
       this.render404(context);
     }
   }

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

@@ -156,15 +156,10 @@ class ModernServer {
       this.warmupSSRBundle();
     }
 
-    await this.prepareFrameHandler();
-    const {
-      favicon,
-      faviconByEntries
-    } = this.conf.output || {};
-    const favicons = this.prepareFavicons(favicon, faviconByEntries); // Only work when without setting `assetPrefix`.
+    await this.prepareFrameHandler(); // 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('|')}` : ''})`);
+    const staticPathRegExp = (0, _utils2.getStaticReg)(this.conf.output || {});
     this.staticFileHandler = (0, _serveFile.createStaticFileHandler)([{
       path: staticPathRegExp,
       target: distDir
@@ -388,7 +383,7 @@ class ModernServer {
       return;
     }
 
-    const routeAPI = (0, _route2.createRouteAPI)(matched, this.router);
+    const routeAPI = (0, _route2.createRouteAPI)(matched, this.router, context.url);
     await this.emitRouteHook('afterMatch', {
       context,
       routeAPI
@@ -401,12 +396,15 @@ class ModernServer {
     const {
       current
     } = routeAPI;
-    const route = current.generate();
-    const params = current.parseURLParams(context.url);
-    context.setParams(params); // route is api service
+    const route = current.generate(context.url);
+    context.setParams(route.params);
+    context.setServerData('router', {
+      baseUrl: route.urlPath,
+      params: route.params
+    }); // route is api service
 
     if (route.isApi) {
-      this.handleAPI(context);
+      await this.handleAPI(context);
       return;
     }
 
@@ -448,6 +446,7 @@ class ModernServer {
         templateAPI
       });
       await this.injectMicroFE(context, templateAPI);
+      templateAPI.appendHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
       response = templateAPI.get();
     }
 
@@ -590,7 +589,7 @@ class ModernServer {
     const matched = this.router.match(statusPage) || this.router.match(customErrorPage); // if no custom status page find
 
     if (matched) {
-      const route = matched.generate();
+      const route = matched.generate(context.url);
       const {
         entryName
       } = route; // check entryName, aviod matched '/' route
@@ -616,26 +615,6 @@ class ModernServer {
     res.end((0, _utils2.createErrorDocument)(status, text));
   }
 
-  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;
-  }
-
 }
 /* eslint-enable max-lines */
 

package/dist/js/node/utils.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toMessage = exports.noop = exports.mergeExtension = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
+exports.toPath = exports.toMessage = exports.prepareFavicons = exports.noop = exports.mergeExtension = exports.getStaticReg = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
+
+var _pathToRegexp = require("path-to-regexp");
 
 const mergeExtension = users => {
   const output = [];
@@ -91,4 +93,51 @@ const createMiddlewareCollecter = () => {
   };
 };
 
-exports.createMiddlewareCollecter = createMiddlewareCollecter;
+exports.createMiddlewareCollecter = createMiddlewareCollecter;
+
+const toPath = (reg, params) => {
+  const fn = (0, _pathToRegexp.compile)(reg, {
+    encode: encodeURIComponent
+  });
+  return fn(params);
+};
+
+exports.toPath = toPath;
+
+const getStaticReg = (output = {}) => {
+  const {
+    favicon,
+    faviconByEntries,
+    cssPath,
+    jsPath,
+    mediaPath
+  } = output;
+  const favicons = prepareFavicons(favicon, faviconByEntries);
+  const staticFiles = [cssPath, jsPath, mediaPath].filter(v => Boolean(v));
+  const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''}|${staticFiles.join('|')})`);
+  return staticPathRegExp;
+};
+
+exports.getStaticReg = getStaticReg;
+
+const 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;
+};
+
+exports.prepareFavicons = prepareFavicons;