From f77ed3a6b202b0eba42e4ce2e76b09dcf70398b4 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 2 Dec 2022 22:05:35 -0500 Subject: [PATCH] Correct prettier calls for YML/JSON (#21832) * Fix fomat-check writing files * Fix unformatted YML/JSON * Add format-check call to prevent regressions --- .github/ISSUE_TEMPLATE/1.bug_report.yml | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/workflows/linter.yml | 4 +++- .github/workflows/test-chart.yml | 16 ++++++++-------- jsconfig.json | 7 +------ package.json | 4 ++-- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yml b/.github/ISSUE_TEMPLATE/1.bug_report.yml index eb70896d7..22f51f7bd 100644 --- a/.github/ISSUE_TEMPLATE/1.bug_report.yml +++ b/.github/ISSUE_TEMPLATE/1.bug_report.yml @@ -50,7 +50,7 @@ body: Google Chrome 106.0.5249.119 Firefox 105.0.3 - + etc... validations: required: true diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index fd62889d0..f5d319652 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,4 +2,4 @@ blank_issues_enabled: false contact_links: - name: GitHub Discussions url: https://github.com/mastodon/mastodon/discussions - about: Please ask and answer questions here. \ No newline at end of file + about: Please ask and answer questions here. diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index cd8cb12c4..874afc459 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -57,12 +57,14 @@ jobs: cache: yarn - name: Install dependencies run: yarn install --frozen-lockfile + - name: Check prettier formatting + run: yarn format-check - name: Set-up RuboCop Problem Mathcher uses: r7kamura/rubocop-problem-matchers-action@v1 - name: Set-up Stylelint Problem Matcher uses: xt0rted/stylelint-problem-matcher@v1 # https://github.com/xt0rted/stylelint-problem-matcher/issues/360 - - run: echo "::add-matcher::.github/stylelint-matcher.json" + - run: echo "::add-matcher::.github/stylelint-matcher.json" ################################ # Run Linter against code base # diff --git a/.github/workflows/test-chart.yml b/.github/workflows/test-chart.yml index b9ff80855..4d7a27887 100644 --- a/.github/workflows/test-chart.yml +++ b/.github/workflows/test-chart.yml @@ -6,16 +6,16 @@ name: Test chart on: pull_request: paths: - - "chart/**" - - "!**.md" - - ".github/workflows/test-chart.yml" + - 'chart/**' + - '!**.md' + - '.github/workflows/test-chart.yml' push: paths: - - "chart/**" - - "!**.md" - - ".github/workflows/test-chart.yml" + - 'chart/**' + - '!**.md' + - '.github/workflows/test-chart.yml' branches-ignore: - - "dependabot/**" + - 'dependabot/**' workflow_dispatch: permissions: @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.x" + python-version: '3.x' - name: Install dependencies (yamllint) run: pip install yamllint diff --git a/jsconfig.json b/jsconfig.json index 7471fb9db..d52816a98 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -13,10 +13,5 @@ "strict": false, "target": "ES2022" }, - "exclude": [ - "**/build/*", - "**/node_modules/*", - "**/public/*", - "**/vendor/*" - ] + "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"] } diff --git a/package.json b/package.json index 92520a8c7..eecdf83db 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "test:lint:js": "eslint --ext=js . --cache", "test:lint:sass": "stylelint '**/*.scss'", "test:jest": "cross-env NODE_ENV=test jest", - "format": "prettier --write '**/*.{json,yml}'", - "format-check": "prettier --write '**/*.{json,yml}'" + "format": "prettier --write \"**/*.{json,yml}\"", + "format-check": "prettier --check \"**/*.{json,yml}\"" }, "repository": { "type": "git",