diff --git a/node_modules/.gitignore b/node_modules/.gitignore index 324d4d592a04..1a8e77b91f58 100644 --- a/node_modules/.gitignore +++ b/node_modules/.gitignore @@ -21,11 +21,6 @@ !/@npmcli/git !/@npmcli/installed-package-contents !/@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 d24a9fca761c..000000000000 --- 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/package.json b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json deleted file mode 100644 index f0aa5b16dba1..000000000000 --- a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "@npmcli/name-from-folder", - "version": "2.0.0", - "files": [ - "bin/", - "lib/" - ], - "main": "lib/index.js", - "description": "Get the package name from a folder path", - "repository": { - "type": "git", - "url": "https://github.com/npm/name-from-folder.git" - }, - "author": "GitHub Inc.", - "license": "ISC", - "scripts": { - "test": "tap", - "snap": "tap", - "lint": "eslint \"**/*.js\"", - "postlint": "template-oss-check", - "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run lint -- --fix", - "posttest": "npm run lint" - }, - "devDependencies": { - "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "4.11.0", - "tap": "^16.3.2" - }, - "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.11.0" - }, - "tap": { - "nyc-arg": [ - "--exclude", - "tap-snapshots/**" - ] - } -} diff --git a/node_modules/@npmcli/name-from-folder/index.js b/node_modules/@npmcli/name-from-folder/index.js deleted file mode 100644 index afb1dbb76297..000000000000 --- a/node_modules/@npmcli/name-from-folder/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/lib/index.js b/node_modules/@npmcli/name-from-folder/lib/index.js similarity index 100% rename from node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js rename to node_modules/@npmcli/name-from-folder/lib/index.js diff --git a/node_modules/@npmcli/name-from-folder/package.json b/node_modules/@npmcli/name-from-folder/package.json index 9569b4e66e90..f0aa5b16dba1 100644 --- a/node_modules/@npmcli/name-from-folder/package.json +++ b/node_modules/@npmcli/name-from-folder/package.json @@ -1,27 +1,43 @@ { "name": "@npmcli/name-from-folder", - "version": "1.0.1", + "version": "2.0.0", "files": [ - "index.js" + "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" + "url": "https://github.com/npm/name-from-folder.git" }, - "author": "Isaac Z. Schlueter (https://izs.me)", + "author": "GitHub Inc.", "license": "ISC", "scripts": { "test": "tap", "snap": "tap", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags" - }, - "tap": { - "check-coverage": true + "lint": "eslint \"**/*.js\"", + "postlint": "template-oss-check", + "template-oss-apply": "template-oss-apply --force", + "lintfix": "npm run lint -- --fix", + "posttest": "npm run lint" }, "devDependencies": { - "tap": "^14.10.7" + "@npmcli/eslint-config": "^4.0.1", + "@npmcli/template-oss": "4.11.0", + "tap": "^16.3.2" + }, + "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.11.0" + }, + "tap": { + "nyc-arg": [ + "--exclude", + "tap-snapshots/**" + ] } } diff --git a/package-lock.json b/package-lock.json index 159c9effb5d3..658f5ce48685 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2177,15 +2177,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@npmcli/map-workspaces/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==", - "inBundle": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/@npmcli/metavuln-calculator": { "version": "5.0.0", "license": "ISC", @@ -2204,8 +2195,13 @@ "link": true }, "node_modules/@npmcli/name-from-folder": { - "version": "1.0.1", - "license": "ISC" + "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==", + "inBundle": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } }, "node_modules/@npmcli/node-gyp": { "version": "3.0.0", @@ -14387,7 +14383,7 @@ "@npmcli/installed-package-contents": "^2.0.0", "@npmcli/map-workspaces": "^3.0.1", "@npmcli/metavuln-calculator": "^5.0.0", - "@npmcli/name-from-folder": "^1.0.1", + "@npmcli/name-from-folder": "^2.0.0", "@npmcli/node-gyp": "^3.0.0", "@npmcli/package-json": "^3.0.0", "@npmcli/query": "^3.0.0", diff --git a/package.json b/package.json index 7f296b0176f8..f6d4193ba674 100644 --- a/package.json +++ b/package.json @@ -250,7 +250,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "./scripts/template-oss/root.js" }, "license": "Artistic-2.0", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 78425f2af523..a10277a1d19f 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -8,7 +8,7 @@ "@npmcli/installed-package-contents": "^2.0.0", "@npmcli/map-workspaces": "^3.0.1", "@npmcli/metavuln-calculator": "^5.0.0", - "@npmcli/name-from-folder": "^1.0.1", + "@npmcli/name-from-folder": "^2.0.0", "@npmcli/node-gyp": "^3.0.0", "@npmcli/package-json": "^3.0.0", "@npmcli/query": "^3.0.0",