@pnpm/workspace.find-packages 3.0.0 → 4.0.0

package/lib/index.d.ts

@@ -20,5 +20,3 @@ export declare function findWorkspacePackages(workspaceRoot: string, opts?: Find
 export declare function findWorkspacePackagesNoCheck(workspaceRoot: string, opts?: {
     patterns?: string[];
 }): Promise<Project[]>;
-type ArrayOfWorkspacePackagesToMapResult = Record<string, Record<string, Pick<Project, 'manifest'>>>;
-export declare function arrayOfWorkspacePackagesToMap(pkgs: Array<Pick<Project, 'manifest'>>): ArrayOfWorkspacePackagesToMapResult;

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.arrayOfWorkspacePackagesToMap = exports.findWorkspacePackagesNoCheck = exports.findWorkspacePackages = void 0;
+exports.findWorkspacePackagesNoCheck = exports.findWorkspacePackages = void 0;
 const cli_utils_1 = require("@pnpm/cli-utils");
 const util_lex_comparator_1 = require("@pnpm/util.lex-comparator");
 const fs_find_packages_1 = require("@pnpm/fs.find-packages");
@@ -8,7 +8,7 @@ const logger_1 = require("@pnpm/logger");
 async function findWorkspacePackages(workspaceRoot, opts) {
     const pkgs = await findWorkspacePackagesNoCheck(workspaceRoot, opts);
     for (const pkg of pkgs) {
-        (0, cli_utils_1.packageIsInstallable)(pkg.dir, pkg.manifest, {
+        (0, cli_utils_1.packageIsInstallable)(pkg.rootDir, pkg.manifest, {
             ...opts,
             supportedArchitectures: opts?.supportedArchitectures ?? {
                 os: ['current'],
@@ -17,7 +17,7 @@ async function findWorkspacePackages(workspaceRoot, opts) {
             },
         });
         // When setting shared-workspace-lockfile=false, `pnpm` can be set in sub-project's package.json.
-        if (opts?.sharedWorkspaceLockfile && pkg.dir !== workspaceRoot) {
+        if (opts?.sharedWorkspaceLockfile && pkg.rootDir !== workspaceRoot) {
             checkNonRootProjectManifest(pkg);
         }
     }
@@ -33,28 +33,16 @@ async function findWorkspacePackagesNoCheck(workspaceRoot, opts) {
         includeRoot: true,
         patterns: opts?.patterns,
     });
-    pkgs.sort((pkg1, pkg2) => (0, util_lex_comparator_1.lexCompare)(pkg1.dir, pkg2.dir));
+    pkgs.sort((pkg1, pkg2) => (0, util_lex_comparator_1.lexCompare)(pkg1.rootDir, pkg2.rootDir));
     return pkgs;
 }
 exports.findWorkspacePackagesNoCheck = findWorkspacePackagesNoCheck;
-function arrayOfWorkspacePackagesToMap(pkgs) {
-    return pkgs.reduce((acc, pkg) => {
-        if (!pkg.manifest.name)
-            return acc;
-        if (!acc[pkg.manifest.name]) {
-            acc[pkg.manifest.name] = {};
-        }
-        acc[pkg.manifest.name][pkg.manifest.version ?? '0.0.0'] = pkg;
-        return acc;
-    }, {});
-}
-exports.arrayOfWorkspacePackagesToMap = arrayOfWorkspacePackagesToMap;
-function checkNonRootProjectManifest({ manifest, dir }) {
+function checkNonRootProjectManifest({ manifest, rootDir }) {
     for (const rootOnlyField of ['pnpm', 'resolutions']) {
         if (manifest?.[rootOnlyField]) {
             logger_1.logger.warn({
-                message: `The field "${rootOnlyField}" was found in ${dir}/package.json. This will not take effect. You should configure "${rootOnlyField}" at the root of the workspace instead.`,
-                prefix: dir,
+                message: `The field "${rootOnlyField}" was found in ${rootDir}/package.json. This will not take effect. You should configure "${rootOnlyField}" at the root of the workspace instead.`,
+                prefix: rootDir,
             });
         }
     }

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AAEtD,mEAAsD;AACtD,6DAAqD;AACrD,yCAAqC;AAuB9B,KAAK,UAAU,qBAAqB,CACzC,aAAqB,EACrB,IAAgC;IAEhC,MAAM,IAAI,GAAG,MAAM,4BAA4B,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;IACpE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAA,gCAAoB,EAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;YAC1C,GAAG,IAAI;YACP,sBAAsB,EAAE,IAAI,EAAE,sBAAsB,IAAI;gBACtD,EAAE,EAAE,CAAC,SAAS,CAAC;gBACf,GAAG,EAAE,CAAC,SAAS,CAAC;gBAChB,IAAI,EAAE,CAAC,SAAS,CAAC;aAClB;SACF,CAAC,CAAA;QACF,iGAAiG;QACjG,IAAI,IAAI,EAAE,uBAAuB,IAAI,GAAG,CAAC,GAAG,KAAK,aAAa,EAAE,CAAC;YAC/D,2BAA2B,CAAC,GAAG,CAAC,CAAA;QAClC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AArBD,sDAqBC;AAEM,KAAK,UAAU,4BAA4B,CAAE,aAAqB,EAAE,IAA8B;IACvG,MAAM,IAAI,GAAG,MAAM,IAAA,+BAAY,EAAC,aAAa,EAAE;QAC7C,MAAM,EAAE;YACN,oBAAoB;YACpB,wBAAwB;SACzB;QACD,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,IAAI,EAAE,QAAQ;KACzB,CAAC,CAAA;IACF,IAAI,CAAC,IAAI,CAAC,CAAC,IAAqB,EAAE,IAAqB,EAAE,EAAE,CAAC,IAAA,gCAAU,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAC3F,OAAO,IAAI,CAAA;AACb,CAAC;AAXD,oEAWC;AAID,SAAgB,6BAA6B,CAC3C,IAAsC;IAEtC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC9B,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI;YAAE,OAAO,GAAG,CAAA;QAClC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,GAAG,CAAA;QAC7D,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAyC,CAAC,CAAA;AAC/C,CAAC;AAXD,sEAWC;AAED,SAAS,2BAA2B,CAAE,EAAE,QAAQ,EAAE,GAAG,EAAW;IAC9D,KAAK,MAAM,aAAa,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC;QACpD,IAAI,QAAQ,EAAE,CAAC,aAAsC,CAAC,EAAE,CAAC;YACvD,eAAM,CAAC,IAAI,CAAC;gBACV,OAAO,EAAE,cAAc,aAAa,kBAAkB,GAAG,mEAAmE,aAAa,yCAAyC;gBAClL,MAAM,EAAE,GAAG;aACZ,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AAEtD,mEAAsD;AACtD,6DAAqD;AACrD,yCAAqC;AAuB9B,KAAK,UAAU,qBAAqB,CACzC,aAAqB,EACrB,IAAgC;IAEhC,MAAM,IAAI,GAAG,MAAM,4BAA4B,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;IACpE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAA,gCAAoB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE;YAC9C,GAAG,IAAI;YACP,sBAAsB,EAAE,IAAI,EAAE,sBAAsB,IAAI;gBACtD,EAAE,EAAE,CAAC,SAAS,CAAC;gBACf,GAAG,EAAE,CAAC,SAAS,CAAC;gBAChB,IAAI,EAAE,CAAC,SAAS,CAAC;aAClB;SACF,CAAC,CAAA;QACF,iGAAiG;QACjG,IAAI,IAAI,EAAE,uBAAuB,IAAI,GAAG,CAAC,OAAO,KAAK,aAAa,EAAE,CAAC;YACnE,2BAA2B,CAAC,GAAG,CAAC,CAAA;QAClC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AArBD,sDAqBC;AAEM,KAAK,UAAU,4BAA4B,CAAE,aAAqB,EAAE,IAA8B;IACvG,MAAM,IAAI,GAAG,MAAM,IAAA,+BAAY,EAAC,aAAa,EAAE;QAC7C,MAAM,EAAE;YACN,oBAAoB;YACpB,wBAAwB;SACzB;QACD,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,IAAI,EAAE,QAAQ;KACzB,CAAC,CAAA;IACF,IAAI,CAAC,IAAI,CAAC,CAAC,IAAyB,EAAE,IAAyB,EAAE,EAAE,CAAC,IAAA,gCAAU,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3G,OAAO,IAAI,CAAA;AACb,CAAC;AAXD,oEAWC;AAED,SAAS,2BAA2B,CAAE,EAAE,QAAQ,EAAE,OAAO,EAAW;IAClE,KAAK,MAAM,aAAa,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC;QACpD,IAAI,QAAQ,EAAE,CAAC,aAAsC,CAAC,EAAE,CAAC;YACvD,eAAM,CAAC,IAAI,CAAC;gBACV,OAAO,EAAE,cAAc,aAAa,kBAAkB,OAAO,mEAAmE,aAAa,yCAAyC;gBACtL,MAAM,EAAE,OAAO;aAChB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/workspace.find-packages",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Finds packages inside a workspace",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,14 +23,14 @@
   "homepage": "https://github.com/pnpm/pnpm/blob/main/workspace/find-packages#readme",
   "dependencies": {
     "@pnpm/util.lex-comparator": "3.0.0",
-    "@pnpm/cli-utils": "3.1.2",
-    "@pnpm/fs.find-packages": "3.0.3",
-    "@pnpm/types": "10.1.1"
+    "@pnpm/cli-utils": "3.1.3",
+    "@pnpm/fs.find-packages": "4.0.0",
+    "@pnpm/types": "11.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
-    "@pnpm/workspace.find-packages": "3.0.0",
-    "@pnpm/workspace.read-manifest": "2.1.0"
+    "@pnpm/workspace.find-packages": "4.0.0",
+    "@pnpm/workspace.read-manifest": "2.2.0"
   },
   "peerDependencies": {
     "@pnpm/logger": "^5.0.0"