Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: simplify prettier include lists #5380

Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/01-bug-report-plugin.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "🐛 Report a Bug With a Rule"
description: "Report a bug you encountered with a lint rule"
title: "Bug: [rule name here] <short description of the issue>"
name: '🐛 Report a Bug With a Rule'
description: 'Report a bug you encountered with a lint rule'
title: 'Bug: [rule name here] <short description of the issue>'
labels:
- bug
- "package: eslint-plugin"
- 'package: eslint-plugin'
- triage
body:
- type: checkboxes
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/02-enhancement-rule-option.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "✨ Propose a New Rule Option or Additional Checks"
description: "Propose a new lint rule option or propose that a lint rule checks more cases"
title: "Enhancement: [rule-name] <a short description of my proposal>"
name: '✨ Propose a New Rule Option or Additional Checks'
description: 'Propose a new lint rule option or propose that a lint rule checks more cases'
title: 'Enhancement: [rule-name] <a short description of my proposal>'
labels:
- "enhancement: plugin rule option"
- "package: eslint-plugin"
- 'enhancement: plugin rule option'
- 'package: eslint-plugin'
- triage
body:
- type: checkboxes
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/03-enhancement-new-rule.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "✨ Propose a New Rule"
description: "Propose a new lint rule"
title: "Rule proposal: <a short description of my proposal>"
name: '✨ Propose a New Rule'
description: 'Propose a new lint rule'
title: 'Rule proposal: <a short description of my proposal>'
labels:
- "enhancement: new plugin rule"
- "package: eslint-plugin"
- 'enhancement: new plugin rule'
- 'package: eslint-plugin'
- triage
body:
- type: checkboxes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "✨ Propose a New Base Rule Extension"
description: "Propose a new base lint rule extension"
title: "Base rule extension: [rule-name] <a short description of my proposal>"
name: '✨ Propose a New Base Rule Extension'
description: 'Propose a new base lint rule extension'
title: 'Base rule extension: [rule-name] <a short description of my proposal>'
labels:
- "enhancement: new base rule extension"
- "package: eslint-plugin"
- 'enhancement: new base rule extension'
- 'package: eslint-plugin'
- triage
body:
- type: markdown
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/05-documentation-request.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "📝 Documentation Request"
description: "Request a change in documentation"
title: "Docs: <a short description of my proposal>"
name: '📝 Documentation Request'
description: 'Request a change in documentation'
title: 'Docs: <a short description of my proposal>'
labels:
- documentation
- triage
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/06-bug-report-other.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "🐛 Report a Bug With Another Package"
description: "Report a bug you encountered with another one of our packages (parser, util, scope-manager, etc)"
title: "Bug: <short description of the issue>"
name: '🐛 Report a Bug With Another Package'
description: 'Report a bug you encountered with another one of our packages (parser, util, scope-manager, etc)'
title: 'Bug: <short description of the issue>'
labels:
- bug
- triage
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/07-enhancement-other.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "✨ Propose an Enhancement With Another Package"
description: "Report an enhancement to another one of our packages (parser, util, scope-manager, etc)"
title: "Enhancement: <a short description of my proposal>"
name: '✨ Propose an Enhancement With Another Package'
description: 'Report an enhancement to another one of our packages (parser, util, scope-manager, etc)'
title: 'Enhancement: <a short description of my proposal>'
labels:
- enhancement
- triage
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/08-bug-report-complex.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "🐛 Report a Complex Bug With a Reproduction Repository"
name: '🐛 Report a Complex Bug With a Reproduction Repository'
description: Report a complex bug you encountered by providing an isolated reproduction repository
title: "Bug: <short description of the issue>"
title: 'Bug: <short description of the issue>'
labels:
- bug
- triage
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/09-config-change.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "♻ Propose a Change to Preset Configurations"
description: "Propose an addition, removal, or general change to a preset config"
title: "Configs: <a short description of my proposal>"
name: '♻ Propose a Change to Preset Configurations'
description: 'Propose an addition, removal, or general change to a preset config'
title: 'Configs: <a short description of my proposal>'
labels:
- "package: eslint-plugin"
- "preset config change"
- 'package: eslint-plugin'
- 'preset config change'
- triage
body:
- type: checkboxes
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/10-repo-maintenance.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: "🏗 Suggest an Improvement with Repository Maintenance"
name: '🏗 Suggest an Improvement with Repository Maintenance'
description: Report a bug or request a feature related to developing the typescript-eslint monorepo
title: "Repo: <short description of the issue>"
title: 'Repo: <short description of the issue>'
labels:
- "repo maintenance"
- 'repo maintenance'
- triage
body:
- type: markdown
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/prepare-build/action.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: "Prepare: Build"
description: "Prepares the repo for a job by running the build"
name: 'Prepare: Build'
description: 'Prepares the repo for a job by running the build'
# inputs: - no inputs
# outputs: - no outputs

runs:
using: "composite"
using: 'composite'
steps:
- uses: actions/cache@v3
id: build-cache
with:
path: "**/dist/**"
path: '**/dist/**'
key: ${{ runner.os }}-build-${{ github.ref }}
restore-keys: |
${{ runner.os }}-build-
Expand Down
10 changes: 5 additions & 5 deletions .github/actions/prepare-install/action.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: "Prepare: Checkout and Install"
description: "Prepares the repo for a job by checking out and installing dependencies"
name: 'Prepare: Checkout and Install'
description: 'Prepares the repo for a job by checking out and installing dependencies'
inputs:
node-version:
description: "The node version to setup"
description: 'The node version to setup'
required: true
registry-url:
description: "Define registry-url"
description: 'Define registry-url'
required: false

