Merge pull request #4741 from easyops-cn/next

Next

Author: weareoutman

cypress/e2e/size-check.spec.js

@@ -35,8 +35,8 @@ for (const port of Cypress.env("ports")) {
         });
         const total = js + css + others;
 
-        expect(total, "total resource").to.be.lessThan(3.2e5);
-        expect(js, "js resource").to.be.lessThan(3e5);
+        expect(total, "total resource").to.be.lessThan(3.3e5);
+        expect(js, "js resource").to.be.lessThan(3.1e5);
         expect(css, "css resource").to.be.lessThan(2e4);
         expect(others, "other resource").to.be.lessThan(1e4);
       });

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   e2e:
-    image: cypress/included:14.1.0
+    image: cypress/included:14.4.1
     working_dir: /app
     volumes:
       - '.:/app'

package.json

@@ -23,7 +23,8 @@
     "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"
+    "lint-staged": "lint-staged",
+    "postinstall": "patch-package"
   },
   "browserslist": {
     "development": [
@@ -37,46 +38,48 @@
     "trailingComma": "es5"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.10",
-    "@babel/types": "^7.26.10",
+    "@babel/core": "^7.27.4",
+    "@babel/types": "^7.27.6",
     "@cypress/browserify-preprocessor": "^3.0.2",
-    "@next-shared/common-bricks": "^0.53.1",
+    "@next-shared/common-bricks": "^0.54.0",
     "@types/doctrine": "^0.0.9",
     "@types/fs-extra": "^9.0.13",
     "@types/history": "^4.7.11",
     "@types/inquirer": "^7.3.3",
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
     "@types/js-yaml": "^3.12.10",
     "@types/klaw-sync": "^6.0.5",
-    "@types/lodash": "^4.17.7",
+    "@types/lodash": "^4.17.17",
     "@types/meow": "^5.0.0",
-    "@types/node": "^20.16.2",
-    "@types/react": "^18.3.4",
-    "@types/react-dom": "^18.3.0",
-    "babel-jest": "^29.7.0",
+    "@types/node": "^20.19.0",
+    "@types/react": "^18.3.23",
+    "@types/react-dom": "^18.3.7",
+    "babel-jest": "^30.0.2",
     "concurrently": "^9.1.2",
     "cross-env": "^7.0.3",
-    "cypress": "^14.1.0",
-    "eslint": "^9.22.0",
+    "cypress": "^14.4.1",
+    "eslint": "^9.29.0",
     "husky": "^9.1.7",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
+    "jest": "^30.0.2",
+    "jest-environment-jsdom": "^30.0.2",
     "jest-websocket-mock": "^2.5.0",
     "lerna": "^8.1.8",
-    "lint-staged": "^15.4.3",
-    "prettier": "^3.5.3",
+    "lint-staged": "^15.5.2",
+    "patch-package": "^8.0.0",
+    "postinstall-postinstall": "^2.1.0",
+    "prettier": "^3.6.0",
     "rimraf": "^6.0.1",
     "ts-jest-resolver": "^2.0.1",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.3"
   },
   "workspaces": [
     "bricks/*",
     "packages/*"
   ],
   "resolutions": {
-    "@babel/parser": "^7.26.10",
-    "@babel/runtime": "^7.26.10",
-    "@types/react": "^18.3.4",
+    "@babel/parser": "^7.27.5",
+    "@babel/runtime": "^7.27.6",
+    "@types/react": "^18.3.23",
     "lodash": "^4.17.21",
     "moment": "^2.30.1"
   },

packages/babel-preset-next/package.json

@@ -11,11 +11,11 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@babel/plugin-proposal-decorators": "^7.25.9",
-    "@babel/plugin-transform-runtime": "^7.26.10",
-    "@babel/preset-env": "^7.26.9",
-    "@babel/preset-react": "^7.26.3",
-    "@babel/preset-typescript": "^7.26.0",
-    "@babel/runtime": "^7.26.10"
+    "@babel/plugin-proposal-decorators": "^7.27.1",
+    "@babel/plugin-transform-runtime": "^7.27.4",
+    "@babel/preset-env": "^7.27.2",
+    "@babel/preset-react": "^7.27.1",
+    "@babel/preset-typescript": "^7.27.1",
+    "@babel/runtime": "^7.27.6"
   }
 }

packages/brick-container/package.json

