Typescript project doesn't mean ts files (#673)

* typescript project doesn't mean ts files

* improve addons

* add changeset

* oupsy

* let's see like this

* Update .changeset/sour-wings-taste.md

---------

Co-authored-by: Manuel <[email protected]>

Author: jycouet

.changeset/sour-wings-taste.md

@@ -0,0 +1,5 @@
+---
+'sv': patch
+---
+
+fix(cli): `vite.config.*` file detection works for both .js and .ts variants

packages/addons/devtools-json/index.ts

@@ -8,13 +8,11 @@ export default defineAddon({
 	homepage: 'https://github.com/ChromeDevTools/vite-plugin-devtools-json',
 	options: {},
 
-	run: ({ sv, typescript }) => {
-		const ext = typescript ? 'ts' : 'js';
-
+	run: ({ sv, viteConfigFile }) => {
 		sv.devDependency('vite-plugin-devtools-json', '^1.0.0');
 
 		// add the vite plugin
-		sv.file(`vite.config.${ext}`, (content) => {
+		sv.file(viteConfigFile, (content) => {
 			const { ast, generateCode } = parseScript(content);
 
 			const vitePluginName = 'devtoolsJson';

packages/addons/paraglide/index.ts

@@ -55,7 +55,7 @@ export default defineAddon({
 	setup: ({ kit, unsupported }) => {
 		if (!kit) unsupported('Requires SvelteKit');
 	},
-	run: ({ sv, options, typescript, kit }) => {
+	run: ({ sv, options, viteConfigFile, typescript, kit }) => {
 		const ext = typescript ? 'ts' : 'js';
 		if (!kit) throw new Error('SvelteKit is required');
 
@@ -81,7 +81,7 @@ export default defineAddon({
 		});
 
 		// add the vite plugin
-		sv.file(`vite.config.${ext}`, (content) => {
+		sv.file(viteConfigFile, (content) => {
 			const { ast, generateCode } = parseScript(content);
 
 			const vitePluginName = 'paraglideVitePlugin';

packages/addons/tailwindcss/index.ts

@@ -41,8 +41,7 @@ export default defineAddon({
 	shortDescription: 'css framework',
 	homepage: 'https://tailwindcss.com',
 	options,
-	run: ({ sv, options, typescript, kit, dependencyVersion }) => {
-		const ext = typescript ? 'ts' : 'js';
+	run: ({ sv, options, viteConfigFile, typescript, kit, dependencyVersion }) => {
 		const prettierInstalled = Boolean(dependencyVersion('prettier'));
 
 		sv.devDependency('tailwindcss', '^4.0.0');
@@ -57,7 +56,7 @@ export default defineAddon({
 		}
 
 		// add the vite plugin
-		sv.file(`vite.config.${ext}`, (content) => {
+		sv.file(viteConfigFile, (content) => {
 			const { ast, generateCode } = parseScript(content);
 
 			const vitePluginName = 'tailwindcss';

packages/addons/vitest-addon/index.ts

@@ -20,7 +20,7 @@ export default defineAddon({
 	shortDescription: 'unit testing',
 	homepage: 'https://vitest.dev',
 	options,
-	run: ({ sv, typescript, kit, options }) => {
+	run: ({ sv, viteConfigFile, typescript, kit, options }) => {
 		const ext = typescript ? 'ts' : 'js';
 		const unitTesting = options.usages.includes('unit');
 		const componentTesting = options.usages.includes('component');
@@ -96,11 +96,11 @@ export default defineAddon({
 				`;
 			});
 		}
-		sv.file(`vite.config.${ext}`, (content) => {
+		sv.file(viteConfigFile, (content) => {
 			const { ast, generateCode } = parseScript(content);
 
 			const clientObjectExpression = object.create({
-				extends: `./vite.config.${ext}`,
+				extends: `./${viteConfigFile}`,
 				test: {
 					name: 'client',
 					environment: 'browser',
@@ -116,7 +116,7 @@ export default defineAddon({
 			});
 
 			const serverObjectExpression = object.create({
-				extends: `./vite.config.${ext}`,
+				extends: `./${viteConfigFile}`,
 				test: {
 					name: 'server',
 					environment: 'node',

packages/cli/commands/add/utils.ts

@@ -111,6 +111,7 @@ export const commonFilePaths = {
 	packageJson: 'package.json',
 	svelteConfig: 'svelte.config.js',
 	tsconfig: 'tsconfig.json',
+	viteConfig: 'vite.config.js',
 	viteConfigTS: 'vite.config.ts'
 } as const;
 

packages/cli/commands/add/workspace.ts

@@ -23,6 +23,8 @@ export async function createWorkspace({
 	const viteConfigPath = path.join(resolvedCwd, commonFilePaths.viteConfigTS);
 	let usesTypescript = fs.existsSync(viteConfigPath);
 
+	const viteConfigFile = usesTypescript ? commonFilePaths.viteConfigTS : commonFilePaths.viteConfig;
+
 	if (TESTING) {
 		// while executing tests, we only look into the direct `cwd`
 		// as we might detect the monorepo `tsconfig.json` otherwise.
@@ -55,6 +57,7 @@ export async function createWorkspace({
 		options,
 		packageManager: packageManager ?? (await detect({ cwd }))?.name ?? getUserAgent() ?? 'npm',
 		typescript: usesTypescript,
+		viteConfigFile,
 		kit: dependencies['@sveltejs/kit'] ? parseKitOptions(resolvedCwd) : undefined,
 		dependencyVersion: (pkg) => dependencies[pkg]
 	};

packages/core/addon/workspace.ts

@@ -13,6 +13,7 @@ export type Workspace<Args extends OptionDefinition> = {
 	 */
 	dependencyVersion: (pkg: string) => string | undefined;
 	typescript: boolean;
+	viteConfigFile: string;
 	kit: { libDirectory: string; routesDirectory: string } | undefined;
 	packageManager: PackageManager;
 };