Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/quick-cars-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@drivenets/eslint-plugin-design-system': patch
---

Support TypeScript 6.x
2 changes: 1 addition & 1 deletion .cursor/rules/checkers.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pnpm eslint packages/eslint-plugin/src/
pnpm eslint --fix packages/design-system/src/components/ds-button/
```

### Type Checking (tsc)
### Type Checking (tsgo)

TypeScript checks the whole project config, so scope by package:

Expand Down
7 changes: 6 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{
"recommendations": ["oxc.oxc-vscode", "dbaeumer.vscode-eslint", "streetsidesoftware.code-spell-checker"]
"recommendations": [
"oxc.oxc-vscode",
"dbaeumer.vscode-eslint",
"streetsidesoftware.code-spell-checker",
"typescriptteam.native-preview"
]
}
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"oxc.fmt.configPath": ".oxfmtrc.json",
"editor.defaultFormatter": "oxc.oxc-vscode",

"typescript.tsdk": "node_modules/typescript/lib"
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.experimental.useTsgo": true
}
2 changes: 1 addition & 1 deletion lint-staged.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
export default {
'*': 'cspell --no-must-find-files',
'!(*.js|*.mjs|*.ts|*.tsx)': 'oxfmt --no-error-on-unmatched-pattern',
'*.{ts,tsx}': () => 'tsc --noEmit',
'*.{ts,tsx}': () => 'tsgo --noEmit',
'*.{js,mjs,ts,tsx}': ['oxfmt', 'eslint --max-warnings=0'],
};
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"lint": "turbo run lint:root lint",
"lint:root": "eslint --max-warnings=0 .",
"typecheck": "turbo run typecheck typecheck:root",
"typecheck:root": "tsc",
"typecheck:root": "tsgo",
"lint:versions": "syncpack lint",
"lint:spell": "cspell . --quiet",
"lint:unused": "knip",
Expand Down Expand Up @@ -42,6 +42,7 @@
"@eslint/core": "^1.1.0",
"@eslint/js": "^10.0.1",
"@types/node": "^25.3.3",
"@typescript/native-preview": "7.0.0-dev.20260304.1",
"@vitest/eslint-plugin": "^1.6.9",
"cspell": "^9.7.0",
"eslint": "^10.0.1",
Expand All @@ -56,7 +57,7 @@
"playwright": "^1.58.2",
"syncpack": "^14.0.0",
"turbo": "^2.8.12",
"typescript": "^5.9.3",
"typescript": "6.0.1-rc",
"typescript-eslint": "^8.56.1"
},
"pnpm": {
Expand All @@ -80,7 +81,8 @@
"string.prototype.matchall": "npm:@nolyfill/string.prototype.matchall@^1",
"string.prototype.repeat": "npm:@nolyfill/string.prototype.repeat@^1",
"esbuild@<=0.24.2": ">=0.25.0",
"eslint": "^10.0.1"
"eslint": "^10.0.1",
"typescript": "6.0.0-beta"
}
}
}
5 changes: 3 additions & 2 deletions packages/commitlint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
},
"scripts": {
"lint": "eslint --max-warnings=0 .",
"typecheck": "tsc"
"typecheck": "tsgo"
},
"peerDependencies": {
"@commitlint/lint": "^20.2.0",
"@commitlint/types": "^20.2.0"
},
"devDependencies": {
"@typescript/native-preview": "7.0.0-dev.20260304.1",
"eslint": "^10.0.1",
"typescript": "^5.9.3"
"typescript": "6.0.1-rc"
}
}
5 changes: 3 additions & 2 deletions packages/design-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"scripts": {
"lint": "pnpm generate-scss-dts && eslint --max-warnings=0 .; EXIT_CODE=$?; rm -rf .scss-dts; exit $EXIT_CODE",
"typecheck": "pnpm generate-scss-dts && tsc; EXIT_CODE=$?; rm -rf .scss-dts; exit $EXIT_CODE",
"typecheck": "pnpm generate-scss-dts && tsgo; EXIT_CODE=$?; rm -rf .scss-dts; exit $EXIT_CODE",
"generate-scss-dts": "typed-scss-modules ./src -o ./.scss-dts --nameFormat all --exportType default > /dev/null 2>&1",
"storybook": "storybook dev -p 6006",
"test": "vitest --project=\"!requires-build\"",
Expand Down Expand Up @@ -92,6 +92,7 @@
"@types/eslint-plugin-jsx-a11y": "^6.10.1",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@typescript/native-preview": "7.0.0-dev.20260304.1",
"@vitest/browser": "^4.0.18",
"@vitest/browser-playwright": "^4.0.18",
"@vitest/coverage-v8": "^4.0.18",
Expand All @@ -115,7 +116,7 @@
"storybook": "^10.2.13",
"tsdown": "^0.20.3",
"typed-scss-modules": "^8.1.1",
"typescript": "^5.9.3",
"typescript": "6.0.1-rc",
"typescript-plugin-css-modules": "^5.2.0",
"vite": "^7.3.1",
"vitest": "^4.0.18",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ export interface DsTreeNode {
export const dsTreeSizes = ['medium', 'small'] as const;
export type DsTreeSize = (typeof dsTreeSizes)[number];

interface DsTreeBaseProps {
export interface DsTreeBaseProps {
className?: string;
style?: CSSProperties;
}

interface DsTreeBasePropsWithChildren extends DsTreeBaseProps {
export interface DsTreeBasePropsWithChildren extends DsTreeBaseProps {
children?: ReactNode;
}

Expand Down
7 changes: 4 additions & 3 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"scripts": {
"lint": "eslint --max-warnings=0 .",
"typecheck": "tsc",
"typecheck": "tsgo",
"test": "vitest",
"test:coverage": "pnpm test --coverage",
"build": "tsdown",
Expand All @@ -44,16 +44,17 @@
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.18.2",
"@typescript/native-preview": "7.0.0-dev.20260304.1",
"@vitest/coverage-v8": "^4.0.18",
"eslint": "^10.0.1",
"publint": "^0.3.17",
"tsdown": "^0.20.3",
"typescript": "^5.9.3",
"typescript": "6.0.1-rc",
"vitest": "^4.0.18"
},
"peerDependencies": {
"@typescript-eslint/parser": "^8.50.0",
"eslint": "^9.0.0 || ^10.0.0",
"typescript": "^5.0.0"
"typescript": "^5.0.0 || ^6.0.0"
}
}
5 changes: 3 additions & 2 deletions packages/vite-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"scripts": {
"lint": "eslint --max-warnings=0 .",
"typecheck": "tsc",
"typecheck": "tsgo",
"build": "tsdown",
"build:lint": "TARBALL=$(pnpm pack | tail -n1) && publint $TARBALL && attw $TARBALL; rm -f $TARBALL",
"test": "vitest",
Expand All @@ -48,12 +48,13 @@
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.18.2",
"@typescript/native-preview": "7.0.0-dev.20260304.1",
"@vitest/coverage-v8": "^4.0.18",
"eslint": "^10.0.1",
"memfs": "^4.56.10",
"publint": "^0.3.17",
"tsdown": "^0.20.3",
"typescript": "^5.9.3",
"typescript": "6.0.1-rc",
"vitest": "^4.0.18"
}
}
Loading