1- const ensureRequire = require ( '../ensure-require' )
21const tsconfig = require ( 'tsconfig' )
2+ const ensureRequire = require ( '../ensure-require' )
3+ const compileBabel = require ( './babel-compiler' )
34const cache = require ( '../cache' )
45const logger = require ( '../logger' )
56
@@ -10,7 +11,7 @@ const defaultTypescriptConfig = {
1011 'dom' ,
1112 'es6'
1213 ] ,
13- 'module' : 'commonjs ' ,
14+ 'module' : 'es2015 ' ,
1415 'moduleResolution' : 'node' ,
1516 'types' : [ 'vue-typescript-import-dts' , 'jest' , 'node' ] ,
1617 'isolatedModules' : false ,
@@ -28,20 +29,20 @@ const defaultTypescriptConfig = {
2829}
2930
3031function 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 ( ) )
3637
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+ }
4041
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+ }
4546}
4647
4748module . exports = function compileTypescript ( scriptContent ) {
@@ -51,5 +52,5 @@ module.exports = function compileTypescript (scriptContent) {
5152
5253 const res = typescript . transpileModule ( scriptContent , tsConfig )
5354
54- return { code : res . outputText , sourceMap : res . sourceMapText }
55+ return compileBabel ( res . outputText , JSON . parse ( res . sourceMapText ) )
5556}
0 commit comments