Skip to content

Commit 9674ec4

Browse files
committed
Merge branch 'main' into inline-svelte-css
2 parents 8fd2058 + e3344b4 commit 9674ec4

File tree

44 files changed

+880
-864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+880
-864
lines changed

.changeset/hungry-pans-check.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/itchy-lions-whisper.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/vite-plugin-svelte': minor
3+
---
4+
5+
Add `esm-env` to `ssr.noExternal` by default to resolve its conditions with Vite

.changeset/light-phones-happen.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/vite-plugin-svelte': major
3+
---
4+
5+
Handle Vite 6 breaking change and remove Vite 5 handling

.changeset/pre.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"mode": "pre",
3+
"tag": "next",
4+
"initialVersions": {
5+
"vite-plugin-svelte-e2e-tests": "1.0.0",
6+
"e2e-test-dep-cjs-and-esm": "1.0.0",
7+
"e2e-test-dep-cjs-only": "1.0.0",
8+
"e2e-test-dep-esm-only": "1.0.0",
9+
"e2e-test-dep-index-only": "1.0.0",
10+
"e2e-test-dep-scss-only": "1.0.0",
11+
"e2e-test-dep-svelte-api-only": "1.0.0",
12+
"e2e-test-dep-svelte-exports-simple": "1.0.0",
13+
"e2e-test-dep-svelte-hybrid": "1.0.0",
14+
"e2e-test-dep-svelte-module": "1.0.0",
15+
"e2e-test-dep-svelte-nested": "1.0.0",
16+
"e2e-test-dep-svelte-simple": "1.0.0",
17+
"e2e-test-dep-types-only": "1.0.0",
18+
"e2e-test-dep-vite-plugins": "1.0.0",
19+
"e2e-tests-autoprefixer-browserslist": "1.0.0",
20+
"e2e-tests-configfile-custom": "1.0.0",
21+
"e2e-tests-configfile-esm": "1.0.0",
22+
"e2e-tests-css-dev-sourcemap": "0.0.0",
23+
"e2e-tests-custom-extensions": "1.0.0",
24+
"e2e-tests-dependencies": "0.0.0",
25+
"e2e-tests-env": "1.0.0",
26+
"e2e-tests-hmr": "0.0.0",
27+
"e2e-tests-import-queries": "0.0.0",
28+
"e2e-tests-inspector-kit": "0.0.0",
29+
"e2e-tests-inspector-vite": "0.0.0",
30+
"e2e-tests-kit-node": "0.0.0",
31+
"e2e-tests-package-json-svelte-field": "1.0.0",
32+
"e2e-tests-prebundle-svelte-deps": "0.0.0",
33+
"e2e-tests-preprocess-with-vite": "0.0.0",
34+
"e2e-tests-css-none": "0.0.0",
35+
"e2e-tests-scan-deps": "0.0.0",
36+
"e2e-tests-svelte-preprocess": "0.0.0",
37+
"e2e-tests-ts-type-import": "0.0.0",
38+
"e2e-tests-vite-ssr-esm": "0.0.0",
39+
"vite-plugin-svelte-playground": "1.0.0",
40+
"playground-basic": "0.0.0",
41+
"playground-big": "0.0.0",
42+
"playground-big-component-library": "0.0.0",
43+
"playground-big-component-library-kit": "0.0.0",
44+
"playground-big-component-library-vite-ssr": "0.0.0",
45+
"playground-kit-demo-app": "0.0.0",
46+
"playground-optimizedeps-include": "0.0.0",
47+
"@sveltejs/vite-plugin-svelte": "4.0.1",
48+
"@sveltejs/vite-plugin-svelte-inspector": "3.0.1"
49+
},
50+
"changesets": []
51+
}

