From 2ac326245678745b5395859da784f117cb025323 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:33:53 +0100 Subject: [PATCH 01/16] chore(deps): update actions/cache action to v4 (#5137) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/actions/setup-and-cache/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-and-cache/action.yml b/.github/actions/setup-and-cache/action.yml index 123ee818ba25..3f708fb8e596 100644 --- a/.github/actions/setup-and-cache/action.yml +++ b/.github/actions/setup-and-cache/action.yml @@ -46,7 +46,7 @@ runs: run: echo "Failed to resolve package versions. See log above." && exit 1 - name: Cache Cypress v${{ steps.resolve-package-versions.outputs.CYPRESS_VERSION }} - uses: actions/cache@v3 + uses: actions/cache@v4 id: cypress-cache with: path: ${{ env.CYPRESS_CACHE_FOLDER }} @@ -55,7 +55,7 @@ runs: ${{ runner.os }}-cypress- - name: Cache Playwright v${{ steps.resolve-package-versions.outputs.PLAYWRIGHT_VERSION }} - uses: actions/cache@v3 + uses: actions/cache@v4 id: playwright-cache with: path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }} From c485708b749c3d1880abbacdd1a3850b453f76b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:34:38 +0100 Subject: [PATCH 02/16] chore(deps): update actions/github-script action to v7 (#5138) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ecosystem-ci-trigger.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ecosystem-ci-trigger.yml b/.github/workflows/ecosystem-ci-trigger.yml index bcbd8c765f73..c94b92024a4e 100644 --- a/.github/workflows/ecosystem-ci-trigger.yml +++ b/.github/workflows/ecosystem-ci-trigger.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'vitest-dev/vitest' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/ecosystem-ci run') steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 with: script: | const user = context.payload.sender.login @@ -45,7 +45,7 @@ jobs: }) throw new Error('not allowed') } - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 id: get-pr-data with: script: | @@ -66,7 +66,7 @@ jobs: app_id: ${{ secrets.ECOSYSTEM_CI_GITHUB_APP_ID }} installation_retrieval_payload: '${{ github.repository_owner }}/vitest-ecosystem-ci' private_key: ${{ secrets.ECOSYSTEM_CI_GITHUB_APP_PRIVATE_KEY }} - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 id: trigger env: COMMENT: ${{ github.event.comment.body }} From ef55724377b9fe1032bcdcb24160d9a58096c7bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:35:14 +0100 Subject: [PATCH 03/16] fix(deps): update dependency strip-literal to v2 (#5136) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/vitest/package.json | 2 +- pnpm-lock.yaml | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/vitest/package.json b/packages/vitest/package.json index a561c277da5f..2c75e6801ff0 100644 --- a/packages/vitest/package.json +++ b/packages/vitest/package.json @@ -156,7 +156,7 @@ "pathe": "^1.1.1", "picocolors": "^1.0.0", "std-env": "^3.5.0", - "strip-literal": "^1.3.0", + "strip-literal": "^2.0.0", "tinybench": "^2.5.1", "tinypool": "^0.8.2", "vite": "^5.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 172c77b13479..57bff926bef1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1343,8 +1343,8 @@ importers: specifier: ^3.5.0 version: 3.5.0 strip-literal: - specifier: ^1.3.0 - version: 1.3.0 + specifier: ^2.0.0 + version: 2.0.0 tinybench: specifier: ^2.5.1 version: 2.5.1 @@ -19045,7 +19045,6 @@ packages: /js-tokens@8.0.2: resolution: {integrity: sha512-Olnt+V7xYdvGze9YTbGFZIfQXuGV4R3nQwwl8BrtgaPE/wq8UFpUHWuTNc05saowhSr1ZO6tx+V6RjE9D5YQog==} - dev: true /js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} @@ -24336,6 +24335,13 @@ packages: resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==} dependencies: acorn: 8.10.0 + dev: true + + /strip-literal@2.0.0: + resolution: {integrity: sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==} + dependencies: + js-tokens: 8.0.2 + dev: false /style-loader@1.3.0(webpack@4.46.0): resolution: {integrity: sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==} From 4bc59f505f0125c4763b513b0e87153fff048570 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:45:10 +0100 Subject: [PATCH 04/16] chore(deps): update dependency happy-dom to v13 (#5140) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/vitest/package.json | 2 +- pnpm-lock.yaml | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/vitest/package.json b/packages/vitest/package.json index 2c75e6801ff0..2d8c6eac46c0 100644 --- a/packages/vitest/package.json +++ b/packages/vitest/package.json @@ -184,7 +184,7 @@ "find-up": "^6.3.0", "flatted": "^3.2.9", "get-tsconfig": "^4.7.2", - "happy-dom": "^12.10.3", + "happy-dom": "^13.3.8", "jsdom": "^24.0.0", "log-update": "^5.0.1", "micromatch": "^4.0.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 57bff926bef1..4df17c4f2842 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1422,8 +1422,8 @@ importers: specifier: ^4.7.2 version: 4.7.2 happy-dom: - specifier: ^12.10.3 - version: 12.10.3 + specifier: ^13.3.8 + version: 13.3.8 jsdom: specifier: ^24.0.0 version: 24.0.0 @@ -17142,6 +17142,15 @@ packages: whatwg-mimetype: 3.0.0 dev: true + /happy-dom@13.3.8: + resolution: {integrity: sha512-RAbq4oYfJNkVan1m1F3jfA4YEyRY0/ASoNvZsNJbuX85jIypidmsz9jQZD7Tqz0VXA2MhAGfcsh5oshwmwNYSg==} + engines: {node: '>=16.0.0'} + dependencies: + entities: 4.5.0 + webidl-conversions: 7.0.0 + whatwg-mimetype: 3.0.0 + dev: true + /has-ansi@2.0.0: resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==} engines: {node: '>=0.10.0'} From dd2b87ee28fca8cb5a0d37047313ca35f791033a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:20:50 +0100 Subject: [PATCH 05/16] chore(deps): update dependency @types/ungap__structured-clone to v1 (#5146) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/web-worker/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/web-worker/package.json b/packages/web-worker/package.json index c3d450d63d47..c54b54e3026e 100644 --- a/packages/web-worker/package.json +++ b/packages/web-worker/package.json @@ -46,7 +46,7 @@ }, "devDependencies": { "@types/debug": "^4.1.12", - "@types/ungap__structured-clone": "^0.3.3", + "@types/ungap__structured-clone": "^1.2.0", "@ungap/structured-clone": "^1.2.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4df17c4f2842..6f089c79f6c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1462,8 +1462,8 @@ importers: specifier: ^4.1.12 version: 4.1.12 '@types/ungap__structured-clone': - specifier: ^0.3.3 - version: 0.3.3 + specifier: ^1.2.0 + version: 1.2.0 '@ungap/structured-clone': specifier: ^1.2.0 version: 1.2.0 @@ -9612,8 +9612,8 @@ packages: source-map: 0.6.1 dev: true - /@types/ungap__structured-clone@0.3.3: - resolution: {integrity: sha512-RNmhIPwoip6K/zZOv3ypksTAqaqLEXvlNSXKyrC93xMSOAHZCR7PifW6xKZCwkbbnbM9dwB9X56PPoNTlNwEqw==} + /@types/ungap__structured-clone@1.2.0: + resolution: {integrity: sha512-ZoaihZNLeZSxESbk9PUAPZOlSpcKx81I1+4emtULDVmBLkYutTcMlCj2K9VNlf9EWODxdO6gkAqEaLorXwZQVA==} dev: true /@types/unist@2.0.6: From 16b3ab3aa354eb82008de72bc75ea07a86b589a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:26:02 +0100 Subject: [PATCH 06/16] chore(deps): update dependency @vitejs/plugin-vue to v5 (#5147) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/ui/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/ui/package.json b/packages/ui/package.json index 59f57cadbe24..6864fc88ea25 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -66,7 +66,7 @@ "@types/d3-selection": "^3.0.10", "@types/ws": "^8.5.9", "@unocss/reset": "^0.57.4", - "@vitejs/plugin-vue": "^4.4.1", + "@vitejs/plugin-vue": "^5.0.3", "@vitejs/plugin-vue-jsx": "^3.0.2", "@vitest/runner": "workspace:*", "@vitest/ws-client": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6f089c79f6c8..d9ee5ebd9f0c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1179,8 +1179,8 @@ importers: specifier: ^0.57.4 version: 0.57.4 '@vitejs/plugin-vue': - specifier: ^4.4.1 - version: 4.4.1(vite@5.0.12)(vue@3.3.8) + specifier: ^5.0.3 + version: 5.0.3(vite@5.0.12)(vue@3.3.8) '@vitejs/plugin-vue-jsx': specifier: ^3.0.2 version: 3.0.2(vite@5.0.12)(vue@3.3.8) @@ -10210,8 +10210,8 @@ packages: - supports-color dev: true - /@vitejs/plugin-vue@4.4.1(vite@5.0.12)(vue@3.3.8): - resolution: {integrity: sha512-HCQG8VDFDM7YDAdcj5QI5DvUi+r6xvo9LgvYdk7LSkUNwdpempdB5horkMSZsbdey9Ywsf5aaU8kEPw9M5kREA==} + /@vitejs/plugin-vue@4.5.0(vite@5.0.12)(vue@3.3.8): + resolution: {integrity: sha512-a2WSpP8X8HTEww/U00bU4mX1QpLINNuz/2KMNpLsdu3BzOpak3AGI1CJYBTXcc4SPhaD0eNRUp7IyQK405L5dQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^5.0.12 @@ -10221,26 +10221,26 @@ packages: vue: 3.3.8(typescript@5.2.2) dev: true - /@vitejs/plugin-vue@4.5.0(vite@5.0.12)(vue@3.3.8): - resolution: {integrity: sha512-a2WSpP8X8HTEww/U00bU4mX1QpLINNuz/2KMNpLsdu3BzOpak3AGI1CJYBTXcc4SPhaD0eNRUp7IyQK405L5dQ==} - engines: {node: ^14.18.0 || >=16.0.0} + /@vitejs/plugin-vue@5.0.2(vite@5.0.12)(vue@3.4.5): + resolution: {integrity: sha512-kEjJHrLb5ePBvjD0SPZwJlw1QTRcjjCA9sB5VyfonoXVBxTS7TMnqL6EkLt1Eu61RDeiuZ/WN9Hf6PxXhPI2uA==} + engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.12 vue: ^3.2.25 dependencies: vite: 5.0.12(@types/node@20.11.5)(less@4.1.3) - vue: 3.3.8(typescript@5.2.2) + vue: 3.4.5(typescript@5.2.2) dev: true - /@vitejs/plugin-vue@5.0.2(vite@5.0.12)(vue@3.4.5): - resolution: {integrity: sha512-kEjJHrLb5ePBvjD0SPZwJlw1QTRcjjCA9sB5VyfonoXVBxTS7TMnqL6EkLt1Eu61RDeiuZ/WN9Hf6PxXhPI2uA==} + /@vitejs/plugin-vue@5.0.3(vite@5.0.12)(vue@3.3.8): + resolution: {integrity: sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.12 vue: ^3.2.25 dependencies: vite: 5.0.12(@types/node@20.11.5)(less@4.1.3) - vue: 3.4.5(typescript@5.2.2) + vue: 3.3.8(typescript@5.2.2) dev: true /@volar/language-core@1.10.4: From 9fbccde2a2f55cda9fc3c533e148c1087911f050 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:26:15 +0100 Subject: [PATCH 07/16] chore(deps): update dependency npm-run-all2 to v6 (#5149) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 451edc048580..c1501075bd74 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "fast-glob": "^3.3.2", "lint-staged": "^15.1.0", "magic-string": "^0.30.5", - "npm-run-all2": "^5.0.0", + "npm-run-all2": "^6.1.2", "pathe": "^1.1.1", "rimraf": "^5.0.5", "rollup": "^4.9.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d9ee5ebd9f0c..30ef2c78a1d9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -73,8 +73,8 @@ importers: specifier: ^0.30.5 version: 0.30.5 npm-run-all2: - specifier: ^5.0.0 - version: 5.0.2 + specifier: ^6.1.2 + version: 6.1.2 pathe: specifier: ^1.1.1 version: 1.1.1 @@ -19311,6 +19311,11 @@ packages: /json-parse-even-better-errors@2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} + /json-parse-even-better-errors@3.0.1: + resolution: {integrity: sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dev: true + /json-schema-traverse@0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} dev: true @@ -20834,17 +20839,22 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /npm-run-all2@5.0.2: - resolution: {integrity: sha512-S2G6FWZ3pNWAAKm2PFSOtEAG/N+XO/kz3+9l6V91IY+Y3XFSt7Lp7DV92KCgEboEW0hRTu0vFaMe4zXDZYaOyA==} - engines: {node: '>= 10'} + /npm-normalize-package-bin@3.0.1: + resolution: {integrity: sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dev: true + + /npm-run-all2@6.1.2: + resolution: {integrity: sha512-WwwnS8Ft+RpXve6T2EIEVpFLSqN+ORHRvgNk3H9N62SZXjmzKoRhMFg3I17TK3oMaAEr+XFbRirWS2Fn3BCPSg==} + engines: {node: ^14.18.0 || >=16.0.0, npm: '>= 8'} hasBin: true dependencies: - ansi-styles: 5.2.0 + ansi-styles: 6.2.1 cross-spawn: 7.0.3 memorystream: 0.3.1 - minimatch: 3.1.2 - pidtree: 0.5.0 - read-pkg: 5.2.0 + minimatch: 9.0.3 + pidtree: 0.6.0 + read-package-json-fast: 3.0.2 shell-quote: 1.7.4 dev: true @@ -21554,12 +21564,6 @@ packages: engines: {node: '>=10'} dev: true - /pidtree@0.5.0: - resolution: {integrity: sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==} - engines: {node: '>=0.10'} - hasBin: true - dev: true - /pidtree@0.6.0: resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} engines: {node: '>=0.10'} @@ -22529,6 +22533,14 @@ packages: dependencies: loose-envify: 1.4.0 + /read-package-json-fast@3.0.2: + resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dependencies: + json-parse-even-better-errors: 3.0.1 + npm-normalize-package-bin: 3.0.1 + dev: true + /read-pkg-up@1.0.1: resolution: {integrity: sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==} engines: {node: '>=0.10.0'} From 0eda22996f1a9fc4ed39e1dd987af4eb745bcc20 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:26:24 +0100 Subject: [PATCH 08/16] chore(deps): update dessant/lock-threads action to v5 (#5150) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/lock-closed-issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock-closed-issues.yml b/.github/workflows/lock-closed-issues.yml index 4a98f9371f02..703ebd04ec32 100644 --- a/.github/workflows/lock-closed-issues.yml +++ b/.github/workflows/lock-closed-issues.yml @@ -12,7 +12,7 @@ jobs: if: github.repository == 'vitest-dev/vitest' runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v4 + - uses: dessant/lock-threads@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} issue-inactive-days: '14' From 626c5f8a371cab7757adf4dd44c7786f9d1a00b5 Mon Sep 17 00:00:00 2001 From: Vladimir Sheremet Date: Thu, 8 Feb 2024 11:28:04 +0100 Subject: [PATCH 09/16] chore(deps): remove npm-run-all2 --- package.json | 1 - pnpm-lock.yaml | 147 ++++++++++++++++++++++++++++--------------------- 2 files changed, 83 insertions(+), 65 deletions(-) diff --git a/package.json b/package.json index c1501075bd74..a9e4824f0972 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "fast-glob": "^3.3.2", "lint-staged": "^15.1.0", "magic-string": "^0.30.5", - "npm-run-all2": "^6.1.2", "pathe": "^1.1.1", "rimraf": "^5.0.5", "rollup": "^4.9.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 30ef2c78a1d9..ef104bbb20c9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,9 +72,6 @@ importers: magic-string: specifier: ^0.30.5 version: 0.30.5 - npm-run-all2: - specifier: ^6.1.2 - version: 6.1.2 pathe: specifier: ^1.1.1 version: 1.1.1 @@ -104,7 +101,7 @@ importers: version: 5.2.2 vite: specifier: ^5.0.12 - version: 5.0.12(@types/node@20.11.5)(less@4.1.3) + version: 5.0.12(@types/node@20.11.5) vitest: specifier: workspace:* version: link:packages/vitest @@ -5533,7 +5530,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 espree: 9.6.1 globals: 13.23.0 ignore: 5.2.4 @@ -5604,7 +5601,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 2.0.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -9711,7 +9708,7 @@ packages: '@typescript-eslint/type-utils': 6.21.0(eslint@8.54.0)(typescript@5.2.2) '@typescript-eslint/utils': 6.21.0(eslint@8.54.0)(typescript@5.2.2) '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.54.0 graphemer: 1.4.0 ignore: 5.2.4 @@ -9737,7 +9734,7 @@ packages: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.2.2) '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.54.0 typescript: 5.2.2 transitivePeerDependencies: @@ -9772,7 +9769,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.2.2) '@typescript-eslint/utils': 6.21.0(eslint@8.54.0)(typescript@5.2.2) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.54.0 ts-api-utils: 1.0.3(typescript@5.2.2) typescript: 5.2.2 @@ -9801,7 +9798,7 @@ packages: dependencies: '@typescript-eslint/types': 6.10.0 '@typescript-eslint/visitor-keys': 6.10.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 @@ -9822,7 +9819,7 @@ packages: dependencies: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.3 @@ -11316,7 +11313,7 @@ packages: resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} engines: {node: '>= 14'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -11474,6 +11471,7 @@ packages: /ansi-styles@3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} + requiresBuild: true dependencies: color-convert: 1.9.3 @@ -12791,6 +12789,7 @@ packages: /chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} engines: {node: '>=4'} + requiresBuild: true dependencies: ansi-styles: 3.2.1 escape-string-regexp: 1.0.5 @@ -13943,6 +13942,17 @@ packages: ms: 2.0.0 dev: true + /debug@3.2.7: + resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.3 + dev: true + /debug@3.2.7(supports-color@8.1.1): resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} peerDependencies: @@ -13954,6 +13964,18 @@ packages: ms: 2.1.3 supports-color: 8.1.1 + /debug@4.3.4: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + dev: true + /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -15128,7 +15150,7 @@ packages: /eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} dependencies: - debug: 3.2.7(supports-color@8.1.1) + debug: 3.2.7 is-core-module: 2.13.0 resolve: 1.22.8 transitivePeerDependencies: @@ -15157,7 +15179,7 @@ packages: optional: true dependencies: '@typescript-eslint/parser': 6.21.0(eslint@8.54.0)(typescript@5.2.2) - debug: 3.2.7(supports-color@8.1.1) + debug: 3.2.7 eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: @@ -15200,7 +15222,7 @@ packages: peerDependencies: eslint: ^7.2.0 || ^8 dependencies: - debug: 3.2.7(supports-color@8.1.1) + debug: 3.2.7 doctrine: 2.1.0 eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 @@ -15226,7 +15248,7 @@ packages: '@es-joy/jsdoccomment': 0.41.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 escape-string-regexp: 4.0.0 eslint: 8.54.0 esquery: 1.5.0 @@ -15398,7 +15420,7 @@ packages: peerDependencies: eslint: '>=6.0.0' dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.54.0 eslint-compat-utils: 0.1.2(eslint@8.54.0) lodash: 4.17.21 @@ -15520,7 +15542,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -17574,7 +17596,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -19051,6 +19073,7 @@ packages: /js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} + requiresBuild: true /js-tokens@8.0.2: resolution: {integrity: sha512-Olnt+V7xYdvGze9YTbGFZIfQXuGV4R3nQwwl8BrtgaPE/wq8UFpUHWuTNc05saowhSr1ZO6tx+V6RjE9D5YQog==} @@ -19311,11 +19334,6 @@ packages: /json-parse-even-better-errors@2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} - /json-parse-even-better-errors@3.0.1: - resolution: {integrity: sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - dev: true - /json-schema-traverse@0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} dev: true @@ -19571,7 +19589,7 @@ packages: dependencies: chalk: 5.3.0 commander: 11.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 execa: 8.0.1 lilconfig: 2.1.0 listr2: 7.0.2 @@ -20091,11 +20109,6 @@ packages: readable-stream: 2.3.7 dev: true - /memorystream@0.3.1: - resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==} - engines: {node: '>= 0.10.0'} - dev: true - /meow@3.7.0: resolution: {integrity: sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==} engines: {node: '>=0.10.0'} @@ -20144,7 +20157,7 @@ packages: /micromark@2.11.4: resolution: {integrity: sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 parse-entities: 2.0.0 transitivePeerDependencies: - supports-color @@ -20839,25 +20852,6 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /npm-normalize-package-bin@3.0.1: - resolution: {integrity: sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - dev: true - - /npm-run-all2@6.1.2: - resolution: {integrity: sha512-WwwnS8Ft+RpXve6T2EIEVpFLSqN+ORHRvgNk3H9N62SZXjmzKoRhMFg3I17TK3oMaAEr+XFbRirWS2Fn3BCPSg==} - engines: {node: ^14.18.0 || >=16.0.0, npm: '>= 8'} - hasBin: true - dependencies: - ansi-styles: 6.2.1 - cross-spawn: 7.0.3 - memorystream: 0.3.1 - minimatch: 9.0.3 - pidtree: 0.6.0 - read-package-json-fast: 3.0.2 - shell-quote: 1.7.4 - dev: true - /npm-run-path@2.0.2: resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==} engines: {node: '>=4'} @@ -22533,14 +22527,6 @@ packages: dependencies: loose-envify: 1.4.0 - /read-package-json-fast@3.0.2: - resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - dependencies: - json-parse-even-better-errors: 3.0.1 - npm-normalize-package-bin: 3.0.1 - dev: true - /read-pkg-up@1.0.1: resolution: {integrity: sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==} engines: {node: '>=0.10.0'} @@ -23118,7 +23104,7 @@ packages: rollup: ^4.9.6 dependencies: '@rollup/pluginutils': 5.0.5(rollup@4.9.6) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 es-module-lexer: 1.3.1 esbuild: 0.19.11 get-tsconfig: 4.7.2 @@ -23626,10 +23612,6 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - /shell-quote@1.7.4: - resolution: {integrity: sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==} - dev: true - /shikiji-core@0.9.17: resolution: {integrity: sha512-r1FWTXk6SO2aYqfWgcsJ11MuVQ1ymPSdXzJjK7q8EXuyqu8yc2N5qrQy5+BL6gTVOaF4yLjbxFjF+KTRM1Sp8Q==} dev: true @@ -24443,6 +24425,7 @@ packages: /supports-color@5.5.0: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} + requiresBuild: true dependencies: has-flag: 3.0.0 @@ -25980,6 +25963,42 @@ packages: - supports-color dev: true + /vite@5.0.12(@types/node@20.11.5): + resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 20.11.5 + esbuild: 0.19.11 + postcss: 8.4.32 + rollup: 4.9.6 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /vite@5.0.12(@types/node@20.11.5)(less@4.1.3): resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} engines: {node: ^18.0.0 || >=20.0.0} @@ -26197,7 +26216,7 @@ packages: peerDependencies: eslint: '>=6.0.0' dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.54.0 eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 From 29f1f799455c6da2f2e41122e6273952ff3fc873 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:33:23 +0100 Subject: [PATCH 10/16] chore(deps): update dependency floating-vue to v5 (#5148) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/ui/package.json | 2 +- pnpm-lock.yaml | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/packages/ui/package.json b/packages/ui/package.json index 6864fc88ea25..b7189664703f 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -77,7 +77,7 @@ "codemirror-theme-vars": "^0.1.2", "cypress": "^13.6.2", "d3-graph-controller": "^3.0.4", - "floating-vue": "^2.0.0-y.0", + "floating-vue": "^5.2.2", "splitpanes": "^3.1.5", "unocss": "^0.57.4", "unplugin-auto-import": "^0.16.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef104bbb20c9..0aa5d7af192e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1209,8 +1209,8 @@ importers: specifier: ^3.0.4 version: 3.0.4 floating-vue: - specifier: ^2.0.0-y.0 - version: 2.0.0-y.0(vue@3.3.8) + specifier: ^5.2.2 + version: 5.2.2(vue@3.3.8) splitpanes: specifier: ^3.1.5 version: 3.1.5 @@ -5574,14 +5574,20 @@ packages: fast-json-stringify: 5.2.0 dev: true - /@floating-ui/core@0.3.1: - resolution: {integrity: sha512-ensKY7Ub59u16qsVIFEo2hwTCqZ/r9oZZFh51ivcLGHfUwTn8l1Xzng8RJUe91H/UP8PeqeBronAGx0qmzwk2g==} + /@floating-ui/core@1.6.0: + resolution: {integrity: sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==} + dependencies: + '@floating-ui/utils': 0.2.1 dev: true - /@floating-ui/dom@0.1.10: - resolution: {integrity: sha512-4kAVoogvQm2N0XE0G6APQJuCNuErjOfPW8Ux7DFxh8+AfugWflwVJ5LDlHOwrwut7z/30NUvdtHzQ3zSip4EzQ==} + /@floating-ui/dom@1.1.1: + resolution: {integrity: sha512-TpIO93+DIujg3g7SykEAGZMDtbJRrmnYRCNYSjJlvIbGhBjRSNTLVbNeDQBrzy9qDgUbiWdc7KA0uZHZ2tJmiw==} dependencies: - '@floating-ui/core': 0.3.1 + '@floating-ui/core': 1.6.0 + dev: true + + /@floating-ui/utils@0.2.1: + resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==} dev: true /@gar/promisify@1.1.3: @@ -16285,12 +16291,16 @@ packages: /flatted@3.2.9: resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} - /floating-vue@2.0.0-y.0(vue@3.3.8): - resolution: {integrity: sha512-UpJquQIlP0Z5978RYwGN3qsE6jhxxCt7ltzE1mV2m9GwsZ6y7IaIOAszWqALC+OqWhdPad/0GYxoQYGLC0y+Ow==} + /floating-vue@5.2.2(vue@3.3.8): + resolution: {integrity: sha512-afW+h2CFafo+7Y9Lvw/xsqjaQlKLdJV7h1fCHfcYQ1C4SVMlu7OAekqWgu5d4SgvkBVU0pVpLlVsrSTBURFRkg==} peerDependencies: + '@nuxt/kit': ^3.2.0 vue: ^3.2.0 + peerDependenciesMeta: + '@nuxt/kit': + optional: true dependencies: - '@floating-ui/dom': 0.1.10 + '@floating-ui/dom': 1.1.1 vue: 3.3.8(typescript@5.2.2) vue-resize: 2.0.0-alpha.1(vue@3.3.8) dev: true From d70157a1d12c3329188fd3efc0e659628e77c86b Mon Sep 17 00:00:00 2001 From: Vladimir Sheremet Date: Thu, 8 Feb 2024 11:45:56 +0100 Subject: [PATCH 11/16] ci: enable --reporter-hide-prefix flag --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a9e4824f0972..00c370598a73 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,9 @@ "test": "vitest --api -r test/core", "test:run": "vitest run -r test/core", "test:all": "CI=true pnpm -r --stream run test --allowOnly", - "test:ci": "CI=true pnpm -r --stream --filter !test-browser --filter !test-esm --filter !test-browser run test --allowOnly", - "test:ci:vm-threads": "CI=true pnpm -r --stream --filter !test-coverage --filter !test-single-thread --filter !test-browser --filter !test-esm --filter !test-network-imports --filter !test-browser --filter !example-react-testing-lib-msw run test --allowOnly --pool vmThreads", - "test:ci:no-threads": "CI=true pnpm -r --stream --filter !test-vm-threads --filter !test-coverage --filter !test-watch --filter !test-bail --filter !test-esm --filter !test-browser run test --allowOnly --pool forks", + "test:ci": "CI=true pnpm -r --reporter-hide-prefix --stream --filter !test-browser --filter !test-esm --filter !test-browser run test --allowOnly", + "test:ci:vm-threads": "CI=true pnpm -r --reporter-hide-prefix --stream --filter !test-coverage --filter !test-single-thread --filter !test-browser --filter !test-esm --filter !test-network-imports --filter !test-browser --filter !example-react-testing-lib-msw run test --allowOnly --pool vmThreads", + "test:ci:no-threads": "CI=true pnpm -r --reporter-hide-prefix --stream --filter !test-vm-threads --filter !test-coverage --filter !test-watch --filter !test-bail --filter !test-esm --filter !test-browser run test --allowOnly --pool forks", "typecheck": "tsc -p tsconfig.check.json --noEmit", "typecheck:why": "tsc -p tsconfig.check.json --noEmit --explainFiles > explainTypes.txt", "ui:build": "vite build packages/ui", @@ -55,6 +55,7 @@ "fast-glob": "^3.3.2", "lint-staged": "^15.1.0", "magic-string": "^0.30.5", + "npm-run-all2": "^5.0.0", "pathe": "^1.1.1", "rimraf": "^5.0.5", "rollup": "^4.9.6", From 219d763ca3d1f056e961d1790474d3834f1fcc6b Mon Sep 17 00:00:00 2001 From: Vladimir Sheremet Date: Thu, 8 Feb 2024 13:47:42 +0100 Subject: [PATCH 12/16] chore: fix lockfile --- package.json | 1 - pnpm-lock.yaml | 99 ++++++++++---------------------------------------- 2 files changed, 20 insertions(+), 80 deletions(-) diff --git a/package.json b/package.json index 00c370598a73..b45f7f37abac 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "fast-glob": "^3.3.2", "lint-staged": "^15.1.0", "magic-string": "^0.30.5", - "npm-run-all2": "^5.0.0", "pathe": "^1.1.1", "rimraf": "^5.0.5", "rollup": "^4.9.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0aa5d7af192e..bff288679e02 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -101,7 +101,7 @@ importers: version: 5.2.2 vite: specifier: ^5.0.12 - version: 5.0.12(@types/node@20.11.5) + version: 5.0.12(@types/node@20.11.5)(less@4.1.3) vitest: specifier: workspace:* version: link:packages/vitest @@ -5530,7 +5530,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) espree: 9.6.1 globals: 13.23.0 ignore: 5.2.4 @@ -5607,7 +5607,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 2.0.1 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -9714,7 +9714,7 @@ packages: '@typescript-eslint/type-utils': 6.21.0(eslint@8.54.0)(typescript@5.2.2) '@typescript-eslint/utils': 6.21.0(eslint@8.54.0)(typescript@5.2.2) '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.54.0 graphemer: 1.4.0 ignore: 5.2.4 @@ -9740,7 +9740,7 @@ packages: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.2.2) '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.54.0 typescript: 5.2.2 transitivePeerDependencies: @@ -9775,7 +9775,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.2.2) '@typescript-eslint/utils': 6.21.0(eslint@8.54.0)(typescript@5.2.2) - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.54.0 ts-api-utils: 1.0.3(typescript@5.2.2) typescript: 5.2.2 @@ -9804,7 +9804,7 @@ packages: dependencies: '@typescript-eslint/types': 6.10.0 '@typescript-eslint/visitor-keys': 6.10.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 @@ -9825,7 +9825,7 @@ packages: dependencies: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.3 @@ -11319,7 +11319,7 @@ packages: resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} engines: {node: '>= 14'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) transitivePeerDependencies: - supports-color dev: true @@ -13948,17 +13948,6 @@ packages: ms: 2.0.0 dev: true - /debug@3.2.7: - resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.3 - dev: true - /debug@3.2.7(supports-color@8.1.1): resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} peerDependencies: @@ -13970,18 +13959,6 @@ packages: ms: 2.1.3 supports-color: 8.1.1 - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - dev: true - /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -15156,7 +15133,7 @@ packages: /eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} dependencies: - debug: 3.2.7 + debug: 3.2.7(supports-color@8.1.1) is-core-module: 2.13.0 resolve: 1.22.8 transitivePeerDependencies: @@ -15185,7 +15162,7 @@ packages: optional: true dependencies: '@typescript-eslint/parser': 6.21.0(eslint@8.54.0)(typescript@5.2.2) - debug: 3.2.7 + debug: 3.2.7(supports-color@8.1.1) eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: @@ -15228,7 +15205,7 @@ packages: peerDependencies: eslint: ^7.2.0 || ^8 dependencies: - debug: 3.2.7 + debug: 3.2.7(supports-color@8.1.1) doctrine: 2.1.0 eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 @@ -15254,7 +15231,7 @@ packages: '@es-joy/jsdoccomment': 0.41.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) escape-string-regexp: 4.0.0 eslint: 8.54.0 esquery: 1.5.0 @@ -15426,7 +15403,7 @@ packages: peerDependencies: eslint: '>=6.0.0' dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.54.0 eslint-compat-utils: 0.1.2(eslint@8.54.0) lodash: 4.17.21 @@ -15548,7 +15525,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -17606,7 +17583,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) transitivePeerDependencies: - supports-color dev: true @@ -19599,7 +19576,7 @@ packages: dependencies: chalk: 5.3.0 commander: 11.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) execa: 8.0.1 lilconfig: 2.1.0 listr2: 7.0.2 @@ -20167,7 +20144,7 @@ packages: /micromark@2.11.4: resolution: {integrity: sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) parse-entities: 2.0.0 transitivePeerDependencies: - supports-color @@ -23114,7 +23091,7 @@ packages: rollup: ^4.9.6 dependencies: '@rollup/pluginutils': 5.0.5(rollup@4.9.6) - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) es-module-lexer: 1.3.1 esbuild: 0.19.11 get-tsconfig: 4.7.2 @@ -25973,42 +25950,6 @@ packages: - supports-color dev: true - /vite@5.0.12(@types/node@20.11.5): - resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 20.11.5 - esbuild: 0.19.11 - postcss: 8.4.32 - rollup: 4.9.6 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /vite@5.0.12(@types/node@20.11.5)(less@4.1.3): resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} engines: {node: ^18.0.0 || >=20.0.0} @@ -26226,7 +26167,7 @@ packages: peerDependencies: eslint: '>=6.0.0' dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.54.0 eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 From 567d20b99fb1db0ebcc86a49b3bebd9fd7511aae Mon Sep 17 00:00:00 2001 From: Vladimir Date: Thu, 8 Feb 2024 15:03:17 +0100 Subject: [PATCH 13/16] feat(vitest): expose jsdom global if jsdom environment is enabled (#5155) --- docs/config/index.md | 4 ++++ packages/vitest/src/integrations/env/jsdom.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/config/index.md b/docs/config/index.md index d0206a66699e..e2690c3d499a 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -511,6 +511,10 @@ export default { Vitest also exposes `builtinEnvironments` through `vitest/environments` entry, in case you just want to extend it. You can read more about extending environments in [our guide](/guide/environment). +::: tip +Since Vitest 1.3.0 jsdom environment exposes `jsdom` global variable equal to the current [JSDOM](https://github.com/jsdom/jsdom) instance. +::: + ### environmentOptions - **Type:** `Record<'jsdom' | string, unknown>` diff --git a/packages/vitest/src/integrations/env/jsdom.ts b/packages/vitest/src/integrations/env/jsdom.ts index 7141e95b60d9..0b509072a7f0 100644 --- a/packages/vitest/src/integrations/env/jsdom.ts +++ b/packages/vitest/src/integrations/env/jsdom.ts @@ -67,6 +67,7 @@ export default ({ // TODO: browser doesn't expose Buffer, but a lot of dependencies use it dom.window.Buffer = Buffer + dom.window.jsdom = dom // inject web globals if they missing in JSDOM but otherwise available in Nodejs // https://nodejs.org/dist/latest/docs/api/globals.html @@ -141,10 +142,13 @@ export default ({ const clearWindowErrors = catchWindowErrors(global) + global.jsdom = dom + return { teardown(global) { clearWindowErrors() dom.window.close() + delete global.jsdom keys.forEach(key => delete global[key]) originals.forEach((v, k) => global[k] = v) }, From a931646fb9f030365503da75a23cc5afb8db68e5 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Thu, 8 Feb 2024 16:48:44 +0100 Subject: [PATCH 14/16] refactor: add CLI config schema to make sure we don't miss options (#5126) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ari Perkkiƶ Co-authored-by: Lorenzo Bloedow --- .github/renovate.json5 | 1 + eslint.config.js | 2 + package.json | 3 +- packages/vitest/LICENSE.md | 29 + packages/vitest/package.json | 2 +- packages/vitest/rollup.config.js | 2 +- packages/vitest/src/node/cache/index.ts | 2 +- packages/vitest/src/node/cli.ts | 208 +------ packages/vitest/src/node/cli/cac.ts | 221 +++++++ packages/vitest/src/node/{ => cli}/cli-api.ts | 43 +- packages/vitest/src/node/cli/cli-config.ts | 551 ++++++++++++++++++ .../vitest/src/node/{ => cli}/cli-wrapper.ts | 4 +- packages/vitest/src/node/index.ts | 2 +- packages/vitest/src/types/pool-options.ts | 8 +- patches/cac@6.7.14.patch | 101 ++++ pnpm-lock.yaml | 20 +- test/config/fixtures/test/log-output.test.ts | 19 - test/config/test/failures.test.ts | 14 - test/config/test/options.test.ts | 25 - test/core/test/cli-test.test.ts | 121 ++++ 20 files changed, 1069 insertions(+), 309 deletions(-) create mode 100644 packages/vitest/src/node/cli/cac.ts rename packages/vitest/src/node/{ => cli}/cli-api.ts (69%) create mode 100644 packages/vitest/src/node/cli/cli-config.ts rename packages/vitest/src/node/{ => cli}/cli-wrapper.ts (97%) create mode 100644 patches/cac@6.7.14.patch delete mode 100644 test/config/fixtures/test/log-output.test.ts delete mode 100644 test/config/test/options.test.ts create mode 100644 test/core/test/cli-test.test.ts diff --git a/.github/renovate.json5 b/.github/renovate.json5 index cca4e23b1d5c..293bd36fab95 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -27,6 +27,7 @@ // we patch these packages "@types/chai", "@sinonjs/fake-timers", + "cac", // TODO: update when chai is updated to 5.0 "loupe", // Pinned due to https://github.com/vitest-dev/vitest/issues/4710 diff --git a/eslint.config.js b/eslint.config.js index 493c5cfd2f3f..c23057a4b187 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -25,6 +25,7 @@ export default antfu( 'no-empty-pattern': 'off', 'antfu/indent-binary-ops': 'off', 'style/member-delimiter-style': ['error', { multiline: { delimiter: 'none' }, singleline: { delimiter: 'semi' } }], + 'unused-imports/no-unused-imports': 'error', 'ts/no-invalid-this': 'off', @@ -72,6 +73,7 @@ export default antfu( 'style/max-statements-per-line': 'off', 'import/newline-after-import': 'off', 'import/first': 'off', + 'unused-imports/no-unused-imports': 'off', }, }, { diff --git a/package.json b/package.json index b45f7f37abac..df4106b8edb4 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,8 @@ }, "patchedDependencies": { "@types/chai@4.3.6": "patches/@types__chai@4.3.6.patch", - "@sinonjs/fake-timers@11.1.0": "patches/@sinonjs__fake-timers@11.1.0.patch" + "@sinonjs/fake-timers@11.1.0": "patches/@sinonjs__fake-timers@11.1.0.patch", + "cac@6.7.14": "patches/cac@6.7.14.patch" } }, "simple-git-hooks": { diff --git a/packages/vitest/LICENSE.md b/packages/vitest/LICENSE.md index 416122e92275..489e43810be9 100644 --- a/packages/vitest/LICENSE.md +++ b/packages/vitest/LICENSE.md @@ -306,6 +306,35 @@ Repository: micromatch/braces --------------------------------------- +## cac +License: MIT +By: egoist +Repository: egoist/cac + +> The MIT License (MIT) +> +> Copyright (c) EGOIST <0x142857@gmail.com> (https://github.com/egoist) +> +> Permission is hereby granted, free of charge, to any person obtaining a copy +> of this software and associated documentation files (the "Software"), to deal +> in the Software without restriction, including without limitation the rights +> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +> copies of the Software, and to permit persons to whom the Software is +> furnished to do so, subject to the following conditions: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +> THE SOFTWARE. + +--------------------------------------- + ## chai-subset License: MIT By: Andrii Shumada, Robert Herhold diff --git a/packages/vitest/package.json b/packages/vitest/package.json index 2d8c6eac46c0..8abd6af8b062 100644 --- a/packages/vitest/package.json +++ b/packages/vitest/package.json @@ -147,7 +147,6 @@ "@vitest/spy": "workspace:*", "@vitest/utils": "workspace:*", "acorn-walk": "^8.3.2", - "cac": "^6.7.14", "chai": "^4.3.10", "debug": "^4.3.4", "execa": "^8.0.1", @@ -177,6 +176,7 @@ "@types/prompts": "^2.4.9", "@types/sinonjs__fake-timers": "^8.1.5", "birpc": "0.2.15", + "cac": "^6.7.14", "chai-subset": "^1.6.0", "cli-truncate": "^4.0.0", "expect-type": "^0.17.3", diff --git a/packages/vitest/rollup.config.js b/packages/vitest/rollup.config.js index 3c2d04caebf5..c5542c49a153 100644 --- a/packages/vitest/rollup.config.js +++ b/packages/vitest/rollup.config.js @@ -19,7 +19,7 @@ const entries = { 'path': 'src/paths.ts', 'index': 'src/index.ts', 'cli': 'src/node/cli.ts', - 'cli-wrapper': 'src/node/cli-wrapper.ts', + 'cli-wrapper': 'src/node/cli/cli-wrapper.ts', 'node': 'src/node.ts', 'suite': 'src/suite.ts', 'browser': 'src/browser.ts', diff --git a/packages/vitest/src/node/cache/index.ts b/packages/vitest/src/node/cache/index.ts index a63c2ef5d8cf..6783736ba23a 100644 --- a/packages/vitest/src/node/cache/index.ts +++ b/packages/vitest/src/node/cache/index.ts @@ -4,7 +4,7 @@ import { findUp } from 'find-up' import { resolve } from 'pathe' import { loadConfigFromFile } from 'vite' import { configFiles } from '../../constants' -import type { CliOptions } from '../cli-api' +import type { CliOptions } from '../cli/cli-api' import { slash } from '../../utils' import { FilesStatsCache } from './files' import { ResultsCache } from './results' diff --git a/packages/vitest/src/node/cli.ts b/packages/vitest/src/node/cli.ts index a03dfdba6557..6b181737ca8f 100644 --- a/packages/vitest/src/node/cli.ts +++ b/packages/vitest/src/node/cli.ts @@ -1,207 +1,3 @@ -import { normalize } from 'pathe' -import cac from 'cac' -import c from 'picocolors' -import { version } from '../../package.json' -import { toArray } from '../utils' -import type { BaseCoverageOptions, CoverageIstanbulOptions, Vitest, VitestRunMode } from '../types' -import type { CliOptions } from './cli-api' -import { startVitest } from './cli-api' -import { divider } from './reporters/renderers/utils' +import { createCLI } from './cli/cac' -const cli = cac('vitest') - -cli - .version(version) - .option('-r, --root ', 'Root path') - .option('-c, --config ', 'Path to config file') - .option('-u, --update', 'Update snapshot') - .option('-w, --watch', 'Enable watch mode') - .option('-t, --testNamePattern ', 'Run tests with full names matching the specified regexp pattern') - .option('--dir ', 'Base directory to scan for the test files') - .option('--ui', 'Enable UI') - .option('--open', 'Open UI automatically (default: !process.env.CI))') - .option('--api [api]', 'Serve API, available options: --api.port , --api.host [host] and --api.strictPort') - .option('--silent', 'Silent console output from tests') - .option('--hideSkippedTests', 'Hide logs for skipped tests') - .option('--reporter ', 'Specify reporters') - .option('--outputFile ', 'Write test results to a file when supporter reporter is also specified, use cac\'s dot notation for individual outputs of multiple reporters') - .option('--coverage', 'Enable coverage report') - .option('--coverage.all', 'Whether to include all files, including the untested ones into report', { default: true }) - .option('--run', 'Disable watch mode') - .option('--mode ', 'Override Vite mode (default: test)') - .option('--workspace ', 'Path to a workspace configuration file') - .option('--isolate', 'Run every test file in isolation. To disable isolation, use --no-isolate (default: true)') - .option('--globals', 'Inject apis globally') - .option('--dom', 'Mock browser API with happy-dom') - .option('--browser [options]', 'Run tests in the browser (default: false)') - .option('--pool ', 'Specify pool, if not running in the browser (default: threads)') - .option('--poolOptions ', 'Specify pool options') - .option('--poolOptions.threads.isolate', 'Isolate tests in threads pool (default: true)') - .option('--poolOptions.forks.isolate', 'Isolate tests in forks pool (default: true)') - .option('--fileParallelism', 'Should all test files run in parallel. Use --no-file-parallelism to disable (default: true)') - .option('--maxWorkers ', 'Maximum number of workers to run tests in') - .option('--minWorkers ', 'Minimum number of workers to run tests in') - .option('--environment ', 'Specify runner environment, if not running in the browser (default: node)') - .option('--passWithNoTests', 'Pass when no tests found') - .option('--logHeapUsage', 'Show the size of heap for each test') - .option('--allowOnly', 'Allow tests and suites that are marked as only (default: !process.env.CI)') - .option('--dangerouslyIgnoreUnhandledErrors', 'Ignore any unhandled errors that occur') - .option('--shard ', 'Test suite shard to execute in a format of /') - .option('--changed [since]', 'Run tests that are affected by the changed files (default: false)') - .option('--sequence ', 'Define in what order to run tests (use --sequence.shuffle to run tests in random order, use --sequence.concurrent to run tests in parallel)') - .option('--segfaultRetry ', 'Return tests on segment fault (default: 0)', { default: 0 }) - .option('--no-color', 'Removes colors from the console output') - .option('--inspect', 'Enable Node.js inspector') - .option('--inspect-brk', 'Enable Node.js inspector with break') - .option('--test-timeout