feat: added support for typescript@^6.0.0 (#121)

* feat: added support for typescript@^6.0.0

* Add changes from twoslash/twoslash#86

* pnpm lint:fix

Author: JoshuaKGoldberg

.changeset/clean-bikes-pump.md

@@ -0,0 +1,9 @@
+---
+"@ec-ts/twoslash": patch
+"@ec-ts/twoslash-vue": patch
+"@ec-ts/vfs": patch
+"css-js-gen": patch
+"expressive-code-twoslash": patch
+---
+
+Added support for typescript@6.0.0

packages/@ec-ts/twoslash/src/core.ts

@@ -111,11 +111,13 @@ export function createTwoslasher(createOptions: CreateTwoslashOptions = {}): Two
 		extension = "ts",
 		options: TwoslashExecuteOptions = {},
 	): TwoslashReturn {
+		const tsMajorVersion = Number(ts.versionMajorMinor.split(".")[0]);
 		const meta: TwoslashReturnMeta = {
 			extension: typesToExtension(extension),
 			compilerOptions: {
 				...defaultCompilerOptions,
-				baseUrl: fsRoot,
+				// TypeScript removed the baseUrl option in 6.0
+				...(tsMajorVersion <= 5 && { baseUrl: fsRoot }),
 				...createOptions.compilerOptions,
 				...options.compilerOptions,
 			},

packages/@ec-ts/twoslash/src/flag-keys.ts

@@ -11,7 +11,6 @@ export const flagKeys = [
 	"alwaysStrict",
 	"assumeChangesOnlyAffectDirectDependencies",
 	"baseUrl",
-	"build",
 	"charset",
 	"checkJs",
 	"composite",
@@ -28,6 +27,7 @@ export const flagKeys = [
 	"emitBOM",
 	"emitDeclarationOnly",
 	"emitDecoratorMetadata",
+	"erasableSyntaxOnly",
 	"errors",
 	"esModuleInterop",
 	"exactOptionalPropertyTypes",
@@ -46,6 +46,7 @@ export const flagKeys = [
 	"init",
 	"inlineSourceMap",
 	"inlineSources",
+	"isolatedDeclarations",
 	"isolatedModules",
 	"jsx",
 	"jsxFactory",
@@ -54,6 +55,7 @@ export const flagKeys = [
 	"keepNotations",
 	"keyofStringsOnly",
 	"lib",
+	"libReplacement",
 	"listEmittedFiles",
 	"listFiles",
 	"listFilesOnly",
@@ -65,6 +67,7 @@ export const flagKeys = [
 	"moduleResolution",
 	"moduleSuffixes",
 	"newLine",
+	"noCheck",
 	"noEmit",
 	"noEmitHelpers",
 	"noEmitOnError",
@@ -84,6 +87,7 @@ export const flagKeys = [
 	"noStaticSemanticInfo",
 	"noStrictGenericChecks",
 	"noUncheckedIndexedAccess",
+	"noUncheckedSideEffectImports",
 	"noUnusedLocals",
 	"noUnusedParameters",
 	"out",
@@ -102,6 +106,7 @@ export const flagKeys = [
 	"resolveJsonModule",
 	"resolvePackageJsonExports",
 	"resolvePackageJsonImports",
+	"rewriteRelativeImportExtensions",
 	"rootDir",
 	"rootDirs",
 	"showConfig",
@@ -113,6 +118,7 @@ export const flagKeys = [
 	"sourceRoot",
 	"strict",
 	"strictBindCallApply",
+	"strictBuiltinIteratorReturn",
 	"strictFunctionTypes",
 	"strictNullChecks",
 	"strictPropertyInitialization",

pnpm-lock.yaml

@@ -17,7 +17,7 @@ catalogs:
   min:
     "@expressive-code/core": ^0.41.7
     expressive-code: ^0.41.7
-    typescript: ^5.5.0
+    typescript: ^5.5.0 || ^6.0.0
   twoslash:
     "@vue/language-core": ^3.2.5
     twoslash-protocol: ^0.3.6