Skip to content

Commit

Permalink
fix: pass filename and inputMap to Babel (#138)
Browse files Browse the repository at this point in the history
  • Loading branch information
rumanHuq authored and eddyerburgh committed Feb 8, 2019
1 parent b5814d9 commit c44e618
Show file tree
Hide file tree
Showing 6 changed files with 1,036 additions and 924 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Expand Up @@ -4,6 +4,6 @@
"vue"
],
"extends": [
"plugin:vue-libs/recommended",
"plugin:vue-libs/recommended"
]
}
3 changes: 3 additions & 0 deletions lib/compilers/babel-compiler.js
Expand Up @@ -18,10 +18,13 @@ module.exports = function compileBabel (scriptContent, inputSourceMap, inlineCon

const babelOptions = Object.assign(sourceMapOptions, babelConfig)

// babel throws error if filename is undefined, "unknown" is default
if (!babelOptions.filename) babelOptions.filename = 'unknown'
const res = babel.transform(scriptContent, babelOptions)

return {
code: res.code,
sourceMap: res.map
}
}

16 changes: 11 additions & 5 deletions lib/compilers/coffee-compiler.js
Expand Up @@ -6,17 +6,23 @@ module.exports = function (raw, vueJestConfig, filePath) {
ensureRequire('coffee', ['coffeescript'])
var coffee = require('coffeescript')
var compiled
var babelConfig = loadBabelConfig(vueJestConfig, filePath)

// babel throws error if filename is undefined, "unknown" is default
if (!babelConfig.filename) babelConfig.filename = 'unknown'

try {
compiled = coffee.compile(raw, {
bare: true,
sourceMap: true,
transpile: loadBabelConfig(vueJestConfig, filePath)
transpile: babelConfig
})

return {
code: compiled.js,
map: compiled.v3SourceMap
}
} catch (err) {
throwError(err)
}
return {
code: compiled.js,
map: compiled.v3SourceMap
}
}
3 changes: 2 additions & 1 deletion lib/compilers/typescript-compiler.js
Expand Up @@ -11,7 +11,7 @@ module.exports = function compileTypescript (scriptContent, vueJestConfig, fileP
const res = typescript.transpileModule(scriptContent, tsConfig)
const inputSourceMap = (res.sourceMapText !== undefined)
? JSON.parse(res.sourceMapText)
: ''
: false // inputSourceMap must be a boolean, object, or undefined as per babel requirements

// handle ES modules in TS source code in case user uses non commonjs module
// output and there is no .babelrc.
Expand All @@ -26,3 +26,4 @@ module.exports = function compileTypescript (scriptContent, vueJestConfig, fileP

return compileBabel(res.outputText, inputSourceMap, inlineBabelConfig, vueJestConfig)
}

2 changes: 1 addition & 1 deletion test/.eslintrc
@@ -1,5 +1,5 @@
{
"extends": '../.eslintrc',
"extends": "../.eslintrc",
"env": {
"jest": true
}
Expand Down

0 comments on commit c44e618

Please sign in to comment.