Merge remote-tracking branch 'origin/master' into 0.8.0

Author: ForsakenHarmony

babel.config.js

@@ -3,21 +3,12 @@ module.exports = {
 		[
 			'@babel/preset-env',
 			{
-				exclude: [
-					'transform-async-to-generator',
-					'proposal-async-generator-functions',
-					'transform-regenerator',
-				],
 				loose: true,
 				targets: {
-					chrome: '58',
-					ie: '11',
+					node: 'current',
 				},
 			},
 		],
 	],
-	plugins: [
-		['babel-plugin-transform-async-to-promises', { inlineHelpers: true }],
-		'@babel/plugin-syntax-jsx',
-	],
+	plugins: ['@babel/plugin-syntax-jsx'],
 };

package.json

@@ -90,7 +90,7 @@
     "husky": "^1.1.2",
     "jest": "^23.6.0",
     "lint-staged": "^8.0.0",
-    "prettier": "^1.13.0",
+    "prettier": "^1.15.3",
     "regenerator-runtime": "^0.12.1",
     "rimraf": "^2.6.2",
     "shell-quote": "^1.6.1",

src/cli.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 import microbundle from '.';
 import prog from './prog';
 import { stdout } from './utils';

src/index.js

@@ -319,6 +319,8 @@ function createConfig(options, entry, format, writeMeta) {
 	}
 	loadNameCache();
 
+	let shebang;
+
 	let config = {
 		inputOptions: {
 			input: exportType ? resolve(__dirname, '../src/lib/__entry__.js') : entry,
@@ -375,14 +377,39 @@ function createConfig(options, entry, format, writeMeta) {
 						babelrc: false,
 						exclude: 'node_modules/**',
 						plugins: [
-							'@babel/plugin-syntax-jsx',
+							require.resolve('@babel/plugin-syntax-jsx'),
 							[
-								'babel-plugin-transform-async-to-promises',
+								require.resolve('babel-plugin-transform-async-to-promises'),
 								{ inlineHelpers: true, externalHelpers: true },
 							],
-							['@babel/plugin-proposal-class-properties', { loose: true }],
+							[
+								require.resolve('@babel/plugin-proposal-class-properties'),
+								{ loose: true },
+							],
 						],
 					}),
+					{
+						// Custom plugin that removes shebang from code because newer
+						// versions of bublé bundle their own private version of `acorn`
+						// and I don't know a way to patch in the option `allowHashBang`
+						// to acorn.
+						// See: https://github.com/Rich-Harris/buble/pull/165
+						transform(code) {
+							let reg = /^#!(.*)/;
+							let match = code.match(reg);
+
+							if (match !== null) {
+								shebang = '#!' + match[0];
+							}
+
+							code = code.replace(reg, '');
+
+							return {
+								code,
+								map: null,
+							};
+						},
+					},
 					buble({
 						exclude: 'node_modules/**',
 						jsx: options.jsx || 'h',
@@ -459,7 +486,9 @@ function createConfig(options, entry, format, writeMeta) {
 							config._code = code;
 						},
 					},
-					shebangPlugin(),
+					shebangPlugin({
+						shebang,
+					}),
 				)
 				.filter(Boolean),
 		},

test/__snapshots__/index.test.js.snap

@@ -480,3 +480,30 @@ Build \\"raw\\" to dist:
 1493 B: raw.umd.js.gz
 1245 B: raw.umd.js.br"
 `;
+
+exports[`fixtures shebang 1`] = `
+"Used script: microbundle
+
+Directory tree:
+
+shebang
+  dist
+    shebang.js
+    shebang.js.map
+    shebang.mjs
+    shebang.mjs.map
+    shebang.umd.js
+    shebang.umd.js.map
+  package.json
+  src
+    index.js
+
+
+Build \\"shebang\\" to dist:
+85 B: shebang.js.gz
+62 B: shebang.js.br
+89 B: shebang.mjs.gz
+70 B: shebang.mjs.br
+177 B: shebang.umd.js.gz
+149 B: shebang.umd.js.br"
+`;

test/fixtures/shebang/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "shebang"
+}

test/fixtures/shebang/src/index.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+export function foo() {
+	return 'hello world';
+}

test/index.test.js

@@ -88,4 +88,12 @@ describe('fixtures', () => {
 			).toMatchSnapshot();
 		});
 	});
+
+	it('should keep shebang', () => {
+		expect(
+			fs
+				.readFileSync(resolve(FIXTURES_DIR, 'shebang/dist/shebang.js'), 'utf8')
+				.startsWith('#!'),
+		).toEqual(true);
+	});
 });