From b329c55a5ee558ee95fda07d16c05a23dc866092 Mon Sep 17 00:00:00 2001 From: Aaron Date: Tue, 26 Nov 2024 15:17:59 +0800 Subject: [PATCH] chore: fix workflow (#6557) * chore: fix workflow * chore: update deps version * chore: update ci workflow --------- Co-authored-by: antv --- .github/workflows/ci.yml | 6 +----- package.json | 22 +++++++++++----------- packages/g6-extension-3d/package.json | 12 ++++++------ packages/g6-extension-react/package.json | 8 ++++---- packages/g6-ssr/package.json | 4 ++-- packages/g6/package.json | 12 ++++++------ packages/g6/src/preset.ts | 3 --- packages/site/package.json | 18 +++++++++--------- 8 files changed, 39 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83d78e043dc..c876774b677 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ concurrency: jobs: lint-and-build-g6: - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v3 @@ -23,10 +23,6 @@ jobs: brew update brew install python3 || : # python doesn't need to be linked brew install pkg-config cairo pango libpng jpeg giflib librsvg - - brew unlink pkg-config - brew link --overwrite pkgconf - pip install setuptools - uses: pnpm/action-setup@v4 diff --git a/package.json b/package.json index 2e47b625817..ccf3ad94047 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "repository": "https://github.com/antvis/G6.git", "scripts": { "build": "turbo build --filter=!@antv/g6-site", - "ci": "turbo run ci --filter=!@antv/g6-site", + "ci": "turbo run ci --filter=!@antv/g6-site --filter=!@antv/g6-ssr", "contribute": "node ./scripts/contribute.mjs", "dev:g6": "cd ./packages/g6 && npm run dev", "postinstall": "husky install", @@ -30,25 +30,25 @@ ] }, "devDependencies": { - "@antv/g-canvas": "^2.0.24", - "@antv/g-plugin-rough-canvas-renderer": "^2.0.24", + "@antv/g-canvas": "^2.0.29", + "@antv/g-plugin-rough-canvas-renderer": "^2.0.29", "@babel/core": "^7.26.0", "@babel/plugin-transform-typescript": "^7.25.9", - "@changesets/cli": "^2.27.9", + "@changesets/cli": "^2.27.10", "@commitlint/cli": "^18.6.1", "@commitlint/config-conventional": "^18.6.3", - "@playwright/test": "^1.48.2", + "@playwright/test": "^1.49.0", "@rollup/plugin-commonjs": "^25.0.8", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.3.0", "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^11.1.6", - "@swc/core": "^1.9.1", + "@swc/core": "^1.9.3", "@swc/jest": "^0.2.37", "@types/d3-hierarchy": "^3.1.7", "@types/jest": "^29.5.14", "@types/jsdom": "^21.1.7", - "@types/node": "^20.17.6", + "@types/node": "^20.17.7", "@typescript-eslint/eslint-plugin": "^6.21.0", "@typescript-eslint/parser": "^6.21.0", "chalk": "^4.1.2", @@ -67,17 +67,17 @@ "open": "^10.1.0", "prettier": "^3.3.3", "prettier-plugin-organize-imports": "^3.2.4", - "prettier-plugin-packagejson": "^2.5.3", + "prettier-plugin-packagejson": "^2.5.6", "rimraf": "^5.0.10", - "rollup": "^4.25.0", + "rollup": "^4.27.4", "rollup-plugin-polyfill-node": "^0.13.0", "rollup-plugin-visualizer": "^5.12.0", "stats.js": "^0.17.0", "ts-node": "^10.9.2", "tslib": "^2.8.1", "turbo": "^1.13.4", - "typescript": "^5.6.3", - "vite": "^5.4.10", + "typescript": "^5.7.2", + "vite": "^5.4.11", "xml-formatter": "^3.6.3" }, "pnpm": { diff --git a/packages/g6-extension-3d/package.json b/packages/g6-extension-3d/package.json index c52a46f1150..cd06dd271d1 100644 --- a/packages/g6-extension-3d/package.json +++ b/packages/g6-extension-3d/package.json @@ -34,16 +34,16 @@ }, "dependencies": { "@antv/g-device-api": "^1.6.13", - "@antv/g-plugin-3d": "^2.0.26", - "@antv/g-plugin-device-renderer": "^2.2.3", - "@antv/g-plugin-dragndrop": "^2.0.18", - "@antv/g-webgl": "^2.0.28", + "@antv/g-plugin-3d": "^2.0.31", + "@antv/g-plugin-device-renderer": "^2.2.8", + "@antv/g-plugin-dragndrop": "^2.0.22", + "@antv/g-webgl": "^2.0.33", "@antv/layout": "1.2.14-beta.8", "@antv/util": "^3.3.10" }, "devDependencies": { - "@antv/g": "^6.1.7", - "@antv/g-canvas": "^2.0.24", + "@antv/g": "^6.1.11", + "@antv/g-canvas": "^2.0.29", "@antv/g6": "workspace:^" }, "peerDependencies": { diff --git a/packages/g6-extension-react/package.json b/packages/g6-extension-react/package.json index 9c22892c2ec..a57b46df9de 100644 --- a/packages/g6-extension-react/package.json +++ b/packages/g6-extension-react/package.json @@ -35,16 +35,16 @@ "type-check": "tsc --noEmit -p tsconfig.test.json" }, "dependencies": { - "@antv/g": "^6.1.7", - "@antv/g-svg": "^2.0.20", - "@antv/react-g": "^2.0.23" + "@antv/g": "^6.1.11", + "@antv/g-svg": "^2.0.24", + "@antv/react-g": "^2.0.27" }, "devDependencies": { "@ant-design/icons": "^5.5.1", "@antv/g6": "workspace:*", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "antd": "^5.21.6", + "antd": "^5.22.2", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^6.28.0", diff --git a/packages/g6-ssr/package.json b/packages/g6-ssr/package.json index b0e91772f5e..7872ac4d283 100644 --- a/packages/g6-ssr/package.json +++ b/packages/g6-ssr/package.json @@ -27,8 +27,8 @@ "type-check": "tsc --noEmit -p tsconfig.test.json" }, "dependencies": { - "@antv/g": "^6.1.7", - "@antv/g-canvas": "^2.0.24", + "@antv/g": "^6.1.11", + "@antv/g-canvas": "^2.0.29", "@antv/g6": "workspace:^", "cac": "^6.7.14", "canvas": "^2.11.2" diff --git a/packages/g6/package.json b/packages/g6/package.json index 5974eb011a8..364bc1394dd 100644 --- a/packages/g6/package.json +++ b/packages/g6/package.json @@ -58,11 +58,11 @@ }, "dependencies": { "@antv/algorithm": "^0.1.26", - "@antv/component": "^2.1.1", + "@antv/component": "^2.1.2", "@antv/event-emitter": "^0.1.3", - "@antv/g": "^6.1.7", - "@antv/g-canvas": "^2.0.24", - "@antv/g-plugin-dragndrop": "^2.0.18", + "@antv/g": "^6.1.11", + "@antv/g-canvas": "^2.0.29", + "@antv/g-plugin-dragndrop": "^2.0.22", "@antv/graphlib": "^2.0.3", "@antv/hierarchy": "^0.6.14", "@antv/layout": "1.2.14-beta.9", @@ -71,8 +71,8 @@ "hull.js": "^1.0.6" }, "devDependencies": { - "@antv/g-svg": "^2.0.20", - "@antv/g-webgl": "^2.0.28", + "@antv/g-svg": "^2.0.24", + "@antv/g-webgl": "^2.0.33", "@antv/layout-gpu": "^1.1.7", "@antv/layout-wasm": "^1.4.2", "@types/hull.js": "^1.0.4", diff --git a/packages/g6/src/preset.ts b/packages/g6/src/preset.ts index 9cda8a75a58..53abd014a95 100644 --- a/packages/g6/src/preset.ts +++ b/packages/g6/src/preset.ts @@ -1,6 +1,3 @@ -import { runtime } from '@antv/g'; import { registerBuiltInExtensions } from './registry/build-in'; -runtime.enableMassiveParsedStyleAssignOptimization = true; - registerBuiltInExtensions(); diff --git a/packages/site/package.json b/packages/site/package.json index 2f3dd55c342..bcd3d37d08e 100644 --- a/packages/site/package.json +++ b/packages/site/package.json @@ -41,9 +41,9 @@ "@ant-design/icons": "^5.5.1", "@antv/algorithm": "^0.1.26", "@antv/dumi-theme-antv": "^0.5.3", - "@antv/g": "^6.1.7", - "@antv/g-svg": "^2.0.20", - "@antv/g-webgl": "^2.0.28", + "@antv/g": "^6.1.11", + "@antv/g-svg": "^2.0.24", + "@antv/g-webgl": "^2.0.33", "@antv/g2": "^5.2.7", "@antv/g6": "workspace:*", "@antv/g6-extension-3d": "workspace:*", @@ -52,8 +52,8 @@ "@antv/layout-gpu": "^1.1.7", "@antv/layout-wasm": "^1.4.2", "@antv/util": "^3.3.10", - "antd": "^5.21.6", - "dumi": "^2.4.13", + "antd": "^5.22.2", + "dumi": "^2.4.14", "insert-css": "^2.0.0", "lodash": "^4.17.21", "react": "^18.3.1", @@ -63,10 +63,10 @@ }, "devDependencies": { "@manypkg/get-packages": "^2.2.2", - "@microsoft/api-documenter": "^7.25.21", - "@microsoft/api-extractor": "^7.47.11", - "@microsoft/api-extractor-model": "^7.29.8", - "@microsoft/tsdoc": "^0.15.0", + "@microsoft/api-documenter": "^7.26.0", + "@microsoft/api-extractor": "^7.48.0", + "@microsoft/api-extractor-model": "^7.30.0", + "@microsoft/tsdoc": "^0.15.1", "@rushstack/node-core-library": "^4.3.0", "@types/fs-extra": "^11.0.4", "@types/lodash": "^4.17.13",