@modern-js/server 1.1.5-beta.1 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @modern-js/server
 
+## 1.2.0
+
+### Minor Changes
+
+- 5a4c557e: feat: support bff test
+
+### Patch Changes
+
+- e04914ce: add route types, fix metrics types
+- e04914ce: add route types, fix metrics types
+- Updated dependencies [90eeb72c]
+- Updated dependencies [e04914ce]
+- Updated dependencies [5a4c557e]
+- Updated dependencies [e04914ce]
+- Updated dependencies [ca7dcb32]
+- Updated dependencies [ecb344dc]
+  - @modern-js/core@1.2.0
+  - @modern-js/server-plugin@1.1.3
+  - @modern-js/utils@1.1.5
+
 ## 1.1.4
 
 ### Patch Changes

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

@@ -9,11 +9,7 @@ import { ERROR_DIGEST } from "../../constants";
 export const createRenderHandler = ({
   distDir,
   staticGenerate
-}) => async function render({
-  ctx,
-  route,
-  runner
-}) {
+}) => async function render(ctx, route) {
   if (ctx.resHasHandled()) {
     return null;
   }
@@ -43,7 +39,7 @@ export const createRenderHandler = ({
         bundle: route.bundle,
         template: templateHTML,
         staticGenerate
-      }, runner);
+      });
       return result;
     } catch (err) {
       ctx.error(ERROR_DIGEST.ERENDER, err.stack);

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

@@ -2,7 +2,7 @@ import path from 'path';
 import { SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
 import mime from 'mime-types';
 import cache from "./cache";
-export const render = async (ctx, renderOptions, runner) => {
+export const render = async (ctx, renderOptions) => {
   const {
     bundle,
     distDir,
@@ -27,7 +27,6 @@ export const render = async (ctx, renderOptions, runner) => {
     logger: ctx.logger,
     metrics: ctx.metrics
   };
-  runner.extendSSRContext(context);
 
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
 

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

@@ -313,11 +313,7 @@ export class ModernServer {
   }
 
   async handleWeb(context, route) {
-    return this.routeRenderHandler({
-      ctx: context,
-      route,
-      runner: this.runner
-    });
+    return this.routeRenderHandler(context, route);
   }
 
   verifyMatch(_c, _m) {// empty
@@ -559,11 +555,7 @@ export class ModernServer {
 
       if (entryName === status.toString() || entryName === '_error') {
         try {
-          const file = await this.routeRenderHandler({
-            route,
-            ctx: context,
-            runner: this.runner
-          });
+          const file = await this.routeRenderHandler(context, route);
 
           if (file) {
             context.res.end(file.content);

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

@@ -30,11 +30,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const createRenderHandler = ({
   distDir,
   staticGenerate
-}) => async function render({
-  ctx,
-  route,
-  runner
-}) {
+}) => async function render(ctx, route) {
   if (ctx.resHasHandled()) {
     return null;
   }
@@ -67,7 +63,7 @@ const createRenderHandler = ({
         bundle: route.bundle,
         template: templateHTML,
         staticGenerate
-      }, runner);
+      });
       return result;
     } catch (err) {
       ctx.error(_constants.ERROR_DIGEST.ERENDER, err.stack);

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

@@ -15,7 +15,7 @@ var _cache = _interopRequireDefault(require("./cache"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const render = async (ctx, renderOptions, runner) => {
+const render = async (ctx, renderOptions) => {
   const {
     bundle,
     distDir,
@@ -42,7 +42,6 @@ const render = async (ctx, renderOptions, runner) => {
     logger: ctx.logger,
     metrics: ctx.metrics
   };
-  runner.extendSSRContext(context);
 
   const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];
 

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

@@ -348,11 +348,7 @@ class ModernServer {
   }
 
   async handleWeb(context, route) {
-    return this.routeRenderHandler({
-      ctx: context,
-      route,
-      runner: this.runner
-    });
+    return this.routeRenderHandler(context, route);
   }
 
   verifyMatch(_c, _m) {// empty
@@ -594,11 +590,7 @@ class ModernServer {
 
       if (entryName === status.toString() || entryName === '_error') {
         try {
-          const file = await this.routeRenderHandler({
-            route,
-            ctx: context,
-            runner: this.runner
-          });
+          const file = await this.routeRenderHandler(context, route);
 
           if (file) {
             context.res.end(file.content);

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

@@ -1,19 +1,10 @@
 import { RenderResult } from '../../type';
 import { ModernRoute } from '../route';
 import { ModernServerContext } from '../context';
-import { ServerHookRunner } from "../../type.d";
 export declare const createRenderHandler: ({
   distDir,
   staticGenerate
 }: {
   distDir: string;
   staticGenerate: boolean;
-}) => ({
-  ctx,
-  route,
-  runner
-}: {
-  ctx: ModernServerContext;
-  route: ModernRoute;
-  runner: ServerHookRunner;
-}) => Promise<RenderResult | null>;
+}) => (ctx: ModernServerContext, route: ModernRoute) => Promise<RenderResult | null>;

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

@@ -1,10 +1,9 @@
 import { ModernServerContext } from '../context';
 import { RenderResult } from '../../type';
-import { ServerHookRunner } from "../../type.d";
 export declare const render: (ctx: ModernServerContext, renderOptions: {
   distDir: string;
   bundle: string;
   template: string;
   entryName: string;
   staticGenerate: boolean;
-}, runner: ServerHookRunner) => Promise<RenderResult>;
+}) => Promise<RenderResult>;

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

@@ -1,5 +1,7 @@
+/// <reference types="node" />
 /// <reference types="react" />
-import { BaseSSRServerContext } from '@modern-js/types/server';
+import { IncomingHttpHeaders } from 'http';
+import { Metrics, Logger } from '../../type';
 declare type MetaKeyMap = {
   header?: string[];
   query?: string[];
@@ -22,7 +24,24 @@ export declare enum RenderLevel {
   SERVER_PREFETCH = 1,
   SERVER_RENDER = 2,
 }
-export declare type SSRServerContext = BaseSSRServerContext & {
+export declare type SSRServerContext = {
+  request: {
+    params: Record<string, string>;
+    pathname: string;
+    query: Record<string, string>;
+    headers: IncomingHttpHeaders;
+    cookie?: string;
+  };
+  redirection: {
+    url?: string;
+    status?: number;
+  };
+  distDir: string;
+  template: string;
+  entryName: string;
+  logger: Logger;
+  metrics?: Metrics;
+  loadableManifest?: string;
   cacheConfig?: CacheConfig;
   staticGenerate?: boolean;
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.5-beta.1",
+  "version": "1.2.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -33,12 +33,12 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.1.4",
+    "@modern-js/core": "^1.2.0",
     "@modern-js/hmr-client": "^1.1.1",
-    "@modern-js/server-plugin": "^1.1.2",
+    "@modern-js/server-plugin": "^1.1.3",
     "@modern-js/server-utils": "^1.1.2",
     "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/utils": "^1.1.4",
+    "@modern-js/utils": "^1.1.5",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@modern-js/module-tools": "^1.1.2",
     "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/types": "^1.1.3",
+    "@modern-js/types": "^1.1.4",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",
@@ -98,5 +98,6 @@
     "build": "modern build",
     "dev": "modern build --watch",
     "test": "modern test --passWithNoTests"
-  }
+  },
+  "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/src/libs/render/index.ts

@@ -9,7 +9,6 @@ import { readFile } from './reader';
 import * as ssr from './ssr';
 import { supportModern, getModernEntry } from './modern';
 import { ERROR_DIGEST } from '@/constants';
-import { ServerHookRunner } from '@/type';
 
 export const createRenderHandler = ({
   distDir,
@@ -18,15 +17,10 @@ export const createRenderHandler = ({
   distDir: string;
   staticGenerate: boolean;
 }) =>
-  async function render({
-    ctx,
-    route,
-    runner,
-  }: {
-    ctx: ModernServerContext;
-    route: ModernRoute;
-    runner: ServerHookRunner;
-  }): Promise<RenderResult | null> {
+  async function render(
+    ctx: ModernServerContext,
+    route: ModernRoute,
+  ): Promise<RenderResult | null> {
     if (ctx.resHasHandled()) {
       return null;
     }
@@ -49,17 +43,13 @@ export const createRenderHandler = ({
     // handles ssr first
     if (route.isSSR) {
       try {
-        const result = await ssr.render(
-          ctx,
-          {
-            distDir,
-            entryName: route.entryName,
-            bundle: route.bundle,
-            template: templateHTML,
-            staticGenerate,
-          },
-          runner,
-        );
+        const result = await ssr.render(ctx, {
+          distDir,
+          entryName: route.entryName,
+          bundle: route.bundle,
+          template: templateHTML,
+          staticGenerate,
+        });
         return result;
       } catch (err) {
         ctx.error(ERROR_DIGEST.ERENDER, (err as Error).stack);

package/src/libs/render/ssr.ts

@@ -5,7 +5,6 @@ import { ModernServerContext } from '../context';
 import { RenderResult } from '../../type';
 import cache from './cache';
 import { SSRServerContext } from './type';
-import { ServerHookRunner } from '@/type';
 
 export const render = async (
   ctx: ModernServerContext,
@@ -16,7 +15,6 @@ export const render = async (
     entryName: string;
     staticGenerate: boolean;
   },
-  runner: ServerHookRunner,
 ): Promise<RenderResult> => {
   const { bundle, distDir, template, entryName, staticGenerate } =
     renderOptions;
@@ -39,8 +37,6 @@ export const render = async (
     metrics: ctx.metrics,
   };
 
-  runner.extendSSRContext(context);
-
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
 
   const html = await cache(serverRender, ctx)(context);

package/src/libs/render/type.ts

@@ -1,5 +1,4 @@
 import { IncomingHttpHeaders } from 'http';
-import { BaseSSRServerContext } from '@modern-js/types/server';
 import { Metrics, Logger } from '../../type';
 
 type MetaKeyMap = {
@@ -27,7 +26,21 @@ export enum RenderLevel {
   SERVER_RENDER,
 }
 
-export type SSRServerContext = BaseSSRServerContext & {
+export type SSRServerContext = {
+  request: {
+    params: Record<string, string>;
+    pathname: string;
+    query: Record<string, string>;
+    headers: IncomingHttpHeaders;
+    cookie?: string;
+  };
+  redirection: { url?: string; status?: number };
+  distDir: string;
+  template: string;
+  entryName: string;
+  logger: Logger;
+  metrics?: Metrics;
+  loadableManifest?: string;
   cacheConfig?: CacheConfig;
   staticGenerate?: boolean;
 };

package/src/server/modern-server.ts

@@ -356,11 +356,7 @@ export class ModernServer {
   }
 
   protected async handleWeb(context: ModernServerContext, route: ModernRoute) {
-    return this.routeRenderHandler({
-      ctx: context,
-      route,
-      runner: this.runner,
-    });
+    return this.routeRenderHandler(context, route);
   }
 
   protected verifyMatch(_c: ModernServerContext, _m: RouteMatcher) {
@@ -584,11 +580,7 @@ export class ModernServer {
       // check entryName, aviod matched '/' route
       if (entryName === status.toString() || entryName === '_error') {
         try {
-          const file = await this.routeRenderHandler({
-            route,
-            ctx: context,
-            runner: this.runner,
-          });
+          const file = await this.routeRenderHandler(context, route);
           if (file) {
             context.res.end(file.content);
             return;