Merge branch 'main' into preprepare

sveltejs · Jan 22, 2025 · c03012f · c03012f
2 parents 7301249 + 6d07765
commit c03012f
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 14 deletions.
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 }) => {
 		const ext = typescript ? 'ts' : 'js';
 
-		sv.devDependency('vitest', '^2.1.8');
+		sv.devDependency('vitest', '^3.0.0');
 
 		sv.file('package.json', (content) => {
 			const { data, generateCode } = parseJson(content);

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,14 @@
 # sv
 
+## 0.6.14
+### Patch Changes
+
+
+- chore: update `vite@6` and related packages ([#410](https://github.com/sveltejs/cli/pull/410))
+
+
+- fix: forward exit code of external package commands ([#412](https://github.com/sveltejs/cli/pull/412))
+
 ## 0.6.13
 ### Patch Changes
 

diff --git a/packages/cli/commands/check.ts b/packages/cli/commands/check.ts
@@ -5,6 +5,7 @@ import { Command } from 'commander';
 import * as resolve from 'empathic/resolve';
 import { resolveCommand } from 'package-manager-detector/commands';
 import { getUserAgent } from '../utils/package-manager.ts';
+import { forwardExitCode } from '../utils/common.js';
 
 export const check = new Command('check')
 	.description('a CLI for checking your Svelte code')
@@ -42,5 +43,7 @@ function runCheck(cwd: string, args: string[]) {
 	try {
 		const cmd = resolveCommand(pm, 'execute-local', ['svelte-check', ...args])!;
 		execSync(`${cmd.command} ${cmd.args.join(' ')}`, { stdio: 'inherit', cwd });
-	} catch {}
+	} catch (error) {
+		forwardExitCode(error);
+	}
 }
diff --git a/packages/cli/commands/migrate.ts b/packages/cli/commands/migrate.ts
@@ -3,6 +3,7 @@ import process from 'node:process';
 import { Command } from 'commander';
 import { resolveCommand } from 'package-manager-detector';
 import { getUserAgent } from '../utils/package-manager.ts';
+import { forwardExitCode } from '../utils/common.js';
 
 export const migrate = new Command('migrate')
 	.description('a CLI for migrating Svelte(Kit) codebases')
@@ -31,5 +32,7 @@ function runMigrate(cwd: string, args: string[]) {
 
 		const cmd = resolveCommand(pm, 'execute', cmdArgs)!;
 		execSync(`${cmd.command} ${cmd.args.join(' ')}`, { stdio: 'inherit', cwd });
-	} catch {}
+	} catch (error) {
+		forwardExitCode(error);
+	}
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sv",
-	"version": "0.6.13",
+	"version": "0.6.14",
 	"type": "module",
 	"description": "A CLI for creating and updating SvelteKit projects",
 	"license": "MIT",

diff --git a/packages/cli/utils/common.ts b/packages/cli/utils/common.ts
@@ -3,6 +3,7 @@ import pkg from '../package.json' with { type: 'json' };
 import * as p from '@sveltejs/clack-prompts';
 import type { Argument, HelpConfiguration, Option } from 'commander';
 import { UnsupportedError } from './errors.ts';
+import process from 'node:process';
 
 const NO_PREFIX = '--no-';
 let options: readonly Option[] = [];
@@ -96,3 +97,11 @@ export function getPadding(lines: string[]) {
 	const lengths = lines.map((s) => s.length);
 	return Math.max(...lengths);
 }
+
+export function forwardExitCode(error: unknown) {
+	if (error && typeof error === 'object' && 'status' in error && typeof error.status == 'number') {
+		process.exit(error.status);
+	} else {
+		process.exit(1);
+	}
+}
diff --git a/packages/create/templates/demo/package.json b/packages/create/templates/demo/package.json
@@ -11,11 +11,11 @@
 	"devDependencies": {
 		"@fontsource/fira-mono": "^5.0.0",
 		"@neoconfetti/svelte": "^2.0.0",
-		"@sveltejs/adapter-auto": "^3",
-		"@sveltejs/kit": "^2",
-		"@sveltejs/vite-plugin-svelte": "^4.0.0",
+		"@sveltejs/adapter-auto": "^4.0.0",
+		"@sveltejs/kit": "^2.9.0",
+		"@sveltejs/vite-plugin-svelte": "^5.0.0",
 		"svelte": "^5.0.0",
 		"typescript": "^5.3.3",
-		"vite": "^5.4.11"
+		"vite": "^6.0.0"
 	}
 }
diff --git a/packages/create/templates/demo/package.template.json b/packages/create/templates/demo/package.template.json
@@ -14,8 +14,8 @@
 		"@neoconfetti/svelte": "^2.0.0",
 		"@sveltejs/adapter-auto": "^4.0.0",
 		"@sveltejs/kit": "^2.16.0",
-		"@sveltejs/vite-plugin-svelte": "^4.0.0",
+		"@sveltejs/vite-plugin-svelte": "^5.0.0",
 		"svelte": "^5.0.0",
-		"vite": "^5.4.11"
+		"vite": "^6.0.0"
 	}
 }
diff --git a/packages/create/templates/library/package.template.json b/packages/create/templates/library/package.template.json
@@ -26,10 +26,10 @@
 		"@sveltejs/adapter-auto": "^4.0.0",
 		"@sveltejs/kit": "^2.16.0",
 		"@sveltejs/package": "^2.0.0",
-		"@sveltejs/vite-plugin-svelte": "^4.0.0",
+		"@sveltejs/vite-plugin-svelte": "^5.0.0",
 		"publint": "^0.3.2",
 		"svelte": "^5.0.0",
 		"typescript": "^5.3.2",
-		"vite": "^5.4.11"
+		"vite": "^6.0.0"
 	}
 }
diff --git a/packages/create/templates/minimal/package.template.json b/packages/create/templates/minimal/package.template.json
@@ -12,8 +12,8 @@
 	"devDependencies": {
 		"@sveltejs/adapter-auto": "^4.0.0",
 		"@sveltejs/kit": "^2.16.0",
-		"@sveltejs/vite-plugin-svelte": "^4.0.0",
+		"@sveltejs/vite-plugin-svelte": "^5.0.0",
 		"svelte": "^5.0.0",
-		"vite": "^5.4.11"
+		"vite": "^6.0.0"
 	}
 }