Merge #265

265: Remove import pruning r=ForsakenHarmony a=marvinhagemeister

Fixes #264 

**EDIT:** PR #262 likely needs to be merged first, as that one fixes the failing CI.

Co-authored-by: Marvin Hagemeister <[email protected]>
Co-authored-by: Jason Miller <[email protected]>
Co-authored-by: Leah <[email protected]>

Author: 4 people

package.json

@@ -68,7 +68,6 @@
     "rollup-plugin-postcss": "^1.6.1",
     "rollup-plugin-preserve-shebang": "^0.1.6",
     "rollup-plugin-sizes": "^0.4.2",
-    "rollup-plugin-strict-alias": "^1.0.0",
     "rollup-plugin-terser": "^3.0.0",
     "rollup-plugin-typescript2": "^0.18.0",
     "sade": "^1.4.0",

src/index.js

@@ -12,7 +12,6 @@ import nodeResolve from 'rollup-plugin-node-resolve';
 import buble from 'rollup-plugin-buble';
 import { terser } from 'rollup-plugin-terser';
 import postcss from 'rollup-plugin-postcss';
-import alias from 'rollup-plugin-strict-alias';
 import gzipSize from 'gzip-size';
 import brotliSize from 'brotli-size';
 import prettyBytes from 'pretty-bytes';
@@ -291,19 +290,6 @@ function createConfig(options, entry, format, writeMeta) {
 	let nameCache = {};
 	let mangleOptions = options.pkg.mangle || false;
 
-	let exportType;
-	if (format !== 'es') {
-		try {
-			let file = fs.readFileSync(entry, 'utf-8');
-			let hasDefault = /\bexport\s*default\s*[a-zA-Z_$]/.test(file);
-			let hasNamed =
-				/\bexport\s*(let|const|var|async|function\*?)\s*[a-zA-Z_$*]/.test(
-					file,
-				) || /^\s*export\s*\{/m.test(file);
-			if (hasDefault && hasNamed) exportType = 'default';
-		} catch (e) {}
-	}
-
 	const useTypescript = extname(entry) === '.ts' || extname(entry) === '.tsx';
 
 	const externalPredicate = new RegExp(`^(${external.join('|')})($|/)`);
@@ -323,7 +309,7 @@ function createConfig(options, entry, format, writeMeta) {
 
 	let config = {
 		inputOptions: {
-			input: exportType ? resolve(__dirname, '../src/lib/__entry__.js') : entry,
+			input: entry,
 			external: id => {
 				if (id === 'babel-plugin-transform-async-to-promises/helpers') {
 					return false;
@@ -335,9 +321,6 @@ function createConfig(options, entry, format, writeMeta) {
 			},
 			plugins: []
 				.concat(
-					alias({
-						__microbundle_entry__: entry,
-					}),
 					postcss({
 						plugins: [
 							autoprefixer(),
@@ -495,7 +478,6 @@ function createConfig(options, entry, format, writeMeta) {
 		},
 
 		outputOptions: {
-			exports: exportType ? 'default' : undefined,
 			paths: aliases,
 			globals,
 			strict: options.strict === true,

test/__snapshots__/index.test.js.snap

@@ -347,6 +347,33 @@ Build \\"customSrc\\" to dist:
 212 B: custom-src.umd.js.br"
 `;
 
+exports[`fixtures default-named 1`] = `
+"Used script: microbundle
+
+Directory tree:
+
+default-named
+  dist
+    default-named.js
+    default-named.js.map
+    default-named.mjs
+    default-named.mjs.map
+    default-named.umd.js
+    default-named.umd.js.map
+  package.json
+  src
+    index.js
+
+
+Build \\"defaultNamed\\" to dist:
+59 B: default-named.js.gz
+42 B: default-named.js.br
+70 B: default-named.mjs.gz
+58 B: default-named.mjs.br
+162 B: default-named.umd.js.gz
+124 B: default-named.umd.js.br"
+`;
+
 exports[`fixtures esnext-ts 1`] = `
 "Used script: microbundle --raw
 

test/fixtures/default-named/package.json

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

test/fixtures/default-named/src/index.js

@@ -0,0 +1,2 @@
+export const foo = 42;
+export default function bar() {}

test/index.test.js

@@ -96,4 +96,13 @@ describe('fixtures', () => {
 				.startsWith('#!'),
 		).toEqual(true);
 	});
+
+	it('should keep named and default export', () => {
+		const mod = require(resolve(
+			FIXTURES_DIR,
+			'default-named/dist/default-named.js',
+		));
+
+		expect(Object.keys(mod)).toEqual(['foo', 'default']);
+	});
 });