Merge branch 'main' into update/eslint-plugin-svelte

Author: manuel3108

.changeset/hungry-beds-speak.md

@@ -0,0 +1,5 @@
+---
+'sv': patch
+---
+
+fix: make `drizzle` next steps more precise

.changeset/nervous-apples-attack.md

@@ -0,0 +1,5 @@
+---
+'sv': patch
+---
+
+chore: update addon dependencies

.changeset/popular-seas-argue.md

@@ -0,0 +1,5 @@
+---
+'sv': patch
+---
+
+fix: allow selecting adapter auto

.changeset/two-crabs-bow.md

@@ -0,0 +1,5 @@
+---
+'sv': patch
+---
+
+fix: re-add `tailwindcss` plugins

package.json

@@ -39,5 +39,10 @@
 		"unplugin-isolated-decl": "^0.8.3",
 		"vitest": "^3.0.5"
 	},
-	"packageManager": "pnpm@10.4.1"
+	"packageManager": "pnpm@10.4.1",
+	"pnpm": {
+		"onlyBuiltDependencies": [
+			"esbuild"
+		]
+	}
 }

packages/addons/_tests/tailwindcss/test.ts

@@ -22,22 +22,19 @@ test.concurrent.for(variants)('none - %s', async (variant, { page, ...ctx }) =>
 	await expect(el).toHaveCSS('margin-top', '4px');
 });
 
-test.concurrent.for(variants)(
-	'typography without plugin - %s',
-	async (variant, { page, ...ctx }) => {
-		const cwd = await ctx.run(variant, { tailwindcss });
-
-		// ...add files
-		addFixture(cwd, variant);
-
-		const { close } = await prepareServer({ cwd, page });
-		// kill server process when we're done
-		ctx.onTestFinished(async () => await close());
-
-		const el = page.getByTestId('typography');
-		await expect(el).toHaveCSS('font-size', '18px');
-		await expect(el).toHaveCSS('line-height', '28px');
-		await expect(el).toHaveCSS('text-align', 'right');
-		await expect(el).toHaveCSS('text-decoration-line', 'line-through');
-	}
-);
+test.concurrent.for(variants)('typography - %s', async (variant, { page, ...ctx }) => {
+	const cwd = await ctx.run(variant, { tailwindcss: { plugins: ['typography'] } });
+
+	// ...add files
+	addFixture(cwd, variant);
+
+	const { close } = await prepareServer({ cwd, page });
+	// kill server process when we're done
+	ctx.onTestFinished(async () => await close());
+
+	const el = page.getByTestId('typography');
+	await expect(el).toHaveCSS('font-size', '18px');
+	await expect(el).toHaveCSS('line-height', '28px');
+	await expect(el).toHaveCSS('text-align', 'right');
+	await expect(el).toHaveCSS('text-decoration-line', 'line-through');
+});

packages/addons/drizzle/index.ts

