Merge pull request #4430 from easyops-cn/steve/next

Steve/next

Author: weareoutman

.github/workflows/ci.yml

@@ -136,11 +136,16 @@ jobs:
       env:
         NX_REJECT_UNKNOWN_LOCAL_CACHE: '0'
 
+    - name: Get coverage files
+      run: |
+        echo "COVERAGE_FILES=$(find ./packages -maxdepth 1 -mindepth 1 -type d -exec echo "{}/.coverage/cobertura-coverage.xml" \; | tr '\n' ',' | sed 's/,$//')" >> $GITHUB_ENV
+
     - name: Codecov
       uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        files: packages/*/.coverage/cobertura-coverage.xml,bricks/*/.coverage/cobertura-coverage.xml,!.cache/**/*
+        files: ${{ env.COVERAGE_FILES }}
+        disable_search: true
 
     - run: yarn test:e2e:ci
       env:

.npmrc

@@ -2,4 +2,3 @@ registry=https://registry.npmjs.org
 tag-version-prefix=
 access=public
 CYPRESS_INSTALL_BINARY=0
-CYPRESS_DOWNLOAD_MIRROR=http://192.168.110.32:3100

bricks/e2e/CHANGELOG.md

@@ -3,6 +3,174 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.4.39](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-08-19)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.38](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-08-13)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.37](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-08-12)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.36](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-08-09)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.35](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-08-08)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.34](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-08-06)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.33](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-08-06)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.32](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-31)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.31](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-31)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.30](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-29)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.29](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-26)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.28](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-26)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.27](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-25)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.26](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-23)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.25](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-22)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.24](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-19)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.23](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-18)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.22](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-18)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.21](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-15)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.20](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-12)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
+## [0.4.19](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-03)
+
+**Note:** Version bump only for package @next-bricks/e2e
+
+
+
+
+
 ## [0.4.18](https://github.com/easyops-cn/next-core/compare/@next-bricks/[email protected]...@next-bricks/[email protected]) (2024-07-02)
 
 **Note:** Version bump only for package @next-bricks/e2e

bricks/e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-bricks/e2e",
-  "version": "0.4.18",
+  "version": "0.4.39",
   "private": true,
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/bricks/e2e",
   "repository": {
@@ -36,17 +36,17 @@
     "build": "cross-env NODE_ENV=production build-next-bricks"
   },
   "dependencies": {
-    "@next-core/element": "^1.2.10",
-    "@next-core/i18n": "^1.0.57",
-    "@next-core/react-element": "^1.0.29",
-    "@next-core/react-runtime": "^1.6.16",
-    "@next-core/runtime": "^1.49.12",
-    "@next-core/types": "^1.11.2",
-    "@next-core/utils": "^1.7.15",
+    "@next-core/element": "^1.2.11",
+    "@next-core/i18n": "^1.0.63",
+    "@next-core/react-element": "^1.0.30",
+    "@next-core/react-runtime": "^1.6.36",
+    "@next-core/runtime": "^1.54.13",
+    "@next-core/types": "^1.12.2",
+    "@next-core/utils": "^1.7.21",
     "react": "0.0.0-experimental-ee8509801-20230117"
   },
   "devDependencies": {
-    "@next-core/build-next-bricks": "^1.22.3",
-    "@next-core/test-next": "^1.1.4"
+    "@next-core/build-next-bricks": "^1.23.0",
+    "@next-core/test-next": "^1.1.5"
   }
 }

cypress/e2e/sub-routes.spec.js

@@ -56,7 +56,7 @@ for (const port of Cypress.env("ports")) {
       cy.contains("SyntaxError");
       cy.expectMainContents([
         ...fixedContents,
-        'SyntaxError: Unexpected token (1:4), in "<% CTX. %>"',
+        'Oops! Something went wrong: SyntaxError: Unexpected token (1:4), in "<% CTX. %>"',
       ]);
 
       cy.get("@console.error").should("be.called");
@@ -213,5 +213,31 @@ for (const port of Cypress.env("ports")) {
         expect(call6.args[0]).to.equal("Mounted App");
       });
     });
