Skip to content

Commit c447912

Browse files
committed
Merge remote-tracking branch 'origin/v3' into next
2 parents 6cb8dda + e452085 commit c447912

File tree

81 files changed

+1700
-227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1700
-227
lines changed

bricks/e2e/CHANGELOG.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,62 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [0.5.11](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-05-29)
7+
8+
**Note:** Version bump only for package @next-bricks/e2e
9+
10+
11+
12+
13+
14+
## [0.5.10](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-04-30)
15+
16+
**Note:** Version bump only for package @next-bricks/e2e
17+
18+
19+
20+
21+
22+
## [0.5.9](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-04-22)
23+
24+
**Note:** Version bump only for package @next-bricks/e2e
25+
26+
27+
28+
29+
30+
## [0.5.8](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-04-17)
31+
32+
**Note:** Version bump only for package @next-bricks/e2e
33+
34+
35+
36+
37+
38+
## [0.5.7](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-03-27)
39+
40+
**Note:** Version bump only for package @next-bricks/e2e
41+
42+
43+
44+
45+
46+
## [0.5.6](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-03-27)
47+
48+
**Note:** Version bump only for package @next-bricks/e2e
49+
50+
51+
52+
53+
54+
## [0.5.5](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-03-24)
55+
56+
**Note:** Version bump only for package @next-bricks/e2e
57+
58+
59+
60+
61+
662
## [0.5.4](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-03-13)
763

864
**Note:** Version bump only for package @next-bricks/e2e

bricks/e2e/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next-bricks/e2e",
3-
"version": "0.5.4",
3+
"version": "0.5.11",
44
"private": true,
55
"homepage": "https://github.com/easyops-cn/next-core/tree/v3/bricks/e2e",
66
"repository": {
@@ -36,16 +36,16 @@
3636
},
3737
"dependencies": {
3838
"@next-core/element": "^1.2.17",
39-
"@next-core/i18n": "^1.0.74",
39+
"@next-core/i18n": "^1.0.77",
4040
"@next-core/react-element": "^1.0.36",
41-
"@next-core/react-runtime": "^1.7.10",
42-
"@next-core/runtime": "^1.59.3",
43-
"@next-core/types": "^1.14.0",
44-
"@next-core/utils": "^1.7.32",
41+
"@next-core/react-runtime": "^1.7.16",
42+
"@next-core/runtime": "^1.62.0",
43+
"@next-core/types": "^1.15.0",
44+
"@next-core/utils": "^1.7.35",
4545
"react": "0.0.0-experimental-ee8509801-20230117"
4646
},
4747
"devDependencies": {
48-
"@next-core/build-next-bricks": "^1.23.11",
48+
"@next-core/build-next-bricks": "^1.23.12",
4949
"@next-core/test-next": "^1.1.9"
5050
}
5151
}

etc/runtime.api.md

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ declare namespace __secret_internals {
5151
renderUseBrick,
5252
mountUseBrick,
5353
unmountUseBrick,
54-
legacyDoTransform,
5554
updateStoryboard,
5655
updateStoryboardByRoute,
5756
updateStoryboardByTemplate,
@@ -74,7 +73,10 @@ declare namespace __secret_internals {
7473
MountUseBrickResult,
7574
updateSnippetPreviewSettings,
7675
setRealTimeDataInspectRoot,
77-
addRealTimeDataInspectHook
76+
addRealTimeDataInspectHook,
77+
legacyDoTransform,
78+
legacyTransformProperties,
79+
legacyTransformIntermediateData
7880
}
7981
}
8082
export { __secret_internals }
@@ -117,6 +119,7 @@ export interface CreateRootOptions {
117119
portal?: HTMLElement;
118120
scope?: "page" | "fragment";
119121
unknownBricks?: "silent" | "throw";
122+
unsafe_penetrate?: boolean;
120123
}
121124

122125
// Warning: (ae-forgotten-export) The symbol "Runtime" needs to be exported by the entry point index.d.ts
@@ -259,6 +262,31 @@ export function isUnauthenticatedError(error: unknown): boolean;
259262
// @public
260263
function legacyDoTransform(data: unknown, to: unknown, options?: unknown): unknown;
261264

