remove fs-extra from tools package

Thinkmill · Jul 7, 2024 · 8605d35 · 8605d35
1 parent aec5096
commit 8605d35
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 57 deletions.
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,5 +1,5 @@
 import path from "path";
-import fs from "fs-extra";
+import fs from "fs";
 
 import { Tool, PackageJSON, Packages, InvalidMonorepoError } from "./Tool";
 import {
@@ -18,9 +18,9 @@ export const BoltTool: Tool = {
 
   async isMonorepoRoot(directory: string): Promise<boolean> {
     try {
-      const pkgJson = (await fs.readJson(
+      const pkgJson = JSON.parse((await fs.promises.readFile(
         path.join(directory, "package.json")
-      )) as BoltPackageJSON;
+      )).toString()) as BoltPackageJSON;
       if (pkgJson.bolt && pkgJson.bolt.workspaces) {
         return true;
       }
@@ -35,9 +35,9 @@ export const BoltTool: Tool = {
 
   isMonorepoRootSync(directory: string): boolean {
     try {
-      const pkgJson = fs.readJsonSync(
+      const pkgJson = JSON.parse(fs.readFileSync(
         path.join(directory, "package.json")
-      ) as BoltPackageJSON;
+      ).toString()) as BoltPackageJSON;
       if (pkgJson.bolt && pkgJson.bolt.workspaces) {
         return true;
       }
@@ -54,9 +54,9 @@ export const BoltTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson = (await fs.readJson(
+      const pkgJson = JSON.parse((await fs.promises.readFile(
         path.join(rootDir, "package.json")
-      )) as BoltPackageJSON;
+      )).toString()) 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 +88,9 @@ export const BoltTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson = fs.readJsonSync(
+      const pkgJson = JSON.parse(fs.readFileSync(
         path.join(rootDir, "package.json")
-      ) as BoltPackageJSON;
+      ).toString()) 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,5 +1,5 @@
 import path from "path";
-import fs from "fs-extra";
+import fs from "fs";
 
 import {
   Tool,
@@ -23,9 +23,9 @@ export const LernaTool: Tool = {
 
   async isMonorepoRoot(directory: string): Promise<boolean> {
     try {
-      const lernaJson = (await fs.readJson(
+      const lernaJson = JSON.parse((await fs.promises.readFile(
         path.join(directory, "lerna.json")
-      )) as LernaJson;
+      )).toString()) as LernaJson;
       if (lernaJson.useWorkspaces !== true) {
         return true;
       }
@@ -40,9 +40,9 @@ export const LernaTool: Tool = {
 
   isMonorepoRootSync(directory: string): boolean {
     try {
-      const lernaJson = fs.readJsonSync(
+      const lernaJson = JSON.parse(fs.readFileSync(
         path.join(directory, "lerna.json")
-      ) as LernaJson;
+      ).toString()) as LernaJson;
       if (lernaJson.useWorkspaces !== true) {
         return true;
       }
@@ -59,10 +59,12 @@ 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(
+      const lernaJson = JSON.parse((await fs.promises.readFile(
+        path.join(rootDir, "lerna.json")
+      )).toString()) as LernaJson;
+      const pkgJson = JSON.parse((await fs.promises.readFile(
         path.join(rootDir, "package.json")
-      )) as PackageJSON;
+      )).toString()) as PackageJSON;
       const packageGlobs: string[] = lernaJson.packages || ["packages/*"];
 
       return {
@@ -89,12 +91,12 @@ export const LernaTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const lernaJson = fs.readJsonSync(
+      const lernaJson = JSON.parse(fs.readFileSync(
         path.join(rootDir, "lerna.json")
-      ) as LernaJson;
-      const pkgJson = fs.readJsonSync(
+      ).toString()) as LernaJson;
+      const pkgJson = JSON.parse(fs.readFileSync(
         path.join(rootDir, "package.json")
-      ) as PackageJSON;
+      ).toString()) as PackageJSON;
       const packageGlobs: string[] = lernaJson.packages || ["packages/*"];
 
       return {

diff --git a/packages/tools/src/PnpmTool.ts b/packages/tools/src/PnpmTool.ts
@@ -1,6 +1,6 @@
 import path from "path";
 import readYamlFile, { sync as readYamlFileSync } from "read-yaml-file";
-import fs from "fs-extra";
+import fs from "fs";
 
 import {
   Tool,
@@ -64,9 +64,9 @@ export const PnpmTool: Tool = {
       const manifest = await readYamlFile<{ packages?: string[] }>(
         path.join(rootDir, "pnpm-workspace.yaml")
       );
-      const pkgJson = (await fs.readJson(
+      const pkgJson = JSON.parse((await fs.promises.readFile(
         path.join(rootDir, "package.json")
-      )) as PackageJSON;
+      )).toString()) as PackageJSON;
       const packageGlobs: string[] = manifest.packages!;
 
       return {
@@ -96,9 +96,9 @@ export const PnpmTool: Tool = {
       const manifest = readYamlFileSync<{ packages?: string[] }>(
         path.join(rootDir, "pnpm-workspace.yaml")
       );
-      const pkgJson = fs.readJsonSync(
+      const pkgJson = JSON.parse(fs.readFileSync(
         path.join(rootDir, "package.json")
-      ) as PackageJSON;
+      ).toString()) 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,5 @@
 import path from "path";
-import fs from "fs-extra";
+import fs from "fs";
 
 import {
   Tool,
@@ -8,7 +8,6 @@ import {
   Packages,
   InvalidMonorepoError,
 } from "./Tool";
-import { expandPackageGlobs } from "./expandPackageGlobs";
 
 export const RootTool: Tool = {
   type: "root",
@@ -27,9 +26,9 @@ export const RootTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson: PackageJSON = await fs.readJson(
+      const pkgJson = JSON.parse((await fs.promises.readFile(
         path.join(rootDir, "package.json")
-      );
+      )).toString()) as PackageJSON;
       const pkg: Package = {
         dir: rootDir,
         relativeDir: ".",
@@ -56,9 +55,9 @@ export const RootTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson: PackageJSON = fs.readJsonSync(
+      const pkgJson = JSON.parse(fs.readFileSync(
         path.join(rootDir, "package.json")
-      );
+      ).toString()) 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,5 @@
 import path from "path";
-import fs from "fs-extra";
+import fs from "fs";
 import jju from "jju";
 
 import {
@@ -24,7 +24,7 @@ export const RushTool: Tool = {
 
   async isMonorepoRoot(directory: string): Promise<boolean> {
     try {
-      await fs.readFile(path.join(directory, "rush.json"), "utf8");
+      await fs.promises.readFile(path.join(directory, "rush.json"), "utf8");
       return true;
     } catch (err) {
       if (err && (err as { code: string }).code === "ENOENT") {
@@ -52,7 +52,7 @@ export const RushTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const rushText: string = await fs.readFile(
+      const rushText: string = await fs.promises.readFile(
         path.join(rootDir, "rush.json"),
         "utf8"
       );
@@ -69,7 +69,9 @@ export const RushTool: Tool = {
           return {
             dir,
             relativeDir: path.relative(directory, dir),
-            packageJson: await fs.readJson(path.join(dir, "package.json")),
+            packageJson: JSON.parse((await fs.promises.readFile(
+              path.join(dir, "package.json")
+            )).toString()),
           };
         })
       );
@@ -107,9 +109,9 @@ export const RushTool: Tool = {
         path.resolve(rootDir, project.projectFolder)
       );
       const packages: Package[] = directories.map((dir: string) => {
-        const packageJson: PackageJSON = fs.readJsonSync(
+        const packageJson: PackageJSON = JSON.parse(fs.readFileSync(
           path.join(dir, "package.json")
-        );
+        ).toString());
         return {
           dir,
           relativeDir: path.relative(directory, dir),

diff --git a/packages/tools/src/YarnTool.ts b/packages/tools/src/YarnTool.ts
@@ -1,9 +1,8 @@
 import path from "path";
-import fs from "fs-extra";
+import fs from "fs";
 
 import {
   Tool,
-  Package,
   PackageJSON,
   Packages,
   InvalidMonorepoError,
@@ -22,9 +21,9 @@ export const YarnTool: Tool = {
 
   async isMonorepoRoot(directory: string): Promise<boolean> {
     try {
-      const pkgJson = (await fs.readJson(
+      const pkgJson = JSON.parse((await fs.promises.readFile(
         path.join(directory, "package.json")
-      )) as YarnPackageJSON;
+      )).toString()) as YarnPackageJSON;
       if (pkgJson.workspaces) {
         if (
           Array.isArray(pkgJson.workspaces) ||
@@ -44,9 +43,9 @@ export const YarnTool: Tool = {
 
   isMonorepoRootSync(directory: string): boolean {
     try {
-      const pkgJson = fs.readJsonSync(
+      const pkgJson = JSON.parse(fs.readFileSync(
         path.join(directory, "package.json")
-      ) as YarnPackageJSON;
+      ).toString()) as YarnPackageJSON;
       if (pkgJson.workspaces) {
         if (
           Array.isArray(pkgJson.workspaces) ||
@@ -68,9 +67,9 @@ export const YarnTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson = (await fs.readJson(
+      const pkgJson = JSON.parse((await fs.promises.readFile(
         path.join(rootDir, "package.json")
-      )) as YarnPackageJSON;
+      )).toString()) as YarnPackageJSON;
       const packageGlobs: string[] = Array.isArray(pkgJson.workspaces)
         ? pkgJson.workspaces
         : pkgJson.workspaces!.packages;
@@ -99,9 +98,9 @@ export const YarnTool: Tool = {
     const rootDir = path.resolve(directory);
 
     try {
-      const pkgJson = fs.readJsonSync(
+      const pkgJson = JSON.parse(fs.readFileSync(
         path.join(rootDir, "package.json")
-      ) as YarnPackageJSON;
+      ).toString()) as YarnPackageJSON;
       const packageGlobs: string[] = Array.isArray(pkgJson.workspaces)
         ? pkgJson.workspaces
         : pkgJson.workspaces!.packages;

diff --git a/packages/tools/src/expandPackageGlobs.ts b/packages/tools/src/expandPackageGlobs.ts
@@ -1,8 +1,8 @@
 import path from "path";
-import fs from "fs-extra";
+import fs from "fs";
 import globby from "globby";
 
-import { Tool, Package, PackageJSON, Packages, MonorepoRoot } from "./Tool";
+import { Package, PackageJSON } from "./Tool";
 
 /**
  * This internal method takes a list of one or more directory globs and the absolute path
@@ -26,19 +26,21 @@ export async function expandPackageGlobs(
   const discoveredPackages: Array<Package | undefined> = await Promise.all(
     directories.map((dir) =>
       fs
-        .readJson(path.join(dir, "package.json"))
+        .promises
+        .readFile(path.join(dir, "package.json"))
         .catch((err) => {
           if (err && (err as { code: string }).code === "ENOENT") {
             return undefined;
           }
           throw err;
         })
-        .then((result: PackageJSON | undefined) => {
-          if (result) {
+        .then((result: Buffer | undefined) => {
+          const s = result?.toString();
+          if (s) {
             return {
               dir: path.resolve(dir),
               relativeDir: path.relative(directory, dir),
-              packageJson: result,
+              packageJson: JSON.parse(s),
             };
           }
         })
@@ -68,9 +70,9 @@ export function expandPackageGlobsSync(
   const discoveredPackages: Array<Package | undefined> = directories.map(
     (dir) => {
       try {
-        const packageJson: PackageJSON = fs.readJsonSync(
+        const packageJson: PackageJSON = JSON.parse(fs.readFileSync(
           path.join(dir, "package.json")
-        );
+        ).toString());
         return {
           dir: path.resolve(dir),
           relativeDir: path.relative(directory, dir),