+
+    it("should handle multiple clicks with sub-routes", () => {
+      cy.visit(`${origin}/e2e/sub-routes-multi-click-entry`, {
+        onBeforeLoad(win) {
+          cy.spy(win.console, "error").as("console.error");
+          cy.spy(win.console, "info").as("console.info");
+        },
+      });
+
+      // Click twice
+      cy.contains("Go App").click();
+      cy.contains("Go App").click();
+      cy.contains("This is App");
+      cy.expectMainContents(["Sub-Routes Multi Click", "This is App"]);
+
+      cy.get("@console.info").should("have.callCount", 3);
+      cy.get("@console.info").should((spy) => {
+        const calledWith = [0, 1, 2].map((index) => {
+          const call = spy.getCall(index);
+          return call.args[0];
+        });
+        expect(calledWith).to.deep.eq(["Mounted", "Unmounted", "Mounted"]);
+      });
+
+      cy.get("@console.error").should("not.be.called");
+    });
   });
 }

etc/runtime.api.md

@@ -262,6 +262,14 @@ function loadEditors(editors: string[] | Set<string>, brickPackages?: BrickPacka
 // @public @deprecated (undocumented)
 export function logout(): unknown;
 
+// @public (undocumented)
+export interface MatchOptions {
+    // (undocumented)
+    exact?: boolean;
+    // (undocumented)
+    path: string | string[];
+}
+
 // Warning: (ae-forgotten-export) The symbol "MatchPathOptions" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "MatchResult" needs to be exported by the entry point index.d.ts
 //
@@ -346,6 +354,8 @@ export interface RenderOptions {
     // (undocumented)
     i18n?: MetaI18n;
     // (undocumented)
+    language?: string;
+    // (undocumented)
     templates?: CustomTemplate[];
     // (undocumented)
     theme?: SiteTheme;
@@ -387,6 +397,8 @@ interface RuntimeContext extends LegacyCompatibleRuntimeContext {
     // (undocumented)
     forEachItem?: unknown;
     // (undocumented)
+    forEachSize?: number;
+    // (undocumented)
     formStateStoreId?: string;
     // (undocumented)
     formStateStoreMap: Map<string, DataStore<"FORM_STATE">>;
@@ -521,7 +533,7 @@ function unmountUseBrick({ rendererContext }: RenderUseBrickResult, mountResult:
 
 // @public (undocumented)
 export function unstable_createRoot(container: HTMLElement | DocumentFragment, { portal: _portal, scope, unknownBricks }?: CreateRootOptions): {
-    render(brick: BrickConf | BrickConf[], { theme, uiVersion, context, functions, templates, i18n: i18nData, url, app, }?: RenderOptions): Promise<void>;
+    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

@@ -842,6 +842,55 @@ routes:
     properties:
       textContent: Real Other Route
 
+- path: '${APP.homepage}/sub-routes-multi-click-entry'
+  bricks:
+  - brick: button
+    properties:
+      textContent: Go App
+    events:
+      click:
+        action: history.push
+        args:
+        - ${APP.homepage}/sub-routes-multi-click/app
+
+- path: '${APP.homepage}/sub-routes-multi-click'
+  incrementalSubRoutes: true
+  bricks:
+  - brick: h1
+    properties:
+      textContent: Sub-Routes Multi Click
+  - brick: div
+    slots:
+      '':
+        type: routes
+        routes:
+        - path: '${APP.homepage}/sub-routes-multi-click/app'
+          context:
+            - name: myApp
+              resolve:
+                useProvider: e2e.return-by-timeout
+                args:
+                  - 500
+                  - App
+          bricks:
+          - brick: h2
+            properties:
+              textContent: <% `This is ${CTX.myApp}` %>
+            lifeCycle:
+              onMount:
+                action: console.info
+                args:
+                  - Mounted
+              onUnmount:
+                action: console.info
+                args:
+                  - Unmounted
+        - path: '${APP.homepage}/sub-routes-multi-click/host'
+          bricks:
+          - brick: h2
+            properties:
+              textContent: This is Host
+
 - path: '${APP.homepage}/async-wrap-brick'
   bricks:
   - brick: e2e.async-wrap

package.json

@@ -20,8 +20,8 @@
     "cypress:open": "cypress open",
     "cypress:run": "cypress run --record",
     "cypress:run:no-record": "cypress run",
-    "test:e2e:ci": "npx start-server-and-test serve:e2e http://localhost:8081/ cypress:run",
-    "test:e2e:no-record": "npx wait-on -r http://localhost:8081/ && npx start-server-and-test serve:e2e http://localhost:8081/ cypress:run:no-record",
+    "test:e2e:ci": "npx start-server-and-test serve:e2e http-get://localhost:8081/ cypress:run",
+    "test:e2e:no-record": "npx wait-on -r http-get://localhost:8081/ && npx start-server-and-test serve:e2e http-get://localhost:8081/ cypress:run:no-record",
     "test:e2e:docker": "docker-compose run --user $(id -u):$(id -g) e2e",
     "lint-staged": "lint-staged"
   },