Merge remote-tracking branch 'origin/v3' into next

Author: weareoutman

bricks/e2e/CHANGELOG.md

@@ -3,6 +3,118 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.5.25](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-09-01)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.24](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-08-25)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.23](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-08-04)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.22](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-31)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.21](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-22)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.20](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-19)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.19](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-13)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.18](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-12)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.17](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-09)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.16](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-07)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.15](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-02)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.14](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-02)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.13](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-07-01)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.5.12](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
 ## [0.5.11](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2025-05-29)
 
 **Note:** Version bump only for package @next-bricks/e2e

bricks/e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-bricks/e2e",
-  "version": "0.5.11",
+  "version": "0.5.25",
   "private": true,
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/bricks/e2e",
   "repository": {
@@ -35,17 +35,17 @@
     "build": "cross-env NODE_ENV=production build-next-bricks"
   },
   "dependencies": {
-    "@next-core/element": "^1.2.17",
-    "@next-core/i18n": "^1.0.77",
-    "@next-core/react-element": "^1.0.36",
-    "@next-core/react-runtime": "^1.7.16",
-    "@next-core/runtime": "^1.62.0",
-    "@next-core/types": "^1.15.0",
-    "@next-core/utils": "^1.7.35",
+    "@next-core/element": "^1.2.18",
+    "@next-core/i18n": "^1.0.83",
+    "@next-core/react-element": "^1.0.37",
+    "@next-core/react-runtime": "^1.7.29",
+    "@next-core/runtime": "^1.65.7",
+    "@next-core/types": "^1.17.0",
+    "@next-core/utils": "^1.8.4",
     "react": "0.0.0-experimental-ee8509801-20230117"
   },
   "devDependencies": {
-    "@next-core/build-next-bricks": "^1.23.12",
-    "@next-core/test-next": "^1.1.9"
+    "@next-core/build-next-bricks": "^1.23.14",
+    "@next-core/test-next": "^2.0.0"
   }
 }

cypress/e2e/control-nodes.spec.js

@@ -263,5 +263,29 @@ for (const port of Cypress.env("ports")) {
 
       cy.get("@console.error").should("not.be.called");
     });
+
+    it("should handle nested :if rerender", () => {
+      cy.visit(`${origin}/e2e/nested-if`, {
+        onBeforeLoad(win) {
+          cy.spy(win.console, "error").as("console.error");
+        },
+      });
+
+      cy.expectMainContents([
+        "Click 1Click 2Second button is not clicked",
+        "This should always be shown",
+      ]);
+
+      cy.contains("Click 1").click();
+      cy.expectMainContents([
+        "Click 1Click 2Second button is not clicked",
+        "This should always be shown",
+      ]);
+
+      cy.contains("Click 2").click();
+      cy.expectMainContents(["Click 1Click 2", "This should always be shown"]);
+
+      cy.get("@console.error").should("not.be.called");
+    });
   });
 }

etc/runtime.api.md

@@ -38,11 +38,13 @@ import type { RuntimeSnippet } from '@next-core/types';
 import type { RuntimeStoryboard } from '@next-core/types';
 import type { SiteMode } from '@next-core/types';
 import type { SiteTheme } from '@next-core/types';
+import type { SiteVariant } from '@next-core/types';
 import type { SlotConfOfRoutes } from '@next-core/types';
 import type { StaticMenuConf } from '@next-core/types';
 import type { Storyboard } from '@next-core/types';
 import { StoryboardFunction } from '@next-core/types';
 import { supply } from '@next-core/supply';
+import type { UseProviderContractConf } from '@next-core/types';
 import type { UseProviderResolveConf } from '@next-core/types';
 import type { UseSingleBrickConf } from '@next-core/types';
 
@@ -118,6 +120,7 @@ export interface CreateRootOptions {
     // (undocumented)
     portal?: HTMLElement;
     scope?: "page" | "fragment";
+    supportsUseChildren?: boolean;
     unknownBricks?: "silent" | "throw";
     unsafe_penetrate?: boolean;
 }
@@ -230,6 +233,9 @@ function getRenderId(): string | undefined;
 // @public (undocumented)
 export const getRuntime: () => Runtime;
 
