Skip to content

Fix Babel options & Respect root's .babelrc #153

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
hassanbazzi merged 4 commits into from
Jun 28, 2017
Merged

Fix Babel options & Respect root's .babelrc #153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eecdc8b
fix malformed babel options; honor root .babelrc file (only)
lukeed Jun 28, 2017
5f86dff
apply Rafal's catch
lukeed Jun 28, 2017
33bf939
fix babelrc test env
lukeed Jun 28, 2017
bf6f41a
tests: Update snapshots
rkostrzewski Jun 28, 2017
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
1 change: 1 addition & 0 deletions src/lib/babel-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export default (env, options={}) => ({
babelrc: false,
presets: [
[require.resolve('babel-preset-env'), {
loose: true,
Expand Down
12 changes: 6 additions & 6 deletions src/lib/webpack/webpack-base-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import autoprefixer from 'autoprefixer';
import ProgressBarPlugin from 'progress-bar-webpack-plugin';
import ReplacePlugin from 'webpack-plugin-replace';
import requireRelative from 'require-relative';
import createBabelConfig from '../babel-config';

export function exists(file) {
try {
Expand Down Expand Up @@ -48,6 +49,7 @@ export default (env) => {
env.manifest = readJson(src('manifest.json')) || {};
env.pkg = readJson(resolve(cwd, 'package.json')) || {};

let babelrc = readJson(resolve(cwd, '.babelrc')) || {};
let browsers = env.pkg.browserslist || ['> 1%', 'last 2 versions', 'IE >= 9'];

return group([
Expand Down Expand Up @@ -86,12 +88,10 @@ export default (env) => {
enforce: 'pre',
test: /\.jsx?$/,
loader: 'babel-loader',
options: {
babelrc: true,
presets: [
[resolve(__dirname, '../babel-config'), { browsers }]
]
}
options: Object.assign(
createBabelConfig(env, { browsers }),
babelrc // intentionall overwrite our settings
)
}
]
}
Expand Down