Skip to content

Commit 8cbf401

Browse files
committed
feat: use getTypeScriptConfig on typescript transformer
1 parent 44b3afb commit 8cbf401

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

packages/vue2-jest/lib/transformers/typescript.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const ensureRequire = require('../ensure-require')
22
const babelJest = require('babel-jest').default
33
const {
4-
getTsJestConfig,
54
stripInlineSourceMap,
65
getCustomTransformer,
6+
getTypeScriptConfig,
77
getVueJestConfig
88
} = require('../utils')
99

@@ -12,7 +12,7 @@ module.exports = scriptLang => ({
1212
ensureRequire('typescript', ['typescript'])
1313
const typescript = require('typescript')
1414
const vueJestConfig = getVueJestConfig(config)
15-
const tsconfig = getTsJestConfig(config)
15+
const tsconfig = getTypeScriptConfig(vueJestConfig.tsConfig)
1616

1717
const res = typescript.transpileModule(scriptContent, {
1818
...tsconfig,

packages/vue3-jest/lib/process.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const typescriptTransformer = require('./transformers/typescript')
66
const coffeescriptTransformer = require('./transformers/coffee')
77
const _processStyle = require('./process-style')
88
const processCustomBlocks = require('./process-custom-blocks')
9+
const getTypeScriptConfig = require('./utils').getTypeScriptConfig
910
const getVueJestConfig = require('./utils').getVueJestConfig
10-
const getTsJestConfig = require('./utils').getTsJestConfig
1111
const logResultErrors = require('./utils').logResultErrors
1212
const stripInlineSourceMap = require('./utils').stripInlineSourceMap
1313
const getCustomTransformer = require('./utils').getCustomTransformer
@@ -118,7 +118,7 @@ function processTemplate(descriptor, filename, config) {
118118

119119
logResultErrors(result)
120120

121-
const tsconfig = getTsJestConfig(config)
121+
const tsconfig = getTypeScriptConfig(vueJestConfig.tsConfig)
122122

123123
if (tsconfig) {
124124
// they are using TypeScript.

packages/vue3-jest/lib/transformers/typescript.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const ensureRequire = require('../ensure-require')
22
const babelJest = require('babel-jest').default
33
const {
4-
getTsJestConfig,
54
stripInlineSourceMap,
65
getCustomTransformer,
6+
getTypeScriptConfig,
77
getVueJestConfig
88
} = require('../utils')
99

@@ -12,7 +12,7 @@ module.exports = {
1212
ensureRequire('typescript', ['typescript'])
1313
const typescript = require('typescript')
1414
const vueJestConfig = getVueJestConfig(config)
15-
const tsconfig = getTsJestConfig(config)
15+
const tsconfig = getTypeScriptConfig(vueJestConfig.tsConfig)
1616

1717
const res = typescript.transpileModule(scriptContent, {
1818
...tsconfig,

0 commit comments

Comments
 (0)