fix(deps): update to rimraf v4, remove path-exists (#3616)

Author: JamesHenry

.github/workflows/ci.yml

@@ -117,7 +117,7 @@ jobs:
 
           # Ignored specs currently failing on windows
           # TODO: investigate why
-          npx nx run-many -t test --parallel=3 --ci --maxWorkers=2 --testTimeout=45000 --testPathIgnorePatterns=create-symlink.spec.ts --testPathIgnorePatterns=get-two-factor-auth-required.spec.ts --testPathIgnorePatterns=version-lifecycle-scripts.spec.ts --testPathIgnorePatterns=version-allow-branch.spec.ts --testPathIgnorePatterns=version-message.spec.ts --testPathIgnorePatterns=version-conventional-commits.spec.ts --testPathIgnorePatterns=version-bump-prerelease.spec.ts --testPathIgnorePatterns=version-bump.spec.ts --testPathIgnorePatterns=version-git-hosted-siblings.spec.ts --testPathIgnorePatterns=version-command.spec.ts  --testPathIgnorePatterns=bootstrap-command.spec.ts --testPathIgnorePatterns=import-command.spec.ts --testPathIgnorePatterns=publish-command.spec.ts --testPathIgnorePatterns=publish-licenses.spec.ts --testPathIgnorePatterns=publish-lifecycle-scripts.spec.ts --testPathIgnorePatterns=publish-tagging.spec.ts --testPathIgnorePatterns=publish-relative-file-specifiers.spec.ts &
+          npx nx run-many -t test --parallel=3 --ci --maxWorkers=2 --testTimeout=60000 --testPathIgnorePatterns=create-symlink.spec.ts --testPathIgnorePatterns=get-two-factor-auth-required.spec.ts --testPathIgnorePatterns=version-lifecycle-scripts.spec.ts --testPathIgnorePatterns=version-allow-branch.spec.ts --testPathIgnorePatterns=version-message.spec.ts --testPathIgnorePatterns=version-conventional-commits.spec.ts --testPathIgnorePatterns=version-bump-prerelease.spec.ts --testPathIgnorePatterns=version-bump.spec.ts --testPathIgnorePatterns=version-git-hosted-siblings.spec.ts --testPathIgnorePatterns=version-command.spec.ts  --testPathIgnorePatterns=bootstrap-command.spec.ts --testPathIgnorePatterns=import-command.spec.ts --testPathIgnorePatterns=publish-command.spec.ts --testPathIgnorePatterns=publish-licenses.spec.ts --testPathIgnorePatterns=publish-lifecycle-scripts.spec.ts --testPathIgnorePatterns=publish-tagging.spec.ts --testPathIgnorePatterns=publish-relative-file-specifiers.spec.ts &
 
           pids+=($!)
 

libs/commands/import/src/lib/import-command.spec.ts

@@ -10,7 +10,6 @@ import {
 import execa from "execa";
 import fs from "fs-extra";
 import path from "path";
-import pathExists from "path-exists";
 
 const promptConfirmation = jest.mocked(_promptConfirmation);
 
@@ -45,7 +44,7 @@ describe("ImportCommand", () => {
       await lernaImport(testDir)(externalDir);
 
       expect(await lastCommitInDir(testDir)).toBe("Init external commit");
-      expect(await pathExists(packageJson)).toBe(true);
+      expect(fs.existsSync(packageJson)).toBe(true);
     });
 
     it("imports a repo with conflicted merge commits when run with --flatten", async () => {
@@ -84,7 +83,7 @@ describe("ImportCommand", () => {
       await lernaImport(testDir)(externalDir, "--flatten");
 
       expect(await lastCommitInDir(testDir)).toBe("Branch merged");
-      expect(await pathExists(newFilePath)).toBe(true);
+      expect(fs.existsSync(newFilePath)).toBe(true);
     });
 
     it("imports a repo into the root directory when packages are located there", async () => {
@@ -94,8 +93,8 @@ describe("ImportCommand", () => {
       await lernaImport(testDir)(externalDir);
 
       expect(await lastCommitInDir(testDir)).toBe("myapp-foo init commit");
-      expect(await pathExists(path.join(testDir, "myapp-foo/old-file"))).toBe(true);
-      expect(await pathExists(path.join(testDir, "myapp-foo/package.json"))).toBe(true);
+      expect(fs.existsSync(path.join(testDir, "myapp-foo/old-file"))).toBe(true);
+      expect(fs.existsSync(path.join(testDir, "myapp-foo/package.json"))).toBe(true);
     });
 
     it("supports moved files within the external repo", async () => {
@@ -108,7 +107,7 @@ describe("ImportCommand", () => {
       await lernaImport(testDir)(externalDir);
 
       expect(await lastCommitInDir(testDir)).toBe("Moved old-file to new-file");
-      expect(await pathExists(newFilePath)).toBe(true);
+      expect(fs.existsSync(newFilePath)).toBe(true);
     });
 
     it("supports filepaths that have spaces within the external repo", async () =>
@@ -128,8 +127,8 @@ describe("ImportCommand", () => {
           }
 
           expect(await lastCommitInDir(testDir)).toBe("Init external commit");
-          expect(await pathExists(newFilePath)).toBe(true);
-          expect(await pathExists(newDeepFilePath)).toBe(true);
+          expect(fs.existsSync(newFilePath)).toBe(true);
+          expect(fs.existsSync(newDeepFilePath)).toBe(true);
         })
       ));
 
@@ -159,8 +158,8 @@ describe("ImportCommand", () => {
           }
 
           expect(await lastCommitInDir(testDir)).toBe("rename");
-          expect(await pathExists(copyFilePath)).toBe(true);
-          expect(await pathExists(renameFilePath)).toBe(true);
+          expect(fs.existsSync(copyFilePath)).toBe(true);
+          expect(fs.existsSync(renameFilePath)).toBe(true);
         })
       ));
 
@@ -315,7 +314,7 @@ describe("ImportCommand", () => {
       await lernaImport(testDir)(externalDir);
 
       expect(await lastCommitInDir(testDir)).toBe("[ISSUE-10] Moved old-file to new-file");
-      expect(await pathExists(newFilePath)).toBe(true);
+      expect(fs.existsSync(newFilePath)).toBe(true);
     });
   });
 
@@ -330,7 +329,7 @@ describe("ImportCommand", () => {
       await lernaImport(testDir)(externalDir);
 
       expect(await lastCommitInDir(rootDir)).toBe("Init external commit");
-      expect(await pathExists(packageJson)).toBe(true);
+      expect(fs.existsSync(packageJson)).toBe(true);
     });
   });
 
