From e23146256940dafea1df9538c8b34d0ef5b7f8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <github@andipaetzold.com>
Date: Fri, 27 May 2022 19:54:28 +0200
Subject: [PATCH 1/6] fix: add type exports to `firebase` package

---
 packages/firebase/package.json | 78 ++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 26 deletions(-)

diff --git a/packages/firebase/package.json b/packages/firebase/package.json
index 9c3350875ff..55665049653 100644
--- a/packages/firebase/package.json
+++ b/packages/firebase/package.json
@@ -28,182 +28,208 @@
         "require": "./analytics/dist/index.cjs.js",
         "import": "./analytics/dist/index.mjs"
       },
-      "default": "./analytics/dist/index.esm.js"
+      "default": "./analytics/dist/index.esm.js",
+      "types": "./analytics/dist/analytics/index.d.ts"
     },
     "./app": {
       "node": {
         "require": "./app/dist/index.cjs.js",
         "import": "./app/dist/index.mjs"
       },
-      "default": "./app/dist/index.esm.js"
+      "default": "./app/dist/index.esm.js",
+      "types": "./app/dist/app/index.d.ts"
     },
     "./app-check": {
       "node": {
         "require": "./app-check/dist/index.cjs.js",
         "import": "./app-check/dist/index.mjs"
       },
-      "default": "./app-check/dist/index.esm.js"
+      "default": "./app-check/dist/index.esm.js",
+      "types": "./app-check/dist/app-check/index.d.ts"
     },
     "./auth": {
       "node": {
         "require": "./auth/dist/index.cjs.js",
         "import": "./auth/dist/index.mjs"
       },
-      "default": "./auth/dist/index.esm.js"
+      "default": "./auth/dist/index.esm.js",
+      "types": "./auth/dist/auth/index.d.ts"
     },
     "./auth/cordova": {
       "node": {
         "require": "./auth/cordova/dist/index.cjs.js",
         "import": "./auth/cordova/dist/index.mjs"
       },
-      "default": "./auth/cordova/dist/index.esm.js"
+      "default": "./auth/cordova/dist/index.esm.js",
+      "types": "./auth/cordova/dist/auth/cordova/index.d.ts"
     },
     "./auth/react-native": {
       "node": {
         "require": "./auth/react-native/dist/index.cjs.js",
         "import": "./auth/react-native/dist/index.mjs"
       },
-      "default": "./auth/react-native/dist/index.esm.js"
+      "default": "./auth/react-native/dist/index.esm.js",
+      "types": "./auth/react-native/dist/auth/react-native/index.d.ts"
     },
     "./database": {
       "node": {
         "require": "./database/dist/index.cjs.js",
         "import": "./database/dist/index.mjs"
       },
-      "default": "./database/dist/index.esm.js"
+      "default": "./database/dist/index.esm.js",
+      "types": "./database/dist/database/index.d.ts"
     },
     "./firestore": {
       "node": {
         "require": "./firestore/dist/index.cjs.js",
         "import": "./firestore/dist/index.mjs"
       },
-      "default": "./firestore/dist/index.esm.js"
+      "default": "./firestore/dist/index.esm.js",
+      "types": "./firestore/dist/firestore/index.d.ts"
     },
     "./firestore/lite": {
       "node": {
         "require": "./firestore/lite/dist/index.cjs.js",
         "import": "./firestore/lite/dist/index.mjs"
       },
-      "default": "./firestore/lite/dist/index.esm.js"
+      "default": "./firestore/lite/dist/index.esm.js",
+      "types": "./firestore/lite/dist/firestore/lite/index.d.ts"
     },
     "./functions": {
       "node": {
         "require": "./functions/dist/index.cjs.js",
         "import": "./functions/dist/index.mjs"
       },
-      "default": "./functions/dist/index.esm.js"
+      "default": "./functions/dist/index.esm.js",
+      "types": "./functions/dist/functions/index.d.ts"
     },
     "./messaging": {
       "node": {
         "require": "./messaging/dist/index.cjs.js",
         "import": "./messaging/dist/index.mjs"
       },
-      "default": "./messaging/dist/index.esm.js"
+      "default": "./messaging/dist/index.esm.js",
+      "types": "./messaging/dist/messaging/index.d.ts"
     },
     "./messaging/sw": {
       "node": {
         "require": "./messaging/sw/dist/index.cjs.js",
         "import": "./messaging/sw/dist/index.mjs"
       },
-      "default": "./messaging/sw/dist/index.esm.js"
+      "default": "./messaging/sw/dist/index.esm.js",
+      "types": "./messaging/sw/dist/messaging/sw/index.d.ts"
     },
     "./performance": {
       "node": {
         "require": "./performance/dist/index.cjs.js",
         "import": "./performance/dist/index.mjs"
       },
-      "default": "./performance/dist/index.esm.js"
+      "default": "./performance/dist/index.esm.js",
+      "types": "./performance/dist/performance/index.d.ts"
     },
     "./remote-config": {
       "node": {
         "require": "./remote-config/dist/index.cjs.js",
         "import": "./remote-config/dist/index.mjs"
       },
-      "default": "./remote-config/dist/index.esm.js"
+      "default": "./remote-config/dist/index.esm.js",
+      "types": "./remote-config/dist/remote-config/index.d.ts"
     },
     "./storage": {
       "node": {
         "require": "./storage/dist/index.cjs.js",
         "import": "./storage/dist/index.mjs"
       },
-      "default": "./storage/dist/index.esm.js"
+      "default": "./storage/dist/index.esm.js",
+      "types": "./storage/dist/storage/index.d.ts"
     },
     "./compat/analytics": {
       "node": {
         "require": "./compat/analytics/dist/index.cjs.js",
         "import": "./compat/analytics/dist/index.mjs"
       },
-      "default": "./compat/analytics/dist/index.esm.js"
+      "default": "./compat/analytics/dist/index.esm.js",
+      "types": "./compat/analytics/dist/compat/analytics/index.d.ts"
     },
     "./compat/app": {
       "node": {
         "require": "./compat/app/dist/index.cjs.js",
         "import": "./compat/app/dist/index.mjs"
       },
-      "default": "./compat/app/dist/index.esm.js"
+      "default": "./compat/app/dist/index.esm.js",
+      "types": "./compat/app/dist/compat/app/index.d.ts"
     },
     "./compat/app-check": {
       "node": {
         "require": "./compat/app-check/dist/index.cjs.js",
         "import": "./compat/app-check/dist/index.mjs"
       },
-      "default": "./compat/app-check/dist/index.esm.js"
+      "default": "./compat/app-check/dist/index.esm.js",
+      "types": "./compat/app-check/dist/compat/app-check/index.d.ts"
     },
     "./compat/auth": {
       "node": {
         "require": "./compat/auth/dist/index.cjs.js",
         "import": "./compat/auth/dist/index.mjs"
       },
-      "default": "./compat/auth/dist/index.esm.js"
+      "default": "./compat/auth/dist/index.esm.js",
+      "types": "./compat/auth/dist/compat/auth/index.d.ts"
     },
     "./compat/database": {
       "node": {
         "require": "./compat/database/dist/index.cjs.js",
         "import": "./compat/database/dist/index.mjs"
       },
-      "default": "./compat/database/dist/index.esm.js"
+      "default": "./compat/database/dist/index.esm.js",
+      "types": "./compat/database/dist/compat/database/index.d.ts"
     },
     "./compat/firestore": {
       "node": {
         "require": "./compat/firestore/dist/index.cjs.js",
         "import": "./compat/firestore/dist/index.mjs"
       },
-      "default": "./compat/firestore/dist/index.esm.js"
+      "default": "./compat/firestore/dist/index.esm.js",
+      "types": "./compat/firestore/dist/compat/firestore/index.d.ts"
     },
     "./compat/functions": {
       "node": {
         "require": "./compat/functions/dist/index.cjs.js",
         "import": "./compat/functions/dist/index.mjs"
       },
-      "default": "./compat/functions/dist/index.esm.js"
+      "default": "./compat/functions/dist/index.esm.js",
+      "types": "./compat/functions/dist/compat/functions/index.d.ts"
     },
     "./compat/messaging": {
       "node": {
         "require": "./compat/messaging/dist/index.cjs.js",
         "import": "./compat/messaging/dist/index.mjs"
       },
-      "default": "./compat/messaging/dist/index.esm.js"
+      "default": "./compat/messaging/dist/index.esm.js",
+      "types": "./compat/messaging/dist/compat/messaging/index.d.ts"
     },
     "./compat/performance": {
       "node": {
         "require": "./compat/performance/dist/index.cjs.js",
         "import": "./compat/performance/dist/index.mjs"
       },
-      "default": "./compat/performance/dist/index.esm.js"
+      "default": "./compat/performance/dist/index.esm.js",
+      "types": "./compat/performance/dist/compat/performance/index.d.ts"
     },
     "./compat/remote-config": {
       "node": {
         "require": "./compat/remote-config/dist/index.cjs.js",
         "import": "./compat/remote-config/dist/index.mjs"
       },
-      "default": "./compat/remote-config/dist/index.esm.js"
+      "default": "./compat/remote-config/dist/index.esm.js",
+      "types": "./compat/remote-config/dist/compat/remote-config/index.d.ts"
     },
     "./compat/storage": {
       "node": {
         "require": "./compat/storage/dist/index.cjs.js",
         "import": "./compat/storage/dist/index.mjs"
       },
-      "default": "./compat/storage/dist/index.esm.js"
+      "default": "./compat/storage/dist/index.esm.js",
+      "types": "./compat/storage/dist/compat/storage/index.d.ts"
     },
     "./package.json": "./package.json"
   },

