Skip to content

Commit a963d6a

Browse files
Merge branch 'main' into migrate-migrate-config-to-new-include-ignore-file
2 parents 8ed86e4 + 9e9a924 commit a963d6a

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
steps:
139139
- uses: actions/checkout@v6
140140

141-
- uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
141+
- uses: pnpm/action-setup@739bfe42ca9233c5e6aca07c1a25a9d34aca49b0 # v6.0.7
142142
with:
143143
version: latest
144144

eslint.config.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
import eslintConfigESLint from "eslint-config-eslint";
2-
import { defineConfig } from "@eslint/config-helpers";
2+
import { defineConfig, includeIgnoreFile } from "@eslint/config-helpers";
33
import tseslint from "typescript-eslint";
4+
import { fileURLToPath } from "node:url";
5+
import path from "node:path";
46

57
const eslintPluginJSDoc = eslintConfigESLint.find(
68
config => config.plugins?.jsdoc,
79
).plugins.jsdoc;
810

11+
const filename = fileURLToPath(import.meta.url);
12+
const dirname = path.dirname(filename);
13+
914
export default defineConfig([
15+
includeIgnoreFile(path.join(dirname, ".gitignore"), {
16+
gitignoreResolution: true,
17+
}),
18+
1019
{
11-
ignores: ["**/tests/fixtures/", "**/dist/", "**/coverage/"],
20+
ignores: ["**/tests/fixtures/"],
1221
},
1322

1423
{

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
"overrides": {
5959
"eslint": {
6060
"@eslint/core": "file:packages/core"
61+
},
62+
"@arethetypeswrong/core": {
63+
"fflate": "0.8.2"
6164
}
6265
}
6366
}

0 commit comments

Comments
 (0)