Skip to content

Commit 6d91e6b

Browse files
danielrentzdanielrentz
authored
Merge branch 'main' into issue105
2 parents 2e49538 + 002a6da commit 6d91e6b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2029
-28
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ body:
1919
required: false
2020
- label: "`@eslint/object-schema`"
2121
required: false
22+
- label: "`@eslint/plugin-kit`"
23+
required: false
2224
- type: textarea
2325
attributes:
2426
label: Environment

‎.github/ISSUE_TEMPLATE/change.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ body:
1818
required: false
1919
- label: "`@eslint/object-schema`"
2020
required: false
21+
- label: "`@eslint/plugin-kit`"
22+
required: false
2123
- type: textarea
2224
attributes:
2325
label: What problem do you want to solve?

‎.github/workflows/release-please.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,3 +204,34 @@ jobs:
204204
env:
205205
MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }}
206206
MASTODON_HOST: ${{ secrets.MASTODON_HOST }}
207+
208+
#-----------------------------------------------------------------------------
209+
# @eslint/plugin-kit
210+
#-----------------------------------------------------------------------------
211+
212+
- name: Publish @eslint/plugin-kit package to npm
213+
run: npm publish -w packages/plugin-kit --provenance
214+
if: ${{ steps.release.outputs['packages/plugin-kit--release_created'] }}
215+
env:
216+
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
217+
218+
- name: Publish @eslint/plugin-kit package to JSR
219+
run: npx jsr publish
220+
working-directory: packages/plugin-kit
221+
if: ${{ steps.release.outputs['packages/plugin-kit--release_created'] }}
222+
223+
- name: Tweet Release Announcement
224+
run: npx @humanwhocodes/tweet "eslint/plugin-kit v${{ steps.release.outputs['packages/plugin-kit--major'] }}.${{ steps.release.outputs['packages/plugin-kit--minor'] }}.${{ steps.release.outputs['packages/plugin-kit--patch'] }} has been released!\n\n${{ github.event.repository.html_url }}/releases/tag/${{ steps.release.outputs['packages/plugin-kit--tag_name'] }}"
225+
if: ${{ steps.release.outputs['packages/plugin-kit--release_created'] }}
226+
env:
227+
TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
228+
TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
229+
TWITTER_ACCESS_TOKEN_KEY: ${{ secrets.TWITTER_ACCESS_TOKEN_KEY }}
230+
TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
231+
232+
- name: Toot Release Announcement
233+
run: npx @humanwhocodes/toot "eslint/plugin-kit v${{ steps.release.outputs['packages/plugin-kit--major'] }}.${{ steps.release.outputs['packages/plugin-kit--minor'] }}.${{ steps.release.outputs['packages/plugin-kit--patch'] }} has been released!\n\n${{ github.event.repository.html_url }}/releases/tag/${{ steps.release.outputs['packages/plugin-kit--tag_name'] }}"
234+
if: ${{ steps.release.outputs['packages/plugin-kit--release_created'] }}
235+
env:
236+
MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }}
237+
MASTODON_HOST: ${{ secrets.MASTODON_HOST }}

‎.release-please-manifest.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"packages/compat": "1.1.1",
33
"packages/config-array": "0.18.0",
4-
"packages/core": "0.4.0",
5-
"packages/migrate-config": "1.2.0",
6-
"packages/object-schema": "2.1.4"
4+
"packages/core": "0.6.0",
5+
"packages/migrate-config": "1.3.0",
6+
"packages/object-schema": "2.1.4",
7+
"packages/plugin-kit": "0.2.0"
78
}

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ The following companies, organizations, and individuals support ESLint's ongoing
2020
<!--sponsorsstart-->
2121
<h3>Platinum Sponsors</h3>
2222
<p><a href="https://automattic.com"><img src="https://images.opencollective.com/automattic/d0ef3e1/logo.png" alt="Automattic" height="128"></a> <a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/airbnb/d327d66/logo.png" alt="Airbnb" height="128"></a></p><h3>Gold Sponsors</h3>
23-
<p><a href="#"><img src="https://images.opencollective.com/guest-bf377e88/avatar.png" alt="Eli Schleifer" height="96"></a></p><h3>Silver Sponsors</h3>
23+
<p><a href="https://trunk.io/"><img src="https://images.opencollective.com/trunkio/fb92d60/avatar.png" alt="trunk.io" height="96"></a></p><h3>Silver Sponsors</h3>
2424
<p><a href="https://www.jetbrains.com/"><img src="https://images.opencollective.com/jetbrains/fe76f99/logo.png" alt="JetBrains" height="64"></a> <a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/5c4fa84/logo.png" alt="Liftoff" height="64"></a> <a href="https://americanexpress.io"><img src="https://avatars.githubusercontent.com/u/3853301?v=4" alt="American Express" height="64"></a> <a href="https://www.workleap.com"><img src="https://avatars.githubusercontent.com/u/53535748?u=d1e55d7661d724bf2281c1bfd33cb8f99fe2465f&v=4" alt="Workleap" height="64"></a></p><h3>Bronze Sponsors</h3>
25-
<p><a href="https://www.notion.so"><img src="https://images.opencollective.com/notion/bf3b117/logo.png" alt="notion" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.ignitionapp.com"><img src="https://avatars.githubusercontent.com/u/5753491?v=4" alt="Ignition" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104?v=4" alt="Nx" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774?v=4" alt="HeroCoders" height="32"></a> <a href="https://usenextbase.com"><img src="https://avatars.githubusercontent.com/u/145838380?v=4" alt="Nextbase Starter Kit" height="32"></a></p>
25+
<p><a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340?v=4" alt="GitBook" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104?v=4" alt="Nx" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774?v=4" alt="HeroCoders" height="32"></a> <a href="https://usenextbase.com"><img src="https://avatars.githubusercontent.com/u/145838380?v=4" alt="Nextbase Starter Kit" height="32"></a></p>
2626
<!--sponsorsend-->
2727

