.gitattributes

@@ -7,7 +7,7 @@
 /configure text eol=lf
 
 # our cmd scripts always need to be CRLF
-/bin/*.cmd text eol=crlf
+/bin/**/*.cmd text eol=crlf
 
 # ignore all line endings in node_modules since we dont control that
 /node_modules/** -text

.github/workflows/benchmark.yml

@@ -6,6 +6,7 @@ on:
       - '*'
     paths:
       - lib/**
+      - workspaces/**/lib/**
   issue_comment:
     types:
       - created
@@ -17,63 +18,70 @@ jobs:
     steps:
       - name: Incoming Pull Request
         if: |
-          github.event_name == 'pull_request' || (
+          (
+            github.event_name == 'pull_request' &&
+            github.event.pull_request.head.repo.full_name == 'npm/cli' 
+          ) || (
             github.event_name == 'issue_comment' &&
             github.event.issue.pull_request &&
             github.event.issue.state == 'open' &&
             startsWith(github.event.comment.body, '@npm-cli-bot benchmark this')
           )
-        env:
-          # gh cli uses these env vars for owner/repo/token
-          GH_REPO: "npm/benchmarks"
-          GITHUB_TOKEN: ${{ secrets.BENCHMARK_DISPATCH_TOKEN }}
-        run: |
-          EVENT_NAME="${{ github.event_name }}"
-          OWNER="${{ github.event.repository.owner.login }}"
-          REPO="${{ github.event.repository.name }}"
-          PR=""
-
-          if [[ "$EVENT_NAME" == "pull_request" ]]; then
-            if [[ "$GITHUB_TOKEN" == "" ]]; then
-              echo "No auth - from fork pull request, exiting"
-              exit 0
-            fi
-            PR="${{ github.event.pull_request.number }}"
-          else
-            PR="${{ github.event.issue.number }}"
-            SENDER="${{ github.event.comment.user.login }}"
-            ROLE=$(gh api repos/${OWNER}/${REPO}/collaborators/${SENDER}/permission -q '.permission')
-
-            if [[ "$ROLE" != "admin" ]]; then
-              echo "${SENDER} is ${ROLE}, not an admin, exiting"
-              exit 0
-            fi
-
-            # add emoji to comment if user is an admin to signal
-            # benchmark is running
-            COMMENT_NODE_ID="${{ github.event.comment.node_id }}"
-            QUERY='mutation ($inputData:AddReactionInput!) {
-              addReaction (input:$inputData) {
-                reaction { content }
-              }
-            }'
-            echo '{
-              "query": "'${QUERY}'",
-              "variables": {
-                "inputData": {
-                  "subjectId": "'"${COMMENT_NODE_ID}"'",
-                  "content": "ROCKET"
-                }
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.BENCHMARK_DISPATCH_TOKEN }}
+          script: |
+            const {
+              payload,
+              eventName,
+              repo: { owner, repo },
+              issue: { number },
+            } = context
+          
+            if (eventName === 'issue_comment') {
+              const res = await github.rest.repos.getCollaboratorPermissionLevel({
+                owner,
+                repo,
+                username: payload.comment.user.login,
+              })
+              if (res.data.permission !== 'admin') {
+                core.info(`Commenter is not an admin, exiting`)
+                return
               }
-            }' | gh api graphql --input -
-          fi
-
-          EVENT="${EVENT_NAME} ${OWNER}/${REPO}#${PR}"
-          echo '{
-            "event_type": "'"$EVENT"'",
-            "client_payload": {
-              "pr_id": "'"$PR"'",
-              "repo": "'"$REPO"'",
-              "owner": "'"$OWNER"'"
+          
+              // add emoji to comment if user is an admin to signal benchmark is running
+              await github.rest.reactions.createForIssueComment({
+                owner,
+                repo,
+                comment_id: payload.comment.node_id,
+                content: 'rocket',
+              })
             }
-          }' | gh api repos/{owner}/{repo}/dispatches --input -
+          
+            const pullRequest = payload.pull_request || await github.rest.pulls.get({
+              owner,
+              repo,
+              pull_number: number,
+            }).then(r => r.data)
+
+            core.info(`Pull request: ${pullRequest.number}`)
+            core.info(`Base ref: ${pullRequest.base.ref}`)
+          
+            const matchesRelease = pullRequest.base.ref.match(/^release\/v(\d+)$/)
+            const targetSpec = matchesRelease ? matchesRelease[1] : 'latest'
+            core.info(`Target spec: ${targetSpec}`)
+
+            const eventType = `"${eventName} ${owner}/${repo}#${pullRequest.number}"`
+            core.info(`Event type: ${eventType}`)
+          
+            await github.rest.repos.createDispatchEvent({
+              owner: 'npm',
+              repo: 'benchmarks',
+              event_type: eventType,
+              client_payload: {
+                owner,
+                repo,
+                pr_id: number,
+                target_spec: targetSpec,
+              },
+            })

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  ".": "9.9.0",
+  ".": "9.9.1",
   "workspaces/arborist": "6.5.0",
   "workspaces/libnpmaccess": "7.0.2",
   "workspaces/libnpmdiff": "5.0.20",

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [9.9.1](https://github.com/npm/cli/compare/v9.9.0...v9.9.1) (2023-10-30)
+
+### Bug Fixes
+
+* [`0dba79a`](https://github.com/npm/cli/commit/0dba79a848254ca5e7f02a2ea76f1d4d84dc95d8) [#6942](https://github.com/npm/cli/pull/6942) add back bin/node-gyp-bin/node-gyp files (@lukekarrys)
+* [`c93edb5`](https://github.com/npm/cli/commit/c93edb55f52532e666a9ba2719bee0da725fe6f0) [#6932](https://github.com/npm/cli/pull/6932) add back `bin/node-gyp-bin/node-gyp` files (@lukekarrys)
+
+### Documentation
+
+* [`e6cce28`](https://github.com/npm/cli/commit/e6cce28ddd300923f616be4a6fa3946d5e96480c) [#6925](https://github.com/npm/cli/pull/6925) use markdown links instead of html (@lukekarrys)
+
 ## [9.9.0](https://github.com/npm/cli/compare/v9.8.1...v9.9.0) (2023-10-06)
 
 ### Features

DEPENDENCIES.md

@@ -720,11 +720,11 @@ graph LR;
   npmcli-run-script-->npmcli-promise-spawn["@npmcli/promise-spawn"];
   npmcli-run-script-->read-package-json-fast;
   npmcli-run-script-->which;
-  npmcli-smoke-tests-->http-proxy;
   npmcli-smoke-tests-->npmcli-eslint-config["@npmcli/eslint-config"];
   npmcli-smoke-tests-->npmcli-mock-registry["@npmcli/mock-registry"];
   npmcli-smoke-tests-->npmcli-promise-spawn["@npmcli/promise-spawn"];
   npmcli-smoke-tests-->npmcli-template-oss["@npmcli/template-oss"];
+  npmcli-smoke-tests-->proxy;
   npmcli-smoke-tests-->tap;
   npmcli-smoke-tests-->which;
   npmlog-->are-we-there-yet;

bin/node-gyp-bin/node-gyp

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+if [ "x$npm_config_node_gyp" = "x" ]; then
+  node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@"
+else
+  "$npm_config_node_gyp" "$@"
+fi

bin/node-gyp-bin/node-gyp.cmd

@@ -0,0 +1,5 @@
+if not defined npm_config_node_gyp (
+  node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
+) else (
+  node "%npm_config_node_gyp%" %*
+)

docs/lib/content/commands/npm-audit.md

@@ -81,13 +81,13 @@ The `sig` is generated using the following template: `${package.name}@${package.
 
 Keys response:
 
-- `expires`: null or a simplified extended <a href="https://en.wikipedia.org/wiki/ISO_8601" target="_blank">ISO 8601 format</a>: `YYYY-MM-DDTHH:mm:ss.sssZ`
+- `expires`: null or a simplified extended [ISO 8601 format](https://en.wikipedia.org/wiki/ISO_8601"): `YYYY-MM-DDTHH:mm:ss.sssZ`
 - `keydid`: sha256 fingerprint of the public key
 - `keytype`: only `ecdsa-sha2-nistp256` is currently supported by the npm CLI
 - `scheme`: only `ecdsa-sha2-nistp256` is currently supported by the npm CLI
 - `key`: base64 encoded public key
 
-See this <a href="https://registry.npmjs.org/-/npm/v1/keys" target="_blank">example key's response from the public npm registry</a>.
+See this [example key's response from the public npm registry](https://registry.npmjs.org/-/npm/v1/keys").
 
 ### Audit Endpoints
 

docs/lib/content/commands/npm-team.md

@@ -25,7 +25,7 @@ on your `authtype`.
 
 * create / destroy:
   Create a new team, or destroy an existing one. Note: You cannot remove the
-  `developers` team, <a href="https://docs.npmjs.com/about-developers-team" target="_blank">learn more.</a>
+  `developers` team, [learn more.](https://docs.npmjs.com/about-developers-team)
 
   Here's how to create a new team `newteam` under the `org` org:
 

docs/lib/content/commands/npm-unpublish.md

@@ -8,9 +8,8 @@ description: Remove a package from the registry
 
 <!-- AUTOGENERATED USAGE DESCRIPTIONS -->
 
-To learn more about how the npm registry treats unpublish, see our <a
-href="https://docs.npmjs.com/policies/unpublish" target="_blank"
-rel="noopener noreferrer"> unpublish policies</a>
+To learn more about how the npm registry treats unpublish, see our
+[unpublish policies](https://docs.npmjs.com/policies/unpublish).
 
 ### Warning
 

node_modules/is-core-module/core.json

@@ -115,7 +115,7 @@
 	"sys": [">= 0.4 && < 0.7", ">= 0.8"],
 	"node:sys": [">= 14.18 && < 15", ">= 16"],
 	"test/reporters": ">= 19.9 && < 20.2",
-	"node:test/reporters": [">= 19.9", ">= 20"],
+	"node:test/reporters": [">= 18.17 && < 19", ">= 19.9", ">= 20"],
 	"node:test": [">= 16.17 && < 17", ">= 18"],
 	"timers": true,
 	"node:timers": [">= 14.18 && < 15", ">= 16"],
@@ -149,8 +149,8 @@
 	"node:v8": [">= 14.18 && < 15", ">= 16"],
 	"vm": true,
 	"node:vm": [">= 14.18 && < 15", ">= 16"],
-	"wasi": [">= 13.4 && < 13.5", ">= 20"],
-	"node:wasi": ">= 20",
+	"wasi": [">= 13.4 && < 13.5", ">= 18.17 && < 19", ">= 20"],
+	"node:wasi": [">= 18.17 && < 19", ">= 20"],
 	"worker_threads": ">= 11.7",
 	"node:worker_threads": [">= 14.18 && < 15", ">= 16"],
 	"zlib": ">= 0.5",

node_modules/is-core-module/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "is-core-module",
-	"version": "2.12.1",
+	"version": "2.13.0",
 	"description": "Is this specifier a node.js core module?",
 	"main": "index.js",
 	"sideEffects": false,
@@ -45,17 +45,17 @@
 		"has": "^1.0.3"
 	},
 	"devDependencies": {
-		"@ljharb/eslint-config": "^21.0.1",
-		"aud": "^2.0.2",
+		"@ljharb/eslint-config": "^21.1.0",
+		"aud": "^2.0.3",
 		"auto-changelog": "^2.4.0",
 		"eslint": "=8.8.0",
 		"in-publish": "^2.0.1",
 		"mock-property": "^1.0.0",
 		"npmignore": "^0.3.0",
 		"nyc": "^10.3.2",
 		"safe-publish-latest": "^2.0.0",
-		"semver": "^6.3.0",
-		"tape": "^5.6.3"
+		"semver": "^6.3.1",
+		"tape": "^5.6.6"
 	},
 	"auto-changelog": {
 		"output": "CHANGELOG.md",