diff --git a/.commitlintrc.js b/.commitlintrc.js
index e9c80b9247279..b706e527d77c0 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/.eslintrc.js b/.eslintrc.js
index b9ba04d34368a..58e76436686f4 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,6 +12,8 @@ module.exports = {
   root: true,
   ignorePatterns: [
     'tap-testdir*/',
+    '/node_modules/.bin/',
+    '/node_modules/.cache/',
     'docs/**',
     'smoke-tests/**',
     'mock-globals/**',
diff --git a/.github/actions/create-check/action.yml b/.github/actions/create-check/action.yml
index aa24a5b0f0581..d1220c90cfb11 100644
--- a/.github/actions/create-check/action.yml
+++ b/.github/actions/create-check/action.yml
@@ -25,7 +25,7 @@ runs:
       with:
         result-encoding: string
         script: |
-          const { repo: { owner, repo}, runId, serverUrl } = context          
+          const { repo: { owner, repo}, runId, serverUrl } = context
           const { JOB_NAME, SHA } = process.env
 
           const job = await github.rest.actions.listJobsForWorkflowRun({
diff --git a/.github/actions/install-latest-npm/action.yml b/.github/actions/install-latest-npm/action.yml
index 8339dbf03882d..580603dd40c92 100644
--- a/.github/actions/install-latest-npm/action.yml
+++ b/.github/actions/install-latest-npm/action.yml
@@ -44,7 +44,7 @@ runs:
             MATCH=$SPEC
             echo "Found compatible version: npm@$MATCH"
             break
-          fi  
+          fi
         done
 
         if [ -z $MATCH ]; then
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index bd6cbf8ab4f1d..02739fd261426 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -60,7 +60,7 @@ jobs:
         run: node . run postlint --ignore-scripts -ws -iwr --if-present
       - name: Conclude Check
         uses: LouisBrunner/checks-action@v1.6.0
-        if: always()
+        if: steps.create-check.outputs.check-id && always()
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           conclusion: ${{ job.status }}
@@ -142,7 +142,7 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Conclude Check
         uses: LouisBrunner/checks-action@v1.6.0
-        if: always()
+        if: steps.create-check.outputs.check-id && always()
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           conclusion: ${{ job.status }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1e05817c06c03..4fb4fb7c4ce11 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,8 +31,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/.gitignore b/.gitignore
index 2a10ae9bd8888..cf767636080ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,20 +2,20 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.commitlintrc.js
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitattributes
 !/.github/
 !/.gitignore
 !/.licensee.json
 !/.mailmap
 !/.npmrc
+!/.prettierignore
+!/.prettierrc.js
 !/.release-please-manifest.json
 !/AUTHORS
 !/bin/
@@ -41,6 +41,7 @@ tap-testdir*/
 !/tap-snapshots/
 !/test/
 !/tsconfig.json
+tap-testdir*/
 !/docs/
 !/smoke-tests/
 !/mock-globals/
diff --git a/SECURITY.md b/SECURITY.md
index 9cd2deaf4fd34..4fe06a2a32c77 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,7 +2,7 @@
 
 GitHub takes the security of our software products and services seriously, including the open source code repositories managed through our GitHub organizations, such as [GitHub](https://github.com/GitHub).
 
-If you believe you have found a security vulnerability in this GitHub-owned open source repository, you can report it to us in one of two ways. 
+If you believe you have found a security vulnerability in this GitHub-owned open source repository, you can report it to us in one of two ways.
 
 If the vulnerability you have found is *not* [in scope for the GitHub Bug Bounty Program](https://bounty.github.com/#scope) or if you do not wish to be considered for a bounty reward, please report the issue to us directly through [opensource-security@github.com](mailto:opensource-security@github.com).
 
diff --git a/docs/.gitignore b/docs/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/docs/package.json b/docs/package.json
index d3f0ecbd26e92..5cc1860d450a9 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -5,14 +5,15 @@
   "private": true,
   "main": "lib/index.js",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
     "test": "tap",
     "posttest": "npm run lint",
-    "build": "node bin/build.js"
+    "build": "node bin/build.js",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "repository": {
     "type": "git",
@@ -22,7 +23,7 @@
   "devDependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "front-matter": "^4.0.2",
     "ignore-walk": "^6.0.5",
     "jsdom": "^24.0.0",
@@ -55,7 +56,7 @@
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "ciVersions": "latest",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../scripts/template-oss/index.js",
     "workspaceRepo": {
       "add": {
diff --git a/mock-globals/.gitignore b/mock-globals/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/mock-globals/.gitignore
+++ b/mock-globals/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/mock-globals/package.json b/mock-globals/package.json
index 83e5388b86186..18e51776acf00 100644
--- a/mock-globals/package.json
+++ b/mock-globals/package.json
@@ -6,12 +6,13 @@
   "private": true,
   "scripts": {
     "test": "tap",
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
-    "posttest": "npm run lint"
+    "posttest": "npm run lint",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "repository": {
     "type": "git",
@@ -34,7 +35,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../scripts/template-oss/index.js"
   },
   "tap": {
@@ -49,7 +50,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.1",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "tap": "^16.3.8"
   }
 }
diff --git a/mock-registry/.gitignore b/mock-registry/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/mock-registry/.gitignore
+++ b/mock-registry/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/mock-registry/package.json b/mock-registry/package.json
index 8582d113c04f0..d8d8f002e42f3 100644
--- a/mock-registry/package.json
+++ b/mock-registry/package.json
@@ -6,12 +6,13 @@
   "private": true,
   "scripts": {
     "test": "tap",
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
-    "posttest": "npm run lint"
+    "posttest": "npm run lint",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "repository": {
     "type": "git",
@@ -34,7 +35,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../scripts/template-oss/index.js"
   },
   "tap": {
@@ -47,7 +48,7 @@
   "devDependencies": {
     "@npmcli/arborist": "^7.1.0",
     "@npmcli/eslint-config": "^4.0.1",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "json-stringify-safe": "^5.0.1",
     "nock": "^13.3.3",
     "npm-package-arg": "^11.0.2",
diff --git a/package-lock.json b/package-lock.json
index e4f3cb0de5b48..cc21d1bb7c19c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -165,7 +165,7 @@
         "@npmcli/git": "^5.0.8",
         "@npmcli/mock-globals": "^1.0.0",
         "@npmcli/mock-registry": "^1.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "@tufjs/repo-mock": "^2.0.0",
         "ajv": "^8.12.0",
         "ajv-formats": "^2.1.1",
@@ -192,7 +192,7 @@
       "devDependencies": {
         "@isaacs/string-locale-compare": "^1.1.0",
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "front-matter": "^4.0.2",
         "ignore-walk": "^6.0.5",
         "jsdom": "^24.0.0",
@@ -216,7 +216,7 @@
       "license": "ISC",
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.1",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "tap": "^16.3.8"
       },
       "engines": {
@@ -230,7 +230,7 @@
       "devDependencies": {
         "@npmcli/arborist": "^7.1.0",
         "@npmcli/eslint-config": "^4.0.1",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "json-stringify-safe": "^5.0.1",
         "nock": "^13.3.3",
         "npm-package-arg": "^11.0.2",
@@ -1746,9 +1746,9 @@
       "link": true
     },
     "node_modules/@npmcli/template-oss": {
-      "version": "4.22.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-4.22.0.tgz",
-      "integrity": "sha512-aCvUL/sqMoTcfqLRqe5RjkrhUHeWXuUr+GlADWT0O2t2nf/D5jttP714agVd1+d1UbE/LOhw7tGirvKhNGlC+A==",
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-4.23.3.tgz",
+      "integrity": "sha512-0oXX3Wf9z86SvumR1vWVUMxglw0VfMiy9zLkO9mQwGpiUlAWgkOFdob4osZ8WHNZz4SKwXdOTD9ZbWc2zrnmrw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "ISC",
@@ -1779,7 +1779,7 @@
         "minimatch": "^9.0.2",
         "npm-package-arg": "^11.0.1",
         "proc-log": "^4.0.0",
-        "release-please": "16.10.2",
+        "release-please": "16.12.0",
         "semver": "^7.3.5",
         "undici": "^6.7.0",
         "yaml": "^2.1.1"
@@ -10923,9 +10923,9 @@
       }
     },
     "node_modules/release-please": {
-      "version": "16.10.2",
-      "resolved": "https://registry.npmjs.org/release-please/-/release-please-16.10.2.tgz",
-      "integrity": "sha512-OX6N7xx3F3ZCd1+B7yq2Ix6KfuA7zXxMP04q3xYic3Hb0X/dOzy8p50xnrxzFpIVJridp1Dn74dUgzjImK6Mdg==",
+      "version": "16.12.0",
+      "resolved": "https://registry.npmjs.org/release-please/-/release-please-16.12.0.tgz",
+      "integrity": "sha512-GTZBZQ/1fJwBk6y/BMSdzOczRkEu2L9LrPOXeS1FMHxY/djQLYfwfCEFrmzxGDWfsJvEeDxJlPEPR66s6WWN9w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -15742,7 +15742,7 @@
         "@npmcli/eslint-config": "^4.0.0",
         "@npmcli/mock-registry": "^1.0.0",
         "@npmcli/promise-spawn": "^7.0.2",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "proxy": "^2.1.1",
         "semver": "^7.5.4",
         "tap": "^16.3.8",
@@ -15798,7 +15798,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "benchmark": "^2.1.4",
         "minify-registry-metadata": "^3.0.0",
         "nock": "^13.3.3",
@@ -15827,7 +15827,7 @@
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
         "@npmcli/mock-globals": "^1.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "tap": "^16.3.8"
       },
       "engines": {
@@ -15844,7 +15844,7 @@
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
         "@npmcli/mock-registry": "^1.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "nock": "^13.3.3",
         "tap": "^16.3.8"
       },
@@ -15867,7 +15867,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "tap": "^16.3.8"
       },
       "engines": {
@@ -15892,7 +15892,7 @@
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
         "@npmcli/mock-registry": "^1.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "bin-links": "^4.0.4",
         "chalk": "^5.2.0",
         "just-extend": "^6.2.0",
@@ -15911,7 +15911,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "tap": "^16.3.8"
       },
       "engines": {
@@ -15927,7 +15927,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "nock": "^13.3.3",
         "tap": "^16.3.8"
       },
@@ -15944,7 +15944,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "minipass": "^7.1.1",
         "nock": "^13.3.3",
         "tap": "^16.3.8"
@@ -15964,7 +15964,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "nock": "^13.3.3",
         "spawk": "^1.7.1",
         "tap": "^16.3.8"
@@ -15990,7 +15990,7 @@
         "@npmcli/eslint-config": "^4.0.0",
         "@npmcli/mock-globals": "^1.0.0",
         "@npmcli/mock-registry": "^1.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "nock": "^13.3.3",
         "tap": "^16.3.8"
       },
@@ -16006,7 +16006,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "nock": "^13.3.3",
         "tap": "^16.3.8"
       },
@@ -16023,7 +16023,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "nock": "^13.3.3",
         "tap": "^16.3.8"
       },
@@ -16043,7 +16043,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.22.0",
+        "@npmcli/template-oss": "4.23.3",
         "require-inject": "^1.4.4",
         "tap": "^16.3.8"
       },
diff --git a/package.json b/package.json
index 09078b06f2ab2..76b8dafb90b03 100644
--- a/package.json
+++ b/package.json
@@ -196,7 +196,7 @@
     "@npmcli/git": "^5.0.8",
     "@npmcli/mock-globals": "^1.0.0",
     "@npmcli/mock-registry": "^1.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "@tufjs/repo-mock": "^2.0.0",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
@@ -222,13 +222,14 @@
     "snap": "tap",
     "prepack": "node . run build -w docs",
     "posttest": "node . run lint",
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
-    "lintfix": "node . run lint -- --fix",
+    "lint": "node . run eslint",
+    "lintfix": "node . run eslint -- --fix",
     "lint-all": "node . run lint -ws -iwr --if-present",
     "resetdeps": "node scripts/resetdeps.js",
     "rp-pull-request": "node scripts/update-authors.js",
     "postlint": "template-oss-check",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "tap": {
     "test-env": [
@@ -253,7 +254,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "./scripts/template-oss/root.js"
   },
   "license": "Artistic-2.0",
diff --git a/smoke-tests/.gitignore b/smoke-tests/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/smoke-tests/.gitignore
+++ b/smoke-tests/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/smoke-tests/package.json b/smoke-tests/package.json
index 6c5d61e635b2d..73b576d551f7d 100644
--- a/smoke-tests/package.json
+++ b/smoke-tests/package.json
@@ -4,13 +4,14 @@
   "version": "1.0.1",
   "private": true,
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
     "test": "tap",
-    "posttest": "npm run lint"
+    "posttest": "npm run lint",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "repository": {
     "type": "git",
@@ -21,7 +22,7 @@
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/mock-registry": "^1.0.0",
     "@npmcli/promise-spawn": "^7.0.2",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "proxy": "^2.1.1",
     "semver": "^7.5.4",
     "tap": "^16.3.8",
@@ -31,7 +32,7 @@
   "license": "ISC",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/arborist/.gitignore b/workspaces/arborist/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/arborist/.gitignore
+++ b/workspaces/arborist/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json
index 9fdbbbf8607ad..7fec2c6bea339 100644
--- a/workspaces/arborist/package.json
+++ b/workspaces/arborist/package.json
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "benchmark": "^2.1.4",
     "minify-registry-metadata": "^3.0.0",
     "nock": "^13.3.3",
@@ -54,12 +54,13 @@
     "posttest": "npm run lint",
     "snap": "tap",
     "test-proxy": "ARBORIST_TEST_PROXY=1 tap --snapshot",
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
-    "lintfix": "npm run lint -- --fix",
+    "lint": "npm run eslint",
+    "lintfix": "npm run eslint -- --fix",
     "benchmark": "node scripts/benchmark.js",
     "benchclean": "rm -rf scripts/benchmark/*/",
     "postlint": "template-oss-check",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "repository": {
     "type": "git",
@@ -92,7 +93,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   }
 }
diff --git a/workspaces/config/.gitignore b/workspaces/config/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/config/.gitignore
+++ b/workspaces/config/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/config/package.json b/workspaces/config/package.json
index 04e6e55c3efa9..6cf2b85438c65 100644
--- a/workspaces/config/package.json
+++ b/workspaces/config/package.json
@@ -17,11 +17,12 @@
   "scripts": {
     "test": "tap",
     "snap": "tap",
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "posttest": "npm run lint",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "tap": {
     "nyc-arg": [
@@ -32,7 +33,7 @@
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/mock-globals": "^1.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "tap": "^16.3.8"
   },
   "dependencies": {
@@ -50,7 +51,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   }
 }
diff --git a/workspaces/libnpmaccess/.gitignore b/workspaces/libnpmaccess/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmaccess/.gitignore
+++ b/workspaces/libnpmaccess/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmaccess/package.json b/workspaces/libnpmaccess/package.json
index 64a4af0bee153..b9d92e4eda667 100644
--- a/workspaces/libnpmaccess/package.json
+++ b/workspaces/libnpmaccess/package.json
@@ -6,18 +6,19 @@
   "license": "ISC",
   "main": "lib/index.js",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "test": "tap",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
     "posttest": "npm run lint",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/mock-registry": "^1.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "nock": "^13.3.3",
     "tap": "^16.3.8"
   },
@@ -41,7 +42,7 @@
   ],
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/libnpmdiff/.gitignore b/workspaces/libnpmdiff/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmdiff/.gitignore
+++ b/workspaces/libnpmdiff/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmdiff/package.json b/workspaces/libnpmdiff/package.json
index f1c28fd1735a2..0e6d23d54d1c7 100644
--- a/workspaces/libnpmdiff/package.json
+++ b/workspaces/libnpmdiff/package.json
@@ -32,17 +32,18 @@
   ],
   "license": "ISC",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
-    "lintfix": "npm run lint -- --fix",
+    "lint": "npm run eslint",
+    "lintfix": "npm run eslint -- --fix",
     "test": "tap",
     "posttest": "npm run lint",
     "snap": "tap",
     "postlint": "template-oss-check",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "tap": "^16.3.8"
   },
   "dependencies": {
@@ -57,7 +58,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/libnpmexec/.gitignore b/workspaces/libnpmexec/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmexec/.gitignore
+++ b/workspaces/libnpmexec/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json
index 159501266386a..658a87665c4fd 100644
--- a/workspaces/libnpmexec/package.json
+++ b/workspaces/libnpmexec/package.json
@@ -33,13 +33,14 @@
   ],
   "license": "ISC",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "posttest": "npm run lint",
     "test": "tap",
     "snap": "tap",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
-    "template-oss-apply": "template-oss-apply --force"
+    "lintfix": "npm run eslint -- --fix",
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "tap": {
     "files": "test/*.js",
@@ -51,7 +52,7 @@
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/mock-registry": "^1.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "bin-links": "^4.0.4",
     "chalk": "^5.2.0",
     "just-extend": "^6.2.0",
@@ -72,7 +73,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   }
 }
diff --git a/workspaces/libnpmfund/.gitignore b/workspaces/libnpmfund/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmfund/.gitignore
+++ b/workspaces/libnpmfund/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmfund/package.json b/workspaces/libnpmfund/package.json
index 3ce8a899ccbea..03fe5f9b4e5a5 100644
--- a/workspaces/libnpmfund/package.json
+++ b/workspaces/libnpmfund/package.json
@@ -31,17 +31,18 @@
   ],
   "license": "ISC",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
-    "lintfix": "npm run lint -- --fix",
+    "lint": "npm run eslint",
+    "lintfix": "npm run eslint -- --fix",
     "posttest": "npm run lint",
     "test": "tap",
     "snap": "tap",
     "postlint": "template-oss-check",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "tap": "^16.3.8"
   },
   "dependencies": {
@@ -52,7 +53,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/libnpmhook/.gitignore b/workspaces/libnpmhook/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmhook/.gitignore
+++ b/workspaces/libnpmhook/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmhook/package.json b/workspaces/libnpmhook/package.json
index 098762c037dfd..741cf8a975b0c 100644
--- a/workspaces/libnpmhook/package.json
+++ b/workspaces/libnpmhook/package.json
@@ -9,12 +9,13 @@
   ],
   "scripts": {
     "test": "tap",
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
     "posttest": "npm run lint",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "repository": {
     "type": "git",
@@ -35,7 +36,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "nock": "^13.3.3",
     "tap": "^16.3.8"
   },
@@ -44,7 +45,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/libnpmorg/.gitignore b/workspaces/libnpmorg/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmorg/.gitignore
+++ b/workspaces/libnpmorg/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmorg/package.json b/workspaces/libnpmorg/package.json
index aa3440de58369..1076474eb97b1 100644
--- a/workspaces/libnpmorg/package.json
+++ b/workspaces/libnpmorg/package.json
@@ -14,13 +14,14 @@
   ],
   "license": "ISC",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "test": "tap",
     "posttest": "npm run lint",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "files": [
     "bin/",
@@ -28,7 +29,7 @@
   ],
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "minipass": "^7.1.1",
     "nock": "^13.3.3",
     "tap": "^16.3.8"
@@ -49,7 +50,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/libnpmpack/.gitignore b/workspaces/libnpmpack/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmpack/.gitignore
+++ b/workspaces/libnpmpack/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmpack/package.json b/workspaces/libnpmpack/package.json
index 03fc3cda5cb87..588921bbfa965 100644
--- a/workspaces/libnpmpack/package.json
+++ b/workspaces/libnpmpack/package.json
@@ -13,17 +13,18 @@
   ],
   "license": "ISC",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "test": "tap",
     "posttest": "npm run lint",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "nock": "^13.3.3",
     "spawk": "^1.7.1",
     "tap": "^16.3.8"
@@ -46,7 +47,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/libnpmpublish/.gitignore b/workspaces/libnpmpublish/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmpublish/.gitignore
+++ b/workspaces/libnpmpublish/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmpublish/package.json b/workspaces/libnpmpublish/package.json
index 87fc8215dcab8..e19d82dd349ed 100644
--- a/workspaces/libnpmpublish/package.json
+++ b/workspaces/libnpmpublish/package.json
@@ -14,19 +14,20 @@
   ],
   "license": "ISC",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
-    "lintfix": "npm run lint -- --fix",
+    "lint": "npm run eslint",
+    "lintfix": "npm run eslint -- --fix",
     "test": "tap",
     "posttest": "npm run lint",
     "postlint": "template-oss-check",
     "snap": "tap",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/mock-globals": "^1.0.0",
     "@npmcli/mock-registry": "^1.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "nock": "^13.3.3",
     "tap": "^16.3.8"
   },
