Skip to content

Commit 372f6e2

Browse files
fix: track value dependencies for sibling keys in DefinePlugin member access
When an undefined member access resolves through a dotted sibling define (e.g. `OBJECT.SUB2.b` via `definitions["OBJECT.SUB2"]`), record a value dependency on every consulted key so the persistent cache invalidates when the sibling definition changes. Use an own-property check for the definitions-map lookup.
1 parent 09f2cd3 commit 372f6e2

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

‎lib/DefinePlugin.js‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -793,10 +793,15 @@ class DefinePlugin {
793793
const chainPrefix = chainParts.slice(isMeta ? 2 : 1);
794794
/**
795795
* Whether a member chain reads a property that is not defined.
796+
* Collects every define key consulted so the caller can record a
797+
* value dependency on each (a sibling key like `OBJECT.SUB2` affects
798+
* the result even though `OBJECT` registered the handler).
799+
* `member in value` keeps inherited members (e.g. `toString`) defined.
796800
* @param {Members} members chain members (after the root)
801+
* @param {string[]} deps consulted define keys (mutated)
797802
* @returns {boolean} true when the access resolves to `undefined`
798803
*/
799-
const isUndefinedMemberAccess = (members) => {
804+
const isUndefinedMemberAccess = (members, deps) => {
800805
if (members.length <= chainPrefix.length) return false;
801806
for (let i = 0; i < chainPrefix.length; i++) {
802807
if (members[i] !== chainPrefix[i]) return false;
@@ -811,8 +816,11 @@ class DefinePlugin {
811816
const nextPath = `${path}.${member}`;
812817
if (member in value) {
813818
value = value[member];
814-
} else if (nextPath in definitions) {
819+
} else if (
820+
Object.prototype.hasOwnProperty.call(definitions, nextPath)
821+
) {
815822
// defined via a dotted sibling key, e.g. `OBJECT.SUB2`
823+
deps.push(nextPath);
816824
value = definitions[nextPath];
817825
} else {
818826
return true;
@@ -824,8 +832,9 @@ class DefinePlugin {
824832
parser.hooks.expressionMemberChain
825833
.for(chainRoot)
826834
.tap(PLUGIN_NAME, (expr, members) => {
827-
if (!isUndefinedMemberAccess(members)) return;
828-
addValueDependency(key);
835+
const deps = [key];
836+
if (!isUndefinedMemberAccess(members, deps)) return;
837+
for (const dep of deps) addValueDependency(dep);
829838
return toConstantDependency(parser, "undefined")(expr);
830839
});
831840
// In a call, replace only the callee so the call itself is kept:
@@ -834,8 +843,9 @@ class DefinePlugin {
834843
parser.hooks.callMemberChain
835844
.for(chainRoot)
836845
.tap(PLUGIN_NAME, (expr, members) => {
837-
if (!isUndefinedMemberAccess(members)) return;
838-
addValueDependency(key);
846+
const deps = [key];
847+
if (!isUndefinedMemberAccess(members, deps)) return;
848+
for (const dep of deps) addValueDependency(dep);
839849
toConstantDependency(
840850
parser,
841851
"undefined"

0 commit comments

Comments
 (0)