Skip to content

Commit 7001258

Browse files
authored
Merge pull request #6573 from dev-hato/update_super_linter_3
super-linterアップデート
2 parents 81664d3 + 250cc48 commit 7001258

3 files changed

Lines changed: 14 additions & 43 deletions

File tree

.github/workflows/pr-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
pr-super-lint:
1515
runs-on: ubuntu-latest
1616
permissions:
17+
pull-requests: write
1718
statuses: write
1819
steps:
1920
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -40,7 +41,7 @@ jobs:
4041
- name: Install dependencies
4142
run: bash "${GITHUB_WORKSPACE}/scripts/pr_test/pr_super_lint/npm_ci.sh"
4243
- name: Lint files
43-
uses: super-linter/super-linter/slim@61abc07d755095a68f4987d1c2c3d1d64408f1f9 # v8.5.0
44+
uses: super-linter/super-linter/slim@9e863354e3ff62e0727d37183162c4a88873df41 # v8.6.0
4445
env:
4546
VALIDATE_ALL_CODEBASE: true
4647
VALIDATE_SQLFLUFF: false

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
repos:
33
- repo: https://github.com/zricethezav/gitleaks
4-
rev: v8.30.0
4+
rev: v8.30.1
55
hooks:
66
- id: gitleaks

eslint.config.mjs

Lines changed: 11 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// https://github.com/super-linter/super-linter/blob/644fff4cf8f9c402888e29313139dd6e7cbce40e/TEMPLATES/eslint.config.mjs
1+
// https://github.com/super-linter/super-linter/blob/58ee821839c7e0d8979f759a8e5ca0d99bb50737/TEMPLATES/eslint.config.mjs
22
import { defineConfig, globalIgnores } from "eslint/config";
33
import n from "eslint-plugin-n";
44
import prettier from "eslint-plugin-prettier";
55
import globals from "globals";
6-
import jsoncParser from "jsonc-eslint-parser";
6+
import eslintPluginJsonc from "eslint-plugin-jsonc";
77
import typescriptEslint from "@typescript-eslint/eslint-plugin";
88
import tsParser from "@typescript-eslint/parser";
99
import pluginVue from "eslint-plugin-vue";
@@ -38,48 +38,18 @@ export default defineConfig([
3838
},
3939
},
4040
},
41-
{
41+
...eslintPluginJsonc.configs["recommended-with-json"].map((config) => ({
42+
...config,
4243
files: ["**/*.json"],
43-
extends: compat.extends("plugin:jsonc/recommended-with-json"),
44-
45-
languageOptions: {
46-
parser: jsoncParser,
47-
ecmaVersion: "latest",
48-
sourceType: "script",
49-
50-
parserOptions: {
51-
jsonSyntax: "JSON",
52-
},
53-
},
54-
},
55-
{
44+
})),
45+
...eslintPluginJsonc.configs["recommended-with-jsonc"].map((config) => ({
46+
...config,
5647
files: ["**/*.jsonc"],
57-
extends: compat.extends("plugin:jsonc/recommended-with-jsonc"),
58-
59-
languageOptions: {
60-
parser: jsoncParser,
61-
ecmaVersion: "latest",
62-
sourceType: "script",
63-
64-
parserOptions: {
65-
jsonSyntax: "JSONC",
66-
},
67-
},
68-
},
69-
{
48+
})),
49+
...eslintPluginJsonc.configs["recommended-with-json5"].map((config) => ({
50+
...config,
7051
files: ["**/*.json5"],
71-
extends: compat.extends("plugin:jsonc/recommended-with-json5"),
72-
73-
languageOptions: {
74-
parser: jsoncParser,
75-
ecmaVersion: "latest",
76-
sourceType: "script",
77-
78-
parserOptions: {
79-
jsonSyntax: "JSON5",
80-
},
81-
},
82-
},
52+
})),
8353
{
8454
files: ["**/*.js", "**/*.mjs", "**/*.cjs", "**/*.jsx"],
8555
extends: compat.extends("plugin:react/recommended"),

0 commit comments

Comments
 (0)