.changeset/twenty-dolls-drive.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@sveltejs/vite-plugin-svelte-inspector': major
3+
'@sveltejs/vite-plugin-svelte': major
4+
---
5+
6+
Support Vite 6

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
"generate:types": "pnpm --filter \"./packages/*\" --parallel generate:types"
2323
},
2424
"devDependencies": {
25-
"@changesets/cli": "^2.27.9",
26-
"@eslint/eslintrc": "^3.1.0",
27-
"@eslint/js": "^9.14.0",
28-
"@stylistic/eslint-plugin-js": "^2.10.1",
25+
"@changesets/cli": "^2.27.10",
26+
"@eslint/eslintrc": "^3.2.0",
27+
"@eslint/js": "^9.15.0",
28+
"@stylistic/eslint-plugin-js": "^2.11.0",
2929
"@sveltejs/eslint-config": "^8.1.0",
3030
"@svitejs/changesets-changelog-github-compact": "^1.2.0",
3131
"@types/fs-extra": "^11.0.4",
32-
"@types/node": "^22.9.0",
32+
"@types/node": "^22.9.1",
3333
"cross-env": "^7.0.3",
3434
"dts-buddy": "^0.5.3",
35-
"eslint": "^9.14.0",
35+
"eslint": "^9.15.0",
3636
"eslint-config-prettier": "^9.1.0",
3737
"eslint-plugin-markdown": "^5.1.0",
3838
"eslint-plugin-n": "^17.13.2",
@@ -41,19 +41,19 @@
4141
"execa": "^8.0.1",
4242
"fs-extra": "^11.2.0",
4343
"globals": "^15.12.0",
44-
"husky": "^9.1.6",
44+
"husky": "^9.1.7",
4545
"lint-staged": "^15.2.10",
4646
"node-fetch": "^3.3.2",
4747
"npm-run-all2": "^7.0.1",
48-
"playwright-core": "~1.48.2",
48+
"playwright-core": "~1.49.0",
4949
"prettier": "^3.3.3",
5050
"prettier-plugin-svelte": "^3.2.8",
5151
"publint": "^0.2.12",
52-
"svelte": "^5.2.0",
52+
"svelte": "^5.2.4",
5353
"svelte-eslint-parser": "^0.43.0",
5454
"typescript": "^5.6.3",
55-
"typescript-eslint": "^8.14.0",
56-
"vite": "^5.4.11",
55+
"typescript-eslint": "^8.15.0",
56+
"vite": "^6.0.0-beta.10",
5757
"vitest": "^2.1.5"
5858
},
5959
"lint-staged": {
@@ -62,7 +62,7 @@
6262
"prettier --cache --ignore-path .gitignore --ignore-unknown --write"
6363
]
6464
},
65-
"packageManager": "pnpm@9.13.2",
65+
"packageManager": "pnpm@9.14.2",
6666
"engines": {
6767
"pnpm": "^9.0.0",
6868
"node": "^18.0.0 || >=20"

packages/e2e-tests/_test_dependencies/svelte-api-only/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
},
1616
"type": "module",
1717
"dependencies": {
18-
"svelte": "^5.2.0"
18+
"svelte": "^5.2.4"
1919
}
2020
}

packages/e2e-tests/_test_dependencies/svelte-hybrid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"dependencies": {
21-
"@types/node": "^22.9.0",
21+
"@types/node": "^22.9.1",
2222
"e2e-test-dep-cjs-only": "file:../cjs-only"
2323
},
2424
"type": "module"

packages/e2e-tests/autoprefixer-browerslist/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"autoprefixer": "^10.4.20",
1616
"postcss": "^8.4.49",
1717
"postcss-load-config": "^6.0.1",
18-
"svelte": "^5.2.0",
18+
"svelte": "^5.2.4",
1919
"svelte-preprocess": "^6.0.3",
20-
"vite": "^5.4.11"
20+
"vite": "^6.0.0-beta.10"
2121
},
2222
"type": "module"
2323
}

packages/e2e-tests/configfile-custom/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
},
1313
"devDependencies": {
1414
"@sveltejs/vite-plugin-svelte": "workspace:^",
15-
"svelte": "^5.2.0",
16-
"vite": "^5.4.11"
15+
"svelte": "^5.2.4",
16+
"vite": "^6.0.0-beta.10"
1717
},
1818
"type": "module"
1919
}

0 commit comments

Comments
 (0)