replace find-up with empathic

Author: talentlessguy

packages/hardhat-core/package.json

@@ -66,7 +66,6 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/ci-info": "^2.0.0",
     "@types/debug": "^4.1.4",
-    "@types/find-up": "^2.1.1",
     "@types/fs-extra": "^5.1.0",
     "@types/keccak": "^3.0.1",
     "@types/lodash": "^4.14.123",
@@ -116,11 +115,11 @@
     "chokidar": "^4.0.0",
     "ci-info": "^2.0.0",
     "debug": "^4.1.1",
+    "empathic": "^1.0.0",
     "enquirer": "^2.3.0",
     "env-paths": "^2.2.0",
     "ethereum-cryptography": "^1.0.3",
     "ethereumjs-abi": "^0.6.8",
-    "find-up": "^2.1.0",
     "fp-ts": "1.19.3",
     "fs-extra": "^7.0.1",
     "immutable": "^4.0.0-rc.12",

packages/hardhat-core/src/internal/cli/autocomplete.ts

@@ -1,4 +1,4 @@
-import findup from "find-up";
+import findup from "empathic/find.mjs";
 import * as fs from "fs-extra";
 import * as path from "path";
 
@@ -305,9 +305,9 @@ function getTaskFromTaskDefinition(taskDef: TaskDefinition): Task {
 }
 
 function getProjectId(): string | undefined {
-  const packageJsonPath = findup.sync("package.json");
+  const packageJsonPath = findup.up("package.json");
 
-  if (packageJsonPath === null) {
+  if (packageJsonPath === undefined) {
     return undefined;
   }
 

packages/hardhat-core/src/internal/core/project-structure.ts

@@ -1,4 +1,4 @@
-import findUp from "find-up";
+import findUp from "empathic/find.mjs";
 import fsExtra from "fs-extra";
 import path from "path";
 
@@ -14,31 +14,31 @@ const CTS_CONFIG_FILENAME = "hardhat.config.cts";
 
 export function isCwdInsideProject() {
   return (
-    findUp.sync(TS_CONFIG_FILENAME) !== null ||
-    findUp.sync(CTS_CONFIG_FILENAME) !== null ||
-    findUp.sync(CJS_CONFIG_FILENAME) !== null ||
-    findUp.sync(JS_CONFIG_FILENAME) !== null
+    findUp.up(TS_CONFIG_FILENAME) !== undefined ||
+    findUp.up(CTS_CONFIG_FILENAME) !== undefined ||
+    findUp.up(CJS_CONFIG_FILENAME) !== undefined ||
+    findUp.up(JS_CONFIG_FILENAME) !== undefined
   );
 }
 
 export function getUserConfigPath() {
-  const tsConfigPath = findUp.sync(TS_CONFIG_FILENAME);
-  if (tsConfigPath !== null) {
+  const tsConfigPath = findUp.up(TS_CONFIG_FILENAME);
+  if (tsConfigPath !== undefined) {
     return tsConfigPath;
   }
 
-  const ctsConfigPath = findUp.sync(CTS_CONFIG_FILENAME);
-  if (ctsConfigPath !== null) {
+  const ctsConfigPath = findUp.up(CTS_CONFIG_FILENAME);
+  if (ctsConfigPath !== undefined) {
     return ctsConfigPath;
   }
 
-  const cjsConfigPath = findUp.sync(CJS_CONFIG_FILENAME);
-  if (cjsConfigPath !== null) {
+  const cjsConfigPath = findUp.up(CJS_CONFIG_FILENAME);
+  if (cjsConfigPath !== undefined) {
     return cjsConfigPath;
   }
 
-  const pathToConfigFile = findUp.sync(JS_CONFIG_FILENAME);
-  if (pathToConfigFile === null) {
+  const pathToConfigFile = findUp.up(JS_CONFIG_FILENAME);
+  if (pathToConfigFile === undefined) {
     throw new HardhatError(ERRORS.GENERAL.NOT_INSIDE_PROJECT);
   }
 

packages/hardhat-core/src/internal/sentry/anonymizer.ts

@@ -1,5 +1,5 @@
 import { Event, Exception, StackFrame, Stacktrace } from "@sentry/node";
-import findup from "find-up";
+import findup from "empathic/find.mjs";
 import { either } from "fp-ts";
 import * as path from "path";
 
@@ -59,7 +59,7 @@ export class Anonymizer {
     if (filename === this._configPath) {
       const packageJsonPath = this._getFilePackageJsonPath(filename);
 
-      if (packageJsonPath === null) {
+      if (packageJsonPath === undefined) {
         // if we can't find a package.json, we just return the basename
         return {
           anonymizedFilename: path.basename(filename),
@@ -163,8 +163,8 @@ export class Anonymizer {
     return false;
   }
 
-  protected _getFilePackageJsonPath(filename: string): string | null {
-    return findup.sync("package.json", {
+  protected _getFilePackageJsonPath(filename: string): string | undefined {
+    return findup.up("package.json", {
       cwd: path.dirname(filename),
     });
   }

packages/hardhat-core/src/internal/util/caller-package.ts

@@ -1,8 +1,8 @@
-import findup from "find-up";
+import findup from "empathic/find.mjs";
 import path from "path";
 
-function findClosestPackageJson(file: string): string | null {
-  return findup.sync("package.json", { cwd: path.dirname(file) });
+function findClosestPackageJson(file: string): string | undefined {
+  return findup.up("package.json", { cwd: path.dirname(file) });
 }
 
 /**
@@ -35,7 +35,7 @@ export function getClosestCallerPackage(): string | undefined {
         continue;
       }
 
-      if (callerPackage === null) {
+      if (callerPackage === undefined) {
         return undefined;
       }
 

packages/hardhat-core/src/internal/util/packageInfo.ts

@@ -1,4 +1,4 @@
-import findup from "find-up";
+import findup from "empathic/find.mjs";
 import fsExtra from "fs-extra";
 import path from "path";
 
@@ -23,13 +23,13 @@ export interface PackageJson {
   };
 }
 
-export function findClosestPackageJson(file: string): string | null {
-  return findup.sync("package.json", { cwd: path.dirname(file) });
+export function findClosestPackageJson(file: string): string | undefined {
+  return findup.up("package.json", { cwd: path.dirname(file) });
 }
 
 export async function getPackageName(file: string): Promise<string> {
   const packageJsonPath = findClosestPackageJson(file);
-  if (packageJsonPath !== null && packageJsonPath !== "") {
+  if (packageJsonPath !== undefined && packageJsonPath !== "") {
     const packageJson: PackageJson = await fsExtra.readJSON(packageJsonPath);
     return packageJson.name;
   }
@@ -45,7 +45,7 @@ export function getHardhatVersion(): string {
   const packageJsonPath = findClosestPackageJson(__filename);
 
   assertHardhatInvariant(
-    packageJsonPath !== null,
+    packageJsonPath !== undefined,
     "There should be a package.json in hardhat-core's root directory"
   );
 
@@ -57,10 +57,10 @@ export function getHardhatVersion(): string {
  * Return the contents of the package.json in the user's project
  */
 export function getProjectPackageJson(): Promise<any> {
-  const packageJsonPath = findup.sync("package.json");
+  const packageJsonPath = findup.up("package.json");
 
   assertHardhatInvariant(
-    packageJsonPath !== null,
+    packageJsonPath !== undefined,
     "Expected a package.json file in the current directory or in an ancestor directory"
   );