diff --git a/node_modules/.gitignore b/node_modules/.gitignore
index 74070a54532d0..b1752b46d3b5e 100644
--- a/node_modules/.gitignore
+++ b/node_modules/.gitignore
@@ -157,6 +157,7 @@
 /node-gyp/node_modules/@npmcli/*
 !/node-gyp/node_modules/@npmcli/fs
 !/node-gyp/node_modules/@npmcli/move-file
+!/node-gyp/node_modules/abbrev
 !/node-gyp/node_modules/are-we-there-yet
 !/node-gyp/node_modules/brace-expansion
 !/node-gyp/node_modules/cacache
@@ -177,9 +178,6 @@
 !/node-gyp/node_modules/unique-slug
 !/node-gyp/node_modules/which
 !/nopt
-!/nopt/node_modules/
-/nopt/node_modules/*
-!/nopt/node_modules/abbrev
 !/normalize-package-data
 !/npm-audit-report
 !/npm-bundled
diff --git a/node_modules/nopt/node_modules/abbrev/lib/index.js b/node_modules/abbrev/lib/index.js
similarity index 100%
rename from node_modules/nopt/node_modules/abbrev/lib/index.js
rename to node_modules/abbrev/lib/index.js
diff --git a/node_modules/abbrev/package.json b/node_modules/abbrev/package.json
index bf4e8015bba9d..e26400445631a 100644
--- a/node_modules/abbrev/package.json
+++ b/node_modules/abbrev/package.json
@@ -1,21 +1,43 @@
 {
   "name": "abbrev",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "description": "Like ruby's abbrev module, but in js",
-  "author": "Isaac Z. Schlueter <i@izs.me>",
-  "main": "abbrev.js",
+  "author": "GitHub Inc.",
+  "main": "lib/index.js",
   "scripts": {
-    "test": "tap test.js --100",
-    "preversion": "npm test",
-    "postversion": "npm publish",
-    "postpublish": "git push origin --all; git push origin --tags"
+    "test": "tap",
+    "lint": "eslint \"**/*.js\"",
+    "postlint": "template-oss-check",
+    "template-oss-apply": "template-oss-apply --force",
+    "lintfix": "npm run lint -- --fix",
+    "snap": "tap",
+    "posttest": "npm run lint"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/npm/abbrev-js.git"
   },
-  "repository": "http://github.com/isaacs/abbrev-js",
   "license": "ISC",
   "devDependencies": {
-    "tap": "^10.1"
+    "@npmcli/eslint-config": "^4.0.0",
+    "@npmcli/template-oss": "4.8.0",
+    "tap": "^16.3.0"
+  },
+  "tap": {
+    "nyc-arg": [
+      "--exclude",
+      "tap-snapshots/**"
+    ]
   },
   "files": [
-    "abbrev.js"
-  ]
+    "bin/",
+    "lib/"
+  ],
+  "engines": {
+    "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+  },
+  "templateOSS": {
+    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
+    "version": "4.8.0"
+  }
 }
diff --git a/node_modules/nopt/node_modules/abbrev/LICENSE b/node_modules/node-gyp/node_modules/abbrev/LICENSE
similarity index 100%
rename from node_modules/nopt/node_modules/abbrev/LICENSE
rename to node_modules/node-gyp/node_modules/abbrev/LICENSE
diff --git a/node_modules/abbrev/abbrev.js b/node_modules/node-gyp/node_modules/abbrev/abbrev.js
similarity index 100%
rename from node_modules/abbrev/abbrev.js
rename to node_modules/node-gyp/node_modules/abbrev/abbrev.js
diff --git a/node_modules/node-gyp/node_modules/abbrev/package.json b/node_modules/node-gyp/node_modules/abbrev/package.json
new file mode 100644
index 0000000000000..bf4e8015bba9d
--- /dev/null
+++ b/node_modules/node-gyp/node_modules/abbrev/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "abbrev",
+  "version": "1.1.1",
+  "description": "Like ruby's abbrev module, but in js",
+  "author": "Isaac Z. Schlueter <i@izs.me>",
+  "main": "abbrev.js",
+  "scripts": {
+    "test": "tap test.js --100",
+    "preversion": "npm test",
+    "postversion": "npm publish",
+    "postpublish": "git push origin --all; git push origin --tags"
+  },
+  "repository": "http://github.com/isaacs/abbrev-js",
+  "license": "ISC",
+  "devDependencies": {
+    "tap": "^10.1"
+  },
+  "files": [
+    "abbrev.js"
+  ]
+}
diff --git a/node_modules/nopt/node_modules/abbrev/package.json b/node_modules/nopt/node_modules/abbrev/package.json
deleted file mode 100644
index e26400445631a..0000000000000
--- a/node_modules/nopt/node_modules/abbrev/package.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "name": "abbrev",
-  "version": "2.0.0",
-  "description": "Like ruby's abbrev module, but in js",
-  "author": "GitHub Inc.",
-  "main": "lib/index.js",
-  "scripts": {
-    "test": "tap",
-    "lint": "eslint \"**/*.js\"",
-    "postlint": "template-oss-check",
-    "template-oss-apply": "template-oss-apply --force",
-    "lintfix": "npm run lint -- --fix",
-    "snap": "tap",
-    "posttest": "npm run lint"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/npm/abbrev-js.git"
-  },
-  "license": "ISC",
-  "devDependencies": {
-    "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.8.0",
-    "tap": "^16.3.0"
-  },
-  "tap": {
-    "nyc-arg": [
-      "--exclude",
-      "tap-snapshots/**"
-    ]
-  },
-  "files": [
-    "bin/",
-    "lib/"
-  ],
-  "engines": {
-    "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-  },
-  "templateOSS": {
-    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.8.0"
-  }
-}
diff --git a/package-lock.json b/package-lock.json
index 7085397e01c5a..71097c2adf8fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -92,7 +92,7 @@
         "@npmcli/map-workspaces": "^3.0.0",
         "@npmcli/package-json": "^3.0.0",
         "@npmcli/run-script": "^6.0.0",
-        "abbrev": "~1.1.1",
+        "abbrev": "^2.0.0",
         "archy": "~1.0.0",
         "cacache": "^17.0.1",
         "chalk": "^4.1.2",
@@ -2564,9 +2564,13 @@
       "dev": true
     },
     "node_modules/abbrev": {
-      "version": "1.1.1",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
       "inBundle": true,
-      "license": "ISC"
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
     },
     "node_modules/abort-controller": {
       "version": "3.0.0",
@@ -7088,6 +7092,12 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "node_modules/licensee/node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
     "node_modules/licensee/node_modules/are-we-there-yet": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
@@ -8272,6 +8282,12 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "node_modules/node-gyp/node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "inBundle": true
+    },
     "node_modules/node-gyp/node_modules/are-we-there-yet": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
@@ -8580,15 +8596,6 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/nopt/node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
-      "inBundle": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/normalize-package-data": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",
diff --git a/package.json b/package.json
index ec378fdecf4be..dbf6a0cb89d74 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@npmcli/map-workspaces": "^3.0.0",
     "@npmcli/package-json": "^3.0.0",
     "@npmcli/run-script": "^6.0.0",
-    "abbrev": "~1.1.1",
+    "abbrev": "^2.0.0",
     "archy": "~1.0.0",
     "cacache": "^17.0.1",
     "chalk": "^4.1.2",