[pull] master from prettier:master

.changeset/config.json

@@ -9,7 +9,7 @@
   "commit": false,
   "linked": [],
   "access": "public",
-  "baseBranch": "master",
+  "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": []
 }

.commitlintrc

@@ -1,3 +1,3 @@
 {
-  "extends": "@1stg"
+  "extends": "@commitlint/config-conventional"
 }

.github/FUNDING.yml

@@ -1,12 +1,15 @@
 github:
+  - prettier-eslint
   - JounQin
   - 1stG
   - rx-ts
   - un-ts
-patreon: 1stG
-open_collective: prettier
+patreon: PrettierESLint
+open_collective: eslint-plugin-prettier
 custom:
+  - https://opencollective.com/prettier-eslint
   - https://opencollective.com/1stG
   - https://opencollective.com/rxts
   - https://opencollective.com/unts
+  - https://patreon.com/1stG
   - https://afdian.net/@JounQin

.github/dependabot.yml

@@ -11,10 +11,20 @@ updates:
       - dependency-name: 'eslint'
       - dependency-name: 'eslint-*'
       - dependency-name: 'prettier'
+      - dependency-name: '@types/eslint'
       - dependency-name: 'vue-eslint-parser'
       - dependency-name: 'mocha'
+    groups:
+      dev-dependencies:
+        dependency-type: development
+        patterns:
+          - '*'
 
   - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: monthly
+    groups:
+      actions:
+        patterns:
+          - '*'

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 jobs:
@@ -16,21 +16,27 @@ jobs:
           - 14
           - 16
           - 18
+          - 20
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
+          cache: pnpm
 
       - name: Install
-        run: yarn --frozen-lockfile
+        run: pnpm install
 
       - name: Test
-        run: yarn mocha
+        run: pnpm mocha
 
       - name: Perf
-        run: TIMING=1 yarn lint
+        # Skip on node 14, as eslint-plugin-n contains syntax that doesn't work
+        # with node 14
+        if: ${{ matrix.node-version != 14 }}
+        run: TIMING=1 pnpm lint

.github/workflows/release.yml

@@ -3,30 +3,32 @@ name: Release
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Setup Node.js 16
-        uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
-          cache: yarn
+          node-version: lts/*
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn --frozen-lockfile
+        run: pnpm install
 
       - name: Create Release Pull Request or Publish to npm
         id: changesets
         uses: changesets/action@v1
         with:
+          publish: pnpm release
           commit: 'chore: release eslint-plugin-prettier'
           title: 'chore: release eslint-plugin-prettier'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -1,3 +1,6 @@
 node_modules
 *.log
 .*cache
+.yarn/*
+!.yarn/plugins
+!.yarn/releases

.lintstagedrc

@@ -0,0 +1,4 @@
+{
+  "*.{js,md,ts}": ["eslint --cache -f friendly --fix"],
+  "*.{json,yml}": ["prettier --write"]
+}

.nvmrc

@@ -1 +1 @@
-lts/*
+16

.prettierignore

@@ -1,3 +1,5 @@
+test/fixtures
+/pnpm-lock.yaml
 # this file doesn't exist, but we use it as a filename that should be ignored
 # by prettier in the tests
 ignore-me.js

.prettierrc

@@ -1 +1,17 @@
-"@1stg/prettier-config/semi"
+{
+  "arrowParens": "avoid",
+  "singleQuote": true,
+  "plugins": [
+    "@prettier/plugin-pug",
+    "prettier-plugin-pkg",
+    "prettier-plugin-svelte"
+  ],
+  "overrides": [
+    {
+      "files": [".changeset/**/*", "CHANGELOG.md"],
+      "options": {
+        "singleQuote": false
+      }
+    }
+  ]
+}

.simple-git-hooks.json

@@ -0,0 +1,4 @@
+{
+  "pre-commit": "npx lint-staged",
+  "commit-msg": "npx commitlint -e"
+}