Avoid unnecessary facade dependency inlining

src/Chunk.ts

@@ -126,7 +126,12 @@ export default class Chunk {
 		if (!facadedModule.facadeChunk) {
 			facadedModule.facadeChunk = chunk;
 		}
-		chunk.dependencies.add(facadedModule.chunk!);
+		for (const dependency of facadedModule.getDependenciesToBeIncluded()) {
+			chunk.dependencies.add(dependency instanceof Module ? dependency.chunk! : dependency);
+		}
+		if (!chunk.dependencies.has(facadedModule.chunk!) && facadedModule.hasEffects()) {
+			chunk.dependencies.add(facadedModule.chunk!);
+		}
 		chunk.facadeModule = facadedModule;
 		chunk.strictFacade = true;
 		return chunk;

src/Module.ts

@@ -368,10 +368,7 @@ export default class Module {
 			const possibleDependencies = new Set(this.dependencies);
 			for (const dependency of possibleDependencies) {
 				if (!dependency.moduleSideEffects || relevantDependencies.has(dependency)) continue;
-				if (
-					dependency instanceof ExternalModule ||
-					(dependency.ast.included && dependency.ast.hasEffects(createHasEffectsContext()))
-				) {
+				if (dependency instanceof ExternalModule || dependency.hasEffects()) {
 					relevantDependencies.add(dependency);
 				} else {
 					for (const transitiveDependency of dependency.dependencies) {
@@ -532,6 +529,12 @@ export default class Module {
 		return null as any;
 	}
 
+	hasEffects() {
+		return (
+			this.moduleSideEffects && this.ast.included && this.ast.hasEffects(createHasEffectsContext())
+		);
+	}
+
 	include(): void {
 		const context = createInclusionContext();
 		if (this.ast.shouldBeIncluded(context)) this.ast.include(context, false);

src/ModuleLoader.ts

@@ -142,32 +142,31 @@ export class ModuleLoader {
 		this.nextEntryModuleIndex += unresolvedEntryModules.length;
 		const loadNewEntryModulesPromise = Promise.all(
 			unresolvedEntryModules.map(
-				async ({ fileName, id, name, importer }): Promise<Module> => {
-					const module = await this.loadEntryModule(id, true, importer);
-					if (fileName !== null) {
-						module.chunkFileNames.add(fileName);
-					} else if (name !== null) {
-						if (module.chunkName === null) {
-							module.chunkName = name;
-						}
-						if (isUserDefined) {
-							module.userChunkNames.add(name);
-						}
-					}
-					return module;
-				}
+				({ id, importer }): Promise<Module> => this.loadEntryModule(id, true, importer)
 			)
 		).then(entryModules => {
 			let moduleIndex = firstEntryModuleIndex;
-			for (const entryModule of entryModules) {
+			for (let index = 0; index < entryModules.length; index++) {
+				const { fileName, name } = unresolvedEntryModules[index];
+				const entryModule = entryModules[index];
 				entryModule.isUserDefinedEntryPoint = entryModule.isUserDefinedEntryPoint || isUserDefined;
-				const existingIndexModule = this.indexedEntryModules.find(
+				if (fileName !== null) {
+					entryModule.chunkFileNames.add(fileName);
+				} else if (name !== null) {
+					if (entryModule.chunkName === null) {
+						entryModule.chunkName = name;
+					}
+					if (isUserDefined) {
+						entryModule.userChunkNames.add(name);
+					}
+				}
+				const existingIndexedModule = this.indexedEntryModules.find(
 					indexedModule => indexedModule.module.id === entryModule.id
 				);
-				if (!existingIndexModule) {
+				if (!existingIndexedModule) {
 					this.indexedEntryModules.push({ module: entryModule, index: moduleIndex });
 				} else {
-					existingIndexModule.index = Math.min(existingIndexModule.index, moduleIndex);
+					existingIndexedModule.index = Math.min(existingIndexedModule.index, moduleIndex);
 				}
 				moduleIndex++;
 			}

test/chunking-form/samples/entry-aliases/_config.js

@@ -0,0 +1,13 @@
+module.exports = {
+	description: 'alias module dependency inlining',
+	options: {
+		input: {
+			'main1.js': 'main1.js',
+			'main1-alias.js': 'main1.js',
+			'main2.js': 'main2.js'
+		},
+		output: {
+			entryFileNames: '[name]'
+		}
+	}
+};

test/chunking-form/samples/entry-aliases/_expected/amd/generated-dep.js

@@ -0,0 +1,7 @@
+define(['exports'], function (exports) { 'use strict';
+
+	var name = 'name';
+
+	exports.name = name;
+
+});

test/chunking-form/samples/entry-aliases/_expected/amd/main1-alias.js

@@ -0,0 +1,9 @@
+define(['exports', './generated-dep'], function (exports, dep) { 'use strict';
+
+
+
+	exports.name = dep.name;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});

test/chunking-form/samples/entry-aliases/_expected/amd/main1.js

@@ -0,0 +1,9 @@
+define(['exports', './generated-dep'], function (exports, dep) { 'use strict';
+
+
+
+	exports.name = dep.name;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});

test/chunking-form/samples/entry-aliases/_expected/amd/main2.js

@@ -0,0 +1,5 @@
+define(['./generated-dep'], function (dep) { 'use strict';
+
+	console.log(dep.name);
+
+});

test/chunking-form/samples/entry-aliases/_expected/cjs/generated-dep.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var name = 'name';
+
+exports.name = name;

test/chunking-form/samples/entry-aliases/_expected/cjs/main1-alias.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var dep = require('./generated-dep.js');
+
+
+
+exports.name = dep.name;

test/chunking-form/samples/entry-aliases/_expected/cjs/main1.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var dep = require('./generated-dep.js');
+
+
+
+exports.name = dep.name;

test/chunking-form/samples/entry-aliases/_expected/cjs/main2.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var dep = require('./generated-dep.js');
+
+console.log(dep.name);

test/chunking-form/samples/entry-aliases/_expected/es/generated-dep.js

@@ -0,0 +1,3 @@
+var name = 'name';
+
+export { name as n };

test/chunking-form/samples/entry-aliases/_expected/es/main1-alias.js

@@ -0,0 +1 @@
+export { n as name } from './generated-dep.js';

test/chunking-form/samples/entry-aliases/_expected/es/main1.js

@@ -0,0 +1 @@
+export { n as name } from './generated-dep.js';

test/chunking-form/samples/entry-aliases/_expected/es/main2.js

@@ -0,0 +1,3 @@
+import { n as name } from './generated-dep.js';
+
+console.log(name);

test/chunking-form/samples/entry-aliases/_expected/system/generated-dep.js

@@ -0,0 +1,10 @@
+System.register([], function (exports) {
+	'use strict';
+	return {
+		execute: function () {
+
+			var name = exports('n', 'name');
+
+		}
+	};
+});

test/chunking-form/samples/entry-aliases/_expected/system/main1-alias.js

@@ -0,0 +1,13 @@
+System.register(['./generated-dep.js'], function (exports) {
+	'use strict';
+	return {
+		setters: [function (module) {
+			exports('name', module.n);
+		}],
+		execute: function () {
+
+
+
+		}
+	};
+});

test/chunking-form/samples/entry-aliases/_expected/system/main1.js

@@ -0,0 +1,13 @@
+System.register(['./generated-dep.js'], function (exports) {
+	'use strict';
+	return {
+		setters: [function (module) {
+			exports('name', module.n);
+		}],
+		execute: function () {
+
+
+
+		}
+	};
+});

test/chunking-form/samples/entry-aliases/_expected/system/main2.js

@@ -0,0 +1,14 @@
+System.register(['./generated-dep.js'], function () {
+	'use strict';
+	var name;
+	return {
+		setters: [function (module) {
+			name = module.n;
+		}],
+		execute: function () {
+
+			console.log(name);
+
+		}
+	};
+});

test/chunking-form/samples/entry-aliases/dep.js

@@ -0,0 +1 @@
+export var name = 'name';

test/chunking-form/samples/entry-aliases/main1.js

@@ -0,0 +1 @@
+export { name } from './dep.js';

test/chunking-form/samples/entry-aliases/main2.js

@@ -0,0 +1,2 @@
+import { name } from './dep.js';
+console.log(name);

test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js

@@ -1,4 +1,4 @@
-define(['exports', './m2', './generated-m1'], function (exports, m2, m1) { 'use strict';
+define(['exports', './m2'], function (exports, m2) { 'use strict';
 
 
 

test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var m2 = require('./m2.js');
-require('./generated-m1.js');
 
 
 

test/chunking-form/samples/entry-point-without-own-code/_expected/es/m1.js

@@ -1,2 +1 @@
 export { default as m2 } from './m2.js';
-import './generated-m1.js';

test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js

@@ -1,9 +1,9 @@
-System.register(['./m2.js', './generated-m1.js'], function (exports) {
+System.register(['./m2.js'], function (exports) {
 	'use strict';
 	return {
 		setters: [function (module) {
 			exports('m2', module.default);
-		}, function () {}],
+		}],
 		execute: function () {
 
 

test/form/samples/prune-pure-unused-import-array/_config.js

@@ -0,0 +1,10 @@
+module.exports = {
+	description: 'prunes pure unused external imports ([#1352])',
+	options: {
+		external: ['external', 'other'],
+		treeshake: { moduleSideEffects: ['other'] },
+		output: {
+			globals: { other: 'other' }
+		}
+	}
+};

test/form/samples/prune-pure-unused-import-array/_expected/amd.js

@@ -0,0 +1,5 @@
+define(['other'], function (other) { 'use strict';
+
+
+
+});

test/form/samples/prune-pure-unused-import-array/_expected/cjs.js

@@ -0,0 +1,4 @@
+'use strict';
+
+require('other');
+

test/form/samples/prune-pure-unused-import-array/_expected/es.js

@@ -0,0 +1 @@
+import 'other';

test/form/samples/prune-pure-unused-import-array/_expected/iife.js

@@ -0,0 +1,6 @@
+(function (other) {
+	'use strict';
+
+
+
+}(other));

test/form/samples/prune-pure-unused-import-array/_expected/system.js

@@ -0,0 +1,11 @@
+System.register(['other'], function () {
+	'use strict';
+	return {
+		setters: [function () {}],
+		execute: function () {
+
+
+
+		}
+	};
+});

test/form/samples/prune-pure-unused-import-array/_expected/umd.js

@@ -0,0 +1,9 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('other')) :
+	typeof define === 'function' && define.amd ? define(['other'], factory) :
+	(global = global || self, factory(global.other));
+}(this, (function (other) { 'use strict';
+
+
+
+})));

test/form/samples/prune-pure-unused-import-array/main.js

@@ -0,0 +1,7 @@
+import { unused } from 'external';
+import { notused } from 'other';
+
+function alsoUnused () {
+	unused();
+	notused();
+}

test/form/samples/prune-pure-unused-import-function/_config.js

@@ -0,0 +1,11 @@
+module.exports = {
+	description: 'prunes pure unused external imports ([#1352])',
+	expectedWarnings: ['EMPTY_BUNDLE'],
+	options: {
+		external: ['external', 'other'],
+		treeshake: { moduleSideEffects: id => id !== 'external' },
+		output: {
+			globals: { other: 'other' }
+		}
+	}
+};

test/form/samples/prune-pure-unused-import-function/_expected/amd.js

@@ -0,0 +1,5 @@
+define(['other'], function (other) { 'use strict';
+
+
+
+});

test/form/samples/prune-pure-unused-import-function/_expected/cjs.js

@@ -0,0 +1,4 @@
+'use strict';
+
+require('other');
+

test/form/samples/prune-pure-unused-import-function/_expected/es.js

@@ -0,0 +1 @@
+import 'other';

test/form/samples/prune-pure-unused-import-function/_expected/iife.js

@@ -0,0 +1,6 @@
+(function (other) {
+	'use strict';
+
+
+
+}(other));

test/form/samples/prune-pure-unused-import-function/_expected/system.js

@@ -0,0 +1,11 @@
+System.register(['other'], function () {
+	'use strict';
+	return {
+		setters: [function () {}],
+		execute: function () {
+
+
+
+		}
+	};
+});

test/form/samples/prune-pure-unused-import-function/_expected/umd.js

@@ -0,0 +1,9 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('other')) :
+	typeof define === 'function' && define.amd ? define(['other'], factory) :
+	(global = global || self, factory(global.other));
+}(this, (function (other) { 'use strict';
+
+
+
+})));

test/form/samples/prune-pure-unused-import-function/main.js

@@ -0,0 +1,7 @@
+import { unused } from 'external';
+import { notused } from 'other';
+
+function alsoUnused () {
+	unused();
+	notused();
+}