From 1b352ca8a1771c21351835a96a6ff39393a6318b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Wed, 11 Sep 2019 06:25:18 -0400 Subject: [PATCH] chore: remove tryResolve dependency (#10428) --- packages/babel-helper-fixtures/package.json | 3 +-- packages/babel-helper-fixtures/src/index.js | 14 ++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/babel-helper-fixtures/package.json b/packages/babel-helper-fixtures/package.json index 0c102680e135..31854ac575d0 100644 --- a/packages/babel-helper-fixtures/package.json +++ b/packages/babel-helper-fixtures/package.json @@ -11,7 +11,6 @@ "main": "lib/index.js", "dependencies": { "lodash": "^4.17.13", - "semver": "^5.3.0", - "try-resolve": "^1.0.0" + "semver": "^5.3.0" } } diff --git a/packages/babel-helper-fixtures/src/index.js b/packages/babel-helper-fixtures/src/index.js index 099fa9fa6e2d..4366d27e3322 100644 --- a/packages/babel-helper-fixtures/src/index.js +++ b/packages/babel-helper-fixtures/src/index.js @@ -1,5 +1,4 @@ import cloneDeep from "lodash/cloneDeep"; -import resolve from "try-resolve"; import clone from "lodash/clone"; import extend from "lodash/extend"; import semver from "semver"; @@ -35,6 +34,13 @@ type Suite = { filename: string, }; +function tryResolve(module) { + try { + return require.resolve(module); + } catch (e) { + return null; + } +} function assertDirectory(loc) { if (!fs.statSync(loc).isDirectory()) { throw new Error(`Expected ${loc} to be a directory.`); @@ -76,7 +82,7 @@ export default function get(entryLoc): Array { const suites = []; let rootOpts = {}; - const rootOptsLoc = resolve(entryLoc + "/options"); + const rootOptsLoc = tryResolve(entryLoc + "/options"); if (rootOptsLoc) rootOpts = require(rootOptsLoc); for (const suiteName of fs.readdirSync(entryLoc)) { @@ -92,7 +98,7 @@ export default function get(entryLoc): Array { assertDirectory(suite.filename); suites.push(suite); - const suiteOptsLoc = resolve(suite.filename + "/options"); + const suiteOptsLoc = tryResolve(suite.filename + "/options"); if (suiteOptsLoc) suite.options = require(suiteOptsLoc); for (const taskName of fs.readdirSync(suite.filename)) { @@ -139,7 +145,7 @@ export default function get(entryLoc): Array { const taskOpts = cloneDeep(suite.options); - const taskOptsLoc = resolve(taskDir + "/options"); + const taskOptsLoc = tryResolve(taskDir + "/options"); if (taskOptsLoc) extend(taskOpts, require(taskOptsLoc)); const test = {