fix: get tsconfig when compiling typescript

Author: eddyerburgh

lib/compilers/babel-compiler.js

@@ -7,15 +7,20 @@ var defaultBabelOptions = {
   plugins: ['transform-runtime']
 }
 
-module.exports = function compileBabel (scriptContent) {
+module.exports = function compileBabel (scriptContent, inputSourceMap) {
   const { file, config } = findBabelConfig.sync(process.cwd(), 0)
 
   if (!file) {
     logger.info('no .babelrc found, defaulting to default babel options')
   }
 
+  const sourceMapOptions = {
+    sourceMaps: true,
+    inputSourceMap: inputSourceMap || null
+  }
+
   const baseBabelOptions = file ? config : defaultBabelOptions
-  const babelOptions = Object.assign({ sourceMaps: true }, baseBabelOptions)
+  const babelOptions = Object.assign(sourceMapOptions, baseBabelOptions)
 
   const res = babel.transform(scriptContent, babelOptions)
 

lib/compilers/typescript-compiler.js

@@ -1,15 +1,13 @@
 const ensureRequire = require('../ensure-require')
+const compileBabel = require('./babel-compiler')
+const tsconfig = require('tsconfig')
 
 module.exports = function compileTypescript (scriptContent) {
   ensureRequire('typescript', ['typescript'])
   const typescript = require('typescript')
+  const file = tsconfig.loadSync(process.cwd())
 
-  const res = typescript.transpileModule(scriptContent, { 'compilerOptions': {
-    'sourceMap': true
-  }})
+  const res = typescript.transpileModule(scriptContent, file.config)
 
-  return {
-    code: res.outputText,
-    sourceMap: res.sourceMapText
-  }
+  return compileBabel(res.outputText, res.sourceMapText)
 }

package-lock.json

@@ -20,7 +20,7 @@
     "release": "build/release.sh",
     "release:note": "node build/gen-release-note.js",
     "test": "npm run lint && ./test.sh",
-    "unit": "cross-env BABEL_ENV=test jest test --runInBand --coverage --coverageDirectory test/coverage"
+    "unit": "jest test --no-cache --runInBand --coverage --coverageDirectory test/coverage"
   },
   "author": "Edd Yerburgh",
   "license": "MIT",
@@ -31,7 +31,6 @@
     "clear-module": "^2.1.0",
     "coffee-script": "^1.12.7",
     "conventional-changelog": "^1.1.5",
-    "cross-env": "^5.0.2",
     "eslint": "^4.3.0",
     "eslint-plugin-html": "^3.1.1",
     "eslint-plugin-vue": "^2.1.0",
@@ -58,6 +57,7 @@
     "js-beautify": "^1.6.14",
     "object-assign": "^4.1.1",
     "source-map": "^0.5.6",
+    "tsconfig": "^7.0.0",
     "vue-template-es2015-compiler": "^1.5.3"
   },
   "jest": {

package.json

@@ -6,5 +6,6 @@ cp -R  node_modules temp-dir/node_modules
 cp jest-vue.js temp-dir/jest-vue.js
 cp package.json temp-dir/package.json
 cp .babelrc temp-dir/.babelrc
+cp tsconfig.json temp-dir/tsconfig.json
 cd temp-dir
 yarn unit

test.sh

@@ -1,13 +1,18 @@
 <template>
-    <div></div>
+    <div><basic /></div>
 </template>
 
 <script lang="ts">
+import Basic from './Basic'
+
 export default {
     computed: {
         exclamationMarks(): string {
             return  'string'
         }
+    },
+    components: {
+      Basic
     }
 };
 </script>

test/TypeScript.spec.js

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "module": "es2015",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "noEmit": true
+  },
+  "include": [
+    "**/*.ts"
+  ]
+}

test/resources/TypeScript.vue

@@ -2,6 +2,14 @@
 # yarn lockfile v1
 
 
+"@types/strip-bom@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2"
+
+"@types/strip-json-comments@0.0.30":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
+
 JSONStream@^1.0.4:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
@@ -1164,13 +1172,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cross-env@^5.0.2:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.5.tgz#4383d364d9660873dd185b398af3bfef5efffef3"
-  dependencies:
-    cross-spawn "^5.1.0"
-    is-windows "^1.0.0"
-
 cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -2141,10 +2142,6 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-is-windows@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
-
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -3537,7 +3534,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-bom@3.0.0:
+strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
@@ -3553,7 +3550,7 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
-strip-json-comments@~2.0.1:
+strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
@@ -3673,6 +3670,15 @@ tryit@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
 
+tsconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
+  dependencies:
+    "@types/strip-bom" "^3.0.0"
+    "@types/strip-json-comments" "0.0.30"
+    strip-bom "^3.0.0"
+    strip-json-comments "^2.0.0"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"