fix: revert back some fs-extra changes

Author: JounQin

src/applyPatches.ts

@@ -1,4 +1,4 @@
-import { existsSync, writeFileSync } from "fs"
+import { existsSync, writeFileSync } from "fs-extra"
 import { posix } from "path"
 import { blue, bold, cyan, green, red, yellow } from "picocolors"
 import semver from "semver"

src/detectPackageManager.ts

@@ -1,5 +1,5 @@
 import findWorkspaceRoot from "find-yarn-workspace-root"
-import fs from "fs"
+import fs from "fs-extra"
 import { bold, red } from "picocolors"
 import process from "process"
 import { join } from "./path"

src/getAppRootPath.ts

@@ -1,6 +1,6 @@
-import { join, resolve } from "./path"
+import { existsSync } from "fs-extra"
 import process from "process"
-import { existsSync } from "fs"
+import { join, resolve } from "./path"
 
 export const getAppRootPath = (): string => {
   let cwd = process.cwd()

src/getPackageResolution.ts

@@ -1,12 +1,12 @@
-import { join, resolve } from "./path"
-import { PackageDetails, getPatchDetailsFromCliString } from "./PackageDetails"
-import { PackageManager, detectPackageManager } from "./detectPackageManager"
-import { readFileSync, existsSync } from "fs"
 import { parse as parseYarnLockFile } from "@yarnpkg/lockfile"
-import yaml from "yaml"
 import findWorkspaceRoot from "find-yarn-workspace-root"
-import { getPackageVersion } from "./getPackageVersion"
+import { existsSync, readFileSync } from "fs-extra"
+import yaml from "yaml"
+import { PackageDetails, getPatchDetailsFromCliString } from "./PackageDetails"
 import { coerceSemVer } from "./coerceSemVer"
+import { PackageManager, detectPackageManager } from "./detectPackageManager"
+import { getPackageVersion } from "./getPackageVersion"
+import { join, resolve } from "./path"
 
 export function getPackageResolution({
   packageDetails,

src/patch/apply.ts

@@ -1,8 +1,16 @@
-import fs from "fs"
-import fse from "fs-extra"
+import {
+  chmodSync,
+  ensureDirSync,
+  existsSync,
+  moveSync,
+  readFileSync,
+  statSync,
+  unlinkSync,
+  writeFileSync,
+} from "fs-extra"
 import { dirname, join, relative, resolve } from "path"
-import { ParsedPatchFile, FilePatch, Hunk } from "./parse"
 import { assertNever } from "../assertNever"
+import { FilePatch, Hunk, ParsedPatchFile } from "./parse"
 
 export const executeEffects = (
   effects: ParsedPatchFile,
@@ -19,7 +27,7 @@ export const executeEffects = (
     switch (eff.type) {
       case "file deletion":
         if (dryRun) {
-          if (!fs.existsSync(inCwd(eff.path))) {
+          if (!existsSync(inCwd(eff.path))) {
             throw new Error(
               "Trying to delete file that doesn't exist: " +
                 humanReadable(eff.path),
@@ -28,7 +36,7 @@ export const executeEffects = (
         } else {
           // TODO: integrity checks
           try {
-            fs.unlinkSync(inCwd(eff.path))
+            unlinkSync(inCwd(eff.path))
           } catch (e) {
             if (bestEffort) {
               errors?.push(`Failed to delete file ${eff.path}`)
@@ -41,15 +49,15 @@ export const executeEffects = (
       case "rename":
         if (dryRun) {
           // TODO: see what patch files look like if moving to exising path
-          if (!fs.existsSync(inCwd(eff.fromPath))) {
+          if (!existsSync(inCwd(eff.fromPath))) {
             throw new Error(
               "Trying to move file that doesn't exist: " +
                 humanReadable(eff.fromPath),
             )
           }
         } else {
           try {
-            fse.moveSync(inCwd(eff.fromPath), inCwd(eff.toPath))
+            moveSync(inCwd(eff.fromPath), inCwd(eff.toPath))
           } catch (e) {
             if (bestEffort) {
               errors?.push(
@@ -63,7 +71,7 @@ export const executeEffects = (
         break
       case "file creation":
         if (dryRun) {
-          if (fs.existsSync(inCwd(eff.path))) {
+          if (existsSync(inCwd(eff.path))) {
             throw new Error(
               "Trying to create file that already exists: " +
                 humanReadable(eff.path),
@@ -77,8 +85,8 @@ export const executeEffects = (
             : ""
           const path = inCwd(eff.path)
           try {
-            fse.ensureDirSync(dirname(path))
-            fs.writeFileSync(path, fileContents, { mode: eff.mode })
+            ensureDirSync(dirname(path))
+            writeFileSync(path, fileContents, { mode: eff.mode })
           } catch (e) {
             if (bestEffort) {
               errors?.push(`Failed to create new file ${eff.path}`)
@@ -92,7 +100,7 @@ export const executeEffects = (
         applyPatch(eff, { dryRun, cwd, bestEffort, errors })
         break
       case "mode change":
-        const currentMode = fs.statSync(inCwd(eff.path)).mode
+        const currentMode = statSync(inCwd(eff.path)).mode
         if (
           ((isExecutable(eff.newMode) && isExecutable(currentMode)) ||
             (!isExecutable(eff.newMode) && !isExecutable(currentMode))) &&
@@ -102,7 +110,7 @@ export const executeEffects = (
             `Mode change is not required for file ${humanReadable(eff.path)}`,
           )
         }
-        fs.chmodSync(inCwd(eff.path), eff.newMode)
+        chmodSync(inCwd(eff.path), eff.newMode)
         break
       default:
         assertNever(eff)
@@ -153,8 +161,8 @@ function applyPatch(
 ): void {
   path = cwd ? resolve(cwd, path) : path
   // modifying the file in place
-  const fileContents = fs.readFileSync(path).toString()
-  const mode = fs.statSync(path).mode
+  const fileContents = readFileSync(path).toString()
+  const mode = statSync(path).mode
 
   const fileLines: string[] = fileContents.split(/\n/)
 
@@ -220,7 +228,7 @@ function applyPatch(
   }
 
   try {
-    fs.writeFileSync(path, fileLines.join("\n"), { mode })
+    writeFileSync(path, fileLines.join("\n"), { mode })
   } catch (e) {
     if (bestEffort) {
       errors?.push(`Failed to write file ${path}`)

src/patch/read.ts

@@ -1,4 +1,4 @@
-import { readFileSync } from "fs"
+import { readFileSync } from "fs-extra"
 import { normalize } from "path"
 import { bold, red } from "picocolors"
 import { PackageDetails } from "../PackageDetails"