Merge branch 'import-specifier-deshadowing' into release-0.55.1

src/Chunk.ts

@@ -491,6 +491,9 @@ export default class Chunk {
 					} else {
 						safeName = (es || system) ? getSafeName(variable.name) : `${module.name}.${name}`;
 					}
+					if (es || system) {
+						toDeshadow.add(safeName);
+					}
 				} else if (es || system) {
 					safeName = getSafeName(variable.name);
 				} else {

src/ast/scopes/Scope.ts

@@ -88,7 +88,7 @@ export default class Scope {
 			// we can disregard exports.foo etc
 			if (declaration.exportName && declaration.isReassigned) return;
 
-			let name = declaration.getName();
+			let name = declaration.getName(true);
 
 			if (!names.has(name)) {
 				return;

src/ast/variables/Variable.ts

@@ -36,7 +36,13 @@ export default class Variable implements ExpressionEntity {
 		_options: ExecutionPathOptions
 	) { }
 
-	getName (): string {
+	getName (reset?: boolean): string {
+		if (reset && this.safeName && this.safeName !== this.name && 
+				this.safeName[this.name.length] === '$' &&
+				this.safeName[this.name.length + 1] === '$') {
+			this.safeName = undefined;
+			return this.name;
+		}
 		return this.safeName || this.name;
 	}
 

test/form/samples/import-specifier-deshadowing/_config.js

@@ -0,0 +1,6 @@
+module.exports = {
+	description: 'deshadows aliased import bindings',
+	options: {
+		name: 'Sticky'
+	}
+};

test/form/samples/import-specifier-deshadowing/_expected/amd.js

@@ -0,0 +1,13 @@
+define(['react-sticky'], function (reactSticky) { 'use strict';
+
+	var Sticky = function () {
+		function Sticky() {}
+
+		Sticky.foo = reactSticky.Sticky;
+
+		return Sticky;
+	}();
+
+	return Sticky;
+
+});

test/form/samples/import-specifier-deshadowing/_expected/cjs.js

@@ -0,0 +1,13 @@
+'use strict';
+
+var reactSticky = require('react-sticky');
+
+var Sticky = function () {
+	function Sticky() {}
+
+	Sticky.foo = reactSticky.Sticky;
+
+	return Sticky;
+}();
+
+module.exports = Sticky;

test/form/samples/import-specifier-deshadowing/_expected/es.js

@@ -0,0 +1,11 @@
+import { Sticky } from 'react-sticky';
+
+var Sticky$1 = function () {
+	function Sticky$$1() {}
+
+	Sticky$$1.foo = Sticky;
+
+	return Sticky$$1;
+}();
+
+export default Sticky$1;

test/form/samples/import-specifier-deshadowing/_expected/iife.js

@@ -0,0 +1,14 @@
+var Sticky = (function (reactSticky) {
+	'use strict';
+
+	var Sticky = function () {
+		function Sticky() {}
+
+		Sticky.foo = reactSticky.Sticky;
+
+		return Sticky;
+	}();
+
+	return Sticky;
+
+}(reactSticky));

test/form/samples/import-specifier-deshadowing/_expected/umd.js

@@ -0,0 +1,17 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('react-sticky')) :
+	typeof define === 'function' && define.amd ? define(['react-sticky'], factory) :
+	(global.Sticky = factory(global.reactSticky));
+}(this, (function (reactSticky) { 'use strict';
+
+	var Sticky = function () {
+		function Sticky() {}
+
+		Sticky.foo = reactSticky.Sticky;
+
+		return Sticky;
+	}();
+
+	return Sticky;
+
+})));

test/form/samples/import-specifier-deshadowing/main.js

@@ -0,0 +1,11 @@
+import { Sticky as ReactSticky } from 'react-sticky';
+
+var Sticky = function () {
+	function Sticky() {}
+
+	Sticky.foo = ReactSticky;
+
+	return Sticky;
+}();
+
+export { Sticky as default };