265+
// @public (undocumented)
266+
export type LegacyGeneralTransform = string | LegacyTransformMap | LegacyTransformItem[] | null | undefined;
267+
268+
// @public
269+
function legacyTransformIntermediateData(data: unknown, to: LegacyGeneralTransform, from?: string | string[], mapArray?: boolean | "auto"): unknown;
270+
271+
// @public (undocumented)
272+
export interface LegacyTransformItem {
273+
// (undocumented)
274+
from?: string | string[];
275+
// (undocumented)
276+
mapArray?: boolean | "auto";
277+
// (undocumented)
278+
to: string | LegacyTransformMap;
279+
}
280+
281+
// @public (undocumented)
282+
export interface LegacyTransformMap {
283+
// (undocumented)
284+
[propName: string]: unknown;
285+
}
286+
287+
// @public
288+
function legacyTransformProperties(props: Record<string, unknown>, data: unknown, to: LegacyGeneralTransform, from?: string | string[], mapArray?: boolean | "auto", options?: unknown): Record<string, unknown>;
289+
262290
// @public
263291
function loadBricks(bricks: string[]): Promise<void>;
264292

@@ -431,6 +459,8 @@ interface RuntimeContext extends LegacyCompatibleRuntimeContext {
431459
tplStateStoreMap: Map<string, DataStore<"STATE">>;
432460
// (undocumented)
433461
tplStateStoreScope?: DataStore<"STATE">[];
462+
// (undocumented)
463+
unsafe_penetrate?: boolean;
434464
}
435465

436466
// @public (undocumented)
@@ -441,6 +471,7 @@ export interface RuntimeHooks {
441471
isLoggedIn(): boolean;
442472
authenticate?(...args: unknown[]): unknown;
443473
logout?(...args: unknown[]): unknown;
474+
addPathToBlackList?(path: string): void;
444475
isBlockedPath?(pathname: string): boolean;
445476
};
446477
// (undocumented)
@@ -555,7 +586,7 @@ const symbolForRootRuntimeContext: unique symbol;
555586
function unmountUseBrick({ rendererContext }: RenderUseBrickResult, mountResult: MountUseBrickResult): void;
556587

557588
// @public (undocumented)
558-
export function unstable_createRoot(container: HTMLElement | DocumentFragment, { portal: _portal, scope, unknownBricks }?: CreateRootOptions): {
589+
export function unstable_createRoot(container: HTMLElement | DocumentFragment, { portal: _portal, scope, unknownBricks, unsafe_penetrate, }?: CreateRootOptions): {
559590
render(brick: BrickConf | BrickConf[], { theme, uiVersion, language, context, functions, templates, i18n: i18nData, url, app, }?: RenderOptions): Promise<void>;
560591
unmount(): void;
561592
};
@@ -587,7 +618,7 @@ function updateTemplatePreviewSettings(appId: string, templateId: string, settin
587618
// dist/types/Dialog.d.ts:10:5 - (ae-forgotten-export) The symbol "show_2" needs to be exported by the entry point index.d.ts
588619
// dist/types/Notification.d.ts:8:5 - (ae-forgotten-export) The symbol "show" needs to be exported by the entry point index.d.ts
589620
// dist/types/StoryboardFunctionRegistry.d.ts:48:5 - (ae-forgotten-export) The symbol "FunctionCoverageSettings" needs to be exported by the entry point index.d.ts
590-
// dist/types/internal/Runtime.d.ts:35:9 - (ae-forgotten-export) The symbol "AppForCheck" needs to be exported by the entry point index.d.ts
621+
// dist/types/internal/Runtime.d.ts:36:9 - (ae-forgotten-export) The symbol "AppForCheck" needs to be exported by the entry point index.d.ts
591622

592623
// (No @packageDocumentation comment for this package)
593624

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,6 @@
7979
"@types/react": "^18.3.23",
8080
"lodash": "^4.17.21",
8181
"moment": "^2.30.1"
82-
}
82+
},
83+
"packageManager": "[email protected]+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
8384
}

