From 06e2f0885207a0ce0dc48cdeba653c59dd25c977 Mon Sep 17 00:00:00 2001
From: dominikg <dominik.goepel@gmx.de>
Date: Thu, 3 Jul 2025 10:51:08 +0200
Subject: [PATCH] chore: fix type-checks for rolldown-vite and run type check
 in our ci

---
 .github/workflows/ci.yml                               |  3 +++
 packages/vite-plugin-svelte/src/plugins/configure.js   |  2 +-
 .../vite-plugin-svelte/src/plugins/setup-optimizer.js  |  4 ++--
 packages/vite-plugin-svelte/src/preprocess.js          | 10 ++++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e2e568c3..7bfdafbc2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -124,6 +124,9 @@ jobs:
         run: pnpm playwright install chromium
       - name: run tests
         run: pnpm test
+      - name: types
+        if: (${{ success() }} || ${{ failure() }})
+        run: pnpm check:types
       - name: archive tests temp directory
         if: failure()
         shell: bash
diff --git a/packages/vite-plugin-svelte/src/plugins/configure.js b/packages/vite-plugin-svelte/src/plugins/configure.js
index d5d28a2cf..68f5e080a 100644
--- a/packages/vite-plugin-svelte/src/plugins/configure.js
+++ b/packages/vite-plugin-svelte/src/plugins/configure.js
@@ -13,7 +13,7 @@ import {
 import { buildIdFilter, buildIdParser } from '../utils/id.js';
 import { createCompileSvelte } from '../utils/compile.js';
 
-// @ts-expect-error rolldownVersion
+// @ts-ignore rolldownVersion
 const { version: viteVersion, rolldownVersion } = vite;
 
 /**
diff --git a/packages/vite-plugin-svelte/src/plugins/setup-optimizer.js b/packages/vite-plugin-svelte/src/plugins/setup-optimizer.js
index 3b1493997..56468a5ac 100644
--- a/packages/vite-plugin-svelte/src/plugins/setup-optimizer.js
+++ b/packages/vite-plugin-svelte/src/plugins/setup-optimizer.js
@@ -7,7 +7,7 @@ import { toESBuildError, toRollupError } from '../utils/error.js';
 import { safeBase64Hash } from '../utils/hash.js';
 import { normalize } from '../utils/id.js';
 import * as vite from 'vite';
-// @ts-expect-error not typed on vite
+// @ts-ignore not typed on vite
 const { rolldownVersion } = vite;
 
 /**
@@ -42,7 +42,7 @@ export function setupOptimizer(api) {
 			// Currently, a placeholder as more information is needed after Vite config is resolved,
 			// the added plugins are patched in configResolved below
 			if (rolldownVersion) {
-				//@ts-expect-error rolldown types not finished
+				//@ts-ignore rolldown types not finished
 				optimizeDeps.rollupOptions = {
 					plugins: [
 						placeholderRolldownOptimizerPlugin(optimizeSveltePluginName),
diff --git a/packages/vite-plugin-svelte/src/preprocess.js b/packages/vite-plugin-svelte/src/preprocess.js
index 4b5c8d4d4..d1b695cf4 100644
--- a/packages/vite-plugin-svelte/src/preprocess.js
+++ b/packages/vite-plugin-svelte/src/preprocess.js
@@ -6,9 +6,9 @@ const {
 	preprocessCSS,
 	resolveConfig,
 	transformWithEsbuild,
-	//@ts-expect-error rolldown types don't exist
+	//@ts-ignore rolldown types don't exist
 	rolldownVersion,
-	//@ts-expect-error rolldown types don't exist
+	//@ts-ignore rolldown types don't exist
 	transformWithOxc
 } = vite;
 /**
@@ -72,8 +72,10 @@ function viteScript() {
 function viteScriptOxc() {
 	return {
 		async script({ attributes, content, filename = '' }) {
-			const lang = /** @type {string} */ (attributes.lang);
-			if (!supportedScriptLangs.includes(lang)) return;
+			if (typeof attributes.lang !== 'string' || !supportedScriptLangs.includes(attributes.lang)) {
+				return;
+			}
+			const lang = /** @type {'ts'} */ (attributes.lang);
 			const { code, map } = await transformWithOxc(content, filename, {
 				lang,
 				target: 'esnext'