Fix SystemJS default variable conflict

src/Chunk.ts

@@ -994,7 +994,6 @@ export default class Chunk {
 
 	private getDependenciesToBeDeconflicted(
 		addNonNamespacesAndInteropHelpers: boolean,
-		addInternalDependencies: boolean,
 		addDependenciesWithoutBindings: boolean,
 		interop: GetInterop
 	): DependenciesToBeDeconflicted {
@@ -1017,7 +1016,7 @@ export default class Chunk {
 							}
 						}
 					}
-				} else if (addInternalDependencies) {
+				} else {
 					const chunk = this.chunkByModule.get(module)!;
 					if (chunk !== this) {
 						dependencies.add(chunk);
@@ -1259,7 +1258,6 @@ export default class Chunk {
 			this.orderedModules,
 			this.getDependenciesToBeDeconflicted(
 				format !== 'es' && format !== 'system',
-				format !== 'system',
 				format === 'amd' || format === 'umd' || format === 'iife',
 				interop
 			),

test/chunking-form/samples/deconflict-system-default-export-variable/_config.js

@@ -0,0 +1,7 @@
+module.exports = {
+	description: 'deconflicts SystemJS default export variable with namespace imports',
+	options: {
+		external: 'external',
+		output: { preserveModules: true }
+	}
+};

test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/main.js

@@ -0,0 +1,7 @@
+define(['./other'], function (other) { 'use strict';
+
+	var main = other + "extended";
+
+	return main;
+
+});

test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/other.js

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

test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/main.js

@@ -0,0 +1,7 @@
+'use strict';
+
+var other = require('./other.js');
+
+var main = other + "extended";
+
+module.exports = main;

test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/other.js

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

test/chunking-form/samples/deconflict-system-default-export-variable/_expected/es/main.js

@@ -0,0 +1,5 @@
+import * as other from './other.js';
+
+var main = other + "extended";
+
+export default main;

test/chunking-form/samples/deconflict-system-default-export-variable/_expected/es/other.js

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

test/chunking-form/samples/deconflict-system-default-export-variable/_expected/system/main.js

@@ -0,0 +1,14 @@
+System.register(['./other.js'], function (exports) {
+	'use strict';
+	var other;
+	return {
+		setters: [function (module) {
+			other = module;
+		}],
+		execute: function () {
+
+			var main = exports('default', other + "extended");
+
+		}
+	};
+});

test/chunking-form/samples/deconflict-system-default-export-variable/_expected/system/other.js

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

test/chunking-form/samples/deconflict-system-default-export-variable/main.js

@@ -0,0 +1,3 @@
+import * as main from './other.js';
+
+export default main + "extended";

test/chunking-form/samples/deconflict-system-default-export-variable/other.js

@@ -0,0 +1 @@
+export const foo = 'bar'

test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/main.js

@@ -1,13 +1,13 @@
 System.register(['./m1.js'], function () {
 	'use strict';
-	var ms;
+	var m1;
 	return {
 		setters: [function (module) {
-			ms = module;
+			m1 = module;
 		}],
 		execute: function () {
 
-			console.log(ms);
+			console.log(m1);
 
 		}
 	};

test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/main.js

@@ -1,13 +1,13 @@
 System.register(['./m1.js'], function () {
 	'use strict';
-	var ms;
+	var m1;
 	return {
 		setters: [function (module) {
-			ms = module;
+			m1 = module;
 		}],
 		execute: function () {
 
-			console.log(ms);
+			console.log(m1);
 
 		}
 	};