fix: sub define key should't be renamed when it's a defined variable

hai-x · hai-x · commit 58fb03552cdb · 2024-12-04T20:12:40.000+08:00
diff --git a/lib/DefinePlugin.js b/lib/DefinePlugin.js
@@ -14,7 +14,7 @@ const RuntimeGlobals = require("./RuntimeGlobals");
 const WebpackError = require("./WebpackError");
 const ConstDependency = require("./dependencies/ConstDependency");
 const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
-
+const { VariableInfo } = require("./javascript/JavascriptParser");
 const {
 	evaluateToString,
 	toConstantDependency
@@ -455,10 +455,16 @@ class DefinePlugin {
 					 */
 					const applyDefineKey = (prefix, key) => {
 						const splittedKey = key.split(".");
+						const firstKey = splittedKey[0];
 						for (const [i, _] of splittedKey.slice(1).entries()) {
 							const fullKey = prefix + splittedKey.slice(0, i + 1).join(".");
 							parser.hooks.canRename.for(fullKey).tap(PLUGIN_NAME, () => {
 								addValueDependency(key);
+								if (
+									parser.scope.definitions.get(firstKey) instanceof VariableInfo
+								) {
+									return false;
+								}
 								return true;
 							});
 						}
diff --git a/lib/javascript/JavascriptParser.js b/lib/javascript/JavascriptParser.js
@@ -5004,3 +5004,4 @@ module.exports.ALLOWED_MEMBER_TYPES_EXPRESSION =
 module.exports.ALLOWED_MEMBER_TYPES_CALL_EXPRESSION =
 	ALLOWED_MEMBER_TYPES_CALL_EXPRESSION;
 module.exports.getImportAttributes = getImportAttributes;
+module.exports.VariableInfo = VariableInfo;
diff --git a/test/configCases/plugins/define-plugin-sub-key/foo.js b/test/configCases/plugins/define-plugin-sub-key/foo.js
@@ -0,0 +1,4 @@
+
+export default {
+	bar: "test"
+}
diff --git a/test/configCases/plugins/define-plugin-sub-key/index.js b/test/configCases/plugins/define-plugin-sub-key/index.js
@@ -0,0 +1,22 @@
+
+import foo from './foo.js';
+
+function works1() {
+  return foo.bar;
+}
+
+function works2() {
+  const v = foo.bar;
+  return v;
+}
+
+function works3() {
+  const v = foo.bar.baz;
+  return v;
+}
+
+it("should compile and run", () => {
+  expect(works1()).toBe("test");
+  expect(works2()).toBe("test");
+  expect(works3()).toBe("test");
+});
diff --git a/test/configCases/plugins/define-plugin-sub-key/webpack.config.js b/test/configCases/plugins/define-plugin-sub-key/webpack.config.js
@@ -0,0 +1,10 @@
+var DefinePlugin = require("../../../../").DefinePlugin;
+
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	plugins: [
+		new DefinePlugin({
+			"foo.bar.baz": '"test"'
+		})
+	]
+};
diff --git a/types.d.ts b/types.d.ts
@@ -4546,7 +4546,7 @@ declare interface ExportSpec {
 	 */
 	hidden?: boolean;
 }
-type ExportedVariableInfo = string | ScopeInfo | VariableInfo;
+type ExportedVariableInfo = string | VariableInfo | ScopeInfo;
 declare abstract class ExportsInfo {
 	get ownedExports(): Iterable<ExportInfo>;
 	get orderedOwnedExports(): Iterable<ExportInfo>;
@@ -6810,7 +6810,7 @@ declare class JavascriptParser extends Parser {
 			| undefined
 			| ((
 					arg0: string,
-					arg1: string | ScopeInfo | VariableInfo,
+					arg1: string | VariableInfo | ScopeInfo,
 					arg2: () => string[]
 			  ) => any),
 		defined: undefined | ((arg0: string) => any),
@@ -7143,6 +7143,7 @@ declare class JavascriptParser extends Parser {
 			| ExportAllDeclarationJavascriptParser
 			| ImportExpressionJavascriptParser
 	) => undefined | ImportAttributes;
+	static VariableInfo: typeof VariableInfo;
 }
 
 /**
@@ -13918,7 +13919,7 @@ declare interface RuntimeValueOptions {
  * to create the range of the _parent node_.
  */
 declare interface ScopeInfo {
-	definitions: StackedMap<string, ScopeInfo | VariableInfo>;
+	definitions: StackedMap<string, VariableInfo | ScopeInfo>;
 	topLevelScope: boolean | "arrow";
 	inShorthand: string | boolean;
 	inTaggedTemplateTag: boolean;
@@ -15249,7 +15250,12 @@ type UsageStateType = 0 | 1 | 2 | 3 | 4;
 type UsedName = string | false | string[];
 type Value = string | number | boolean | RegExp;
 type ValueCacheVersion = string | Set<string>;
-declare abstract class VariableInfo {
+declare class VariableInfo {
+	constructor(
+		declaredScope: ScopeInfo,
+		freeName?: string | true,
+		tagInfo?: TagInfo
+	);
 	declaredScope: ScopeInfo;
 	freeName?: string | true;
 	tagInfo?: TagInfo;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +export default {
 +	bar: "test"
 +}