From c3b064a29035d1c95798a4661e337ecfc1841473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <github@andipaetzold.com>
Date: Fri, 27 May 2022 19:56:35 +0200
Subject: [PATCH 2/6] fix: add type exports to `@firebase` packages

---
 packages/analytics-compat/package.json     |  3 +-
 packages/analytics/package.json            |  3 +-
 packages/app-check-compat/package.json     |  3 +-
 packages/app-check/package.json            |  3 +-
 packages/app-compat/package.json           |  3 +-
 packages/app/package.json                  |  3 +-
 packages/auth-compat/package.json          |  6 ++-
 packages/auth/package.json                 | 47 +++++++++++++++++-----
 packages/component/package.json            |  3 +-
 packages/database-compat/package.json      |  9 +++--
 packages/database/package.json             |  3 +-
 packages/firestore-compat/package.json     |  3 +-
 packages/firestore/package.json            |  6 ++-
 packages/functions-compat/package.json     |  3 +-
 packages/functions/package.json            |  3 +-
 packages/installations-compat/package.json |  3 +-
 packages/installations/package.json        |  3 +-
 packages/logger/package.json               |  3 +-
 packages/messaging-compat/package.json     |  3 +-
 packages/messaging/package.json            |  6 ++-
 packages/performance-compat/package.json   |  3 +-
 packages/performance/package.json          |  3 +-
 packages/remote-config-compat/package.json |  3 +-
 packages/remote-config/package.json        |  3 +-
 packages/storage-compat/package.json       |  3 +-
 packages/storage/package.json              |  3 +-
 packages/template/package.json             |  3 +-
 packages/util/package.json                 |  3 +-
 packages/webchannel-wrapper/package.json   |  3 +-
 29 files changed, 102 insertions(+), 44 deletions(-)

diff --git a/packages/analytics-compat/package.json b/packages/analytics-compat/package.json
index 5c94458b819..f35b1f9ed7a 100644
--- a/packages/analytics-compat/package.json
+++ b/packages/analytics-compat/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/src/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
index a8350fd96bc..2c4c1081b58 100644
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/analytics-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/app-check-compat/package.json b/packages/app-check-compat/package.json
index 7dad8d88cc2..d7632190b70 100644
--- a/packages/app-check-compat/package.json
+++ b/packages/app-check-compat/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/src/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/app-check/package.json b/packages/app-check/package.json
index 94869d55c23..4efd75c2f09 100644
--- a/packages/app-check/package.json
+++ b/packages/app-check/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/app-check-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/app-compat/package.json b/packages/app-compat/package.json
index 2741f36db4f..dad95b617e4 100644
--- a/packages/app-compat/package.json
+++ b/packages/app-compat/package.json
@@ -15,7 +15,8 @@
       "esm5": "./dist/esm/index.esm5.js",
       "lite": "./dist/index.lite.js",
       "liteesm5": "./dist/index.lite.esm5.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/app-compat-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/app/package.json b/packages/app/package.json
