diff --git a/src/__helpers__/fakers.ts b/src/__helpers__/fakers.ts index f96b43c2f5..936ee00d3f 100644 --- a/src/__helpers__/fakers.ts +++ b/src/__helpers__/fakers.ts @@ -4,7 +4,7 @@ import type { Config } from '@jest/types' import type { Logger } from 'bs-logger' import { TsCompiler } from '../compiler' -import { ConfigSet } from '../config' +import { ConfigSet } from '../legacy/config/config-set' import type { StringMap, TsJestGlobalOptions } from '../types' import type { ImportReasons } from '../utils/messages' diff --git a/src/compiler/ts-compiler.ts b/src/compiler/ts-compiler.ts index c973fe230d..73c63b05ef 100644 --- a/src/compiler/ts-compiler.ts +++ b/src/compiler/ts-compiler.ts @@ -23,8 +23,8 @@ import type { TranspileOutput, } from 'typescript' -import type { ConfigSet } from '../config' import { LINE_FEED, TS_TSX_REGEX } from '../constants' +import type { ConfigSet } from '../legacy/config/config-set' import type { DepGraphInfo, StringMap, diff --git a/src/compiler/ts-jest-compiler.ts b/src/compiler/ts-jest-compiler.ts index 88169a50aa..c7fe28e385 100644 --- a/src/compiler/ts-jest-compiler.ts +++ b/src/compiler/ts-jest-compiler.ts @@ -1,6 +1,6 @@ import type { TransformedSource } from '@jest/transform' -import type { ConfigSet } from '../config' +import type { ConfigSet } from '../legacy/config/config-set' import type { CompilerInstance, StringMap, TsJestCompileOptions } from '../types' import { TsCompiler } from './ts-compiler' diff --git a/src/config/index.ts b/src/config/index.ts index c160ca4257..6310d2e9e8 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1,2 +1 @@ -export * from './config-set' export * from './paths-to-module-name-mapper' diff --git a/src/config/__snapshots__/config-set.spec.ts.snap b/src/legacy/config/__snapshots__/config-set.spec.ts.snap similarity index 100% rename from src/config/__snapshots__/config-set.spec.ts.snap rename to src/legacy/config/__snapshots__/config-set.spec.ts.snap diff --git a/src/config/config-set.spec.ts b/src/legacy/config/config-set.spec.ts similarity index 98% rename from src/config/config-set.spec.ts rename to src/legacy/config/config-set.spec.ts index 046014b3cb..503d45d6dd 100644 --- a/src/config/config-set.spec.ts +++ b/src/legacy/config/config-set.spec.ts @@ -4,20 +4,20 @@ import type { Transformer } from '@jest/transform' import { LogLevels, testing } from 'bs-logger' import ts from 'typescript' -import { createConfigSet } from '../__helpers__/fakers' -import { logTargetMock } from '../__helpers__/mocks' -import type { AstTransformerDesc, TsJestGlobalOptions } from '../types' -import { stringify } from '../utils' -import * as _backports from '../utils/backports' -import { getPackageVersion } from '../utils/get-package-version' -import { normalizeSlashes } from '../utils/normalize-slashes' -import { sha1 } from '../utils/sha1' +import { createConfigSet } from '../../__helpers__/fakers' +import { logTargetMock } from '../../__helpers__/mocks' +import type { AstTransformerDesc, TsJestGlobalOptions } from '../../types' +import { stringify } from '../../utils' +import * as _backports from '../../utils/backports' +import { getPackageVersion } from '../../utils/get-package-version' +import { normalizeSlashes } from '../../utils/normalize-slashes' +import { sha1 } from '../../utils/sha1' import { ConfigSet, MY_DIGEST } from './config-set' -jest.mock('../utils/backports') +jest.mock('../../utils/backports') jest.mock('../index') -jest.mock('../utils/get-package-version') +jest.mock('../../utils/get-package-version') const backports = jest.mocked(_backports) @@ -305,7 +305,7 @@ describe('babelJestTransformer', () => { it('should return babelJestTransformer with loaded config object', () => { /* eslint-disable-next-line jest/no-mocks-import */ - const babelConfig = require('../__mocks__/babel-foo.config') + const babelConfig = require('../../__mocks__/babel-foo.config') const cs = createConfigSet({ jestConfig: { globals: { @@ -668,7 +668,9 @@ describe('resolvePath', () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any const cs = createConfigSet({ jestConfig: { rootDir: '/root', cwd: '/cwd' } as any, resolve: null }) const doResolve = (path: string) => cs.resolvePath(path, { throwIfMissing: false, nodeResolve: true }) - expect(doResolve('json5')).toBe(resolve(__dirname, '../../node_modules/json5', require('json5/package.json').main)) + expect(doResolve('json5')).toBe( + resolve(__dirname, '../../../node_modules/json5', require('json5/package.json').main), + ) expect(doResolve('./bar.js')).toBe(resolve('/cwd/bar.js')) expect(doResolve('bar.js')).toBe(resolve('/root/bar.js')) expect(doResolve('/bar.js')).toBe(resolve('/root//bar.js')) diff --git a/src/config/config-set.ts b/src/legacy/config/config-set.ts similarity index 96% rename from src/config/config-set.ts rename to src/legacy/config/config-set.ts index 2e2efe9f99..5c7e0eb8e0 100644 --- a/src/config/config-set.ts +++ b/src/legacy/config/config-set.ts @@ -17,8 +17,8 @@ import { globsToMatcher } from 'jest-util' import json5 from 'json5' import type * as ts from 'typescript' -import { DEFAULT_JEST_TEST_MATCH, JS_JSX_EXTENSIONS } from '../constants' -import type { RawCompilerOptions } from '../raw-compiler-options' +import { DEFAULT_JEST_TEST_MATCH, JS_JSX_EXTENSIONS } from '../../constants' +import type { RawCompilerOptions } from '../../raw-compiler-options' import type { AstTransformer, AstTransformerDesc, @@ -29,20 +29,20 @@ import type { TsJestDiagnosticsCfg, TsJestGlobalOptions, TTypeScript, -} from '../types' -import { TsCompilerInstance } from '../types' -import { rootLogger, stringify } from '../utils' -import { backportJestConfig } from '../utils/backports' -import { importer } from '../utils/importer' -import { Errors, ImportReasons, interpolate } from '../utils/messages' -import { normalizeSlashes } from '../utils/normalize-slashes' -import { sha1 } from '../utils/sha1' -import { TSError } from '../utils/ts-error' +} from '../../types' +import { TsCompilerInstance } from '../../types' +import { rootLogger, stringify } from '../../utils' +import { backportJestConfig } from '../../utils/backports' +import { importer } from '../../utils/importer' +import { Errors, ImportReasons, interpolate } from '../../utils/messages' +import { normalizeSlashes } from '../../utils/normalize-slashes' +import { sha1 } from '../../utils/sha1' +import { TSError } from '../../utils/ts-error' /** * @internal */ -export const MY_DIGEST: string = readFileSync(resolve(__dirname, '..', '..', '.ts-jest-digest'), 'utf8') +export const MY_DIGEST: string = readFileSync(resolve(__dirname, '../../../.ts-jest-digest'), 'utf8') /** * @internal @@ -313,7 +313,7 @@ export class ConfigSet { this.logger.debug({ tsconfig: this.parsedTsConfig }, 'normalized typescript config via ts-jest option') // transformers - this.resolvedTransformers.before = [require('../transformers/hoist-jest')] + this.resolvedTransformers.before = [require('../../transformers/hoist-jest')] const { astTransformers } = options if (astTransformers) { const resolveTransformerFunc = (transformerPath: string) => { diff --git a/src/legacy/ts-jest-transformer.ts b/src/legacy/ts-jest-transformer.ts index 84d8498b13..e5da0e4ba0 100644 --- a/src/legacy/ts-jest-transformer.ts +++ b/src/legacy/ts-jest-transformer.ts @@ -5,7 +5,6 @@ import type { SyncTransformer, TransformedSource } from '@jest/transform' import type { Logger } from 'bs-logger' 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, JsonableValue, rootLogger } from '../utils' @@ -14,6 +13,8 @@ import { Deprecations, Errors, interpolate } from '../utils/messages' import { sha1 } from '../utils/sha1' import { VersionCheckers } from '../utils/version-checkers' +import { ConfigSet } from './config/config-set' + interface CachedConfigSet { configSet: ConfigSet jestConfig: JsonableValue diff --git a/src/types.ts b/src/types.ts index db1506a9f4..b92df70942 100644 --- a/src/types.ts +++ b/src/types.ts @@ -4,7 +4,7 @@ import type * as babelJest from 'babel-jest' import type * as _babel from 'babel__core' import type * as _ts from 'typescript' -import type { ConfigSet } from './config' +import type { ConfigSet } from './legacy/config/config-set' import type { RawCompilerOptions } from './raw-compiler-options' declare module '@jest/types' {