From 0a2f533864f0e41fa144e890a7603e041fb9658c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Sat, 16 Feb 2019 16:01:49 +0100 Subject: [PATCH] chore: remove jest-config-resolver --- package-lock.json | 30 ++++++------------- src/config/jest-config-resolver.ts | 46 ------------------------------ 2 files changed, 8 insertions(+), 68 deletions(-) delete mode 100644 src/config/jest-config-resolver.ts diff --git a/package-lock.json b/package-lock.json index 60666c73a4..41e2d4a502 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2942,14 +2942,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2964,20 +2962,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -3094,8 +3089,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -3107,7 +3101,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3122,7 +3115,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3130,14 +3122,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3156,7 +3146,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -3237,8 +3226,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -3250,7 +3238,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3372,7 +3359,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6266,7 +6252,7 @@ "dependencies": { "minimist": { "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true } diff --git a/src/config/jest-config-resolver.ts b/src/config/jest-config-resolver.ts deleted file mode 100644 index e0611cabb2..0000000000 --- a/src/config/jest-config-resolver.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { Logger } from 'bs-logger' -import { Stats, existsSync, readFileSync, realpathSync, statSync } from 'fs' -import { dirname, join, resolve } from 'path' -import { sync as resolveSync } from 'resolve' - -import { IPackageJson } from '../types' -import { Errors } from '../util/messages' - -export function getJestConfigPkg(logger: Logger): TJestConfig { - try { - const jestPath: string = resolvePackagePath('jest', __dirname) - const jestCliPath: string = resolvePackagePath('jest-cli', jestPath) - const jestConfigPath: string = resolvePackagePath('jest-config', jestCliPath) - - const jestConfigPackageJson: IPackageJson = require(join(jestConfigPath, 'package.json')) - const jestConfigMainPath: string = resolve(jestConfigPath, jestConfigPackageJson.main) - return require(jestConfigMainPath) - } catch (error) { - logger.error({ error }, Errors.UnableToResolveJestConfig) - return {} as TJestConfig - } -} - -function resolvePackagePath(packageName: string, baseDir: string): string { - const packageJsonPath: string = resolveSync(packageName, { - basedir: baseDir, - packageFilter: (packageJson: IPackageJson) => { - packageJson.main = 'package.json' - return packageJson - }, - readFileSync, - isFile, - }) - - const realPackageJsonPath: string = realpathSync(packageJsonPath) - return dirname(realPackageJsonPath) -} - -function isFile(filePath: string): boolean { - if (existsSync(filePath)) { - const stats: Stats = statSync(filePath) - return stats.isFile() - } else { - return false - } -}