From 04969c9f7a37c4bb1d07c2b2f3f9ee9431843750 Mon Sep 17 00:00:00 2001
From: Filipp Riabchun <filipp.riabchun@jetbrains.com>
Date: Tue, 8 Jun 2021 17:36:15 +0200
Subject: [PATCH] Fix a hidden merge conflict

---
 src/ExportMap.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/ExportMap.js b/src/ExportMap.js
index 360587f698..aa3d2dc4c7 100644
--- a/src/ExportMap.js
+++ b/src/ExportMap.js
@@ -383,12 +383,14 @@ ExportMap.parse = function (path, content, context) {
     const getter = thunkFor(p, context);
     m.imports.set(p, {
       getter,
-      source: {
+      declarations: new Set([{
+        source: {
         // capturing actual node reference holds full AST in memory!
-        value: source.value,
-        loc: source.loc,
-      },
-      importedSpecifiers,
+          value: source.value,
+          loc: source.loc,
+        },
+        importedSpecifiers,
+      }]),
     });
   }