From f0975dabf5bca5621f5219b20e7596e534b4101c Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 31 Mar 2025 11:54:24 -0700 Subject: [PATCH 1/2] fix: allow eslint.config.js in npm project gitignore files (#508) https://github.com/npm/documentation/pull/1518 the github eslint plugin is now esm only in 6.0.0. We need to be able to add an eslint.config to adapt. --- .gitignore | 1 + lib/content/index.js | 1 + tap-snapshots/test/apply/source-snapshots.js.test.cjs | 6 ++++++ tap-snapshots/test/check/snapshots.js.test.cjs | 4 ++++ workspace/test-workspace/.gitignore | 1 + 5 files changed, 13 insertions(+) diff --git a/.gitignore b/.gitignore index 9d61ca63..7287e17e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ !**/.gitignore !/.commitlintrc.js +!/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs diff --git a/lib/content/index.js b/lib/content/index.js index 4100bb7b..678e9536 100644 --- a/lib/content/index.js +++ b/lib/content/index.js @@ -157,6 +157,7 @@ module.exports = { allowDistPaths: true, allowPaths: [ '/.eslintrc.local.*', + '/.eslint.config.js', '**/.gitignore', '/docs/', '/tap-snapshots/', diff --git a/tap-snapshots/test/apply/source-snapshots.js.test.cjs b/tap-snapshots/test/apply/source-snapshots.js.test.cjs index d6025401..077156b7 100644 --- a/tap-snapshots/test/apply/source-snapshots.js.test.cjs +++ b/tap-snapshots/test/apply/source-snapshots.js.test.cjs @@ -1255,6 +1255,7 @@ jobs: !**/.gitignore !/.commitlintrc.js +!/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs @@ -2940,6 +2941,7 @@ jobs: !**/.gitignore !/.commitlintrc.js +!/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs @@ -3188,6 +3190,7 @@ workspaces/a/.gitignore /* !**/.gitignore +!/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs @@ -3268,6 +3271,7 @@ workspaces/b/.gitignore /* !**/.gitignore +!/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs @@ -4569,6 +4573,7 @@ workspaces/a/.gitignore /* !**/.gitignore +!/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs @@ -4649,6 +4654,7 @@ workspaces/b/.gitignore /* !**/.gitignore +!/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs diff --git a/tap-snapshots/test/check/snapshots.js.test.cjs b/tap-snapshots/test/check/snapshots.js.test.cjs index 38a9aec8..36d03629 100644 --- a/tap-snapshots/test/check/snapshots.js.test.cjs +++ b/tap-snapshots/test/check/snapshots.js.test.cjs @@ -126,6 +126,7 @@ To correct it: move files to not match one of the following patterns: /* !**/.gitignore !/.commitlintrc.js + !/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs @@ -170,6 +171,7 @@ To correct it: move files to not match one of the following patterns: /* !**/.gitignore !/.commitlintrc.js + !/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs @@ -211,6 +213,7 @@ To correct it: move files to not match one of the following patterns: /* !**/.gitignore + !/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs @@ -238,6 +241,7 @@ To correct it: move files to not match one of the following patterns: /* !**/.gitignore + !/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs diff --git a/workspace/test-workspace/.gitignore b/workspace/test-workspace/.gitignore index 8591cc37..08e5141a 100644 --- a/workspace/test-workspace/.gitignore +++ b/workspace/test-workspace/.gitignore @@ -4,6 +4,7 @@ /* !**/.gitignore +!/.eslint.config.js !/.eslintrc.js !/.eslintrc.local.* !/.git-blame-ignore-revs From 415deb2743e8c5a73d3cbbfb7a06f52dc1bce394 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 13:02:36 -0700 Subject: [PATCH 2/2] chore: release 4.24.3 (#509) :robot: I have created a release *beep* *boop* --- ## [4.24.3](https://github.com/npm/template-oss/compare/v4.24.2...v4.24.3) (2025-03-31) ### Bug Fixes * [`f0975da`](https://github.com/npm/template-oss/commit/f0975dabf5bca5621f5219b20e7596e534b4101c) allow eslint.config.js in npm project gitignore files (#508) (@owlstronaut) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- CHANGELOG.md | 4 ++++ package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 52d941c8..0c1de9bc 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "4.24.2" + ".": "4.24.3" } diff --git a/CHANGELOG.md b/CHANGELOG.md index bbedcda2..26fcc6d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [4.24.3](https://github.com/npm/template-oss/compare/v4.24.2...v4.24.3) (2025-03-31) +### Bug Fixes +* [`f0975da`](https://github.com/npm/template-oss/commit/f0975dabf5bca5621f5219b20e7596e534b4101c) allow eslint.config.js in npm project gitignore files (#508) (@owlstronaut) + ## [4.24.2](https://github.com/npm/template-oss/compare/v4.24.1...v4.24.2) (2025-03-05) ### Bug Fixes * [`fa962c3`](https://github.com/npm/template-oss/commit/fa962c3b6761ee48ee9a10e7f6252f81f6605f4f) [#506](https://github.com/npm/template-oss/pull/506) propagate content read for release integration (#506) (@reggi) diff --git a/package.json b/package.json index 211ba6c1..0e39bc77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/template-oss", - "version": "4.24.2", + "version": "4.24.3", "description": "templated files used in npm CLI team oss projects", "main": "lib/content/index.js", "bin": {