workspace-tools 0.32.0 → 0.33.0

package/lib/workspaces/getWorkspaces.js

@@ -2,41 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWorkspacesAsync = exports.getWorkspaces = void 0;
 const implementations_1 = require("./implementations");
-const preferred = process.env.PREFERRED_WORKSPACE_MANAGER;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a workspace.
+ * The list of included packages is based on the workspace manager's config file.
+ *
+ * The method name is somewhat misleading due to the double meaning of "workspace", but it's retained
+ * for compatibility. "Workspace" here refers to an individual package, in the sense of the `workspaces`
+ * package.json config used by npm/yarn (instead of referring to the entire monorepo).
+ */
 function getWorkspaces(cwd) {
-    const workspaceImplementation = preferred || (0, implementations_1.getWorkspaceImplementation)(cwd);
-    if (!workspaceImplementation) {
-        return [];
-    }
-    switch (workspaceImplementation) {
-        case "yarn":
-            return require(`./implementations/yarn`).getYarnWorkspaces(cwd);
-        case "pnpm":
-            return require(`./implementations/pnpm`).getPnpmWorkspaces(cwd);
-        case "rush":
-            return require(`./implementations/rush`).getRushWorkspaces(cwd);
-        case "npm":
-            return require(`./implementations/npm`).getNpmWorkspaces(cwd);
-        case "lerna":
-            return require(`./implementations/lerna`).getLernaWorkspaces(cwd);
-    }
+    const utils = (0, implementations_1.getWorkspaceUtilities)(cwd);
+    return (utils === null || utils === void 0 ? void 0 : utils.getWorkspaces(cwd)) || [];
 }
 exports.getWorkspaces = getWorkspaces;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a workspace.
