From 897add4bf730fe791b91f0d62dd09fb5414b6ffe Mon Sep 17 00:00:00 2001 From: fangsmile <892739385@qq.com> Date: Tue, 4 Nov 2025 17:38:19 +0800 Subject: [PATCH 1/3] refactor: resolve roughjs error #1975 --- packages/vrender-kits/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 0d3313519..a4859384b 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -23,7 +23,7 @@ "@visactor/vutils": "~1.0.12", "@visactor/vrender-core": "workspace:1.0.24", "@resvg/resvg-js": "2.4.1", - "roughjs": "4.5.2", + "roughjs": "4.6.6", "gifuct-js": "2.1.2", "lottie-web": "^5.12.2" }, From a3200e3579eda8e9823dc78e1f28ac3b87315d90 Mon Sep 17 00:00:00 2001 From: fangsmile <892739385@qq.com> Date: Tue, 4 Nov 2025 17:42:05 +0800 Subject: [PATCH 2/3] refactor: resolve roughjs error #1975 --- common/config/rush/pnpm-lock.yaml | 95 ++++++------------------------- 1 file changed, 17 insertions(+), 78 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index f005b945d..8504483a3 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -482,8 +482,8 @@ importers: specifier: ^5.12.2 version: 5.12.2 roughjs: - specifier: 4.5.2 - version: 4.5.2 + specifier: 4.6.6 + version: 4.6.6 devDependencies: '@internal/bundler': specifier: workspace:* @@ -3969,6 +3969,9 @@ packages: resolution: {integrity: sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==} engines: {node: '>= 0.10'} + hachure-fill@0.5.2: + resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==} + har-schema@2.0.0: resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==} engines: {node: '>=4'} @@ -5887,8 +5890,8 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true - roughjs@4.5.2: - resolution: {integrity: sha512-2xSlLDKdsWyFxrveYWk9YQ/Y9UfK38EAMRNkYkMqYBJvPX8abCa9PN0x3w02H8Oa6/0bcZICJU+U95VumPqseg==} + roughjs@4.6.6: + resolution: {integrity: sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ==} rsvp@4.8.5: resolution: {integrity: sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==} @@ -7961,7 +7964,7 @@ snapshots: jest-resolve: 26.6.2 jest-resolve-dependencies: 26.6.3 jest-runner: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-runtime: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) jest-snapshot: 26.6.2 jest-util: 26.6.2 jest-validate: 26.6.2 @@ -8100,7 +8103,7 @@ snapshots: graceful-fs: 4.2.11 jest-haste-map: 26.6.2 jest-runner: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-runtime: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) transitivePeerDependencies: - bufferutil - canvas @@ -10977,6 +10980,8 @@ snapshots: dependencies: glogg: 1.0.2 + hachure-fill@0.5.2: {} + har-schema@2.0.0: {} har-validator@5.1.5: @@ -11513,7 +11518,7 @@ snapshots: jest-environment-jsdom: 26.6.2(canvas@2.11.2) jest-environment-node: 26.6.2 jest-get-type: 26.3.0 - jest-jasmine2: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-jasmine2: 26.6.3 jest-regex-util: 26.0.0 jest-resolve: 26.6.2 jest-util: 26.6.2 @@ -11541,7 +11546,7 @@ snapshots: jest-environment-jsdom: 26.6.2(canvas@2.11.2) jest-environment-node: 26.6.2 jest-get-type: 26.3.0 - jest-jasmine2: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-jasmine2: 26.6.3 jest-regex-util: 26.0.0 jest-resolve: 26.6.2 jest-util: 26.6.2 @@ -11746,7 +11751,7 @@ snapshots: transitivePeerDependencies: - supports-color - jest-jasmine2@26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)): + jest-jasmine2@26.6.3: dependencies: '@babel/traverse': 7.27.0 '@jest/environment': 26.6.2 @@ -11767,38 +11772,7 @@ snapshots: pretty-format: 26.6.2 throat: 5.0.0 transitivePeerDependencies: - - bufferutil - - canvas - supports-color - - ts-node - - utf-8-validate - - jest-jasmine2@26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)): - dependencies: - '@babel/traverse': 7.27.0 - '@jest/environment': 26.6.2 - '@jest/source-map': 26.6.2 - '@jest/test-result': 26.6.2 - '@jest/types': 26.6.2 - '@types/node': 22.13.17 - chalk: 4.1.2 - co: 4.6.0 - expect: 26.6.2 - is-generator-fn: 2.1.0 - jest-each: 26.6.2 - jest-matcher-utils: 26.6.2 - jest-message-util: 26.6.2 - jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-snapshot: 26.6.2 - jest-util: 26.6.2 - pretty-format: 26.6.2 - throat: 5.0.0 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate jest-leak-detector@24.9.0: dependencies: @@ -11970,7 +11944,7 @@ snapshots: jest-leak-detector: 26.6.2 jest-message-util: 26.6.2 jest-resolve: 26.6.2 - jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-runtime: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) jest-util: 26.6.2 jest-worker: 26.6.2 source-map-support: 0.5.21 @@ -12046,42 +12020,6 @@ snapshots: - ts-node - utf-8-validate - jest-runtime@26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)): - dependencies: - '@jest/console': 26.6.2 - '@jest/environment': 26.6.2 - '@jest/fake-timers': 26.6.2 - '@jest/globals': 26.6.2 - '@jest/source-map': 26.6.2 - '@jest/test-result': 26.6.2 - '@jest/transform': 26.6.2 - '@jest/types': 26.6.2 - '@types/yargs': 15.0.19 - chalk: 4.1.2 - cjs-module-lexer: 0.6.0 - collect-v8-coverage: 1.0.2 - exit: 0.1.2 - glob: 7.2.3 - graceful-fs: 4.2.11 - jest-config: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-haste-map: 26.6.2 - jest-message-util: 26.6.2 - jest-mock: 26.6.2 - jest-regex-util: 26.0.0 - jest-resolve: 26.6.2 - jest-snapshot: 26.6.2 - jest-util: 26.6.2 - jest-validate: 26.6.2 - slash: 3.0.0 - strip-bom: 4.0.0 - yargs: 15.4.1 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate - jest-serializer@24.9.0: {} jest-serializer@26.6.2: @@ -13536,8 +13474,9 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - roughjs@4.5.2: + roughjs@4.6.6: dependencies: + hachure-fill: 0.5.2 path-data-parser: 0.1.0 points-on-curve: 0.2.0 points-on-path: 0.2.1 From d0f5d882fa8cf8ca11c465392f21a3874e304c81 Mon Sep 17 00:00:00 2001 From: fangsmile <892739385@qq.com> Date: Tue, 4 Nov 2025 17:43:01 +0800 Subject: [PATCH 3/3] docs: update changlog of rush --- ...75-bug-roughjs-vite-conflict_2025-11-04-09-43.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json diff --git a/common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json b/common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json new file mode 100644 index 000000000..1bbe9abde --- /dev/null +++ b/common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "refactor: resolve roughjs error #1975\n\n", + "type": "none", + "packageName": "@visactor/vrender-kits" + } + ], + "packageName": "@visactor/vrender-kits", + "email": "892739385@qq.com" +} \ No newline at end of file