Merge branch 'main' into feat/vitest-addon-use-workspaces

sveltejs · Jan 16, 2025 · 8d07331 · 8d07331
2 parents b26262f + 13ff31b
commit 8d07331
Show file tree

Hide file tree

Showing 21 changed files with 135 additions and 355 deletions.
diff --git a/.changeset/sour-tomatoes-sin.md b/.changeset/sour-tomatoes-sin.md
@@ -0,0 +1,5 @@
+---
+"sv": patch
+---
+
+chore: improve cli help menu
diff --git a/packages/addons/drizzle/index.ts b/packages/addons/drizzle/index.ts
@@ -74,25 +74,25 @@ export default defineAddon({
 	run: ({ sv, typescript, options, kit }) => {
 		const ext = typescript ? 'ts' : 'js';
 
-		sv.dependency('drizzle-orm', '^0.33.0');
-		sv.devDependency('drizzle-kit', '^0.22.0');
+		sv.dependency('drizzle-orm', '^0.38.4');
+		sv.devDependency('drizzle-kit', '^0.30.2');
 
 		// MySQL
-		if (options.mysql === 'mysql2') sv.dependency('mysql2', '^3.11.0');
-		if (options.mysql === 'planetscale') sv.dependency('@planetscale/database', '^1.18.0');
+		if (options.mysql === 'mysql2') sv.dependency('mysql2', '^3.12.0');
+		if (options.mysql === 'planetscale') sv.dependency('@planetscale/database', '^1.19.0');
 
 		// PostgreSQL
-		if (options.postgresql === 'neon') sv.dependency('@neondatabase/serverless', '^0.9.4');
-		if (options.postgresql === 'postgres.js') sv.dependency('postgres', '^3.4.4');
+		if (options.postgresql === 'neon') sv.dependency('@neondatabase/serverless', '^0.10.4');
+		if (options.postgresql === 'postgres.js') sv.dependency('postgres', '^3.4.5');
 
 		// SQLite
 		if (options.sqlite === 'better-sqlite3') {
-			sv.dependency('better-sqlite3', '^11.1.2');
-			sv.devDependency('@types/better-sqlite3', '^7.6.11');
+			sv.dependency('better-sqlite3', '^11.8.0');
+			sv.devDependency('@types/better-sqlite3', '^7.6.12');
 		}
 
 		if (options.sqlite === 'libsql' || options.sqlite === 'turso')
-			sv.dependency('@libsql/client', '^0.9.0');
+			sv.dependency('@libsql/client', '^0.14.0');
 
 		sv.file('.env', (content) => generateEnvFileContent(content, options));
 		sv.file('.env.example', (content) => generateEnvFileContent(content, options));
@@ -179,7 +179,6 @@ export default defineAddon({
 			const objExpression = exportDefault.arguments?.[0];
 			if (!objExpression || objExpression.type !== 'ObjectExpression') return content;
 
-			const driver = options.sqlite === 'turso' ? common.createLiteral('turso') : undefined;
 			const authToken =
 				options.sqlite === 'turso'
 					? common.expressionFromString('process.env.DATABASE_AUTH_TOKEN')
@@ -192,12 +191,12 @@ export default defineAddon({
 					authToken
 				}),
 				verbose: { type: 'BooleanLiteral', value: true },
-				strict: { type: 'BooleanLiteral', value: true },
-				driver
+				strict: { type: 'BooleanLiteral', value: true }
 			});
 
+			const dialect = options.sqlite === 'turso' ? 'turso' : options.database;
 			object.overrideProperties(objExpression, {
-				dialect: common.createLiteral(options.database)
+				dialect: common.createLiteral(dialect)
 			});
 
 			// The `driver` property is only required for _some_ sqlite DBs.

diff --git a/packages/addons/eslint/index.ts b/packages/addons/eslint/index.ts
@@ -20,15 +20,15 @@ export default defineAddon({
 	run: ({ sv, typescript, dependencyVersion }) => {
 		const prettierInstalled = Boolean(dependencyVersion('prettier'));
 
-		sv.devDependency('eslint', '^9.7.0');
-		sv.devDependency('@eslint/compat', '^1.2.3');
-		sv.devDependency('globals', '^15.0.0');
-		sv.devDependency('eslint-plugin-svelte', '^2.36.0');
-		sv.devDependency('@eslint/js', '^9.17.0');
+		sv.devDependency('eslint', '^9.18.0');
+		sv.devDependency('@eslint/compat', '^1.2.5');
+		sv.devDependency('globals', '^15.14.0');
+		sv.devDependency('eslint-plugin-svelte', '^2.46.1');
+		sv.devDependency('@eslint/js', '^9.18.0');
 
-		if (typescript) sv.devDependency('typescript-eslint', '^8.0.0');
+		if (typescript) sv.devDependency('typescript-eslint', '^8.20.0');
 
-		if (prettierInstalled) sv.devDependency('eslint-config-prettier', '^9.1.0');
+		if (prettierInstalled) sv.devDependency('eslint-config-prettier', '^10.0.1');
 
 		sv.file('package.json', (content) => {
 			const { data, generateCode } = parseJson(content);

diff --git a/packages/addons/lucia/index.ts b/packages/addons/lucia/index.ts
@@ -49,7 +49,7 @@ export default defineAddon({
 
 		if (options.demo) {
 			// password hashing for demo
-			sv.dependency('@node-rs/argon2', '^1.1.0');
+			sv.dependency('@node-rs/argon2', '^2.0.2');
 		}
 
 		sv.file(`drizzle.config.${ext}`, (content) => {

diff --git a/packages/addons/mdsvex/index.ts b/packages/addons/mdsvex/index.ts
@@ -8,7 +8,7 @@ export default defineAddon({
 	homepage: 'https://mdsvex.pngwn.io',
 	options: {},
 	run: ({ sv }) => {
-		sv.devDependency('mdsvex', '^0.11.2');
+		sv.devDependency('mdsvex', '^0.12.3');
 
 		sv.file('svelte.config.js', (content) => {
 			const { ast, generateCode } = parseScript(content);

diff --git a/packages/addons/paraglide/index.ts b/packages/addons/paraglide/index.ts
@@ -73,7 +73,7 @@ export default defineAddon({
 
 		const paraglideOutDir = 'src/lib/paraglide';
 
-		sv.dependency('@inlang/paraglide-sveltekit', '^0.11.1');
+		sv.dependency('@inlang/paraglide-sveltekit', '^0.15.5');
 
 		sv.file('project.inlang/settings.json', (content) => {
 			if (content) return content;

diff --git a/packages/addons/playwright/index.ts b/packages/addons/playwright/index.ts
@@ -10,7 +10,7 @@ export default defineAddon({
 	run: ({ sv, typescript }) => {
 		const ext = typescript ? 'ts' : 'js';
 
-		sv.devDependency('@playwright/test', '^1.45.3');
+		sv.devDependency('@playwright/test', '^1.49.1');
 
 		sv.file('package.json', (content) => {
 			const { data, generateCode } = parseJson(content);

diff --git a/packages/addons/prettier/index.ts b/packages/addons/prettier/index.ts
@@ -8,8 +8,8 @@ export default defineAddon({
 	homepage: 'https://prettier.io',
 	options: {},
 	run: ({ sv, dependencyVersion }) => {
-		sv.devDependency('prettier', '^3.3.2');
-		sv.devDependency('prettier-plugin-svelte', '^3.2.6');
+		sv.devDependency('prettier', '^3.4.2');
+		sv.devDependency('prettier-plugin-svelte', '^3.3.3');
 
 		sv.file('.prettierignore', (content) => {
 			if (content) return content;
@@ -77,7 +77,7 @@ export default defineAddon({
 		}
 
 		if (eslintInstalled) {
-			sv.devDependency('eslint-config-prettier', '^9.1.0');
+			sv.devDependency('eslint-config-prettier', '^10.0.1');
 			sv.file('eslint.config.js', addEslintConfigPrettier);
 		}
 	}

diff --git a/packages/addons/sveltekit-adapter/index.ts b/packages/addons/sveltekit-adapter/index.ts
@@ -9,11 +9,11 @@ type Adapter = {
 };
 
 const adapters: Adapter[] = [
-	{ id: 'node', package: '@sveltejs/adapter-node', version: '^5.2.9' },
-	{ id: 'static', package: '@sveltejs/adapter-static', version: '^3.0.6' },
-	{ id: 'vercel', package: '@sveltejs/adapter-vercel', version: '^5.5.0' },
+	{ id: 'node', package: '@sveltejs/adapter-node', version: '^5.2.11' },
+	{ id: 'static', package: '@sveltejs/adapter-static', version: '^3.0.8' },
+	{ id: 'vercel', package: '@sveltejs/adapter-vercel', version: '^5.5.2' },
 	{ id: 'cloudflare-pages', package: '@sveltejs/adapter-cloudflare', version: '^4.8.0' },
-	{ id: 'cloudflare-workers', package: '@sveltejs/adapter-cloudflare-workers', version: '^2.6.0' },
+	{ id: 'cloudflare-workers', package: '@sveltejs/adapter-cloudflare-workers', version: '^2.7.0' },
 	{ id: 'netlify', package: '@sveltejs/adapter-netlify', version: '^4.4.0' }
 ];
 

diff --git a/packages/addons/tailwindcss/index.ts b/packages/addons/tailwindcss/index.ts
@@ -15,13 +15,13 @@ const plugins: Plugin[] = [
 	{
 		id: 'typography',
 		package: '@tailwindcss/typography',
-		version: '^0.5.15',
+		version: '^0.5.16',
 		identifier: 'typography'
 	},
 	{
 		id: 'forms',
 		package: '@tailwindcss/forms',
-		version: '^0.5.9',
+		version: '^0.5.10',
 		identifier: 'forms'
 	},
 	{
@@ -51,15 +51,15 @@ export default defineAddon({
 		const ext = typescript ? 'ts' : 'js';
 		const prettierInstalled = Boolean(dependencyVersion('prettier'));
 
-		sv.devDependency('tailwindcss', '^3.4.9');
+		sv.devDependency('tailwindcss', '^3.4.17');
 		sv.devDependency('autoprefixer', '^10.4.20');
 
-		if (prettierInstalled) sv.devDependency('prettier-plugin-tailwindcss', '^0.6.5');
+		if (prettierInstalled) sv.devDependency('prettier-plugin-tailwindcss', '^0.6.10');
 
 		for (const plugin of plugins) {
 			if (!options.plugins.includes(plugin.id)) continue;
 
-			sv.dependency(plugin.package, plugin.version);
+			sv.devDependency(plugin.package, plugin.version);
 		}
 
 		sv.file(`tailwind.config.${ext}`, (content) => {

diff --git a/packages/addons/vitest-addon/index.ts b/packages/addons/vitest-addon/index.ts
@@ -10,7 +10,7 @@ export default defineAddon({
 	run: ({ sv, typescript, kit }) => {
 		const ext = typescript ? 'ts' : 'js';
 
-		sv.devDependency('vitest', '^2.0.4');
+		sv.devDependency('vitest', '^2.1.8');
 		sv.devDependency('@testing-library/svelte', '^5.2.4');
 		sv.devDependency('@testing-library/jest-dom', '^6.6.3');
 		sv.devDependency('jsdom', '^25.0.1');

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,23 @@
 # sv
 
+## 0.6.12
+### Patch Changes
+
+
+- fix: git detection inside preconditions failed ([#394](https://github.com/sveltejs/cli/pull/394))
+
+
+- chore: update addon dependencies ([#357](https://github.com/sveltejs/cli/pull/357))
+
+
+- chore: utilize prepack lifecycle script ([#396](https://github.com/sveltejs/cli/pull/396))
+
+
+- fix: use modern `Spring` and `MediaQuery` implementation ([#361](https://github.com/sveltejs/cli/pull/361))
+
+
+- fix: tailwind plugins as dev dependencies ([#400](https://github.com/sveltejs/cli/pull/400))
+
 ## 0.6.11
 ### Patch Changes
 

diff --git a/packages/cli/commands/add/preconditions.ts b/packages/cli/commands/add/preconditions.ts
@@ -1,4 +1,5 @@
-import { exec } from 'tinyexec';
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
 import type { AddonSetupResult, AddonWithoutExplicitArgs, Precondition } from '@sveltejs/cli-core';
 import { UnsupportedError } from '../../utils/errors.ts';
 
@@ -21,9 +22,9 @@ export function getGlobalPreconditions(
 						// there are no pending changes. If the below command is run outside of a git repository,
 						// git will exit with a failing exit code, which will trigger the catch statement.
 						// also see https://remarkablemark.org/blog/2017/10/12/check-git-dirty/#git-status
-						const { stdout } = await exec('git', ['status', '--short'], {
-							nodeOptions: { cwd },
-							throwOnError: true
+						const asyncExec = promisify(exec);
+						const { stdout } = await asyncExec('git status --short', {
+							cwd
 						});
 
 						if (stdout) {

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sv",
-	"version": "0.6.11",
+	"version": "0.6.12",
 	"type": "module",
 	"description": "A CLI for creating and updating SvelteKit projects",
 	"license": "MIT",
@@ -37,7 +37,7 @@
 		"@types/degit": "^2.8.6",
 		"@types/ps-tree": "^1.1.6",
 		"@types/tar-fs": "^2.0.4",
-		"commander": "^12.1.0",
+		"commander": "^13.0.0",
 		"degit": "^2.8.4",
 		"empathic": "^1.0.0",
 		"package-manager-detector": "^0.2.7",

diff --git a/packages/cli/utils/common.ts b/packages/cli/utils/common.ts
@@ -49,7 +49,13 @@ export const helpConfig: HelpConfiguration = {
 		}
 
 		return option.flags;
-	}
+	},
+	styleTitle: (str) => pc.underline(str),
+	styleCommandText: (str) => pc.red(str),
+	styleDescriptionText: (str) => pc.gray(str),
+	styleOptionText: (str) => pc.white(str),
+	styleArgumentText: (str) => pc.white(str),
+	styleSubcommandText: (str) => pc.red(str)
 };
 
 function formatDescription(arg: Option | Argument): string {

diff --git a/packages/create/templates/demo/package.json b/packages/create/templates/demo/package.json
@@ -11,8 +11,8 @@
 	"devDependencies": {
 		"@fontsource/fira-mono": "^5.0.0",
 		"@neoconfetti/svelte": "^2.0.0",
-		"@sveltejs/adapter-auto": "workspace:*",
-		"@sveltejs/kit": "workspace:*",
+		"@sveltejs/adapter-auto": "^3",
+		"@sveltejs/kit": "^2",
 		"@sveltejs/vite-plugin-svelte": "^4.0.0",
 		"svelte": "^5.0.0",
 		"typescript": "^5.3.3",

diff --git a/packages/create/templates/demo/src/routes/Counter.svelte b/packages/create/templates/demo/src/routes/Counter.svelte
@@ -1,15 +1,8 @@
 <script lang="ts">
-	import { spring } from 'svelte/motion';
+	import { Spring } from 'svelte/motion';
 
-	let count = $state(0);
-
-	// svelte-ignore state_referenced_locally
-	const displayedCount = spring(count);
-
-	$effect(() => {
-		displayedCount.set(count);
-	});
-	let offset = $derived(modulo($displayedCount, 1));
+	const count = new Spring(0);
+	const offset = $derived(modulo(count.current, 1));
 
 	/**
 	 * @param {number} n
@@ -22,20 +15,20 @@
 </script>
 
 <div class="counter">
-	<button onclick={() => (count -= 1)} aria-label="Decrease the counter by one">
+	<button onclick={() => (count.target -= 1)} aria-label="Decrease the counter by one">
 		<svg aria-hidden="true" viewBox="0 0 1 1">
 			<path d="M0,0.5 L1,0.5" />
 		</svg>
 	</button>
 
 	<div class="counter-viewport">
 		<div class="counter-digits" style="transform: translate(0, {100 * offset}%)">
-			<strong class="hidden" aria-hidden="true">{Math.floor($displayedCount + 1)}</strong>
-			<strong>{Math.floor($displayedCount)}</strong>
+			<strong class="hidden" aria-hidden="true">{Math.floor(count.current + 1)}</strong>
+			<strong>{Math.floor(count.current)}</strong>
 		</div>
 	</div>
 
-	<button onclick={() => (count += 1)} aria-label="Increase the counter by one">
+	<button onclick={() => (count.target += 1)} aria-label="Increase the counter by one">
 		<svg aria-hidden="true" viewBox="0 0 1 1">
 			<path d="M0,0.5 L1,0.5 M0.5,0 L0.5,1" />
 		</svg>

diff --git a/packages/create/templates/demo/src/routes/sverdle/+page.svelte b/packages/create/templates/demo/src/routes/sverdle/+page.svelte
@@ -2,7 +2,7 @@
 	import { enhance } from '$app/forms';
 	import { confetti } from '@neoconfetti/svelte';
 	import type { ActionData, PageData } from './$types';
-	import { reducedMotion } from './reduced-motion';
+	import { MediaQuery } from 'svelte/reactivity';
 
 	interface Props {
 		data: PageData;
@@ -19,6 +19,9 @@
 	 */
 	let { data, form = $bindable() }: Props = $props();
 
+	/** Whether the user prefers reduced motion */
+	const reducedMotion = new MediaQuery('(prefers-reduced-motion: reduce)');
+
 	/** Whether or not the user has won */
 	let won = $derived(data.answers.at(-1) === 'xxxxx');
 
@@ -203,7 +206,7 @@
 	<div
 		style="position: absolute; left: 50%; top: 30%"
 		use:confetti={{
-			particleCount: $reducedMotion ? 0 : undefined,
+			particleCount: reducedMotion.current ? 0 : undefined,
 			force: 0.7,
 			stageWidth: window.innerWidth,
 			stageHeight: window.innerHeight,

diff --git a/packages/create/templates/demo/src/routes/sverdle/reduced-motion.ts b/packages/create/templates/demo/src/routes/sverdle/reduced-motion.ts