+ * The list of included packages is based on the workspace manager's config file.
+ *
+ * The method name is somewhat misleading due to the double meaning of "workspace", but it's retained
+ * for compatibility. "Workspace" here refers to an individual package, in the sense of the `workspaces`
+ * package.json config used by npm/yarn (instead of referring to the entire monorepo).
+ */
 async function getWorkspacesAsync(cwd) {
-    const workspaceImplementation = preferred || (0, implementations_1.getWorkspaceImplementation)(cwd);
-    if (!workspaceImplementation) {
+    var _a;
+    const utils = (0, implementations_1.getWorkspaceUtilities)(cwd);
+    if (!utils) {
         return [];
     }
-    switch (workspaceImplementation) {
-        case "yarn":
-            return await require(`./implementations/yarn`).getYarnWorkspacesAsync(cwd);
-        case "npm":
-            return require(`./implementations/npm`).getNpmWorkspacesAsync(cwd);
-        case "pnpm":
-        case "rush":
-        case "lerna":
-            throw new Error(`${cwd} is using ${workspaceImplementation} which has not been converted to async yet`);
+    if (!utils.getWorkspacesAsync) {
+        const managerName = (_a = (0, implementations_1.getWorkspaceManagerAndRoot)(cwd)) === null || _a === void 0 ? void 0 : _a.manager;
+        throw new Error(`${cwd} is using ${managerName} which has not been converted to async yet`);
     }
+    return utils.getWorkspacesAsync(cwd);
 }
 exports.getWorkspacesAsync = getWorkspacesAsync;
 //# sourceMappingURL=getWorkspaces.js.map

package/lib/workspaces/getWorkspaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"getWorkspaces.js","sourceRoot":"","sources":["../../src/workspaces/getWorkspaces.ts"],"names":[],"mappings":";;;AAAA,uDAA+D;AAK/D,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,2BAAsD,CAAC;AAErF,SAAgB,aAAa,CAAC,GAAW;IACvC,MAAM,uBAAuB,GAAG,SAAS,IAAI,IAAA,4CAA0B,EAAC,GAAG,CAAC,CAAC;IAE7E,IAAI,CAAC,uBAAuB,EAAE;QAC5B,OAAO,EAAE,CAAC;KACX;IAED,QAAQ,uBAAuB,EAAE;QAC/B,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,wBAAwB,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAElE,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,wBAAwB,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAElE,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,wBAAwB,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAElE,KAAK,KAAK;YACR,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAEhE,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,yBAAyB,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;KACrE;AACH,CAAC;AAvBD,sCAuBC;AAEM,KAAK,UAAU,kBAAkB,CAAC,GAAW;IAClD,MAAM,uBAAuB,GAAG,SAAS,IAAI,IAAA,4CAA0B,EAAC,GAAG,CAAC,CAAC;IAE7E,IAAI,CAAC,uBAAuB,EAAE;QAC5B,OAAO,EAAE,CAAC;KACX;IAED,QAAQ,uBAAuB,EAAE;QAC/B,KAAK,MAAM;YACT,OAAO,MAAM,OAAO,CAAC,wBAAwB,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;QAE7E,KAAK,KAAK;YACR,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAErE,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO;YACV,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,aAAa,uBAAuB,4CAA4C,CAAC,CAAC;KAC3G;AACH,CAAC;AAnBD,gDAmBC"}
+{"version":3,"file":"getWorkspaces.js","sourceRoot":"","sources":["../../src/workspaces/getWorkspaces.ts"],"names":[],"mappings":";;;AAAA,uDAAsF;AAGtF;;;;;;;GAOG;AACH,SAAgB,aAAa,CAAC,GAAW;IACvC,MAAM,KAAK,GAAG,IAAA,uCAAqB,EAAC,GAAG,CAAC,CAAC;IACzC,OAAO,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAC,GAAG,CAAC,KAAI,EAAE,CAAC;AACzC,CAAC;AAHD,sCAGC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,kBAAkB,CAAC,GAAW;;IAClD,MAAM,KAAK,GAAG,IAAA,uCAAqB,EAAC,GAAG,CAAC,CAAC;IAEzC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,EAAE,CAAC;KACX;IAED,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE;QAC7B,MAAM,WAAW,GAAG,MAAA,IAAA,4CAA0B,EAAC,GAAG,CAAC,0CAAE,OAAO,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,aAAa,WAAW,4CAA4C,CAAC,CAAC;KAC7F;IAED,OAAO,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;AACvC,CAAC;AAbD,gDAaC"}

package/lib/workspaces/implementations/getWorkspaceManagerAndRoot.d.ts

@@ -0,0 +1,22 @@
+import { WorkspaceManager } from "../WorkspaceManager";
+export interface WorkspaceManagerAndRoot {
+    /** Workspace manager name */
+    manager: WorkspaceManager;
+    /** Workspace root, where the manager configuration file is located */
+    root: string;
+}
+/**
+ * Get the preferred workspace manager based on `process.env.PREFERRED_WORKSPACE_MANAGER`
+ * (if valid).
+ */
+export declare function getPreferredWorkspaceManager(): WorkspaceManager | undefined;
+/**
+ * Get the workspace manager name and workspace root directory for `cwd`, with caching.
+ * Also respects the `process.env.PREFERRED_WORKSPACE_MANAGER` override, provided the relevant
+ * manager file exists.
+ * @param cwd Directory to search up from
+ * @param cache Optional override cache for testing
+ * @param preferredManager Optional override manager (if provided, only searches for this manager's file)
+ * @returns Workspace manager and root, or undefined if it can't be determined
+ */
+export declare function getWorkspaceManagerAndRoot(cwd: string, cache?: Map<string, WorkspaceManagerAndRoot | undefined>, preferredManager?: WorkspaceManager): WorkspaceManagerAndRoot | undefined;

package/lib/workspaces/implementations/getWorkspaceManagerAndRoot.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWorkspaceManagerAndRoot = exports.getPreferredWorkspaceManager = void 0;
+const path_1 = __importDefault(require("path"));
+const paths_1 = require("../../paths");
+const workspaceCache = new Map();
+/**
+ * Files indicating the workspace root for each manager.
+ *
+ * DO NOT REORDER! The order of keys determines the precedence of the files, which is
+ * important for cases like lerna where lerna.json and e.g. yarn.lock may both exist.
+ */
+const managerFiles = {
+    // DO NOT REORDER! (see above)
+    lerna: "lerna.json",
+    rush: "rush.json",
+    yarn: "yarn.lock",
+    pnpm: "pnpm-workspace.yaml",
+    npm: "package-lock.json",
+};
+/**
+ * Get the preferred workspace manager based on `process.env.PREFERRED_WORKSPACE_MANAGER`
+ * (if valid).
+ */
+function getPreferredWorkspaceManager() {
+    const preferred = process.env.PREFERRED_WORKSPACE_MANAGER;
+    return preferred && managerFiles[preferred] ? preferred : undefined;
+}
+exports.getPreferredWorkspaceManager = getPreferredWorkspaceManager;
+/**
+ * Get the workspace manager name and workspace root directory for `cwd`, with caching.
+ * Also respects the `process.env.PREFERRED_WORKSPACE_MANAGER` override, provided the relevant
+ * manager file exists.
+ * @param cwd Directory to search up from
+ * @param cache Optional override cache for testing
+ * @param preferredManager Optional override manager (if provided, only searches for this manager's file)
+ * @returns Workspace manager and root, or undefined if it can't be determined
+ */
+function getWorkspaceManagerAndRoot(cwd, cache, preferredManager) {
+    cache = cache || workspaceCache;
+    if (cache.has(cwd)) {
+        return cache.get(cwd);
+    }
+    preferredManager = preferredManager || getPreferredWorkspaceManager();
+    const managerFile = (0, paths_1.searchUp)((preferredManager && managerFiles[preferredManager]) || Object.values(managerFiles), cwd);
+    if (managerFile) {
+        const managerFileName = path_1.default.basename(managerFile);
+        cache.set(cwd, {
+            manager: Object.keys(managerFiles).find((name) => managerFiles[name] === managerFileName),
+            root: path_1.default.dirname(managerFile),
+        });
+    }
+    else {
+        // Avoid searching again if no file was found
+        cache.set(cwd, undefined);
+    }
+    return cache.get(cwd);
+}
+exports.getWorkspaceManagerAndRoot = getWorkspaceManagerAndRoot;
+//# sourceMappingURL=getWorkspaceManagerAndRoot.js.map

package/lib/workspaces/implementations/getWorkspaceManagerAndRoot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getWorkspaceManagerAndRoot.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/getWorkspaceManagerAndRoot.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,uCAAuC;AASvC,MAAM,cAAc,GAAG,IAAI,GAAG,EAA+C,CAAC;AAE9E;;;;;GAKG;AACH,MAAM,YAAY,GAAG;IACnB,8BAA8B;IAC9B,KAAK,EAAE,YAAY;IACnB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,qBAAqB;IAC3B,GAAG,EAAE,mBAAmB;CACzB,CAAC;AAEF;;;GAGG;AACH,SAAgB,4BAA4B;IAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2D,CAAC;IAC1F,OAAO,SAAS,IAAI,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACtE,CAAC;AAHD,oEAGC;AAED;;;;;;;;GAQG;AACH,SAAgB,0BAA0B,CACxC,GAAW,EACX,KAAwD,EACxD,gBAAmC;IAEnC,KAAK,GAAG,KAAK,IAAI,cAAc,CAAC;IAChC,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAClB,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACvB;IAED,gBAAgB,GAAG,gBAAgB,IAAI,4BAA4B,EAAE,CAAC;IACtE,MAAM,WAAW,GAAG,IAAA,gBAAQ,EAC1B,CAAC,gBAAgB,IAAI,YAAY,CAAC,gBAAgB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EACnF,GAAG,CACJ,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,MAAM,eAAe,GAAG,cAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACnD,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YACb,OAAO,EAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAwB,CAAC,IAAI,CAC7D,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,eAAe,CAChD;YACF,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC;SAChC,CAAC,CAAC;KACJ;SAAM;QACL,6CAA6C;QAC7C,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;KAC3B;IAED,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AA9BD,gEA8BC"}

package/lib/workspaces/implementations/getWorkspaceUtilities.d.ts

@@ -0,0 +1,18 @@
+import { WorkspaceInfo } from "../../types/WorkspaceInfo";
+export interface WorkspaceUtilities {
+    /**
+     * Get an array with names, paths, and package.json contents for each package in a workspace.
+     * (See `../getWorkspaces` for why it's named this way.)
+     */
+    getWorkspaces: (cwd: string) => WorkspaceInfo;
+    /**
+     * Get an array with names, paths, and package.json contents for each package in a workspace.
+     * (See `../getWorkspaces` for why it's named this way.)
+     */
+    getWorkspacesAsync?: (cwd: string) => Promise<WorkspaceInfo>;
+}
+/**
+ * Get utility implementations for the workspace manager of `cwd`.
+ * Returns undefined if the manager can't be determined.
+ */
+export declare function getWorkspaceUtilities(cwd: string): WorkspaceUtilities | undefined;

package/lib/workspaces/implementations/getWorkspaceUtilities.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWorkspaceUtilities = void 0;
+const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
+/**
+ * Get utility implementations for the workspace manager of `cwd`.
+ * Returns undefined if the manager can't be determined.
+ */
+function getWorkspaceUtilities(cwd) {
+    var _a;
+    const manager = (_a = (0, getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot)(cwd)) === null || _a === void 0 ? void 0 : _a.manager;
+    switch (manager) {
+        case "yarn":
+            return require("./yarn");
+        case "pnpm":
+            return require("./pnpm");
+        case "rush":
+            return require("./rush");
+        case "npm":
+            return require("./npm");
+        case "lerna":
+            return require("./lerna");
+    }
+}
+exports.getWorkspaceUtilities = getWorkspaceUtilities;
+//# sourceMappingURL=getWorkspaceUtilities.js.map

package/lib/workspaces/implementations/getWorkspaceUtilities.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getWorkspaceUtilities.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/getWorkspaceUtilities.ts"],"names":[],"mappings":";;;AACA,6EAA0E;AAqB1E;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,GAAW;;IAC/C,MAAM,OAAO,GAAG,MAAA,IAAA,uDAA0B,EAAC,GAAG,CAAC,0CAAE,OAAO,CAAC;IAEzD,QAAQ,OAAO,EAAE;QACf,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAEnD,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAEnD,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAEnD,KAAK,KAAK;YACR,OAAO,OAAO,CAAC,OAAO,CAAwB,CAAC;QAEjD,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,SAAS,CAA0B,CAAC;KACtD;AACH,CAAC;AAnBD,sDAmBC"}

package/lib/workspaces/implementations/index.d.ts

@@ -1,14 +1,2 @@
-export declare type WorkspaceImplementations = "yarn" | "pnpm" | "rush" | "npm" | "lerna";
-export interface ImplementationAndLockFile {
-    implementation: WorkspaceImplementations | undefined;
-    lockFile: string;
-}
-export declare function getWorkspaceImplementationAndLockFile(cwd: string, cache?: {
-    [cwd: string]: ImplementationAndLockFile;
-}): {
-    implementation: WorkspaceImplementations | undefined;
-    lockFile: string;
-} | undefined;
-export declare function getWorkspaceImplementation(cwd: string, cache?: {
-    [cwd: string]: ImplementationAndLockFile;
-}): WorkspaceImplementations | undefined;
+export { getWorkspaceManagerAndRoot, WorkspaceManagerAndRoot } from "./getWorkspaceManagerAndRoot";
+export { getWorkspaceUtilities, WorkspaceUtilities } from "./getWorkspaceUtilities";

package/lib/workspaces/implementations/index.js

@@ -1,58 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspaceImplementation = exports.getWorkspaceImplementationAndLockFile = void 0;
-const path_1 = __importDefault(require("path"));
-const paths_1 = require("../../paths");
-const workspaceCache = {};
-function getWorkspaceImplementationAndLockFile(cwd, cache = workspaceCache) {
-    if (cache[cwd]) {
-        return cache[cwd];
-    }
-    const lockFile = (0, paths_1.searchUp)(["lerna.json", "rush.json", "yarn.lock", "pnpm-workspace.yaml", "package-lock.json"], cwd);
-    if (!lockFile) {
-        return;
-    }
-    switch (path_1.default.basename(lockFile)) {
-        case "lerna.json":
-            cache[cwd] = {
-                implementation: "lerna",
-                lockFile,
-            };
-            break;
-        case "yarn.lock":
-            cache[cwd] = {
-                implementation: "yarn",
-                lockFile,
-            };
-            break;
-        case "pnpm-workspace.yaml":
-            cache[cwd] = {
-                implementation: "pnpm",
-                lockFile,
-            };
-            break;
-        case "rush.json":
-            cache[cwd] = {
-                implementation: "rush",
-                lockFile,
-            };
-            break;
-        case "package-lock.json":
-            cache[cwd] = {
-                implementation: "npm",
-                lockFile,
-            };
-            break;
-    }
-    return cache[cwd];
-}
-exports.getWorkspaceImplementationAndLockFile = getWorkspaceImplementationAndLockFile;
-function getWorkspaceImplementation(cwd, cache = workspaceCache) {
-    var _a;
-    return (_a = getWorkspaceImplementationAndLockFile(cwd, cache)) === null || _a === void 0 ? void 0 : _a.implementation;
-}
-exports.getWorkspaceImplementation = getWorkspaceImplementation;
+exports.getWorkspaceUtilities = exports.getWorkspaceManagerAndRoot = void 0;
+var getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
+Object.defineProperty(exports, "getWorkspaceManagerAndRoot", { enumerable: true, get: function () { return getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot; } });
+var getWorkspaceUtilities_1 = require("./getWorkspaceUtilities");
+Object.defineProperty(exports, "getWorkspaceUtilities", { enumerable: true, get: function () { return getWorkspaceUtilities_1.getWorkspaceUtilities; } });
 //# sourceMappingURL=index.js.map

package/lib/workspaces/implementations/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,uCAAuC;AAOvC,MAAM,cAAc,GAAiD,EAAE,CAAC;AAExE,SAAgB,qCAAqC,CACnD,GAAW,EACX,KAAK,GAAG,cAAc;IAEtB,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;KACnB;IAED,MAAM,QAAQ,GAAG,IAAA,gBAAQ,EAAC,CAAC,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,qBAAqB,EAAE,mBAAmB,CAAC,EAAE,GAAG,CAAC,CAAC;IAErH,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IAED,QAAQ,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAC/B,KAAK,YAAY;YACf,KAAK,CAAC,GAAG,CAAC,GAAG;gBACX,cAAc,EAAE,OAAO;gBACvB,QAAQ;aACT,CAAC;YACF,MAAM;QAER,KAAK,WAAW;YACd,KAAK,CAAC,GAAG,CAAC,GAAG;gBACX,cAAc,EAAE,MAAM;gBACtB,QAAQ;aACT,CAAC;YACF,MAAM;QAER,KAAK,qBAAqB;YACxB,KAAK,CAAC,GAAG,CAAC,GAAG;gBACX,cAAc,EAAE,MAAM;gBACtB,QAAQ;aACT,CAAC;YACF,MAAM;QAER,KAAK,WAAW;YACd,KAAK,CAAC,GAAG,CAAC,GAAG;gBACX,cAAc,EAAE,MAAM;gBACtB,QAAQ;aACT,CAAC;YACF,MAAM;QAER,KAAK,mBAAmB;YACtB,KAAK,CAAC,GAAG,CAAC,GAAG;gBACX,cAAc,EAAE,KAAK;gBACrB,QAAQ;aACT,CAAC;YACF,MAAM;KACT;IAED,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;AACpB,CAAC;AApDD,sFAoDC;AAED,SAAgB,0BAA0B,CAAC,GAAW,EAAE,KAAK,GAAG,cAAc;;IAC5E,OAAO,MAAA,qCAAqC,CAAC,GAAG,EAAE,KAAK,CAAC,0CAAE,cAAc,CAAC;AAC3E,CAAC;AAFD,gEAEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/index.ts"],"names":[],"mappings":";;;AAAA,2EAAmG;AAA1F,wIAAA,0BAA0B,OAAA;AACnC,iEAAoF;AAA3E,8HAAA,qBAAqB,OAAA"}

package/lib/workspaces/implementations/lerna.d.ts

@@ -1,3 +1,7 @@
 import { WorkspaceInfo } from "../../types/WorkspaceInfo";
-export declare function getLernaWorkspaceRoot(cwd: string): string;
-export declare function getLernaWorkspaces(cwd: string, ignorePatterns?: string[]): WorkspaceInfo;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a lerna workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
+export declare function getLernaWorkspaces(cwd: string): WorkspaceInfo;
+export { getLernaWorkspaces as getWorkspaces };

package/lib/workspaces/implementations/lerna.js

@@ -3,33 +3,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLernaWorkspaces = exports.getLernaWorkspaceRoot = void 0;
+exports.getWorkspaces = exports.getLernaWorkspaces = void 0;
 const fs_1 = __importDefault(require("fs"));
 const jju_1 = __importDefault(require("jju"));
 const path_1 = __importDefault(require("path"));
 const getPackagePaths_1 = require("../../getPackagePaths");
-const paths_1 = require("../../paths");
 const getWorkspacePackageInfo_1 = require("../getWorkspacePackageInfo");
+const logging_1 = require("../../logging");
+const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
 function getLernaWorkspaceRoot(cwd) {
-    const lernaJsonPath = (0, paths_1.searchUp)("lerna.json", cwd);
-    if (!lernaJsonPath) {
-        throw new Error("Could not find lerna workspace root");
+    var _a;
+    const root = (_a = (0, getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot)(cwd, undefined, "lerna")) === null || _a === void 0 ? void 0 : _a.root;
+    if (!root) {
+        throw new Error("Could not find lerna workspace root from " + cwd);
     }
-    return path_1.default.dirname(lernaJsonPath);
+    return root;
 }
-exports.getLernaWorkspaceRoot = getLernaWorkspaceRoot;
-function getLernaWorkspaces(cwd, ignorePatterns) {
+/**
+ * Get an array with names, paths, and package.json contents for each package in a lerna workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
+function getLernaWorkspaces(cwd) {
     try {
         const lernaWorkspaceRoot = getLernaWorkspaceRoot(cwd);
         const lernaJsonPath = path_1.default.join(lernaWorkspaceRoot, "lerna.json");
         const lernaConfig = jju_1.default.parse(fs_1.default.readFileSync(lernaJsonPath, "utf-8"));
-        const packagePaths = (0, getPackagePaths_1.getPackagePaths)(lernaWorkspaceRoot, lernaConfig.packages, ignorePatterns);
+        const packagePaths = (0, getPackagePaths_1.getPackagePaths)(lernaWorkspaceRoot, lernaConfig.packages);
         const workspaceInfo = (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
         return workspaceInfo;
     }
-    catch {
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting lerna workspaces for ${cwd}`, err);
         return [];
     }
 }
 exports.getLernaWorkspaces = getLernaWorkspaces;
+exports.getWorkspaces = getLernaWorkspaces;
 //# sourceMappingURL=lerna.js.map

package/lib/workspaces/implementations/lerna.js.map

@@ -1 +1 @@
-{"version":3,"file":"lerna.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/lerna.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,8CAAsB;AACtB,gDAAwB;AACxB,2DAAwD;AACxD,uCAAuC;AAEvC,wEAAqE;AAErE,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,aAAa,GAAG,IAAA,gBAAQ,EAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IAElD,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;KACxD;IAED,OAAO,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;AACrC,CAAC;AARD,sDAQC;AAED,SAAgB,kBAAkB,CAAC,GAAW,EAAE,cAAyB;IACvE,IAAI;QACF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QAElE,MAAM,WAAW,GAAG,aAAG,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;QAEvE,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,kBAAkB,EAAE,WAAW,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC/F,MAAM,aAAa,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;QAC5D,OAAO,aAAa,CAAC;KACtB;IAAC,MAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAbD,gDAaC"}
+{"version":3,"file":"lerna.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/lerna.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,8CAAsB;AACtB,gDAAwB;AACxB,2DAAwD;AAExD,wEAAqE;AACrE,2CAAkD;AAClD,6EAA0E;AAE1E,SAAS,qBAAqB,CAAC,GAAW;;IACxC,MAAM,IAAI,GAAG,MAAA,IAAA,uDAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,0CAAE,IAAI,CAAC;IACvE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,2CAA2C,GAAG,GAAG,CAAC,CAAC;KACpE;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,IAAI;QACF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QAElE,MAAM,WAAW,GAAG,aAAG,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;QAEvE,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,kBAAkB,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC/E,MAAM,aAAa,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;QAC5D,OAAO,aAAa,CAAC;KACtB;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,sCAAsC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACpE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAdD,gDAcC;AAE8B,2CAAa"}

package/lib/workspaces/implementations/npm.d.ts

@@ -1,4 +1,13 @@
 import { WorkspaceInfo } from "../../types/WorkspaceInfo";
-export declare function getNpmWorkspaceRoot(cwd: string): string;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getNpmWorkspaces(cwd: string): WorkspaceInfo;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getNpmWorkspacesAsync(cwd: string): Promise<WorkspaceInfo>;
+export { getNpmWorkspaces as getWorkspaces };
+export { getNpmWorkspacesAsync as getWorkspacesAsync };

package/lib/workspaces/implementations/npm.js

@@ -1,23 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNpmWorkspacesAsync = exports.getNpmWorkspaces = exports.getNpmWorkspaceRoot = void 0;
+exports.getWorkspacesAsync = exports.getWorkspaces = exports.getNpmWorkspacesAsync = exports.getNpmWorkspaces = void 0;
+const _1 = require(".");
 const packageJsonWorkspaces_1 = require("./packageJsonWorkspaces");
 function getNpmWorkspaceRoot(cwd) {
-    const npmWorkspacesRoot = (0, packageJsonWorkspaces_1.getPackageJsonWorkspaceRoot)(cwd);
-    if (!npmWorkspacesRoot) {
-        throw new Error("Could not find NPM workspaces root");
+    var _a;
+    const root = (_a = (0, _1.getWorkspaceManagerAndRoot)(cwd, undefined, "npm")) === null || _a === void 0 ? void 0 : _a.root;
+    if (!root) {
+        throw new Error("Could not find npm workspace root from " + cwd);
     }
-    return npmWorkspacesRoot;
+    return root;
 }
-exports.getNpmWorkspaceRoot = getNpmWorkspaceRoot;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 function getNpmWorkspaces(cwd) {
     const npmWorkspacesRoot = getNpmWorkspaceRoot(cwd);
     return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot)(npmWorkspacesRoot);
 }
 exports.getNpmWorkspaces = getNpmWorkspaces;
-async function getNpmWorkspacesAsync(cwd) {
+exports.getWorkspaces = getNpmWorkspaces;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
+function getNpmWorkspacesAsync(cwd) {
     const npmWorkspacesRoot = getNpmWorkspaceRoot(cwd);
-    return await (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRootAsync)(npmWorkspacesRoot);
+    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRootAsync)(npmWorkspacesRoot);
 }
 exports.getNpmWorkspacesAsync = getNpmWorkspacesAsync;
+exports.getWorkspacesAsync = getNpmWorkspacesAsync;
 //# sourceMappingURL=npm.js.map

package/lib/workspaces/implementations/npm.js.map

@@ -1 +1 @@
-{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/npm.ts"],"names":[],"mappings":";;;AACA,mEAIiC;AAEjC,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,MAAM,iBAAiB,GAAG,IAAA,mDAA2B,EAAC,GAAG,CAAC,CAAC;IAE3D,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACvD;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AARD,kDAQC;AAED,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,IAAA,yDAAiC,EAAC,iBAAiB,CAAC,CAAC;AAC9D,CAAC;AAHD,4CAGC;AAEM,KAAK,UAAU,qBAAqB,CAAC,GAAW;IACrD,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,MAAM,IAAA,8DAAsC,EAAC,iBAAiB,CAAC,CAAC;AACzE,CAAC;AAHD,sDAGC"}
+{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/npm.ts"],"names":[],"mappings":";;;AAAA,wBAA+C;AAE/C,mEAAoH;AAEpH,SAAS,mBAAmB,CAAC,GAAW;;IACtC,MAAM,IAAI,GAAG,MAAA,IAAA,6BAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,0CAAE,IAAI,CAAC;IACrE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,GAAG,CAAC,CAAC;KAClE;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,IAAA,yDAAiC,EAAC,iBAAiB,CAAC,CAAC;AAC9D,CAAC;AAHD,4CAGC;AAW4B,yCAAa;AAT1C;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,IAAA,8DAAsC,EAAC,iBAAiB,CAAC,CAAC;AACnE,CAAC;AAHD,sDAGC;AAGiC,mDAAkB"}

package/lib/workspaces/implementations/packageJsonWorkspaces.d.ts

@@ -1,3 +1,10 @@
-export declare function getPackageJsonWorkspaceRoot(cwd: string): string | null;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm/yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getWorkspaceInfoFromWorkspaceRoot(packageJsonWorkspacesRoot: string): import("../..").WorkspaceInfo;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm/yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getWorkspaceInfoFromWorkspaceRootAsync(packageJsonWorkspacesRoot: string): Promise<import("../..").WorkspaceInfo>;

package/lib/workspaces/implementations/packageJsonWorkspaces.js

@@ -3,59 +3,61 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspaceInfoFromWorkspaceRootAsync = exports.getWorkspaceInfoFromWorkspaceRoot = exports.getPackageJsonWorkspaceRoot = void 0;
+exports.getWorkspaceInfoFromWorkspaceRootAsync = exports.getWorkspaceInfoFromWorkspaceRoot = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const _1 = require(".");
 const getPackagePaths_1 = require("../../getPackagePaths");
 const getWorkspacePackageInfo_1 = require("../getWorkspacePackageInfo");
-function getPackageJsonWorkspaceRoot(cwd) {
-    var _a;
-    const lockFile = (_a = (0, _1.getWorkspaceImplementationAndLockFile)(cwd)) === null || _a === void 0 ? void 0 : _a.lockFile;
-    const packageJsonWorkspacesRoot = lockFile ? path_1.default.dirname(lockFile) : cwd;
-    return packageJsonWorkspacesRoot;
-}
-exports.getPackageJsonWorkspaceRoot = getPackageJsonWorkspaceRoot;
-function getRootPackageJson(packageJsonWorkspacesRoot) {
+const logging_1 = require("../../logging");
+/**
+ * Read the workspace root package.json and get the list of package globs from its `workspaces` property.
+ */
+function getPackages(packageJsonWorkspacesRoot) {
     const packageJsonFile = path_1.default.join(packageJsonWorkspacesRoot, "package.json");
+    let packageJson;
     try {
-        const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonFile, "utf-8"));
-        return packageJson;
+        packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonFile, "utf-8"));
     }
     catch (e) {
         throw new Error("Could not load package.json from workspaces root");
     }
