diff --git a/packages/app-compat/rollup.config.js b/packages/app-compat/rollup.config.js
index 055b75f3836..28026552fa0 100644
--- a/packages/app-compat/rollup.config.js
+++ b/packages/app-compat/rollup.config.js
@@ -17,6 +17,7 @@
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import json from '@rollup/plugin-json';
+import resolve from '@rollup/plugin-node-resolve';
 import typescript from 'typescript';
 import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';
 import pkg from './package.json';
@@ -45,7 +46,8 @@ const es2017BuildPlugins = [
   }),
   json({
     preferConst: true
-  })
+  }),
+  resolve()
 ];
 
 const esmBuilds = [
@@ -53,7 +55,10 @@ const esmBuilds = [
     input: 'src/index.ts',
     output: { file: pkg.esm5, format: 'es', sourcemap: true },
     plugins: [...es5BuildPlugins, emitModulePackageFile()],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   },
   {
     input: 'src/index.lite.ts',
@@ -62,8 +67,7 @@ const esmBuilds = [
       format: 'es',
       sourcemap: true
     },
-    plugins: es5BuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    plugins: es5BuildPlugins
   },
   {
     input: 'src/index.ts',
@@ -73,7 +77,10 @@ const esmBuilds = [
       sourcemap: true
     },
     plugins: [...es2017BuildPlugins, emitModulePackageFile()],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   },
   {
     input: 'src/index.lite.ts',
@@ -83,7 +90,10 @@ const esmBuilds = [
       sourcemap: true
     },
     plugins: es2017BuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   }
 ];
 
diff --git a/packages/app/package.json b/packages/app/package.json
index c413787ea2c..cd6c2fa652b 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -42,12 +42,12 @@
     "@firebase/util": "1.10.0",
     "@firebase/logger": "0.4.2",
     "@firebase/component": "0.6.9",
-    "idb": "7.1.1",
     "tslib": "^2.1.0"
   },
   "license": "Apache-2.0",
   "devDependencies": {
     "@rollup/plugin-json": "4.1.0",
+    "idb": "7.1.1",
     "rollup": "2.79.1",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.31.2",
diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js
index 6900b5f0f4a..6c0b4ff21c3 100644
--- a/packages/app/rollup.config.js
+++ b/packages/app/rollup.config.js
@@ -17,6 +17,7 @@
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import replace from 'rollup-plugin-replace';
+import resolve from '@rollup/plugin-node-resolve';
 import typescript from 'typescript';
 import json from '@rollup/plugin-json';
 import dts from 'rollup-plugin-dts';
@@ -46,7 +47,8 @@ const es2017BuildPlugins = [
   }),
   json({
     preferConst: true
-  })
+  }),
+  resolve()
 ];
 
 const esmBuilds = [
@@ -73,7 +75,10 @@ const esmBuilds = [
       format: 'es',
       sourcemap: true
     },
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      ),
     plugins: [
       ...es2017BuildPlugins,
       replace({
@@ -89,7 +94,10 @@ const cjsBuilds = [
   {
     input: 'src/index.ts',
     output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      ),
     plugins: [
       ...es5BuildPlugins,
       replace({
diff --git a/packages/installations-compat/rollup.config.js b/packages/installations-compat/rollup.config.js
index dff41008688..bd64ba26e62 100644
--- a/packages/installations-compat/rollup.config.js
+++ b/packages/installations-compat/rollup.config.js
@@ -17,6 +17,7 @@
 
 import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
+import resolve from '@rollup/plugin-node-resolve';
 import typescript from 'typescript';
 import pkg from './package.json';
 import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';
@@ -33,14 +34,18 @@ const es2017BuildPlugins = [
       }
     }
   }),
-  json({ preferConst: true })
+  json({ preferConst: true }),
+  resolve()
 ];
 
 const esmBuilds = [
   {
     input: 'src/index.ts',
     output: { file: pkg.esm5, format: 'es', sourcemap: true },
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      ),
     plugins: [...es5BuildPlugins, emitModulePackageFile()]
   },
   {
@@ -50,7 +55,10 @@ const esmBuilds = [
       format: 'es',
       sourcemap: true
     },
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      ),
     plugins: [...es2017BuildPlugins, emitModulePackageFile()]
   }
 ];
@@ -59,7 +67,10 @@ const cjsBuilds = [
   {
     input: 'src/index.ts',
     output: { file: pkg.main, format: 'cjs', sourcemap: true },
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      ),
     plugins: es5BuildPlugins
   }
 ];
diff --git a/packages/installations/package.json b/packages/installations/package.json
index ff6c74bd23d..ecbbad3772b 100644
--- a/packages/installations/package.json
+++ b/packages/installations/package.json
@@ -52,6 +52,7 @@
   },
   "devDependencies": {
     "@firebase/app": "0.10.11",
+    "idb": "7.1.1",
     "rollup": "2.79.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",
@@ -66,7 +67,6 @@
   "dependencies": {
     "@firebase/util": "1.10.0",
     "@firebase/component": "0.6.9",
-    "idb": "7.1.1",
     "tslib": "^2.1.0"
   }
 }