@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@next-core/serve-helpers": "^1.2.5",
-    "body-parser": "^1.20.3",
+    "body-parser": "^2.2.0",
     "chalk": "^4.1.2",
     "chokidar": "^4.0.3",
     "compression": "^1.8.0",
@@ -47,7 +47,7 @@
     "lodash": "^4.17.21",
     "meow": "^11.0.0",
     "mockdate": "^3.0.5",
-    "ws": "^8.18.1"
+    "ws": "^8.18.2"
   },
   "devDependencies": {
     "@next-api-sdk/api-gateway-sdk": "^1.2.2",
@@ -65,10 +65,10 @@
     "@next-core/utils": "^1.7.35",
     "broadcast-channel": "^7.0.0",
     "copy-webpack-plugin": "^13.0.0",
-    "core-js": "^3.41.0",
+    "core-js": "^3.43.0",
     "html-webpack-plugin": "^5.6.3",
     "regenerator-runtime": "^0.14.1",
-    "webpack-dev-server": "^5.2.0"
+    "webpack-dev-server": "^5.2.2"
   },
   "peerDependencies": {
     "@next-core/http": "*",

packages/brick-container/src/loadBootstrapData.spec.ts

@@ -313,7 +313,7 @@ describe("loadBootstrapData", () => {
     window.BOOTSTRAP_FILE = "bootstrap.app-a.json";
     window.APP_ROOT = "sa-static/app-a/versions/1.88.0/webroot/";
     const promise = loadBootstrapData();
-    expect(RuntimeApi_runtimeMicroAppStandalone).toBeCalledWith("app-a", {
+    expect(RuntimeApi_runtimeMicroAppStandalone).toHaveBeenCalledWith("app-a", {
       version: "1.88.0",
     });
     const data = await promise;
@@ -358,8 +358,8 @@ describe("loadBootstrapData", () => {
     });
 
     await fulfilStoryboard(data.storyboards[0]);
-    expect(RuntimeApi_runtimeMicroAppStandalone).toBeCalledTimes(1);
-    expect(registerMocks).toBeCalledTimes(1);
+    expect(RuntimeApi_runtimeMicroAppStandalone).toHaveBeenCalledTimes(1);
+    expect(registerMocks).toHaveBeenCalledTimes(1);
 
     expect(data.storyboards[0]).toEqual({
       app: {
@@ -428,7 +428,7 @@ describe("loadBootstrapData", () => {
     window.BOOTSTRAP_FILE = "bootstrap.mini.g.json";
 
     const promise = loadBootstrapData();
-    expect(RuntimeApi_runtimeMicroAppStandalone).not.toBeCalled();
+    expect(RuntimeApi_runtimeMicroAppStandalone).not.toHaveBeenCalled();
 
     const data = await promise;
     expect(data).toEqual({
@@ -705,7 +705,7 @@ describe("loadBootstrapData", () => {
         },
       },
     });
-    expect(consoleWarn).toBeCalledTimes(1);
+    expect(consoleWarn).toHaveBeenCalledTimes(1);
   });
 
   test("standalone with invalid conf.yaml", async () => {
@@ -719,8 +719,8 @@ describe("loadBootstrapData", () => {
     await expect(promise).rejects.toThrowErrorMatchingInlineSnapshot(
       `"Invalid conf.yaml"`
     );
-    expect(consoleWarn).toBeCalledTimes(1);
-    expect(consoleError).toBeCalledTimes(1);
+    expect(consoleWarn).toHaveBeenCalledTimes(1);
+    expect(consoleError).toHaveBeenCalledTimes(1);
   });
 
   test("standalone with conf.yaml of user_config_by_apps", async () => {
@@ -745,7 +745,7 @@ describe("loadBootstrapData", () => {
         },
       ],
     });
-    expect(consoleWarn).toBeCalledTimes(1);
+    expect(consoleWarn).toHaveBeenCalledTimes(1);
   });
 
   test("standalone with conf.yaml of missing in user_config_by_apps", async () => {
@@ -768,9 +768,9 @@ describe("loadBootstrapData", () => {
         },
       ],
     });
-    expect(consoleWarn).toBeCalledTimes(1);
+    expect(consoleWarn).toHaveBeenCalledTimes(1);
     await fulfilStoryboard(data.storyboards[0]);
-    expect(consoleWarn).toBeCalledTimes(2);
+    expect(consoleWarn).toHaveBeenCalledTimes(2);
     consoleWarn.mockReset();
   });
 
@@ -794,7 +794,7 @@ describe("loadBootstrapData", () => {
         },
       ],
     });
-    expect(consoleWarn).toBeCalledTimes(1);
+    expect(consoleWarn).toHaveBeenCalledTimes(1);
   });
 
   test("non-standalone", async () => {
@@ -832,7 +832,7 @@ describe("loadBootstrapData", () => {
     });
 
     await fulfilStoryboard(data.storyboards[0]);
-    expect(mockGetAppStoryboardV2).toBeCalledTimes(1);
+    expect(mockGetAppStoryboardV2).toHaveBeenCalledTimes(1);
 
     expect(data.storyboards[0]).toEqual({
       app: {

packages/brick-container/src/loadCheckLogin.spec.ts

@@ -14,22 +14,22 @@ describe("loadCheckLogin", () => {
   test("should work for when not logged in", async () => {
     mockCheckLogin.mockResolvedValueOnce({ loggedIn: false });
     await loadCheckLogin();
-    expect(auth.authenticate).not.toBeCalled();
+    expect(auth.authenticate).not.toHaveBeenCalled();
   });
 
   test("should work for when logged in", async () => {
     mockCheckLogin.mockResolvedValueOnce({ loggedIn: true });
     await loadCheckLogin();
-    expect(auth.authenticate).toBeCalledWith({
+    expect(auth.authenticate).toHaveBeenCalledWith({
       loggedIn: true,
     });
   });
 
   test("should work for no auth guard", async () => {
     window.NO_AUTH_GUARD = true;
     await loadCheckLogin();
-    expect(mockCheckLogin).not.toBeCalled();
-    expect(auth.authenticate).not.toBeCalled();
+    expect(mockCheckLogin).not.toHaveBeenCalled();
+    expect(auth.authenticate).not.toHaveBeenCalled();
     window.NO_AUTH_GUARD = false;
   });
 });

packages/brick-container/src/preview/initialize.spec.ts

@@ -75,7 +75,9 @@ describe("initialize", () => {
       "https://dev.easyops.local"
     );
     expect(ok).toBe(false);
-    expect(consoleError).toBeCalledWith(expect.stringContaining("disallowed"));
+    expect(consoleError).toHaveBeenCalledWith(
+      expect.stringContaining("disallowed")
+    );
 
     (window as any).location = location;
   });

packages/brick-container/src/preview/listen.spec.ts

@@ -47,15 +47,15 @@ describe("listen", () => {
 
     await (global as any).flushPromises();
 
-    expect(loadBricksImperatively).toBeCalledWith(
+    expect(loadBricksImperatively).toHaveBeenCalledWith(
       ["visual-builder.inject-preview-agent"],
       [
         {
           id: "bricks/visual-builder",
         },
       ]
     );
-    expect(injectPreview).toBeCalledWith(location.origin, {
+    expect(injectPreview).toHaveBeenCalledWith(location.origin, {
       foo: "bar",
     });
   });
@@ -87,15 +87,15 @@ describe("listen", () => {
 
     await (global as any).flushPromises();
 
-    expect(loadBricksImperatively).toBeCalledWith(
+    expect(loadBricksImperatively).toHaveBeenCalledWith(
       ["ui-test.inject-preview-agent"],
       [
         {
           id: "bricks/ui-test",
         },
       ]
     );
-    expect(injectUITest).toBeCalledWith(location.origin, {
+    expect(injectUITest).toHaveBeenCalledWith(location.origin, {
       foo: "bar",
     });
   });
@@ -111,7 +111,7 @@ describe("listen", () => {
 
     await (global as any).flushPromises();
 
-    expect(loadBricksImperatively).not.toBeCalled();
+    expect(loadBricksImperatively).not.toHaveBeenCalled();
   });
 
   test("initialize failed", async () => {
@@ -141,6 +141,6 @@ describe("listen", () => {
 
     await (global as any).flushPromises();
 
-    expect(loadBricksImperatively).not.toBeCalled();
+    expect(loadBricksImperatively).not.toHaveBeenCalled();
   });
 });

packages/brick-playground/package.json

@@ -40,6 +40,6 @@
     "html-webpack-plugin": "^5.6.3",
     "monaco-editor": "^0.50.0",
     "monaco-editor-webpack-plugin": "^7.1.0",
-    "webpack-dev-server": "^5.2.0"
+    "webpack-dev-server": "^5.2.2"
   }
 }