+// @public (undocumented)
+export function getThemeVariant(): SiteVariant;
+
 // Warning: (ae-forgotten-export) The symbol "Kit" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
@@ -491,7 +497,7 @@ export interface RuntimeHooks {
         FLOW_API_PROVIDER: string;
         registerFlowApiProvider(): void;
         isFlowApiProvider(provider: string): boolean;
-        getArgsOfFlowApi(provider: string, originalArgs: unknown[], method?: string, stream?: boolean): Promise<unknown[]>;
+        getArgsOfFlowApi(provider: string, originalArgs: unknown[] | UseProviderContractConf, method?: string, stream?: boolean): Promise<unknown[]>;
         collectContract(contracts: Contract[] | undefined): void;
         collectWidgetContract(contracts: Contract[] | undefined): void;
         clearCollectWidgetContract(): void;
@@ -586,7 +592,7 @@ const symbolForRootRuntimeContext: unique symbol;
 function unmountUseBrick({ rendererContext }: RenderUseBrickResult, mountResult: MountUseBrickResult): void;
 
 // @public (undocumented)
-export function unstable_createRoot(container: HTMLElement | DocumentFragment, { portal: _portal, scope, unknownBricks, unsafe_penetrate, }?: CreateRootOptions): {
+export function unstable_createRoot(container: HTMLElement | DocumentFragment, { portal: _portal, scope, unknownBricks, supportsUseChildren, unsafe_penetrate, }?: CreateRootOptions): {
     render(brick: BrickConf | BrickConf[], { theme, uiVersion, language, context, functions, templates, i18n: i18nData, url, app, }?: RenderOptions): Promise<void>;
     unmount(): void;
 };

mock-micro-apps/e2e/storyboard.yaml

@@ -1040,3 +1040,90 @@ routes:
   #       - path: '${APP.homepage}/initial-rerender/apps/:group?'
   #         exact: true
   #         bricks: []
+
+- path: '${APP.homepage}/nested-if'
+  context:
+  - name: value
+    value: null
+  - name: alwaysFalsy
+    value: <% !!CTX.value %>
+    track: true
+  - name: secondButtonClicked
+    value: false
+  bricks:
+  - brick: div
+    iid: 1
+    children:
+    - brick: p
+      iid: 2
+      children:
+      - brick: button
+        iid: 3
+        properties:
+          textContent: Click 1
+        events:
+          click:
+          - action: context.replace
+            args:
+            - value
+            - false
+      - brick: button
+        iid: 4
+        properties:
+          textContent: Click 2
+        events:
+          click:
+          - action: context.replace
+            args:
+            - secondButtonClicked
+            - true
+    - brick: :if
+      iid: 5
+      dataSource: <%= !CTX.secondButtonClicked %>
+      children:
+      - brick: p
+        iid: 6
+        properties:
+          textContent: Second button is not clicked
+      - brick: :if
+        iid: 7
+        dataSource: <%= CTX.alwaysFalsy %>
+        children:
+        - brick: p
+          iid: 8
+          properties:
+            textContent: This should never be shown
+  - brick: p
+    iid: 9
+    properties:
+      textContent: This should always be shown
+
+- path: '${APP.homepage}/debug'
+  context:
+  - name: debug
+    value: false
+  bricks:
+  - brick: button
+    properties:
+      textContent: Toggle Debug
+    events:
+      click:
+      - action: context.replace
+        args:
+        - debug
+        - <% !CTX.debug %>
+  - brick: e2e.list-by-use-brick
+    properties:
+      data: [1, 2]
+      useBrick:
+      - brick: div
+        children:
+        - brick: div
+          portal: true
+          children:
+          - brick: :if
+            dataSource: <%= CTX.debug %>
+            children:
+            - brick: p
+              properties:
+                textContent: '<% `Debug: ${DATA}` %>'

packages/babel-preset-next/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.26](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @next-core/babel-preset-next
+
+
+
+
+
 ## [1.0.25](https://github.com/easyops-cn/next-core/compare/@next-core/[email protected]...@next-core/[email protected]) (2025-03-13)
 
 **Note:** Version bump only for package @next-core/babel-preset-next

packages/babel-preset-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/babel-preset-next",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "babel preset for brick-next related packages",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/babel-preset-next",
   "license": "GPL-3.0",