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

package/CHANGELOG.md

@@ -1,5 +1,73 @@
 # @modern-js/server
 
+## 1.4.1
+
+### Patch Changes
+
+- 2cfc4235: support cssPath/jsPath/mediaPath in production mode
+- 8d55e234: fix: catch api error
+- Updated dependencies [53aca274]
+- Updated dependencies [78279953]
+- Updated dependencies [e116ace5]
+- Updated dependencies [4d72edea]
+  - @modern-js/core@1.4.1
+  - @modern-js/utils@1.3.1
+
+## 1.4.0
+
+### Minor Changes
+
+- ec4dbffb: feat: support as a pure api service
+
+### Patch Changes
+
+- 816fd721: support more server context
+- d9cc5ea9: support resatrt options transfer
+- bfbea9a7: support multi base url and dynamic base url
+- d099e5c5: fix error when modify modern.config.js
+- 24f616ca: feat: support custom meta info
+- 272cab15: refactor server plugin manager
+- Updated dependencies [d9cc5ea9]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [ec4dbffb]
+- Updated dependencies [d099e5c5]
+- Updated dependencies [bada2879]
+- Updated dependencies [24f616ca]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [272cab15]
+  - @modern-js/core@1.4.0
+  - @modern-js/utils@1.3.0
+  - @modern-js/server-core@1.2.2
+
+## 1.3.2
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+  - @modern-js/core@1.3.2
+  - @modern-js/bff-utils@1.2.2
+  - @modern-js/hmr-client@1.2.1
+  - @modern-js/server-plugin@1.2.1
+  - @modern-js/server-utils@1.2.1
+  - @modern-js/utils@1.2.2
+
+## 1.3.1
+
+### Patch Changes
+
+- e2d3a575: fix extending core config interface
+- 823809c6: fix: hot reload not working on windows
+- e2d3a575: fix extending core config interface
+- Updated dependencies [823809c6]
+- Updated dependencies [4584cc04]
+- Updated dependencies [7c19fd94]
+  - @modern-js/bff-utils@1.2.1
+  - @modern-js/utils@1.2.1
+  - @modern-js/core@1.3.1
+
 ## 1.3.0
 
 ### Minor Changes

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

