perf: remove find-up (#12601)

Author: 43081j

.changeset/purple-queens-vanish.md

@@ -0,0 +1,6 @@
+---
+"@cloudflare/workers-utils": patch
+"wrangler": patch
+---
+
+Switch to `empathic` for file-system upwards traversal to reduce dependency bloat.

packages/workers-utils/package.json

@@ -45,8 +45,8 @@
 		"@vitest/ui": "catalog:default",
 		"cloudflare": "^5.2.0",
 		"concurrently": "^8.2.2",
+		"empathic": "^2.0.0",
 		"eslint": "catalog:default",
-		"find-up": "^6.3.0",
 		"jsonc-parser": "catalog:default",
 		"smol-toml": "catalog:default",
 		"ts-dedent": "^2.2.0",

packages/workers-utils/src/config/config-helpers.ts

@@ -1,6 +1,6 @@
 import { existsSync } from "node:fs";
 import path from "node:path";
-import { findUpSync } from "find-up";
+import * as find from "empathic/find";
 import dedent from "ts-dedent";
 import { PATH_TO_DEPLOY_CONFIG } from "../constants";
 import { UserError } from "../errors";
@@ -61,9 +61,9 @@ export function findWranglerConfig(
 	{ useRedirectIfAvailable = false } = {}
 ): ConfigPaths {
 	const userConfigPath =
-		findUpSync(`wrangler.json`, { cwd: referencePath }) ??
-		findUpSync(`wrangler.jsonc`, { cwd: referencePath }) ??
-		findUpSync(`wrangler.toml`, { cwd: referencePath });
+		find.file(`wrangler.json`, { cwd: referencePath }) ??
+		find.file(`wrangler.jsonc`, { cwd: referencePath }) ??
+		find.file(`wrangler.toml`, { cwd: referencePath });
 
 	if (!useRedirectIfAvailable) {
 		return {
@@ -99,7 +99,7 @@ function findRedirectedWranglerConfig(
 	deployConfigPath: string | undefined;
 	redirected: boolean;
 } {
-	const deployConfigPath = findUpSync(PATH_TO_DEPLOY_CONFIG, { cwd });
+	const deployConfigPath = find.file(PATH_TO_DEPLOY_CONFIG, { cwd });
 	if (deployConfigPath === undefined) {
 		return { configPath: userConfigPath, deployConfigPath, redirected: false };
 	}

packages/wrangler/package.json

@@ -127,10 +127,10 @@
 		"devtools-protocol": "^0.0.1182435",
 		"dotenv": "^16.3.1",
 		"dotenv-expand": "^12.0.2",
+		"empathic": "^2.0.0",
 		"eslint": "catalog:default",
 		"esprima": "4.0.1",
 		"execa": "^6.1.0",
-		"find-up": "^6.3.0",
 		"get-port": "^7.0.0",
 		"glob-to-regexp": "^0.4.1",
 		"https-proxy-agent": "7.0.2",

packages/wrangler/src/autoconfig/frameworks/utils/packages.ts

@@ -1,5 +1,5 @@
 import { parsePackageJSON, readFileSync } from "@cloudflare/workers-utils";
-import { findUpSync } from "find-up";
+import * as find from "empathic/find";
 
 /**
  * Checks wether a package is installed in a target project or not
@@ -35,9 +35,9 @@ export function getInstalledPackageVersion(
 		if (!packagePath) {
 			return undefined;
 		}
-		const packageJsonPath = findUpSync("package.json", {
+		const packageJsonPath = find.file("package.json", {
 			cwd: packagePath,
-			stopAt: opts.stopAtProjectPath === true ? projectPath : undefined,
+			last: opts.stopAtProjectPath === true ? projectPath : undefined,
 		});
 		if (!packageJsonPath) {
 			return undefined;

packages/wrangler/src/config-cache.ts

@@ -7,7 +7,7 @@ import {
 } from "node:fs";
 import * as path from "node:path";
 import { getWranglerCacheDirFromEnv } from "@cloudflare/workers-utils";
-import { findUpSync } from "find-up";
+import * as find from "empathic/find";
 import { isNonInteractiveOrCI } from "./is-interactive";
 import { logger } from "./logger";
 
@@ -29,9 +29,7 @@ export function getCacheFolder(): string {
 	}
 
 	// Find node_modules using existing find-up logic
-	const closestNodeModulesDirectory = findUpSync("node_modules", {
-		type: "directory",
-	});
+	const closestNodeModulesDirectory = find.dir("node_modules");
 
 	const nodeModulesCache = closestNodeModulesDirectory
 		? path.join(closestNodeModulesDirectory, ".cache", "wrangler")

packages/wrangler/src/pages/utils.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { findUpSync } from "find-up";
+import * as find from "empathic/find";
 import { getWranglerTmpDir } from "../paths";
 import type { BundleResult } from "../deployment-bundle/bundle";
 
@@ -47,7 +47,7 @@ export function getPagesProjectRoot(): string {
 	if (projectRootCache !== undefined && projectRootCacheCwd === cwd) {
 		return projectRootCache;
 	}
-	const packagePath = findUpSync("package.json");
+	const packagePath = find.file("package.json");
 	projectRootCache = packagePath ? path.dirname(packagePath) : process.cwd();
 	projectRootCacheCwd = cwd;
 	return projectRootCache;

packages/wrangler/src/type-generation/index.ts

@@ -10,7 +10,7 @@ import {
 	UserError,
 } from "@cloudflare/workers-utils";
 import chalk from "chalk";
-import { findUpSync } from "find-up";
+import * as find from "empathic/find";
 import { getNodeCompat } from "miniflare";
 import { readConfig } from "../config";
 import { createCommand } from "../core/create-command";
@@ -1257,7 +1257,7 @@ function generatePerEnvTypeStrings(
  * @throws {UserError} If a non-Wrangler .d.ts file already exists at the given path.
  */
 const validateTypesFile = (path: string): void => {
-	const wranglerOverrideDTSPath = findUpSync(path);
+	const wranglerOverrideDTSPath = find.file(path);
 	if (wranglerOverrideDTSPath === undefined) {
 		return;
 	}

packages/wrangler/src/type-generation/runtime/log-runtime-types-message.ts

@@ -1,7 +1,6 @@
 import { existsSync } from "node:fs";
-import { join } from "node:path";
 import chalk from "chalk";
-import { findUpMultipleSync } from "find-up";
+import * as find from "empathic/find";
 import { logger } from "../../logger";
 
 /**
@@ -42,14 +41,9 @@ export function logRuntimeTypesMessage(
 	);
 
 	if (!isNodeTypesInstalled && isNodeCompat) {
-		const nodeModules = findUpMultipleSync("node_modules", {
-			type: "directory",
-		});
-		for (const folder of nodeModules) {
-			if (nodeModules && existsSync(join(folder, "@types/node"))) {
-				isNodeTypesInstalled = true;
-				break;
-			}
+		const nodeModules = find.dir("node_modules/@types/node");
+		if (nodeModules) {
+			isNodeTypesInstalled = true;
 		}
 	}
 	if (isNodeCompat && !isNodeTypesInstalled) {