index ffd2bf6f52d..f7ba2a2b148 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/app-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json
index 994b02aaad7..71a2c8ba8a6 100644
--- a/packages/auth-compat/package.json
+++ b/packages/auth-compat/package.json
@@ -11,10 +11,12 @@
     ".": {
       "node": {
         "import": "./dist/esm/index.node.esm.js",
-        "require": "./dist/index.node.cjs.js"
+        "require": "./dist/index.node.cjs.js",
+        "types": "./dist/auth-compat/index.node.d.ts"
       },
       "esm5": "./dist/index.esm.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/auth-compat/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 70a8794a583..4a56f660fdb 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -14,25 +14,50 @@
     ".": {
       "node": {
         "import": "./dist/node-esm/index.js",
-        "require": "./dist/node/index.js"
+        "require": "./dist/node/index.js",
+        "types": "./dist/node/index.d.ts"
+      },
+      "react-native": {
+        "default": "./dist/rn/index.js",
+        "types": "./dist/rn/index.rn.d.ts"
+      },
+      "cordova": {
+        "default": "./dist/cordova/index.js",
+        "types": "./dist/cordova/index.cordova.d.ts"
+      },
+      "webworker": {
+        "default": "./dist/index.webworker.esm5.js",
+        "types": "./dist/index.webworker.d.ts"
       },
-      "react-native": "./dist/rn/index.js",
-      "cordova": "./dist/cordova/index.js",
-      "webworker": "./dist/index.webworker.esm5.js",
       "esm5": "./dist/esm5/index.js",
-      "default": "./dist/esm2017/index.js"
+      "default": "./dist/esm2017/index.js",
+      "types": "./dist/auth-public.d.ts"
+    },
+    "./cordova": {
+      "default": "./dist/cordova/index.js",
+      "types": "./dist/cordova/index.cordova.d.ts"
+    },
+    "./react-native": {
+      "default": "./dist/rn/index.js",
+      "types": "./dist/rn/index.rn.d.ts"
     },
-    "./cordova": "./dist/cordova/index.js",
-    "./react-native": "./dist/rn/index.js",
     "./internal": {
       "node": {
         "import": "./dist/node-esm/internal.js",
-        "require": "./dist/node/internal.js"
+        "require": "./dist/node/internal.js",
+        "types": "./dist/node/internal/index.d.ts"
+      },
+      "react-native": {
+        "default": "./dist/rn/internal.js",
+        "types": "./dist/rn/internal/index.d.ts"
+      },
+      "cordova": {
+        "default": "./dist/cordova/internal.js",
+        "types": "./dist/cordova/internal/index.d.ts"
       },
-      "react-native": "./dist/rn/internal.js",
-      "cordova": "./dist/cordova/internal.js",
       "esm5": "./dist/esm5/internal.js",
-      "default": "./dist/esm2017/internal.js"
+      "default": "./dist/esm2017/internal.js",
+      "types": "./dist/internal/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/component/package.json b/packages/component/package.json
index 823061475f3..c42168235dc 100644
--- a/packages/component/package.json
+++ b/packages/component/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/database-compat/package.json b/packages/database-compat/package.json
index a146b31f1f6..df3c21978f9 100644
--- a/packages/database-compat/package.json
+++ b/packages/database-compat/package.json
@@ -17,13 +17,16 @@
     ".": {
       "node": {
         "import": "./dist/node-esm/index.js",
-        "require": "./dist/index.js"
+        "require": "./dist/index.js",
+        "types": "./dist/database-compat/src/index.node.d.ts"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/database-compat/src/index.d.ts"
     },
     "./standalone": {
-      "node": "./dist/index.standalone.js"
+      "node": "./dist/index.standalone.js",
+      "types": "./dist/database-compat/src/index.standalone.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/database/package.json b/packages/database/package.json
index b0842710fba..e3c602282fb 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -16,7 +16,8 @@
       },
       "esm5": "./dist/index.esm5.js",
       "standalone": "./dist/index.standalone.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json
index d7140c0b604..0c55189a01f 100644
--- a/packages/firestore-compat/package.json
+++ b/packages/firestore-compat/package.json
@@ -16,7 +16,8 @@
       },
       "react-native": "./dist/index.rn.js",
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/src/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
index d2f31e5a93e..a4e8913b8db 100644
--- a/packages/firestore/package.json
+++ b/packages/firestore/package.json
@@ -52,7 +52,8 @@
       },
       "react-native": "./dist/index.rn.js",
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/index.d.ts"
     },
     "./lite": {
       "node": {
@@ -61,7 +62,8 @@
       },
       "react-native": "./dist/lite/index.rn.esm2017.js",
       "esm5": "./dist/lite/index.browser.esm5.js",
-      "default": "./dist/lite/index.browser.esm2017.js"
+      "default": "./dist/lite/index.browser.esm2017.js",
+      "types": "./dist/lite/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json
index 6667ecce49c..98886636c50 100644
--- a/packages/functions-compat/package.json
+++ b/packages/functions-compat/package.json
@@ -14,7 +14,8 @@
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/src/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/functions/package.json b/packages/functions/package.json
index 440e1ac897c..93ac123837c 100644
--- a/packages/functions/package.json
+++ b/packages/functions/package.json
@@ -14,7 +14,8 @@
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/functions-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/installations-compat/package.json b/packages/installations-compat/package.json
index ce0713f684a..6f5a5a31c2d 100644
--- a/packages/installations-compat/package.json
+++ b/packages/installations-compat/package.json
@@ -10,7 +10,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/installations-compat.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/installations/package.json b/packages/installations/package.json
index 9236c0e5c58..270ffac51e0 100644
--- a/packages/installations/package.json
+++ b/packages/installations/package.json
@@ -10,7 +10,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/installations-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/logger/package.json b/packages/logger/package.json
index d1609a6e1b2..d68ddcf979c 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -10,7 +10,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/messaging-compat/package.json b/packages/messaging-compat/package.json
index 048b7479c55..6f05dbdae82 100644
--- a/packages/messaging-compat/package.json
+++ b/packages/messaging-compat/package.json
@@ -12,7 +12,8 @@
     ".": {
       "node": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/src/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/messaging/package.json b/packages/messaging/package.json
index 3e476e875d3..58320789d58 100644
--- a/packages/messaging/package.json
+++ b/packages/messaging/package.json
@@ -15,11 +15,13 @@
       "browser": "./dist/esm/index.esm2017.js",
       "module": "./dist/esm/index.esm2017.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/index.cjs.js"
+      "default": "./dist/index.cjs.js",
+      "types": "./dist/index-public.d.ts"
     },
     "./sw": {
       "node": "./dist/index.sw.cjs",
-      "default": "./dist/index.sw.esm2017.js"
+      "default": "./dist/index.sw.esm2017.js",
+      "types": "./dist/sw/index-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/performance-compat/package.json b/packages/performance-compat/package.json
index bab6dee864f..189b446bf12 100644
--- a/packages/performance-compat/package.json
+++ b/packages/performance-compat/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/src/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/performance/package.json b/packages/performance/package.json
index 68cabb68a76..00a299c0fff 100644
--- a/packages/performance/package.json
+++ b/packages/performance/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/src/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/remote-config-compat/package.json b/packages/remote-config-compat/package.json
index e6d1725d9cd..0ce6f34a00e 100644
--- a/packages/remote-config-compat/package.json
+++ b/packages/remote-config-compat/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/src/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json
index 57972fefb46..29e226c7c88 100644
--- a/packages/remote-config/package.json
+++ b/packages/remote-config/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/remote-config-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json
index 0af1a5aa0f5..1156b3ce5f2 100644
--- a/packages/storage-compat/package.json
+++ b/packages/storage-compat/package.json
@@ -11,7 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js"
+      "default": "./dist/esm/index.esm2017.js",
+      "types": "./dist/src/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/storage/package.json b/packages/storage/package.json
index 561f15ef80c..a9358ffa134 100644
--- a/packages/storage/package.json
+++ b/packages/storage/package.json
@@ -14,7 +14,8 @@
         "default": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/storage-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/template/package.json b/packages/template/package.json
index 64f4ff2a017..a2ab92f2baf 100644
--- a/packages/template/package.json
+++ b/packages/template/package.json
@@ -15,7 +15,8 @@
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/index.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/util/package.json b/packages/util/package.json
index b5258b70eec..6c9ac85802a 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -14,7 +14,8 @@
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./dist/util-public.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/webchannel-wrapper/package.json b/packages/webchannel-wrapper/package.json
index 7c405e91182..a43d576e38e 100644
--- a/packages/webchannel-wrapper/package.json
+++ b/packages/webchannel-wrapper/package.json
@@ -10,7 +10,8 @@
     ".": {
       "require": "./dist/index.js",
       "esm5": "./dist/index.esm.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "types": "./src/index.d.ts"
     },
     "./package.json": "./package.json"
   },

From 061c34a95dff29fd255d027b1782c2556dd28ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <github@andipaetzold.com>
Date: Fri, 27 May 2022 23:47:31 +0200
Subject: [PATCH 3/6] chore: add changeset

---
 .changeset/eighty-beds-rule.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .changeset/eighty-beds-rule.md

diff --git a/.changeset/eighty-beds-rule.md b/.changeset/eighty-beds-rule.md
new file mode 100644
index 00000000000..2977a97c25c
--- /dev/null
+++ b/.changeset/eighty-beds-rule.md
@@ -0,0 +1,34 @@
+---
+"@firebase/analytics-compat": patch
+"@firebase/analytics": patch
+"@firebase/app-check-compat": patch
+"@firebase/app-check": patch
+"@firebase/app-compat": patch
+"@firebase/app": patch
+"@firebase/auth-compat": patch
+"@firebase/auth": patch
+"@firebase/component": patch
+"@firebase/database-compat": patch
+"@firebase/database": patch
+"firebase": patch
+"@firebase/firestore-compat": patch
+"@firebase/firestore": patch
+"@firebase/functions-compat": patch
+"@firebase/functions": patch
+"@firebase/installations-compat": patch
+"@firebase/installations": patch
+"@firebase/logger": patch
+"@firebase/messaging-compat": patch
+"@firebase/messaging": patch
+"@firebase/performance-compat": patch
+"@firebase/performance": patch
+"@firebase/remote-config-compat": patch
+"@firebase/remote-config": patch
+"@firebase/storage-compat": patch
+"@firebase/storage": patch
+"@firebase/template": patch
+"@firebase/util": patch
+"@firebase/webchannel-wrapper": patch
+---
+
+fix: add type declarations to exports field

From f2190486eebb757bc23316f3ae8f90937ba0520d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <github@andipaetzold.com>
Date: Sat, 28 May 2022 02:09:52 +0200
Subject: [PATCH 4/6] fix: default condition should be last

---
 packages/analytics-compat/package.json     |   4 +-
 packages/analytics/package.json            |   4 +-
 packages/app-check-compat/package.json     |   4 +-
 packages/app-check/package.json            |   4 +-
 packages/app-compat/package.json           |   4 +-
 packages/app/package.json                  |   4 +-
 packages/auth-compat/package.json          |   4 +-
 packages/auth/package.json                 |  36 +++----
 packages/component/package.json            |   4 +-
 packages/database-compat/package.json      |   4 +-
 packages/database/package.json             |   4 +-
 packages/firebase/package.json             | 104 ++++++++++-----------
 packages/firestore-compat/package.json     |   4 +-
 packages/firestore/package.json            |   8 +-
 packages/functions-compat/package.json     |   4 +-
 packages/functions/package.json            |   4 +-
 packages/installations-compat/package.json |   4 +-
 packages/installations/package.json        |   4 +-
 packages/logger/package.json               |   4 +-
 packages/messaging-compat/package.json     |   4 +-
 packages/messaging/package.json            |   8 +-
 packages/performance-compat/package.json   |   4 +-
 packages/performance/package.json          |   4 +-
 packages/remote-config-compat/package.json |   4 +-
 packages/remote-config/package.json        |   4 +-
 packages/storage-compat/package.json       |   4 +-
 packages/storage/package.json              |   4 +-
 packages/template/package.json             |   4 +-
 packages/util/package.json                 |   4 +-
 packages/webchannel-wrapper/package.json   |   4 +-
 30 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/packages/analytics-compat/package.json b/packages/analytics-compat/package.json
index f35b1f9ed7a..46bfff5074d 100644
--- a/packages/analytics-compat/package.json
+++ b/packages/analytics-compat/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
index 2c4c1081b58..fa42f00a21d 100644
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/analytics-public.d.ts"
+      "types": "./dist/analytics-public.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/app-check-compat/package.json b/packages/app-check-compat/package.json
index d7632190b70..1581c41127c 100644
--- a/packages/app-check-compat/package.json
+++ b/packages/app-check-compat/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/app-check/package.json b/packages/app-check/package.json
index 4efd75c2f09..bf6ef89a2ac 100644
--- a/packages/app-check/package.json
+++ b/packages/app-check/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/app-check-public.d.ts"
+      "types": "./dist/app-check-public.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/app-compat/package.json b/packages/app-compat/package.json
index dad95b617e4..bc453df4ad9 100644
--- a/packages/app-compat/package.json
+++ b/packages/app-compat/package.json
@@ -15,8 +15,8 @@
       "esm5": "./dist/esm/index.esm5.js",
       "lite": "./dist/index.lite.js",
       "liteesm5": "./dist/index.lite.esm5.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/app-compat-public.d.ts"
+      "types": "./dist/app-compat-public.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/app/package.json b/packages/app/package.json
index f7ba2a2b148..29b37d40872 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/app-public.d.ts"
+      "types": "./dist/app-public.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json
index 71a2c8ba8a6..cf8f6f2149b 100644
--- a/packages/auth-compat/package.json
+++ b/packages/auth-compat/package.json
@@ -15,8 +15,8 @@
         "types": "./dist/auth-compat/index.node.d.ts"
       },
       "esm5": "./dist/index.esm.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/auth-compat/index.d.ts"
