terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Babelrc false babelrc (#1094)

Browse source 
* Detect babelrc disabling via babelrc.

* Simplify boolean condition.
This commit is contained in:
Arunoda Susiripala 2017-02-13 02:48:22 +05:30 committed by Naoyuki Kanezawa
parent a0453a7b84
commit b220193167
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/.babelrc
View file

@ -1,3 +1,3 @@
{ {
"presets": ["../babel"] "babelrc": false
} }

4
server/build/babel/find-config-location.js → server/build/babel/find-config.js
View file

@ -1,7 +1,7 @@
import { join } from 'path' import { join } from 'path'
import buildConfigChain from 'babel-core/lib/transformation/file/options/build-config-chain' import buildConfigChain from 'babel-core/lib/transformation/file/options/build-config-chain'
export default function findBabelConfigLocation (dir) { export default function findBabelConfig (dir) {
// We need to provide a location of a filename inside the `dir`. // We need to provide a location of a filename inside the `dir`.
// For the name of the file, we could be provide anything. // For the name of the file, we could be provide anything.
const filename = join(dir, 'filename.js') const filename = join(dir, 'filename.js')
@ -12,5 +12,5 @@ export default function findBabelConfigLocation (dir) {
// That's the config we are passing as the "options" below // That's the config we are passing as the "options" below
const configList = buildConfigChain(options).filter(i => i.loc !== 'base') const configList = buildConfigChain(options).filter(i => i.loc !== 'base')
return configList[0] ? configList[0].loc : null return configList[0]
} }

20
server/build/webpack.js
View file

@ -10,7 +10,7 @@ import WatchPagesPlugin from './plugins/watch-pages-plugin'
import JsonPagesPlugin from './plugins/json-pages-plugin' import JsonPagesPlugin from './plugins/json-pages-plugin'
import getConfig from '../config' import getConfig from '../config'
import * as babelCore from 'babel-core' import * as babelCore from 'babel-core'
import findBabelConfigLocation from './babel/find-config-location' import findBabelConfig from './babel/find-config'
const documentPage = join('pages', '_document.js') const documentPage = join('pages', '_document.js')
const defaultPages = [ const defaultPages = [
@ -114,16 +114,24 @@ export default async function createCompiler (dir, { dev = false, quiet = false
presets: [] presets: []
} }
const configLocation = findBabelConfigLocation(dir) const externalBabelConfig = findBabelConfig(dir)
if (configLocation) { if (externalBabelConfig) {
console.log(`> Using external babel configuration`) console.log(`> Using external babel configuration`)
console.log(`> location: "${configLocation}"`) console.log(`> location: "${externalBabelConfig.loc}"`)
mainBabelOptions.babelrc = true // It's possible to turn off babelrc support via babelrc itself.
// In that case, we should add our default preset.
// That's why we need to do this.
const { options } = externalBabelConfig
mainBabelOptions.babelrc = options.babelrc !== false
} else { } else {
mainBabelOptions.presets.push(require.resolve('./babel/preset'))
mainBabelOptions.babelrc = false mainBabelOptions.babelrc = false
} }
// Add our default preset if the no "babelrc" found.
if (!mainBabelOptions.babelrc) {
mainBabelOptions.presets.push(require.resolve('./babel/preset'))
}
const rules = (dev ? [{ const rules = (dev ? [{
test: /\.js(\?[^?]*)?$/, test: /\.js(\?[^?]*)?$/,
loader: 'hot-self-accept-loader', loader: 'hot-self-accept-loader',