Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/sharp-pets-do.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@sveltejs/sv-utils': patch
'sv': patch
---

feat(sv): improve `svelte` version detection
6 changes: 3 additions & 3 deletions packages/sv-utils/src/tooling/svelte/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { coerceVersion } from '../../semver.ts';
import { parseScript, type SvelteAst } from '../index.ts';
import { appendFromString } from '../js/common.ts';
import { parseSvelte } from '../parsers.ts';
Expand Down Expand Up @@ -38,9 +39,8 @@ export function addSlot(
ast: SvelteAst.Root,
options: { svelteVersion: string; language?: 'ts' | 'js' }
): void {
const slotSyntax =
options.svelteVersion &&
(options.svelteVersion.startsWith('4') || options.svelteVersion.startsWith('3'));
const svelteVersionMajor = options.svelteVersion && coerceVersion(options.svelteVersion).major;
const slotSyntax = svelteVersionMajor === 4 || svelteVersionMajor === 3;

if (slotSyntax) {
// @ts-expect-error
Expand Down
6 changes: 4 additions & 2 deletions packages/sv/src/addons/better-auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import {
transforms,
resolveCommandArray,
createPrinter,
type TransformFn
type TransformFn,
coerceVersion
} from '@sveltejs/sv-utils';
import crypto from 'node:crypto';
import { defineAddon, defineAddonOptions } from '../core/config.ts';
Expand Down Expand Up @@ -41,7 +42,8 @@ export default defineAddon({
runsAfter('tailwindcss');
},
run: ({ sv, language, options, directory, dependencyVersion, file }) => {
const svelte5 = !!dependencyVersion('svelte')?.startsWith('5');
const svelteVersion = dependencyVersion('svelte');
const svelte5 = !!svelteVersion && coerceVersion(svelteVersion).major === 5;
const [ts, s5] = createPrinter(language === 'ts', svelte5);

const demoPassword = options.demo.includes('password');
Expand Down
Loading