2828
<!--techsponsorsstart-->

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
"pre-commit": "lint-staged"
2121
},
2222
"lint-staged": {
23-
"*.js": [
23+
"*.{js,ts}": [
2424
"eslint --fix",
2525
"prettier --write"
2626
],
27-
"!(*.js)": "prettier --write --ignore-unknown"
27+
"!(*.{js,ts})": "prettier --write --ignore-unknown"
2828
},
2929
"devDependencies": {
3030
"common-tags": "^1.8.2",
31-
"eslint": "^9.4.0",
31+
"eslint": "^9.11.1",
3232
"eslint-config-eslint": "^11.0.0",
3333
"got": "^14.4.1",
3434
"lint-staged": "^15.2.0",

‎packages/compat/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ The following companies, organizations, and individuals support ESLint's ongoing
195195
<!--sponsorsstart-->
196196
<h3>Platinum Sponsors</h3>
197197
<p><a href="https://automattic.com"><img src="https://images.opencollective.com/automattic/d0ef3e1/logo.png" alt="Automattic" height="128"></a> <a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/airbnb/d327d66/logo.png" alt="Airbnb" height="128"></a></p><h3>Gold Sponsors</h3>
198-
<p><a href="#"><img src="https://images.opencollective.com/guest-bf377e88/avatar.png" alt="Eli Schleifer" height="96"></a></p><h3>Silver Sponsors</h3>
198+
<p><a href="https://trunk.io/"><img src="https://images.opencollective.com/trunkio/fb92d60/avatar.png" alt="trunk.io" height="96"></a></p><h3>Silver Sponsors</h3>
199199
<p><a href="https://www.jetbrains.com/"><img src="https://images.opencollective.com/jetbrains/fe76f99/logo.png" alt="JetBrains" height="64"></a> <a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/5c4fa84/logo.png" alt="Liftoff" height="64"></a> <a href="https://americanexpress.io"><img src="https://avatars.githubusercontent.com/u/3853301?v=4" alt="American Express" height="64"></a> <a href="https://www.workleap.com"><img src="https://avatars.githubusercontent.com/u/53535748?u=d1e55d7661d724bf2281c1bfd33cb8f99fe2465f&v=4" alt="Workleap" height="64"></a></p><h3>Bronze Sponsors</h3>
200-
<p><a href="https://www.notion.so"><img src="https://images.opencollective.com/notion/bf3b117/logo.png" alt="notion" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.ignitionapp.com"><img src="https://avatars.githubusercontent.com/u/5753491?v=4" alt="Ignition" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104?v=4" alt="Nx" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774?v=4" alt="HeroCoders" height="32"></a> <a href="https://usenextbase.com"><img src="https://avatars.githubusercontent.com/u/145838380?v=4" alt="Nextbase Starter Kit" height="32"></a></p>
200+
<p><a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340?v=4" alt="GitBook" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104?v=4" alt="Nx" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774?v=4" alt="HeroCoders" height="32"></a> <a href="https://usenextbase.com"><img src="https://avatars.githubusercontent.com/u/145838380?v=4" alt="Nextbase Starter Kit" height="32"></a></p>
201201
<!--sponsorsend-->
202202
203203
<!--techsponsorsstart-->

‎packages/compat/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
},
4949
"homepage": "https://github.com/eslint/rewrite#readme",
5050
"devDependencies": {
51+
"@eslint/core": "^0.6.0",
5152
"c8": "^9.1.0",
5253
"eslint": "^9.11.0",
5354
"mocha": "^10.4.0",

‎packages/compat/src/fixup-rules.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/** @typedef {import("eslint").ESLint.Plugin} FixupPluginDefinition */
1111
/** @typedef {import("eslint").Rule.RuleModule} FixupRuleDefinition */
1212
/** @typedef {FixupRuleDefinition["create"]} FixupLegacyRuleDefinition */
13-
/** @typedef {import("eslint").Linter.FlatConfig} FixupConfig */
13+
/** @typedef {import("eslint").Linter.Config} FixupConfig */
1414
/** @typedef {Array<FixupConfig>} FixupConfigArray */
1515

1616
//-----------------------------------------------------------------------------

‎packages/compat/src/ignore-file.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import path from "node:path";
1414
// Types
1515
//-----------------------------------------------------------------------------
1616

17-
/** @typedef {import("eslint").Linter.FlatConfig} FlatConfig */
17+
/** @typedef {import("eslint").Linter.Config} FlatConfig */
1818

1919
//-----------------------------------------------------------------------------
2020
// Exports

0 commit comments

Comments
 (0)