From c650a30b1be153f03710517544885d7726b83f48 Mon Sep 17 00:00:00 2001 From: Daniel La Rocque Date: Tue, 24 Sep 2024 16:18:32 -0400 Subject: [PATCH 1/5] Internalize IDB dependency --- packages/app-compat/rollup.config.js | 11 ++++++----- packages/app/rollup.config.js | 8 +++++--- packages/installations-compat/rollup.config.js | 10 ++++++---- packages/installations/rollup.config.js | 8 +++++--- packages/messaging-compat/rollup.config.js | 10 ++++++---- packages/messaging/rollup.config.js | 12 +++++++----- 6 files changed, 35 insertions(+), 24 deletions(-) diff --git a/packages/app-compat/rollup.config.js b/packages/app-compat/rollup.config.js index 055b75f3836..bacc0e59fb4 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,7 @@ 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 index 6900b5f0f4a..272fb087e75 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,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 index dff41008688..599553d7dc5 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,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 index 70628504fdb..425b18caff6 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,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 index 2bc0cecded0..45ea7e04264 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,7 @@ 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 index 297dc00c46f..ad176493bf9 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,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}/`))) } ]; From 5b6417f887763a97d46ab34c6d09e271192493a3 Mon Sep 17 00:00:00 2001 From: Daniel La Rocque Date: Tue, 24 Sep 2024 16:32:19 -0400 Subject: [PATCH 2/5] Format --- packages/app-compat/rollup.config.js | 25 ++++++++++++---- packages/app/rollup.config.js | 16 ++++++++-- .../installations-compat/rollup.config.js | 21 +++++++++++-- packages/installations/rollup.config.js | 16 ++++++++-- packages/messaging-compat/rollup.config.js | 21 +++++++++++-- packages/messaging/rollup.config.js | 30 +++++++++++++++---- 6 files changed, 107 insertions(+), 22 deletions(-) diff --git a/packages/app-compat/rollup.config.js b/packages/app-compat/rollup.config.js index bacc0e59fb4..bd04625ccd5 100644 --- a/packages/app-compat/rollup.config.js +++ b/packages/app-compat/rollup.config.js @@ -17,7 +17,7 @@ import typescriptPlugin from 'rollup-plugin-typescript2'; import json from '@rollup/plugin-json'; -import resolve from '@rollup/plugin-node-resolve' +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'; @@ -55,7 +55,12 @@ const esmBuilds = [ input: 'src/index.ts', output: { file: pkg.esm5, format: 'es', sourcemap: true }, plugins: [...es5BuildPlugins, emitModulePackageFile()], - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))) + external: id => + deps.some( + dep => + dep !== pkg.dependencies.idb && + (id === dep || id.startsWith(`${dep}/`)) + ) }, { input: 'src/index.lite.ts', @@ -64,7 +69,7 @@ const esmBuilds = [ format: 'es', sourcemap: true }, - plugins: es5BuildPlugins, + plugins: es5BuildPlugins }, { input: 'src/index.ts', @@ -74,7 +79,12 @@ const esmBuilds = [ sourcemap: true }, plugins: [...es2017BuildPlugins, emitModulePackageFile()], - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))) + external: id => + deps.some( + dep => + dep !== pkg.dependencies.idb && + (id === dep || id.startsWith(`${dep}/`)) + ) }, { input: 'src/index.lite.ts', @@ -84,7 +94,12 @@ const esmBuilds = [ sourcemap: true }, plugins: es2017BuildPlugins, - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (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 index 272fb087e75..3c7a3cafbb1 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -17,7 +17,7 @@ import typescriptPlugin from 'rollup-plugin-typescript2'; import replace from 'rollup-plugin-replace'; -import resolve from '@rollup/plugin-node-resolve' +import resolve from '@rollup/plugin-node-resolve'; import typescript from 'typescript'; import json from '@rollup/plugin-json'; import dts from 'rollup-plugin-dts'; @@ -75,7 +75,12 @@ const esmBuilds = [ format: 'es', sourcemap: true }, - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))), + external: id => + deps.some( + dep => + dep !== pkg.dependencies.idb && + (id === dep || id.startsWith(`${dep}/`)) + ), plugins: [ ...es2017BuildPlugins, replace({ @@ -91,7 +96,12 @@ const cjsBuilds = [ { input: 'src/index.ts', output: [{ file: pkg.main, format: 'cjs', sourcemap: true }], - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (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 index 599553d7dc5..ef4bd6e55a9 100644 --- a/packages/installations-compat/rollup.config.js +++ b/packages/installations-compat/rollup.config.js @@ -42,7 +42,12 @@ const esmBuilds = [ { input: 'src/index.ts', output: { file: pkg.esm5, format: 'es', sourcemap: true }, - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))), + external: id => + deps.some( + dep => + dep !== pkg.dependencies.idb && + (id === dep || id.startsWith(`${dep}/`)) + ), plugins: [...es5BuildPlugins, emitModulePackageFile()] }, { @@ -52,7 +57,12 @@ const esmBuilds = [ format: 'es', sourcemap: true }, - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))), + external: id => + deps.some( + dep => + dep !== pkg.dependencies.idb && + (id === dep || id.startsWith(`${dep}/`)) + ), plugins: [...es2017BuildPlugins, emitModulePackageFile()] } ]; @@ -61,7 +71,12 @@ const cjsBuilds = [ { input: 'src/index.ts', output: { file: pkg.main, format: 'cjs', sourcemap: true }, - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (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 index 425b18caff6..54ea6adc387 100644 --- a/packages/installations/rollup.config.js +++ b/packages/installations/rollup.config.js @@ -18,7 +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 resolve from '@rollup/plugin-node-resolve'; import typescript from 'typescript'; import pkg from './package.json'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; @@ -45,7 +45,12 @@ const esmBuilds = [ { input: 'src/index.ts', output: [{ file: pkg.esm5, format: 'es', sourcemap: true }], - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (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)), @@ -59,7 +64,12 @@ const esmBuilds = [ format: 'es', sourcemap: true }, - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (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 index 45ea7e04264..f82a84c8bd1 100644 --- a/packages/messaging-compat/rollup.config.js +++ b/packages/messaging-compat/rollup.config.js @@ -51,7 +51,12 @@ const esmBuilds = [ input: 'src/index.ts', output: { file: pkg.esm5, format: 'es', sourcemap: true }, plugins: [...es5BuildPlugins, emitModulePackageFile()], - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))) + external: id => + deps.some( + dep => + dep !== pkg.dependencies.idb && + (id === dep || id.startsWith(`${dep}/`)) + ) }, { input: 'src/index.ts', @@ -61,7 +66,12 @@ const esmBuilds = [ sourcemap: true }, plugins: [...es2017BuildPlugins, emitModulePackageFile()], - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))) + external: id => + deps.some( + dep => + dep !== pkg.dependencies.idb && + (id === dep || id.startsWith(`${dep}/`)) + ) } ]; @@ -70,7 +80,12 @@ const cjsBuilds = [ input: 'src/index.ts', output: { file: pkg.main, format: 'cjs', sourcemap: true }, plugins: es5BuildPlugins, - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (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 index ad176493bf9..28c5c71e1c7 100644 --- a/packages/messaging/rollup.config.js +++ b/packages/messaging/rollup.config.js @@ -16,7 +16,7 @@ */ import json from '@rollup/plugin-json'; -import resolve from "@rollup/plugin-node-resolve"; +import resolve from '@rollup/plugin-node-resolve'; import pkg from './package.json'; import typescript from 'typescript'; import replace from 'rollup-plugin-replace'; @@ -71,14 +71,24 @@ const esmBuilds = [ replace(generateBuildTargetReplaceConfig('esm', 2017)), emitModulePackageFile() ], - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (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 => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))) + external: id => + deps.some( + dep => + dep !== pkg.dependencies.idb && + (id === dep || id.startsWith(`${dep}/`)) + ) } ]; @@ -90,7 +100,12 @@ const cjsBuilds = [ ...es5BuildPlugins, replace(generateBuildTargetReplaceConfig('cjs', 5)) ], - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (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 @@ -104,7 +119,12 @@ const cjsBuilds = [ ...es5BuildPlugins, replace(generateBuildTargetReplaceConfig('cjs', 5)) ], - external: id => deps.some(dep => dep !== pkg.dependencies.idb && (id === dep || id.startsWith(`${dep}/`))) + external: id => + deps.some( + dep => + dep !== pkg.dependencies.idb && + (id === dep || id.startsWith(`${dep}/`)) + ) } ]; From 496f20665af8096470eeda8b628443b726b28a55 Mon Sep 17 00:00:00 2001 From: Daniel La Rocque Date: Wed, 25 Sep 2024 11:41:56 -0400 Subject: [PATCH 3/5] Replace pkg.dependencies.idb with `"idb"` --- packages/app-compat/rollup.config.js | 6 +++--- packages/app/rollup.config.js | 4 ++-- packages/installations-compat/rollup.config.js | 6 +++--- packages/installations/rollup.config.js | 4 ++-- packages/messaging-compat/rollup.config.js | 6 +++--- packages/messaging/rollup.config.js | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/app-compat/rollup.config.js b/packages/app-compat/rollup.config.js index bd04625ccd5..24cc2e57361 100644 --- a/packages/app-compat/rollup.config.js +++ b/packages/app-compat/rollup.config.js @@ -58,7 +58,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, @@ -82,7 +82,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, @@ -97,7 +97,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 3c7a3cafbb1..31f539ff73f 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -78,7 +78,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [ @@ -99,7 +99,7 @@ const cjsBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [ diff --git a/packages/installations-compat/rollup.config.js b/packages/installations-compat/rollup.config.js index ef4bd6e55a9..6f6ba62a40b 100644 --- a/packages/installations-compat/rollup.config.js +++ b/packages/installations-compat/rollup.config.js @@ -45,7 +45,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [...es5BuildPlugins, emitModulePackageFile()] @@ -60,7 +60,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [...es2017BuildPlugins, emitModulePackageFile()] @@ -74,7 +74,7 @@ const cjsBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: es5BuildPlugins diff --git a/packages/installations/rollup.config.js b/packages/installations/rollup.config.js index 54ea6adc387..7c8e3a7b80f 100644 --- a/packages/installations/rollup.config.js +++ b/packages/installations/rollup.config.js @@ -48,7 +48,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [ @@ -67,7 +67,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [ diff --git a/packages/messaging-compat/rollup.config.js b/packages/messaging-compat/rollup.config.js index f82a84c8bd1..20b8318337d 100644 --- a/packages/messaging-compat/rollup.config.js +++ b/packages/messaging-compat/rollup.config.js @@ -54,7 +54,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, @@ -69,7 +69,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } @@ -83,7 +83,7 @@ const cjsBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } diff --git a/packages/messaging/rollup.config.js b/packages/messaging/rollup.config.js index 28c5c71e1c7..1fa04db5afd 100644 --- a/packages/messaging/rollup.config.js +++ b/packages/messaging/rollup.config.js @@ -74,7 +74,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, @@ -86,7 +86,7 @@ const esmBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } @@ -103,7 +103,7 @@ const cjsBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, @@ -122,7 +122,7 @@ const cjsBuilds = [ external: id => deps.some( dep => - dep !== pkg.dependencies.idb && + dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } From 09f3e72935a7402ae2cf017681f6e6e0c851693b Mon Sep 17 00:00:00 2001 From: Daniel La Rocque Date: Wed, 25 Sep 2024 11:51:52 -0400 Subject: [PATCH 4/5] format --- packages/app-compat/rollup.config.js | 12 +++--------- packages/app/rollup.config.js | 8 ++------ packages/installations-compat/rollup.config.js | 12 +++--------- packages/installations/rollup.config.js | 8 ++------ packages/messaging-compat/rollup.config.js | 12 +++--------- packages/messaging/rollup.config.js | 16 ++++------------ 6 files changed, 17 insertions(+), 51 deletions(-) diff --git a/packages/app-compat/rollup.config.js b/packages/app-compat/rollup.config.js index 24cc2e57361..28026552fa0 100644 --- a/packages/app-compat/rollup.config.js +++ b/packages/app-compat/rollup.config.js @@ -57,9 +57,7 @@ const esmBuilds = [ plugins: [...es5BuildPlugins, emitModulePackageFile()], external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, { @@ -81,9 +79,7 @@ const esmBuilds = [ plugins: [...es2017BuildPlugins, emitModulePackageFile()], external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, { @@ -96,9 +92,7 @@ const esmBuilds = [ plugins: es2017BuildPlugins, external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } ]; diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 31f539ff73f..6c0b4ff21c3 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -77,9 +77,7 @@ const esmBuilds = [ }, external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [ ...es2017BuildPlugins, @@ -98,9 +96,7 @@ const cjsBuilds = [ output: [{ file: pkg.main, format: 'cjs', sourcemap: true }], external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [ ...es5BuildPlugins, diff --git a/packages/installations-compat/rollup.config.js b/packages/installations-compat/rollup.config.js index 6f6ba62a40b..bd64ba26e62 100644 --- a/packages/installations-compat/rollup.config.js +++ b/packages/installations-compat/rollup.config.js @@ -44,9 +44,7 @@ const esmBuilds = [ output: { file: pkg.esm5, format: 'es', sourcemap: true }, external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [...es5BuildPlugins, emitModulePackageFile()] }, @@ -59,9 +57,7 @@ const esmBuilds = [ }, external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [...es2017BuildPlugins, emitModulePackageFile()] } @@ -73,9 +69,7 @@ const cjsBuilds = [ output: { file: pkg.main, format: 'cjs', sourcemap: true }, external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: es5BuildPlugins } diff --git a/packages/installations/rollup.config.js b/packages/installations/rollup.config.js index 7c8e3a7b80f..f102e7d3311 100644 --- a/packages/installations/rollup.config.js +++ b/packages/installations/rollup.config.js @@ -47,9 +47,7 @@ const esmBuilds = [ output: [{ file: pkg.esm5, format: 'es', sourcemap: true }], external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [ ...es5BuildPlugins, @@ -66,9 +64,7 @@ const esmBuilds = [ }, external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ), plugins: [ ...es2017BuildPlugins, diff --git a/packages/messaging-compat/rollup.config.js b/packages/messaging-compat/rollup.config.js index 20b8318337d..38415b6a315 100644 --- a/packages/messaging-compat/rollup.config.js +++ b/packages/messaging-compat/rollup.config.js @@ -53,9 +53,7 @@ const esmBuilds = [ plugins: [...es5BuildPlugins, emitModulePackageFile()], external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, { @@ -68,9 +66,7 @@ const esmBuilds = [ plugins: [...es2017BuildPlugins, emitModulePackageFile()], external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } ]; @@ -82,9 +78,7 @@ const cjsBuilds = [ plugins: es5BuildPlugins, external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } ]; diff --git a/packages/messaging/rollup.config.js b/packages/messaging/rollup.config.js index 1fa04db5afd..84332290dcf 100644 --- a/packages/messaging/rollup.config.js +++ b/packages/messaging/rollup.config.js @@ -73,9 +73,7 @@ const esmBuilds = [ ], external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, // sw builds @@ -85,9 +83,7 @@ const esmBuilds = [ plugins: es2017BuildPlugins, external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } ]; @@ -102,9 +98,7 @@ const cjsBuilds = [ ], external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) }, // sw build @@ -121,9 +115,7 @@ const cjsBuilds = [ ], external: id => deps.some( - dep => - dep !== 'idb' && - (id === dep || id.startsWith(`${dep}/`)) + dep => dep !== 'idb' && (id === dep || id.startsWith(`${dep}/`)) ) } ]; From 72825f56060b27380af17819827e09e6381a9dca Mon Sep 17 00:00:00 2001 From: Daniel La Rocque Date: Wed, 25 Sep 2024 12:15:17 -0400 Subject: [PATCH 5/5] Make idb a devDependency --- packages/app/package.json | 2 +- packages/installations/package.json | 2 +- packages/messaging/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/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/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",