-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
feat: support stringly-typed extends #10973
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.
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
bradzacher
merged 24 commits into
typescript-eslint:main
from
kirkwaiblinger:add-flat-configs-to-plugin
Apr 10, 2025
Merged
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
af837e3
work in progress
kirkwaiblinger 1120c01
wip
kirkwaiblinger 01d23ed
fix stuff
kirkwaiblinger cf76bfb
lintfixy stuff
kirkwaiblinger 4000797
why not work
kirkwaiblinger 7f46e57
yay, passing tests!
kirkwaiblinger 56af0f7
undo extraneous change
kirkwaiblinger 093c180
Merge branch 'main' into add-flat-configs-to-plugin
kirkwaiblinger 6da9850
point to the new config locations
kirkwaiblinger e1d0850
ignore dep from website build
kirkwaiblinger 48902d8
website mocking take 2
kirkwaiblinger 616d9fd
unused var
kirkwaiblinger ef2c6b5
typo
kirkwaiblinger f13959b
Merge branch 'main' into add-flat-configs-to-plugin
kirkwaiblinger 7d36b57
up eslint
kirkwaiblinger 53a5a99
knip ignore
kirkwaiblinger caec857
alfa
kirkwaiblinger c7b7f71
Revert "up eslint"
kirkwaiblinger 7177a6a
fix up resolution stuff
kirkwaiblinger 97d1346
is it this
kirkwaiblinger a6f0044
Revert "is it this"
kirkwaiblinger 8a41179
uhhh
kirkwaiblinger 1ba30d6
fixup
kirkwaiblinger 39228c2
fixup
kirkwaiblinger File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -148,7 +148,8 @@ | |
"react-split-pane@^0.1.92": "patch:react-split-pane@npm%3A0.1.92#./.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch", | ||
"tmp": "0.2.1", | ||
"tsx": "^4.7.2", | ||
"typescript": "5.8.2" | ||
"typescript": "5.8.2", | ||
"@eslint/config-helpers": "^0.2.0" | ||
}, | ||
"packageManager": "[email protected]", | ||
"nx": { | ||
|
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import type { FlatConfig } from '@typescript-eslint/utils/ts-eslint'; | ||
|
||
import type plugin from './index'; | ||
|
||
declare const cjsExport: { | ||
flatConfigs: { | ||
'flat/all': FlatConfig.ConfigArray; | ||
'flat/base': FlatConfig.Config; | ||
'flat/disable-type-checked': FlatConfig.Config; | ||
'flat/eslint-recommended': FlatConfig.Config; | ||
'flat/recommended': FlatConfig.ConfigArray; | ||
'flat/recommended-type-checked': FlatConfig.ConfigArray; | ||
'flat/recommended-type-checked-only': FlatConfig.ConfigArray; | ||
'flat/strict': FlatConfig.ConfigArray; | ||
'flat/strict-type-checked': FlatConfig.ConfigArray; | ||
'flat/strict-type-checked-only': FlatConfig.ConfigArray; | ||
'flat/stylistic': FlatConfig.ConfigArray; | ||
'flat/stylistic-type-checked': FlatConfig.ConfigArray; | ||
'flat/stylistic-type-checked-only': FlatConfig.ConfigArray; | ||
}; | ||
parser: FlatConfig.Parser; | ||
plugin: typeof plugin; | ||
}; | ||
|
||
export = cjsExport; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...-eslint/src/configs/eslint-recommended.ts → ...in/src/configs/flat/eslint-recommended.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,51 +1,3 @@ | ||
import type { Linter } from '@typescript-eslint/utils/ts-eslint'; | ||
import rawPlugin from './raw-plugin'; | ||
|
||
import all from './configs/all'; | ||
import base from './configs/base'; | ||
import disableTypeChecked from './configs/disable-type-checked'; | ||
import eslintRecommended from './configs/eslint-recommended'; | ||
import recommended from './configs/recommended'; | ||
import recommendedTypeChecked from './configs/recommended-type-checked'; | ||
import recommendedTypeCheckedOnly from './configs/recommended-type-checked-only'; | ||
import strict from './configs/strict'; | ||
import strictTypeChecked from './configs/strict-type-checked'; | ||
import strictTypeCheckedOnly from './configs/strict-type-checked-only'; | ||
import stylistic from './configs/stylistic'; | ||
import stylisticTypeChecked from './configs/stylistic-type-checked'; | ||
import stylisticTypeCheckedOnly from './configs/stylistic-type-checked-only'; | ||
import rules from './rules'; | ||
|
||
// note - cannot migrate this to an import statement because it will make TSC copy the package.json to the dist folder | ||
const { name, version } = require('../package.json') as { | ||
name: string; | ||
version: string; | ||
}; | ||
|
||
const configs = { | ||
all, | ||
base, | ||
'disable-type-checked': disableTypeChecked, | ||
'eslint-recommended': eslintRecommended, | ||
recommended, | ||
/** @deprecated - please use "recommended-type-checked" instead. */ | ||
'recommended-requiring-type-checking': recommendedTypeChecked, | ||
'recommended-type-checked': recommendedTypeChecked, | ||
'recommended-type-checked-only': recommendedTypeCheckedOnly, | ||
strict, | ||
'strict-type-checked': strictTypeChecked, | ||
'strict-type-checked-only': strictTypeCheckedOnly, | ||
stylistic, | ||
'stylistic-type-checked': stylisticTypeChecked, | ||
'stylistic-type-checked-only': stylisticTypeCheckedOnly, | ||
}; | ||
|
||
const meta = { | ||
name, | ||
version, | ||
}; | ||
|
||
export = { | ||
configs, | ||
meta, | ||
rules, | ||
} satisfies Linter.Plugin; | ||
export = rawPlugin.plugin; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This manual resolution is required pending release of the next version of eslint (eslint/eslint#19533 has been merged but not yet released)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're clear to remove this now, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well, on main we still have
so we need either this or to upgrade eslint past 9.23
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(I've implemented the latter, updating our eslint dependency)I've kept theresolutions
since I had some CI failures that I had a hard time debugging when I tried upgrading the eslint version.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but yeah once main has eslint >= 9.23 we can remove it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fun. I just clicked the checkmark in #6687 to start the Renovate PR.