Merge pull request #276 from nogic1008/hotfix/transform-next

fix: convert SourceMapGenerator to RawSourceMap in next branch
vuejs · Sep 17, 2020 · bb5be76 · bb5be76
2 parents 416c38e + 6a48f76
commit bb5be76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/process.js b/lib/process.js
@@ -144,6 +144,6 @@ module.exports = function(src, filename, config) {
 
   return {
     code: output.code,
-    map
+    map: map && map.toJSON()
   }
 }
diff --git a/lib/utils.js b/lib/utils.js
@@ -66,9 +66,10 @@ const getBabelOptions = function loadBabelOptions(filename, options = {}) {
 const getTsJestConfig = function getTsJestConfig(config) {
   const createTransformer = require('ts-jest').createTransformer
   const tr = createTransformer()
-  const { typescript } = tr.configsFor(config)
+  const configSet = tr.configsFor(config)
+  const tsConfig = configSet.typescript || configSet.parsedTsConfig
   // Force es5 to prevent const vue_1 = require('vue') from conflicting
-  return { compilerOptions: { ...typescript.options, target: 'es5' } }
+  return { compilerOptions: { ...tsConfig.options, target: 'es5' } }
 }
 
 function isValidTransformer(transformer) {