Skip to content

fix es modules usage in TypeScript when no .babelrc is present #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 16, 2018
Merged

fix es modules usage in TypeScript when no .babelrc is present #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dc3254
fix es modules usage in TypeScript when no .babelrc is present
yyx990803 Jan 15, 2018
2ce1214
only apply ts module transform if target is not already commonjs
yyx990803 Jan 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/compilers/babel-compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const babel = require('babel-core')
const loadBabelConfig = require('../load-babel-config.js')

module.exports = function compileBabel (scriptContent, inputSourceMap) {
const babelConfig = loadBabelConfig()
module.exports = function compileBabel (scriptContent, inputSourceMap, inlineConfig) {
const babelConfig = inlineConfig || loadBabelConfig()

if (!babelConfig) {
return {
Expand Down
14 changes: 13 additions & 1 deletion lib/compilers/typescript-compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const tsconfig = require('tsconfig')
const ensureRequire = require('../ensure-require')
const compileBabel = require('./babel-compiler')
const loadBabelConfig = require('../load-babel-config.js')
const cache = require('../cache')
const logger = require('../logger')

Expand Down Expand Up @@ -52,5 +53,16 @@ module.exports = function compileTypescript (scriptContent) {

const res = typescript.transpileModule(scriptContent, tsConfig)

return compileBabel(res.outputText, JSON.parse(res.sourceMapText))
// handle ES modules in TS source code in case user uses non commonjs module
// output and there is no .babelrc.
let inlineBabelConfig
if (tsConfig.compilerOptions.module !== 'commonjs' && !loadBabelConfig()) {
inlineBabelConfig = {
plugins: [
require('babel-plugin-transform-es2015-modules-commonjs')
]
}
}

return compileBabel(res.outputText, JSON.parse(res.sourceMapText), inlineBabelConfig)
}
Loading