+      "types": "./dist/auth-compat/index.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 4a56f660fdb..b0fa98999ef 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -18,28 +18,28 @@
         "types": "./dist/node/index.d.ts"
       },
       "react-native": {
-        "default": "./dist/rn/index.js",
-        "types": "./dist/rn/index.rn.d.ts"
+        "types": "./dist/rn/index.rn.d.ts",
+        "default": "./dist/rn/index.js"
       },
       "cordova": {
-        "default": "./dist/cordova/index.js",
-        "types": "./dist/cordova/index.cordova.d.ts"
+        "types": "./dist/cordova/index.cordova.d.ts",
+        "default": "./dist/cordova/index.js"
       },
       "webworker": {
-        "default": "./dist/index.webworker.esm5.js",
-        "types": "./dist/index.webworker.d.ts"
+        "types": "./dist/index.webworker.d.ts",
+        "default": "./dist/index.webworker.esm5.js"
       },
       "esm5": "./dist/esm5/index.js",
-      "default": "./dist/esm2017/index.js",
-      "types": "./dist/auth-public.d.ts"
+      "types": "./dist/auth-public.d.ts",
+      "default": "./dist/esm2017/index.js"
     },
     "./cordova": {
-      "default": "./dist/cordova/index.js",
-      "types": "./dist/cordova/index.cordova.d.ts"
+      "types": "./dist/cordova/index.cordova.d.ts",
+      "default": "./dist/cordova/index.js"
     },
     "./react-native": {
-      "default": "./dist/rn/index.js",
-      "types": "./dist/rn/index.rn.d.ts"
+      "types": "./dist/rn/index.rn.d.ts",
+      "default": "./dist/rn/index.js"
     },
     "./internal": {
       "node": {
@@ -48,16 +48,16 @@
         "types": "./dist/node/internal/index.d.ts"
       },
       "react-native": {
-        "default": "./dist/rn/internal.js",
-        "types": "./dist/rn/internal/index.d.ts"
+        "types": "./dist/rn/internal/index.d.ts",
+        "default": "./dist/rn/internal.js"
       },
       "cordova": {
-        "default": "./dist/cordova/internal.js",
-        "types": "./dist/cordova/internal/index.d.ts"
+        "types": "./dist/cordova/internal/index.d.ts",
+        "default": "./dist/cordova/internal.js"
       },
       "esm5": "./dist/esm5/internal.js",
-      "default": "./dist/esm2017/internal.js",
-      "types": "./dist/internal/index.d.ts"
+      "types": "./dist/internal/index.d.ts",
+      "default": "./dist/esm2017/internal.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/component/package.json b/packages/component/package.json
index c42168235dc..d06bbd5bdc3 100644
--- a/packages/component/package.json
+++ b/packages/component/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/database-compat/package.json b/packages/database-compat/package.json
index df3c21978f9..19f9b7bb315 100644
--- a/packages/database-compat/package.json
+++ b/packages/database-compat/package.json
@@ -21,8 +21,8 @@
         "types": "./dist/database-compat/src/index.node.d.ts"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/database-compat/src/index.d.ts"
+      "types": "./dist/database-compat/src/index.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./standalone": {
       "node": "./dist/index.standalone.js",
diff --git a/packages/database/package.json b/packages/database/package.json
index e3c602282fb..f1cffc9feeb 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -16,8 +16,8 @@
       },
       "esm5": "./dist/index.esm5.js",
       "standalone": "./dist/index.standalone.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/public.d.ts"
+      "types": "./dist/public.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/firebase/package.json b/packages/firebase/package.json
index 55665049653..629fe139740 100644
--- a/packages/firebase/package.json
+++ b/packages/firebase/package.json
@@ -28,208 +28,208 @@
         "require": "./analytics/dist/index.cjs.js",
         "import": "./analytics/dist/index.mjs"
       },
