From 9160ca2476b3bbf0937159112cc036ebdad9c1c7 Mon Sep 17 00:00:00 2001 From: JounQin Date: Mon, 13 Jan 2025 22:52:14 +0800 Subject: [PATCH 1/4] chore: add FUNDING.yml --- .github/FUNDING.yml | 15 +++++++++++++++ package-lock.json | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..8ee2f43 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,15 @@ +github: + - prettier-eslint + - JounQin + - 1stG + - rx-ts + - un-ts +patreon: PrettierESLint +open_collective: eslint-config-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 diff --git a/package-lock.json b/package-lock.json index d9be165..bd85dd9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "eslint-config-prettier", - "version": "10.0.0", + "version": "10.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "eslint-config-prettier", - "version": "10.0.0", + "version": "10.0.1", "license": "MIT", "bin": { "eslint-config-prettier": "build/bin/cli.js" From b5b913df8fb9211813a734efa17b659012e9c5f0 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Wed, 26 Feb 2025 13:33:17 +0000 Subject: [PATCH 2/4] ci: bump github actions (#300) --- .github/workflows/check.yml | 6 +++--- .github/workflows/test.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index d6be38d..e025fd4 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -19,17 +19,17 @@ jobs: node-version: [20] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Cache node_modules id: cache-node_modules - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ matrix.os }}-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a05b18f..6ee155a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,20 +16,20 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - node-version: [16, 18, 20] + node-version: [16, 18, 20, 22] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Cache node_modules id: cache-node_modules - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ matrix.os }}-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }} From e750edc530c816e0b3ffabfab1f4e46532bccbfe Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Wed, 26 Feb 2025 13:47:55 +0000 Subject: [PATCH 3/4] chore(package): explicitly declare js module type (#299) Co-authored-by: JounQin --- .changeset/six-dolls-itch.md | 5 +++++ package.json | 1 + 2 files changed, 6 insertions(+) create mode 100644 .changeset/six-dolls-itch.md diff --git a/.changeset/six-dolls-itch.md b/.changeset/six-dolls-itch.md new file mode 100644 index 0000000..e70022d --- /dev/null +++ b/.changeset/six-dolls-itch.md @@ -0,0 +1,5 @@ +--- +"eslint-config-prettier": patch +--- + +chore(package): explicitly declare js module type diff --git a/package.json b/package.json index 97033cb..49ed0ce 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "repository": "prettier/eslint-config-prettier", "bin": "build/bin/cli.js", "main": "build/index.js", + "type": "commonjs", "files": [ "build" ], From e2015cd918969a67a31906c9670e09752a87e122 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 13:51:11 +0000 Subject: [PATCH 4/4] chore: release eslint-config-prettier (#301) Co-authored-by: github-actions[bot] --- .changeset/six-dolls-itch.md | 5 ----- CHANGELOG.md | 6 ++++++ package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/six-dolls-itch.md diff --git a/.changeset/six-dolls-itch.md b/.changeset/six-dolls-itch.md deleted file mode 100644 index e70022d..0000000 --- a/.changeset/six-dolls-itch.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"eslint-config-prettier": patch ---- - -chore(package): explicitly declare js module type diff --git a/CHANGELOG.md b/CHANGELOG.md index c8dce6c..ae655ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # eslint-config-prettier +## 10.0.2 + +### Patch Changes + +- [#299](https://github.com/prettier/eslint-config-prettier/pull/299) [`e750edc`](https://github.com/prettier/eslint-config-prettier/commit/e750edc530c816e0b3ffabfab1f4e46532bccbfe) Thanks [@Fdawgs](https://github.com/Fdawgs)! - chore(package): explicitly declare js module type + ## 10.0.0 ### Major Changes diff --git a/package.json b/package.json index 49ed0ce..7c0ee82 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-prettier", - "version": "10.0.1", + "version": "10.0.2", "license": "MIT", "author": "Simon Lydell", "description": "Turns off all rules that are unnecessary or might conflict with Prettier.",