ts: remove vite config from tsconfig.test.json

kettanaito · kettanaito · commit ed8af137bef7 · 2025-02-20T14:19:07.000+01:00
diff --git a/exercises/01.sunsetting-jsdom/01.problem.break-jsdom/tsconfig.node.json b/exercises/01.sunsetting-jsdom/01.problem.break-jsdom/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts"]
 }
diff --git a/exercises/01.sunsetting-jsdom/01.solution.break-jsdom/tsconfig.node.json b/exercises/01.sunsetting-jsdom/01.solution.break-jsdom/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts"]
 }
diff --git a/exercises/02.vitest-browser-mode/01.problem.installation-and-setup/README.mdx b/exercises/02.vitest-browser-mode/01.problem.installation-and-setup/README.mdx
@@ -77,7 +77,7 @@ The last thing that remains is to extend the TypeScript configuration to recogni
 ```json filename=tsconfig.test.json add=10
 {
 	"extends": "./tsconfig.base.json",
-	"include": ["vite.config.ts", "**/*.test.ts*"],
+	"include": ["**/*.test.ts*"],
 	"compilerOptions": {
 		"target": "esnext",
 		"module": "preserve",
diff --git a/exercises/02.vitest-browser-mode/01.problem.installation-and-setup/tsconfig.node.json b/exercises/02.vitest-browser-mode/01.problem.installation-and-setup/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts"]
 }
diff --git a/exercises/02.vitest-browser-mode/01.solution.installation-and-setup/tsconfig.node.json b/exercises/02.vitest-browser-mode/01.solution.installation-and-setup/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts"]
 }
diff --git a/exercises/02.vitest-browser-mode/02.problem.migrate-the-test/tsconfig.node.json b/exercises/02.vitest-browser-mode/02.problem.migrate-the-test/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts"]
 }
diff --git a/exercises/02.vitest-browser-mode/02.problem.migrate-the-test/tsconfig.test.json b/exercises/02.vitest-browser-mode/02.problem.migrate-the-test/tsconfig.test.json
@@ -1,6 +1,6 @@
 {
 	"extends": "./tsconfig.base.json",
-	"include": ["vite.config.ts", "**/*.test.ts*"],
+	"include": ["**/*.test.ts*"],
 	"compilerOptions": {
 		"target": "esnext",
 		"module": "preserve",
diff --git a/exercises/02.vitest-browser-mode/02.solution.migrate-the-test/tsconfig.node.json b/exercises/02.vitest-browser-mode/02.solution.migrate-the-test/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts"]
 }
diff --git a/exercises/02.vitest-browser-mode/03.problem.playwright/tsconfig.node.json b/exercises/02.vitest-browser-mode/03.problem.playwright/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts"]
 }
diff --git a/exercises/02.vitest-browser-mode/03.solution.playwright/README.mdx b/exercises/02.vitest-browser-mode/03.solution.playwright/README.mdx
@@ -43,7 +43,7 @@ And, finally, let's update the type definitions for the assertion matchers to be
 ```json filename=tsconfig.test.json remove=9 add=10
 {
 	"extends": "./tsconfig.base.json",
-	"include": ["vite.config.ts", "**/*.test.ts*"],
+	"include": ["**/*.test.ts*"],
 	"compilerOptions": {
 		"target": "esnext",
 		"module": "preserve",
diff --git a/exercises/02.vitest-browser-mode/03.solution.playwright/tsconfig.node.json b/exercises/02.vitest-browser-mode/03.solution.playwright/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts"]
 }
diff --git a/exercises/02.vitest-browser-mode/04.problem.shared-assets/tsconfig.node.json b/exercises/02.vitest-browser-mode/04.problem.shared-assets/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts"]
 }
