fix(typescript-config): extends option in tsconfig Fixes vuejs#144

yohodopo · Jan 30, 2019 · 723b0fd · 723b0fd
1 parent 13426a0
commit 723b0fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/typescript-transformer.js b/lib/typescript-transformer.js
@@ -11,7 +11,7 @@ module.exports = {
     ensureRequire('typescript', ['typescript'])
     const typescript = require('typescript')
     const vueJestConfig = getVueJestConfig(config)
-    const { tsconfig } = getTsJestConfig(config)
+    const tsconfig = getTsJestConfig(config)
     const babelOptions = getBabelOptions(filePath)
 
     const res = typescript.transpileModule(scriptContent, tsconfig)
@@ -24,7 +24,10 @@ module.exports = {
     // handle ES modules in TS source code in case user uses non commonjs module
     // output and there is no .babelrc.
     let inlineBabelOptions = {}
-    if (tsconfig.compilerOptions.module !== 'commonjs' && !babelOptions) {
+    if (
+      tsconfig.compilerOptions.module !== typescript.ModuleKind.CommonJS &&
+      !babelOptions
+    ) {
       inlineBabelOptions = {
         plugins: [require('@babel/plugin-transform-modules-commonjs')]
       }

diff --git a/lib/utils.js b/lib/utils.js
@@ -64,7 +64,8 @@ const getBabelOptions = function loadBabelOptions(filename, options = {}) {
 
 const getTsJestConfig = function getTsJestConfig(config) {
   const tr = createTransformer()
-  return tr.configsFor(config)
+  const { typescript } = tr.configsFor(config)
+  return { compilerOptions: typescript.options }
 }
 
 function isValidTransformer(transformer) {