remove fs-extra from dependencies (#212)

Thinkmill · Aug 9, 2024 · c0a5e5d · c0a5e5d
1 parent 2ebda03
commit c0a5e5d
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 84 deletions.
diff --git a/.changeset/spotty-owls-pull.md b/.changeset/spotty-owls-pull.md
@@ -0,0 +1,6 @@
+---
+"@manypkg/find-root": patch
+"@manypkg/tools": patch
+---
+
+Remove fs-extra from dependencies
diff --git a/packages/find-root/package.json b/packages/find-root/package.json
@@ -10,8 +10,7 @@
   "main": "dist/manypkg-find-root.cjs.js",
   "module": "dist/manypkg-find-root.esm.js",
   "dependencies": {
-    "@manypkg/tools": "^1.1.1",
-    "fs-extra": "^8.1.0"
+    "@manypkg/tools": "^1.1.1"
   },
   "devDependencies": {
     "@types/node": "^16.11.7",

diff --git a/packages/find-root/src/index.ts b/packages/find-root/src/index.ts
@@ -1,5 +1,6 @@
 import path from "path";
-import fs from "fs-extra";
+import fs from "fs";
+import fsp from "fs/promises";
 
 import {
   Tool,
@@ -114,7 +115,7 @@ export async function findRoot(
   let rootDir = await findUp(
     async (directory) => {
       try {
-        await fs.access(path.join(directory, "package.json"));
+        await fsp.access(path.join(directory, "package.json"));
         return directory;
       } catch (err) {
         if (!isNoEntryError(err)) {

diff --git a/packages/tools/package.json b/packages/tools/package.json
@@ -9,7 +9,6 @@
   "license": "MIT",
   "main": "dist/manypkg-tools.cjs.js",
   "dependencies": {
-    "fs-extra": "^8.1.0",
     "globby": "^11.0.0",
     "jju": "^1.4.0",
     "read-yaml-file": "^1.1.0"

diff --git a/packages/tools/src/BoltTool.ts b/packages/tools/src/BoltTool.ts
@@ -1,11 +1,11 @@
 import path from "path";
-import fs from "fs-extra";
 
 import { Tool, PackageJSON, Packages, InvalidMonorepoError } from "./Tool";
 import {
   expandPackageGlobs,
   expandPackageGlobsSync,
 } from "./expandPackageGlobs";
+import { readJson, readJsonSync } from "./utils";
 
 export interface BoltPackageJSON extends PackageJSON {
   bolt?: {
@@ -18,9 +18,7 @@ export const BoltTool: Tool = {
 
   async isMonorepoRoot(directory: string): Promise<boolean> {
     try {
-      const pkgJson = (await fs.readJson(
-        path.join(directory, "package.json")
-      )) as BoltPackageJSON;
+      const pkgJson = await readJson(directory, "package.json") as BoltPackageJSON;
       if (pkgJson.bolt && pkgJson.bolt.workspaces) {
         return true;
       }
@@ -35,9 +33,7 @@ export const BoltTool: Tool = {
 
   isMonorepoRootSync(directory: string): boolean {
     try {
-      const pkgJson = fs.readJsonSync(
-        path.join(directory, "package.json")
-      ) as BoltPackageJSON;
+      const pkgJson = readJsonSync(directory, "package.json") as BoltPackageJSON;
       if (pkgJson.bolt && pkgJson.bolt.workspaces) {
         return true;
       }
@@ -54,9 +50,7 @@ export const BoltTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson = (await fs.readJson(
-        path.join(rootDir, "package.json")
-      )) as BoltPackageJSON;
+      const pkgJson = await readJson(rootDir, "package.json") as BoltPackageJSON;
       if (!pkgJson.bolt || !pkgJson.bolt.workspaces) {
         throw new InvalidMonorepoError(
           `Directory ${rootDir} is not a valid ${BoltTool.type} monorepo root: missing bolt.workspaces entry`
@@ -88,9 +82,7 @@ export const BoltTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson = fs.readJsonSync(
-        path.join(rootDir, "package.json")
-      ) as BoltPackageJSON;
+      const pkgJson = readJsonSync(rootDir, "package.json") as BoltPackageJSON;
       if (!pkgJson.bolt || !pkgJson.bolt.workspaces) {
         throw new InvalidMonorepoError(
           `Directory ${directory} is not a valid ${BoltTool.type} monorepo root: missing bolt.workspaces entry`

diff --git a/packages/tools/src/LernaTool.ts b/packages/tools/src/LernaTool.ts
@@ -1,9 +1,7 @@
 import path from "path";
-import fs from "fs-extra";
 
 import {
   Tool,
-  Package,
   PackageJSON,
   Packages,
   InvalidMonorepoError,
@@ -12,6 +10,7 @@ import {
   expandPackageGlobs,
   expandPackageGlobsSync,
 } from "./expandPackageGlobs";
+import { readJson, readJsonSync } from "./utils";
 
 export interface LernaJson {
   useWorkspaces?: boolean;
@@ -23,9 +22,7 @@ export const LernaTool: Tool = {
 
   async isMonorepoRoot(directory: string): Promise<boolean> {
     try {
-      const lernaJson = (await fs.readJson(
-        path.join(directory, "lerna.json")
-      )) as LernaJson;
+      const lernaJson = await readJson(directory, "lerna.json") as LernaJson;
       if (lernaJson.useWorkspaces !== true) {
         return true;
       }
@@ -40,9 +37,7 @@ export const LernaTool: Tool = {
 
   isMonorepoRootSync(directory: string): boolean {
     try {
-      const lernaJson = fs.readJsonSync(
-        path.join(directory, "lerna.json")
-      ) as LernaJson;
+      const lernaJson = readJsonSync(directory, "lerna.json") as LernaJson;
       if (lernaJson.useWorkspaces !== true) {
         return true;
       }
@@ -59,10 +54,8 @@ export const LernaTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const lernaJson = await fs.readJson(path.join(rootDir, "lerna.json"));
-      const pkgJson = (await fs.readJson(
-        path.join(rootDir, "package.json")
-      )) as PackageJSON;
+      const lernaJson = await readJson(rootDir, "lerna.json") as LernaJson;
+      const pkgJson = await readJson(rootDir, "package.json") as PackageJSON;
       const packageGlobs: string[] = lernaJson.packages || ["packages/*"];
 
       return {
@@ -89,12 +82,8 @@ export const LernaTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const lernaJson = fs.readJsonSync(
-        path.join(rootDir, "lerna.json")
-      ) as LernaJson;
-      const pkgJson = fs.readJsonSync(
-        path.join(rootDir, "package.json")
-      ) as PackageJSON;
+      const lernaJson = readJsonSync(rootDir, "lerna.json") as LernaJson;
+      const pkgJson = readJsonSync(rootDir, "package.json") as PackageJSON;
       const packageGlobs: string[] = lernaJson.packages || ["packages/*"];
 
       return {

diff --git a/packages/tools/src/PnpmTool.ts b/packages/tools/src/PnpmTool.ts
@@ -1,10 +1,8 @@
 import path from "path";
 import readYamlFile, { sync as readYamlFileSync } from "read-yaml-file";
-import fs from "fs-extra";
 
 import {
   Tool,
-  Package,
   PackageJSON,
   Packages,
   InvalidMonorepoError,
@@ -13,6 +11,7 @@ import {
   expandPackageGlobs,
   expandPackageGlobsSync,
 } from "./expandPackageGlobs";
+import { readJson, readJsonSync } from "./utils";
 
 export interface PnpmWorkspaceYaml {
   packages?: string[];
@@ -64,9 +63,7 @@ export const PnpmTool: Tool = {
       const manifest = await readYamlFile<{ packages?: string[] }>(
         path.join(rootDir, "pnpm-workspace.yaml")
       );
-      const pkgJson = (await fs.readJson(
-        path.join(rootDir, "package.json")
-      )) as PackageJSON;
+      const pkgJson = await readJson(rootDir, "package.json") as PackageJSON;
       const packageGlobs: string[] = manifest.packages!;
 
       return {
@@ -96,9 +93,7 @@ export const PnpmTool: Tool = {
       const manifest = readYamlFileSync<{ packages?: string[] }>(
         path.join(rootDir, "pnpm-workspace.yaml")
       );
-      const pkgJson = fs.readJsonSync(
-        path.join(rootDir, "package.json")
-      ) as PackageJSON;
+      const pkgJson = readJsonSync(rootDir, "package.json") as PackageJSON;
       const packageGlobs: string[] = manifest.packages!;
 
       return {

diff --git a/packages/tools/src/RootTool.ts b/packages/tools/src/RootTool.ts
@@ -1,5 +1,4 @@
 import path from "path";
-import fs from "fs-extra";
 
 import {
   Tool,
@@ -8,7 +7,7 @@ import {
   Packages,
   InvalidMonorepoError,
 } from "./Tool";
-import { expandPackageGlobs } from "./expandPackageGlobs";
+import { readJson, readJsonSync } from "./utils";
 
 export const RootTool: Tool = {
   type: "root",
@@ -27,9 +26,7 @@ export const RootTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson: PackageJSON = await fs.readJson(
-        path.join(rootDir, "package.json")
-      );
+      const pkgJson = await readJson(rootDir, "package.json") as PackageJSON;
       const pkg: Package = {
         dir: rootDir,
         relativeDir: ".",
@@ -56,9 +53,7 @@ export const RootTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson: PackageJSON = fs.readJsonSync(
-        path.join(rootDir, "package.json")
-      );
+      const pkgJson = readJsonSync(rootDir, "package.json") as PackageJSON;
       const pkg: Package = {
         dir: rootDir,
         relativeDir: ".",

diff --git a/packages/tools/src/RushTool.ts b/packages/tools/src/RushTool.ts
@@ -1,5 +1,6 @@
 import path from "path";
-import fs from "fs-extra";
+import fs from "fs";
+import fsp from "fs/promises";
 import jju from "jju";
 
 import {
@@ -9,6 +10,7 @@ import {
   Packages,
   InvalidMonorepoError,
 } from "./Tool";
+import { readJson, readJsonSync } from "./utils";
 
 interface RushJson {
   projects: RushProject[];
@@ -24,15 +26,14 @@ export const RushTool: Tool = {
 
   async isMonorepoRoot(directory: string): Promise<boolean> {
     try {
-      await fs.readFile(path.join(directory, "rush.json"), "utf8");
+      await fsp.readFile(path.join(directory, "rush.json"), "utf8");
       return true;
     } catch (err) {
       if (err && (err as { code: string }).code === "ENOENT") {
         return false;
       }
       throw err;
     }
-    return false;
   },
 
   isMonorepoRootSync(directory: string): boolean {
@@ -45,14 +46,13 @@ export const RushTool: Tool = {
       }
       throw err;
     }
-    return false;
   },
 
   async getPackages(directory: string): Promise<Packages> {
     const rootDir = path.resolve(directory);
 
     try {
-      const rushText: string = await fs.readFile(
+      const rushText: string = await fsp.readFile(
         path.join(rootDir, "rush.json"),
         "utf8"
       );
@@ -69,7 +69,7 @@ export const RushTool: Tool = {
           return {
             dir,
             relativeDir: path.relative(directory, dir),
-            packageJson: await fs.readJson(path.join(dir, "package.json")),
+            packageJson: await readJson(dir, "package.json"),
           };
         })
       );
@@ -107,9 +107,7 @@ export const RushTool: Tool = {
         path.resolve(rootDir, project.projectFolder)
       );
       const packages: Package[] = directories.map((dir: string) => {
-        const packageJson: PackageJSON = fs.readJsonSync(
-          path.join(dir, "package.json")
-        );
+        const packageJson: PackageJSON = readJsonSync(dir, "package.json");
         return {
           dir,
           relativeDir: path.relative(directory, dir),

diff --git a/packages/tools/src/YarnTool.ts b/packages/tools/src/YarnTool.ts
@@ -1,9 +1,7 @@
 import path from "path";
-import fs from "fs-extra";
 
 import {
   Tool,
-  Package,
   PackageJSON,
   Packages,
   InvalidMonorepoError,
@@ -12,6 +10,7 @@ import {
   expandPackageGlobs,
   expandPackageGlobsSync,
 } from "./expandPackageGlobs";
+import { readJson, readJsonSync } from "./utils";
 
 export interface YarnPackageJSON extends PackageJSON {
   workspaces?: string[] | { packages: string[] };
@@ -22,9 +21,7 @@ export const YarnTool: Tool = {
 
   async isMonorepoRoot(directory: string): Promise<boolean> {
     try {
-      const pkgJson = (await fs.readJson(
-        path.join(directory, "package.json")
-      )) as YarnPackageJSON;
+      const pkgJson = await readJson(directory, "package.json") as YarnPackageJSON;
       if (pkgJson.workspaces) {
         if (
           Array.isArray(pkgJson.workspaces) ||
@@ -44,9 +41,7 @@ export const YarnTool: Tool = {
 
   isMonorepoRootSync(directory: string): boolean {
     try {
-      const pkgJson = fs.readJsonSync(
-        path.join(directory, "package.json")
-      ) as YarnPackageJSON;
+      const pkgJson = readJsonSync(directory, "package.json") as YarnPackageJSON;
       if (pkgJson.workspaces) {
         if (
           Array.isArray(pkgJson.workspaces) ||
@@ -68,9 +63,7 @@ export const YarnTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson = (await fs.readJson(
-        path.join(rootDir, "package.json")
-      )) as YarnPackageJSON;
+      const pkgJson = await readJson(rootDir, "package.json") as YarnPackageJSON;
       const packageGlobs: string[] = Array.isArray(pkgJson.workspaces)
         ? pkgJson.workspaces
         : pkgJson.workspaces!.packages;
@@ -99,9 +92,7 @@ export const YarnTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson = fs.readJsonSync(
-        path.join(rootDir, "package.json")
-      ) as YarnPackageJSON;
+      const pkgJson = readJsonSync(rootDir, "package.json") as YarnPackageJSON;
       const packageGlobs: string[] = Array.isArray(pkgJson.workspaces)
         ? pkgJson.workspaces
         : pkgJson.workspaces!.packages;