@modern-js/prod-server 2.0.0-beta.7 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @modern-js/prod-server
 
+## 2.0.0
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+
+### Patch Changes
+
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [ffb2ed4]
+- Updated dependencies [bbe4c4ab64]
+  - @modern-js/utils@2.0.0
+  - @modern-js/server-core@2.0.0
+
 ## 2.0.0-beta.7
 
 ### Major Changes

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

@@ -3,15 +3,15 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/Itwx-pHxmgYitwqD7Jzx4/src/type" />
+/// <reference types=".dts-temp/GthP9GiM25QuxdWDnQMoe/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import { URL } from 'url';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';
-export declare type ContextOptions = {
+export type ContextOptions = {
   etag?: boolean;
 };
-declare type ResponseBody = string | Buffer;
+type ResponseBody = string | Buffer;
 export declare class ModernServerContext implements ModernServerContextInterface {
   /**
    * http request

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

@@ -2,7 +2,7 @@
 import { IncomingHttpHeaders } from 'http';
 import { RenderResult } from '../../../type';
 export type { CacheConfig } from '../type';
-export declare type CacheContent = {
+export type CacheContent = {
   level: number;
   includes: {
     header?: string[];
@@ -25,14 +25,14 @@ export interface PageCachesInterface {
   del: (key: string) => void;
   keys: () => string[];
 }
-export declare type PageCache = {
+export type PageCache = {
   html: string;
   expireTime: number;
   limitTime: number | null;
   cacheHash: string;
   size: number;
 };
-export declare type CacheManagerOptions = {
+export type CacheManagerOptions = {
   max: number;
 };
 export interface CacheResult extends RenderResult {
@@ -40,7 +40,7 @@ export interface CacheResult extends RenderResult {
   isGarbage: boolean;
   hash: string;
 }
-export declare type CacheContext = {
+export type CacheContext = {
   entry: string;
   pathname: string;
   query: Record<string, string>;

package/dist/types/libs/render/cache/util.d.ts

@@ -8,11 +8,11 @@ export declare function connectFactor(...args: string[]): string;
 export declare function valueFactory(obj: url.URLSearchParams | IncomingHttpHeaders): ((key: string) => string | null) | ((key: string) => string | undefined);
 export declare function getTime([s, ns]: [number, number]): number;
 export declare function cacheAddition(html: string, hash: string): string;
-declare type CoalescedInvoke<T> = {
+type CoalescedInvoke<T> = {
   isOrigin: boolean;
   value: T;
 };
-declare type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
+type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
 export declare function withCoalescedInvoke<F extends (...args: any[]) => Promise<any>>(func: F): (key: string, args: Parameters<F>) => Promise<CoalescedInvoke<UnwrapPromise<ReturnType<F>>>>;
 export declare function maybeSync(fn: () => Promise<any>): (sync: boolean) => Promise<any>;
 export {};

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

@@ -2,16 +2,16 @@
 /// <reference types="node" />
 import { Writable, Readable } from 'stream';
 import { BaseSSRServerContext } from '@modern-js/types';
-declare type MetaKeyMap = {
+type MetaKeyMap = {
   header?: string[];
   query?: string[];
 };
-declare type MetaKeyMatch = {
+type MetaKeyMatch = {
   header?: MatchMap;
   query?: MatchMap;
 };
-declare type MatchMap = Record<string, Record<string, string>>;
-export declare type CacheConfig = {
+type MatchMap = Record<string, Record<string, string>>;
+export type CacheConfig = {
   interval: number;
   staleLimit: number | boolean;
   level: number;
@@ -24,13 +24,13 @@ export declare enum RenderLevel {
   SERVER_PREFETCH = 1,
   SERVER_RENDER = 2,
 }
-export declare type SSRServerContext = BaseSSRServerContext & {
+export type SSRServerContext = BaseSSRServerContext & {
   cacheConfig?: CacheConfig;
   staticGenerate?: boolean;
 };
-export declare type ModernSSRReactComponent = React.ComponentType<any> & {
+export type ModernSSRReactComponent = React.ComponentType<any> & {
   init: (context: SSRServerContext) => Promise<void>;
   prefetch: (context: SSRServerContext) => Promise<Record<string, any>>;
 };
-export declare type RenderFunction = (context: SSRServerContext) => Promise<string | ((writable: Writable) => Promise<Readable>)>;
+export type RenderFunction = (context: SSRServerContext) => Promise<string | ((writable: Writable) => Promise<Readable>)>;
 export {};

package/dist/types/libs/serve-file.d.ts

@@ -1,7 +1,7 @@
 import { ServerOptions } from '@modern-js/server-core';
 import type { ModernServerContext } from '@modern-js/types';
 import { NextFunction, ModernServerHandler } from '../type';
-declare type Rule = {
+type Rule = {
   path: string | RegExp;
   target: string;
 };

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

@@ -7,7 +7,7 @@ import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, M
 import { RouteMatchManager, ModernRouteInterface, ModernRoute } from '../libs/route';
 import { mergeExtension } from '../utils';
 import * as reader from '../libs/render/reader';
-declare type ModernServerAsyncHandler = (context: ModernServerContext, next: NextFunction) => Promise<void>;
+type ModernServerAsyncHandler = (context: ModernServerContext, next: NextFunction) => Promise<void>;
 export declare class ModernServer implements ModernServerInterface {
   pwd: string;
   distDir: string;
@@ -50,7 +50,7 @@ export declare class ModernServer implements ModernServerInterface {
   }): void;
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void | ServerResponse;
   render(req: IncomingMessage, res: ServerResponse, url?: string): Promise<string | null>;
-  createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server>;
+  createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server<typeof IncomingMessage, typeof ServerResponse>>;
   protected getRoutes(): ServerRoute[];
   protected addHandler(handler: ModernServerHandler): void;
   protected render404(context: ModernServerContext): void;

package/dist/types/type.d.ts

@@ -13,7 +13,7 @@ declare module 'http' {
     metrics: Metrics;
   }
 }
-export declare type ModernServerOptions = {
+export type ModernServerOptions = {
   pwd: string;
   config: ServerOptions;
   plugins?: ServerPlugin[];
@@ -28,25 +28,25 @@ export declare type ModernServerOptions = {
   runMode?: string;
   [propName: string]: any;
 };
-export declare type RenderResult = {
+export type RenderResult = {
   content: string | Buffer;
   contentType: string;
   contentStream?: Readable;
   statusCode?: number;
   redirect?: boolean;
 };
-export declare type ConfWithBFF = {
+export type ConfWithBFF = {
   bff?: {
     prefix: string;
   } & ServerOptions['bff'];
 };
-export declare type Then<T> = T extends PromiseLike<infer U> ? U : T;
-export declare type ServerHookRunner = Then<ReturnType<typeof serverManager.init>>;
-export declare type BuildOptions = {
+export type Then<T> = T extends PromiseLike<infer U> ? U : T;
+export type ServerHookRunner = Then<ReturnType<typeof serverManager.init>>;
+export type BuildOptions = {
   routes?: ModernRouteInterface[];
 };
 export type { Metrics, Logger, NextFunction };
-export declare type HookNames = 'afterMatch' | 'afterRender';
+export type HookNames = 'afterMatch' | 'afterRender';
 export interface ModernServerInterface {
   pwd: string;
   distDir: string;
@@ -56,5 +56,5 @@ export interface ModernServerInterface {
   createHTTPServer: (handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void) => Promise<Server>;
   render: (req: IncomingMessage, res: ServerResponse, url?: string) => Promise<string | null>;
 }
-export declare type ServerConstructor = (options: ModernServerOptions) => ModernServerInterface;
-export declare type ModernServerHandler = (context: ModernServerContext, next: NextFunction) => Promise<void> | void;
+export type ServerConstructor = (options: ModernServerOptions) => ModernServerInterface;
+export type ModernServerHandler = (context: ModernServerContext, next: NextFunction) => Promise<void> | void;

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/Itwx-pHxmgYitwqD7Jzx4/src/type" />
+/// <reference types=".dts-temp/GthP9GiM25QuxdWDnQMoe/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;
@@ -9,7 +9,7 @@ export declare const mergeExtension: (users: any[]) => {
 };
 export declare const noop: () => void;
 export declare const createErrorDocument: (status: number, text: string) => string;
-export declare type CollectMiddlewaresResult = {
+export type CollectMiddlewaresResult = {
   web: any[];
   api: any[];
 };

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

@@ -1,9 +1,9 @@
 import { ModernRouteInterface } from './libs/route';
-export declare type Context = Record<string, any>;
+export type Context = Record<string, any>;
 export interface UrlQuery {
   [key: string]: string;
 }
-export declare type Manifest = {
+export type Manifest = {
   pages: Record<string, // path
   {
     entryName: string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -46,7 +46,6 @@
     }
   },
   "dependencies": {
-    "axios": "^0.24.0",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
     "cookie": "^0.4.2",
@@ -56,8 +55,8 @@
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/utils": "2.0.0-beta.7",
-    "@modern-js/server-core": "2.0.0-beta.7"
+    "@modern-js/utils": "2.0.0",
+    "@modern-js/server-core": "2.0.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -68,14 +67,15 @@
     "@types/etag": "^1.8.1",
     "@types/fresh": "^0.5.0",
     "@types/serve-static": "^1.13.10",
+    "axios": "^1.2.1",
     "jest": "^27",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^4",
-    "@modern-js/types": "2.0.0-beta.7",
-    "@modern-js/server-core": "2.0.0-beta.7",
-    "@scripts/build": "2.0.0-beta.7",
-    "@scripts/jest-config": "2.0.0-beta.7"
+    "@modern-js/types": "2.0.0",
+    "@modern-js/server-core": "2.0.0",
+    "@scripts/build": "2.0.0",
+    "@scripts/jest-config": "2.0.0"
   },
   "sideEffects": false,
   "publishConfig": {