@@ -74,7 +74,7 @@ export default defineAddon({
 	run: ({ sv, typescript, options, kit }) => {
 		const ext = typescript ? 'ts' : 'js';
 
-		sv.dependency('drizzle-orm', '^0.38.4');
+		sv.dependency('drizzle-orm', '^0.40.0');
 		sv.devDependency('drizzle-kit', '^0.30.2');
 
 		// MySQL
@@ -343,6 +343,10 @@ export default defineAddon({
 			steps.push(
 				`Run ${highlighter.command(`${packageManager} run db:start`)} to start the docker container`
 			);
+		} else {
+			steps.push(
+				`Check ${highlighter.env('DATABASE_URL')} in ${highlighter.path('.env')} and adjust it to your needs`
+			);
 		}
 		steps.push(
 			`Run ${highlighter.command(`${packageManager} run db:push`)} to update your database schema`

packages/addons/eslint/index.ts

@@ -24,6 +24,8 @@ export default defineAddon({
 		sv.devDependency('@eslint/compat', '^1.2.5');
 		sv.devDependency('globals', '^15.14.0');
 		sv.devDependency('eslint-plugin-svelte', '^3.0.0');
+		sv.devDependency('globals', '^16.0.0');
+		sv.devDependency('eslint-plugin-svelte', '^2.46.1');
 		sv.devDependency('@eslint/js', '^9.18.0');
 
 		if (typescript) sv.devDependency('typescript-eslint', '^8.20.0');

packages/addons/sveltekit-adapter/index.ts

@@ -9,6 +9,7 @@ type Adapter = {
 };
 
 const adapters: Adapter[] = [
+	{ id: 'auto', package: '@sveltejs/adapter-auto', version: '^4.0.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' },
@@ -22,7 +23,7 @@ const options = defineAddonOptions({
 		type: 'select',
 		question: 'Which SvelteKit adapter would you like to use?',
 		options: adapters.map((p) => ({ value: p.id, label: p.id, hint: p.package })),
-		default: 'node'
+		default: 'auto'
 	}
 });
 

packages/addons/tailwindcss/index.ts

@@ -1,16 +1,47 @@
-import { defineAddon } from '@sveltejs/cli-core';
-import { addImports } from '@sveltejs/cli-core/css';
+import { defineAddon, defineAddonOptions } from '@sveltejs/cli-core';
+import { addAtRule, addImports } from '@sveltejs/cli-core/css';
 import { array, functions, imports, object, exports } from '@sveltejs/cli-core/js';
 import { parseCss, parseJson, parseScript, parseSvelte } from '@sveltejs/cli-core/parsers';
 import { addSlot } from '@sveltejs/cli-core/html';
 
+type Plugin = {
+	id: string;
+	package: string;
+	version: string;
+	identifier: string;
+};
+
+const plugins: Plugin[] = [
+	{
+		id: 'typography',
+		package: '@tailwindcss/typography',
+		version: '^0.5.15',
+		identifier: 'typography'
+	},
+	{
+		id: 'forms',
+		package: '@tailwindcss/forms',
+		version: '^0.5.9',
+		identifier: 'forms'
+	}
+];
+
+const options = defineAddonOptions({
+	plugins: {
+		type: 'multiselect',
+		question: 'Which plugins would you like to add?',
+		options: plugins.map((p) => ({ value: p.id, label: p.id, hint: p.package })),
+		default: []
+	}
+});
+
 export default defineAddon({
 	id: 'tailwindcss',
 	alias: 'tailwind',
 	shortDescription: 'css framework',
 	homepage: 'https://tailwindcss.com',
-	options: {},
-	run: ({ sv, typescript, kit, dependencyVersion }) => {
+	options,
+	run: ({ sv, options, typescript, kit, dependencyVersion }) => {
 		const ext = typescript ? 'ts' : 'js';
 		const prettierInstalled = Boolean(dependencyVersion('prettier'));
 
@@ -19,6 +50,12 @@ export default defineAddon({
 
 		if (prettierInstalled) sv.devDependency('prettier-plugin-tailwindcss', '^0.6.11');
 
+		for (const plugin of plugins) {
+			if (!options.plugins.includes(plugin.id)) continue;
+
+			sv.devDependency(plugin.package, plugin.version);
+		}
+
 		// add the vite plugin
 		sv.file(`vite.config.${ext}`, (content) => {
 			const { ast, generateCode } = parseScript(content);
@@ -46,6 +83,12 @@ export default defineAddon({
 
 			const nodes = addImports(ast, ["'tailwindcss'"]);
 
+			for (const plugin of plugins) {
+				if (!options.plugins.includes(plugin.id)) continue;
+
+				addAtRule(ast, 'plugin', `'${plugin.package}'`, true);
+			}
+
 			if (
 				originalFirst !== ast.first &&
 				originalFirst?.type === 'atrule' &&

packages/addons/vitest-addon/index.ts

@@ -13,7 +13,7 @@ export default defineAddon({
 		sv.devDependency('vitest', '^3.0.0');
 		sv.devDependency('@testing-library/svelte', '^5.2.4');
 		sv.devDependency('@testing-library/jest-dom', '^6.6.3');
-		sv.devDependency('jsdom', '^25.0.1');
+		sv.devDependency('jsdom', '^26.0.0');
 
 		sv.file('package.json', (content) => {
 			const { data, generateCode } = parseJson(content);