Skip to content

Commit 249eb2c

Browse files
committed
fix(cli): fix wrong path for preset creator fns
1 parent 0dc22ca commit 249eb2c

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

src/cli/__snapshots__/cli.spec.ts.snap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`config init should create a jest config file with cli options for config type default 1`] = `
4-
"const { createDefaultPreset } = require("ts-jest/presets")
4+
"const { createDefaultPreset } = require("ts-jest");
55
6-
const tsJestTransformCfg = createDefaultPreset().transform
6+
const tsJestTransformCfg = createDefaultPreset().transform;
77
88
/** @type {import("jest").Config} **/
99
module.exports = {
@@ -15,9 +15,9 @@ module.exports = {
1515
`;
1616

1717
exports[`config init should create a jest config file with cli options for config type default and type "module" package.json 1`] = `
18-
"const { createDefaultPreset } = require("ts-jest/presets")
18+
"const { createDefaultPreset } = require("ts-jest");
1919
20-
const tsJestTransformCfg = createDefaultPreset().transform
20+
const tsJestTransformCfg = createDefaultPreset().transform;
2121
2222
/** @type {import("jest").Config} **/
2323
export default {
@@ -29,11 +29,11 @@ export default {
2929
`;
3030

3131
exports[`config init should create a jest config file with cli options for config type js-with-babel-full-options 1`] = `
32-
"const { createJsWithBabelPreset } = require("ts-jest/presets")
32+
"const { createJsWithBabelPreset } = require("ts-jest");
3333
3434
const tsJestTransformCfg = createJsWithBabelPreset({
3535
"tsconfig": "tsconfig.test.json"
36-
}).transform
36+
}).transform;
3737
3838
/** @type {import("jest").Config} **/
3939
module.exports = {
@@ -45,11 +45,11 @@ module.exports = {
4545
`;
4646

4747
exports[`config init should create a jest config file with cli options for config type js-with-babel-full-options and type "module" package.json 1`] = `
48-
"const { createJsWithBabelPreset } = require("ts-jest/presets")
48+
"const { createJsWithBabelPreset } = require("ts-jest");
4949
5050
const tsJestTransformCfg = createJsWithBabelPreset({
5151
"tsconfig": "tsconfig.test.json"
52-
}).transform
52+
}).transform;
5353
5454
/** @type {import("jest").Config} **/
5555
export default {
@@ -61,11 +61,11 @@ export default {
6161
`;
6262

6363
exports[`config init should create a jest config file with cli options for config type js-with-ts-full-options 1`] = `
64-
"const { createJsWithTsPreset } = require("ts-jest/presets")
64+
"const { createJsWithTsPreset } = require("ts-jest");
6565
6666
const tsJestTransformCfg = createJsWithTsPreset({
6767
"tsconfig": "tsconfig.test.json"
68-
}).transform
68+
}).transform;
6969
7070
/** @type {import("jest").Config} **/
7171
module.exports = {
@@ -77,11 +77,11 @@ module.exports = {
7777
`;
7878

7979
exports[`config init should create a jest config file with cli options for config type js-with-ts-full-options and type "module" package.json 1`] = `
80-
"const { createJsWithTsPreset } = require("ts-jest/presets")
80+
"const { createJsWithTsPreset } = require("ts-jest");
8181
8282
const tsJestTransformCfg = createJsWithTsPreset({
8383
"tsconfig": "tsconfig.test.json"
84-
}).transform
84+
}).transform;
8585
8686
/** @type {import("jest").Config} **/
8787
export default {

src/cli/config/init.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import type { CliCommand, CliCommandArgs } from '..'
1414
import { createDefaultPreset, createJsWithTsPreset, createJsWithBabelPreset } from '../../presets/create-jest-preset'
1515
import type { DefaultPreset, JsWithBabelPreset, JsWithTsPreset, TsJestTransformerOptions } from '../../types'
1616

17-
const JEST_CONFIG_EJS_TEMPLATE = `const { <%= presetCreatorFn %> } = require("ts-jest/presets")
17+
const JEST_CONFIG_EJS_TEMPLATE = `const { <%= presetCreatorFn %> } = require("ts-jest");
1818
19-
const tsJestTransformCfg = <%= presetCreatorFn %>(<%- transformOpts %>).transform
19+
const tsJestTransformCfg = <%= presetCreatorFn %>(<%- transformOpts %>).transform;
2020
2121
/** @type {import("jest").Config} **/
2222
<%= exportKind %> {
@@ -45,8 +45,7 @@ export const run: CliCommand = async (args: CliCommandArgs /* , logger: Logger *
4545
const isJestConfigFileExisted = existsSync(filePath)
4646
const pkgFile = isPackageJsonConfig ? filePath : join(process.cwd(), 'package.json')
4747
const isPackageJsonExisted = isPackageJsonConfig || existsSync(pkgFile)
48-
const tsconfig =
49-
askedTsconfig === 'tsconfig.json' ? undefined : (askedTsconfig as TsJestTransformerOptions['tsconfig'])
48+
const tsconfig = askedTsconfig === 'tsconfig.json' ? undefined : askedTsconfig
5049
const pkgJsonContent = isPackageJsonExisted ? JSON.parse(readFileSync(pkgFile, 'utf8')) : {}
5150
if (shouldPostProcessWithBabel) {
5251
console.warn(

0 commit comments

Comments
 (0)