diff --git a/exercises/02.vitest-browser-mode/04.problem.shared-assets/tsconfig.test.json b/exercises/02.vitest-browser-mode/04.problem.shared-assets/tsconfig.test.json
@@ -1,6 +1,6 @@
 {
 	"extends": "./tsconfig.base.json",
-	"include": ["vite.config.ts", "**/*.test.ts*"],
+	"include": ["**/*.test.ts*"],
 	"compilerOptions": {
 		"target": "esnext",
 		"module": "preserve",
diff --git a/exercises/02.vitest-browser-mode/04.solution.shared-assets/README.mdx b/exercises/02.vitest-browser-mode/04.solution.shared-assets/README.mdx
@@ -17,6 +17,20 @@ To make Vite process this file the same way it does the rest of my application,
 import './src/index.css'
 ```
 
+Since we added this new file, we have to tell TypeScript how it should be handled. In `tsconfig.test.json`, add `vitest.browser.setup.ts` to the `compilerOptions.include` array:
+
+```json filename=tsconfig.test.json add=6
+{
+	"compilerOptions": {
+		"include": [
+			"**/*.test.ts*",
+			// The setup file runs in the browser just like the test suite.
+			"vitest.browser.setup.ts"
+		]
+	}
+}
+```
+
 Now all that remains is to tell Vitest to use this file as the global setup for the Browser Mode.
 
 In `vite.config.ts`, I will provide the path to this setup file as the value for the `setupFiles` property on the current browser instance:
diff --git a/exercises/02.vitest-browser-mode/04.solution.shared-assets/tsconfig.node.json b/exercises/02.vitest-browser-mode/04.solution.shared-assets/tsconfig.node.json
@@ -19,5 +19,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"noUncheckedSideEffectImports": true
 	},
-	"include": ["vite.config.ts", "vitest.browser.setup.ts"]
+	"include": ["vite.config.ts", "tailwind.config.ts", "vitest.browser.setup.ts"]
 }
diff --git a/exercises/02.vitest-browser-mode/04.solution.shared-assets/tsconfig.test.json b/exercises/02.vitest-browser-mode/04.solution.shared-assets/tsconfig.test.json
@@ -1,6 +1,6 @@
 {
 	"extends": "./tsconfig.base.json",
-	"include": ["vite.config.ts", "**/*.test.ts*"],
+	"include": ["vitest.browser.setup.ts", "**/*.test.ts*"],
 	"compilerOptions": {
 		"target": "esnext",
 		"module": "preserve",

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@`
`19`	`19`	`"noFallthroughCasesInSwitch": true,`
`20`	`20`	`"noUncheckedSideEffectImports": true`
`21`	`21`	`},`
`22`		`- "include": ["vite.config.ts"]`
	`22`	`+ "include": ["vite.config.ts", "tailwind.config.ts"]`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ The last thing that remains is to extend the TypeScript configuration to recogni`
`77`	`77`	```json filename=tsconfig.test.json add=10
`78`	`78`	`{`
`79`	`79`	`"extends": "./tsconfig.base.json",`
`80`		`- "include": ["vite.config.ts", "*/.test.ts*"],`
	`80`	`+ "include": ["*/.test.ts*"],`
`81`	`81`	`"compilerOptions": {`
`82`	`82`	`"target": "esnext",`
`83`	`83`	`"module": "preserve",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "./tsconfig.base.json",`
`3`		`- "include": ["vite.config.ts", "*/.test.ts*"],`
	`3`	`+ "include": ["*/.test.ts*"],`
`4`	`4`	`"compilerOptions": {`
`5`	`5`	`"target": "esnext",`
`6`	`6`	`"module": "preserve",`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ And, finally, let's update the type definitions for the assertion matchers to be`
`43`	`43`	```json filename=tsconfig.test.json remove=9 add=10
`44`	`44`	`{`
`45`	`45`	`"extends": "./tsconfig.base.json",`
`46`		`- "include": ["vite.config.ts", "*/.test.ts*"],`
	`46`	`+ "include": ["*/.test.ts*"],`
`47`	`47`	`"compilerOptions": {`
`48`	`48`	`"target": "esnext",`
`49`	`49`	`"module": "preserve",`