diff --git a/e2e/__tests__/presets.test.ts b/e2e/__tests__/presets.test.ts index d82c6a5c37..0f43ecda18 100644 --- a/e2e/__tests__/presets.test.ts +++ b/e2e/__tests__/presets.test.ts @@ -1,7 +1,18 @@ +import path from 'path' + +import execa from 'execa' + import { json as runWithJson } from '../run-jest' +import { tsJestBundle } from '../utils' const DIR_NAME = 'presets' +beforeAll(() => { + execa.sync('npm', ['install', '--no-package-lock', '--no-shrinkwrap', '--no-save', tsJestBundle], { + cwd: path.join(__dirname, '..', DIR_NAME), + }) +}) + test(`successfully runs the tests inside ${DIR_NAME}`, () => { const { json } = runWithJson(DIR_NAME) diff --git a/e2e/presets/__tests__/ts-jest-presets.spec.ts b/e2e/presets/__tests__/presets.spec.ts similarity index 88% rename from e2e/presets/__tests__/ts-jest-presets.spec.ts rename to e2e/presets/__tests__/presets.spec.ts index f951c76626..a97429dee9 100644 --- a/e2e/presets/__tests__/ts-jest-presets.spec.ts +++ b/e2e/presets/__tests__/presets.spec.ts @@ -1,7 +1,7 @@ -import { JS_EXT_TO_TREAT_AS_ESM, TS_EXT_TO_TREAT_AS_ESM } from '../../../dist/constants' -import * as presets from '../../../presets' +import { JS_EXT_TO_TREAT_AS_ESM, TS_EXT_TO_TREAT_AS_ESM } from 'ts-jest' +import presets from 'ts-jest/presets' -const defaultPreset = require('../../../jest-preset') +const defaultPreset = require('ts-jest/jest-preset') test('presets', () => { expect(defaultPreset).toEqual({ @@ -9,7 +9,6 @@ test('presets', () => { '^.+\\.tsx?$': 'ts-jest', }, }) - expect(presets.defaultsESM).toEqual({ extensionsToTreatAsEsm: [...TS_EXT_TO_TREAT_AS_ESM], transform: { diff --git a/src/__helpers__/fakers.ts b/src/__helpers__/fakers.ts index 325461cf6d..f96b43c2f5 100644 --- a/src/__helpers__/fakers.ts +++ b/src/__helpers__/fakers.ts @@ -3,8 +3,8 @@ import { resolve } from 'path' import type { Config } from '@jest/types' import type { Logger } from 'bs-logger' -import { TsCompiler } from '../compiler/ts-compiler' -import { ConfigSet } from '../config/config-set' +import { TsCompiler } from '../compiler' +import { ConfigSet } from '../config' import type { StringMap, TsJestGlobalOptions } from '../types' import type { ImportReasons } from '../utils/messages' diff --git a/src/__helpers__/mocks.ts b/src/__helpers__/mocks.ts index c30db9065e..92d84a44df 100644 --- a/src/__helpers__/mocks.ts +++ b/src/__helpers__/mocks.ts @@ -1,6 +1,6 @@ import type { testing } from 'bs-logger' -import { rootLogger } from '../utils/logger' +import { rootLogger } from '../utils' export const logTargetMock = (): testing.LogTargetMock => (rootLogger as testing.LoggerMock).target diff --git a/src/cli/cli.spec.ts b/src/cli/cli.spec.ts index cd521e2b8d..86786a50e6 100644 --- a/src/cli/cli.spec.ts +++ b/src/cli/cli.spec.ts @@ -2,7 +2,7 @@ import * as _fs from 'fs' import { normalize, resolve } from 'path' import { logTargetMock, mockObject, mockWriteStream } from '../__helpers__/mocks' -import { mocked } from '../utils/testing' +import { mocked } from '../utils' import { processArgv } from '.' diff --git a/src/cli/index.ts b/src/cli/index.ts index 46ae4766ef..ddda794465 100644 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -2,7 +2,7 @@ import { LogContexts, Logger } from 'bs-logger' import type { Arguments } from 'yargs' import yargsParser from 'yargs-parser' -import { rootLogger } from '../utils/logger' +import { rootLogger } from '../utils' const VALID_COMMANDS = ['help', 'config:migrate', 'config:init'] diff --git a/src/compiler/compiler-utils.ts b/src/compiler/compiler-utils.ts index 1802dcd49c..1931213a3b 100644 --- a/src/compiler/compiler-utils.ts +++ b/src/compiler/compiler-utils.ts @@ -1,4 +1,4 @@ -import { stringify } from '../utils/json' +import { stringify } from '../utils' /** * Rely on TypeScript compiled output generation which contains this prefix to point to sourcemap location. diff --git a/src/compiler/ts-compiler.ts b/src/compiler/ts-compiler.ts index 5889691860..6849e17ba9 100644 --- a/src/compiler/ts-compiler.ts +++ b/src/compiler/ts-compiler.ts @@ -22,7 +22,7 @@ import type { Diagnostic, } from 'typescript' -import type { ConfigSet } from '../config/config-set' +import type { ConfigSet } from '../config' import { LINE_FEED, TS_TSX_REGEX } from '../constants' import type { DepGraphInfo, @@ -32,7 +32,7 @@ import type { TsJestCompileOptions, TTypeScript, } from '../types' -import { rootLogger } from '../utils/logger' +import { rootLogger } from '../utils' import { Errors, interpolate } from '../utils/messages' import { updateOutput } from './compiler-utils' diff --git a/src/compiler/ts-jest-compiler.ts b/src/compiler/ts-jest-compiler.ts index 54fe73bafa..20aaeec379 100644 --- a/src/compiler/ts-jest-compiler.ts +++ b/src/compiler/ts-jest-compiler.ts @@ -1,4 +1,4 @@ -import type { ConfigSet } from '../config/config-set' +import type { ConfigSet } from '../config' import type { CompilerInstance, StringMap, TsJestCompileOptions } from '../types' import { TsCompiler } from './ts-compiler' diff --git a/src/config/config-set.spec.ts b/src/config/config-set.spec.ts index 884750218a..7d13ffaf2a 100644 --- a/src/config/config-set.spec.ts +++ b/src/config/config-set.spec.ts @@ -8,12 +8,11 @@ import ts from 'typescript' import { createConfigSet } from '../__helpers__/fakers' import { logTargetMock } from '../__helpers__/mocks' import type { AstTransformerDesc, TsJestGlobalOptions } from '../types' +import { stringify, mocked } from '../utils' import * as _backports from '../utils/backports' import { getPackageVersion } from '../utils/get-package-version' -import { stringify } from '../utils/json' import { normalizeSlashes } from '../utils/normalize-slashes' import { sha1 } from '../utils/sha1' -import { mocked } from '../utils/testing' import { ConfigSet, MY_DIGEST } from './config-set' diff --git a/src/config/config-set.ts b/src/config/config-set.ts index 6d430b9576..9d81930842 100644 --- a/src/config/config-set.ts +++ b/src/config/config-set.ts @@ -31,10 +31,9 @@ import type { TsJestGlobalOptions, TTypeScript, } from '../types' +import { stringify, rootLogger } from '../utils' import { backportJestConfig } from '../utils/backports' import { importer } from '../utils/importer' -import { stringify } from '../utils/json' -import { rootLogger } from '../utils/logger' import { Errors, ImportReasons, interpolate } from '../utils/messages' import { normalizeSlashes } from '../utils/normalize-slashes' import { sha1 } from '../utils/sha1' diff --git a/src/config/paths-to-module-name-mapper.ts b/src/config/paths-to-module-name-mapper.ts index 73d0744c88..e3a34b6feb 100644 --- a/src/config/paths-to-module-name-mapper.ts +++ b/src/config/paths-to-module-name-mapper.ts @@ -2,7 +2,7 @@ import type { Config } from '@jest/types' import { LogContexts } from 'bs-logger' import type { CompilerOptions } from 'typescript' -import { rootLogger } from '../utils/logger' +import { rootLogger } from '../utils' import { Errors, interpolate } from '../utils/messages' type TsPathMapping = Exclude diff --git a/src/presets/create-jest-preset.ts b/src/presets/create-jest-preset.ts index ed952193e5..0cf13af314 100644 --- a/src/presets/create-jest-preset.ts +++ b/src/presets/create-jest-preset.ts @@ -1,7 +1,7 @@ import type { Config } from '@jest/types' import type { TsJestPresets } from '../types' -import { rootLogger } from '../utils/logger' +import { rootLogger } from '../utils' const logger = rootLogger.child({ namespace: 'jest-preset' }) diff --git a/src/transformers/path-mapping.spec.ts b/src/transformers/path-mapping.spec.ts index b6ef8606d8..ff64767cb2 100644 --- a/src/transformers/path-mapping.spec.ts +++ b/src/transformers/path-mapping.spec.ts @@ -3,7 +3,7 @@ import path from 'path' import ts from 'typescript' import { createConfigSet, makeCompiler } from '../__helpers__/fakers' -import { TsCompiler } from '../compiler/ts-compiler' +import { TsCompiler } from '../compiler' import { normalizeSlashes } from '../utils/normalize-slashes' import { factory as pathMapping, name, version } from './path-mapping' diff --git a/src/ts-jest-transformer.spec.ts b/src/ts-jest-transformer.spec.ts index b06a7dbdfc..de3741598c 100644 --- a/src/ts-jest-transformer.spec.ts +++ b/src/ts-jest-transformer.spec.ts @@ -6,11 +6,10 @@ import { removeSync, writeFileSync } from 'fs-extra' import { createConfigSet } from './__helpers__/fakers' import { logTargetMock } from './__helpers__/mocks' -import { SOURCE_MAPPING_PREFIX } from './compiler/compiler-utils' -import { TsJestCompiler } from './compiler/ts-jest-compiler' +import { SOURCE_MAPPING_PREFIX, TsJestCompiler } from './compiler' import { CACHE_KEY_EL_SEPARATOR, TsJestTransformer } from './ts-jest-transformer' import type { DepGraphInfo } from './types' -import { stringify } from './utils/json' +import { stringify } from './utils' import { sha1 } from './utils/sha1' const logTarget = logTargetMock() diff --git a/src/ts-jest-transformer.ts b/src/ts-jest-transformer.ts index 4994d60d65..94b81922e0 100644 --- a/src/ts-jest-transformer.ts +++ b/src/ts-jest-transformer.ts @@ -5,13 +5,11 @@ import type { SyncTransformer, TransformedSource } from '@jest/transform' import type { Config } from '@jest/types' import type { Logger } from 'bs-logger' -import { TsJestCompiler } from './compiler/ts-jest-compiler' -import { ConfigSet } from './config/config-set' +import { TsJestCompiler } from './compiler' +import { ConfigSet } from './config' import { DECLARATION_TYPE_EXT, JS_JSX_REGEX, TS_TSX_REGEX } from './constants' import type { CompilerInstance, DepGraphInfo, ProjectConfigTsJest, TransformOptionsTsJest } from './types' -import { parse, stringify } from './utils/json' -import { JsonableValue } from './utils/jsonable-value' -import { rootLogger } from './utils/logger' +import { parse, stringify, JsonableValue, rootLogger } from './utils' import { Errors, interpolate } from './utils/messages' import { sha1 } from './utils/sha1' import { VersionCheckers } from './utils/version-checkers'