fix(deconflictChunk): Deconflict multiple index imports for ES format using nested export star statements

src/utils/deconflictChunk.ts

@@ -51,9 +51,18 @@ export function deconflictChunk(
 function deconflictImportsEsm(
 	usedNames: Set<string>,
 	imports: Set<Variable>,
-	_dependencies: Set<ExternalModule | Chunk>,
+	dependencies: Set<ExternalModule | Chunk>,
 	interop: boolean
 ) {
+	for (const chunkOrExternalModule of dependencies) {
+		// only deconflict index aliased variables for ESM/System
+		if (chunkOrExternalModule.variableName === 'index') {
+			chunkOrExternalModule.variableName = getSafeName(
+				chunkOrExternalModule.variableName,
+				usedNames
+			);
+		}
+	}
 	for (const variable of imports) {
 		const module = variable.module;
 		const name = variable.name;

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

@@ -0,0 +1,7 @@
+module.exports = {
+	description: 'confirm exports are deconflicted when exporting nested index aliases',
+	options: {
+		input: 'main.js',
+		preserveModules: true
+	}
+};

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js

@@ -0,0 +1,10 @@
+define(['exports', './module-a/v1/index', './module-b/v1/index'], function (exports, index, index$1) { 'use strict';
+
+
+
+	exports.ModuleA_V1 = index;
+	exports.ModuleB_V1 = index$1;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js

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

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js

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

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js

@@ -0,0 +1,11 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var index = require('./module-a/v1/index.js');
+var index$1 = require('./module-b/v1/index.js');
+
+
+
+exports.ModuleA_V1 = index;
+exports.ModuleB_V1 = index$1;

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const TEST_MODULE_A = 'A';
+
+exports.TEST_MODULE_A = TEST_MODULE_A;

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const TEST_MODULE_B = 'A';
+
+exports.TEST_MODULE_B = TEST_MODULE_B;

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

@@ -0,0 +1,4 @@
+import * as index from './module-a/v1/index.js';
+export { index as ModuleA_V1 };
+import * as index$1 from './module-b/v1/index.js';
+export { index$1 as ModuleB_V1 };

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/es/module-a/v1/index.js

@@ -0,0 +1,3 @@
+const TEST_MODULE_A = 'A';
+
+export { TEST_MODULE_A };

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/es/module-b/v1/index.js

@@ -0,0 +1,3 @@
+const TEST_MODULE_B = 'A';
+
+export { TEST_MODULE_B };

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/main.js

@@ -0,0 +1,15 @@
+System.register(['./module-a/v1/index.js', './module-b/v1/index.js'], function (exports) {
+	'use strict';
+	return {
+		setters: [function (module) {
+			exports('ModuleA_V1', module);
+		}, function (module) {
+			exports('ModuleB_V1', module);
+		}],
+		execute: function () {
+
+
+
+		}
+	};
+});

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/module-a/v1/index.js

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

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/module-b/v1/index.js

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

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/main.js

@@ -0,0 +1,2 @@
+export * from './module-a/index'
+export * from './module-b/index'

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/module-a/index.js

@@ -0,0 +1,3 @@
+import * as ModuleA_V1 from './v1/index'
+
+export { ModuleA_V1 }

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/module-a/v1/index.js

@@ -0,0 +1 @@
+export const TEST_MODULE_A = 'A'

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/module-b/index.js

@@ -0,0 +1,3 @@
+import * as ModuleB_V1 from './v1/index'
+
+export { ModuleB_V1 }

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/module-b/v1/index.js

@@ -0,0 +1 @@
+export const TEST_MODULE_B = 'A'