Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
2 changes: 1 addition & 1 deletion src/lib/webpack/transform-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default async function (env, config, ssr = false) {
}

require('babel-register')({
presets: ['env']
presets: [require.resolve('babel-preset-env')]
});
const m = require(transformerPath);
const transformer = m && m.default || m;
Expand Down
12 changes: 6 additions & 6 deletions src/lib/webpack/webpack-base-config.js
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
12 changes: 6 additions & 6 deletions tests/build.snapshot.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ export default {
'bundle.js': { size: 18460 },
'bundle.js.map': { size: 101500 },
'route-home.chunk.*.js': { size: 1020 },
'route-home.chunk.*.js.map': { size: 4283 },
'route-home.chunk.*.js.map': { size: 4977 },
'route-profile.chunk.*.js': { size: 1660 },
'route-profile.chunk.*.js.map': { size: 7504 },
'route-profile.chunk.*.js.map': { size: 8607 },
'polyfills.js.map': { size: 31750 },
'index.html': { size: 870 },
'style.css': { size: 1065 },
'style.css.map': { size: 2246 },
'ssr-build': {
'ssr-bundle.js': { size: 18960 },
'ssr-bundle.js.map': { size: 91773 },
'ssr-bundle.js.map': { size: 97403 },
'style.css': { size: 1065 },
'style.css.map': { size: 2250 },
}
Expand All @@ -85,16 +85,16 @@ export default {
'bundle.js': { size: 19300 },
'bundle.js.map': { size: 105590 },
'route-home.chunk.*.js': { size: 1000 },
'route-home.chunk.*.js.map': { size: 4285 },
'route-home.chunk.*.js.map': { size: 4981 },
'route-profile.chunk.*.js': { size: 1650 },
'route-profile.chunk.*.js.map': { size: 7507 },
'route-profile.chunk.*.js.map': { size: 8609 },
'polyfills.js.map': { size: 31800 },
'index.html': { size: 850 },
'style.css': { size: 1065 },
'style.css.map': { size: 2345 },
'ssr-build': {
'ssr-bundle.js': { size: 19820 },
'ssr-bundle.js.map': { size: 95581 },
'ssr-bundle.js.map': { size: 101502 },
'style.css': { size: 1065 },
'style.css.map': { size: 2345 },
}
Expand Down
1 change: 1 addition & 0 deletions tests/subjects/custom-babelrc/.babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plugins": [
"transform-regenerator",
["transform-react-jsx", { "pragma": "h" }],
["transform-runtime", {
"helpers": false,
"polyfill": false,
Expand Down
2 changes: 1 addition & 1 deletion tests/subjects/custom-babelrc/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from 'preact';
import { h, Component } from 'preact';

const delay = t => new Promise(r => setTimeout(r, t));

Expand Down