keep nested exports with preserveModules (#2854) (#2863)

src/Chunk.ts

@@ -338,6 +338,7 @@ export default class Chunk {
 		const dynamicDependencies: Set<Chunk | ExternalModule> = new Set();
 		for (const module of this.orderedModules) {
 			this.addChunksFromDependencies(module.dependencies, dependencies);
+			this.addChunksFromDependencies(module.getReexportModules(), dependencies);
 			this.addChunksFromDependencies(module.dynamicDependencies, dynamicDependencies);
 			this.setUpModuleImports(module);
 		}

src/Module.ts

@@ -311,6 +311,10 @@ export default class Module {
 		);
 	}
 
+	getReexportModules() {
+		return this.getReexports().map(exportName => this.getVariableForExportName(exportName).module);
+	}
+
 	getReexports(walkedModuleIds = new Set<string>()) {
 		// avoid infinite recursion when using circular `export * from X`
 		if (walkedModuleIds.has(this.id)) {

test/chunking-form/samples/preserve-modules-nested-export/_config.js

@@ -0,0 +1,7 @@
+module.exports = {
+	description: 'confirm exports are preserved when exporting a module',
+	options: {
+		input: ['main1.js', 'main2.js'],
+		preserveModules: true
+	}
+};

test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/dep.js

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

test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main1.js

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

test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main2.js

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

test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/dep.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const foo = 1;
+
+exports.foo = foo;

test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main1.js

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

test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main2.js

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

test/chunking-form/samples/preserve-modules-nested-export/_expected/es/dep.js

@@ -0,0 +1,3 @@
+const foo = 1;
+
+export { foo };

test/chunking-form/samples/preserve-modules-nested-export/_expected/es/main1.js

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

test/chunking-form/samples/preserve-modules-nested-export/_expected/es/main2.js

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

test/chunking-form/samples/preserve-modules-nested-export/_expected/system/dep.js

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

test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main1.js

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

test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main2.js

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

test/chunking-form/samples/preserve-modules-nested-export/dep.js

@@ -0,0 +1,3 @@
+const foo = 1;
+
+export { foo  };

test/chunking-form/samples/preserve-modules-nested-export/main1.js

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

test/chunking-form/samples/preserve-modules-nested-export/main2.js

@@ -0,0 +1 @@
+export { foo } from './main1.js';