@modern-js/server 1.3.2 → 1.4.2

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) {
@@ -209,6 +212,10 @@ class ModernDevServer extends _modernServer.ModernServer {
     };
 
     const addHooks = compiler => {
+      if (compiler.name === 'server') {
+        return;
+      }
+
       const {
         compile,
         invalid,

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;

package/dist/types/dev-tools/mock/getMockData.d.ts

@@ -15,4 +15,5 @@ declare const createStaticDataHandler: (method: string, handler: Record<string,
 
 declare const _default: (filepath: string) => MockApi[];
 
-export default _default;
+export default _default;
+export declare const getMatched: (context: ModernServerContext, mockApiList: MockApi[]) => MockApi | undefined;

package/dist/types/dev-tools/socket-server.d.ts

@@ -9,11 +9,14 @@ export default class SocketServer {
   private readonly options;
   private app?;
   private stats?;
+  private timer;
   constructor(options: DevServerOptions);
   prepare(app: Server): void;
   updateStats(stats: Stats): void;
   sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
-  close(connection: ws): void;
+  singleWrite(socket: ws, type: string, data?: Record<string, any> | string | boolean): void;
+  close(): void;
+  private onConnect;
   private getStats;
   private sendStats;
   private send;

package/dist/types/dev-tools/watcher/index.d.ts

@@ -1,4 +1,5 @@
-import { WatchOptions } from 'chokidar';
+import chokidar, { FSWatcher, WatchOptions } from 'chokidar';
+export declare const getWatchedFiles: (watcher: chokidar.FSWatcher) => string[];
 export default class Watcher {
   private dependencyTree;
   private watcher;

package/dist/types/dev-tools/watcher/stats-cache.d.ts

@@ -1,9 +1,10 @@
 export declare class StatsCache {
-  private readonly cachedStats;
+  private readonly cachedHash;
+  private readonly cachedSize;
   add(files: string[]): void;
   refresh(filename: string): void;
   del(filename: string): void;
   isDiff(filename: string): boolean;
   has(filename: string): boolean;
-  private sign;
+  private hash;
 }

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

@@ -26,9 +26,11 @@ export declare class ModernServerContext implements ModernServerContextInterface
   params: Record<string, string>;
   logger: Logger;
   metrics?: Metrics;
+  serverData: Record<string, any>;
   constructor(req: IncomingMessage, res: ServerResponse);
   private bind;
   setParams(params: Record<string, string>): void;
+  setServerData(key: string, value: any): void;
   getReqHeader(key: string): string | string[];
   get headers(): import("http").IncomingHttpHeaders;
   get method(): string;

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

@@ -3,11 +3,12 @@ import { RouteMatchManager, RouteMatcher } from '../route';
 declare class RouteAPI {
   private readonly router;
   private current;
-  constructor(matched: RouteMatcher, router: RouteMatchManager);
+  private readonly url;
+  constructor(matched: RouteMatcher, router: RouteMatchManager, url: string);
   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 declare const createRouteAPI: (matched: RouteMatcher, router: RouteMatchManager, url: string) => RouteAPI;
 export {};

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

@@ -1,4 +1,17 @@
 /// <reference types="node" />
+export declare class LruReader {
+  private readonly cache;
+  constructor();
+  init(): void;
+  close(): void;
+  read(filepath: string): Promise<{
+    content: Buffer;
+    mtime: Date;
+  } | {
+    content: Buffer;
+  } | null>;
+  update(): void;
+}
 export declare const readFile: (filepath: string) => Promise<Buffer | undefined>;
 export declare const updateFile: () => void;
 export declare const init: () => void;

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

@@ -3,6 +3,7 @@ import { RenderResult, ServerHookRunner } from '../../type';
 export declare const render: (ctx: ModernServerContext, renderOptions: {
   distDir: string;
   bundle: string;
+  urlPath: string;
   template: string;
   entryName: string;
   staticGenerate: boolean;

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

@@ -6,7 +6,7 @@ export declare class RouteMatcher {
   urlMatcher?: MatchFunction;
   urlReg?: RegExp;
   constructor(spec: ModernRouteInterface);
-  generate(): ModernRoute;
+  generate(url: string): ModernRoute;
   parseURLParams(pathname: string): Record<string, string>;
   matchLength(pathname: string): number | null;
   matchUrlPath(requestUrl: string): boolean;

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

@@ -9,5 +9,6 @@ export declare class ModernRoute implements ModernRouteInterface {
   isSSR: boolean;
   isSPA: boolean;
   enableModernMode?: boolean;
+  params: Record<string, any>;
   constructor(routeSpec: ModernRouteInterface);
 }

package/dist/types/server/dev-server/dev-server-split.d.ts

@@ -1,15 +1,15 @@
-import type { APIServerStartInput } from '@modern-js/server-plugin';
+import type { APIServerStartInput } from '@modern-js/server-core';
 import { mergeExtension } from '../../utils';
 import { ModernRouteInterface } from '../../libs/route';
 import { ApiServerMode } from '../../constants';
 import { ModernDevServer } from './dev-server';
 export declare class ModernSSRDevServer extends ModernDevServer {
   protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
-  protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
+  protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-core").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
 }
 export declare class ModernAPIDevServer extends ModernDevServer {
-  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<import("@modern-js/server-plugin").Adapter>;
+  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<import("@modern-js/server-core").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected preServerInit(): Promise<void>;
 }

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

@@ -1,4 +1,4 @@
-import { APIServerStartInput } from '@modern-js/server-plugin';
+import { APIServerStartInput } from '@modern-js/server-core';
 import { mergeExtension } from '../utils';
 import { ModernRoute, ModernRouteInterface, RouteMatcher } from '../libs/route';
 import { ApiServerMode } from '../constants';
@@ -8,14 +8,14 @@ export declare class ModernSSRServer extends ModernServer {
   protected warmupSSRBundle(): Promise<void>;
   protected verifyMatch(context: ModernServerContext, matched: RouteMatcher): void;
   protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
-  protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
+  protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-core").Adapter>;
   protected preServerInit(): Promise<void>;
 }
 export declare class ModernAPIServer extends ModernServer {
   protected emitRouteHook(_: string, _input: any): Promise<void>;
   protected warmupSSRBundle(): Promise<void>;
   protected prepareWebHandler(_: ReturnType<typeof mergeExtension>): any;
-  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<import("@modern-js/server-plugin").Adapter>;
+  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<import("@modern-js/server-core").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected preServerInit(): Promise<void>;
 }

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse, Server } from 'http';
-import { Adapter, APIServerStartInput } from '@modern-js/server-plugin';
+import { Adapter, APIServerStartInput } from '@modern-js/server-core';
 import type { NormalizedConfig } from '@modern-js/core';
 import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ReadyOptions } from '../type';
 import { RouteMatchManager, ModernRouteInterface, ModernRoute, RouteMatcher } from '../libs/route';
@@ -68,6 +68,5 @@ export declare class ModernServer {
   private requestHandler;
   private onError;
   private renderErrorPage;
-  private prepareFavicons;
 }
 export {};

package/dist/types/type.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type Webpack from 'webpack';
-import { serverManager } from '@modern-js/server-plugin';
+import { serverManager } from '@modern-js/server-core';
 import type { NormalizedConfig } from '@modern-js/core';
 import type { Metrics, Logger, NextFunction } from '@modern-js/types/server';
 import { ModernRouteInterface } from './libs/route';
@@ -41,9 +41,11 @@ export declare type DevServerOptions = {
 export declare type ModernServerOptions = {
   pwd: string;
   config: NormalizedConfig;
-  plugins?: any[];
+  plugins?: {
+    pluginPath: string;
+  }[];
   dev?: boolean | Partial<DevServerOptions>;
-  compiler?: Webpack.MultiCompiler | Webpack.Compiler;
+  compiler?: Webpack.MultiCompiler | Webpack.Compiler | null;
   routes?: ModernRouteInterface[];
   staticGenerate?: boolean;
   customServer?: boolean;

package/dist/types/utils.d.ts

@@ -1,3 +1,4 @@
+import type { NormalizedConfig } from '@modern-js/core';
 export declare const mergeExtension: (users: any[]) => {
   middleware: any[];
 };
@@ -12,4 +13,7 @@ export declare const createMiddlewareCollecter: () => {
   getMiddlewares: () => CollectMiddlewaresResult;
   addWebMiddleware: (input: any) => void;
   addAPIMiddleware: (input: any) => void;
-};
+};
+export declare const toPath: (reg: string, params: Record<string, any>) => string;
+export declare const getStaticReg: (output?: NormalizedConfig['output']) => RegExp;
+export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined> | undefined) => string[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.2",
+  "version": "1.4.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,12 +34,12 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.3.2",
+    "@modern-js/core": "^1.4.2",
     "@modern-js/hmr-client": "^1.2.1",
-    "@modern-js/server-plugin": "^1.2.1",
+    "@modern-js/server-core": "^1.2.2",
     "@modern-js/server-utils": "^1.2.1",
     "@modern-js/bff-utils": "^1.2.2",
-    "@modern-js/utils": "^1.2.2",
+    "@modern-js/utils": "^1.3.1",
     "axios": "^0.24.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -60,11 +60,12 @@
     "ua-parser-js": "^0.7.28",
     "webpack-dev-middleware": "^5.0.0",
     "ws": "^8.2.0",
-    "lodash.clone": "^4.5.0"
+    "lodash.clone": "^4.5.0",
+    "cookie": "^0.4.2"
   },
   "devDependencies": {
     "@scripts/build": "0.0.0",
-    "@modern-js/types": "^1.2.1",
+    "@modern-js/types": "^1.3.2",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",
@@ -79,6 +80,7 @@
     "@types/webpack-dev-middleware": "^5.0.2",
     "@types/ws": "^7.4.7",
     "@types/lodash.clone": "^4",
+    "@types/cookie": "^0.4.1",
     "typescript": "^4",
     "webpack": "^5.54.0",
     "node-mocks-http": "^1.11.0",
@@ -98,8 +100,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/context.test.ts

@@ -14,6 +14,7 @@ describe('test server context', () => {
       method: 'GET',
     });
     const res = httpMocks.createResponse({ eventEmitter: EventEmitter });
+    const context = createContext(req, res);
     const {
       method,
       url,
@@ -25,7 +26,7 @@ describe('test server context', () => {
       querystring,
       protocol,
       params,
-    } = createContext(req, res);
+    } = context;
 
     expect(method).toBe('GET');
     expect(url).toBe('/pathname?foo=baz');
@@ -37,5 +38,15 @@ describe('test server context', () => {
     expect(querystring).toBe('foo=baz');
     expect(protocol).toBe('http');
     expect(params).toEqual({});
+
+    expect(context.serverData).toEqual({});
+    context.setServerData('foo', {
+      name: 'foo',
+    });
+    expect(context.serverData).toEqual({
+      foo: {
+        name: 'foo',
+      },
+    });
   });
 });