fix(vitest): now import defineConfig from vitest/config (#703)

* manage alias

* tooling improvement

* working & test ok

* add utils imports.find

* add utils imports.remove

* add changeset

* linting is always a nice friend around.

* Huuuuuu, looks great

Author: jycouet

.changeset/eager-schools-allow.md

@@ -0,0 +1,5 @@
+---
+'sv': patch
+---
+
+fix(vitest): now import `defineConfig` from `vitest/config`

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, variants } = setupTest({ vitest }, { browser: false });
 
@@ -12,4 +14,10 @@ test.concurrent.for(variants)('core - %s', async (variant, { 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`);
 });

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();
 		});
 	}

packages/core/tests/js/imports/find-import/output.ts

@@ -0,0 +1 @@
+import { namedOne as namedOneAlias, namedOneAliasFound } from 'package';

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'
+		});
+	}
+}

packages/core/tests/js/imports/remove-import/input.ts

@@ -0,0 +1,2 @@
+import { n1, n2 } from 'p1';
+import { n3 } from 'p3';

packages/core/tests/js/imports/remove-import/output.ts

@@ -0,0 +1 @@
+import { n1 } from 'p1';

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' });
+}

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()]
+});

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()] });