Skip to content

Update TypeScript to v6 #1407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
microbit-matt-hillsdon merged 1 commit into from
Nov 11, 2026
+20 −13
Merged

Update TypeScript to v6 #1407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"jsdom": "^30.1.3",
"playwright": "^1.58.2",
"prettier": "2.3.2",
"typescript": "^5.9.3",
"typescript": "^6.0.3",
"vite": "^7.3.1",
"vite-plugin-pwa": "^1.0.0",
"vite-plugin-svgr": "^4.5.0",
Expand All @@ -99,7 +99,7 @@
"lint": "eslint . --max-warnings 0",
"format": "prettier --write src",
"format:check": "prettier --check src",
"typecheck": "tsc --noEmit",
"typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.node.json",
"pretypecheck": "npm run generate",
"typecheck:watch": "tsc --noEmit --watch",
"test": "vitest",
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Bundler mode */
"moduleResolution": "bundler",
"baseUrl": ".",
"paths": {
"styled-system/*": ["./styled-system/*"]
},
Expand All @@ -26,5 +25,7 @@
"types": ["vitest/globals", "node", "vite-plugin-pwa/client"]
},
"include": ["src"],
// Build-time config, owned by tsconfig.node.json; a file cannot be in both.
"exclude": ["src/deployment/default/panda-preset.ts"],
"references": [{ "path": "./tsconfig.node.json" }]
}
10 changes: 8 additions & 2 deletions tsconfig.node.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
{
"compilerOptions": {
"composite": true,
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
"skipLibCheck": true,
"module": "ESNext",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true
"allowSyntheticDefaultImports": true,
"types": ["node"]
},
"include": ["vite.config.ts", "panda.config.ts"]
"include": [
"vite.config.ts",
"panda.config.ts",
"src/deployment/default/panda-preset.ts"
]
}
8 changes: 4 additions & 4 deletions vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from "vite";
import { VitePWA } from "vite-plugin-pwa";
import svgr from "vite-plugin-svgr";
import { configDefaults, defineConfig, UserConfig } from "vitest/config";
import { configDefaults, defineConfig, ViteUserConfig } from "vitest/config";

// Browser-support floor (esbuild/lightningcss target syntax) for JS
// (build.target) and CSS (build.cssTarget). Keep in sync with the
Expand Down Expand Up @@ -43,7 +43,7 @@ const pwaCacheId =
process.env.STAGE === "BETA" ||
process.env.STAGE === "STAGING" ||
process.env.STAGE === "REVIEW"
? process.env.BASE_URL.replaceAll("/", "")
? process.env.BASE_URL?.replaceAll("/", "")
: undefined;

// There are third-party options but seems better to just depend on ejs.
Expand Down Expand Up @@ -86,7 +86,7 @@ const viteRemoveManifestPlugin = (): Plugin => ({

export default defineConfig(({ mode }) => {
process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
const unitTest: UserConfig["test"] = {
const unitTest: ViteUserConfig["test"] = {
globals: true,
exclude: [...configDefaults.exclude, "**/e2e/**"],
environment: "jsdom",
Expand All @@ -102,7 +102,7 @@ export default defineConfig(({ mode }) => {
),
},
};
const config: UserConfig = {
const config: ViteUserConfig = {
base: process.env.BASE_URL ?? "/",
build: {
outDir: "build",
Expand Down
Loading