From 3c74336e28290f295f4e9e947a840d92683fa76c Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Nov 2024 21:45:14 +0800 Subject: [PATCH 1/2] feat: support vite 6 and enter prerelease --- .changeset/pre.json | 51 +++++++++++++++++++ .changeset/twenty-dolls-drive.md | 6 +++ .../vite-plugin-svelte-inspector/package.json | 6 +-- packages/vite-plugin-svelte/package.json | 4 +- 4 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 .changeset/pre.json create mode 100644 .changeset/twenty-dolls-drive.md diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 000000000..757ea93ca --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,51 @@ +{ + "mode": "pre", + "tag": "next", + "initialVersions": { + "vite-plugin-svelte-e2e-tests": "1.0.0", + "e2e-test-dep-cjs-and-esm": "1.0.0", + "e2e-test-dep-cjs-only": "1.0.0", + "e2e-test-dep-esm-only": "1.0.0", + "e2e-test-dep-index-only": "1.0.0", + "e2e-test-dep-scss-only": "1.0.0", + "e2e-test-dep-svelte-api-only": "1.0.0", + "e2e-test-dep-svelte-exports-simple": "1.0.0", + "e2e-test-dep-svelte-hybrid": "1.0.0", + "e2e-test-dep-svelte-module": "1.0.0", + "e2e-test-dep-svelte-nested": "1.0.0", + "e2e-test-dep-svelte-simple": "1.0.0", + "e2e-test-dep-types-only": "1.0.0", + "e2e-test-dep-vite-plugins": "1.0.0", + "e2e-tests-autoprefixer-browserslist": "1.0.0", + "e2e-tests-configfile-custom": "1.0.0", + "e2e-tests-configfile-esm": "1.0.0", + "e2e-tests-css-dev-sourcemap": "0.0.0", + "e2e-tests-custom-extensions": "1.0.0", + "e2e-tests-dependencies": "0.0.0", + "e2e-tests-env": "1.0.0", + "e2e-tests-hmr": "0.0.0", + "e2e-tests-import-queries": "0.0.0", + "e2e-tests-inspector-kit": "0.0.0", + "e2e-tests-inspector-vite": "0.0.0", + "e2e-tests-kit-node": "0.0.0", + "e2e-tests-package-json-svelte-field": "1.0.0", + "e2e-tests-prebundle-svelte-deps": "0.0.0", + "e2e-tests-preprocess-with-vite": "0.0.0", + "e2e-tests-css-none": "0.0.0", + "e2e-tests-scan-deps": "0.0.0", + "e2e-tests-svelte-preprocess": "0.0.0", + "e2e-tests-ts-type-import": "0.0.0", + "e2e-tests-vite-ssr-esm": "0.0.0", + "vite-plugin-svelte-playground": "1.0.0", + "playground-basic": "0.0.0", + "playground-big": "0.0.0", + "playground-big-component-library": "0.0.0", + "playground-big-component-library-kit": "0.0.0", + "playground-big-component-library-vite-ssr": "0.0.0", + "playground-kit-demo-app": "0.0.0", + "playground-optimizedeps-include": "0.0.0", + "@sveltejs/vite-plugin-svelte": "4.0.1", + "@sveltejs/vite-plugin-svelte-inspector": "3.0.1" + }, + "changesets": [] +} diff --git a/.changeset/twenty-dolls-drive.md b/.changeset/twenty-dolls-drive.md new file mode 100644 index 000000000..4e5a368ee --- /dev/null +++ b/.changeset/twenty-dolls-drive.md @@ -0,0 +1,6 @@ +--- +'@sveltejs/vite-plugin-svelte-inspector': major +'@sveltejs/vite-plugin-svelte': major +--- + +Support Vite 6 diff --git a/packages/vite-plugin-svelte-inspector/package.json b/packages/vite-plugin-svelte-inspector/package.json index d31ac4d50..4979be54c 100644 --- a/packages/vite-plugin-svelte-inspector/package.json +++ b/packages/vite-plugin-svelte-inspector/package.json @@ -44,9 +44,9 @@ "debug": "^4.3.7" }, "peerDependencies": { - "@sveltejs/vite-plugin-svelte": "^4.0.0-next.0||^4.0.0", - "svelte": "^5.0.0-next.96 || ^5.0.0", - "vite": "^5.0.0" + "@sveltejs/vite-plugin-svelte": "^5.0.0-next.0 || ^5.0.0", + "svelte": "^5.0.0", + "vite": "^6.0.0-beta.10 || ^6.0.0" }, "devDependencies": { "@types/debug": "^4.1.12", diff --git a/packages/vite-plugin-svelte/package.json b/packages/vite-plugin-svelte/package.json index ddd5ef251..1c8d20e30 100644 --- a/packages/vite-plugin-svelte/package.json +++ b/packages/vite-plugin-svelte/package.json @@ -49,8 +49,8 @@ "vitefu": "^1.0.3" }, "peerDependencies": { - "svelte": "^5.0.0-next.96 || ^5.0.0", - "vite": "^5.0.0" + "svelte": "^5.0.0", + "vite": "^6.0.0-beta.10 || ^6.0.0" }, "devDependencies": { "@types/debug": "^4.1.12", From c57b11e9b285ca61131088e6cea711d9b9ed921d Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Nov 2024 21:50:29 +0800 Subject: [PATCH 2/2] chore: audit fix --- package.json | 3 ++- pnpm-lock.yaml | 68 ++++++++------------------------------------------ 2 files changed, 12 insertions(+), 59 deletions(-) diff --git a/package.json b/package.json index 6be8e9829..3c34895c8 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,8 @@ "svelte": "$svelte", "vite": "$vite", "@types/node@<=20.12.0": "20.11.5", - "send@<0.19.0": "^0.19.0" + "send@<0.19.0": "^0.19.0", + "cross-spawn@<7.0.5": ">=7.0.5" }, "onlyBuiltDependencies": [ "esbuild" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ecaad8eb5..3a140cc13 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,6 +12,7 @@ overrides: vite: ^5.4.11 '@types/node@<=20.12.0': 20.11.5 send@<0.19.0: ^0.19.0 + cross-spawn@<7.0.5: '>=7.0.5' importers: @@ -2063,11 +2064,8 @@ packages: engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'} hasBin: true - cross-spawn@5.1.0: - resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} - - cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} + cross-spawn@7.0.5: + resolution: {integrity: sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==} engines: {node: '>= 8'} css-color-names@1.0.1: @@ -2840,9 +2838,6 @@ packages: lru-cache@10.4.3: resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} - lru-cache@4.1.5: - resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} - lru-queue@0.1.0: resolution: {integrity: sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==} @@ -3238,9 +3233,6 @@ packages: resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} engines: {node: '>= 0.10'} - pseudomap@1.0.2: - resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} - publint@0.2.12: resolution: {integrity: sha512-YNeUtCVeM4j9nDiTT2OPczmlyzOkIXNtdDZnSuajAxS/nZ6j3t7Vs9SUB4euQNddiltIwu7Tdd3s+hr08fAsMw==} engines: {node: '>=16'} @@ -3355,18 +3347,10 @@ packages: setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} - shebang-command@1.2.0: - resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} - engines: {node: '>=0.10.0'} - shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} - shebang-regex@1.0.0: - resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==} - engines: {node: '>=0.10.0'} - shebang-regex@3.0.0: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} @@ -3770,10 +3754,6 @@ packages: whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} - which@1.3.1: - resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} - hasBin: true - which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} @@ -3804,9 +3784,6 @@ packages: wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - yallist@2.1.2: - resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==} - yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} @@ -4955,15 +4932,9 @@ snapshots: cross-env@7.0.3: dependencies: - cross-spawn: 7.0.3 - - cross-spawn@5.1.0: - dependencies: - lru-cache: 4.1.5 - shebang-command: 1.2.0 - which: 1.3.1 + cross-spawn: 7.0.5 - cross-spawn@7.0.3: + cross-spawn@7.0.5: dependencies: path-key: 3.1.1 shebang-command: 2.0.0 @@ -5312,7 +5283,7 @@ snapshots: '@types/json-schema': 7.0.15 ajv: 6.12.6 chalk: 4.1.2 - cross-spawn: 7.0.3 + cross-spawn: 7.0.5 debug: 4.3.7 escape-string-regexp: 4.0.0 eslint-scope: 8.2.0 @@ -5386,7 +5357,7 @@ snapshots: execa@8.0.1: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.5 get-stream: 8.0.1 human-signals: 5.0.0 is-stream: 3.0.0 @@ -5516,7 +5487,7 @@ snapshots: foreground-child@3.3.0: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.5 signal-exit: 4.1.0 formdata-polyfill@4.0.10: @@ -5846,11 +5817,6 @@ snapshots: lru-cache@10.4.3: {} - lru-cache@4.1.5: - dependencies: - pseudomap: 1.0.2 - yallist: 2.1.2 - lru-queue@0.1.0: dependencies: es5-ext: 0.10.62 @@ -5992,7 +5958,7 @@ snapshots: npm-run-all2@7.0.1: dependencies: ansi-styles: 6.2.1 - cross-spawn: 7.0.3 + cross-spawn: 7.0.5 memorystream: 0.3.1 minimatch: 9.0.5 pidtree: 0.6.0 @@ -6177,8 +6143,6 @@ snapshots: forwarded: 0.2.0 ipaddr.js: 1.9.1 - pseudomap@1.0.2: {} - publint@0.2.12: dependencies: npm-packlist: 5.1.3 @@ -6325,16 +6289,10 @@ snapshots: setprototypeof@1.2.0: {} - shebang-command@1.2.0: - dependencies: - shebang-regex: 1.0.0 - shebang-command@2.0.0: dependencies: shebang-regex: 3.0.0 - shebang-regex@1.0.0: {} - shebang-regex@3.0.0: {} shell-quote@1.8.1: {} @@ -6376,7 +6334,7 @@ snapshots: spawndamnit@2.0.0: dependencies: - cross-spawn: 5.1.0 + cross-spawn: 7.0.5 signal-exit: 3.0.7 sprintf-js@1.0.3: {} @@ -6755,10 +6713,6 @@ snapshots: tr46: 0.0.3 webidl-conversions: 3.0.1 - which@1.3.1: - dependencies: - isexe: 2.0.0 - which@2.0.2: dependencies: isexe: 2.0.0 @@ -6792,8 +6746,6 @@ snapshots: wrappy@1.0.2: {} - yallist@2.1.2: {} - yaml@1.10.2: {} yaml@2.5.0: {}