Skip to content

Commit 2a1b6ac

Browse files
authored
Merge branch 'main' into renovate/pin-dependencies
2 parents 083daa9 + 11433d2 commit 2a1b6ac

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"storybook": "10.3.4",
8484
"ts-jest": "29.4.6",
8585
"tsup": "8.5.1",
86-
"typescript": "5.9.3",
86+
"typescript": "6.0.2",
8787
"typescript-eslint": "8.57.2",
8888
"vite": "8.0.3"
8989
},

tsconfig.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
// Enable ergonomic default imports from CommonJS modules
1515
"esModuleInterop": true,
1616
// This is only for type checking, tsup will handle the emitted code.
17-
"module": "commonjs",
18-
"moduleResolution": "node",
17+
"module": "esnext",
18+
"moduleResolution": "bundler",
19+
// ts-jest hardcodes moduleResolution=Node10 internally; suppress the resulting TS6.0 deprecation error
20+
"ignoreDeprecations": "6.0",
1921
// Compile to ES2022 (supports top-level await, Array.at(), etc.)
2022
"target": "ES2022",
2123
// Include ES2022 standard library types
@@ -37,7 +39,8 @@
3739
// Enable JSX support for React (used by Storybook stories)
3840
"jsx": "react-jsx",
3941
// Output compiled files to the lib/ directory
40-
"outDir": "./lib"
42+
"outDir": "./lib",
43+
"rootDir": "./src"
4144
},
4245
"include": ["src"],
4346
"exclude": ["node_modules", "lib", "README.md", "**/*.test.ts", "src/stories"]

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6548,10 +6548,10 @@ typescript-eslint@8.57.2:
65486548
"@typescript-eslint/typescript-estree" "8.57.2"
65496549
"@typescript-eslint/utils" "8.57.2"
65506550

6551-
typescript@5.9.3:
6552-
version "5.9.3"
6553-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
6554-
integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
6551+
typescript@6.0.2:
6552+
version "6.0.2"
6553+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.2.tgz#0b1bfb15f68c64b97032f3d78abbf98bdbba501f"
6554+
integrity sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==
65556555

65566556
ufo@^1.6.1:
65576557
version "1.6.3"

0 commit comments

Comments
 (0)