Internalize IDB dependency

dlarocque · dlarocque · commit c650a30b1be1 · 2024-09-24T16:18:32.000-04:00
diff --git 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,15 +46,16 @@ const es2017BuildPlugins = [
   }),
   json({
     preferConst: true
-  })
+  }),
+  resolve()
 ];
 
 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 !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`)))
   },
   {
     input: 'src/index.lite.ts',
@@ -63,7 +65,6 @@ const esmBuilds = [
       sourcemap: true
     },
     plugins: es5BuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
   {
     input: 'src/index.ts',
@@ -73,7 +74,7 @@ const esmBuilds = [
       sourcemap: true
     },
     plugins: [...es2017BuildPlugins, emitModulePackageFile()],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`)))
   },
   {
     input: 'src/index.lite.ts',
@@ -83,7 +84,7 @@ const esmBuilds = [
       sourcemap: true
     },
     plugins: es2017BuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`)))
   }
 ];
 
diff --git 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,7 @@ const esmBuilds = [
       format: 'es',
       sourcemap: true
     },
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))),
     plugins: [
       ...es2017BuildPlugins,
       replace({
@@ -89,7 +91,7 @@ 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 !== pkg.dependencies.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
@@ -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,15 @@ 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 !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))),
     plugins: [...es5BuildPlugins, emitModulePackageFile()]
   },
   {
@@ -50,7 +52,7 @@ const esmBuilds = [
       format: 'es',
       sourcemap: true
     },
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))),
     plugins: [...es2017BuildPlugins, emitModulePackageFile()]
   }
 ];
@@ -59,7 +61,7 @@ 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 !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))),
     plugins: es5BuildPlugins
   }
 ];
diff --git 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,15 @@ 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 !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))),
     plugins: [
       ...es5BuildPlugins,
       replace(generateBuildTargetReplaceConfig('esm', 5)),
@@ -57,7 +59,7 @@ const esmBuilds = [
       format: 'es',
       sourcemap: true
     },
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    external: id => deps.some(dep => dep !== pkg.dependencies.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
@@ -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,15 +42,16 @@ const es2017BuildPlugins = [
       }
     }
   }),
-  json({ preferConst: true })
+  json({ preferConst: true }),
+  resolve()
 ];
 
 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 !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`)))
   },
   {
     input: 'src/index.ts',
@@ -59,7 +61,7 @@ const esmBuilds = [
       sourcemap: true
     },
     plugins: [...es2017BuildPlugins, emitModulePackageFile()],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`)))
   }
 ];
 
@@ -68,7 +70,7 @@ 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 !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`)))
   }
 ];
 
diff --git 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,14 @@ const esmBuilds = [
       replace(generateBuildTargetReplaceConfig('esm', 2017)),
       emitModulePackageFile()
     ],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id => deps.some(dep => dep !== pkg.dependencies.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 !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`)))
   }
 ];
 
@@ -88,7 +90,7 @@ const cjsBuilds = [
       ...es5BuildPlugins,
       replace(generateBuildTargetReplaceConfig('cjs', 5))
     ],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`)))
   },
   // sw build
   // TODO: This may no longer be necessary when we can provide ESM Node
@@ -102,7 +104,7 @@ const cjsBuilds = [
       ...es5BuildPlugins,
       replace(generateBuildTargetReplaceConfig('cjs', 5))
     ],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`)))
   }
 ];
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`import json from '@rollup/plugin-json';`
`19`	`19`	`import typescriptPlugin from 'rollup-plugin-typescript2';`
	`20`	`+import resolve from '@rollup/plugin-node-resolve';`
`20`	`21`	`import typescript from 'typescript';`
`21`	`22`	`import pkg from './package.json';`
`22`	`23`	`import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';`
`@@ -33,14 +34,15 @@ const es2017BuildPlugins = [`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`	`}),`
`36`		`- json({ preferConst: true })`
	`37`	`+ json({ preferConst: true }),`
	`38`	`+ resolve()`
`37`	`39`	`];`
`38`	`40`
`39`	`41`	`const esmBuilds = [`
`40`	`42`	`{`
`41`	`43`	`input: 'src/index.ts',`
`42`	`44`	`output: { file: pkg.esm5, format: 'es', sourcemap: true },`
`43`		- external: id => deps.some(dep => id === dep \|\| id.startsWith(`${dep}/`)),
	`45`	+ external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep \|\| id.startsWith(`${dep}/`))),
`44`	`46`	`plugins: [...es5BuildPlugins, emitModulePackageFile()]`
`45`	`47`	`},`
`46`	`48`	`{`
`@@ -50,7 +52,7 @@ const esmBuilds = [`
`50`	`52`	`format: 'es',`
`51`	`53`	`sourcemap: true`
`52`	`54`	`},`
`53`		- external: id => deps.some(dep => id === dep \|\| id.startsWith(`${dep}/`)),
	`55`	+ external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep \|\| id.startsWith(`${dep}/`))),
`54`	`56`	`plugins: [...es2017BuildPlugins, emitModulePackageFile()]`
`55`	`57`	`}`
`56`	`58`	`];`
`@@ -59,7 +61,7 @@ const cjsBuilds = [`
`59`	`61`	`{`
`60`	`62`	`input: 'src/index.ts',`
`61`	`63`	`output: { file: pkg.main, format: 'cjs', sourcemap: true },`
`62`		- external: id => deps.some(dep => id === dep \|\| id.startsWith(`${dep}/`)),
	`64`	+ external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep \|\| id.startsWith(`${dep}/`))),
`63`	`65`	`plugins: es5BuildPlugins`
`64`	`66`	`}`
`65`	`67`	`];`