Merge branch 'main' into perf/tests-v7

jycouet · web-flow · commit e2d57a601e9d · 2025-09-24T23:24:36.000+02:00
diff --git a/.changeset/three-trains-allow.md b/.changeset/three-trains-allow.md
@@ -0,0 +1,5 @@
+---
+'sv': patch
+---
+
+fix(cli): `--from-playground` option now works correctly from node 20
diff --git a/packages/addons/_tests/vitest/test.ts b/packages/addons/_tests/vitest/test.ts
@@ -1,6 +1,8 @@
 import { execSync } from 'node:child_process';
 import { setupTest } from '../_setup/suite.ts';
 import vitest from '../../vitest-addon/index.ts';
+import path from 'node:path';
+import fs from 'node:fs';
 
 const { test, flavors } = setupTest(
 	{ vitest },
@@ -15,4 +17,10 @@ test.concurrent.for(flavors)('vitest $variant', (flavor, { expect, ...ctx }) =>
 	expect(() => execSync('pnpm exec playwright install chromium', { cwd })).not.toThrow();
 
 	expect(() => execSync('pnpm test', { cwd, stdio: 'pipe' })).not.toThrow();
+
+	const ext = variant.includes('ts') ? 'ts' : 'js';
+	const viteFile = path.resolve(cwd, `vite.config.${ext}`);
+	const viteContent = fs.readFileSync(viteFile, 'utf8');
+
+	expect(viteContent).toContain(`vitest/config`);
 });
diff --git a/packages/addons/vitest-addon/index.ts b/packages/addons/vitest-addon/index.ts
@@ -1,5 +1,5 @@
-import { dedent, defineAddon, defineAddonOptions, log } from '@sveltejs/cli-core';
-import { array, exports, functions, object } from '@sveltejs/cli-core/js';
+import { dedent, defineAddon, defineAddonOptions } from '@sveltejs/cli-core';
+import { array, imports, object, vite } from '@sveltejs/cli-core/js';
 import { parseJson, parseScript } from '@sveltejs/cli-core/parsers';
 
 const options = defineAddonOptions()