@@ -52,7 +53,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/libnpmsearch/.gitignore b/workspaces/libnpmsearch/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmsearch/.gitignore
+++ b/workspaces/libnpmsearch/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmsearch/package.json b/workspaces/libnpmsearch/package.json
index 795a6ae076831..d43aaa4a45459 100644
--- a/workspaces/libnpmsearch/package.json
+++ b/workspaces/libnpmsearch/package.json
@@ -18,15 +18,16 @@
   "scripts": {
     "posttest": "npm run lint",
     "test": "tap",
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "nock": "^13.3.3",
     "tap": "^16.3.8"
   },
@@ -45,7 +46,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/libnpmteam/.gitignore b/workspaces/libnpmteam/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmteam/.gitignore
+++ b/workspaces/libnpmteam/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmteam/package.json b/workspaces/libnpmteam/package.json
index 4900435c5b27a..848769961182a 100644
--- a/workspaces/libnpmteam/package.json
+++ b/workspaces/libnpmteam/package.json
@@ -6,17 +6,18 @@
   "license": "ISC",
   "main": "lib/index.js",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "test": "tap",
     "posttest": "npm run lint",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "snap": "tap",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "nock": "^13.3.3",
     "tap": "^16.3.8"
   },
@@ -39,7 +40,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   },
   "tap": {
diff --git a/workspaces/libnpmversion/.gitignore b/workspaces/libnpmversion/.gitignore
index a96d056a7064e..8591cc376e949 100644
--- a/workspaces/libnpmversion/.gitignore
+++ b/workspaces/libnpmversion/.gitignore
@@ -2,13 +2,11 @@
 
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 !**/.gitignore
 !/.eslintrc.js
 !/.eslintrc.local.*
+!/.git-blame-ignore-revs
 !/.gitignore
 !/bin/
 !/CHANGELOG*
@@ -21,3 +19,4 @@ tap-testdir*/
 !/scripts/
 !/tap-snapshots/
 !/test/
+tap-testdir*/
diff --git a/workspaces/libnpmversion/package.json b/workspaces/libnpmversion/package.json
index 3f251e4b63613..ccfe5a05cb30a 100644
--- a/workspaces/libnpmversion/package.json
+++ b/workspaces/libnpmversion/package.json
@@ -15,13 +15,14 @@
   "author": "GitHub Inc.",
   "license": "ISC",
   "scripts": {
-    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
     "test": "tap",
     "posttest": "npm run lint",
     "snap": "tap",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
-    "template-oss-apply": "template-oss-apply --force"
+    "lintfix": "npm run eslint -- --fix",
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "tap": {
     "coverage-map": "map.js",
@@ -32,7 +33,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.22.0",
+    "@npmcli/template-oss": "4.23.3",
     "require-inject": "^1.4.4",
     "tap": "^16.3.8"
   },
@@ -48,7 +49,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.22.0",
+    "version": "4.23.3",
     "content": "../../scripts/template-oss/index.js"
   }
 }