Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Internalize IDB dependency #8518

Closed
wants to merge 5 commits into from
Closed

Internalize IDB dependency #8518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c650a30
Internalize IDB dependency
dlarocque Sep 24, 2024
5b6417f
Format
dlarocque Sep 24, 2024
496f206
Replace pkg.dependencies.idb with `"idb"`
dlarocque Sep 25, 2024
09f3e72
format
dlarocque Sep 25, 2024
72825f5
Make idb a devDependency
dlarocque Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions packages/app-compat/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -45,15 +46,19 @@ 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 !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
)
},
{
input: 'src/index.lite.ts',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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}/`))
)
}
];

Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 11 additions & 3 deletions packages/app/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -46,7 +47,8 @@ const es2017BuildPlugins = [
}),
json({
preferConst: true
})
}),
resolve()
];

const esmBuilds = [
Expand All @@ -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({
Expand All @@ -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({
Expand Down
19 changes: 15 additions & 4 deletions packages/installations-compat/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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()]
},
{
Expand All @@ -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()]
}
];
Expand All @@ -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
}
];
Expand Down
2 changes: 1 addition & 1 deletion packages/installations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -66,7 +67,6 @@
"dependencies": {
"@firebase/util": "1.10.0",
"@firebase/component": "0.6.9",
"idb": "7.1.1",
"tslib": "^2.1.0"
}
}
14 changes: 11 additions & 3 deletions packages/installations/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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)),
Expand All @@ -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)),
Expand Down
19 changes: 15 additions & 4 deletions packages/messaging-compat/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -41,15 +42,19 @@ 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 !== 'idb' && (id === dep || id.startsWith(`${dep}/`))
)
},
{
input: 'src/index.ts',
Expand All @@ -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}/`))
)
}
];

Expand All @@ -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}/`))
)
}
];

Expand Down
2 changes: 1 addition & 1 deletion packages/messaging/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
24 changes: 19 additions & 5 deletions packages/messaging/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -43,7 +44,8 @@ const es2017BuildPlugins = [
}
}
}),
json({ preferConst: true })
json({ preferConst: true }),
resolve()
];

const esmBuilds = [
Expand All @@ -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}/`))
)
}
];

Expand All @@ -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
Expand All @@ -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}/`))
)
}
];

Expand Down
Loading