Commit ddd93e98 authored by Naoyuki Kanezawa's avatar Naoyuki Kanezawa Committed by Guillermo Rauch

Improve babel settings (#976)

* fix babelrc settings

* use only transform-es2015-modules-commonjs for transpiling emitting files
parent 3143e0d0
...@@ -109,7 +109,6 @@ export default async function createCompiler (dir, { dev = false, quiet = false ...@@ -109,7 +109,6 @@ export default async function createCompiler (dir, { dev = false, quiet = false
.filter((p) => !!p) .filter((p) => !!p)
const mainBabelOptions = { const mainBabelOptions = {
babelrc: true,
cacheDirectory: true, cacheDirectory: true,
sourceMaps: dev ? 'both' : false, sourceMaps: dev ? 'both' : false,
presets: [] presets: []
...@@ -119,8 +118,10 @@ export default async function createCompiler (dir, { dev = false, quiet = false ...@@ -119,8 +118,10 @@ export default async function createCompiler (dir, { dev = false, quiet = false
if (configLocation) { if (configLocation) {
console.log(`> Using external babel configuration`) console.log(`> Using external babel configuration`)
console.log(`> location: "${configLocation}"`) console.log(`> location: "${configLocation}"`)
mainBabelOptions.babelrc = true
} else { } else {
mainBabelOptions.presets.push(require.resolve('./babel/preset')) mainBabelOptions.presets.push(require.resolve('./babel/preset'))
mainBabelOptions.babelrc = false
} }
const rules = (dev ? [{ const rules = (dev ? [{
...@@ -158,7 +159,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false ...@@ -158,7 +159,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false
const babelRuntimePath = require.resolve('babel-runtime/package') const babelRuntimePath = require.resolve('babel-runtime/package')
.replace(/[\\/]package\.json$/, '') .replace(/[\\/]package\.json$/, '')
const transpiled = babelCore.transform(content, { const transpiled = babelCore.transform(content, {
presets: [require.resolve('babel-preset-es2015')], babelrc: false,
sourceMaps: dev ? 'both' : false, sourceMaps: dev ? 'both' : false,
// Here we need to resolve all modules to the absolute paths. // Here we need to resolve all modules to the absolute paths.
// Earlier we did it with the babel-preset. // Earlier we did it with the babel-preset.
...@@ -166,6 +167,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false ...@@ -166,6 +167,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false
// That's why we need to do it here. // That's why we need to do it here.
// See more: https://github.com/zeit/next.js/issues/951 // See more: https://github.com/zeit/next.js/issues/951
plugins: [ plugins: [
[require.resolve('babel-plugin-transform-es2015-modules-commonjs')],
[ [
require.resolve('babel-plugin-module-resolver'), require.resolve('babel-plugin-module-resolver'),
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment