From bd76829f66c5c0f3c6907b80010f19893cb0fc8c Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 17 Jul 2019 17:35:57 +0200 Subject: [PATCH] chore: move getVersion to jest-core from cli (#8706) --- CHANGELOG.md | 1 + packages/jest-cli/src/cli/index.ts | 3 +-- packages/jest-cli/src/index.ts | 9 +++++++-- packages/jest-core/src/jest.ts | 1 + packages/{jest-cli => jest-core}/src/version.ts | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) rename packages/{jest-cli => jest-core}/src/version.ts (86%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2def9d695a0f..0d13a1c27a04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ - `[docs]` Add information about using `jest.doMock` with ES6 imports ([#8573](https://github.com/facebook/jest/pull/8573)) - `[docs]` Fix variable name in custom-matcher-api code example ([#8582](https://github.com/facebook/jest/pull/8582)) - `[docs]` Fix example used in custom environment docs ([#8617](https://github.com/facebook/jest/pull/8617)) +- `[jest-core]` Add `getVersion` (moved from `jest-cli`) ([#8706](https://github.com/facebook/jest/pull/8706)) ### Performance diff --git a/packages/jest-cli/src/cli/index.ts b/packages/jest-cli/src/cli/index.ts index ea73a76292bd..d0685776ad3f 100644 --- a/packages/jest-cli/src/cli/index.ts +++ b/packages/jest-cli/src/cli/index.ts @@ -11,13 +11,12 @@ import {AggregatedResult} from '@jest/test-result'; import {clearLine} from 'jest-util'; import {validateCLIOptions} from 'jest-validate'; import {deprecationEntries} from 'jest-config'; -import {runCLI} from '@jest/core'; +import {getVersion, runCLI} from '@jest/core'; import chalk from 'chalk'; import exit from 'exit'; import yargs from 'yargs'; import {sync as realpath} from 'realpath-native'; import init from '../init'; -import getVersion from '../version'; import * as args from './args'; export async function run(maybeArgv?: Array, project?: Config.Path) { diff --git a/packages/jest-cli/src/index.ts b/packages/jest-cli/src/index.ts index 38dcb1c26fb1..03b9e0a4d8bc 100644 --- a/packages/jest-cli/src/index.ts +++ b/packages/jest-cli/src/index.ts @@ -6,9 +6,14 @@ */ // TODO: remove @jest/core exports for the next major -import {runCLI, SearchSource, TestScheduler, TestWatcher} from '@jest/core'; +import { + getVersion, + runCLI, + SearchSource, + TestScheduler, + TestWatcher, +} from '@jest/core'; import {run} from './cli'; -import {default as getVersion} from './version'; export = { SearchSource, diff --git a/packages/jest-core/src/jest.ts b/packages/jest-core/src/jest.ts index 87ceab84269f..dfba24c2c4b5 100644 --- a/packages/jest-core/src/jest.ts +++ b/packages/jest-core/src/jest.ts @@ -9,3 +9,4 @@ export {default as SearchSource} from './SearchSource'; export {default as TestScheduler} from './TestScheduler'; export {default as TestWatcher} from './TestWatcher'; export {runCLI} from './cli'; +export {default as getVersion} from './version'; diff --git a/packages/jest-cli/src/version.ts b/packages/jest-core/src/version.ts similarity index 86% rename from packages/jest-cli/src/version.ts rename to packages/jest-core/src/version.ts index 5d778a274253..868603aed1ef 100644 --- a/packages/jest-cli/src/version.ts +++ b/packages/jest-core/src/version.ts @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. */ +// Cannot be `import` as it's not under TS root dir const {version: VERSION} = require('../package.json'); export default function getVersion(): string {