-}
-function getPackages(packageJson) {
     const { workspaces } = packageJson;
-    if (workspaces && Array.isArray(workspaces)) {
+    if (Array.isArray(workspaces)) {
         return workspaces;
     }
-    if (!workspaces || !workspaces.packages) {
+    if (!(workspaces === null || workspaces === void 0 ? void 0 : workspaces.packages)) {
         throw new Error("Could not find a workspaces object in package.json");
     }
     return workspaces.packages;
 }
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm/yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 function getWorkspaceInfoFromWorkspaceRoot(packageJsonWorkspacesRoot) {
     try {
-        const rootPackageJson = getRootPackageJson(packageJsonWorkspacesRoot);
-        const packages = getPackages(rootPackageJson);
-        const packagePaths = (0, getPackagePaths_1.getPackagePaths)(packageJsonWorkspacesRoot, packages);
+        const packageGlobs = getPackages(packageJsonWorkspacesRoot);
+        const packagePaths = (0, getPackagePaths_1.getPackagePaths)(packageJsonWorkspacesRoot, packageGlobs);
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
     }
-    catch {
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting workspace info for ${packageJsonWorkspacesRoot}`, err);
         return [];
     }
 }
 exports.getWorkspaceInfoFromWorkspaceRoot = getWorkspaceInfoFromWorkspaceRoot;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm/yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 async function getWorkspaceInfoFromWorkspaceRootAsync(packageJsonWorkspacesRoot) {
     try {
-        const rootPackageJson = getRootPackageJson(packageJsonWorkspacesRoot);
-        const packages = getPackages(rootPackageJson);
-        const packagePaths = await (0, getPackagePaths_1.getPackagePathsAsync)(packageJsonWorkspacesRoot, packages);
+        const packageGlobs = getPackages(packageJsonWorkspacesRoot);
+        const packagePaths = await (0, getPackagePaths_1.getPackagePathsAsync)(packageJsonWorkspacesRoot, packageGlobs);
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfoAsync)(packagePaths);
     }
-    catch {
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting workspace info for ${packageJsonWorkspacesRoot}`, err);
         return [];
     }
 }

package/lib/workspaces/implementations/packageJsonWorkspaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageJsonWorkspaces.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/packageJsonWorkspaces.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,wBAA0D;AAC1D,2DAA8E;AAC9E,wEAAmG;AAWnG,SAAgB,2BAA2B,CAAC,GAAW;;IACrD,MAAM,QAAQ,GAAG,MAAA,IAAA,wCAAqC,EAAC,GAAG,CAAC,0CAAE,QAAQ,CAAC;IACtE,MAAM,yBAAyB,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1E,OAAO,yBAAyB,CAAC;AACnC,CAAC;AAJD,kEAIC;AAED,SAAS,kBAAkB,CAAC,yBAAiC;IAC3D,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;IAE7E,IAAI;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1E,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;AACH,CAAC;AAED,SAAS,WAAW,CAAC,WAAkC;IACrD,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IAEnC,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC3C,OAAO,UAAU,CAAC;KACnB;IAED,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACvE;IAED,OAAO,UAAU,CAAC,QAAQ,CAAC;AAC7B,CAAC;AAED,SAAgB,iCAAiC,CAAC,yBAAiC;IACjF,IAAI;QACF,MAAM,eAAe,GAAG,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC;QAC1E,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,MAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AATD,8EASC;AAEM,KAAK,UAAU,sCAAsC,CAAC,yBAAiC;IAC5F,IAAI;QACF,MAAM,eAAe,GAAG,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,MAAM,IAAA,sCAAoB,EAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC;QACrF,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,MAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AATD,wFASC"}
+{"version":3,"file":"packageJsonWorkspaces.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/packageJsonWorkspaces.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,2DAA8E;AAC9E,wEAAmG;AACnG,2CAAkD;AAWlD;;GAEG;AACH,SAAS,WAAW,CAAC,yBAAiC;IACpD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;IAE7E,IAAI,WAAsC,CAAC;IAC3C,IAAI;QACF,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAA8B,CAAC;KAClG;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,UAAU,CAAC;KACnB;IAED,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAA,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACvE;IAED,OAAO,UAAU,CAAC,QAAQ,CAAC;AAC7B,CAAC;AAED;;;GAGG;AACH,SAAgB,iCAAiC,CAAC,yBAAiC;IACjF,IAAI;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,yBAAyB,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;QAC9E,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,oCAAoC,yBAAyB,EAAE,EAAE,GAAG,CAAC,CAAC;QACxF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AATD,8EASC;AAED;;;GAGG;AACI,KAAK,UAAU,sCAAsC,CAAC,yBAAiC;IAC5F,IAAI;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,yBAAyB,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,MAAM,IAAA,sCAAoB,EAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;QACzF,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,oCAAoC,yBAAyB,EAAE,EAAE,GAAG,CAAC,CAAC;QACxF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AATD,wFASC"}

package/lib/workspaces/implementations/pnpm.d.ts

@@ -1,3 +1,9 @@
 import { WorkspaceInfo } from "../../types/WorkspaceInfo";
+/** @deprecated Use `getWorkspaceRoot` */
 export declare function getPnpmWorkspaceRoot(cwd: string): string;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a pnpm workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getPnpmWorkspaces(cwd: string): WorkspaceInfo;
+export { getPnpmWorkspaces as getWorkspaces };

package/lib/workspaces/implementations/pnpm.js

@@ -3,20 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPnpmWorkspaces = exports.getPnpmWorkspaceRoot = void 0;
+exports.getWorkspaces = exports.getPnpmWorkspaces = exports.getPnpmWorkspaceRoot = void 0;
 const path_1 = __importDefault(require("path"));
 const getPackagePaths_1 = require("../../getPackagePaths");
 const getWorkspacePackageInfo_1 = require("../getWorkspacePackageInfo");
 const readYaml_1 = require("../../lockfile/readYaml");
-const paths_1 = require("../../paths");
+const logging_1 = require("../../logging");
+const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
+/** @deprecated Use `getWorkspaceRoot` */
 function getPnpmWorkspaceRoot(cwd) {
-    const pnpmWorkspacesFile = (0, paths_1.searchUp)("pnpm-workspace.yaml", cwd);
-    if (!pnpmWorkspacesFile) {
-        throw new Error("Could not find pnpm workspaces root");
+    var _a;
+    const root = (_a = (0, getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot)(cwd, undefined, "pnpm")) === null || _a === void 0 ? void 0 : _a.root;
+    if (!root) {
+        throw new Error("Could not find pnpm workspace root from " + cwd);
     }
-    return path_1.default.dirname(pnpmWorkspacesFile);
+    return root;
 }
 exports.getPnpmWorkspaceRoot = getPnpmWorkspaceRoot;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a pnpm workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 function getPnpmWorkspaces(cwd) {
     try {
         const pnpmWorkspacesRoot = getPnpmWorkspaceRoot(cwd);
@@ -26,9 +33,11 @@ function getPnpmWorkspaces(cwd) {
         const workspaceInfo = (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
         return workspaceInfo;
     }
-    catch {
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting pnpm workspaces for ${cwd}`, err);
         return [];
     }
 }
 exports.getPnpmWorkspaces = getPnpmWorkspaces;
+exports.getWorkspaces = getPnpmWorkspaces;
 //# sourceMappingURL=pnpm.js.map