@@ -344,7 +343,7 @@ describe("ImportCommand", () => {
       await lernaImport(testDir)(externalDir, "--dest=packages");
 
       expect(await lastCommitInDir(testDir)).toBe("Init external commit");
-      expect(await pathExists(packageJson)).toBe(true);
+      expect(fs.existsSync(packageJson)).toBe(true);
     });
 
     it("throws error when the package directory does not match with config", async () => {

libs/core/src/lib/rimraf-dir.spec.ts

@@ -1,59 +1,18 @@
-"use strict";
-
+import { existsSync } from "fs";
 import log from "npmlog";
-import path from "node:path";
-import fs from "node:fs";
-import pathExists from "path-exists";
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const childProcess = require("@lerna/child-process");
-
-let rimrafBinPath: string | undefined;
-
-async function useRimrafBinPath(): Promise<string> {
-  if (typeof rimrafBinPath === "string") {
-    return rimrafBinPath;
-  }
-
-  const filePath = require.resolve("rimraf");
-  const directoryPath = path.basename(filePath);
-
-  try {
-    const rawFile = await fs.promises.readFile(path.join(directoryPath, "package.json"), {
-      encoding: "utf-8",
-    });
-    const file = JSON.parse(rawFile);
-
-    rimrafBinPath = file.bin || require.resolve("rimraf/bin");
-  } catch (e) {
-    rimrafBinPath = require.resolve("rimraf/bin");
-  }
-
-  return rimrafBinPath as string;
-}
+import rimraf from "rimraf";
 
 export async function rimrafDir(dirPath: string) {
   log.silly("rimrafDir", dirPath);
-  // Shelling out to a child process for a noop is expensive.
-  // Checking if `dirPath` exists to be removed is cheap.
-  // This lets us short-circuit if we don't have anything to do.
 
-  const fileExists = await pathExists(dirPath);
-  if (!fileExists) {
+  // Short-circuit if we don't have anything to do.
+  if (!existsSync(dirPath)) {
     return;
   }
 
-  const cliPath = await useRimrafBinPath();
-
-  // globs only return directories with a trailing slash
-  const slashed = path.normalize(`${dirPath}/`);
-  const args = [cliPath, "--no-glob", slashed];
-
-  // We call this resolved CLI path in the "path/to/node path/to/cli <..args>"
-  // pattern to avoid Windows hangups with shebangs (e.g., WSH can't handle it)
-  return childProcess.spawn(process.execPath, args).then(() => {
-    log.verbose("rimrafDir", "removed", dirPath);
-
-    return dirPath;
-  });
+  const isSuccessful = await rimraf(dirPath);
+  if (!isSuccessful) {
+    throw new Error(`Failed to fully remove ${dirPath}`);
+  }
+  log.verbose("rimrafDir", "removed", dirPath);
 }

libs/core/src/lib/rimraf-dir.ts

@@ -88,12 +88,11 @@
     "p-reduce": "^2.1.0",
     "p-waterfall": "^2.1.1",
     "pacote": "^13.6.2",
-    "path-exists": "^4.0.0",
     "pify": "^5.0.0",
     "read-cmd-shim": "^3.0.0",
     "read-package-json": "^5.0.1",
     "resolve-from": "^5.0.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.4.1",
     "semver": "^7.3.8",
     "signal-exit": "^3.0.3",
     "slash": "^3.0.0",

package-lock.json

@@ -70,7 +70,6 @@
     "p-queue": "6.6.2",
     "p-waterfall": "2.1.1",
     "pacote": "13.6.2",
-    "path-exists": "4.0.0",
     "pify": "5.0.0",
     "pretty-format": "29.4.3",
     "read-cmd-shim": "3.0.0",

package.json

@@ -92,12 +92,11 @@
     "p-reduce": "2.1.0",
     "p-waterfall": "2.1.1",
     "pacote": "13.6.2",
-    "path-exists": "4.0.0",
     "pify": "5.0.0",
     "read-cmd-shim": "3.0.0",
     "read-package-json": "5.0.1",
     "resolve-from": "5.0.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.4.1",
     "semver": "^7.3.8",
     "signal-exit": "3.0.7",
     "slash": "3.0.0",