@modern-js/server-core 2.4.1-beta.0 → 2.5.0

package/CHANGELOG.md

@@ -1,15 +1,29 @@
 # @modern-js/server-plugin
 
-## 2.4.1-beta.0
+## 2.5.0
 
 ### Patch Changes
 
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 6fca567: feat: support bff handle complete server, include page render
+  feat: 支持 bff 处理整个服务，包括页面渲染
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
 - 11c053b: feat: ssr support deploy worker
 
   feat: ssr 支持边缘部署
 
+- 169c58b: feat: support force csr config
+  feat: 支持强制 CSR 的配置
+- Updated dependencies [89ca6cc]
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
 - Updated dependencies [11c053b]
-  - @modern-js/utils@2.4.1-beta.0
+  - @modern-js/plugin@2.5.0
+  - @modern-js/utils@2.5.0
 
 ## 2.4.0
 

package/dist/{js/node → cjs}/plugin.js

@@ -35,6 +35,7 @@ const preparebeforeRouteHandler = (0, import_plugin.createAsyncPipeline)();
 const prepareWebServer = (0, import_plugin.createAsyncPipeline)();
 const prepareApiServer = (0, import_plugin.createAsyncPipeline)();
 const onApiChange = (0, import_plugin.createWaterfall)();
+const repack = (0, import_plugin.createWaterfall)();
 const beforeDevServer = (0, import_plugin.createParallelWorkflow)();
 const setupCompiler = (0, import_plugin.createParallelWorkflow)();
 const afterDevServer = (0, import_plugin.createParallelWorkflow)();
@@ -74,6 +75,7 @@ const serverHooks = {
   preparebeforeRouteHandler,
   prepareWebServer,
   prepareApiServer,
+  repack,
   onApiChange,
   beforeDevServer,
   setupCompiler,

package/dist/{js/modern → esm}/plugin.js

@@ -13,6 +13,7 @@ const preparebeforeRouteHandler = createAsyncPipeline();
 const prepareWebServer = createAsyncPipeline();
 const prepareApiServer = createAsyncPipeline();
 const onApiChange = createWaterfall();
+const repack = createWaterfall();
 const beforeDevServer = createParallelWorkflow();
 const setupCompiler = createParallelWorkflow();
 const afterDevServer = createParallelWorkflow();
@@ -52,6 +53,7 @@ const serverHooks = {
   preparebeforeRouteHandler,
   prepareWebServer,
   prepareApiServer,
+  repack,
   onApiChange,
   beforeDevServer,
   setupCompiler,

package/dist/types/plugin.d.ts

@@ -3,8 +3,7 @@ import { IncomingMessage, ServerResponse } from 'http';
 import type { Component } from 'react';
 import { CommonAPI, ToThreads, AsyncSetup, PluginOptions } from '@modern-js/plugin';
 import type { ModernServerContext, BaseSSRServerContext, AfterMatchContext, AfterRenderContext, MiddlewareContext, ISAppContext, ServerRoute } from '@modern-js/types';
-import type { Options } from 'http-proxy-middleware';
-import type { ServerOptions, UserConfig } from './types/config';
+import type { BffUserConfig, ServerOptions, UserConfig } from './types/config';
 export type WebAdapter = (ctx: MiddlewareContext) => void | Promise<void>;
 export type Adapter = (req: IncomingMessage, res: ServerResponse) => void | Promise<void>;
 export type WebServerStartInput = {
@@ -18,6 +17,7 @@ export type APIServerStartInput = {
   config?: {
     middleware?: Array<any>;
   };
+  render?: (req: IncomingMessage, res: ServerResponse, url?: string) => Promise<string | null>;
 };
 type Change = {
   filename: string;
@@ -60,6 +60,7 @@ declare const serverHooks: {
   }, BeforeRouteHandler>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
+  repack: import("@modern-js/plugin").Waterfall<void>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
   setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
@@ -122,6 +123,7 @@ export declare const createServerManager: () => import("@modern-js/plugin").Asyn
   }, BeforeRouteHandler>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
+  repack: import("@modern-js/plugin").Waterfall<void>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
   setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
@@ -179,6 +181,7 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
   }, BeforeRouteHandler>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
+  repack: import("@modern-js/plugin").Waterfall<void>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
   setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
@@ -227,9 +230,7 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
 
 export type ServerPlugin = PluginOptions<ServerHooks, AsyncSetup<ServerHooks, PluginAPI>>;
 export type ServerConfig = {
-  bff?: Partial<{
-    proxy: Record<string, Options>;
-  }>;
+  bff?: BffUserConfig;
   plugins?: ServerPlugin[];
 };
 export declare const createPlugin: (setup?: AsyncSetup<{
@@ -245,6 +246,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   }, BeforeRouteHandler>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
+  repack: import("@modern-js/plugin").Waterfall<void>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
   setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
@@ -301,6 +303,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   }, BeforeRouteHandler>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
+  repack: import("@modern-js/plugin").Waterfall<void>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
   setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
@@ -353,6 +356,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   }, BeforeRouteHandler>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
+  repack: import("@modern-js/plugin").Waterfall<void>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
   setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
@@ -409,6 +413,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   }, BeforeRouteHandler>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
+  repack: import("@modern-js/plugin").Waterfall<void>;
   onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
   beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<ServerOptions, any>;
   setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;

package/dist/types/types/config/bff.d.ts

@@ -1,5 +1,7 @@
+import type { Options } from 'http-proxy-middleware';
 export interface BffUserConfig {
   prefix?: string;
-  proxy?: Record<string, string>;
+  proxy?: Record<string, Options>;
+  enableHandleWeb?: boolean;
 }
 export type BffNormalizedConfig = BffUserConfig;

package/dist/types/types/config/server.d.ts

@@ -6,6 +6,7 @@ type Route = string | string[] | {
 };
 export type Routes = Record<string, Route>;
 export type SSR = boolean | {
+  forceCSR?: boolean;
   mode?: 'string' | 'stream';
 };
 export type SSRByEntries = Record<string, SSR>;

package/package.json

@@ -11,26 +11,25 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm/index.js",
+        "require": "./dist/cjs/index.js"
       },
       "types": "./dist/types/index.d.ts",
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/index.js"
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "2.4.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/plugin": "2.5.0",
+    "@modern-js/utils": "2.5.0"
   },
   "devDependencies": {
     "@types/jest": "^27",
@@ -39,10 +38,10 @@
     "jest": "^27",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/babel-preset-app": "2.4.1-beta.0",
-    "@scripts/build": "2.4.0",
-    "@scripts/jest-config": "2.4.0"
+    "@modern-js/types": "2.5.0",
+    "@modern-js/babel-preset-app": "2.5.0",
+    "@scripts/jest-config": "2.5.0",
+    "@scripts/build": "2.5.0"
   },
   "sideEffects": false,
   "publishConfig": {