1
- const ensureRequire = require ( '../ensure-require' )
2
1
const tsconfig = require ( 'tsconfig' )
2
+ const ensureRequire = require ( '../ensure-require' )
3
+ const compileBabel = require ( './babel-compiler' )
3
4
const cache = require ( '../cache' )
4
5
const logger = require ( '../logger' )
5
6
@@ -10,7 +11,7 @@ const defaultTypescriptConfig = {
10
11
'dom' ,
11
12
'es6'
12
13
] ,
13
- 'module' : 'commonjs ' ,
14
+ 'module' : 'es2015 ' ,
14
15
'moduleResolution' : 'node' ,
15
16
'types' : [ 'vue-typescript-import-dts' , 'jest' , 'node' ] ,
16
17
'isolatedModules' : false ,
@@ -28,20 +29,20 @@ const defaultTypescriptConfig = {
28
29
}
29
30
30
31
function getTypescriptConfig ( ) {
31
- // const cachedConfig = cache.get('typescript-config')
32
- // if (cachedConfig) {
33
- // return cachedConfig
34
- // } else {
35
- const { config } = tsconfig . loadSync ( process . cwd ( ) )
32
+ const cachedConfig = cache . get ( 'typescript-config' )
33
+ if ( cachedConfig ) {
34
+ return cachedConfig
35
+ } else {
36
+ const { config } = tsconfig . loadSync ( process . cwd ( ) )
36
37
37
- if ( ! config ) {
38
- logger . info ( 'no tsconfig.json found, defaulting to default typescript options' )
39
- }
38
+ if ( ! config ) {
39
+ logger . info ( 'no tsconfig.json found, defaulting to default typescript options' )
40
+ }
40
41
41
- const typescriptConfig = config || defaultTypescriptConfig
42
- cache . set ( 'typescript-config' , typescriptConfig )
43
- return typescriptConfig
44
- // }
42
+ const typescriptConfig = config || defaultTypescriptConfig
43
+ cache . set ( 'typescript-config' , typescriptConfig )
44
+ return typescriptConfig
45
+ }
45
46
}
46
47
47
48
module . exports = function compileTypescript ( scriptContent ) {
@@ -51,5 +52,5 @@ module.exports = function compileTypescript (scriptContent) {
51
52
52
53
const res = typescript . transpileModule ( scriptContent , tsConfig )
53
54
54
- return { code : res . outputText , sourceMap : res . sourceMapText }
55
+ return compileBabel ( res . outputText , JSON . parse ( res . sourceMapText ) )
55
56
}
0 commit comments