diff --git a/packages/g6/package.json b/packages/g6/package.json index da7c34d15d6..760916ae6dc 100644 --- a/packages/g6/package.json +++ b/packages/g6/package.json @@ -27,7 +27,7 @@ "fix": "eslint ./src ./tests --fix && prettier ./src ./tests --write ", "test": "jest", "test:integration": "node --expose-gc --max-old-space-size=4096 --unhandled-rejections=strict node_modules/jest/bin/jest tests/integration/ --config jest.node.config.js --coverage --logHeapUsage --detectOpenHandles", - "test:integration_one": "node --expose-gc --max-old-space-size=4096 --unhandled-rejections=strict node_modules/jest/bin/jest tests/integration/animations --config jest.node.config.js --logHeapUsage --detectOpenHandles", + "test:integration_one": "node --expose-gc --max-old-space-size=4096 --unhandled-rejections=strict node_modules/jest/bin/jest tests/integration/behavior --config jest.node.config.js --logHeapUsage --detectOpenHandles", "test-live": "DEBUG_MODE=1 jest --watch ./tests/unit/item-animate-spec.ts", "test-behavior": "DEBUG_MODE=1 jest --watch ./tests/unit/item-3d-spec.ts", "ci": "run-s lint build test:integration", @@ -99,6 +99,7 @@ "rollup-plugin-polyfill-node": "^0.8.0", "rollup-plugin-typescript": "^1.0.1", "rollup-plugin-visualizer": "^5.6.0", + "stats.js": "^0.17.0", "ts-jest": "^29.1.1", "typedoc": "^0.25.0", "typedoc-plugin-markdown": "^3.16.0", diff --git a/packages/g6/src/stdlib/index.ts b/packages/g6/src/stdlib/index.ts index b3cc09e71e8..6e3e7b531d1 100644 --- a/packages/g6/src/stdlib/index.ts +++ b/packages/g6/src/stdlib/index.ts @@ -83,7 +83,7 @@ const { Snapline, EdgeFilterLens, LodController, - EdgeBundling + EdgeBundling, } = Plugins; const { @@ -306,7 +306,7 @@ const Extensions = { Snapline, EdgeFilterLens, WaterMarker, - EdgeBundling + EdgeBundling, }; export default registry; diff --git a/packages/g6/src/stdlib/plugin/edgeBundling/index.ts b/packages/g6/src/stdlib/plugin/edgeBundling/index.ts index d52a36f37f1..825fabbb9e8 100644 --- a/packages/g6/src/stdlib/plugin/edgeBundling/index.ts +++ b/packages/g6/src/stdlib/plugin/edgeBundling/index.ts @@ -189,11 +189,13 @@ export class EdgeBundling extends Base { e.data.type = 'polyline-edge'; if (typeof e.data.keyShape === 'object') { - (e.data.keyShape as Record).controlPoints = edgePoints[i].slice(1, edgePoints[i].length - 1) + (e.data.keyShape as Record).controlPoints = edgePoints[ + i + ].slice(1, edgePoints[i].length - 1); } else { e.data.keyShape = { controlPoints: edgePoints[i].slice(1, edgePoints[i].length - 1), - } + }; } }); diff --git a/packages/g6/src/stdlib/plugin/index.ts b/packages/g6/src/stdlib/plugin/index.ts index 97a16a9e59a..bfed9e591da 100644 --- a/packages/g6/src/stdlib/plugin/index.ts +++ b/packages/g6/src/stdlib/plugin/index.ts @@ -1,4 +1,4 @@ -export * from './edgeBundling' +export * from './edgeBundling'; export * from './fisheye'; export * from './grid'; export * from './history'; diff --git a/packages/g6/tests/demo/behaviors/activate-relations.ts b/packages/g6/tests/demo/behaviors/activate-relations.ts index 23c4d9c79c4..017aba8299b 100644 --- a/packages/g6/tests/demo/behaviors/activate-relations.ts +++ b/packages/g6/tests/demo/behaviors/activate-relations.ts @@ -39,7 +39,7 @@ export default (context: TestCaseContext) => { ], }, modes: { - default: [{ type: 'activate-relations', trigger: 'click' }, 'drag-node'], + default: [{ type: 'activate-relations', trigger: 'click' }], }, }); }; diff --git a/packages/g6/tests/demo/plugins/edgeBundling.ts b/packages/g6/tests/demo/plugins/edgeBundling.ts index 8bfc529b13e..623492989e7 100644 --- a/packages/g6/tests/demo/plugins/edgeBundling.ts +++ b/packages/g6/tests/demo/plugins/edgeBundling.ts @@ -490,7 +490,7 @@ export default (context: TestCaseContext, options = {}) => { fields: ['label'], formatter: (model) => model.data.label, }, - fill: '#fff' + fill: '#fff', }, }, plugins: [ diff --git a/packages/g6/tests/integration/behaviors-scroll-canvas.spec.ts b/packages/g6/tests/integration/behaviors-scroll-canvas.spec.ts index 01f5cd1a66f..6e873f98b21 100644 --- a/packages/g6/tests/integration/behaviors-scroll-canvas.spec.ts +++ b/packages/g6/tests/integration/behaviors-scroll-canvas.spec.ts @@ -2,7 +2,7 @@ import scrollCanvas from '../demo/behaviors/scroll-canvas'; import { createContext } from './utils'; import './utils/useSnapshotMatchers'; -const dir = `${__dirname}/snapshots/behaivors`; +const dir = `${__dirname}/snapshots/behaviors`; describe('Scroll canvas behavior', () => { it('should be rendered correctly', (done) => { diff --git a/packages/g6/tests/integration/snapshots/behaviors/behaviors-activate-relations-activate-node1.svg b/packages/g6/tests/integration/snapshots/behaviors/behaviors-activate-relations-activate-node1.svg index 78e318c180b..827bb9e1f55 100644 --- a/packages/g6/tests/integration/snapshots/behaviors/behaviors-activate-relations-activate-node1.svg +++ b/packages/g6/tests/integration/snapshots/behaviors/behaviors-activate-relations-activate-node1.svg @@ -373,7 +373,7 @@ - + - + - + { function fn() { edgeBundling.updateBundling({ - data: data2 + data: data2, }); } expect(fn).toThrowError( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7fa87db2f80..d0021e569a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + overrides: prettier: ^2.8.8 @@ -167,6 +171,9 @@ importers: rollup-plugin-visualizer: specifier: ^5.6.0 version: 5.6.0(rollup@2.79.1) + stats.js: + specifier: ^0.17.0 + version: 0.17.0 ts-jest: specifier: ^29.1.1 version: 29.1.1(@babel/core@7.23.2)(jest@29.6.0)(typescript@5.1.6) @@ -10891,7 +10898,7 @@ packages: dependencies: '@babel/core': 7.23.2 postcss: 8.4.31 - postcss-syntax: 0.36.2(postcss-html@0.36.0)(postcss-jsx@0.36.4)(postcss-less@3.1.4)(postcss-markdown@0.36.0)(postcss-scss@2.1.1)(postcss@7.0.39) + postcss-syntax: 0.36.2(postcss@8.4.31) transitivePeerDependencies: - supports-color dev: false @@ -12852,7 +12859,7 @@ packages: esbuild: 0.17.19 regenerate: 1.4.2 regenerate-unicode-properties: 10.1.1 - spdy: 4.0.2(supports-color@6.1.0) + spdy: 4.0.2 transitivePeerDependencies: - supports-color dev: false @@ -12870,7 +12877,7 @@ packages: postcss-preset-env: 7.5.0(postcss@8.4.31) rollup-plugin-visualizer: 5.9.0(rollup@2.33.3) systemjs: 6.14.2 - vite: 4.3.1(@types/node@13.11.1)(less@4.1.3)(sass@1.69.5)(stylus@0.54.8) + vite: 4.3.1(@types/node@13.11.1)(less@3.13.1)(stylus@0.54.8) transitivePeerDependencies: - '@types/node' - postcss @@ -13172,7 +13179,7 @@ packages: eslint-plugin-react: 7.33.2(eslint@8.48.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.48.0) postcss: 8.4.31 - postcss-syntax: 0.36.2(postcss-html@0.36.0)(postcss-jsx@0.36.4)(postcss-less@3.1.4)(postcss-markdown@0.36.0)(postcss-scss@2.1.1)(postcss@7.0.39) + postcss-syntax: 0.36.2(postcss@8.4.31) stylelint-config-standard: 25.0.0(stylelint@14.16.1) transitivePeerDependencies: - eslint @@ -13386,7 +13393,7 @@ packages: '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.23.2) '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.23.2) react-refresh: 0.14.0 - vite: 4.3.1(@types/node@13.11.1)(less@4.1.3)(sass@1.69.5)(stylus@0.54.8) + vite: 4.3.1(@types/node@13.11.1)(less@3.13.1)(stylus@0.54.8) transitivePeerDependencies: - supports-color dev: false @@ -18138,6 +18145,7 @@ packages: /delegate@3.2.0: resolution: {integrity: sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==} + requiresBuild: true optional: true /delegates@1.0.0: @@ -20390,7 +20398,7 @@ packages: peerDependencies: eslint: '>=5.0.0' eslint-config-prettier: '*' - prettier: '>=1.13.0' + prettier: ^2.8.8 peerDependenciesMeta: eslint-config-prettier: optional: true @@ -22896,6 +22904,7 @@ packages: /good-listener@1.2.2: resolution: {integrity: sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==} + requiresBuild: true dependencies: delegate: 3.2.0 optional: true @@ -30886,6 +30895,30 @@ packages: postcss-markdown: 0.36.0(postcss-syntax@0.36.2)(postcss@7.0.39) postcss-scss: 2.1.1 + /postcss-syntax@0.36.2(postcss@8.4.31): + resolution: {integrity: sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==} + peerDependencies: + postcss: '>=5.0.0' + postcss-html: '*' + postcss-jsx: '*' + postcss-less: '*' + postcss-markdown: '*' + postcss-scss: '*' + peerDependenciesMeta: + postcss-html: + optional: true + postcss-jsx: + optional: true + postcss-less: + optional: true + postcss-markdown: + optional: true + postcss-scss: + optional: true + dependencies: + postcss: 8.4.31 + dev: false + /postcss-unique-selectors@4.0.1: resolution: {integrity: sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==} engines: {node: '>=6.9.0'} @@ -30982,7 +31015,7 @@ packages: peerDependencies: '@volar/vue-language-plugin-pug': ^1.0.4 '@volar/vue-typescript': ^1.0.4 - prettier: '>=2.0' + prettier: ^2.8.8 typescript: '>=2.9' peerDependenciesMeta: '@volar/vue-language-plugin-pug': @@ -30997,7 +31030,7 @@ packages: /prettier-plugin-packagejson@2.3.0(prettier@2.8.8): resolution: {integrity: sha512-2SAPMMk1UDkqsB7DifWKcwCm6VC52JXMrzLHfbcQHJRWhRCj9zziOy+s+2XOyPBeyqFqS+A/1IKzOrxKFTo6pw==} peerDependencies: - prettier: '>= 1.16.0' + prettier: ^2.8.8 peerDependenciesMeta: prettier: optional: true @@ -31009,7 +31042,7 @@ packages: /prettier-plugin-packagejson@2.4.3(prettier@2.8.8): resolution: {integrity: sha512-kPeeviJiwy0BgOSk7No8NmzzXfW4R9FYWni6ziA5zc1kGVVrKnBzMZdu2TUhI+I7h8/5Htt3vARYOk7KKJTTNQ==} peerDependencies: - prettier: '>= 1.16.0' + prettier: ^2.8.8 peerDependenciesMeta: prettier: optional: true @@ -31022,7 +31055,7 @@ packages: /prettier-plugin-two-style-order@1.0.1(prettier@2.8.8): resolution: {integrity: sha512-ETltO2FRR/Pxc7bsgz2XwuzWSPwafl7/v5+5Rria4S579CTas7dya+xsmbkix0q1tYQiuRjVVdfGnCKlH/aOuQ==} peerDependencies: - prettier: '>= 2.0.0' + prettier: ^2.8.8 dependencies: postcss: 8.4.31 postcss-less: 4.0.1 @@ -31256,6 +31289,7 @@ packages: /prr@1.0.1: resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} + requiresBuild: true /pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} @@ -35009,6 +35043,7 @@ packages: /select@1.1.2: resolution: {integrity: sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==} + requiresBuild: true optional: true /selfsigned@1.10.14: @@ -35752,6 +35787,19 @@ packages: /spdx-license-ids@3.0.16: resolution: {integrity: sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==} + /spdy-transport@3.0.0: + resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} + dependencies: + debug: 4.3.4(supports-color@5.5.0) + detect-node: 2.1.0 + hpack.js: 2.1.6 + obuf: 1.1.2 + readable-stream: 3.6.2 + wbuf: 1.7.3 + transitivePeerDependencies: + - supports-color + dev: false + /spdy-transport@3.0.0(supports-color@6.1.0): resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} dependencies: @@ -35764,6 +35812,19 @@ packages: transitivePeerDependencies: - supports-color + /spdy@4.0.2: + resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} + engines: {node: '>=6.0.0'} + dependencies: + debug: 4.3.4(supports-color@5.5.0) + handle-thing: 2.0.1 + http-deceiver: 1.2.7 + select-hose: 2.0.0 + spdy-transport: 3.0.0 + transitivePeerDependencies: + - supports-color + dev: false + /spdy@4.0.2(supports-color@6.1.0): resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} engines: {node: '>=6.0.0'} @@ -35915,7 +35976,6 @@ packages: /stats.js@0.17.0: resolution: {integrity: sha512-hNKz8phvYLPEcRkeG1rsGmV5ChMjKDAWU7/OJJdDErPBNChQXxCo3WZurGpnWc6gZhAzEPFad1aVgyOANH1sMw==} - dev: false /statuses@1.5.0: resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==} @@ -37248,6 +37308,7 @@ packages: /tiny-emitter@2.1.0: resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} + requiresBuild: true optional: true /tiny-invariant@1.3.1: @@ -38746,7 +38807,7 @@ packages: remove-trailing-separator: 1.1.0 replace-ext: 1.0.1 - /vite@4.3.1(@types/node@13.11.1)(less@4.1.3)(sass@1.69.5)(stylus@0.54.8): + /vite@4.3.1(@types/node@13.11.1)(less@3.13.1)(stylus@0.54.8): resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -38773,10 +38834,9 @@ packages: dependencies: '@types/node': 13.11.1 esbuild: 0.17.19 - less: 4.1.3 + less: 3.13.1 postcss: 8.4.31 rollup: 3.29.4 - sass: 1.69.5 stylus: 0.54.8 optionalDependencies: fsevents: 2.3.3 @@ -39786,7 +39846,3 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: false - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false