Skip to content

Commit 38968ad

Browse files
merge: upstream/main -> chore/update-deps-20250306
2 parents 22248d8 + 8e07868 commit 38968ad

File tree

4 files changed

+827
-488
lines changed

4 files changed

+827
-488
lines changed

eslint.config.mjs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import {
1111
vueTsConfigs,
1212
} from "@vue/eslint-config-typescript";
1313
import { configs as tsConfigs, parser as tsParser } from "typescript-eslint";
14+
import progress from "eslint-plugin-file-progress";
15+
import gitignore from "eslint-config-flat-gitignore";
1416
import voicevoxPlugin from "./eslint-plugin/index.mjs";
1517

1618
const __dirname = import.meta.dirname;
@@ -91,6 +93,7 @@ export default defineConfigWithVueTs(
9193
name: "voicevox/defaults/plugins",
9294
plugins: {
9395
import: importPlugin,
96+
progress,
9497
},
9598
},
9699

@@ -115,10 +118,7 @@ export default defineConfigWithVueTs(
115118
},
116119
},
117120

118-
{
119-
name: "voicevox/defaults/ignores",
120-
ignores: ["dist/**/*", "dist_*/**/*", "node_modules/**/*"],
121-
},
121+
gitignore(),
122122

123123
...pluginConfig(vuePlugin.configs["flat/recommended"]),
124124
...pluginConfig("eslint:recommended", js.configs.recommended),
@@ -217,6 +217,8 @@ export default defineConfigWithVueTs(
217217
{ sameNameShorthand: "always" },
218218
],
219219
"vue/v-on-event-hyphenation": ["error", "never", { autofix: true }],
220+
"progress/activate":
221+
process.env.ESLINT_FILE_PROGRESS === "1" ? "error" : "off",
220222
},
221223
},
222224

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"packageManager": "[email protected]",
1414
"scripts": {
1515
"// --- lint ---": "",
16-
"lint": "eslint .",
16+
"lint": "cross-env ESLINT_FILE_PROGRESS=1 eslint .",
1717
"lint:inspector": "eslint --inspect-config",
18-
"fmt": "eslint . --fix",
18+
"fmt": "cross-env ESLINT_FILE_PROGRESS=1 eslint . --fix",
1919
"markdownlint": "markdownlint --ignore node_modules/ --ignore dist/ --ignore dist_electron/ --ignore dist_preview/ ./",
2020
"typecheck": "vue-tsc --noEmit",
2121
"typos": "cross-env ./vendored/typos/typos",
@@ -124,6 +124,8 @@
124124
"electron-builder": "25.1.8",
125125
"electron-devtools-installer": "4.0.0",
126126
"eslint": "9.21.0",
127+
"eslint-config-flat-gitignore": "2.1.0",
128+
"eslint-plugin-file-progress": "3.0.1",
127129
"eslint-plugin-import": "2.31.0",
128130
"eslint-plugin-prettier": "5.2.3",
129131
"eslint-plugin-storybook": "0.11.4",

0 commit comments

Comments
 (0)