-      "default": "./analytics/dist/index.esm.js",
-      "types": "./analytics/dist/analytics/index.d.ts"
+      "types": "./analytics/dist/analytics/index.d.ts",
+      "default": "./analytics/dist/index.esm.js"
     },
     "./app": {
       "node": {
         "require": "./app/dist/index.cjs.js",
         "import": "./app/dist/index.mjs"
       },
-      "default": "./app/dist/index.esm.js",
-      "types": "./app/dist/app/index.d.ts"
+      "types": "./app/dist/app/index.d.ts",
+      "default": "./app/dist/index.esm.js"
     },
     "./app-check": {
       "node": {
         "require": "./app-check/dist/index.cjs.js",
         "import": "./app-check/dist/index.mjs"
       },
-      "default": "./app-check/dist/index.esm.js",
-      "types": "./app-check/dist/app-check/index.d.ts"
+      "types": "./app-check/dist/app-check/index.d.ts",
+      "default": "./app-check/dist/index.esm.js"
     },
     "./auth": {
       "node": {
         "require": "./auth/dist/index.cjs.js",
         "import": "./auth/dist/index.mjs"
       },
-      "default": "./auth/dist/index.esm.js",
-      "types": "./auth/dist/auth/index.d.ts"
+      "types": "./auth/dist/auth/index.d.ts",
+      "default": "./auth/dist/index.esm.js"
     },
     "./auth/cordova": {
       "node": {
         "require": "./auth/cordova/dist/index.cjs.js",
         "import": "./auth/cordova/dist/index.mjs"
       },
-      "default": "./auth/cordova/dist/index.esm.js",
-      "types": "./auth/cordova/dist/auth/cordova/index.d.ts"
+      "types": "./auth/cordova/dist/auth/cordova/index.d.ts",
+      "default": "./auth/cordova/dist/index.esm.js"
     },
     "./auth/react-native": {
       "node": {
         "require": "./auth/react-native/dist/index.cjs.js",
         "import": "./auth/react-native/dist/index.mjs"
       },
-      "default": "./auth/react-native/dist/index.esm.js",
-      "types": "./auth/react-native/dist/auth/react-native/index.d.ts"
+      "types": "./auth/react-native/dist/auth/react-native/index.d.ts",
+      "default": "./auth/react-native/dist/index.esm.js"
     },
     "./database": {
       "node": {
         "require": "./database/dist/index.cjs.js",
         "import": "./database/dist/index.mjs"
       },
-      "default": "./database/dist/index.esm.js",
-      "types": "./database/dist/database/index.d.ts"
+      "types": "./database/dist/database/index.d.ts",
+      "default": "./database/dist/index.esm.js"
     },
     "./firestore": {
       "node": {
         "require": "./firestore/dist/index.cjs.js",
         "import": "./firestore/dist/index.mjs"
       },
-      "default": "./firestore/dist/index.esm.js",
-      "types": "./firestore/dist/firestore/index.d.ts"
+      "types": "./firestore/dist/firestore/index.d.ts",
+      "default": "./firestore/dist/index.esm.js"
     },
     "./firestore/lite": {
       "node": {
         "require": "./firestore/lite/dist/index.cjs.js",
         "import": "./firestore/lite/dist/index.mjs"
       },
-      "default": "./firestore/lite/dist/index.esm.js",
-      "types": "./firestore/lite/dist/firestore/lite/index.d.ts"
+      "types": "./firestore/lite/dist/firestore/lite/index.d.ts",
+      "default": "./firestore/lite/dist/index.esm.js"
     },
     "./functions": {
       "node": {
         "require": "./functions/dist/index.cjs.js",
         "import": "./functions/dist/index.mjs"
       },
-      "default": "./functions/dist/index.esm.js",
-      "types": "./functions/dist/functions/index.d.ts"
+      "types": "./functions/dist/functions/index.d.ts",
+      "default": "./functions/dist/index.esm.js"
     },
     "./messaging": {
       "node": {
         "require": "./messaging/dist/index.cjs.js",
         "import": "./messaging/dist/index.mjs"
       },
-      "default": "./messaging/dist/index.esm.js",
-      "types": "./messaging/dist/messaging/index.d.ts"
+      "types": "./messaging/dist/messaging/index.d.ts",
+      "default": "./messaging/dist/index.esm.js"
     },
     "./messaging/sw": {
       "node": {
         "require": "./messaging/sw/dist/index.cjs.js",
         "import": "./messaging/sw/dist/index.mjs"
       },
-      "default": "./messaging/sw/dist/index.esm.js",
-      "types": "./messaging/sw/dist/messaging/sw/index.d.ts"
+      "types": "./messaging/sw/dist/messaging/sw/index.d.ts",
+      "default": "./messaging/sw/dist/index.esm.js"
     },
     "./performance": {
       "node": {
         "require": "./performance/dist/index.cjs.js",
         "import": "./performance/dist/index.mjs"
       },
-      "default": "./performance/dist/index.esm.js",
-      "types": "./performance/dist/performance/index.d.ts"
+      "types": "./performance/dist/performance/index.d.ts",
+      "default": "./performance/dist/index.esm.js"
     },
     "./remote-config": {
       "node": {
         "require": "./remote-config/dist/index.cjs.js",
         "import": "./remote-config/dist/index.mjs"
       },
-      "default": "./remote-config/dist/index.esm.js",
-      "types": "./remote-config/dist/remote-config/index.d.ts"
+      "types": "./remote-config/dist/remote-config/index.d.ts",
+      "default": "./remote-config/dist/index.esm.js"
     },
     "./storage": {
       "node": {
         "require": "./storage/dist/index.cjs.js",
         "import": "./storage/dist/index.mjs"
       },
-      "default": "./storage/dist/index.esm.js",
-      "types": "./storage/dist/storage/index.d.ts"
+      "types": "./storage/dist/storage/index.d.ts",
+      "default": "./storage/dist/index.esm.js"
     },
     "./compat/analytics": {
       "node": {
         "require": "./compat/analytics/dist/index.cjs.js",
         "import": "./compat/analytics/dist/index.mjs"
       },
-      "default": "./compat/analytics/dist/index.esm.js",
-      "types": "./compat/analytics/dist/compat/analytics/index.d.ts"
+      "types": "./compat/analytics/dist/compat/analytics/index.d.ts",
+      "default": "./compat/analytics/dist/index.esm.js"
     },
     "./compat/app": {
       "node": {
         "require": "./compat/app/dist/index.cjs.js",
         "import": "./compat/app/dist/index.mjs"
       },
-      "default": "./compat/app/dist/index.esm.js",
-      "types": "./compat/app/dist/compat/app/index.d.ts"
+      "types": "./compat/app/dist/compat/app/index.d.ts",
+      "default": "./compat/app/dist/index.esm.js"
     },
     "./compat/app-check": {
       "node": {
         "require": "./compat/app-check/dist/index.cjs.js",
         "import": "./compat/app-check/dist/index.mjs"
       },
-      "default": "./compat/app-check/dist/index.esm.js",
-      "types": "./compat/app-check/dist/compat/app-check/index.d.ts"
+      "types": "./compat/app-check/dist/compat/app-check/index.d.ts",
+      "default": "./compat/app-check/dist/index.esm.js"
     },
     "./compat/auth": {
       "node": {
         "require": "./compat/auth/dist/index.cjs.js",
         "import": "./compat/auth/dist/index.mjs"
       },
-      "default": "./compat/auth/dist/index.esm.js",
-      "types": "./compat/auth/dist/compat/auth/index.d.ts"
+      "types": "./compat/auth/dist/compat/auth/index.d.ts",
+      "default": "./compat/auth/dist/index.esm.js"
     },
     "./compat/database": {
       "node": {
         "require": "./compat/database/dist/index.cjs.js",
         "import": "./compat/database/dist/index.mjs"
       },
-      "default": "./compat/database/dist/index.esm.js",
-      "types": "./compat/database/dist/compat/database/index.d.ts"
+      "types": "./compat/database/dist/compat/database/index.d.ts",
+      "default": "./compat/database/dist/index.esm.js"
     },
     "./compat/firestore": {
       "node": {
         "require": "./compat/firestore/dist/index.cjs.js",
         "import": "./compat/firestore/dist/index.mjs"
       },
-      "default": "./compat/firestore/dist/index.esm.js",
-      "types": "./compat/firestore/dist/compat/firestore/index.d.ts"
+      "types": "./compat/firestore/dist/compat/firestore/index.d.ts",
+      "default": "./compat/firestore/dist/index.esm.js"
     },
     "./compat/functions": {
       "node": {
         "require": "./compat/functions/dist/index.cjs.js",
         "import": "./compat/functions/dist/index.mjs"
       },
-      "default": "./compat/functions/dist/index.esm.js",
-      "types": "./compat/functions/dist/compat/functions/index.d.ts"
+      "types": "./compat/functions/dist/compat/functions/index.d.ts",
+      "default": "./compat/functions/dist/index.esm.js"
     },
     "./compat/messaging": {
       "node": {
         "require": "./compat/messaging/dist/index.cjs.js",
         "import": "./compat/messaging/dist/index.mjs"
       },
-      "default": "./compat/messaging/dist/index.esm.js",
-      "types": "./compat/messaging/dist/compat/messaging/index.d.ts"
+      "types": "./compat/messaging/dist/compat/messaging/index.d.ts",
+      "default": "./compat/messaging/dist/index.esm.js"
     },
     "./compat/performance": {
       "node": {
         "require": "./compat/performance/dist/index.cjs.js",
         "import": "./compat/performance/dist/index.mjs"
       },
-      "default": "./compat/performance/dist/index.esm.js",
-      "types": "./compat/performance/dist/compat/performance/index.d.ts"
+      "types": "./compat/performance/dist/compat/performance/index.d.ts",
+      "default": "./compat/performance/dist/index.esm.js"
     },
     "./compat/remote-config": {
       "node": {
         "require": "./compat/remote-config/dist/index.cjs.js",
         "import": "./compat/remote-config/dist/index.mjs"
       },
-      "default": "./compat/remote-config/dist/index.esm.js",
-      "types": "./compat/remote-config/dist/compat/remote-config/index.d.ts"
+      "types": "./compat/remote-config/dist/compat/remote-config/index.d.ts",
+      "default": "./compat/remote-config/dist/index.esm.js"
     },
     "./compat/storage": {
       "node": {
         "require": "./compat/storage/dist/index.cjs.js",
         "import": "./compat/storage/dist/index.mjs"
       },
-      "default": "./compat/storage/dist/index.esm.js",
-      "types": "./compat/storage/dist/compat/storage/index.d.ts"
+      "types": "./compat/storage/dist/compat/storage/index.d.ts",
+      "default": "./compat/storage/dist/index.esm.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json
index 0c55189a01f..133f97c6745 100644
--- a/packages/firestore-compat/package.json
+++ b/packages/firestore-compat/package.json
@@ -16,8 +16,8 @@
       },
       "react-native": "./dist/index.rn.js",
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
index a4e8913b8db..046b671b2f7 100644
--- a/packages/firestore/package.json
+++ b/packages/firestore/package.json
@@ -52,8 +52,8 @@
       },
       "react-native": "./dist/index.rn.js",
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./lite": {
       "node": {
@@ -62,8 +62,8 @@
       },
       "react-native": "./dist/lite/index.rn.esm2017.js",
       "esm5": "./dist/lite/index.browser.esm5.js",