diff --git a/packages/installations/rollup.config.js b/packages/installations/rollup.config.js
index 70628504fdb..f102e7d3311 100644
--- a/packages/installations/rollup.config.js
+++ b/packages/installations/rollup.config.js
@@ -18,6 +18,7 @@
 import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import replace from 'rollup-plugin-replace';
+import resolve from '@rollup/plugin-node-resolve';
 import typescript from 'typescript';
 import pkg from './package.json';
 import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target';
@@ -36,14 +37,18 @@ const es2017BuildPlugins = [
       }
     }
   }),
-  json({ preferConst: true })
+  json({ preferConst: true }),
+  resolve()
 ];
 
 const esmBuilds = [
   {
     input: 'src/index.ts',
     output: [{ file: pkg.esm5, format: 'es', sourcemap: true }],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      ),
     plugins: [
       ...es5BuildPlugins,
       replace(generateBuildTargetReplaceConfig('esm', 5)),
@@ -57,7 +62,10 @@ const esmBuilds = [
       format: 'es',
       sourcemap: true
     },
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      ),
     plugins: [
       ...es2017BuildPlugins,
       replace(generateBuildTargetReplaceConfig('esm', 2017)),
diff --git a/packages/messaging-compat/rollup.config.js b/packages/messaging-compat/rollup.config.js
index 2bc0cecded0..38415b6a315 100644
--- a/packages/messaging-compat/rollup.config.js
+++ b/packages/messaging-compat/rollup.config.js
@@ -16,6 +16,7 @@
  */
 
 import json from '@rollup/plugin-json';
+import resolve from '@rollup/plugin-node-resolve';
 import pkg from './package.json';
 import typescript from 'typescript';
 import typescriptPlugin from 'rollup-plugin-typescript2';
@@ -41,7 +42,8 @@ const es2017BuildPlugins = [
       }
     }
   }),
-  json({ preferConst: true })
+  json({ preferConst: true }),
+  resolve()
 ];
 
 const esmBuilds = [
@@ -49,7 +51,10 @@ const esmBuilds = [
     input: 'src/index.ts',
     output: { file: pkg.esm5, format: 'es', sourcemap: true },
     plugins: [...es5BuildPlugins, emitModulePackageFile()],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   },
   {
     input: 'src/index.ts',
@@ -59,7 +64,10 @@ const esmBuilds = [
       sourcemap: true
     },
     plugins: [...es2017BuildPlugins, emitModulePackageFile()],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   }
 ];
 
@@ -68,7 +76,10 @@ const cjsBuilds = [
     input: 'src/index.ts',
     output: { file: pkg.main, format: 'cjs', sourcemap: true },
     plugins: es5BuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   }
 ];
 
diff --git a/packages/messaging/package.json b/packages/messaging/package.json
index 674b2feb246..25b2f2c0104 100644
--- a/packages/messaging/package.json
+++ b/packages/messaging/package.json
@@ -58,11 +58,11 @@
     "@firebase/messaging-interop-types": "0.2.2",
     "@firebase/util": "1.10.0",
     "@firebase/component": "0.6.9",
-    "idb": "7.1.1",
     "tslib": "^2.1.0"
   },
   "devDependencies": {
     "@firebase/app": "0.10.11",
+    "idb": "7.1.1",
     "rollup": "2.79.1",
     "rollup-plugin-typescript2": "0.31.2",
     "@rollup/plugin-json": "4.1.0",
diff --git a/packages/messaging/rollup.config.js b/packages/messaging/rollup.config.js
index 297dc00c46f..84332290dcf 100644
--- a/packages/messaging/rollup.config.js
+++ b/packages/messaging/rollup.config.js
@@ -16,6 +16,7 @@
  */
 
 import json from '@rollup/plugin-json';
+import resolve from '@rollup/plugin-node-resolve';
 import pkg from './package.json';
 import typescript from 'typescript';
 import replace from 'rollup-plugin-replace';
@@ -43,7 +44,8 @@ const es2017BuildPlugins = [
       }
     }
   }),
-  json({ preferConst: true })
+  json({ preferConst: true }),
+  resolve()
 ];
 
 const esmBuilds = [
@@ -69,14 +71,20 @@ const esmBuilds = [
       replace(generateBuildTargetReplaceConfig('esm', 2017)),
       emitModulePackageFile()
     ],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   },
   // sw builds
   {
     input: 'src/index.sw.ts',
     output: { file: pkg.sw, format: 'es', sourcemap: true },
     plugins: es2017BuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   }
 ];
 
@@ -88,7 +96,10 @@ const cjsBuilds = [
       ...es5BuildPlugins,
       replace(generateBuildTargetReplaceConfig('cjs', 5))
     ],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   },
   // sw build
   // TODO: This may no longer be necessary when we can provide ESM Node
@@ -102,7 +113,10 @@ const cjsBuilds = [
       ...es5BuildPlugins,
       replace(generateBuildTargetReplaceConfig('cjs', 5))
     ],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id =>
+      deps.some(
+        dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
+      )
   }
 ];