diff --git a/.all-contributorsrc b/.all-contributorsrc index fb3c9dee..1ec0193f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -88,6 +88,15 @@ "contributions": [ "code" ] + }, + { + "login": "fobbyal", + "name": "Alex Liang", + "avatar_url": "https://avatars2.githubusercontent.com/u/7818365?v=4", + "profile": "https://github.com/fobbyal", + "contributions": [ + "code" + ] } ], "repoType": "github" diff --git a/README.md b/README.md index fbe4a615..3996175e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![downloads][downloads-badge]][npmcharts] [![MIT License][license-badge]][license] -[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors) [![PRs Welcome][prs-badge]][prs] [![Code of Conduct][coc-badge]][coc] @@ -128,7 +128,7 @@ Thanks goes to these people ([emoji key][emojis]): | [
Kent C. Dodds](https://kentcdodds.com)
[💻](https://github.com/kentcdodds/kcd-scripts/commits?author=kentcdodds "Code") [📖](https://github.com/kentcdodds/kcd-scripts/commits?author=kentcdodds "Documentation") [🚇](#infra-kentcdodds "Infrastructure (Hosting, Build-Tools, etc)") [⚠️](https://github.com/kentcdodds/kcd-scripts/commits?author=kentcdodds "Tests") | [
Suhas Karanth](https://github.com/sudo-suhas)
[💻](https://github.com/kentcdodds/kcd-scripts/commits?author=sudo-suhas "Code") [🐛](https://github.com/kentcdodds/kcd-scripts/issues?q=author%3Asudo-suhas "Bug reports") [⚠️](https://github.com/kentcdodds/kcd-scripts/commits?author=sudo-suhas "Tests") | [
Matt Parrish](https://github.com/pbomb)
[💻](https://github.com/kentcdodds/kcd-scripts/commits?author=pbomb "Code") [⚠️](https://github.com/kentcdodds/kcd-scripts/commits?author=pbomb "Tests") | [
Mateus](https://github.com/mateuscb)
[💻](https://github.com/kentcdodds/kcd-scripts/commits?author=mateuscb "Code") [⚠️](https://github.com/kentcdodds/kcd-scripts/commits?author=mateuscb "Tests") | [
Macklin Underdown](http://macklin.underdown.me)
[💻](https://github.com/kentcdodds/kcd-scripts/commits?author=macklinu "Code") [⚠️](https://github.com/kentcdodds/kcd-scripts/commits?author=macklinu "Tests") | [
stereobooster](https://github.com/stereobooster)
[💻](https://github.com/kentcdodds/kcd-scripts/commits?author=stereobooster "Code") [⚠️](https://github.com/kentcdodds/kcd-scripts/commits?author=stereobooster "Tests") | [
Dony Sukardi](http://dsds.io)
[🐛](https://github.com/kentcdodds/kcd-scripts/issues?q=author%3Adonysukardi "Bug reports") [💻](https://github.com/kentcdodds/kcd-scripts/commits?author=donysukardi "Code") | | :---: | :---: | :---: | :---: | :---: | :---: | :---: | -| [
Alexander Nanberg](https://alexandernanberg.com)
[💻](https://github.com/kentcdodds/kcd-scripts/commits?author=alexandernanberg "Code") | +| [
Alexander Nanberg](https://alexandernanberg.com)
[💻](https://github.com/kentcdodds/kcd-scripts/commits?author=alexandernanberg "Code") | [
Alex Liang](https://github.com/fobbyal)
[💻](https://github.com/kentcdodds/kcd-scripts/commits?author=fobbyal "Code") | diff --git a/src/config/rollup.config.js b/src/config/rollup.config.js index 2d732e96..a782bd53 100644 --- a/src/config/rollup.config.js +++ b/src/config/rollup.config.js @@ -115,7 +115,11 @@ const output = [ }, ] -const useBuiltinConfig = !hasFile('.babelrc') && !hasFile('.babelrc.js') && !hasPkgProp('babel') +const useBuiltinConfig = + !hasFile('.babelrc') && + !hasFile('.babelrc.js') && + !hasFile('babel.config.js') && + !hasPkgProp('babel') const babelPresets = useBuiltinConfig ? [here('../config/babelrc.js')] : [] const replacements = Object.entries( @@ -143,7 +147,6 @@ module.exports = { commonjs({include: 'node_modules/**'}), json(), rollupBabel({ - exclude: 'node_modules/**', presets: babelPresets, babelrc: !useBuiltinConfig, runtimeHelpers: useBuiltinConfig, diff --git a/src/scripts/build/babel.js b/src/scripts/build/babel.js index 67d32e46..cbba0190 100644 --- a/src/scripts/build/babel.js +++ b/src/scripts/build/babel.js @@ -7,7 +7,11 @@ const args = process.argv.slice(2) const here = p => path.join(__dirname, p) const useBuiltinConfig = - !args.includes('--presets') && !hasFile('.babelrc') && !hasFile('.babelrc.js') && !hasPkgProp('babel') + !args.includes('--presets') && + !hasFile('.babelrc') && + !hasFile('.babelrc.js') && + !hasFile('babel.config.js') && + !hasPkgProp('babel') const config = useBuiltinConfig ? ['--presets', here('../../config/babelrc.js')] : []