-      "default": "./dist/lite/index.browser.esm2017.js",
-      "types": "./dist/lite/index.d.ts"
+      "types": "./dist/lite/index.d.ts",
+      "default": "./dist/lite/index.browser.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json
index 98886636c50..f7a8082ac15 100644
--- a/packages/functions-compat/package.json
+++ b/packages/functions-compat/package.json
@@ -14,8 +14,8 @@
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/functions/package.json b/packages/functions/package.json
index 93ac123837c..55a2d12665e 100644
--- a/packages/functions/package.json
+++ b/packages/functions/package.json
@@ -14,8 +14,8 @@
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/functions-public.d.ts"
+      "types": "./dist/functions-public.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/installations-compat/package.json b/packages/installations-compat/package.json
index 6f5a5a31c2d..99ed38f16f0 100644
--- a/packages/installations-compat/package.json
+++ b/packages/installations-compat/package.json
@@ -10,8 +10,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/installations-compat.d.ts"
+      "types": "./dist/installations-compat.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/installations/package.json b/packages/installations/package.json
index 270ffac51e0..5a465f10c8a 100644
--- a/packages/installations/package.json
+++ b/packages/installations/package.json
@@ -10,8 +10,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/installations-public.d.ts"
+      "types": "./dist/installations-public.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/logger/package.json b/packages/logger/package.json
index d68ddcf979c..7eb357e80a1 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -10,8 +10,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/messaging-compat/package.json b/packages/messaging-compat/package.json
index 6f05dbdae82..57c798fe8df 100644
--- a/packages/messaging-compat/package.json
+++ b/packages/messaging-compat/package.json
@@ -12,8 +12,8 @@
     ".": {
       "node": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/messaging/package.json b/packages/messaging/package.json
index 58320789d58..abe6eac7952 100644
--- a/packages/messaging/package.json
+++ b/packages/messaging/package.json
@@ -15,13 +15,13 @@
       "browser": "./dist/esm/index.esm2017.js",
       "module": "./dist/esm/index.esm2017.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/index.cjs.js",
-      "types": "./dist/index-public.d.ts"
+      "types": "./dist/index-public.d.ts",
+      "default": "./dist/index.cjs.js"
     },
     "./sw": {
       "node": "./dist/index.sw.cjs",
-      "default": "./dist/index.sw.esm2017.js",
-      "types": "./dist/sw/index-public.d.ts"
+      "types": "./dist/sw/index-public.d.ts",
+      "default": "./dist/index.sw.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/performance-compat/package.json b/packages/performance-compat/package.json
index 189b446bf12..098b955ad19 100644
--- a/packages/performance-compat/package.json
+++ b/packages/performance-compat/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/performance/package.json b/packages/performance/package.json
index 00a299c0fff..f94fae8a6e9 100644
--- a/packages/performance/package.json
+++ b/packages/performance/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/remote-config-compat/package.json b/packages/remote-config-compat/package.json
index 0ce6f34a00e..3c5b14a977e 100644
--- a/packages/remote-config-compat/package.json
+++ b/packages/remote-config-compat/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json
index 29e226c7c88..e829f88a03c 100644
--- a/packages/remote-config/package.json
+++ b/packages/remote-config/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/remote-config-public.d.ts"
+      "types": "./dist/remote-config-public.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json
index 1156b3ce5f2..c0b6760973e 100644
--- a/packages/storage-compat/package.json
+++ b/packages/storage-compat/package.json
@@ -11,8 +11,8 @@
     ".": {
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "default": "./dist/esm/index.esm2017.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/storage/package.json b/packages/storage/package.json
index a9358ffa134..032eb5f5d20 100644
--- a/packages/storage/package.json
+++ b/packages/storage/package.json
@@ -14,8 +14,8 @@
         "default": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/storage-public.d.ts"
+      "types": "./dist/storage-public.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/template/package.json b/packages/template/package.json
index a2ab92f2baf..56e8efe7c20 100644
--- a/packages/template/package.json
+++ b/packages/template/package.json
@@ -15,8 +15,8 @@
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/util/package.json b/packages/util/package.json
index 6c9ac85802a..0a479a7f9e2 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -14,8 +14,8 @@
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./dist/util-public.d.ts"
+      "types": "./dist/util-public.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/webchannel-wrapper/package.json b/packages/webchannel-wrapper/package.json
index a43d576e38e..e46cec00cea 100644
--- a/packages/webchannel-wrapper/package.json
+++ b/packages/webchannel-wrapper/package.json
@@ -10,8 +10,8 @@
     ".": {
       "require": "./dist/index.js",
       "esm5": "./dist/index.esm.js",
-      "default": "./dist/index.esm2017.js",
-      "types": "./src/index.d.ts"
+      "types": "./src/index.d.ts",
+      "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },

From 99a9f90bffbbd04f6a14cb2baf82209eabaf492c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <github@andipaetzold.com>
Date: Wed, 1 Jun 2022 00:36:47 +0200
Subject: [PATCH 5/6] fix: move `types` condition to the top of `exports`

---
 packages/analytics-compat/package.json     |  2 +-
 packages/analytics/package.json            |  2 +-
 packages/app-check-compat/package.json     |  2 +-
 packages/app-check/package.json            |  2 +-
 packages/app-compat/package.json           |  2 +-
 packages/app/package.json                  |  2 +-
 packages/auth-compat/package.json          |  6 +--
 packages/auth/package.json                 | 12 ++---
 packages/component/package.json            |  2 +-
 packages/database-compat/package.json      | 10 ++---
 packages/database/package.json             |  2 +-
 packages/firebase/package.json             | 52 +++++++++++-----------
 packages/firestore-compat/package.json     |  2 +-
 packages/firestore/package.json            |  4 +-
 packages/functions-compat/package.json     |  2 +-
 packages/functions/package.json            |  2 +-
 packages/installations-compat/package.json |  2 +-
 packages/installations/package.json        |  2 +-
 packages/logger/package.json               |  2 +-
 packages/messaging-compat/package.json     |  2 +-
 packages/messaging/package.json            |  4 +-
 packages/performance-compat/package.json   |  2 +-
 packages/performance/package.json          |  2 +-
 packages/remote-config-compat/package.json |  2 +-
 packages/remote-config/package.json        |  2 +-
 packages/storage-compat/package.json       |  2 +-
 packages/storage/package.json              |  2 +-
 packages/template/package.json             |  2 +-
 packages/util/package.json                 |  2 +-
 packages/webchannel-wrapper/package.json   |  2 +-
 30 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/packages/analytics-compat/package.json b/packages/analytics-compat/package.json
index 46bfff5074d..e65a0a10d6d 100644
--- a/packages/analytics-compat/package.json
+++ b/packages/analytics-compat/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/src/index.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
index fa42f00a21d..8e2c1de6ccc 100644
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/analytics-public.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/analytics-public.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/app-check-compat/package.json b/packages/app-check-compat/package.json
index 1581c41127c..c98d6333635 100644
--- a/packages/app-check-compat/package.json
+++ b/packages/app-check-compat/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/src/index.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/app-check/package.json b/packages/app-check/package.json
index bf6ef89a2ac..5776087bca0 100644
--- a/packages/app-check/package.json
+++ b/packages/app-check/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/app-check-public.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/app-check-public.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/app-compat/package.json b/packages/app-compat/package.json
index bc453df4ad9..5b455b160bc 100644
--- a/packages/app-compat/package.json
+++ b/packages/app-compat/package.json
@@ -11,11 +11,11 @@
   "liteesm5": "dist/index.lite.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/app-compat-public.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
       "lite": "./dist/index.lite.js",
       "liteesm5": "./dist/index.lite.esm5.js",
-      "types": "./dist/app-compat-public.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/app/package.json b/packages/app/package.json
index 29b37d40872..4604f86730d 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/app-public.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "types": "./dist/app-public.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json
index cf8f6f2149b..c01143e786c 100644
--- a/packages/auth-compat/package.json
+++ b/packages/auth-compat/package.json
@@ -9,13 +9,13 @@
   "esm5": "dist/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/auth-compat/index.d.ts",
       "node": {
+        "types": "./dist/auth-compat/index.node.d.ts",
         "import": "./dist/esm/index.node.esm.js",
-        "require": "./dist/index.node.cjs.js",
-        "types": "./dist/auth-compat/index.node.d.ts"
+        "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm.js",
-      "types": "./dist/auth-compat/index.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index b0fa98999ef..420a57680cc 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -12,10 +12,11 @@
   "esm5": "dist/esm5/index.js",
   "exports": {
     ".": {
+      "types": "./dist/auth-public.d.ts",
       "node": {
+        "types": "./dist/node/index.d.ts",
         "import": "./dist/node-esm/index.js",
-        "require": "./dist/node/index.js",
-        "types": "./dist/node/index.d.ts"
+        "require": "./dist/node/index.js"
       },
       "react-native": {
         "types": "./dist/rn/index.rn.d.ts",
@@ -30,7 +31,6 @@
         "default": "./dist/index.webworker.esm5.js"
       },
       "esm5": "./dist/esm5/index.js",
-      "types": "./dist/auth-public.d.ts",
       "default": "./dist/esm2017/index.js"
     },
     "./cordova": {
@@ -42,10 +42,11 @@
       "default": "./dist/rn/index.js"
     },
     "./internal": {
+      "types": "./dist/internal/index.d.ts",
       "node": {
+        "types": "./dist/node/internal/index.d.ts",
         "import": "./dist/node-esm/internal.js",
-        "require": "./dist/node/internal.js",
-        "types": "./dist/node/internal/index.d.ts"
+        "require": "./dist/node/internal.js"
       },
       "react-native": {
         "types": "./dist/rn/internal/index.d.ts",
@@ -56,7 +57,6 @@
         "default": "./dist/cordova/internal.js"
       },
       "esm5": "./dist/esm5/internal.js",
-      "types": "./dist/internal/index.d.ts",
       "default": "./dist/esm2017/internal.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/component/package.json b/packages/component/package.json
index d06bbd5bdc3..6750de51d0b 100644
--- a/packages/component/package.json
+++ b/packages/component/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "types": "./dist/index.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/database-compat/package.json b/packages/database-compat/package.json
index 19f9b7bb315..00c7bda9553 100644
--- a/packages/database-compat/package.json
+++ b/packages/database-compat/package.json
@@ -15,18 +15,18 @@
   ],
   "exports": {
     ".": {
+      "types": "./dist/database-compat/src/index.d.ts",
       "node": {
+        "types": "./dist/database-compat/src/index.node.d.ts",
         "import": "./dist/node-esm/index.js",
-        "require": "./dist/index.js",
-        "types": "./dist/database-compat/src/index.node.d.ts"
+        "require": "./dist/index.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "types": "./dist/database-compat/src/index.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./standalone": {
-      "node": "./dist/index.standalone.js",
-      "types": "./dist/database-compat/src/index.standalone.d.ts"
+      "types": "./dist/database-compat/src/index.standalone.d.ts",
+      "node": "./dist/index.standalone.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/database/package.json b/packages/database/package.json
index f1cffc9feeb..db99118f1a6 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -10,13 +10,13 @@
   "standalone": "dist/index.standalone.js",
   "exports": {
     ".": {
+      "types": "./dist/public.d.ts",
       "node": {
         "import": "./dist/node-esm/index.node.esm.js",
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
       "standalone": "./dist/index.standalone.js",
-      "types": "./dist/public.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/firebase/package.json b/packages/firebase/package.json
index 629fe139740..98acfb4fd2e 100644
--- a/packages/firebase/package.json
+++ b/packages/firebase/package.json
@@ -24,211 +24,211 @@
   ],
   "exports": {
     "./analytics": {
+      "types": "./analytics/dist/analytics/index.d.ts",
       "node": {
         "require": "./analytics/dist/index.cjs.js",
         "import": "./analytics/dist/index.mjs"
       },
-      "types": "./analytics/dist/analytics/index.d.ts",
       "default": "./analytics/dist/index.esm.js"
     },
     "./app": {
+      "types": "./app/dist/app/index.d.ts",
       "node": {
         "require": "./app/dist/index.cjs.js",
         "import": "./app/dist/index.mjs"
       },
-      "types": "./app/dist/app/index.d.ts",
       "default": "./app/dist/index.esm.js"
     },
     "./app-check": {
+      "types": "./app-check/dist/app-check/index.d.ts",
       "node": {
         "require": "./app-check/dist/index.cjs.js",
         "import": "./app-check/dist/index.mjs"
       },
-      "types": "./app-check/dist/app-check/index.d.ts",
       "default": "./app-check/dist/index.esm.js"
     },
     "./auth": {
+      "types": "./auth/dist/auth/index.d.ts",
       "node": {
         "require": "./auth/dist/index.cjs.js",
         "import": "./auth/dist/index.mjs"
       },
-      "types": "./auth/dist/auth/index.d.ts",
       "default": "./auth/dist/index.esm.js"
     },
     "./auth/cordova": {
+      "types": "./auth/cordova/dist/auth/cordova/index.d.ts",
       "node": {
         "require": "./auth/cordova/dist/index.cjs.js",
         "import": "./auth/cordova/dist/index.mjs"
       },
-      "types": "./auth/cordova/dist/auth/cordova/index.d.ts",
       "default": "./auth/cordova/dist/index.esm.js"
     },
     "./auth/react-native": {
+      "types": "./auth/react-native/dist/auth/react-native/index.d.ts",
       "node": {
         "require": "./auth/react-native/dist/index.cjs.js",
         "import": "./auth/react-native/dist/index.mjs"
       },
-      "types": "./auth/react-native/dist/auth/react-native/index.d.ts",
       "default": "./auth/react-native/dist/index.esm.js"
     },
     "./database": {
+      "types": "./database/dist/database/index.d.ts",
       "node": {
         "require": "./database/dist/index.cjs.js",
         "import": "./database/dist/index.mjs"
       },
-      "types": "./database/dist/database/index.d.ts",
       "default": "./database/dist/index.esm.js"
     },
     "./firestore": {
+      "types": "./firestore/dist/firestore/index.d.ts",
       "node": {
         "require": "./firestore/dist/index.cjs.js",
         "import": "./firestore/dist/index.mjs"
       },
-      "types": "./firestore/dist/firestore/index.d.ts",
       "default": "./firestore/dist/index.esm.js"
     },
     "./firestore/lite": {
+      "types": "./firestore/lite/dist/firestore/lite/index.d.ts",
       "node": {
         "require": "./firestore/lite/dist/index.cjs.js",
         "import": "./firestore/lite/dist/index.mjs"
       },
-      "types": "./firestore/lite/dist/firestore/lite/index.d.ts",
       "default": "./firestore/lite/dist/index.esm.js"
     },
     "./functions": {
+      "types": "./functions/dist/functions/index.d.ts",
       "node": {
         "require": "./functions/dist/index.cjs.js",
         "import": "./functions/dist/index.mjs"
       },
-      "types": "./functions/dist/functions/index.d.ts",
       "default": "./functions/dist/index.esm.js"
     },
     "./messaging": {
+      "types": "./messaging/dist/messaging/index.d.ts",
       "node": {
         "require": "./messaging/dist/index.cjs.js",
         "import": "./messaging/dist/index.mjs"
       },
-      "types": "./messaging/dist/messaging/index.d.ts",
       "default": "./messaging/dist/index.esm.js"
     },
     "./messaging/sw": {
+      "types": "./messaging/sw/dist/messaging/sw/index.d.ts",
       "node": {
         "require": "./messaging/sw/dist/index.cjs.js",
         "import": "./messaging/sw/dist/index.mjs"
       },
-      "types": "./messaging/sw/dist/messaging/sw/index.d.ts",
       "default": "./messaging/sw/dist/index.esm.js"
     },
     "./performance": {
+      "types": "./performance/dist/performance/index.d.ts",
       "node": {
         "require": "./performance/dist/index.cjs.js",
         "import": "./performance/dist/index.mjs"
       },
-      "types": "./performance/dist/performance/index.d.ts",
       "default": "./performance/dist/index.esm.js"
     },
     "./remote-config": {
+      "types": "./remote-config/dist/remote-config/index.d.ts",
       "node": {
         "require": "./remote-config/dist/index.cjs.js",
         "import": "./remote-config/dist/index.mjs"
       },
-      "types": "./remote-config/dist/remote-config/index.d.ts",
       "default": "./remote-config/dist/index.esm.js"
     },
     "./storage": {
+      "types": "./storage/dist/storage/index.d.ts",
       "node": {
         "require": "./storage/dist/index.cjs.js",
         "import": "./storage/dist/index.mjs"
       },
-      "types": "./storage/dist/storage/index.d.ts",
       "default": "./storage/dist/index.esm.js"
     },
     "./compat/analytics": {
+      "types": "./compat/analytics/dist/compat/analytics/index.d.ts",
       "node": {
         "require": "./compat/analytics/dist/index.cjs.js",
         "import": "./compat/analytics/dist/index.mjs"
       },
-      "types": "./compat/analytics/dist/compat/analytics/index.d.ts",
       "default": "./compat/analytics/dist/index.esm.js"
     },
     "./compat/app": {
+      "types": "./compat/app/dist/compat/app/index.d.ts",
       "node": {
         "require": "./compat/app/dist/index.cjs.js",
         "import": "./compat/app/dist/index.mjs"
       },
-      "types": "./compat/app/dist/compat/app/index.d.ts",
       "default": "./compat/app/dist/index.esm.js"
     },
     "./compat/app-check": {
+      "types": "./compat/app-check/dist/compat/app-check/index.d.ts",
       "node": {
         "require": "./compat/app-check/dist/index.cjs.js",
         "import": "./compat/app-check/dist/index.mjs"
       },
-      "types": "./compat/app-check/dist/compat/app-check/index.d.ts",
       "default": "./compat/app-check/dist/index.esm.js"
     },
     "./compat/auth": {
+      "types": "./compat/auth/dist/compat/auth/index.d.ts",
       "node": {
         "require": "./compat/auth/dist/index.cjs.js",
         "import": "./compat/auth/dist/index.mjs"
       },
-      "types": "./compat/auth/dist/compat/auth/index.d.ts",
       "default": "./compat/auth/dist/index.esm.js"
     },
     "./compat/database": {
+      "types": "./compat/database/dist/compat/database/index.d.ts",
       "node": {
         "require": "./compat/database/dist/index.cjs.js",
         "import": "./compat/database/dist/index.mjs"
       },
-      "types": "./compat/database/dist/compat/database/index.d.ts",
       "default": "./compat/database/dist/index.esm.js"
     },
     "./compat/firestore": {
+      "types": "./compat/firestore/dist/compat/firestore/index.d.ts",
       "node": {
         "require": "./compat/firestore/dist/index.cjs.js",
         "import": "./compat/firestore/dist/index.mjs"
       },
-      "types": "./compat/firestore/dist/compat/firestore/index.d.ts",
       "default": "./compat/firestore/dist/index.esm.js"
     },
     "./compat/functions": {
+      "types": "./compat/functions/dist/compat/functions/index.d.ts",
       "node": {
         "require": "./compat/functions/dist/index.cjs.js",
         "import": "./compat/functions/dist/index.mjs"
       },
-      "types": "./compat/functions/dist/compat/functions/index.d.ts",
       "default": "./compat/functions/dist/index.esm.js"
     },
     "./compat/messaging": {
+      "types": "./compat/messaging/dist/compat/messaging/index.d.ts",
       "node": {
         "require": "./compat/messaging/dist/index.cjs.js",
         "import": "./compat/messaging/dist/index.mjs"
       },
-      "types": "./compat/messaging/dist/compat/messaging/index.d.ts",
       "default": "./compat/messaging/dist/index.esm.js"
     },
     "./compat/performance": {
+      "types": "./compat/performance/dist/compat/performance/index.d.ts",
       "node": {
         "require": "./compat/performance/dist/index.cjs.js",
         "import": "./compat/performance/dist/index.mjs"
       },
-      "types": "./compat/performance/dist/compat/performance/index.d.ts",
       "default": "./compat/performance/dist/index.esm.js"
     },
     "./compat/remote-config": {
+      "types": "./compat/remote-config/dist/compat/remote-config/index.d.ts",
       "node": {
         "require": "./compat/remote-config/dist/index.cjs.js",
         "import": "./compat/remote-config/dist/index.mjs"
       },
-      "types": "./compat/remote-config/dist/compat/remote-config/index.d.ts",
       "default": "./compat/remote-config/dist/index.esm.js"
     },
     "./compat/storage": {
+      "types": "./compat/storage/dist/compat/storage/index.d.ts",
       "node": {
         "require": "./compat/storage/dist/index.cjs.js",
         "import": "./compat/storage/dist/index.mjs"
       },
-      "types": "./compat/storage/dist/compat/storage/index.d.ts",
       "default": "./compat/storage/dist/index.esm.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json
index 133f97c6745..9d230d856ab 100644
--- a/packages/firestore-compat/package.json
+++ b/packages/firestore-compat/package.json
@@ -10,13 +10,13 @@
   "esm5": "dist/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "node": {
         "import": "./dist/node-esm/index.node.esm.js",
         "require": "./dist/index.node.cjs.js"
       },
       "react-native": "./dist/index.rn.js",
       "esm5": "./dist/index.esm5.js",
-      "types": "./dist/src/index.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
index 046b671b2f7..28ae926b780 100644
--- a/packages/firestore/package.json
+++ b/packages/firestore/package.json
@@ -46,23 +46,23 @@
   },
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "node": {
         "require": "./dist/index.node.cjs.js",
         "import": "./dist/index.node.mjs"
       },
       "react-native": "./dist/index.rn.js",
       "esm5": "./dist/index.esm5.js",
-      "types": "./dist/index.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./lite": {
+      "types": "./dist/lite/index.d.ts",
       "node": {
         "require": "./dist/lite/index.node.cjs.js",
         "import": "./dist/lite/index.node.mjs"
       },
       "react-native": "./dist/lite/index.rn.esm2017.js",
       "esm5": "./dist/lite/index.browser.esm5.js",
-      "types": "./dist/lite/index.d.ts",
       "default": "./dist/lite/index.browser.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json
index f7a8082ac15..206e8fac6c3 100644
--- a/packages/functions-compat/package.json
+++ b/packages/functions-compat/package.json
@@ -9,12 +9,12 @@
   "esm5": "dist/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "node": {
         "import": "./dist/node-esm/index.node.esm.js",
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "types": "./dist/src/index.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/functions/package.json b/packages/functions/package.json
index 55a2d12665e..3f2d10d12c2 100644
--- a/packages/functions/package.json
+++ b/packages/functions/package.json
@@ -9,12 +9,12 @@
   "esm5": "dist/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/functions-public.d.ts",
       "node": {
         "import": "./dist/esm-node/index.node.esm.js",
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm.js",
-      "types": "./dist/functions-public.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/installations-compat/package.json b/packages/installations-compat/package.json
index 99ed38f16f0..21c0c7c43c4 100644
--- a/packages/installations-compat/package.json
+++ b/packages/installations-compat/package.json
@@ -8,9 +8,9 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/installations-compat.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/installations-compat.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/installations/package.json b/packages/installations/package.json
index 5a465f10c8a..f17792ba370 100644
--- a/packages/installations/package.json
+++ b/packages/installations/package.json
@@ -8,9 +8,9 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/installations-public.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/installations-public.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 7eb357e80a1..dd9089d73e1 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -8,9 +8,9 @@
   "esm5": "dist/esm/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "types": "./dist/index.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/messaging-compat/package.json b/packages/messaging-compat/package.json
index 57c798fe8df..845af43e0b8 100644
--- a/packages/messaging-compat/package.json
+++ b/packages/messaging-compat/package.json
@@ -10,9 +10,9 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "node": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/src/index.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/messaging/package.json b/packages/messaging/package.json
index abe6eac7952..736c0127c9f 100644
--- a/packages/messaging/package.json
+++ b/packages/messaging/package.json
@@ -11,16 +11,16 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/index-public.d.ts",
       "node": "./dist/index.cjs.js",
       "browser": "./dist/esm/index.esm2017.js",
       "module": "./dist/esm/index.esm2017.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/index-public.d.ts",
       "default": "./dist/index.cjs.js"
     },
     "./sw": {
-      "node": "./dist/index.sw.cjs",
       "types": "./dist/sw/index-public.d.ts",
+      "node": "./dist/index.sw.cjs",
       "default": "./dist/index.sw.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/performance-compat/package.json b/packages/performance-compat/package.json
index 098b955ad19..32e858b1ed0 100644
--- a/packages/performance-compat/package.json
+++ b/packages/performance-compat/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "types": "./dist/src/index.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/performance/package.json b/packages/performance/package.json
index f94fae8a6e9..d74235644a5 100644
--- a/packages/performance/package.json
+++ b/packages/performance/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/src/index.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/remote-config-compat/package.json b/packages/remote-config-compat/package.json
index 3c5b14a977e..39fd56f2719 100644
--- a/packages/remote-config-compat/package.json
+++ b/packages/remote-config-compat/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "types": "./dist/src/index.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json
index e829f88a03c..0e2a9152929 100644
--- a/packages/remote-config/package.json
+++ b/packages/remote-config/package.json
@@ -9,9 +9,9 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/remote-config-public.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
-      "types": "./dist/remote-config-public.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json
index c0b6760973e..6f9a98699f9 100644
--- a/packages/storage-compat/package.json
+++ b/packages/storage-compat/package.json
@@ -9,9 +9,9 @@
   "esm5": "./dist/esm/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm5.js",
-      "types": "./dist/src/index.d.ts",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/storage/package.json b/packages/storage/package.json
index 032eb5f5d20..97551159bf7 100644
--- a/packages/storage/package.json
+++ b/packages/storage/package.json
@@ -9,12 +9,12 @@
   "esm5": "dist/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/storage-public.d.ts",
       "node": {
         "import": "./dist/node-esm/index.node.esm.js",
         "default": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "types": "./dist/storage-public.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/template/package.json b/packages/template/package.json
index 56e8efe7c20..2fccf55ab91 100644
--- a/packages/template/package.json
+++ b/packages/template/package.json
@@ -10,12 +10,12 @@
   "esm5": "dist/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "node": {
         "import": "./dist/node-esm/index.node.esm.js",
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "types": "./dist/index.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/util/package.json b/packages/util/package.json
index 0a479a7f9e2..2c062f85c27 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -9,12 +9,12 @@
   "esm5": "dist/index.esm5.js",
   "exports": {
     ".": {
+      "types": "./dist/util-public.d.ts",
       "node": {
         "import": "./dist/node-esm/index.node.esm.js",
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "types": "./dist/util-public.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/webchannel-wrapper/package.json b/packages/webchannel-wrapper/package.json
index e46cec00cea..349549058e5 100644
--- a/packages/webchannel-wrapper/package.json
+++ b/packages/webchannel-wrapper/package.json
@@ -8,9 +8,9 @@
   "esm5": "dist/index.esm.js",
   "exports": {
     ".": {
+      "types": "./src/index.d.ts",
       "require": "./dist/index.js",
       "esm5": "./dist/index.esm.js",
-      "types": "./src/index.d.ts",
       "default": "./dist/index.esm2017.js"
     },
     "./package.json": "./package.json"

From 19adc31dc11373144a628dbd22005b824f864159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <github@andipaetzold.com>
Date: Wed, 1 Jun 2022 21:16:36 +0200
Subject: [PATCH 6/6] fix: wrong type paths in @firebase/installations-compat

---
 packages/installations-compat/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/installations-compat/package.json b/packages/installations-compat/package.json
index 21c0c7c43c4..10427f222a3 100644
--- a/packages/installations-compat/package.json
+++ b/packages/installations-compat/package.json
@@ -8,14 +8,14 @@
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
-      "types": "./dist/installations-compat.d.ts",
+      "types": "./dist/src/index.d.ts",
       "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
       "default": "./dist/esm/index.esm2017.js"
     },
     "./package.json": "./package.json"
   },
-  "typings": "dist/installations-compat.d.ts",
+  "typings": "dist/src/index.d.ts",
   "license": "Apache-2.0",
   "files": [
     "dist"