diff --git a/package.json b/package.json index fabcba5181e..ee00b7542c8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "x6", "private": true, "scripts": { - "preinstall": "node ./scripts/preinstall.js", + "preinstall": "./scripts/preinstall", "lint:ts": "eslint '**/src/**/*.{js,ts}?(x)' --fix", "lint:style": "stylelint '**/src/**/*.less' --syntax less --fix", "lint": "run-s lint:ts lint:style", @@ -10,14 +10,17 @@ "pretty-quick": "pretty-quick", "test": "turbo run test --filter=./packages/*", "build": "turbo run build --filter=./packages/*", + "build:cjs": "turbo run build:cjs --filter=./packages/*", + "build:esm": "turbo run build:esm --filter=./packages/*", "build:dev": "turbo run build:dev --filter=./packages/*", + "build:umd": "turbo run build:umd --filter=./packages/*", "build:demos": "sh ./scripts/build-demos", "build:sites": "sh ./scripts/build-sites", - "update:deps": "pnpm update --interactive --latest --recursive", "clean:turbo": "pnpm -r --if-present --parallel --filter=./packages/* run clean:turbo", "clean:build": "pnpm -r --if-present --parallel --filter=./packages/* run clean", "clean:modules": "pnpm -r --parallel exec rimraf node_modules && rimraf node_modules", - "clean": "run-s clean:build clean:modules", + "clean": "run-s clean:build clean:turbo clean:modules", + "update:deps": "pnpm update --interactive --latest --recursive", "setup:husky": "husky install .husky", "prepare": "is-ci || run-p setup:husky build:dev" }, @@ -26,17 +29,21 @@ "clean:build": "rimraf dist es lib", "clean:coverage": "rimraf ./test/coverage", "clean": "run-p clean:**", - "build:less": "rss", + "build:less": { + "file": "./scripts/build-less" + }, "build:esm": "tsc --module esnext --target es6 --outDir ./es", "build:cjs": "tsc --module commonjs --target es6 --outDir ./lib", - "build:umd": "rss-less && rollup -c ../../rollup.config.js --bundleConfigAsCjs", - "build:dev": "rss-less && run-p -s build:cjs build:esm", + "build:umd": "pnpm run --if-present build:less && rollup -c ../../rollup.config.js --bundleConfigAsCjs", + "build:dev": "pnpm run --if-present build:less && run-p -s build:cjs build:esm", "build:watch": "run-s -s build:watch:esm", "build:watch:esm": "run-s -s 'build:esm -w'", "build:watch:cjs": "run-s -s 'build:cjs -w'", "build": "run-p -s build:dev build:umd", "prebuild": "run-s -s clean:build", - "test": "rss-test", + "test": { + "file": "./scripts/run-test" + }, "coveralls": "cat ./test/coverage/lcov.info | coveralls", "pretest": "run-s -s clean:coverage" }, @@ -82,7 +89,6 @@ } }, "dependencies": { - "@antv/x6-build-tools": "workspace:*", "@babel/core": "^7.20.2", "@babel/plugin-syntax-flow": "^7.18.6", "@babel/plugin-transform-react-jsx": "^7.19.0", @@ -120,7 +126,7 @@ "husky": "^8.0.1", "is-ci": "^3.0.0", "jasmine-core": "^4.5.0", - "jest": "^29.2.2", + "jest": "^29.3.1", "karma": "^6.3.4", "karma-chrome-launcher": "^3.1.0", "karma-cli": "^2.0.0", @@ -141,6 +147,7 @@ "rollup-plugin-postcss": "^4.0.1", "rollup-plugin-progress": "^1.1.2", "rollup-plugin-terser": "^7.0.2", + "run-shared-scripts": "^1.0.2", "semantic-release": "^19.0.5", "sinon": "^14.0.1", "stylelint": "^14.14.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 182472694f4..ba15b70ba0e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,6 @@ importers: .: specifiers: - '@antv/x6-build-tools': workspace:* '@babel/core': ^7.20.2 '@babel/plugin-syntax-flow': ^7.18.6 '@babel/plugin-transform-react-jsx': ^7.19.0 @@ -42,7 +41,7 @@ importers: husky: ^8.0.1 is-ci: ^3.0.0 jasmine-core: ^4.5.0 - jest: ^29.2.2 + jest: ^29.3.1 karma: ^6.3.4 karma-chrome-launcher: ^3.1.0 karma-cli: ^2.0.0 @@ -63,6 +62,7 @@ importers: rollup-plugin-postcss: ^4.0.1 rollup-plugin-progress: ^1.1.2 rollup-plugin-terser: ^7.0.2 + run-shared-scripts: ^1.0.2 semantic-release: ^19.0.5 sinon: ^14.0.1 stylelint: ^14.14.1 @@ -77,7 +77,6 @@ importers: turbo: ^1.6.3 typescript: ^4.4.3 dependencies: - '@antv/x6-build-tools': link:scripts/x6-build-tools '@babel/core': 7.20.2 '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.20.2 '@babel/plugin-transform-react-jsx': 7.19.0_@babel+core@7.20.2 @@ -104,7 +103,7 @@ importers: eslint-plugin-eslint-comments: 3.2.0_eslint@8.27.0 eslint-plugin-flowtype: 8.0.3_zkxtsrstecczhnlaucletdiiua eslint-plugin-import: 2.26.0_jnohwm7eexgw7uduhweedcbnpe - eslint-plugin-jest: 27.1.4_oyhdxdxe4qakybjbdlayychnea + eslint-plugin-jest: 27.1.4_kdswgjmqcx7mthqz7ow2zlfevy eslint-plugin-jsx-a11y: 6.6.1_eslint@8.27.0 eslint-plugin-prettier: 4.2.1_v7o5sx5x3wbs57ifz6wc4f76we eslint-plugin-promise: 6.1.1_eslint@8.27.0 @@ -115,7 +114,7 @@ importers: husky: 8.0.2 is-ci: 3.0.1 jasmine-core: 4.5.0 - jest: 29.3.0_odkjkoia5xunhxkdrka32ib6vi + jest: 29.3.1_odkjkoia5xunhxkdrka32ib6vi karma: 6.4.1 karma-chrome-launcher: 3.1.1 karma-cli: 2.0.0 @@ -136,6 +135,7 @@ importers: rollup-plugin-postcss: 4.0.2_neo3lunb2qpadwxplzw7r2isgm rollup-plugin-progress: 1.1.2 rollup-plugin-terser: 7.0.2_rollup@3.2.5 + run-shared-scripts: 1.0.2 semantic-release: 19.0.5 sinon: 14.0.2 stylelint: 14.14.1 @@ -144,7 +144,7 @@ importers: stylelint-config-standard: 29.0.0_stylelint@14.14.1 stylelint-declaration-block-no-ignored-properties: 2.6.0_stylelint@14.14.1 stylelint-order: 5.0.0_stylelint@14.14.1 - ts-jest: 29.0.3_35m2wlk7dtrpmmk2m6jvo7qjly + ts-jest: 29.0.3_25xopm7qx5wgmsgnog4okhpq5a ts-node: 10.9.1_cbe7ovvae6zqfnmtgctpgpys54 tslib: 2.4.1 turbo: 1.6.3 @@ -309,20 +309,6 @@ importers: '@vue/composition-api': 1.7.1_vue@2.7.13 vue: 2.7.13 - scripts/x6-build-tools: - specifiers: - colors: ^1.4.0 - cross-spawn: ^7.0.3 - fastest-levenshtein: ^1.0.16 - find-monorepo-root: ^1.0.1 - fs-extra: ^10.0.0 - dependencies: - colors: 1.4.0 - cross-spawn: 7.0.3 - fastest-levenshtein: 1.0.16 - find-monorepo-root: 1.0.2 - fs-extra: 10.1.0 - packages: /@ampproject/remapping/2.2.0: @@ -416,8 +402,8 @@ packages: jsesc: 2.5.2 dev: false - /@babel/generator/7.20.3: - resolution: {integrity: sha512-Wl5ilw2UD1+ZYprHVprxHZJCFeBWlzZYOovE4SDYLZnqCOD11j+0QzNeEWKLLTWM7nixrZEh7vNIyb76MyJg3A==} + /@babel/generator/7.20.4: + resolution: {integrity: sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.20.2 @@ -1720,20 +1706,20 @@ packages: engines: {node: '>=8'} dev: false - /@jest/console/29.2.1: - resolution: {integrity: sha512-MF8Adcw+WPLZGBiNxn76DOuczG3BhODTcMlDCA4+cFi41OkaY/lyI0XUUhi73F88Y+7IHoGmD80pN5CtxQUdSw==} + /@jest/console/29.3.1: + resolution: {integrity: sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.2.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 chalk: 4.1.2 - jest-message-util: 29.2.1 - jest-util: 29.2.1 + jest-message-util: 29.3.1 + jest-util: 29.3.1 slash: 3.0.0 dev: false - /@jest/core/29.3.0_ts-node@10.9.1: - resolution: {integrity: sha512-5DyNvV8452bwqcYyXHCYaAD8UrTiWosrhBY+rc0MBMyXyDzcIL+w5gdlCYhlHbNsHoWnf4nUbRmg++LWfWVtMQ==} + /@jest/core/29.3.1_ts-node@10.9.1: + resolution: {integrity: sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -1741,11 +1727,11 @@ packages: node-notifier: optional: true dependencies: - '@jest/console': 29.2.1 - '@jest/reporters': 29.3.0 - '@jest/test-result': 29.2.1 - '@jest/transform': 29.3.0 - '@jest/types': 29.2.1 + '@jest/console': 29.3.1 + '@jest/reporters': 29.3.1 + '@jest/test-result': 29.3.1 + '@jest/transform': 29.3.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 ansi-escapes: 4.3.2 chalk: 4.1.2 @@ -1753,20 +1739,20 @@ packages: exit: 0.1.2 graceful-fs: 4.2.10 jest-changed-files: 29.2.0 - jest-config: 29.3.0_odkjkoia5xunhxkdrka32ib6vi - jest-haste-map: 29.3.0 - jest-message-util: 29.2.1 + jest-config: 29.3.1_odkjkoia5xunhxkdrka32ib6vi + jest-haste-map: 29.3.1 + jest-message-util: 29.3.1 jest-regex-util: 29.2.0 - jest-resolve: 29.3.0 - jest-resolve-dependencies: 29.3.0 - jest-runner: 29.3.0 - jest-runtime: 29.3.0 - jest-snapshot: 29.3.0 - jest-util: 29.2.1 - jest-validate: 29.2.2 - jest-watcher: 29.2.2 + jest-resolve: 29.3.1 + jest-resolve-dependencies: 29.3.1 + jest-runner: 29.3.1 + jest-runtime: 29.3.1 + jest-snapshot: 29.3.1 + jest-util: 29.3.1 + jest-validate: 29.3.1 + jest-watcher: 29.3.1 micromatch: 4.0.5 - pretty-format: 29.2.1 + pretty-format: 29.3.1 slash: 3.0.0 strip-ansi: 6.0.1 transitivePeerDependencies: @@ -1774,14 +1760,14 @@ packages: - ts-node dev: false - /@jest/environment/29.3.0: - resolution: {integrity: sha512-8wgn3br51bx+7rgC8FOKmAD62Q39iswdiy5/p6acoekp/9Bb/IQbh3zydOrnGp74LwStSrKgpQSKBlOKlAQq0g==} + /@jest/environment/29.3.1: + resolution: {integrity: sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/fake-timers': 29.3.0 - '@jest/types': 29.2.1 + '@jest/fake-timers': 29.3.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 - jest-mock: 29.3.0 + jest-mock: 29.3.1 dev: false /@jest/expect-utils/29.2.2: @@ -1791,42 +1777,49 @@ packages: jest-get-type: 29.2.0 dev: false - /@jest/expect/29.3.0: - resolution: {integrity: sha512-Lz/3x4Se5g6nBuLjTO+xE8D4OXY9fFmosZPwkXXZUJUsp9r9seN81cJa54wOGr1QjCQnhngMqclblhM4X/hcCg==} + /@jest/expect-utils/29.3.1: + resolution: {integrity: sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - expect: 29.3.0 - jest-snapshot: 29.3.0 + jest-get-type: 29.2.0 + dev: false + + /@jest/expect/29.3.1: + resolution: {integrity: sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + expect: 29.3.1 + jest-snapshot: 29.3.1 transitivePeerDependencies: - supports-color dev: false - /@jest/fake-timers/29.3.0: - resolution: {integrity: sha512-SzmWtN6Rld+xebMRGuWeMGhytc7qHnYfFk1Zd/1QavQWsFOmA9SgtvGHCBue1wXQhdDMaSIm1aPGj2Zmyrr1Zg==} + /@jest/fake-timers/29.3.1: + resolution: {integrity: sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.2.1 + '@jest/types': 29.3.1 '@sinonjs/fake-timers': 9.1.2 '@types/node': 18.11.9 - jest-message-util: 29.2.1 - jest-mock: 29.3.0 - jest-util: 29.2.1 + jest-message-util: 29.3.1 + jest-mock: 29.3.1 + jest-util: 29.3.1 dev: false - /@jest/globals/29.3.0: - resolution: {integrity: sha512-okYDVzYNrt/4ysR8XnX6u0I1bGG4kmfdXtUu7kwWHZ9OP13RCjmphgve0tfOrNluwksWvOPYS1f/HOrFTHLygQ==} + /@jest/globals/29.3.1: + resolution: {integrity: sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/environment': 29.3.0 - '@jest/expect': 29.3.0 - '@jest/types': 29.2.1 - jest-mock: 29.3.0 + '@jest/environment': 29.3.1 + '@jest/expect': 29.3.1 + '@jest/types': 29.3.1 + jest-mock: 29.3.1 transitivePeerDependencies: - supports-color dev: false - /@jest/reporters/29.3.0: - resolution: {integrity: sha512-MV76tB3Kd80vcv2yMDZfQpMkwkHaY9hlvVhCtHXkVRCWwN+SX3EOmCdX8pT/X4Xh+NusA7l2Rc3yhx4q5p3+Fg==} + /@jest/reporters/29.3.1: + resolution: {integrity: sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -1835,10 +1828,10 @@ packages: optional: true dependencies: '@bcoe/v8-coverage': 0.2.3 - '@jest/console': 29.2.1 - '@jest/test-result': 29.2.1 - '@jest/transform': 29.3.0 - '@jest/types': 29.2.1 + '@jest/console': 29.3.1 + '@jest/test-result': 29.3.1 + '@jest/transform': 29.3.1 + '@jest/types': 29.3.1 '@jridgewell/trace-mapping': 0.3.17 '@types/node': 18.11.9 chalk: 4.1.2 @@ -1851,9 +1844,9 @@ packages: istanbul-lib-report: 3.0.0 istanbul-lib-source-maps: 4.0.1 istanbul-reports: 3.1.5 - jest-message-util: 29.2.1 - jest-util: 29.2.1 - jest-worker: 29.3.0 + jest-message-util: 29.3.1 + jest-util: 29.3.1 + jest-worker: 29.3.1 slash: 3.0.0 string-length: 4.0.2 strip-ansi: 6.0.1 @@ -1878,41 +1871,41 @@ packages: graceful-fs: 4.2.10 dev: false - /@jest/test-result/29.2.1: - resolution: {integrity: sha512-lS4+H+VkhbX6z64tZP7PAUwPqhwj3kbuEHcaLuaBuB+riyaX7oa1txe0tXgrFj5hRWvZKvqO7LZDlNWeJ7VTPA==} + /@jest/test-result/29.3.1: + resolution: {integrity: sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/console': 29.2.1 - '@jest/types': 29.2.1 + '@jest/console': 29.3.1 + '@jest/types': 29.3.1 '@types/istanbul-lib-coverage': 2.0.4 collect-v8-coverage: 1.0.1 dev: false - /@jest/test-sequencer/29.3.0: - resolution: {integrity: sha512-XQlTP/S6Yf6NKV0Mt4oopFKyDxiEkDMD7hIFcCTeltKQszE0Z+LI5KLukwNW6Qxr1YzaZ/s6PlKJusiCLJNTcw==} + /@jest/test-sequencer/29.3.1: + resolution: {integrity: sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/test-result': 29.2.1 + '@jest/test-result': 29.3.1 graceful-fs: 4.2.10 - jest-haste-map: 29.3.0 + jest-haste-map: 29.3.1 slash: 3.0.0 dev: false - /@jest/transform/29.3.0: - resolution: {integrity: sha512-4T8h61ItCakAlJkdYa7XVWP3r39QldlCeOSNmRpiJisi5PrrlzwZdpJDIH13ZZjh+MlSPQ2cq8YbUs3TuH+tRA==} + /@jest/transform/29.3.1: + resolution: {integrity: sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@babel/core': 7.20.2 - '@jest/types': 29.2.1 + '@jest/types': 29.3.1 '@jridgewell/trace-mapping': 0.3.17 babel-plugin-istanbul: 6.1.1 chalk: 4.1.2 convert-source-map: 2.0.0 fast-json-stable-stringify: 2.1.0 graceful-fs: 4.2.10 - jest-haste-map: 29.3.0 + jest-haste-map: 29.3.1 jest-regex-util: 29.2.0 - jest-util: 29.2.1 + jest-util: 29.3.1 micromatch: 4.0.5 pirates: 4.0.5 slash: 3.0.0 @@ -1921,8 +1914,8 @@ packages: - supports-color dev: false - /@jest/types/29.2.1: - resolution: {integrity: sha512-O/QNDQODLnINEPAI0cl9U6zUIDXEWXt6IC1o2N2QENuos7hlGUIthlKyV4p6ki3TvXFX071blj8HUhgLGquPjw==} + /@jest/types/29.3.1: + resolution: {integrity: sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/schemas': 29.0.0 @@ -3463,14 +3456,14 @@ packages: resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/axobject-query/-/axobject-query-2.2.0.tgz} dev: false - /babel-jest/29.3.0_@babel+core@7.20.2: - resolution: {integrity: sha512-LzQWdGm6hUugVeyGpIKI/T4SVT+PgAA5WFPqBDbneK7C/PqfckNb0tc4KvcKXq/PLA1yY6wTvB8Bc/REQdUxFg==} + /babel-jest/29.3.1_@babel+core@7.20.2: + resolution: {integrity: sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: '@babel/core': ^7.8.0 dependencies: '@babel/core': 7.20.2 - '@jest/transform': 29.3.0 + '@jest/transform': 29.3.1 '@types/babel__core': 7.1.20 babel-plugin-istanbul: 6.1.1 babel-preset-jest: 29.2.0_@babel+core@7.20.2 @@ -4874,8 +4867,8 @@ packages: resolution: {integrity: sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==} dev: false - /diff-sequences/29.2.0: - resolution: {integrity: sha512-413SY5JpYeSBZxmenGEmCVQ8mCgtFJF0w9PROdaS6z987XC2Pd2GOKqOITLtMftmyFZqgtCOb/QA7/Z3ZXfzIw==} + /diff-sequences/29.3.1: + resolution: {integrity: sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dev: false @@ -5348,7 +5341,7 @@ packages: - supports-color dev: false - /eslint-plugin-jest/27.1.4_oyhdxdxe4qakybjbdlayychnea: + /eslint-plugin-jest/27.1.4_kdswgjmqcx7mthqz7ow2zlfevy: resolution: {integrity: sha512-evJ9E9id/z2Fu6LR+ncNySJ6UMs5RiJiv4JsmdA3gPWoq0AR+uZyva738+Y9Uln+3WaYX+3OYP9HJoau94Iurg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -5364,7 +5357,7 @@ packages: '@typescript-eslint/eslint-plugin': 5.42.1_2udltptbznfmezdozpdoa2aemq '@typescript-eslint/utils': 5.42.0_rmayb2veg2btbq6mbmnyivgasy eslint: 8.27.0 - jest: 29.3.0_odkjkoia5xunhxkdrka32ib6vi + jest: 29.3.1_odkjkoia5xunhxkdrka32ib6vi transitivePeerDependencies: - supports-color - typescript @@ -5712,15 +5705,15 @@ packages: jest-util: 29.2.1 dev: false - /expect/29.3.0: - resolution: {integrity: sha512-bms139btnQNZh4uxCPmzbWz46YOjtEpYIZ847OfY9GCeSBEfzedHWH0CkdR20Sy+XBs8/FI2lFJPZiuH0NGv+w==} + /expect/29.3.1: + resolution: {integrity: sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/expect-utils': 29.2.2 + '@jest/expect-utils': 29.3.1 jest-get-type: 29.2.0 - jest-matcher-utils: 29.2.2 - jest-message-util: 29.2.1 - jest-util: 29.2.1 + jest-matcher-utils: 29.3.1 + jest-message-util: 29.3.1 + jest-util: 29.3.1 dev: false /extend-shallow/2.0.1: @@ -7288,35 +7281,35 @@ packages: p-limit: 3.1.0 dev: false - /jest-circus/29.3.0: - resolution: {integrity: sha512-xL1cmbUGBGy923KBZpZ2LRKspHlIhrltrwGaefJ677HXCPY5rTF758BtweamBype2ogcSEK/oqcp1SmYZ/ATig==} + /jest-circus/29.3.1: + resolution: {integrity: sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/environment': 29.3.0 - '@jest/expect': 29.3.0 - '@jest/test-result': 29.2.1 - '@jest/types': 29.2.1 + '@jest/environment': 29.3.1 + '@jest/expect': 29.3.1 + '@jest/test-result': 29.3.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 is-generator-fn: 2.1.0 - jest-each: 29.2.1 - jest-matcher-utils: 29.2.2 - jest-message-util: 29.2.1 - jest-runtime: 29.3.0 - jest-snapshot: 29.3.0 - jest-util: 29.2.1 + jest-each: 29.3.1 + jest-matcher-utils: 29.3.1 + jest-message-util: 29.3.1 + jest-runtime: 29.3.1 + jest-snapshot: 29.3.1 + jest-util: 29.3.1 p-limit: 3.1.0 - pretty-format: 29.2.1 + pretty-format: 29.3.1 slash: 3.0.0 - stack-utils: 2.0.5 + stack-utils: 2.0.6 transitivePeerDependencies: - supports-color dev: false - /jest-cli/29.3.0_odkjkoia5xunhxkdrka32ib6vi: - resolution: {integrity: sha512-rDb9iasZvqTkgrlwzVGemR5i20T0/XN1ug46Ch2vxTRa0zS5PHaVXQXYzYbuLFHs1xpc+XsB9xPfEkkwbnLJBg==} + /jest-cli/29.3.1_odkjkoia5xunhxkdrka32ib6vi: + resolution: {integrity: sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true peerDependencies: @@ -7325,16 +7318,16 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 29.3.0_ts-node@10.9.1 - '@jest/test-result': 29.2.1 - '@jest/types': 29.2.1 + '@jest/core': 29.3.1_ts-node@10.9.1 + '@jest/test-result': 29.3.1 + '@jest/types': 29.3.1 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.10 import-local: 3.1.0 - jest-config: 29.3.0_odkjkoia5xunhxkdrka32ib6vi - jest-util: 29.2.1 - jest-validate: 29.2.2 + jest-config: 29.3.1_odkjkoia5xunhxkdrka32ib6vi + jest-util: 29.3.1 + jest-validate: 29.3.1 prompts: 2.4.2 yargs: 17.6.2 transitivePeerDependencies: @@ -7343,8 +7336,8 @@ packages: - ts-node dev: false - /jest-config/29.3.0_odkjkoia5xunhxkdrka32ib6vi: - resolution: {integrity: sha512-sTSDs/M+//njznsytxiBxwfDnSWRb6OqiNSlO/B2iw1HUaa1YLsdWmV4AWLXss1XKzv1F0yVK+kA4XOhZ0I1qQ==} + /jest-config/29.3.1_odkjkoia5xunhxkdrka32ib6vi: + resolution: {integrity: sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: '@types/node': '*' @@ -7356,26 +7349,26 @@ packages: optional: true dependencies: '@babel/core': 7.20.2 - '@jest/test-sequencer': 29.3.0 - '@jest/types': 29.2.1 + '@jest/test-sequencer': 29.3.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 - babel-jest: 29.3.0_@babel+core@7.20.2 + babel-jest: 29.3.1_@babel+core@7.20.2 chalk: 4.1.2 ci-info: 3.5.0 deepmerge: 4.2.2 glob: 7.2.3 graceful-fs: 4.2.10 - jest-circus: 29.3.0 - jest-environment-node: 29.3.0 + jest-circus: 29.3.1 + jest-environment-node: 29.3.1 jest-get-type: 29.2.0 jest-regex-util: 29.2.0 - jest-resolve: 29.3.0 - jest-runner: 29.3.0 - jest-util: 29.2.1 - jest-validate: 29.2.2 + jest-resolve: 29.3.1 + jest-runner: 29.3.1 + jest-util: 29.3.1 + jest-validate: 29.3.1 micromatch: 4.0.5 parse-json: 5.2.0 - pretty-format: 29.2.1 + pretty-format: 29.3.1 slash: 3.0.0 strip-json-comments: 3.1.1 ts-node: 10.9.1_cbe7ovvae6zqfnmtgctpgpys54 @@ -7383,14 +7376,14 @@ packages: - supports-color dev: false - /jest-diff/29.2.1: - resolution: {integrity: sha512-gfh/SMNlQmP3MOUgdzxPOd4XETDJifADpT937fN1iUGz+9DgOu2eUPHH25JDkLVcLwwqxv3GzVyK4VBUr9fjfA==} + /jest-diff/29.3.1: + resolution: {integrity: sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: chalk: 4.1.2 - diff-sequences: 29.2.0 + diff-sequences: 29.3.1 jest-get-type: 29.2.0 - pretty-format: 29.2.1 + pretty-format: 29.3.1 dev: false /jest-docblock/29.2.0: @@ -7400,27 +7393,27 @@ packages: detect-newline: 3.1.0 dev: false - /jest-each/29.2.1: - resolution: {integrity: sha512-sGP86H/CpWHMyK3qGIGFCgP6mt+o5tu9qG4+tobl0LNdgny0aitLXs9/EBacLy3Bwqy+v4uXClqJgASJWcruYw==} + /jest-each/29.3.1: + resolution: {integrity: sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.2.1 + '@jest/types': 29.3.1 chalk: 4.1.2 jest-get-type: 29.2.0 - jest-util: 29.2.1 - pretty-format: 29.2.1 + jest-util: 29.3.1 + pretty-format: 29.3.1 dev: false - /jest-environment-node/29.3.0: - resolution: {integrity: sha512-oikVE5pyiBUMrqi7J/kFGd1zeT14+EnJulyqzopDNijLX13ygwjiOF/GVpVKSGyBrrAwSkaj/ohEQJCcjkCtOA==} + /jest-environment-node/29.3.1: + resolution: {integrity: sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/environment': 29.3.0 - '@jest/fake-timers': 29.3.0 - '@jest/types': 29.2.1 + '@jest/environment': 29.3.1 + '@jest/fake-timers': 29.3.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 - jest-mock: 29.3.0 - jest-util: 29.2.1 + jest-mock: 29.3.1 + jest-util: 29.3.1 dev: false /jest-get-type/29.2.0: @@ -7428,31 +7421,31 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dev: false - /jest-haste-map/29.3.0: - resolution: {integrity: sha512-ugdLIreycMRRg3+6AjiExECmuFI2D9PS+BmNU7eGvBt3fzVMKybb9USAZXN6kw4Q6Mn8DSK+7OFCloY2rN820Q==} + /jest-haste-map/29.3.1: + resolution: {integrity: sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.2.1 + '@jest/types': 29.3.1 '@types/graceful-fs': 4.1.5 '@types/node': 18.11.9 anymatch: 3.1.2 fb-watchman: 2.0.2 graceful-fs: 4.2.10 jest-regex-util: 29.2.0 - jest-util: 29.2.1 - jest-worker: 29.3.0 + jest-util: 29.3.1 + jest-worker: 29.3.1 micromatch: 4.0.5 walker: 1.0.8 optionalDependencies: fsevents: 2.3.2 dev: false - /jest-leak-detector/29.2.1: - resolution: {integrity: sha512-1YvSqYoiurxKOJtySc+CGVmw/e1v4yNY27BjWTVzp0aTduQeA7pdieLiW05wTYG/twlKOp2xS/pWuikQEmklug==} + /jest-leak-detector/29.3.1: + resolution: {integrity: sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: jest-get-type: 29.2.0 - pretty-format: 29.2.1 + pretty-format: 29.3.1 dev: false /jest-matcher-utils/29.2.2: @@ -7460,36 +7453,61 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: chalk: 4.1.2 - jest-diff: 29.2.1 + jest-diff: 29.3.1 jest-get-type: 29.2.0 pretty-format: 29.2.1 dev: false + /jest-matcher-utils/29.3.1: + resolution: {integrity: sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + chalk: 4.1.2 + jest-diff: 29.3.1 + jest-get-type: 29.2.0 + pretty-format: 29.3.1 + dev: false + /jest-message-util/29.2.1: resolution: {integrity: sha512-Dx5nEjw9V8C1/Yj10S/8ivA8F439VS8vTq1L7hEgwHFn9ovSKNpYW/kwNh7UglaEgXO42XxzKJB+2x0nSglFVw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@babel/code-frame': 7.18.6 - '@jest/types': 29.2.1 + '@jest/types': 29.3.1 '@types/stack-utils': 2.0.1 chalk: 4.1.2 graceful-fs: 4.2.10 micromatch: 4.0.5 pretty-format: 29.2.1 slash: 3.0.0 - stack-utils: 2.0.5 + stack-utils: 2.0.6 dev: false - /jest-mock/29.3.0: - resolution: {integrity: sha512-BRKfsAaeP3pTWeog+1D0ILeJF96SzB6y3k0JDxY63kssxiUy9nDLHmNUoVkBGILjMbpHULhbzVTsb3harPXuUQ==} + /jest-message-util/29.3.1: + resolution: {integrity: sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.2.1 + '@babel/code-frame': 7.18.6 + '@jest/types': 29.3.1 + '@types/stack-utils': 2.0.1 + chalk: 4.1.2 + graceful-fs: 4.2.10 + micromatch: 4.0.5 + pretty-format: 29.3.1 + slash: 3.0.0 + stack-utils: 2.0.6 + dev: false + + /jest-mock/29.3.1: + resolution: {integrity: sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + '@jest/types': 29.3.1 '@types/node': 18.11.9 - jest-util: 29.2.1 + jest-util: 29.3.1 dev: false - /jest-pnp-resolver/1.2.2_jest-resolve@29.3.0: + /jest-pnp-resolver/1.2.2_jest-resolve@29.3.1: resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==} engines: {node: '>=6'} peerDependencies: @@ -7498,7 +7516,7 @@ packages: jest-resolve: optional: true dependencies: - jest-resolve: 29.3.0 + jest-resolve: 29.3.1 dev: false /jest-regex-util/29.2.0: @@ -7506,117 +7524,117 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dev: false - /jest-resolve-dependencies/29.3.0: - resolution: {integrity: sha512-ykSbDbWmIaHprOBig57AExw7i6Fj0y69M6baiAd75Ivx1UMQt4wsM6A+SNqIhycV6Zy8XV3L40Ac3HYSrDSq7w==} + /jest-resolve-dependencies/29.3.1: + resolution: {integrity: sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: jest-regex-util: 29.2.0 - jest-snapshot: 29.3.0 + jest-snapshot: 29.3.1 transitivePeerDependencies: - supports-color dev: false - /jest-resolve/29.3.0: - resolution: {integrity: sha512-xH6C6loDlOWEWHdCgioLDlbpmsolNdNsV/UR35ChuK217x0ttHuhyEPdh5wa6CTQ/Eq4OGW2/EZTlh0ay5aojQ==} + /jest-resolve/29.3.1: + resolution: {integrity: sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: chalk: 4.1.2 graceful-fs: 4.2.10 - jest-haste-map: 29.3.0 - jest-pnp-resolver: 1.2.2_jest-resolve@29.3.0 - jest-util: 29.2.1 - jest-validate: 29.2.2 + jest-haste-map: 29.3.1 + jest-pnp-resolver: 1.2.2_jest-resolve@29.3.1 + jest-util: 29.3.1 + jest-validate: 29.3.1 resolve: 1.22.1 resolve.exports: 1.1.0 slash: 3.0.0 dev: false - /jest-runner/29.3.0: - resolution: {integrity: sha512-E/ROzAVj7gy44FvIe+Tbz0xGWG1sa8WLkhUg/hsXHewPC0Z48kqWySdfYRtXkB7RmMn4OcWE+hIBfsRAMVV+sQ==} + /jest-runner/29.3.1: + resolution: {integrity: sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/console': 29.2.1 - '@jest/environment': 29.3.0 - '@jest/test-result': 29.2.1 - '@jest/transform': 29.3.0 - '@jest/types': 29.2.1 + '@jest/console': 29.3.1 + '@jest/environment': 29.3.1 + '@jest/test-result': 29.3.1 + '@jest/transform': 29.3.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.10 jest-docblock: 29.2.0 - jest-environment-node: 29.3.0 - jest-haste-map: 29.3.0 - jest-leak-detector: 29.2.1 - jest-message-util: 29.2.1 - jest-resolve: 29.3.0 - jest-runtime: 29.3.0 - jest-util: 29.2.1 - jest-watcher: 29.2.2 - jest-worker: 29.3.0 + jest-environment-node: 29.3.1 + jest-haste-map: 29.3.1 + jest-leak-detector: 29.3.1 + jest-message-util: 29.3.1 + jest-resolve: 29.3.1 + jest-runtime: 29.3.1 + jest-util: 29.3.1 + jest-watcher: 29.3.1 + jest-worker: 29.3.1 p-limit: 3.1.0 source-map-support: 0.5.13 transitivePeerDependencies: - supports-color dev: false - /jest-runtime/29.3.0: - resolution: {integrity: sha512-ufgX/hbpa7MLnjWRW82T5mVF73FBk3W38dGCLPXWtYZ5Zr1ZFh8QnaAtITKJt0p3kGXR8ZqlIjadSiBTk/QJ/A==} + /jest-runtime/29.3.1: + resolution: {integrity: sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/environment': 29.3.0 - '@jest/fake-timers': 29.3.0 - '@jest/globals': 29.3.0 + '@jest/environment': 29.3.1 + '@jest/fake-timers': 29.3.1 + '@jest/globals': 29.3.1 '@jest/source-map': 29.2.0 - '@jest/test-result': 29.2.1 - '@jest/transform': 29.3.0 - '@jest/types': 29.2.1 + '@jest/test-result': 29.3.1 + '@jest/transform': 29.3.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 chalk: 4.1.2 cjs-module-lexer: 1.2.2 collect-v8-coverage: 1.0.1 glob: 7.2.3 graceful-fs: 4.2.10 - jest-haste-map: 29.3.0 - jest-message-util: 29.2.1 - jest-mock: 29.3.0 + jest-haste-map: 29.3.1 + jest-message-util: 29.3.1 + jest-mock: 29.3.1 jest-regex-util: 29.2.0 - jest-resolve: 29.3.0 - jest-snapshot: 29.3.0 - jest-util: 29.2.1 + jest-resolve: 29.3.1 + jest-snapshot: 29.3.1 + jest-util: 29.3.1 slash: 3.0.0 strip-bom: 4.0.0 transitivePeerDependencies: - supports-color dev: false - /jest-snapshot/29.3.0: - resolution: {integrity: sha512-+4mX3T8XI3ABbZFzBd/AM74mfwOb6gMpYVFNTc0Cgg2F2fGYvHii8D6jWWka99a3wyNFmni3ov8meEVTF8n13Q==} + /jest-snapshot/29.3.1: + resolution: {integrity: sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@babel/core': 7.20.2 - '@babel/generator': 7.20.3 + '@babel/generator': 7.20.4 '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.2 '@babel/plugin-syntax-typescript': 7.20.0_@babel+core@7.20.2 '@babel/traverse': 7.20.1 '@babel/types': 7.20.2 - '@jest/expect-utils': 29.2.2 - '@jest/transform': 29.3.0 - '@jest/types': 29.2.1 + '@jest/expect-utils': 29.3.1 + '@jest/transform': 29.3.1 + '@jest/types': 29.3.1 '@types/babel__traverse': 7.18.2 '@types/prettier': 2.7.1 babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.2 chalk: 4.1.2 - expect: 29.3.0 + expect: 29.3.1 graceful-fs: 4.2.10 - jest-diff: 29.2.1 + jest-diff: 29.3.1 jest-get-type: 29.2.0 - jest-haste-map: 29.3.0 - jest-matcher-utils: 29.2.2 - jest-message-util: 29.2.1 - jest-util: 29.2.1 + jest-haste-map: 29.3.1 + jest-matcher-utils: 29.3.1 + jest-message-util: 29.3.1 + jest-util: 29.3.1 natural-compare: 1.4.0 - pretty-format: 29.2.1 + pretty-format: 29.3.1 semver: 7.3.8 transitivePeerDependencies: - supports-color @@ -7626,7 +7644,7 @@ packages: resolution: {integrity: sha512-P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.2.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 chalk: 4.1.2 ci-info: 3.5.0 @@ -7634,29 +7652,41 @@ packages: picomatch: 2.3.1 dev: false - /jest-validate/29.2.2: - resolution: {integrity: sha512-eJXATaKaSnOuxNfs8CLHgdABFgUrd0TtWS8QckiJ4L/QVDF4KVbZFBBOwCBZHOS0Rc5fOxqngXeGXE3nGQkpQA==} + /jest-util/29.3.1: + resolution: {integrity: sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/types': 29.2.1 + '@jest/types': 29.3.1 + '@types/node': 18.11.9 + chalk: 4.1.2 + ci-info: 3.5.0 + graceful-fs: 4.2.10 + picomatch: 2.3.1 + dev: false + + /jest-validate/29.3.1: + resolution: {integrity: sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + '@jest/types': 29.3.1 camelcase: 6.3.0 chalk: 4.1.2 jest-get-type: 29.2.0 leven: 3.1.0 - pretty-format: 29.2.1 + pretty-format: 29.3.1 dev: false - /jest-watcher/29.2.2: - resolution: {integrity: sha512-j2otfqh7mOvMgN2WlJ0n7gIx9XCMWntheYGlBK7+5g3b1Su13/UAK7pdKGyd4kDlrLwtH2QPvRv5oNIxWvsJ1w==} + /jest-watcher/29.3.1: + resolution: {integrity: sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jest/test-result': 29.2.1 - '@jest/types': 29.2.1 + '@jest/test-result': 29.3.1 + '@jest/types': 29.3.1 '@types/node': 18.11.9 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 - jest-util: 29.2.1 + jest-util: 29.3.1 string-length: 4.0.2 dev: false @@ -7669,18 +7699,18 @@ packages: supports-color: 7.2.0 dev: false - /jest-worker/29.3.0: - resolution: {integrity: sha512-rP8LYClB5NCWW0p8GdQT9vRmZNrDmjypklEYZuGCIU5iNviVWCZK5MILS3rQwD0FY1u96bY7b+KoU17DdZy6Ww==} + /jest-worker/29.3.1: + resolution: {integrity: sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@types/node': 18.11.9 - jest-util: 29.2.1 + jest-util: 29.3.1 merge-stream: 2.0.0 supports-color: 8.1.1 dev: false - /jest/29.3.0_odkjkoia5xunhxkdrka32ib6vi: - resolution: {integrity: sha512-lWmHtOcJSjR6FYRw+4oo7456QUe6LN73Lw6HLwOWKTPLcyQF60cMh0EoIHi67dV74SY5tw/kL+jYC+Ji43ScUg==} + /jest/29.3.1_odkjkoia5xunhxkdrka32ib6vi: + resolution: {integrity: sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true peerDependencies: @@ -7689,10 +7719,10 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 29.3.0_ts-node@10.9.1 - '@jest/types': 29.2.1 + '@jest/core': 29.3.1_ts-node@10.9.1 + '@jest/types': 29.3.1 import-local: 3.1.0 - jest-cli: 29.3.0_odkjkoia5xunhxkdrka32ib6vi + jest-cli: 29.3.1_odkjkoia5xunhxkdrka32ib6vi transitivePeerDependencies: - '@types/node' - supports-color @@ -9575,6 +9605,12 @@ packages: hasBin: true dev: false + /pidtree/0.6.0: + resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} + engines: {node: '>=0.10'} + hasBin: true + dev: false + /pify/3.0.0: resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==} engines: {node: '>=4'} @@ -10181,6 +10217,15 @@ packages: react-is: 18.2.0 dev: false + /pretty-format/29.3.1: + resolution: {integrity: sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + '@jest/schemas': 29.0.0 + ansi-styles: 5.2.0 + react-is: 18.2.0 + dev: false + /pretty-quick/3.1.3_prettier@2.7.1: resolution: {integrity: sha512-kOCi2FJabvuh1as9enxYmrnBC6tVMoVOenMaBqRfsvBHB0cbpYHjdQEpSglpASDFEXVwplpcGR4CLEaisYAFcA==} engines: {node: '>=10.13'} @@ -11495,6 +11540,20 @@ packages: queue-microtask: 1.2.3 dev: false + /run-shared-scripts/1.0.2: + resolution: {integrity: sha512-LCKNPU2/7Q0/BYcdO54kqnMrt3urj3c1qDHWPuGm+JuorI2/RKXB1G53TOfF1IUuKuZboRD5xS0EaP+ZT0Tojw==} + engines: {node: '>=14'} + hasBin: true + dependencies: + chalk: 5.1.2 + cross-spawn: 7.0.3 + fastest-levenshtein: 1.0.16 + find-monorepo-root: 1.0.2 + fs-extra: 10.1.0 + meow: 11.0.0 + pidtree: 0.6.0 + dev: false + /safe-buffer/5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} dev: false @@ -11981,8 +12040,8 @@ packages: deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility' dev: false - /stack-utils/2.0.5: - resolution: {integrity: sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==} + /stack-utils/2.0.6: + resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==} engines: {node: '>=10'} dependencies: escape-string-regexp: 2.0.0 @@ -12693,7 +12752,7 @@ packages: resolution: {integrity: sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==} dev: false - /ts-jest/29.0.3_35m2wlk7dtrpmmk2m6jvo7qjly: + /ts-jest/29.0.3_25xopm7qx5wgmsgnog4okhpq5a: resolution: {integrity: sha512-Ibygvmuyq1qp/z3yTh9QTwVVAbFdDy/+4BtIQR2sp6baF2SJU/8CKK/hhnGIDY2L90Az2jIqTwZPnN2p+BweiQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -12717,7 +12776,7 @@ packages: '@babel/core': 7.20.2 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 - jest: 29.3.0_odkjkoia5xunhxkdrka32ib6vi + jest: 29.3.1_odkjkoia5xunhxkdrka32ib6vi jest-util: 29.2.1 json5: 2.2.1 lodash.memoize: 4.1.2 @@ -13331,7 +13390,7 @@ packages: /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} dependencies: - string-width: 4.2.3 + string-width: 1.0.2 dev: false /widest-line/3.1.0: diff --git a/scripts/x6-build-tools/bin/less.js b/scripts/build-less similarity index 93% rename from scripts/x6-build-tools/bin/less.js rename to scripts/build-less index 9c82a13ba5d..430cf58dc0f 100755 --- a/scripts/x6-build-tools/bin/less.js +++ b/scripts/build-less @@ -1,10 +1,10 @@ #!/usr/bin/env node -import fs from 'fs' -import os from 'os' -import path from 'path' -import fse from 'fs-extra' -import cp from 'child_process' +const fs = require('fs') +const os = require('os') +const path = require('path') +const fse = require('fs-extra') +const cp = require('child_process') const cwd = process.cwd() const es = path.join(cwd, 'es') diff --git a/scripts/preinstall.js b/scripts/preinstall.js index 8736fb4ae5b..a263bff3bb9 100644 --- a/scripts/preinstall.js +++ b/scripts/preinstall.js @@ -1,3 +1,5 @@ +#!/usr/bin/env node + if (!/pnpm/.test(process.env.npm_execpath || '')) { console.warn( `This repository requires using pnpm as the package manager for scripts to work properly.`, diff --git a/scripts/x6-build-tools/bin/test.js b/scripts/run-test similarity index 84% rename from scripts/x6-build-tools/bin/test.js rename to scripts/run-test index ce52d39d9bb..a2baaf5f134 100755 --- a/scripts/x6-build-tools/bin/test.js +++ b/scripts/run-test @@ -1,6 +1,8 @@ -import fs from 'fs' -import path from 'path' -import spawn from 'cross-spawn' +#!/usr/bin/env node + +const fs = require('fs') +const path = require('path') +const spawn = require('cross-spawn') const cwd = process.cwd() const karmaConf = path.join(cwd, 'karma.conf.js') diff --git a/scripts/x6-build-tools/.gitignore b/scripts/x6-build-tools/.gitignore deleted file mode 100644 index ebf4281dc07..00000000000 --- a/scripts/x6-build-tools/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!lib diff --git a/scripts/x6-build-tools/CHANGELOG.md b/scripts/x6-build-tools/CHANGELOG.md deleted file mode 100644 index bb09618e0d2..00000000000 --- a/scripts/x6-build-tools/CHANGELOG.md +++ /dev/null @@ -1,24 +0,0 @@ -# @antv/x6-build-tools 1.0.0 (2022-11-05) - - -### Bug Fixes - -* error -> ETXTBSY: text file is busy ([814e0dd](https://github.com/antvis/x6/commit/814e0dd137ab766b3f80e737bef9485d40a315f4)) -* unique cmd file name ([da18f12](https://github.com/antvis/x6/commit/da18f126ea3a9d09a2a3e6c2ff680bcd4d916845)) - - -### chore - -* bump to 2.0 ([94af7fa](https://github.com/antvis/x6/commit/94af7fa7ec96e3417db9aa5d245751507ae2671e)) -* bump to 2.0 ([ecffe1a](https://github.com/antvis/x6/commit/ecffe1a2a8bcf5538f027c3c54acaefc50215023)) - - -### Features - -* add rss command to run sharable scripts ([4a45fa7](https://github.com/antvis/x6/commit/4a45fa7d386dbb17ce60102cb406905d439a64bd)) - - -### BREAKING CHANGES - -* bump to 2.0 -* bump to 2.0 diff --git a/scripts/x6-build-tools/bin/rss.js b/scripts/x6-build-tools/bin/rss.js deleted file mode 100755 index ea131eeaf5c..00000000000 --- a/scripts/x6-build-tools/bin/rss.js +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env node - -import os from 'os' -import fse from 'fs-extra' -import path from 'path' -import crypto from 'crypto' -import colors from 'colors/safe.js' -import spawn from 'cross-spawn' -import { closest } from 'fastest-levenshtein' -import { findMonorepoRootSync } from 'find-monorepo-root/sync' - -let script -const event = process.env.npm_lifecycle_event -if (event != null) { - const { dir } = findMonorepoRootSync(process.cwd()) - const { rss } = fse.readJSONSync(path.join(dir, 'package.json')) - script = rss[event] -} - -if (script) { - const tmpdir = os.tmpdir() - const dir = path.join(tmpdir, 'rss') - if (!fse.existsSync(dir)) { - fse.mkdirSync(dir) - } - const hash = crypto.randomBytes(16).toString('hex') - const name = event.toLowerCase().replace(/[^0-9a-z]/g, '-') - const isWin32 = process.platform === 'win32' - const ext = isWin32 ? '.cmd' : '' - const file = path.join(dir, `${name}-${hash}`, ext) - const define = isWin32 ? '@ECHO OFF' : '#!/usr/bin/env sh' - const args = process.argv.slice(2) - const main = args.length ? `${script} ${args.join(' ')}` : script - - fse.writeFileSync(file, `${define}\n\n${main}`) - fse.chmodSync(file, 0o777) - - const eventColor = closest(event, [ - 'green', - 'yellow', - 'blue', - 'magenta', - 'cyan', - 'red', - ]) - const eventTitle = colors[eventColor](`[${event}]`) - console.log(`> ${eventTitle} ${main}`) - const child = spawn(file, { stdio: 'inherit' }) - - child.on('exit', () => { - fse.rmSync(file) - }) -} else { - console.error(`unknown script: [${event}]`) -} diff --git a/scripts/x6-build-tools/package.json b/scripts/x6-build-tools/package.json deleted file mode 100644 index d3812971696..00000000000 --- a/scripts/x6-build-tools/package.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "private": true, - "name": "@antv/x6-build-tools", - "version": "1.0.0", - "type": "module", - "bin": { - "rss": "./bin/rss.js", - "rss-test": "./bin/test.js", - "rss-less": "./bin/less.js" - }, - "files": [ - "lib", - "bin" - ], - "scripts": {}, - "dependencies": { - "colors": "^1.4.0", - "cross-spawn": "^7.0.3", - "fastest-levenshtein": "^1.0.16", - "find-monorepo-root": "^1.0.1", - "fs-extra": "^10.0.0" - }, - "author": { - "name": "bubkoo", - "email": "bubkoo.wy@gmail.com" - }, - "license": "MIT", - "homepage": "https://github.com/antvis/x6", - "bugs": { - "url": "https://github.com/antvis/x6/issues" - }, - "repository": { - "type": "git", - "url": "ssh://git@github.com/antvis/x6.git", - "directory": "scripts/x6-build-tools" - } -}