@pnpm/workspace.find-packages 1.1.0 → 1.1.2

package/lib/index.js

@@ -1,16 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrayOfWorkspacePackagesToMap = exports.findWorkspacePackagesNoCheck = exports.findWorkspacePackages = void 0;
-const path_1 = __importDefault(require("path"));
 const cli_utils_1 = require("@pnpm/cli-utils");
-const constants_1 = require("@pnpm/constants");
+const workspace_read_manifest_1 = require("@pnpm/workspace.read-manifest");
 const util_lex_comparator_1 = require("@pnpm/util.lex-comparator");
 const fs_find_packages_1 = require("@pnpm/fs.find-packages");
 const logger_1 = require("@pnpm/logger");
-const read_yaml_file_1 = __importDefault(require("read-yaml-file"));
 async function findWorkspacePackages(workspaceRoot, opts) {
     const pkgs = await findWorkspacePackagesNoCheck(workspaceRoot, opts);
     for (const pkg of pkgs) {
@@ -32,8 +27,8 @@ exports.findWorkspacePackages = findWorkspacePackages;
 async function findWorkspacePackagesNoCheck(workspaceRoot, opts) {
     let patterns = opts?.patterns;
     if (patterns == null) {
-        const packagesManifest = await requirePackagesManifest(workspaceRoot);
-        patterns = packagesManifest?.packages ?? undefined;
+        const workspaceManifest = await (0, workspace_read_manifest_1.readWorkspaceManifest)(workspaceRoot);
+        patterns = workspaceManifest?.packages;
     }
     const pkgs = await (0, fs_find_packages_1.findPackages)(workspaceRoot, {
         ignore: [
@@ -47,17 +42,6 @@ async function findWorkspacePackagesNoCheck(workspaceRoot, opts) {
     return pkgs;
 }
 exports.findWorkspacePackagesNoCheck = findWorkspacePackagesNoCheck;
-async function requirePackagesManifest(dir) {
-    try {
-        return await (0, read_yaml_file_1.default)(path_1.default.join(dir, constants_1.WORKSPACE_MANIFEST_FILENAME));
-    }
-    catch (err) { // eslint-disable-line
-        if (err['code'] === 'ENOENT') {
-            return null;
-        }
-        throw err;
-    }
-}
 function arrayOfWorkspacePackagesToMap(pkgs) {
     return pkgs.reduce((acc, pkg) => {
         if (!pkg.manifest.name)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/workspace.find-packages",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Finds packages inside a workspace",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,15 +23,14 @@
   "homepage": "https://github.com/pnpm/pnpm/blob/main/workspace/find-packages#readme",
   "dependencies": {
     "@pnpm/util.lex-comparator": "1.0.0",
-    "read-yaml-file": "^2.1.0",
-    "@pnpm/cli-utils": "2.1.0",
-    "@pnpm/constants": "7.1.1",
+    "@pnpm/cli-utils": "2.1.2",
     "@pnpm/fs.find-packages": "2.0.8",
-    "@pnpm/types": "9.4.0"
+    "@pnpm/types": "9.4.0",
+    "@pnpm/workspace.read-manifest": "1.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
-    "@pnpm/workspace.find-packages": "1.1.0"
+    "@pnpm/workspace.find-packages": "1.1.2"
   },
   "peerDependencies": {
     "@pnpm/logger": "^5.0.0"

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}