From 61782fa858c278455ce144f975c6b0e3ea2d9944 Mon Sep 17 00:00:00 2001 From: Gar Date: Wed, 11 Aug 2021 10:35:10 -0700 Subject: [PATCH] @npmcli/map-workspaces@1.0.4 * fix: better error message for duplicate workspace names --- node_modules/@npmcli/map-workspaces/index.js | 7 ++++++- node_modules/@npmcli/map-workspaces/package.json | 2 +- package-lock.json | 13 +++++++------ package.json | 1 + 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/node_modules/@npmcli/map-workspaces/index.js b/node_modules/@npmcli/map-workspaces/index.js index b06662154a83a..7587db717f362 100644 --- a/node_modules/@npmcli/map-workspaces/index.js +++ b/node_modules/@npmcli/map-workspaces/index.js @@ -129,7 +129,12 @@ async function mapWorkspaces (opts = {}) { if (seen.has(name) && seen.get(name) !== packagePathname) { throw getError({ Type: Error, - message: 'must not have multiple workspaces with the same name', + message: [ + 'must not have multiple workspaces with the same name', + `package '${name}' has conflicts in the following paths:`, + ' ' + seen.get(name), + ' ' + packagePathname + ].join('\n'), code: 'EDUPLICATEWORKSPACE' }) } diff --git a/node_modules/@npmcli/map-workspaces/package.json b/node_modules/@npmcli/map-workspaces/package.json index 2445c12f9c308..17cc4197e9e2b 100644 --- a/node_modules/@npmcli/map-workspaces/package.json +++ b/node_modules/@npmcli/map-workspaces/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/map-workspaces", - "version": "1.0.3", + "version": "1.0.4", "files": [ "index.js" ], diff --git a/package-lock.json b/package-lock.json index 9288f9a98bfe7..4d27861d14a52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -85,6 +85,7 @@ "@npmcli/arborist": "^2.8.0", "@npmcli/ci-detect": "^1.2.0", "@npmcli/config": "^2.2.0", + "@npmcli/map-workspaces": "^1.0.4", "@npmcli/package-json": "^1.0.1", "@npmcli/run-script": "^1.8.5", "abbrev": "~1.1.1", @@ -865,9 +866,9 @@ } }, "node_modules/@npmcli/map-workspaces": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-1.0.3.tgz", - "integrity": "sha512-SdlRlOoQw4WKD4vtb/n5gUkobEABYBEOo8fRE4L8CtBkyWDSvIrReTfKvQ/Jc/LQqDaaZ5iv1iMSQzKCUr1n1A==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz", + "integrity": "sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==", "inBundle": true, "dependencies": { "@npmcli/name-from-folder": "^1.0.1", @@ -11083,9 +11084,9 @@ } }, "@npmcli/map-workspaces": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-1.0.3.tgz", - "integrity": "sha512-SdlRlOoQw4WKD4vtb/n5gUkobEABYBEOo8fRE4L8CtBkyWDSvIrReTfKvQ/Jc/LQqDaaZ5iv1iMSQzKCUr1n1A==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz", + "integrity": "sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==", "requires": { "@npmcli/name-from-folder": "^1.0.1", "glob": "^7.1.6", diff --git a/package.json b/package.json index 8ae29c538427f..bda2982e8444f 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "@npmcli/arborist": "^2.8.0", "@npmcli/ci-detect": "^1.2.0", "@npmcli/config": "^2.2.0", + "@npmcli/map-workspaces": "^1.0.4", "@npmcli/package-json": "^1.0.1", "@npmcli/run-script": "^1.8.5", "abbrev": "~1.1.1",