From 29d1c168d1476398623a582e0f0486b71e1dc590 Mon Sep 17 00:00:00 2001 From: eranc Date: Sun, 8 Jun 2025 16:12:35 +0300 Subject: [PATCH 1/5] feat(build): Add rollup config for google3 modular typings --- packages/analytics/package.json | 1 + packages/analytics/rollup.config.js | 16 +++++++++++++++- packages/remote-config/package.json | 1 + packages/remote-config/rollup.config.js | 18 +++++++++++++++++- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 3f8decfc35f..237dbfdd820 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -49,6 +49,7 @@ "devDependencies": { "@firebase/app": "0.13.1", "rollup": "2.79.2", + "rollup-plugin-dts": "6.1.0", "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "6.1.0", "@rollup/plugin-node-resolve": "16.0.0", diff --git a/packages/analytics/rollup.config.js b/packages/analytics/rollup.config.js index a22194d1d4a..f9c52861674 100644 --- a/packages/analytics/rollup.config.js +++ b/packages/analytics/rollup.config.js @@ -19,6 +19,7 @@ import json from '@rollup/plugin-json'; import typescriptPlugin from 'rollup-plugin-typescript2'; import replace from 'rollup-plugin-replace'; import typescript from 'typescript'; +import dts from 'rollup-plugin-dts'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; @@ -77,4 +78,17 @@ const cjsBuilds = [ } ]; -export default [...esmBuilds, ...cjsBuilds]; +const google3TypingsBuild = { + input: 'dist/src/index.d.ts', + output: { + file: 'dist/esm/src/global_index.d.ts', + format: 'es' + }, + plugins: [ + dts({ + respectExternal: true + }) + ] +}; + +export default [...esmBuilds, ...cjsBuilds, google3TypingsBuild]; diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json index 194f9806cb7..d78f6017cb2 100644 --- a/packages/remote-config/package.json +++ b/packages/remote-config/package.json @@ -50,6 +50,7 @@ "devDependencies": { "@firebase/app": "0.13.1", "rollup": "2.79.2", + "rollup-plugin-dts": "6.1.0", "rollup-plugin-typescript2": "0.36.0", "typescript": "5.5.4" }, diff --git a/packages/remote-config/rollup.config.js b/packages/remote-config/rollup.config.js index 36622f4dae2..cc528ab2acf 100644 --- a/packages/remote-config/rollup.config.js +++ b/packages/remote-config/rollup.config.js @@ -19,6 +19,7 @@ import json from '@rollup/plugin-json'; // Enables package.json import in TypeSc import typescriptPlugin from 'rollup-plugin-typescript2'; import replace from 'rollup-plugin-replace'; import typescript from 'typescript'; +import dts from 'rollup-plugin-dts'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; @@ -70,4 +71,19 @@ const cjsBuild = { ] }; -export default [esmBuild, cjsBuild]; + +const google3TypingsBuild = { + input: 'dist/src/index.d.ts', + output: { + file: 'dist/esm/src/global_index.d.ts', + format: 'es' + }, + plugins: [ + dts({ + respectExternal: true + }) + ] +}; + + +export default [esmBuild, cjsBuild, google3TypingsBuild]; From 83e72ac4fe6521b05694711520807bc00883bbc0 Mon Sep 17 00:00:00 2001 From: eranc Date: Sun, 8 Jun 2025 16:23:20 +0300 Subject: [PATCH 2/5] chore: Add changeset file --- .changeset/brave-boats-arrive.md | 7 +++++++ packages/analytics/rollup.config.js | 2 +- packages/remote-config/rollup.config.js | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .changeset/brave-boats-arrive.md diff --git a/.changeset/brave-boats-arrive.md b/.changeset/brave-boats-arrive.md new file mode 100644 index 00000000000..1e2f703ddb3 --- /dev/null +++ b/.changeset/brave-boats-arrive.md @@ -0,0 +1,7 @@ +--- +'@firebase/remote-config': patch +'@firebase/analytics': patch +'firebase': patch +--- + +Add rollup config to generate modular typings for google3 diff --git a/packages/analytics/rollup.config.js b/packages/analytics/rollup.config.js index f9c52861674..529858f147f 100644 --- a/packages/analytics/rollup.config.js +++ b/packages/analytics/rollup.config.js @@ -81,7 +81,7 @@ const cjsBuilds = [ const google3TypingsBuild = { input: 'dist/src/index.d.ts', output: { - file: 'dist/esm/src/global_index.d.ts', + file: 'dist/src/global_index.d.ts', format: 'es' }, plugins: [ diff --git a/packages/remote-config/rollup.config.js b/packages/remote-config/rollup.config.js index cc528ab2acf..e55c469b3c6 100644 --- a/packages/remote-config/rollup.config.js +++ b/packages/remote-config/rollup.config.js @@ -75,7 +75,7 @@ const cjsBuild = { const google3TypingsBuild = { input: 'dist/src/index.d.ts', output: { - file: 'dist/esm/src/global_index.d.ts', + file: 'dist/src/global_index.d.ts', format: 'es' }, plugins: [ From dce918fd24a36898036269527fc9e2e89ba4b499 Mon Sep 17 00:00:00 2001 From: eranc-google Date: Sun, 15 Jun 2025 13:00:40 +0300 Subject: [PATCH 3/5] Update packages/analytics/package.json Co-authored-by: Daniel La Rocque --- packages/analytics/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 237dbfdd820..5d4c4d06735 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -49,7 +49,7 @@ "devDependencies": { "@firebase/app": "0.13.1", "rollup": "2.79.2", - "rollup-plugin-dts": "6.1.0", + "rollup-plugin-dts": "5.3.1", "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "6.1.0", "@rollup/plugin-node-resolve": "16.0.0", From 615fb99696cb38c07298cc8c46f8ed670c505c20 Mon Sep 17 00:00:00 2001 From: eranc Date: Sun, 15 Jun 2025 13:02:42 +0300 Subject: [PATCH 4/5] chore: Update yarn.lock file --- packages/remote-config/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json index d78f6017cb2..43648d267d4 100644 --- a/packages/remote-config/package.json +++ b/packages/remote-config/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@firebase/app": "0.13.1", "rollup": "2.79.2", - "rollup-plugin-dts": "6.1.0", + "rollup-plugin-dts": "5.3.1", "rollup-plugin-typescript2": "0.36.0", "typescript": "5.5.4" }, From 7e6bdf2f22660adae59cc62860a205770ca80b52 Mon Sep 17 00:00:00 2001 From: eranc Date: Sun, 15 Jun 2025 13:02:42 +0300 Subject: [PATCH 5/5] chore: Update yarn.lock file --- packages/remote-config/package.json | 2 +- packages/remote-config/rollup.config.js | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json index d78f6017cb2..43648d267d4 100644 --- a/packages/remote-config/package.json +++ b/packages/remote-config/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@firebase/app": "0.13.1", "rollup": "2.79.2", - "rollup-plugin-dts": "6.1.0", + "rollup-plugin-dts": "5.3.1", "rollup-plugin-typescript2": "0.36.0", "typescript": "5.5.4" }, diff --git a/packages/remote-config/rollup.config.js b/packages/remote-config/rollup.config.js index e55c469b3c6..d8eb3abd315 100644 --- a/packages/remote-config/rollup.config.js +++ b/packages/remote-config/rollup.config.js @@ -71,7 +71,6 @@ const cjsBuild = { ] }; - const google3TypingsBuild = { input: 'dist/src/index.d.ts', output: { @@ -85,5 +84,4 @@ const google3TypingsBuild = { ] }; - export default [esmBuild, cjsBuild, google3TypingsBuild];