Merge pull request #6689 from webpack/bugfix/issue-6688

fix #6688

lib/optimize/ConcatenatedModule.js

@@ -173,10 +173,10 @@ const getSymbolsFromScope = (s, untilScope) => {
 	const allUsedNames = new Set();
 	let scope = s;
 	while (scope) {
-		if (untilScope === scope) break;
 		for (const variable of scope.variables) {
 			allUsedNames.add(variable.name);
 		}
+		if (untilScope === scope) break;
 		scope = scope.upper;
 	}
 	return allUsedNames;

test/configCases/scope-hoisting/class-naming/index.js

@@ -0,0 +1,5 @@
+import { Hello as t } from "./module2";
+
+it("should rename classes correctly", () => {
+	new t();
+});

test/configCases/scope-hoisting/class-naming/module.js

@@ -0,0 +1 @@
+export class Hello {}

test/configCases/scope-hoisting/class-naming/module2.js

@@ -0,0 +1,3 @@
+import * as MODULE from "./module";
+let Hello = class Hello extends MODULE.Hello {}
+export { Hello }

test/configCases/scope-hoisting/class-naming/webpack.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	optimization: {
+		concatenateModules: true
+	}
+};