feat(babel): merges babelrc with microbunde babel config (#396)

wardpeet · ForsakenHarmony · commit 1ad2b7d369a3 · 2019-05-29T00:03:08.000+02:00
* feat(babel): merges babelrc with microbunde babel config * update tests * Fix README.md Fix examples description * remove unused rollup-plugin-flow dependency (#379)
diff --git a/README.md b/README.md
@@ -116,10 +116,10 @@ Libraries often wish to rename internal object properties or class members to sm
     -h, --help       Displays this message
 
   Examples
-    $ microbundle microbundle --globals react=React,jquery=$
-    $ microbundle microbundle --define API_KEY=1234
-    $ microbundle microbundle --alias react=preact
-    $ microbundle microbundle --no-sourcemap # don't generate sourcemaps
+    $ microbundle build --globals react=React,jquery=$
+    $ microbundle build --define API_KEY=1234
+    $ microbundle build --alias react=preact
+    $ microbundle build --no-sourcemap # don't generate sourcemaps
 ```
 
 ## 🛣 Roadmap
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
     "@babel/core": "^7.4.5",
     "@babel/plugin-proposal-class-properties": "7.4.4",
     "@babel/plugin-syntax-jsx": "^7.2.0",
+    "@babel/plugin-transform-flow-strip-types": "^7.4.4",
     "@babel/plugin-transform-react-jsx": "^7.3.0",
     "@babel/polyfill": "^7.4.4",
     "@babel/preset-flow": "^7.0.0",
@@ -59,6 +60,7 @@
     "filesize": "^4.1.2",
     "gzip-size": "^5.1.1",
     "kleur": "^3.0.3",
+    "lodash.merge": "^4.6.1",
     "module-details-from-path": "^1.0.3",
     "pretty-bytes": "^5.2.0",
     "rollup": "^1.12.4",
@@ -67,7 +69,6 @@
     "rollup-plugin-bundle-size": "^1.0.1",
     "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-es3": "^1.1.0",
-    "rollup-plugin-flow": "^1.1.1",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-resolve": "^5.0.0",
     "rollup-plugin-postcss": "^2.0.3",
@@ -85,6 +86,7 @@
     "@babel/preset-env": "^7.4.5",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.8.0",
+    "core-js": "^3.1.2",
     "cross-env": "^5.2.0",
     "directory-tree": "^2.2.3",
     "eslint": "^5.16.0",
diff --git a/src/index.js b/src/index.js
@@ -8,6 +8,7 @@ import cssnano from 'cssnano';
 import { rollup, watch } from 'rollup';
 import commonjs from 'rollup-plugin-commonjs';
 import babel from 'rollup-plugin-babel';
+import customBabel from './lib/babel-custom';
 import nodeResolve from 'rollup-plugin-node-resolve';
 import { terser } from 'rollup-plugin-terser';
 import alias from 'rollup-plugin-alias';
@@ -18,7 +19,7 @@ import prettyBytes from 'pretty-bytes';
 import typescript from 'rollup-plugin-typescript2';
 import json from 'rollup-plugin-json';
 import logError from './log-error';
-import { readFile, isDir, isFile, stdout, stderr } from './utils';
+import { readFile, isDir, isFile, stdout, stderr, isTruthy } from './utils';
 import camelCase from 'camelcase';
 
 const removeScope = name => name.replace(/^@.*\//, '');
@@ -540,56 +541,31 @@ function createConfig(options, entry, format, writeMeta) {
 								},
 							},
 						}),
-					babel({
-						babelrc: false,
-						configFile: false,
-						compact: false,
-						include: 'node_modules/**',
-						plugins: [
-							[
-								require.resolve('babel-plugin-transform-replace-expressions'),
-								{ replace: defines },
+					// if defines is not set, we shouldn't run babel through node_modules
+					isTruthy(defines) &&
+						babel({
+							babelrc: false,
+							configFile: false,
+							compact: false,
+							include: 'node_modules/**',
+							plugins: [
+								[
+									require.resolve('babel-plugin-transform-replace-expressions'),
+									{ replace: defines },
+								],
 							],
-						],
-					}),
-					babel({
+						}),
+					customBabel({
 						extensions: EXTENSIONS,
 						exclude: 'node_modules/**',
 						passPerPreset: true, // @see https://babeljs.io/docs/en/options#passperpreset
-						presets: [
-							[
-								'@babel/preset-env',
-								{
-									loose: true,
-									modules: false,
-									targets:
-										options.target === 'node' ? { node: '8' } : undefined,
-									exclude: ['transform-async-to-generator'],
-								},
-							],
-							!useTypescript && ['@babel/preset-flow', { all: true }],
-						].filter(Boolean),
-						plugins: [
-							[
-								require.resolve('@babel/plugin-transform-react-jsx'),
-								{
-									pragma: options.jsx || 'h',
-									pragmaFrag: options.jsxFragment || 'Fragment',
-								},
-							],
-							[
-								require.resolve('babel-plugin-transform-replace-expressions'),
-								{ replace: defines },
-							],
-							[
-								require.resolve('babel-plugin-transform-async-to-promises'),
-								{ inlineHelpers: true, externalHelpers: true },
-							],
-							[
-								require.resolve('@babel/plugin-proposal-class-properties'),
-								{ loose: true },
-							],
-						],
+						custom: {
+							defines,
+							targets: options.target === 'node' ? { node: '8' } : undefined,
+							pragma: options.jsx || 'h',
+							pragmaFrag: options.jsxFragment || 'Fragment',
+							typescript: !!useTypescript,
+						},
 					}),
 					options.compress !== false && [
 						terser({
diff --git a/src/lib/babel-custom.js b/src/lib/babel-custom.js
@@ -0,0 +1,140 @@
+import { createConfigItem } from '@babel/core';
+import babelPlugin from 'rollup-plugin-babel';
+import merge from 'lodash.merge';
+import { isTruthy } from '../utils';
+
+const mergeConfigItems = (type, ...configItemsToMerge) => {
+	const mergedItems = [];
+
+	configItemsToMerge.forEach(configItemToMerge => {
+		configItemToMerge.forEach(item => {
+			const itemToMergeWithIndex = mergedItems.findIndex(
+				mergedItem => mergedItem.file.resolved === item.file.resolved,
+			);
+
+			if (itemToMergeWithIndex === -1) {
+				mergedItems.push(item);
+				return;
+			}
+
+			mergedItems[itemToMergeWithIndex] = createConfigItem(
+				[
+					mergedItems[itemToMergeWithIndex].file.resolved,
+					merge(mergedItems[itemToMergeWithIndex].options, item.options),
+				],
+				{
+					type,
+				},
+			);
+		});
+	});
+
+	return mergedItems;
+};
+
+const createConfigItems = (type, items) => {
+	return items.map(({ name, ...options }) => {
+		return createConfigItem([require.resolve(name), options], { type });
+	});
+};
+
+export default babelPlugin.custom(babelCore => {
+	return {
+		// Passed the plugin options.
+		options({ custom: customOptions, ...pluginOptions }) {
+			return {
+				// Pull out any custom options that the plugin might have.
+				customOptions,
+
+				// Pass the options back with the two custom options removed.
+				pluginOptions,
+			};
+		},
+
+		config(config, { customOptions }) {
+			const defaultPlugins = createConfigItems(
+				'plugin',
+				[
+					{
+						name: '@babel/plugin-transform-react-jsx',
+						pragma: customOptions.jsx || 'h',
+						pragmaFrag: customOptions.jsxFragment || 'Fragment',
+					},
+					isTruthy(customOptions.defines) && {
+						name: 'babel-plugin-transform-replace-expressions',
+						replace: customOptions.defines,
+					},
+					{
+						name: 'babel-plugin-transform-async-to-promises',
+						inlineHelpers: true,
+						externalHelpers: true,
+					},
+					{
+						name: '@babel/plugin-proposal-class-properties',
+						loose: true,
+					},
+				].filter(Boolean),
+			);
+
+			let babelOptions = {
+				presets: [],
+				plugins: [],
+			};
+			if (config.hasFilesystemConfig()) {
+				babelOptions = config.options;
+
+				if (babelOptions.presets) {
+					babelOptions.presets = babelOptions.presets.map(preset => {
+						// When preset-env is configured we want to make sure we override some settings.
+						// We want to make sure microbundle is still fast & creates small bundles
+						if (preset.file.request === '@babel/preset-env') {
+							preset = createConfigItem(
+								[
+									preset.file.resolved,
+									merge(
+										{
+											loose: true,
+											targets: customOptions.targets,
+										},
+										preset.options,
+										{
+											modules: false,
+											exclude: merge(
+												['transform-async-to-generator'],
+												preset.options.exclude || [],
+											),
+										},
+									),
+								],
+								{
+									type: `preset`,
+								},
+							);
+						}
+
+						return preset;
+					});
+				}
+			} else {
+				babelOptions.presets = createConfigItems('preset', [
+					{
+						name: '@babel/preset-env',
+						targets: customOptions.targets,
+						modules: false,
+						loose: true,
+						exclude: ['transform-async-to-generator'],
+					},
+				]);
+			}
+
+			// Merge babelrc & our plugins together
+			babelOptions.plugins = mergeConfigItems(
+				'plugin',
+				defaultPlugins,
+				babelOptions.plugins || [],
+			);
+
+			return babelOptions;
+		},
+	};
+});
diff --git a/src/utils.js b/src/utils.js
@@ -14,3 +14,11 @@ export const isFile = name =>
 		.catch(() => false);
 export const stdout = console.log.bind(console); // eslint-disable-line no-console
 export const stderr = console.error.bind(console);
+
+export const isTruthy = obj => {
+	if (!obj) {
+		return false;
+	}
+
+	return obj.constructor !== Object || Object.keys(obj).length > 0;
+};
diff --git a/test/__snapshots__/index.test.js.snap b/test/__snapshots__/index.test.js.snap
diff --git a/test/fixtures/custom-babelrc/.babelrc b/test/fixtures/custom-babelrc/.babelrc
@@ -0,0 +1,24 @@
+{
+	"presets": [
+		[
+			"@babel/preset-env",
+			{
+				"loose": true,
+				"modules": false,
+				"useBuiltIns": "usage",
+				"corejs": 3,
+				"targets": {
+					"esmodules": true
+				}
+			}
+		]
+	],
+	"plugins": [
+		[
+			"@babel/plugin-proposal-class-properties",
+			{
+				"loose": false
+			}
+		]
+	]
+}
diff --git a/test/fixtures/custom-babelrc/package.json b/test/fixtures/custom-babelrc/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "custom-babelrc"
+}
diff --git a/test/fixtures/custom-babelrc/src/index.js b/test/fixtures/custom-babelrc/src/index.js
@@ -0,0 +1,6 @@
+export class MyClass {
+	myFields = ['foo', 'bar'];
+	async foo() {
+		return this.myFields.find(item => item === 'bar');
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "custom-babelrc"`
	`3`	`+}`