@modern-js/runtime 2.40.0 → 2.42.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/core/loader/loaderManager.js +7 -7
- package/dist/cjs/document/DocumentStructureContext.js +2 -1
- package/dist/cjs/document/Head.js +7 -5
- package/dist/cjs/document/Html.js +2 -0
- package/dist/cjs/document/Title.js +34 -0
- package/dist/cjs/document/cli/index.js +5 -1
- package/dist/cjs/document/constants.js +3 -0
- package/dist/cjs/router/runtime/index.js +6 -2
- package/dist/cjs/router/runtime/plugin.js +2 -2
- package/dist/cjs/router/runtime/{shouldRevalidate.js → routeModule.js} +19 -5
- package/dist/cjs/ssr/index.js +3 -3
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js +3 -3
- package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js +3 -3
- package/dist/cjs/ssr/serverRender/renderToString/entry.js +3 -2
- package/dist/cjs/ssr/serverRender/renderToString/loadable.js +2 -2
- package/dist/cjs/ssr/serverRender/tracker.js +18 -15
- package/dist/esm/core/loader/loaderManager.js +7 -7
- package/dist/esm/document/DocumentStructureContext.js +2 -1
- package/dist/esm/document/Head.js +7 -5
- package/dist/esm/document/Html.js +2 -0
- package/dist/esm/document/Title.js +10 -0
- package/dist/esm/document/cli/index.js +9 -3
- package/dist/esm/document/constants.js +2 -0
- package/dist/esm/router/runtime/index.js +3 -1
- package/dist/esm/router/runtime/plugin.js +1 -1
- package/dist/esm/router/runtime/{shouldRevalidate.js → routeModule.js} +13 -1
- package/dist/esm/ssr/cli/babel-plugin-ssr-loader-id.js +3 -3
- package/dist/esm/ssr/index.js +1 -1
- package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js +6 -6
- package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js +14 -14
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.js +3 -3
- package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js +3 -3
- package/dist/esm/ssr/serverRender/renderToString/entry.js +2 -1
- package/dist/esm/ssr/serverRender/renderToString/loadable.js +2 -2
- package/dist/esm/ssr/serverRender/tracker.js +18 -15
- package/dist/esm-node/core/loader/loaderManager.js +7 -7
- package/dist/esm-node/document/DocumentStructureContext.js +2 -1
- package/dist/esm-node/document/Head.js +7 -5
- package/dist/esm-node/document/Html.js +2 -0
- package/dist/esm-node/document/Title.js +10 -0
- package/dist/esm-node/document/cli/index.js +6 -2
- package/dist/esm-node/document/constants.js +2 -0
- package/dist/esm-node/router/runtime/index.js +3 -1
- package/dist/esm-node/router/runtime/plugin.js +1 -1
- package/dist/esm-node/router/runtime/{shouldRevalidate.js → routeModule.js} +13 -1
- package/dist/esm-node/ssr/index.js +1 -1
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js +3 -3
- package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js +3 -3
- package/dist/esm-node/ssr/serverRender/renderToString/entry.js +3 -2
- package/dist/esm-node/ssr/serverRender/renderToString/loadable.js +2 -2
- package/dist/esm-node/ssr/serverRender/tracker.js +18 -15
- package/dist/types/cli/index.d.ts +1 -1
- package/dist/types/common.d.ts +3 -3
- package/dist/types/config.d.ts +5 -5
- package/dist/types/core/appConfig.d.ts +1 -1
- package/dist/types/core/compatible.d.ts +8 -11
- package/dist/types/core/index.d.ts +1 -1
- package/dist/types/core/loader/index.d.ts +1 -1
- package/dist/types/core/loader/loaderManager.d.ts +38 -38
- package/dist/types/core/loader/useLoader.d.ts +31 -31
- package/dist/types/core/plugin.d.ts +178 -177
- package/dist/types/core/types.d.ts +12 -12
- package/dist/types/document/Body.d.ts +2 -2
- package/dist/types/document/Comment.d.ts +3 -3
- package/dist/types/document/DocumentContext.d.ts +9 -9
- package/dist/types/document/DocumentStructureContext.d.ts +8 -7
- package/dist/types/document/Head.d.ts +2 -2
- package/dist/types/document/Html.d.ts +2 -2
- package/dist/types/document/Links.d.ts +1 -1
- package/dist/types/document/Root.d.ts +4 -4
- package/dist/types/document/Script.d.ts +2 -2
- package/dist/types/document/Scripts.d.ts +1 -1
- package/dist/types/document/Style.d.ts +3 -3
- package/dist/types/document/Title.d.ts +2 -0
- package/dist/types/document/cli/index.d.ts +1 -1
- package/dist/types/document/constants.d.ts +3 -2
- package/dist/types/document/index.d.ts +1 -1
- package/dist/types/exports/head.d.ts +1 -1
- package/dist/types/exports/loadable.d.ts +1 -1
- package/dist/types/exports/server.d.ts +9 -17
- package/dist/types/exports/styled.d.ts +1 -1
- package/dist/types/index.d.ts +3 -3
- package/dist/types/router/cli/index.d.ts +1 -1
- package/dist/types/router/index.d.ts +1 -1
- package/dist/types/router/runtime/DefaultNotFound.d.ts +1 -1
- package/dist/types/router/runtime/DeferredDataScripts.d.ts +1 -1
- package/dist/types/router/runtime/DeferredDataScripts.node.d.ts +2 -2
- package/dist/types/router/runtime/PrefetchLink.d.ts +3 -3
- package/dist/types/router/runtime/fetch.d.ts +1 -1
- package/dist/types/router/runtime/fetch.node.d.ts +1 -1
- package/dist/types/router/runtime/fetch.worker.d.ts +1 -1
- package/dist/types/router/runtime/hooks.d.ts +1 -1
- package/dist/types/router/runtime/index.d.ts +3 -3
- package/dist/types/router/runtime/plugin.d.ts +1 -7
- package/dist/types/router/runtime/plugin.node.d.ts +2 -6
- package/dist/types/router/runtime/routeModule.d.ts +6 -0
- package/dist/types/router/runtime/server.d.ts +1 -1
- package/dist/types/router/runtime/types.d.ts +41 -41
- package/dist/types/router/runtime/utils.d.ts +11 -21
- package/dist/types/router/runtime/withRouter.d.ts +4 -4
- package/dist/types/runtimeContext.d.ts +26 -26
- package/dist/types/ssr/cli/babel-plugin-ssr-loader-id.d.ts +1 -1
- package/dist/types/ssr/cli/index.d.ts +1 -1
- package/dist/types/ssr/cli/loadable-bundler-plugin.d.ts +1 -1
- package/dist/types/ssr/index.d.ts +5 -5
- package/dist/types/ssr/index.node.d.ts +1 -1
- package/dist/types/ssr/prefetch.d.ts +9 -9
- package/dist/types/ssr/react/index.d.ts +1 -1
- package/dist/types/ssr/react/nossr/index.d.ts +3 -3
- package/dist/types/ssr/react/prerender/index.d.ts +1 -1
- package/dist/types/ssr/react/prerender/type.d.ts +17 -17
- package/dist/types/ssr/react/prerender/util.d.ts +1 -1
- package/dist/types/ssr/react/withCallback/index.d.ts +3 -3
- package/dist/types/ssr/serverRender/helmet.d.ts +1 -1
- package/dist/types/ssr/serverRender/index.d.ts +1 -1
- package/dist/types/ssr/serverRender/renderToStream/buildTemplate.after.d.ts +3 -3
- package/dist/types/ssr/serverRender/renderToStream/buildTemplate.share.d.ts +1 -1
- package/dist/types/ssr/serverRender/renderToStream/bulidTemplate.before.d.ts +1 -1
- package/dist/types/ssr/serverRender/renderToStream/index.d.ts +1 -4
- package/dist/types/ssr/serverRender/renderToStream/renderToPipe.d.ts +1 -1
- package/dist/types/ssr/serverRender/renderToStream/renderToPipe.worker.d.ts +1 -1
- package/dist/types/ssr/serverRender/renderToStream/template.d.ts +3 -3
- package/dist/types/ssr/serverRender/renderToString/buildHtml.d.ts +1 -1
- package/dist/types/ssr/serverRender/renderToString/entry.d.ts +19 -19
- package/dist/types/ssr/serverRender/renderToString/index.d.ts +1 -5
- package/dist/types/ssr/serverRender/renderToString/loadable.d.ts +18 -18
- package/dist/types/ssr/serverRender/renderToString/render.d.ts +8 -8
- package/dist/types/ssr/serverRender/renderToString/styledComponent.d.ts +7 -7
- package/dist/types/ssr/serverRender/renderToString/type.d.ts +10 -10
- package/dist/types/ssr/serverRender/tracker.d.ts +14 -19
- package/dist/types/ssr/serverRender/types.d.ts +17 -17
- package/dist/types/ssr/serverRender/utils.d.ts +1 -1
- package/dist/types/ssr/utils.d.ts +4 -4
- package/dist/types/state/cli/index.d.ts +1 -1
- package/dist/types/state/index.d.ts +1 -1
- package/dist/types/state/plugins.d.ts +1 -1
- package/dist/types/state/runtime/index.d.ts +1 -1
- package/dist/types/state/runtime/plugin.d.ts +3 -3
- package/package.json +11 -11
- package/dist/types/router/runtime/shouldRevalidate.d.ts +0 -2
|
@@ -3,25 +3,25 @@ import { SSRPluginConfig } from '../types';
|
|
|
3
3
|
import { RenderResult } from './type';
|
|
4
4
|
import type { Collector } from './render';
|
|
5
5
|
declare class LoadableCollector implements Collector {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
6
|
+
private options;
|
|
7
|
+
private extractor?;
|
|
8
|
+
constructor(options: LoadableCollectorOptions);
|
|
9
|
+
private get existsAssets();
|
|
10
|
+
collect(comopnent: ReactElement): ReactElement;
|
|
11
|
+
effect(): Promise<void>;
|
|
12
|
+
private emitLoadableScripts;
|
|
13
|
+
private emitScriptAssets;
|
|
14
|
+
private emitStyleAssets;
|
|
15
|
+
private generateAttributes;
|
|
16
16
|
}
|
|
17
17
|
export interface LoadableCollectorOptions {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
nonce?: string;
|
|
19
|
+
stats?: Record<string, any>;
|
|
20
|
+
routeManifest?: Record<string, any>;
|
|
21
|
+
template: string;
|
|
22
|
+
config: SSRPluginConfig;
|
|
23
|
+
entryName: string;
|
|
24
|
+
result: RenderResult;
|
|
25
25
|
}
|
|
26
26
|
export declare function createLoadableCollector(options: LoadableCollectorOptions): LoadableCollector;
|
|
27
|
-
export {};
|
|
27
|
+
export {};
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import type { ReactElement } from 'react';
|
|
2
2
|
export interface Collector {
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
collect: (comopnent: ReactElement) => ReactElement;
|
|
4
|
+
effect: () => void | Promise<void>;
|
|
5
5
|
}
|
|
6
6
|
declare class Render {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
7
|
+
private App;
|
|
8
|
+
private collectors;
|
|
9
|
+
constructor(App: ReactElement);
|
|
10
|
+
addCollector(collector: Collector): this;
|
|
11
|
+
finish(): Promise<string>;
|
|
12
12
|
}
|
|
13
13
|
export declare function createRender(App: ReactElement): Render;
|
|
14
|
-
export {};
|
|
14
|
+
export {};
|
|
@@ -3,13 +3,13 @@ import { ReactElement } from 'react';
|
|
|
3
3
|
import type { RenderResult } from './type';
|
|
4
4
|
import type { Collector } from './render';
|
|
5
5
|
declare class StyledCollector implements Collector {
|
|
6
|
-
sheet: ServerStyleSheet;
|
|
7
|
-
result: RenderResult;
|
|
8
|
-
constructor(result: RenderResult);
|
|
9
|
-
collect(comopnent: ReactElement): ReactElement<{
|
|
10
6
|
sheet: ServerStyleSheet;
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
result: RenderResult;
|
|
8
|
+
constructor(result: RenderResult);
|
|
9
|
+
collect(comopnent: ReactElement): ReactElement<{
|
|
10
|
+
sheet: ServerStyleSheet;
|
|
11
|
+
}, string | import("react").JSXElementConstructor<any>>;
|
|
12
|
+
effect(): void;
|
|
13
13
|
}
|
|
14
14
|
export declare function createStyledCollector(result: RenderResult): StyledCollector;
|
|
15
|
-
export {};
|
|
15
|
+
export {};
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
export declare enum RenderLevel {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
CLIENT_RENDER = 0,
|
|
3
|
+
SERVER_PREFETCH = 1,
|
|
4
|
+
SERVER_RENDER = 2
|
|
5
5
|
}
|
|
6
6
|
export type RenderResult = {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
};
|
|
7
|
+
renderLevel: RenderLevel;
|
|
8
|
+
html?: string;
|
|
9
|
+
chunksMap: {
|
|
10
|
+
js: string;
|
|
11
|
+
css: string;
|
|
12
|
+
};
|
|
13
|
+
};
|
|
@@ -1,25 +1,20 @@
|
|
|
1
1
|
import type { BaseSSRServerContext } from '@modern-js/types';
|
|
2
2
|
export type SSRTracker = ReturnType<typeof createSSRTracker>;
|
|
3
3
|
export declare enum SSRTimings {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
PRERENDER = 0,
|
|
5
|
+
RENDER_HTML = 1,
|
|
6
|
+
RENDER_SHELL = 2,
|
|
7
|
+
USE_LOADER = 3
|
|
8
8
|
}
|
|
9
9
|
export declare enum SSRErrors {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
PRERENDER = 0,
|
|
11
|
+
USE_LOADER = 1,
|
|
12
|
+
RENDER_HTML = 2,
|
|
13
|
+
RENDER_STREAM = 3,
|
|
14
|
+
RENDER_SHELL = 4
|
|
15
15
|
}
|
|
16
|
-
export declare function createSSRTracker({
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
}: BaseSSRServerContext): {
|
|
22
|
-
readonly sessionId: string | undefined;
|
|
23
|
-
trackError(key: SSRErrors, e: Error): void;
|
|
24
|
-
trackTiming(key: SSRTimings, cost: number): void;
|
|
25
|
-
};
|
|
16
|
+
export declare function createSSRTracker({ reporter, serverTiming, metrics, logger, }: BaseSSRServerContext): {
|
|
17
|
+
readonly sessionId: string | undefined;
|
|
18
|
+
trackError(key: SSRErrors, e: Error): void;
|
|
19
|
+
trackTiming(key: SSRTimings, cost: number): void;
|
|
20
|
+
};
|
|
@@ -6,26 +6,26 @@ import { RenderLevel } from './renderToString/type';
|
|
|
6
6
|
import type { BuildHtmlCb } from './renderToString/buildHtml';
|
|
7
7
|
import type { SSRTracker } from './tracker';
|
|
8
8
|
export type SSRServerContext = BaseSSRServerContext & {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
request: BaseSSRServerContext['request'] & {
|
|
10
|
+
userAgent: string;
|
|
11
|
+
cookie: string;
|
|
12
|
+
cookieMap: Record<string, string>;
|
|
13
|
+
};
|
|
14
|
+
htmlModifiers: BuildHtmlCb[];
|
|
15
|
+
tracker: SSRTracker;
|
|
16
16
|
};
|
|
17
17
|
export type ModernSSRReactComponent = React.ComponentType<any>;
|
|
18
18
|
export { RuntimeContext, RenderLevel };
|
|
19
19
|
export type SSRPluginConfig = {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
crossorigin?: boolean | 'anonymous' | 'use-credentials';
|
|
21
|
+
scriptLoading?: 'defer' | 'blocking' | 'module';
|
|
22
|
+
enableInlineStyles?: boolean | RegExp;
|
|
23
|
+
enableInlineScripts?: boolean | RegExp;
|
|
24
|
+
disablePrerender?: boolean;
|
|
25
|
+
chunkLoadingGlobal?: string;
|
|
26
26
|
} & Exclude<ServerUserConfig['ssr'], boolean>;
|
|
27
27
|
export type ServerRenderOptions = {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
};
|
|
28
|
+
App: ModernSSRReactComponent;
|
|
29
|
+
config: SSRPluginConfig;
|
|
30
|
+
context: RuntimeContext;
|
|
31
|
+
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare const CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
|
|
2
2
|
export declare const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
|
|
3
3
|
export declare const ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";
|
|
4
|
-
export declare function attributesToString(attributes: Record<string, any>): string;
|
|
4
|
+
export declare function attributesToString(attributes: Record<string, any>): string;
|
|
@@ -4,7 +4,7 @@ export declare const isReact18: () => boolean;
|
|
|
4
4
|
export declare const formatServer: (request: BaseSSRServerContext['request']) => SSRServerContext['request'];
|
|
5
5
|
export declare const formatClient: (request: BaseSSRServerContext['request']) => SSRServerContext['request'];
|
|
6
6
|
export declare const mockResponse: () => {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
};
|
|
7
|
+
setHeader(): void;
|
|
8
|
+
status(): void;
|
|
9
|
+
readonly locals: {};
|
|
10
|
+
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { default as devtools } from '@modern-js-reduck/plugin-devtools';
|
|
2
2
|
export declare const effects: () => (context: import("@modern-js-reduck/store/dist/types/types/plugin").PluginContext) => import("@modern-js-reduck/store/dist/types/types/plugin").PluginLifeCycle;
|
|
3
3
|
export declare const immer: () => (context: import("@modern-js-reduck/store/dist/types/types/plugin").PluginContext) => import("@modern-js-reduck/store/dist/types/types/plugin").PluginLifeCycle;
|
|
4
|
-
export declare const autoActions: () => (context: import("@modern-js-reduck/store/dist/types/types/plugin").PluginContext) => import("@modern-js-reduck/store/dist/types/types/plugin").PluginLifeCycle;
|
|
4
|
+
export declare const autoActions: () => (context: import("@modern-js-reduck/store/dist/types/types/plugin").PluginContext) => import("@modern-js-reduck/store/dist/types/types/plugin").PluginLifeCycle;
|
|
@@ -2,10 +2,10 @@ import { type Model } from '@modern-js-reduck/store';
|
|
|
2
2
|
import type { Plugin } from '../../core';
|
|
3
3
|
type StatePluginType = 'immer' | 'effects' | 'autoActions' | 'devtools';
|
|
4
4
|
type StateExtraType = {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
initialState: any;
|
|
6
|
+
models: Array<Model>;
|
|
7
7
|
};
|
|
8
8
|
export type StateConfig = Partial<Record<StatePluginType, boolean> & StateExtraType>;
|
|
9
9
|
declare const state: (config: StateConfig) => Plugin;
|
|
10
10
|
export default state;
|
|
11
|
-
export * from '../plugins';
|
|
11
|
+
export * from '../plugins';
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.
|
|
18
|
+
"version": "2.42.0",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=14.17.6"
|
|
21
21
|
},
|
|
@@ -170,11 +170,11 @@
|
|
|
170
170
|
"react-is": "^18",
|
|
171
171
|
"react-side-effect": "^2.1.1",
|
|
172
172
|
"styled-components": "^5.3.1",
|
|
173
|
-
"@swc/helpers": "0.5.
|
|
174
|
-
"@modern-js/
|
|
175
|
-
"@modern-js/
|
|
176
|
-
"@modern-js/utils": "2.
|
|
177
|
-
"@modern-js/
|
|
173
|
+
"@swc/helpers": "0.5.3",
|
|
174
|
+
"@modern-js/types": "2.42.0",
|
|
175
|
+
"@modern-js/runtime-utils": "2.42.0",
|
|
176
|
+
"@modern-js/utils": "2.42.0",
|
|
177
|
+
"@modern-js/plugin": "2.42.0"
|
|
178
178
|
},
|
|
179
179
|
"peerDependencies": {
|
|
180
180
|
"react": ">=17",
|
|
@@ -195,11 +195,11 @@
|
|
|
195
195
|
"ts-jest": "^29.1.0",
|
|
196
196
|
"typescript": "^5",
|
|
197
197
|
"webpack": "^5.88.1",
|
|
198
|
-
"@modern-js/app-tools": "2.
|
|
199
|
-
"@modern-js/core": "2.
|
|
200
|
-
"@modern-js/server-core": "2.
|
|
201
|
-
"@scripts/
|
|
202
|
-
"@scripts/
|
|
198
|
+
"@modern-js/app-tools": "2.42.0",
|
|
199
|
+
"@modern-js/core": "2.42.0",
|
|
200
|
+
"@modern-js/server-core": "2.42.0",
|
|
201
|
+
"@scripts/jest-config": "2.42.0",
|
|
202
|
+
"@scripts/build": "2.42.0"
|
|
203
203
|
},
|
|
204
204
|
"sideEffects": false,
|
|
205
205
|
"publishConfig": {
|