From 2d7fc3d320b92a8447e7282df14e2b99047cc426 Mon Sep 17 00:00:00 2001 From: reggi Date: Wed, 2 Oct 2024 13:26:42 -0400 Subject: [PATCH] deps: update @npmcli/name-from-folder@3.0.0 --- node_modules/.gitignore | 5 --- .../@npmcli/name-from-folder/LICENSE | 15 ------- .../@npmcli/name-from-folder/lib/index.js | 7 --- .../@npmcli/name-from-folder/package.json | 45 ------------------- .../@npmcli/name-from-folder/package.json | 20 +++++---- package-lock.json | 31 ++++++------- workspaces/arborist/package.json | 2 +- 7 files changed, 28 insertions(+), 97 deletions(-) delete mode 100644 node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE delete mode 100644 node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js delete mode 100644 node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json diff --git a/node_modules/.gitignore b/node_modules/.gitignore index 7ce7e967ccd1a..d0b541feb8ecd 100644 --- a/node_modules/.gitignore +++ b/node_modules/.gitignore @@ -24,11 +24,6 @@ /@npmcli/installed-package-contents/node_modules/* !/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin !/@npmcli/map-workspaces -!/@npmcli/map-workspaces/node_modules/ -/@npmcli/map-workspaces/node_modules/* -!/@npmcli/map-workspaces/node_modules/@npmcli/ -/@npmcli/map-workspaces/node_modules/@npmcli/* -!/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder !/@npmcli/metavuln-calculator !/@npmcli/name-from-folder !/@npmcli/node-gyp diff --git a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE deleted file mode 100644 index d24a9fca761c8..0000000000000 --- a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE +++ /dev/null @@ -1,15 +0,0 @@ -The ISC License - -Copyright npm, Inc. - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND NPM DISCLAIMS ALL WARRANTIES WITH REGARD -TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS. IN NO EVENT SHALL NPM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. diff --git a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js deleted file mode 100644 index afb1dbb76297f..0000000000000 --- a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js +++ /dev/null @@ -1,7 +0,0 @@ -const { basename, dirname } = require('path') - -const getName = (parent, base) => - parent.charAt(0) === '@' ? `${parent}/${base}` : base - -module.exports = dir => dir ? getName(basename(dirname(dir)), basename(dir)) - : false diff --git a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json deleted file mode 100644 index 323edd81d22fb..0000000000000 --- a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "@npmcli/name-from-folder", - "version": "3.0.0", - "files": [ - "bin/", - "lib/" - ], - "main": "lib/index.js", - "description": "Get the package name from a folder path", - "repository": { - "type": "git", - "url": "git+https://github.com/npm/name-from-folder.git" - }, - "author": "GitHub Inc.", - "license": "ISC", - "scripts": { - "test": "tap", - "snap": "tap", - "lint": "npm run eslint", - "postlint": "template-oss-check", - "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run eslint -- --fix", - "posttest": "npm run lint", - "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"" - }, - "devDependencies": { - "@npmcli/eslint-config": "^5.0.0", - "@npmcli/template-oss": "4.23.3", - "tap": "^16.3.2" - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" - }, - "templateOSS": { - "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.23.3", - "publish": true - }, - "tap": { - "nyc-arg": [ - "--exclude", - "tap-snapshots/**" - ] - } -} diff --git a/node_modules/@npmcli/name-from-folder/package.json b/node_modules/@npmcli/name-from-folder/package.json index f0aa5b16dba1a..323edd81d22fb 100644 --- a/node_modules/@npmcli/name-from-folder/package.json +++ b/node_modules/@npmcli/name-from-folder/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/name-from-folder", - "version": "2.0.0", + "version": "3.0.0", "files": [ "bin/", "lib/" @@ -9,30 +9,32 @@ "description": "Get the package name from a folder path", "repository": { "type": "git", - "url": "https://github.com/npm/name-from-folder.git" + "url": "git+https://github.com/npm/name-from-folder.git" }, "author": "GitHub Inc.", "license": "ISC", "scripts": { "test": "tap", "snap": "tap", - "lint": "eslint \"**/*.js\"", + "lint": "npm run eslint", "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run lint -- --fix", - "posttest": "npm run lint" + "lintfix": "npm run eslint -- --fix", + "posttest": "npm run lint", + "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"" }, "devDependencies": { - "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "4.11.0", + "@npmcli/eslint-config": "^5.0.0", + "@npmcli/template-oss": "4.23.3", "tap": "^16.3.2" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.0" + "version": "4.23.3", + "publish": true }, "tap": { "nyc-arg": [ diff --git a/package-lock.json b/package-lock.json index fb7ba5e6242ff..f5c2f9f52fbe6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1648,16 +1648,6 @@ "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-3.0.0.tgz", - "integrity": "sha512-61cDL8LUc9y80fXn+lir+iVt8IS0xHqEKwPu/5jCjxQTVoSCmkXvw4vbMrzAMtmghz3/AkiBjhHkDKUH+kf7kA==", - "inBundle": true, - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" - } - }, "node_modules/@npmcli/metavuln-calculator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-8.0.0.tgz", @@ -1683,12 +1673,13 @@ "link": true }, "node_modules/@npmcli/name-from-folder": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz", - "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-3.0.0.tgz", + "integrity": "sha512-61cDL8LUc9y80fXn+lir+iVt8IS0xHqEKwPu/5jCjxQTVoSCmkXvw4vbMrzAMtmghz3/AkiBjhHkDKUH+kf7kA==", + "inBundle": true, "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/node-gyp": { @@ -1872,6 +1863,16 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@npmcli/template-oss/node_modules/@npmcli/name-from-folder": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz", + "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/@npmcli/template-oss/node_modules/@npmcli/package-json": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz", @@ -16678,7 +16679,7 @@ "@npmcli/installed-package-contents": "^3.0.0", "@npmcli/map-workspaces": "^4.0.1", "@npmcli/metavuln-calculator": "^8.0.0", - "@npmcli/name-from-folder": "^2.0.0", + "@npmcli/name-from-folder": "^3.0.0", "@npmcli/node-gyp": "^3.0.0", "@npmcli/package-json": "^6.0.1", "@npmcli/query": "^3.1.0", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index e16f3b7bf02f9..6aa4e4f67b4d1 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -8,7 +8,7 @@ "@npmcli/installed-package-contents": "^3.0.0", "@npmcli/map-workspaces": "^4.0.1", "@npmcli/metavuln-calculator": "^8.0.0", - "@npmcli/name-from-folder": "^2.0.0", + "@npmcli/name-from-folder": "^3.0.0", "@npmcli/node-gyp": "^3.0.0", "@npmcli/package-json": "^6.0.1", "@npmcli/query": "^3.1.0",