.github/workflows/release.yml

@@ -71,9 +71,9 @@ jobs:
             const comments = await github.paginate(github.rest.issues.listComments, issue)
             let commentId = comments?.find(c => c.user.login === 'github-actions[bot]' && c.body.startsWith(body))?.id
 
-            body += `Release workflow run: ${workflow.html_url}\n\n#### Force CI to Rerun for This Release\n\n`
-            body += `This PR will be updated and CI will run for every non-\`chore:\` commit that is pushed to \`main\`. `
-            body += `To force CI to rerun, run this command:\n\n`
+            body += `Release workflow run: ${workflow.html_url}\n\n#### Force CI to Update This Release\n\n`
+            body += `This PR will be updated and CI will run for every non-\`chore:\` commit that is pushed to \`latest\`. `
+            body += `To force CI to update this PR, run this command:\n\n`
             body += `\`\`\`\ngh workflow run release.yml -r ${REF_NAME}\n\`\`\``
 
             if (commentId) {
@@ -162,7 +162,7 @@ jobs:
           RELEASE_COMMENT_ID: ${{ needs.release.outputs.comment-id }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          node . exec --offline -- template-oss-release-manager
+          node . exec --offline -- template-oss-release-manager --lockfile=true
           node . run rp-pull-request --ignore-scripts -ws -iwr --if-present
       - name: Commit
         id: commit

.release-please-manifest.json

@@ -1,14 +1,14 @@
 {
-  ".": "9.1.1",
-  "workspaces/arborist": "6.1.2",
+  ".": "9.1.2",
+  "workspaces/arborist": "6.1.3",
   "workspaces/libnpmaccess": "7.0.0",
-  "workspaces/libnpmdiff": "5.0.3",
-  "workspaces/libnpmexec": "5.0.3",
-  "workspaces/libnpmfund": "4.0.3",
+  "workspaces/libnpmdiff": "5.0.4",
+  "workspaces/libnpmexec": "5.0.4",
+  "workspaces/libnpmfund": "4.0.4",
   "workspaces/libnpmhook": "9.0.0",
   "workspaces/libnpmorg": "5.0.0",
-  "workspaces/libnpmpack": "5.0.3",
-  "workspaces/libnpmpublish": "7.0.3",
+  "workspaces/libnpmpack": "5.0.4",
+  "workspaces/libnpmpublish": "7.0.4",
   "workspaces/libnpmsearch": "6.0.0",
   "workspaces/libnpmteam": "5.0.0",
   "workspaces/libnpmversion": "4.0.1",

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [9.1.2](https://github.com/npm/cli/compare/v9.1.1...v9.1.2) (2022-11-16)
+
+### Bug Fixes
+
+* [`d9654cf`](https://github.com/npm/cli/commit/d9654cffd7024ec2d068147868978fc994d696e4) [#5861](https://github.com/npm/cli/pull/5861) remove unwanted package.json entries (#5861) (@wraithgar)
+
+### Dependencies
+
+* [`a351685`](https://github.com/npm/cli/commit/a351685c4951b1d9e2ba86bc99e3706688813438) [#5858](https://github.com/npm/cli/pull/5858) move from @npmcli/ci-detect to ci-info (#5858)
+* [Workspace](https://github.com/npm/cli/compare/arborist-v6.1.2...arborist-v6.1.3): `@npmcli/arborist@6.1.3`
+* [Workspace](https://github.com/npm/cli/compare/libnpmdiff-v5.0.3...libnpmdiff-v5.0.4): `libnpmdiff@5.0.4`
+* [Workspace](https://github.com/npm/cli/compare/libnpmexec-v5.0.3...libnpmexec-v5.0.4): `libnpmexec@5.0.4`
+* [Workspace](https://github.com/npm/cli/compare/libnpmfund-v4.0.3...libnpmfund-v4.0.4): `libnpmfund@4.0.4`
+* [Workspace](https://github.com/npm/cli/compare/libnpmpack-v5.0.3...libnpmpack-v5.0.4): `libnpmpack@5.0.4`
+* [Workspace](https://github.com/npm/cli/compare/libnpmpublish-v7.0.3...libnpmpublish-v7.0.4): `libnpmpublish@7.0.4`
+
 ## [9.1.1](https://github.com/npm/cli/compare/v9.1.0...v9.1.1) (2022-11-09)
 
 ### Documentation

DEPENDENCIES.md

@@ -32,7 +32,6 @@ graph LR;
   libnpmexec-->minify-registry-metadata;
   libnpmexec-->npm-package-arg;
   libnpmexec-->npmcli-arborist["@npmcli/arborist"];
-  libnpmexec-->npmcli-ci-detect["@npmcli/ci-detect"];
   libnpmexec-->npmcli-eslint-config["@npmcli/eslint-config"];
   libnpmexec-->npmcli-run-script["@npmcli/run-script"];
   libnpmexec-->npmcli-template-oss["@npmcli/template-oss"];
@@ -113,7 +112,6 @@ graph LR;
   npm-->npm-registry-fetch;
   npm-->npm-user-validate;
   npm-->npmcli-arborist["@npmcli/arborist"];
-  npm-->npmcli-ci-detect["@npmcli/ci-detect"];
   npm-->npmcli-config["@npmcli/config"];
   npm-->npmcli-docs["@npmcli/docs"];
   npm-->npmcli-eslint-config["@npmcli/eslint-config"];
@@ -353,11 +351,11 @@ graph LR;
   libnpmdiff-->tar;
   libnpmexec-->bin-links;
   libnpmexec-->chalk;
+  libnpmexec-->ci-info;
   libnpmexec-->minify-registry-metadata;
   libnpmexec-->mkdirp;
   libnpmexec-->npm-package-arg;
   libnpmexec-->npmcli-arborist["@npmcli/arborist"];
-  libnpmexec-->npmcli-ci-detect["@npmcli/ci-detect"];
   libnpmexec-->npmcli-eslint-config["@npmcli/eslint-config"];
   libnpmexec-->npmcli-run-script["@npmcli/run-script"];
   libnpmexec-->npmcli-template-oss["@npmcli/template-oss"];
@@ -476,6 +474,7 @@ graph LR;
   npm-->archy;
   npm-->cacache;
   npm-->chalk;
+  npm-->ci-info;
   npm-->cli-columns;
   npm-->cli-table3;
   npm-->columnify;
@@ -519,7 +518,6 @@ graph LR;
   npm-->npm-registry-fetch;
   npm-->npm-user-validate;
   npm-->npmcli-arborist["@npmcli/arborist"];
-  npm-->npmcli-ci-detect["@npmcli/ci-detect"];
   npm-->npmcli-config["@npmcli/config"];
   npm-->npmcli-docs["@npmcli/docs"];
   npm-->npmcli-eslint-config["@npmcli/eslint-config"];
@@ -783,4 +781,4 @@ packages higher up the chain.
  - @npmcli/git, make-fetch-happen, @npmcli/config, init-package-json
  - @npmcli/installed-package-contents, @npmcli/map-workspaces, cacache, npm-pick-manifest, @npmcli/run-script, read-package-json, promzard
  - @npmcli/docs, @npmcli/fs, npm-bundled, read-package-json-fast, unique-filename, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, @npmcli/package-json, bin-links, nopt, npmlog, parse-conflict-json, read
- - @npmcli/eslint-config, @npmcli/template-oss, ignore-walk, semver, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, fs-minipass, ssri, unique-slug, @npmcli/promise-spawn, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, treeverse, minify-registry-metadata, ini, @npmcli/disparity-colors, @npmcli/ci-detect, mute-stream, npm-audit-report, npm-user-validate
+ - @npmcli/eslint-config, @npmcli/template-oss, ignore-walk, semver, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, fs-minipass, ssri, unique-slug, @npmcli/promise-spawn, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, treeverse, minify-registry-metadata, ini, @npmcli/disparity-colors, mute-stream, npm-audit-report, npm-user-validate

docs/package.json

@@ -22,7 +22,7 @@
   "devDependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.9.0",
+    "@npmcli/template-oss": "4.10.0",
     "front-matter": "^4.0.2",
     "ignore-walk": "^6.0.0",
     "jsdom": "^20.0.1",
@@ -56,7 +56,7 @@
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "ciVersions": "latest",
     "engines": "^14.17.0 || ^16.13.0 || >=18.0.0",
-    "version": "4.9.0",
+    "version": "4.10.0",
     "content": "../scripts/template-oss/index.js",
     "workspaceRepo": {
       "add": {

lib/utils/config/definitions.js

@@ -4,8 +4,7 @@ module.exports = definitions
 const Definition = require('./definition.js')
 
 const { version: npmVersion } = require('../../../package.json')
-const ciDetect = require('@npmcli/ci-detect')
-const ciName = ciDetect()
+const ciInfo = require('ci-info')
 const querystring = require('querystring')
 const { isWindows } = require('../is-windows.js')
 const { join } = require('path')
@@ -433,7 +432,7 @@ define('cert', {
 })
 
 define('ci-name', {
-  default: ciName || null,
+  default: ciInfo.name ? ciInfo.name.toLowerCase().split(' ').join('-') : null,
   defaultDescription: `
     The name of the current CI system, or \`null\` when not on a known CI
     platform.
@@ -442,7 +441,7 @@ define('ci-name', {
   description: `
     The name of a continuous integration system.  If not set explicitly, npm
     will detect the current CI environment using the
-    [\`@npmcli/ci-detect\`](http://npm.im/@npmcli/ci-detect) module.
+    [\`ci-info\`](http://npm.im/@npmcli/ci-info) module.
   `,
   flatten,
 })
@@ -1597,7 +1596,7 @@ define('production', {
 })
 
 define('progress', {
-  default: !ciName,
+  default: !ciInfo.isCI,
   defaultDescription: `
     \`true\` unless running in a known CI system
   `,

lib/utils/update-notifier.js

@@ -3,7 +3,7 @@
 // Check daily for betas, and weekly otherwise.
 
 const pacote = require('pacote')
-const ciDetect = require('@npmcli/ci-detect')
+const ciInfo = require('ci-info')
 const semver = require('semver')
 const chalk = require('chalk')
 const { promisify } = require('util')
@@ -39,7 +39,7 @@ const updateNotifier = async (npm, spec = 'latest') => {
   // never check for updates in CI, when updating npm already, or opted out
   if (!npm.config.get('update-notifier') ||
       isGlobalNpmUpdate(npm) ||
-      ciDetect()) {
+      ciInfo.isCI) {
     return SKIP
   }
 

mock-registry/package.json

@@ -34,7 +34,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.9.0"
+    "version": "4.10.0"
   },
   "tap": {
     "no-coverage": true,
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@npmcli/arborist": "^6.1.1",
     "@npmcli/eslint-config": "^4.0.1",
-    "@npmcli/template-oss": "4.9.0",
+    "@npmcli/template-oss": "4.10.0",
     "nock": "^13.2.9",
     "npm-package-arg": "^10.0.0",
     "pacote": "^15.0.6",

node_modules/.gitignore

@@ -15,7 +15,6 @@
 !/@npmcli/
 /@npmcli/*
 !/@npmcli/arborist
-!/@npmcli/ci-detect
 !/@npmcli/config
 !/@npmcli/disparity-colors
 !/@npmcli/fs
@@ -55,6 +54,7 @@
 !/cacache
 !/chalk
 !/chownr
+!/ci-info
 !/cidr-regex
 !/clean-stack
 !/cli-columns

node_modules/ci-info/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016-2021 Thomas Watson Steen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.