Skip to content

Commit 04969c9

Browse files
committed
Fix a hidden merge conflict
1 parent 5933a48 commit 04969c9

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/ExportMap.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -383,12 +383,14 @@ ExportMap.parse = function (path, content, context) {
383383
const getter = thunkFor(p, context);
384384
m.imports.set(p, {
385385
getter,
386-
source: {
386+
declarations: new Set([{
387+
source: {
387388
// capturing actual node reference holds full AST in memory!
388-
value: source.value,
389-
loc: source.loc,
390-
},
391-
importedSpecifiers,
389+
value: source.value,
390+
loc: source.loc,
391+
},
392+
importedSpecifiers,
393+
}]),
392394
});
393395
}
394396

0 commit comments

Comments
 (0)