Skip to content

Commit

Permalink
generate: 'client' | 'server' (#785)
Browse files Browse the repository at this point in the history
* generate client/server

* changeset

* chore: ignore type error for now

* chore: fix audit check

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
Co-authored-by: dominikg <dominik.goepel@gmx.de>
  • Loading branch information
3 people committed Nov 9, 2023
1 parent cda2e30 commit 9509066
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 54 deletions.
5 changes: 5 additions & 0 deletions .changeset/eleven-hats-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/vite-plugin-svelte': patch
---

feat: support Svelte 5 compiler API
2 changes: 1 addition & 1 deletion packages/e2e-tests/autoprefixer-browerslist/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"autoprefixer": "^10.4.15",
"postcss": "^8.4.29",
"postcss": "^8.4.31",
"postcss-load-config": "^4.0.1",
"svelte": "^4.2.0",
"svelte-preprocess": "^5.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-plugin-svelte/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ export function svelte(inlineOptions) {
try {
// @ts-ignore doesn't exist in Svelte 4
const compileResult = await svelteCompiler.compileModule(code, {
generate: ssr ? 'ssr' : 'dom',
generate: isSvelte5 ? (ssr ? 'server' : 'client') : ssr ? 'ssr' : 'dom',
filename: moduleRequest.filename
});
logCompilerWarnings(moduleRequest, compileResult.warnings, options);
Expand Down
5 changes: 3 additions & 2 deletions packages/vite-plugin-svelte/src/utils/compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { mapToRelative } from './sourcemaps.js';

const scriptLangRE = /<script [^>]*lang=["']?([^"' >]+)["']?[^>]*>/;

import { isSvelte3 } from './svelte-version.js';
import { isSvelte3, isSvelte5 } from './svelte-version.js';

/**
* @param {Function} [makeHot]
Expand Down Expand Up @@ -53,7 +53,8 @@ export const _createCompileSvelte = (makeHot) => {
const compileOptions = {
...options.compilerOptions,
filename,
generate: ssr ? 'ssr' : 'dom'
// @ts-expect-error generate type is different for svelte5
generate: isSvelte5 ? (ssr ? 'server' : 'client') : ssr ? 'ssr' : 'dom'
};
if (isSvelte3) {
// @ts-ignore
Expand Down
5 changes: 3 additions & 2 deletions packages/vite-plugin-svelte/src/utils/esbuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
// @ts-ignore doesn't exist in Svelte 4
const compiled = svelte.compileModule(code, {
filename,
generate: 'dom',
generate: isSvelte5 ? 'client' : 'dom',
runes: true
});
if (endStat) {
Expand All @@ -86,7 +86,8 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
...options.compilerOptions,
css,
filename,
generate: 'dom'
// @ts-expect-error generate type is different for svelte5
generate: isSvelte5 ? 'client' : 'dom'
};
if (isSvelte3) {
// @ts-ignore
Expand Down

0 comments on commit 9509066

Please sign in to comment.