@@ -18,6 +18,7 @@ export 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.sep}.modern-js`)) {
         return true;
       }

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

@@ -14,8 +14,7 @@ export default 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/modern/dev-tools/mock/getMockData.js

@@ -5,6 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { compatRequire } from '@modern-js/utils';
+import { match } from 'path-to-regexp';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const VALID_METHODS = ['get', 'post', 'put', 'delete', 'patch']; // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
@@ -81,4 +82,26 @@ export default (filepath => {
 
   const data = normalizeConfig(mockModule);
   return data;
-});
+});
+export 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 match(pathname, {
+        encode: encodeURI,
+        decode: decodeURIComponent
+      })(targetPathname);
+    }
+
+    return false;
+  });
+  return matched;
+};

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

@@ -1,32 +1,7 @@
 import path from 'path';
 import { fs } from '@modern-js/utils';
-import { match } from 'path-to-regexp';
 import { AGGRED_DIR } from "../../constants";
-import getMockData from "./getMockData";
-
-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 match(pathname, {
-        encode: encodeURI,
-        decode: decodeURIComponent
-      })(targetPathname);
-    }
-
-    return false;
-  });
-  return matched;
-};
-
+import getMockData, { getMatched } from "./getMockData";
 export const createMockHandler = ({
   pwd
 }) => {

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

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

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

@@ -1,18 +1,17 @@
+import path from 'path';
 import chokidar from 'chokidar';
 import { DependencyTree } from "./dependency-tree";
 import { StatsCache } from "./stats-cache";
-
-const getWatchedFiles = watcher => {
+export const getWatchedFiles = watcher => {
   const watched = watcher.getWatched();
   const files = [];
   Object.keys(watched).forEach(dir => {
     watched[dir].forEach(fileName => {
-      files.push(`${dir}/${fileName}`);
+      files.push(path.join(dir, fileName));
     });
   });
   return files;
 };
-
 export default class Watcher {
   constructor() {
     this.dependencyTree = null;
@@ -21,9 +20,7 @@ export default 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();
     const watcher = chokidar.watch(filenames, options);
     watcher.on('ready', () => {

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

@@ -1,20 +1,24 @@
 import fs from 'fs';
+import crypto from 'crypto';
 export class StatsCache {
   constructor() {
-    this.cachedStats = {};
+    this.cachedHash = {};
+    this.cachedSize = {};
   }
 
   add(files) {
     const {
-      cachedStats
+      cachedHash,
+      cachedSize
     } = this;
 
     for (const filename of files) {
       if (fs.existsSync(filename)) {
-        const stat = fs.statSync(filename);
+        const stats = fs.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;
         }
       }
     }
@@ -22,32 +26,41 @@ export class StatsCache {
 
   refresh(filename) {
     const {
-      cachedStats
+      cachedHash,
+      cachedSize
     } = this;
 
     if (fs.existsSync(filename)) {
-      const stat = fs.statSync(filename);
+      const stats = fs.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.statSync(filename);
-    const cachedStat = cachedStats[filename];
+    const stats = fs.statSync(filename);
+    const hash = cachedHash[filename];
+    const size = cachedSize[filename];
 
-    if (this.sign(stat) !== cachedStat) {
+    if (stats.size !== size) {
+      return true;
+    }
+
+    if (this.hash(stats, filename) !== hash) {
       return true;
     }
 
@@ -55,12 +68,11 @@ export 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.createHash('md5').update(fs.readFileSync(filename)).digest('hex');
   }
 
 }

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

@@ -19,10 +19,12 @@ export 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();
   }
 
@@ -41,6 +43,10 @@ export class ModernServerContext {
     this.params = params;
   }
 
+  setServerData(key, value) {
+    this.serverData[key] = value;
+  }
+
   getReqHeader(key) {
     const {
       req

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

@@ -1,13 +1,15 @@
 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) {
@@ -15,7 +17,7 @@ class RouteAPI {
       router
     } = this;
     const matched = router.matchEntry(entryName);
-    return matched ? matched.generate() : null;
+    return matched ? matched.generate(this.url) : null;
   }
 
   use(entryName) {
@@ -34,4 +36,4 @@ class RouteAPI {
 
 }
 
-export const createRouteAPI = (matched, router) => new RouteAPI(matched, router);
+export const createRouteAPI = (matched, router, url) => new RouteAPI(matched, router, url);

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

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

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

@@ -14,7 +14,7 @@ const createCacheItem = async (filepath, mtime) => {
   };
 };
 
-class LruReader {
+export class LruReader {
   // private timer?: NodeJS.Timeout;
   constructor() {
     this.cache = void 0;
@@ -96,7 +96,6 @@ class LruReader {
 
 
 }
-
 const reader = new LruReader();
 export const readFile = async filepath => {
   const file = await reader.read(filepath);

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

@@ -1,9 +1,11 @@
 import path from 'path';
 import { SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
 import mime from 'mime-types';
+import cookie from 'cookie';
 import cache from "./cache";
 export const render = async (ctx, renderOptions, runner) => {
   const {
+    urlPath,
     bundle,
     distDir,
     template,
@@ -13,11 +15,14 @@ export const render = async (ctx, renderOptions, runner) => {
   const bundleJS = path.join(distDir, bundle);
   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.parse(ctx.headers.cookie || ''),
+      headers: ctx.headers
     },
     redirection: {},
     template,

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

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

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

@@ -1,5 +1,6 @@
 import { removeTailSlash } from '@modern-js/utils';
 import { match, pathToRegexp } from 'path-to-regexp';
+import { toPath } from "../../utils";
 import { ModernRoute } from "./route"; // eslint-disable-next-line no-useless-escape
 
 const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
@@ -14,8 +15,16 @@ export class RouteMatcher {
   } // generate modern route object
 
 
-  generate() {
-    return new ModernRoute(this.spec);
+  generate(url) {
+    const route = new ModernRoute(this.spec);
+
+    if (this.urlPath) {
+      const params = this.parseURLParams(url);
+      route.urlPath = toPath(route.urlPath, params);
+      route.params = params;
+    }
+
+    return route;
   }
 
   parseURLParams(pathname) {
@@ -73,9 +82,12 @@ export class RouteMatcher {
 
     if (useReg) {
       this.urlMatcher = match(urlPath, {
+        end: false,
         decode: decodeURIComponent
       });
-      this.urlReg = pathToRegexp(urlPath);
+      this.urlReg = pathToRegexp(urlPath, [], {
+        end: false
+      });
     }
   }
 

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

@@ -10,6 +10,7 @@ export 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/modern/server/dev-server/dev-server.js

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

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

@@ -5,9 +5,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 path from 'path';
-import { serverManager } from '@modern-js/server-plugin';
-import { logger as defaultLogger } from '@modern-js/utils';
-import { AppContext, initAppContext, initAppDir, loadUserConfig, ConfigContext } from '@modern-js/core';
+import { serverManager, AppContext, ConfigContext } from '@modern-js/server-core';
+import { compatRequire, logger as defaultLogger } from '@modern-js/utils';
+import { initAppContext, initAppDir, loadUserConfig } from '@modern-js/core';
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { ModernServer } from "./modern-server";
 import { ModernAPIServer, ModernSSRServer, ModernWebServer } from "./modern-server-split";
@@ -115,8 +115,9 @@ export class Server {
     const {
       options
     } = this;
+    serverManager.clear();
     (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
-      serverManager.usePlugin(p);
+      serverManager.usePlugin(compatRequire(p.pluginPath));
     });
     const appContext = await this.initAppContext();
     serverManager.run(() => {

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

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

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

@@ -21,7 +21,7 @@ import clone from 'lodash.clone';
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler } from "../libs/serve-file";
-import { createErrorDocument, createMiddlewareCollecter, mergeExtension, noop } from "../utils";
+import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExtension, noop } from "../utils";
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
@@ -126,15 +126,10 @@ export 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 = getStaticReg(this.conf.output || {});
     this.staticFileHandler = createStaticFileHandler([{
       path: staticPathRegExp,
       target: distDir
@@ -353,7 +348,7 @@ export class ModernServer {
       return;
     }
 
-    const routeAPI = createRouteAPI(matched, this.router);
+    const routeAPI = createRouteAPI(matched, this.router, context.url);
     await this.emitRouteHook('afterMatch', {
       context,
       routeAPI
@@ -366,12 +361,15 @@ export 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;
     }
 
@@ -413,6 +411,7 @@ export class ModernServer {
         templateAPI
       });
       await this.injectMicroFE(context, templateAPI);
+      templateAPI.appendHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
       response = templateAPI.get();
     }
 
@@ -555,7 +554,7 @@ export 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
@@ -581,25 +580,5 @@ export class ModernServer {
     res.end(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/modern/utils.js

@@ -1,3 +1,4 @@
+import { compile } from 'path-to-regexp';
 export const mergeExtension = users => {
   const output = [];
   return {
@@ -70,4 +71,42 @@ export const createMiddlewareCollecter = () => {
     addWebMiddleware,
     addAPIMiddleware
   };
+};
+export const toPath = (reg, params) => {
+  const fn = compile(reg, {
+    encode: encodeURIComponent
+  });
+  return fn(params);
+};
+export 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;
+};
+export 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;
 };