packages/brick-container/CHANGELOG.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,68 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.21.0](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-05-29)
7+
8+
9+
### Features
10+
11+
* **Router:** Add support for blacklist in app runtime data ([1158c96](https://github.com/easyops-cn/next-core/commit/1158c961308537b9cc78b5200cabb9e62e8de64f))
12+
13+
14+
15+
16+
17+
## [3.20.14](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-04-30)
18+
19+
20+
### Bug Fixes
21+
22+
* fix cookie same site issue ([96c20c7](https://github.com/easyops-cn/next-core/commit/96c20c7d8d919b13a58f99990a904cedf2fba203))
23+
24+
25+
26+
27+
28+
## [3.20.13](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-04-22)
29+
30+
**Note:** Version bump only for package @next-core/brick-container
31+
32+
33+
34+
35+
36+
## [3.20.12](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-04-17)
37+
38+
**Note:** Version bump only for package @next-core/brick-container
39+
40+
41+
42+
43+
44+
## [3.20.11](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-03-27)
45+
46+
**Note:** Version bump only for package @next-core/brick-container
47+
48+
49+
50+
51+
52+
## [3.20.10](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-03-27)
53+
54+
**Note:** Version bump only for package @next-core/brick-container
55+
56+
57+
58+
59+
60+
## [3.20.9](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-03-24)
61+
62+
**Note:** Version bump only for package @next-core/brick-container
63+
64+
65+
66+
67+
668
## [3.20.8](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-03-13)
769

870
**Note:** Version bump only for package @next-core/brick-container

packages/brick-container/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next-core/brick-container",
3-
"version": "3.20.8",
3+
"version": "3.21.0",
44
"description": "Brick Container Server",
55
"homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/brick-container",
66
"license": "GPL-3.0",
@@ -51,18 +51,18 @@
5151
},
5252
"devDependencies": {
5353
"@next-api-sdk/api-gateway-sdk": "^1.2.2",
54-
"@next-api-sdk/micro-app-standalone-sdk": "^1.1.0",
55-
"@next-core/build-next-bricks": "^1.23.11",
56-
"@next-core/easyops-runtime": "^0.13.4",
54+
"@next-api-sdk/micro-app-standalone-sdk": "^1.3.0",
55+
"@next-core/build-next-bricks": "^1.23.12",
56+
"@next-core/easyops-runtime": "^0.14.0",
5757
"@next-core/http": "^1.2.12",
58-
"@next-core/i18n": "^1.0.74",
58+
"@next-core/i18n": "^1.0.77",
5959
"@next-core/loader": "^1.6.15",
60-
"@next-core/preview": "^0.7.51",
61-
"@next-core/runtime": "^1.59.3",
60+
"@next-core/preview": "^0.7.58",
61+
"@next-core/runtime": "^1.62.0",
6262
"@next-core/test-next": "^1.1.9",
6363
"@next-core/theme": "^1.5.4",
64-
"@next-core/types": "^1.14.0",
65-
"@next-core/utils": "^1.7.32",
64+
"@next-core/types": "^1.15.0",
65+
"@next-core/utils": "^1.7.35",
6666
"broadcast-channel": "^7.0.0",
6767
"copy-webpack-plugin": "^13.0.0",
6868
"core-js": "^3.43.0",

packages/brick-container/serve/getProxy.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,16 @@ export default function getProxy(env, getRawIndexHtml) {
116116
req.path === "/next/api/auth/login/v2" &&
117117
Array.isArray(setCookies)
118118
) {
119-
// - If the server is https, but the local is http, clear the secure cookie flags;
120-
// - Otherwise, if the local is localhost and cookieSameSiteNone is enabled (default),
119+
// - If the local is localhost and cookieSameSiteNone is enabled (default),
121120
// add the secure cookie flags;
122121
// - Otherwise, if the local is https, do nothing;
123122
// - Otherwise, clear the secure cookie flags;
124123
const strategy =
125-
env.server.startsWith("https:") && !env.https
126-
? "clear"
127-
: env.cookieSameSiteNone && env.host === "localhost"
128-
? "add"
129-
: env.https
130-
? null
131-
: "clear";
124+
env.cookieSameSiteNone && env.host === "localhost"
125+
? "add"
126+
: env.https
127+
? null
128+
: "clear";
132129
if (strategy) {
133130
// Note: it seems that now Chrome (v107) requires `SameSite=None` even for localhost.
134131
// However, `Secure` can use used with non-http for localhost.

0 commit comments

Comments
 (0)