@@ -96,6 +96,7 @@ export default defineAddon({
 				`;
 			});
 		}
+
 		sv.file(viteConfigFile, (content) => {
 			const { ast, generateCode } = parseScript(content);
 
@@ -125,19 +126,9 @@ export default defineAddon({
 				}
 			});
 
-			const defineConfigFallback = functions.createCall({ name: 'defineConfig', args: [] });
-			const { value: defineWorkspaceCall } = exports.createDefault(ast, {
-				fallback: defineConfigFallback
-			});
-			if (defineWorkspaceCall.type !== 'CallExpression') {
-				log.warn('Unexpected vite config. Could not update.');
-			}
+			const viteConfig = vite.getConfig(ast);
 
-			const vitestConfig = functions.getArgument(defineWorkspaceCall, {
-				index: 0,
-				fallback: object.create({})
-			});
-			const testObject = object.property(vitestConfig, {
+			const testObject = object.property(viteConfig, {
 				name: 'test',
 				fallback: object.create({
 					expect: {
@@ -154,6 +145,17 @@ export default defineAddon({
 			if (componentTesting) array.append(workspaceArray, clientObjectExpression);
 			if (unitTesting) array.append(workspaceArray, serverObjectExpression);
 
+			// Manage imports
+			const importName = 'defineConfig';
+			const { statement, alias } = imports.find(ast, { name: importName, from: 'vite' });
+			if (statement) {
+				// Switch the import from 'vite' to 'vitest/config' (keeping the alias)
+				imports.addNamed(ast, { imports: { defineConfig: alias }, from: 'vitest/config' });
+
+				// Remove the old import
+				imports.remove(ast, { name: importName, from: 'vite', statement });
+			}
+
 			return generateCode();
 		});
 	}
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # sv
 
+## 0.9.6
+### Patch Changes
+
+
+- fix(vitest): now import `defineConfig` from `vitest/config` ([#703](https://github.com/sveltejs/cli/pull/703))
+
 ## 0.9.5
 ### Patch Changes
 
diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts
@@ -242,7 +242,7 @@ async function createProjectFromPlayground(url: string, cwd: string): Promise<vo
 
 	// Detect external dependencies and ask for confirmation
 	const dependencies = detectPlaygroundDependencies(playground.files);
-	const installDependencies = await confirmExternalDependencies(dependencies.keys().toArray());
+	const installDependencies = await confirmExternalDependencies(Array.from(dependencies.keys()));
 
 	setupPlaygroundProject(playground, cwd, installDependencies);
 }
diff --git a/packages/cli/lib/testing.ts b/packages/cli/lib/testing.ts
@@ -4,6 +4,7 @@ import process from 'node:process';
 import degit from 'degit';
 import { x, exec } from 'tinyexec';
 import { create } from '@sveltejs/create';
+import pstree, { type PS } from 'ps-tree';
 
 export { addPnpmBuildDependencies } from '../utils/package-manager.ts';
 export type ProjectVariant = 'kit-js' | 'kit-ts' | 'vite-js' | 'vite-ts';
@@ -121,18 +122,36 @@ export async function startPreview({
 	});
 }
 
+async function getProcessTree(pid: number) {
+	return new Promise<readonly PS[]>((res, rej) => {
+		pstree(pid, (err, children) => {
+			if (err) rej(err);
+			res(children);
+		});
+	});
+}
+
 async function terminate(pid: number) {
+	if (process.platform === 'win32') {
+		// on windows, use taskkill to terminate the process tree
+		await x('taskkill', ['/PID', `${pid}`, '/T', '/F']);
+		return;
+	}
+	const children = await getProcessTree(pid);
+	// the process tree is ordered from parents -> children,
+	// so we'll iterate in the reverse order to terminate the children first
+	for (let i = children.length - 1; i >= 0; i--) {
+		const child = children[i];
+		const pid = Number(child.PID);
+		kill(pid);
+	}
+	kill(pid);
+}
+
+function kill(pid: number) {
 	try {
-		if (process.platform === 'win32') {
-			await x('taskkill', ['/PID', `${pid}`, '/T', '/F']); // on windows, use taskkill to terminate the process tree
-		} else {
-			process.kill(-pid, 'SIGTERM'); // Kill the process group
-		}
+		process.kill(pid);
 	} catch {
-		try {
-			process.kill(pid, 'SIGTERM'); // Kill just the process
-		} catch {
-			// Process might already be terminated
-		}
+		// this can happen if a process has been automatically terminated.
 	}
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sv",
-	"version": "0.9.5",
+	"version": "0.9.6",
 	"type": "module",
 	"description": "A CLI for creating and updating SvelteKit projects",
 	"license": "MIT",
diff --git a/packages/core/tests/js/imports/find-import/output.ts b/packages/core/tests/js/imports/find-import/output.ts
@@ -0,0 +1 @@
+import { namedOne as namedOneAlias, namedOneAliasFound } from 'package';
diff --git a/packages/core/tests/js/imports/find-import/run.ts b/packages/core/tests/js/imports/find-import/run.ts
@@ -0,0 +1,14 @@
+import { imports, type AstTypes } from '@sveltejs/cli-core/js';
+
+export function run(ast: AstTypes.Program): void {
+	imports.addNamed(ast, { from: 'package', imports: { namedOne: 'namedOneAlias' }, isType: false });
+
+	const result = imports.find(ast, { name: 'namedOne', from: 'package' });
+
+	if (result) {
+		imports.addNamed(ast, {
+			imports: [result.alias + 'Found'],
+			from: 'package'
+		});
+	}
+}
diff --git a/packages/core/tests/js/imports/remove-import/input.ts b/packages/core/tests/js/imports/remove-import/input.ts
@@ -0,0 +1,2 @@
+import { n1, n2 } from 'p1';
+import { n3 } from 'p3';
diff --git a/packages/core/tests/js/imports/remove-import/output.ts b/packages/core/tests/js/imports/remove-import/output.ts
@@ -0,0 +1 @@
+import { n1 } from 'p1';
diff --git a/packages/core/tests/js/imports/remove-import/run.ts b/packages/core/tests/js/imports/remove-import/run.ts
@@ -0,0 +1,6 @@
+import { imports, type AstTypes } from '@sveltejs/cli-core/js';
+
+export function run(ast: AstTypes.Program): void {
+	imports.remove(ast, { name: 'n2', from: 'p1' });
+	imports.remove(ast, { name: 'n3', from: 'p3' });
+}
diff --git a/packages/core/tests/js/vite/with-alias/input.ts b/packages/core/tests/js/vite/with-alias/input.ts
@@ -0,0 +1,6 @@
+import { sveltekit } from '@sveltejs/kit/vite';
+import { defineConfig as MyConf } from 'vite';
+
+export default MyConf({
+	plugins: [sveltekit()]
+});
diff --git a/packages/core/tests/js/vite/with-alias/output.ts b/packages/core/tests/js/vite/with-alias/output.ts
@@ -0,0 +1,5 @@
+import myPlugin from 'my-plugin';
+import { sveltekit } from '@sveltejs/kit/vite';
+import { defineConfig as MyConf } from 'vite';
+
+export default MyConf({ plugins: [sveltekit(), myPlugin()] });
diff --git a/packages/core/tests/js/vite/with-alias/run.ts b/packages/core/tests/js/vite/with-alias/run.ts
@@ -0,0 +1,7 @@
+import { imports, vite, type AstTypes } from '@sveltejs/cli-core/js';
+
+export function run(ast: AstTypes.Program): void {
+	const vitePluginName = 'myPlugin';
+	imports.addDefault(ast, { as: vitePluginName, from: 'my-plugin' });
+	vite.addPlugin(ast, { code: `${vitePluginName}()` });
+}
diff --git a/packages/core/tests/js/vite/without-defineConfig/output.ts b/packages/core/tests/js/vite/without-defineConfig/output.ts
@@ -1,6 +1,6 @@
 import myPlugin from 'my-plugin';
 import { sveltekit } from '@sveltejs/kit/vite';
-import type { UserConfig, defineConfig } from 'vite';
+import type { UserConfig } from 'vite';
 
 const config: UserConfig = { plugins: [myPlugin(), sveltekit()] };
 
diff --git a/packages/core/tooling/js/exports.ts b/packages/core/tooling/js/exports.ts
@@ -3,6 +3,7 @@ import type { AstTypes } from '../index.ts';
 export type ExportDefaultResult<T> = {
 	astNode: AstTypes.ExportDefaultDeclaration;
 	value: T;
+	isFallback: boolean;
 };
 
 export function createDefault<T extends AstTypes.Expression>(
@@ -17,7 +18,7 @@ export function createDefault<T extends AstTypes.Expression>(
 		};
 
 		node.body.push(exportNode);
-		return { astNode: exportNode, value: options.fallback };
+		return { astNode: exportNode, value: options.fallback, isFallback: true };
 	}
 
 	const exportDefaultDeclaration = existingNode;
@@ -46,11 +47,11 @@ export function createDefault<T extends AstTypes.Expression>(
 
 		const value = variableDeclarator.init as T;
 
-		return { astNode: exportDefaultDeclaration, value };
+		return { astNode: exportDefaultDeclaration, value, isFallback: false };
 	}
 
 	const declaration = exportDefaultDeclaration.declaration as T;
-	return { astNode: exportDefaultDeclaration, value: declaration };
+	return { astNode: exportDefaultDeclaration, value: declaration, isFallback: false };
 }
 
 export function createNamed(
diff --git a/packages/core/tooling/js/imports.ts b/packages/core/tooling/js/imports.ts
@@ -59,6 +59,11 @@ export function addDefault(node: AstTypes.Program, options: { from: string; as:
 export function addNamed(
 	node: AstTypes.Program,
 	options: {
+		/**
+		 * ```ts
+		 * imports: { 'name': 'alias' } | ['name']
+		 * ```
+		 */
 		imports: Record<string, string> | string[];
 		from: string;
 		isType?: boolean;
@@ -138,3 +143,69 @@ function addImportIfNecessary(
 		node.body.unshift(expectedImportDeclaration);
 	}
 }
+
+export function find(
+	ast: AstTypes.Program,
+	options: { name: string; from: string }
+):
+	| { statement: AstTypes.ImportDeclaration; alias: string }
+	| { statement: undefined; alias: undefined } {
+	let alias = options.name;
+	let statement: AstTypes.ImportDeclaration;
+
+	Walker.walk(ast as AstTypes.Node, null, {
+		ImportDeclaration(node) {
+			if (node.specifiers && node.source.value === options.from) {
+				const specifier = node.specifiers.find(
+					(sp) =>
+						sp.type === 'ImportSpecifier' &&
+						sp.imported.type === 'Identifier' &&
+						sp.imported.name === options.name
+				) as AstTypes.ImportSpecifier | undefined;
+				if (specifier) {
+					statement = node;
+					alias = (specifier.local?.name ?? alias) as string;
+					return;
+				}
+			}
+		}
+	});
+
+	if (statement!) {
+		return { statement, alias };
+	}
+
+	return { statement: undefined, alias: undefined };
+}
+
+export function remove(
+	ast: AstTypes.Program,
+	options: {
+		name: string;
+		from: string;
+		statement?: AstTypes.ImportDeclaration; // Just in case you want to pass the statement directly
+	}
+): void {
+	const statement =
+		options.statement ?? find(ast, { name: options.name, from: options.from }).statement;
+
+	if (!statement) {
+		return;
+	}
+
+	if (statement.specifiers?.length === 1) {
+		const idxToRemove = ast.body.indexOf(statement);
+		ast.body.splice(idxToRemove, 1);
+	} else {
+		// otherwise, just remove the `defineConfig` specifier
+		const idxToRemove = statement.specifiers?.findIndex(
+			(s) =>
+				s.type === 'ImportSpecifier' &&
+				s.imported.type === 'Identifier' &&
+				s.imported.name === options.name
+		);
+		if (idxToRemove !== undefined && idxToRemove !== -1) {
+			statement.specifiers?.splice(idxToRemove, 1);
+		}
+	}
+}
diff --git a/packages/core/tooling/js/vite.ts b/packages/core/tooling/js/vite.ts
diff --git a/packages/create/test/playground.ts b/packages/create/test/playground.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'sv': patch
 +---
++
 +fix(cli): `--from-playground` option now works correctly from node 20
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ async function createProjectFromPlayground(url: string, cwd: string): Promise<vo`
`242`	`242`
`243`	`243`	`// Detect external dependencies and ask for confirmation`
`244`	`244`	`const dependencies = detectPlaygroundDependencies(playground.files);`
`245`		`- const installDependencies = await confirmExternalDependencies(dependencies.keys().toArray());`
	`245`	`+ const installDependencies = await confirmExternalDependencies(Array.from(dependencies.keys()));`
`246`	`246`
`247`	`247`	`setupPlaygroundProject(playground, cwd, installDependencies);`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sv",`
`3`		`- "version": "0.9.5",`
	`3`	`+ "version": "0.9.6",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "A CLI for creating and updating SvelteKit projects",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+import { namedOne as namedOneAlias, namedOneAliasFound } from 'package';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import { n1, n2 } from 'p1';`
	`2`	`+import { n3 } from 'p3';`