# outputs: - no outputs

runs:
using: "composite"
using: 'composite'
steps:
- name: echo github.ref
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Otherwise we may not be able to review your PR.

## PR Checklist

- [ ] Addresses an existing open issue: fixes #000
- [ ] That issue was marked as [accepting prs](https://github.com/typescript-eslint/typescript-eslint/issues?q=is%3Aopen+is%3Aissue+label%3A%22accepting+prs%22)
- [ ] Steps in [CONTRIBUTING.md](https://github.com/typescript-eslint/typescript-eslint/blob/main/CONTRIBUTING.md) were taken
- [ ] Addresses an existing open issue: fixes #000
- [ ] That issue was marked as [accepting prs](https://github.com/typescript-eslint/typescript-eslint/issues?q=is%3Aopen+is%3Aissue+label%3A%22accepting+prs%22)
- [ ] Steps in [CONTRIBUTING.md](https://github.com/typescript-eslint/typescript-eslint/blob/main/CONTRIBUTING.md) were taken

## Overview

Expand Down
47 changes: 17 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
lint-task: [
"check-spelling",
"check-format",
"lint-markdown",
]
lint-task: ['check-spelling', 'check-format', 'lint-markdown']
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -78,10 +74,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
lint-task: [
"lint",
"typecheck",
]
lint-task: ['lint', 'typecheck']
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -122,18 +115,19 @@ jobs:
matrix:
# just run on the oldest and latest supported versions and assume the intermediate versions are good
node-version: [12, 18]
package: [
"ast-spec",
"eslint-plugin",
"eslint-plugin-internal",
"eslint-plugin-tslint",
"parser",
"scope-manager",
"type-utils",
"typescript-estree",
"utils",
"visitor-keys",
]
package:
[
'ast-spec',
'eslint-plugin',
'eslint-plugin-internal',
'eslint-plugin-tslint',
'parser',
'scope-manager',
'type-utils',
'typescript-estree',
'utils',
'visitor-keys',
]
env:
# Added the - at the end to function as a separator to improve readability in the PR comment from the Nx cloud app
NX_CLOUD_ENV_NAME: 'Node ${{ matrix.node-version }} -'
Expand Down Expand Up @@ -228,17 +222,10 @@ jobs:
flags: unittest
name: codecov


publish_canary_version:
name: Publish the latest code as a canary version
runs-on: ubuntu-latest
needs:
[
integration_tests,
lint_with_build,
lint_without_build,
unit_tests,
]
needs: [integration_tests, lint_with_build, lint_without_build, unit_tests]
if: github.repository == 'typescript-eslint/typescript-eslint' && github.ref == 'refs/heads/main'
steps:
- name: Checkout
Expand All @@ -247,7 +234,7 @@ jobs:
uses: ./.github/actions/prepare-install
with:
node-version: ${{ env.PRIMARY_NODE_VERSION }}
registry-url: "https://registry.npmjs.org"
registry-url: 'https://registry.npmjs.org'
- name: Build
uses: ./.github/actions/prepare-build

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/lock.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: "Lock threads"
name: 'Lock threads'

on:
schedule:
- cron: "0 0 * * *"
- cron: '0 0 * * *'

jobs:
lock:
Expand All @@ -11,9 +11,9 @@ jobs:
- uses: dessant/lock-threads@v3
with:
github-token: ${{ github.token }}
issue-inactive-days: "30"
issue-lock-reason: "resolved"
issue-comment: ""
pr-inactive-days: "30"
pr-lock-reason: "resolved"
pr-comment: ""
issue-inactive-days: '30'
issue-lock-reason: 'resolved'
issue-comment: ''
pr-inactive-days: '30'
pr-lock-reason: 'resolved'
pr-comment: ''
2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
**/.nyc_output
**/.vs
packages/eslint-plugin-tslint/tests/test-tslint-rules-directory/alwaysFailRule.js
.github
packages/eslint-plugin/src/configs/*.json
.all-contributorsrc
CONTRIBUTORS.md
packages/ast-spec/src/*/*/fixtures/_error_/*/fixture.ts

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
"check-clean-workspace-after-install": "git diff --quiet --exit-code",
"check-configs": "nx run-many --target=check-configs --all --parallel",
"check-docs": "nx run-many --target=check-docs --all --parallel",
"check-format": "prettier --list-different \"./**/*.{md,mdx,ts,mts,cts,js,cjs,mjs,tsx,jsx}\"",
"check-format": "prettier --list-different .",
"check-spelling": "cspell --config=.cspell.json \"**/*.{md,mdx,ts,mts,cts,js,cjs,mjs,tsx,jsx}\"",
"clean": "lerna clean && lerna run clean",
"format": "prettier --write \"./**/*.{ts,mts,cts,tsx,js,mjs,cjs,jsx,json,md,css}\"",
"format": "prettier --write .",
"generate-contributors": "yarn ts-node --transpile-only ./tools/generate-contributors.ts",
"generate-sponsors": "yarn ts-node --transpile-only ./tools/generate-sponsors.ts",
"generate-website-dts": "yarn ts-node --transpile-only ./tools/generate-website-dts.ts",
Expand Down