From 87d3ed921f4b180946818558c6fef5817090ebe7 Mon Sep 17 00:00:00 2001 From: Gar Date: Mon, 5 Aug 2024 13:09:00 -0700 Subject: [PATCH 1/5] fix: update codeql runner version (#466) v3 uses a newer nodejs image --- .github/workflows/codeql-analysis.yml | 4 ++-- lib/content/codeql-analysis-yml.hbs | 4 ++-- tap-snapshots/test/apply/source-snapshots.js.test.cjs | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 13efe1b4..15c8efee 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,8 +29,8 @@ jobs: git config --global user.email "npm-cli+bot@github.com" git config --global user.name "npm CLI robot" - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: javascript - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/lib/content/codeql-analysis-yml.hbs b/lib/content/codeql-analysis-yml.hbs index 78415d3f..cf7601cc 100644 --- a/lib/content/codeql-analysis-yml.hbs +++ b/lib/content/codeql-analysis-yml.hbs @@ -26,8 +26,8 @@ jobs: steps: {{> stepGitYml }} - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: javascript - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/tap-snapshots/test/apply/source-snapshots.js.test.cjs b/tap-snapshots/test/apply/source-snapshots.js.test.cjs index 667ebcf9..bba9adb9 100644 --- a/tap-snapshots/test/apply/source-snapshots.js.test.cjs +++ b/tap-snapshots/test/apply/source-snapshots.js.test.cjs @@ -666,11 +666,11 @@ jobs: git config --global user.email "npm-cli+bot@github.com" git config --global user.name "npm CLI robot" - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: javascript - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 .github/workflows/post-dependabot.yml ======================================== @@ -2324,11 +2324,11 @@ jobs: git config --global user.email "npm-cli+bot@github.com" git config --global user.name "npm CLI robot" - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: javascript - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 .github/workflows/post-dependabot.yml ======================================== From 6ee703d12a4f1874493ead2be8de207928ca9cb4 Mon Sep 17 00:00:00 2001 From: Chris Sidi Date: Mon, 5 Aug 2024 16:16:56 -0400 Subject: [PATCH 2/5] fix: Don't restrict length for commit message footer (#467) Our breaking change footers related to engine changes are often >100 characters, resulting in commitlint CI failures. Example CI failure: https://github.com/npm/ssri/actions/runs/10169599799/job/28126863705#step:7:12 Associated PR: https://github.com/npm/ssri/pull/137 --- .commitlintrc.js | 1 + lib/content/commitlintrc-js.hbs | 1 + tap-snapshots/test/apply/source-snapshots.js.test.cjs | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.commitlintrc.js b/.commitlintrc.js index e9c80b92..b706e527 100644 --- a/.commitlintrc.js +++ b/.commitlintrc.js @@ -7,5 +7,6 @@ module.exports = { 'header-max-length': [2, 'always', 80], 'subject-case': [0], 'body-max-line-length': [0], + 'footer-max-line-length': [0], }, } diff --git a/lib/content/commitlintrc-js.hbs b/lib/content/commitlintrc-js.hbs index 8b19e3fa..12d63d34 100644 --- a/lib/content/commitlintrc-js.hbs +++ b/lib/content/commitlintrc-js.hbs @@ -5,5 +5,6 @@ module.exports = { 'header-max-length': [2, 'always', 80], 'subject-case': [0], 'body-max-line-length': [0], + 'footer-max-line-length': [0], }, } diff --git a/tap-snapshots/test/apply/source-snapshots.js.test.cjs b/tap-snapshots/test/apply/source-snapshots.js.test.cjs index bba9adb9..5c39d2f1 100644 --- a/tap-snapshots/test/apply/source-snapshots.js.test.cjs +++ b/tap-snapshots/test/apply/source-snapshots.js.test.cjs @@ -17,6 +17,7 @@ module.exports = { 'header-max-length': [2, 'always', 80], 'subject-case': [0], 'body-max-line-length': [0], + 'footer-max-line-length': [0], }, } @@ -1455,6 +1456,7 @@ module.exports = { 'header-max-length': [2, 'always', 80], 'subject-case': [0], 'body-max-line-length': [0], + 'footer-max-line-length': [0], }, } From 6a2200dc746742d9e155df5834b49a779875206e Mon Sep 17 00:00:00 2001 From: Gar Date: Tue, 6 Aug 2024 07:22:19 -0700 Subject: [PATCH 3/5] fix: omit nyc config for all tap versions above 18 (#465) --- lib/config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/config.js b/lib/config.js index 86ad9fb4..a3912cc0 100644 --- a/lib/config.js +++ b/lib/config.js @@ -169,7 +169,8 @@ const getFullConfig = async ({ cjsExt: esm ? 'cjs' : 'js', deleteJsExt: esm ? 'js' : 'cjs', // tap - tap18: semver.coerce(pkg.pkgJson?.devDependencies?.tap)?.major === 18, + // 18 and up doesn't like nyc-arg + tap18: semver.coerce(pkg.pkgJson?.devDependencies?.tap)?.major >= 18, tap16: semver.coerce(pkg.pkgJson?.devDependencies?.tap)?.major === 16, // booleans to control application of updates isForce, From fa37073fd9a4cc7dea2d783bac7055fb35a3d787 Mon Sep 17 00:00:00 2001 From: Gar Date: Wed, 7 Aug 2024 08:23:52 -0700 Subject: [PATCH 4/5] fix: proper workspace tap config for tap18 and up --- lib/content/package-json.hbs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/content/package-json.hbs b/lib/content/package-json.hbs index 98e7d591..d9523151 100644 --- a/lib/content/package-json.hbs +++ b/lib/content/package-json.hbs @@ -42,7 +42,10 @@ "standard": {{{ del }}}, "tap": { {{#if workspacePaths}} - "test-ignore": "^({{ join workspacePaths "|" }})/", + "exclude": {{#if tap18}}[ + "{{ join workspaceGlobs "," }}" + ]{{else }}{{{ del }}}{{/if}}, + "test-ignore": {{#if tap18}}{{{ del }}}{{else}}"^({{ join workspacePaths "|" }})/"{{/if}}, {{/if}} {{#if typescript}} {{#if tap16}} From bba605f22f7072454fdd7c4999fcc3fe2e6d3aff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:56:53 -0700 Subject: [PATCH 5/5] chore: release 4.23.2 (#468) :robot: I have created a release *beep* *boop* --- ## [4.23.2](https://github.com/npm/template-oss/compare/v4.23.1...v4.23.2) (2024-08-13) ### Bug Fixes * [`fa37073`](https://github.com/npm/template-oss/commit/fa37073fd9a4cc7dea2d783bac7055fb35a3d787) [#469](https://github.com/npm/template-oss/pull/469) proper workspace tap config for tap18 and up (@wraithgar) * [`6a2200d`](https://github.com/npm/template-oss/commit/6a2200dc746742d9e155df5834b49a779875206e) [#465](https://github.com/npm/template-oss/pull/465) omit nyc config for all tap versions above 18 (#465) (@wraithgar) * [`6ee703d`](https://github.com/npm/template-oss/commit/6ee703d12a4f1874493ead2be8de207928ca9cb4) Don't restrict length for commit message footer (#467) (@hashtagchris) * [`87d3ed9`](https://github.com/npm/template-oss/commit/87d3ed921f4b180946818558c6fef5817090ebe7) [#466](https://github.com/npm/template-oss/pull/466) update codeql runner version (#466) (@wraithgar) --- 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 | 9 +++++++++ package.json | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 4bf86e39..c4b75363 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "4.23.1" + ".": "4.23.2" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 51b6f84c..cb704790 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [4.23.2](https://github.com/npm/template-oss/compare/v4.23.1...v4.23.2) (2024-08-13) + +### Bug Fixes + +* [`fa37073`](https://github.com/npm/template-oss/commit/fa37073fd9a4cc7dea2d783bac7055fb35a3d787) [#469](https://github.com/npm/template-oss/pull/469) proper workspace tap config for tap18 and up (@wraithgar) +* [`6a2200d`](https://github.com/npm/template-oss/commit/6a2200dc746742d9e155df5834b49a779875206e) [#465](https://github.com/npm/template-oss/pull/465) omit nyc config for all tap versions above 18 (#465) (@wraithgar) +* [`6ee703d`](https://github.com/npm/template-oss/commit/6ee703d12a4f1874493ead2be8de207928ca9cb4) Don't restrict length for commit message footer (#467) (@hashtagchris) +* [`87d3ed9`](https://github.com/npm/template-oss/commit/87d3ed921f4b180946818558c6fef5817090ebe7) [#466](https://github.com/npm/template-oss/pull/466) update codeql runner version (#466) (@wraithgar) + ## [4.23.1](https://github.com/npm/template-oss/compare/v4.23.0...v4.23.1) (2024-07-17) ### Bug Fixes diff --git a/package.json b/package.json index 518dfb26..1b2d4f7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/template-oss", - "version": "4.23.1", + "version": "4.23.2", "description": "templated files used in npm CLI team oss projects", "main": "lib/content/index.js", "bin": {