From b13f1a11b5cfcbc06aeda8563628b38b514da933 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Mon, 27 Jan 2025 12:46:29 -0800 Subject: [PATCH] changes for rollup --- config/api-extractor.json | 2 +- packages/analytics-compat/tsconfig.json | 6 ++---- packages/analytics-interop-types/tsconfig.json | 4 +--- packages/analytics-types/tsconfig.json | 4 +--- packages/analytics/rollup.config.js | 6 +++++- packages/app-check-interop-types/tsconfig.json | 4 +--- packages/app-check-types/tsconfig.json | 4 +--- packages/app-types/tsconfig.json | 4 +--- packages/app/rollup.config.js | 6 +++++- packages/app/tsconfig.json | 6 ++---- packages/auth-compat/tsconfig.json | 6 ++---- packages/auth-interop-types/tsconfig.json | 4 +--- packages/auth-types/tsconfig.json | 4 +--- packages/auth/rollup.config.js | 7 ++++++- packages/auth/tsconfig.json | 7 ++----- packages/component/rollup.config.js | 10 +++++++++- packages/component/src/provider.ts | 6 +++--- packages/component/tsconfig.json | 6 ++---- packages/data-connect/rollup.config.js | 4 ++++ packages/data-connect/tsconfig.json | 5 +---- packages/database-compat/tsconfig.json | 6 ++---- packages/database-types/tsconfig.json | 4 +--- packages/database/rollup.config.js | 4 ++++ packages/database/tsconfig.json | 6 ++---- packages/firebase/tsconfig.json | 6 ++---- packages/firestore-types/tsconfig.json | 4 +--- packages/firestore/rollup.config.js | 3 +++ packages/firestore/rollup.shared.js | 1 - .../firestore/test/unit/specs/describe_spec.ts | 4 ++-- packages/functions-compat/tsconfig.json | 6 ++---- packages/functions-types/tsconfig.json | 4 +--- packages/functions/rollup.config.js | 6 +++++- packages/functions/tsconfig.json | 6 ++---- packages/installations/rollup.config.js | 6 +++++- packages/logger/tsconfig.json | 6 ++---- packages/messaging-compat/tsconfig.json | 9 ++------- packages/messaging-interop-types/tsconfig.json | 14 ++++++-------- packages/messaging/rollup.config.js | 6 +++++- packages/messaging/tsconfig.json | 9 ++------- packages/performance-types/tsconfig.json | 4 +--- packages/performance/rollup.config.js | 6 +++++- packages/remote-config-types/tsconfig.json | 4 +--- packages/remote-config/rollup.config.js | 6 +++++- packages/remote-config/tsconfig.json | 8 +++----- packages/rules-unit-testing/api-extractor.json | 2 +- packages/rules-unit-testing/package.json | 4 ++-- packages/rules-unit-testing/rollup.config.js | 6 +++++- packages/rules-unit-testing/tsconfig.json | 4 +--- packages/storage-compat/tsconfig.json | 6 ++---- packages/storage-types/tsconfig.json | 4 +--- packages/storage/rollup.config.js | 4 ++++ packages/storage/tsconfig.json | 6 ++---- packages/template-types/tsconfig.json | 4 +--- packages/template/tsconfig.json | 6 ++---- packages/util/tsconfig.json | 6 ++---- packages/vertexai/rollup.config.js | 2 ++ packages/vertexai/tsconfig.json | 8 +++----- packages/webchannel-wrapper/tsconfig.json | 2 +- scripts/build/rollup_emit_module_package_file.js | 4 +++- 59 files changed, 147 insertions(+), 164 deletions(-) diff --git a/config/api-extractor.json b/config/api-extractor.json index 3dd3d985f81..5d3e13e2867 100644 --- a/config/api-extractor.json +++ b/config/api-extractor.json @@ -100,7 +100,7 @@ * * DEFAULT VALUE: false */ - // "skipLibCheck": true, + "skipLibCheck": true, }, /** diff --git a/packages/analytics-compat/tsconfig.json b/packages/analytics-compat/tsconfig.json index a06ed9a374c..4e0ae05eebc 100644 --- a/packages/analytics-compat/tsconfig.json +++ b/packages/analytics-compat/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/analytics-interop-types/tsconfig.json b/packages/analytics-interop-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/analytics-interop-types/tsconfig.json +++ b/packages/analytics-interop-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/analytics-types/tsconfig.json b/packages/analytics-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/analytics-types/tsconfig.json +++ b/packages/analytics-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/analytics/rollup.config.js b/packages/analytics/rollup.config.js index 6acafe03b5d..a22194d1d4a 100644 --- a/packages/analytics/rollup.config.js +++ b/packages/analytics/rollup.config.js @@ -22,6 +22,7 @@ import typescript from 'typescript'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; const deps = [ ...Object.keys(Object.assign({}, pkg.peerDependencies, pkg.dependencies)) @@ -29,7 +30,10 @@ const deps = [ const buildPlugins = [ typescriptPlugin({ - typescript + typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + } }), json({ preferConst: true }) ]; diff --git a/packages/app-check-interop-types/tsconfig.json b/packages/app-check-interop-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/app-check-interop-types/tsconfig.json +++ b/packages/app-check-interop-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/app-check-types/tsconfig.json b/packages/app-check-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/app-check-types/tsconfig.json +++ b/packages/app-check-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/app-types/tsconfig.json b/packages/app-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/app-types/tsconfig.json +++ b/packages/app-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index ec5a279a1c2..8314734a746 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -23,6 +23,7 @@ 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'; +import tsconfig from './tsconfig.json'; const deps = Object.keys( Object.assign({}, pkg.peerDependencies, pkg.dependencies) @@ -30,7 +31,10 @@ const deps = Object.keys( const buildPlugins = [ typescriptPlugin({ - typescript + typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + } }), json({ preferConst: true }) ]; diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json index 735ea623511..d20427b2bec 100644 --- a/packages/app/tsconfig.json +++ b/packages/app/tsconfig.json @@ -4,7 +4,5 @@ "outDir": "dist", "downlevelIteration": true }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/auth-compat/tsconfig.json b/packages/auth-compat/tsconfig.json index a06ed9a374c..4e0ae05eebc 100644 --- a/packages/auth-compat/tsconfig.json +++ b/packages/auth-compat/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/auth-interop-types/tsconfig.json b/packages/auth-interop-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/auth-interop-types/tsconfig.json +++ b/packages/auth-interop-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/auth-types/tsconfig.json b/packages/auth-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/auth-types/tsconfig.json +++ b/packages/auth-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js index 6af229962bd..01ca456e0ac 100644 --- a/packages/auth/rollup.config.js +++ b/packages/auth/rollup.config.js @@ -24,6 +24,7 @@ import alias from '@rollup/plugin-alias'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; const deps = Object.keys( Object.assign({}, pkg.peerDependencies, pkg.dependencies) @@ -47,7 +48,10 @@ const nodeAliasPlugin = alias({ const buildPlugins = [ json(), strip({ functions: ['debugAssert.*'] }), - typescriptPlugin({ typescript }) + typescriptPlugin({ + typescript, + tsconfigOverride: { exclude: [...tsconfig.exclude, '**/*.test.ts'] } + }) ]; const browserBuilds = [ @@ -191,6 +195,7 @@ const webWorkerBuild = { }), typescriptPlugin({ typescript, + exclude: [...tsconfig.exclude, '**/*.test.*'], compilerOptions: { lib: [ // Remove dom after we figure out why navigator stuff doesn't exist diff --git a/packages/auth/tsconfig.json b/packages/auth/tsconfig.json index 03897eed09c..f8d06916d09 100644 --- a/packages/auth/tsconfig.json +++ b/packages/auth/tsconfig.json @@ -3,8 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*", - "demo/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*", "demo/**/*"] +} diff --git a/packages/component/rollup.config.js b/packages/component/rollup.config.js index 11d18692c8c..17d92f77bb8 100644 --- a/packages/component/rollup.config.js +++ b/packages/component/rollup.config.js @@ -19,12 +19,20 @@ import typescriptPlugin from 'rollup-plugin-typescript2'; import typescript from 'typescript'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; const deps = Object.keys( Object.assign({}, pkg.peerDependencies, pkg.dependencies) ); -const buildPlugins = [typescriptPlugin({ typescript })]; +const buildPlugins = [ + typescriptPlugin({ + typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + } + }) +]; const esmBuild = { input: 'index.ts', diff --git a/packages/component/src/provider.ts b/packages/component/src/provider.ts index 267bae976f7..35005893e96 100644 --- a/packages/component/src/provider.ts +++ b/packages/component/src/provider.ts @@ -319,7 +319,7 @@ export class Provider { instanceIdentifier: normalizeIdentifierForFactory(instanceIdentifier), options }); - this.instances.set(instanceIdentifier, instance); + this.instances.set(instanceIdentifier, instance!); this.instancesOptions.set(instanceIdentifier, options); /** @@ -327,7 +327,7 @@ export class Provider { * Note this.component.onInstanceCreated is different, which is used by the component creator, * while onInit listeners are registered by consumers of the provider. */ - this.invokeOnInitCallbacks(instance, instanceIdentifier); + this.invokeOnInitCallbacks(instance!, instanceIdentifier); /** * Order is important @@ -339,7 +339,7 @@ export class Provider { this.component.onInstanceCreated( this.container, instanceIdentifier, - instance + instance! ); } catch { // ignore errors in the onInstanceCreatedCallback diff --git a/packages/component/tsconfig.json b/packages/component/tsconfig.json index 735ea623511..d20427b2bec 100644 --- a/packages/component/tsconfig.json +++ b/packages/component/tsconfig.json @@ -4,7 +4,5 @@ "outDir": "dist", "downlevelIteration": true }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/data-connect/rollup.config.js b/packages/data-connect/rollup.config.js index 56b6464d274..ab0119ca5d2 100644 --- a/packages/data-connect/rollup.config.js +++ b/packages/data-connect/rollup.config.js @@ -22,6 +22,7 @@ import typescript from 'typescript'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; const deps = [ ...Object.keys({ ...pkg.peerDependencies, ...pkg.dependencies }), @@ -38,6 +39,9 @@ function onWarn(warning, defaultWarn) { const buildPlugins = [ typescriptPlugin({ typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + }, abortOnError: false }), json({ preferConst: true }) diff --git a/packages/data-connect/tsconfig.json b/packages/data-connect/tsconfig.json index 838f5c0d3c3..58561f50f5d 100644 --- a/packages/data-connect/tsconfig.json +++ b/packages/data-connect/tsconfig.json @@ -4,8 +4,5 @@ "outDir": "dist", "strict": false }, - "exclude": [ - "dist/**/*", - "test/**/*" - ] + "exclude": ["dist/**/*", "test/**/*"] } diff --git a/packages/database-compat/tsconfig.json b/packages/database-compat/tsconfig.json index ce12ac3c5dc..cda7e399a2c 100644 --- a/packages/database-compat/tsconfig.json +++ b/packages/database-compat/tsconfig.json @@ -5,7 +5,5 @@ "strict": false, "downlevelIteration": true }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/database-types/tsconfig.json b/packages/database-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/database-types/tsconfig.json +++ b/packages/database-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/database/rollup.config.js b/packages/database/rollup.config.js index 293eaf06811..bdd6b8ae36c 100644 --- a/packages/database/rollup.config.js +++ b/packages/database/rollup.config.js @@ -22,6 +22,7 @@ import typescript from 'typescript'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; const deps = [ ...Object.keys({ ...pkg.peerDependencies, ...pkg.dependencies }), @@ -38,6 +39,9 @@ function onWarn(warning, defaultWarn) { const buildPlugins = [ typescriptPlugin({ typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + }, abortOnError: false }), json({ preferConst: true }) diff --git a/packages/database/tsconfig.json b/packages/database/tsconfig.json index ce12ac3c5dc..cda7e399a2c 100644 --- a/packages/database/tsconfig.json +++ b/packages/database/tsconfig.json @@ -5,7 +5,5 @@ "strict": false, "downlevelIteration": true }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/firebase/tsconfig.json b/packages/firebase/tsconfig.json index 741f57b2ae4..53e45c82eae 100644 --- a/packages/firebase/tsconfig.json +++ b/packages/firebase/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "**/dist/**/*" - ] -} \ No newline at end of file + "exclude": ["**/dist/**/*"] +} diff --git a/packages/firestore-types/tsconfig.json b/packages/firestore-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/firestore-types/tsconfig.json +++ b/packages/firestore-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/firestore/rollup.config.js b/packages/firestore/rollup.config.js index 8d93aab992e..f9a29bef742 100644 --- a/packages/firestore/rollup.config.js +++ b/packages/firestore/rollup.config.js @@ -28,6 +28,7 @@ import typescript from 'typescript'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; const sourcemaps = require('rollup-plugin-sourcemaps'); const util = require('./rollup.shared'); @@ -35,6 +36,7 @@ const util = require('./rollup.shared'); const nodePlugins = [ typescriptPlugin({ typescript, + exclude: [...tsconfig.exclude, '**/*.test.ts'], cacheDir: tmp.dirSync(), abortOnError: true, transformers: [util.removeAssertTransformer] @@ -48,6 +50,7 @@ const nodePlugins = [ const browserPlugins = [ typescriptPlugin({ typescript, + exclude: [...tsconfig.exclude, '**/*.test.ts'], cacheDir: tmp.dirSync(), abortOnError: true, transformers: [util.removeAssertAndPrefixInternalTransformer] diff --git a/packages/firestore/rollup.shared.js b/packages/firestore/rollup.shared.js index aa90fc51edb..728f03df2fe 100644 --- a/packages/firestore/rollup.shared.js +++ b/packages/firestore/rollup.shared.js @@ -22,7 +22,6 @@ const typescriptPlugin = require('rollup-plugin-typescript2'); const typescript = require('typescript'); const { terser } = require('@rollup/plugin-terser'); const path = require('path'); -const sourcemaps = require('rollup-plugin-sourcemaps'); const { renameInternals } = require('./scripts/rename-internals'); const { extractPublicIdentifiers } = require('./scripts/extract-api'); diff --git a/packages/firestore/test/unit/specs/describe_spec.ts b/packages/firestore/test/unit/specs/describe_spec.ts index 5ee3b638fd9..0b95cef1897 100644 --- a/packages/firestore/test/unit/specs/describe_spec.ts +++ b/packages/firestore/test/unit/specs/describe_spec.ts @@ -300,8 +300,8 @@ function stringifyGroup(s: string): number { * some logically-first keys before others. */ function stringifyComparator( - a: { key: string, value: unknown }, - b: { key: string, value: unknown } + a: { key: string; value: unknown }, + b: { key: string; value: unknown } ): number { const aGroup = stringifyGroup(a.key); const bGroup = stringifyGroup(b.key); diff --git a/packages/functions-compat/tsconfig.json b/packages/functions-compat/tsconfig.json index a06ed9a374c..4e0ae05eebc 100644 --- a/packages/functions-compat/tsconfig.json +++ b/packages/functions-compat/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/functions-types/tsconfig.json b/packages/functions-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/functions-types/tsconfig.json +++ b/packages/functions-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/functions/rollup.config.js b/packages/functions/rollup.config.js index 8d00f21d755..06899e7224c 100644 --- a/packages/functions/rollup.config.js +++ b/packages/functions/rollup.config.js @@ -20,6 +20,7 @@ import typescriptPlugin from 'rollup-plugin-typescript2'; import replace from 'rollup-plugin-replace'; import typescript from 'typescript'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; @@ -29,7 +30,10 @@ const deps = Object.keys( const buildPlugins = [ typescriptPlugin({ - typescript + typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + } }), json({ preferConst: true }) ]; diff --git a/packages/functions/tsconfig.json b/packages/functions/tsconfig.json index a06ed9a374c..4e0ae05eebc 100644 --- a/packages/functions/tsconfig.json +++ b/packages/functions/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/installations/rollup.config.js b/packages/installations/rollup.config.js index 7d083c63320..bf2b61f73f0 100644 --- a/packages/installations/rollup.config.js +++ b/packages/installations/rollup.config.js @@ -20,6 +20,7 @@ import typescriptPlugin from 'rollup-plugin-typescript2'; import replace from 'rollup-plugin-replace'; import typescript from 'typescript'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; @@ -27,7 +28,10 @@ const deps = [...Object.keys({ ...pkg.peerDependencies, ...pkg.dependencies })]; const buildPlugins = [ typescriptPlugin({ - typescript + typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + } }), json({ preferConst: true }) ]; diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index a06ed9a374c..4e0ae05eebc 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/messaging-compat/tsconfig.json b/packages/messaging-compat/tsconfig.json index 4b63b47c5b5..90f9c26f657 100644 --- a/packages/messaging-compat/tsconfig.json +++ b/packages/messaging-compat/tsconfig.json @@ -3,13 +3,8 @@ "compilerOptions": { "outDir": "dist", "noUnusedLocals": true, - "lib": [ - "dom", - "es2017" - ], + "lib": ["dom", "es2017"], "downlevelIteration": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/messaging-interop-types/tsconfig.json b/packages/messaging-interop-types/tsconfig.json index 94e5b1c1b3e..ad532c5f58b 100644 --- a/packages/messaging-interop-types/tsconfig.json +++ b/packages/messaging-interop-types/tsconfig.json @@ -1,9 +1,7 @@ { - "extends": "../../config/tsconfig.base.json", - "compilerOptions": { - "noEmit": true - }, - "exclude": [ - "dist/**/*" - ] - } \ No newline at end of file + "extends": "../../config/tsconfig.base.json", + "compilerOptions": { + "noEmit": true + }, + "exclude": ["dist/**/*"] +} diff --git a/packages/messaging/rollup.config.js b/packages/messaging/rollup.config.js index 506f0d30261..9342be135f2 100644 --- a/packages/messaging/rollup.config.js +++ b/packages/messaging/rollup.config.js @@ -17,6 +17,7 @@ import json from '@rollup/plugin-json'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; import typescript from 'typescript'; import replace from 'rollup-plugin-replace'; import typescriptPlugin from 'rollup-plugin-typescript2'; @@ -29,7 +30,10 @@ const deps = Object.keys( const buildPlugins = [ typescriptPlugin({ - typescript + typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + } }), json({ preferConst: true }) ]; diff --git a/packages/messaging/tsconfig.json b/packages/messaging/tsconfig.json index 4b63b47c5b5..90f9c26f657 100644 --- a/packages/messaging/tsconfig.json +++ b/packages/messaging/tsconfig.json @@ -3,13 +3,8 @@ "compilerOptions": { "outDir": "dist", "noUnusedLocals": true, - "lib": [ - "dom", - "es2017" - ], + "lib": ["dom", "es2017"], "downlevelIteration": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/performance-types/tsconfig.json b/packages/performance-types/tsconfig.json index 09f747b4d46..4e0ae05eebc 100644 --- a/packages/performance-types/tsconfig.json +++ b/packages/performance-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/performance/rollup.config.js b/packages/performance/rollup.config.js index ca9fdde7f54..006dcf54337 100644 --- a/packages/performance/rollup.config.js +++ b/packages/performance/rollup.config.js @@ -22,6 +22,7 @@ import typescript from 'typescript'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; const deps = Object.keys( Object.assign({}, pkg.peerDependencies, pkg.dependencies) @@ -29,7 +30,10 @@ const deps = Object.keys( const buildPlugins = [ typescriptPlugin({ - typescript + typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + } }), json({ preferConst: true }) ]; diff --git a/packages/remote-config-types/tsconfig.json b/packages/remote-config-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/remote-config-types/tsconfig.json +++ b/packages/remote-config-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/remote-config/rollup.config.js b/packages/remote-config/rollup.config.js index a7209c67e09..36622f4dae2 100644 --- a/packages/remote-config/rollup.config.js +++ b/packages/remote-config/rollup.config.js @@ -22,6 +22,7 @@ import typescript from 'typescript'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; const deps = Object.keys( Object.assign({}, pkg.peerDependencies, pkg.dependencies) @@ -29,7 +30,10 @@ const deps = Object.keys( const buildPlugins = [ typescriptPlugin({ - typescript + typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + } }), json({ preferConst: true }) ]; diff --git a/packages/remote-config/tsconfig.json b/packages/remote-config/tsconfig.json index a4b8678284b..f2942111423 100644 --- a/packages/remote-config/tsconfig.json +++ b/packages/remote-config/tsconfig.json @@ -2,9 +2,7 @@ "extends": "../../config/tsconfig.base.json", "compilerOptions": { "outDir": "dist", - "resolveJsonModule": true, + "resolveJsonModule": true }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/rules-unit-testing/api-extractor.json b/packages/rules-unit-testing/api-extractor.json index 620d10a071c..12ef61e843d 100644 --- a/packages/rules-unit-testing/api-extractor.json +++ b/packages/rules-unit-testing/api-extractor.json @@ -1,5 +1,5 @@ { "extends": "../../config/api-extractor.json", // Point it to your entry point d.ts file. - "mainEntryPointFilePath": "/dist/index.d.ts" + "mainEntryPointFilePath": "/dist/rules-unit-testing/index.d.ts" } \ No newline at end of file diff --git a/packages/rules-unit-testing/package.json b/packages/rules-unit-testing/package.json index ce68f002130..52c68fad5d1 100644 --- a/packages/rules-unit-testing/package.json +++ b/packages/rules-unit-testing/package.json @@ -6,7 +6,7 @@ "main": "dist/index.cjs.js", "exports": { ".": { - "types": "./dist/index.d.ts", + "types": "./dist/rules-unit-testing/index.d.ts", "node": { "import": "./dist/esm/index.esm.js", "require": "./dist/index.cjs.js" @@ -50,7 +50,7 @@ "type": "git", "url": "git+https://github.com/firebase/firebase-js-sdk.git" }, - "typings": "dist/index.d.ts", + "typings": "dist/rules-unut-testing/index.d.ts", "bugs": { "url": "https://github.com/firebase/firebase-js-sdk/issues" } diff --git a/packages/rules-unit-testing/rollup.config.js b/packages/rules-unit-testing/rollup.config.js index 5811401fb74..55755326dda 100644 --- a/packages/rules-unit-testing/rollup.config.js +++ b/packages/rules-unit-testing/rollup.config.js @@ -17,12 +17,16 @@ import typescriptPlugin from 'rollup-plugin-typescript2'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; import typescript from 'typescript'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; const buildPlugins = [ typescriptPlugin({ - typescript + typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + } }) ]; diff --git a/packages/rules-unit-testing/tsconfig.json b/packages/rules-unit-testing/tsconfig.json index 09f747b4d46..4e0ae05eebc 100644 --- a/packages/rules-unit-testing/tsconfig.json +++ b/packages/rules-unit-testing/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/storage-compat/tsconfig.json b/packages/storage-compat/tsconfig.json index a06ed9a374c..4e0ae05eebc 100644 --- a/packages/storage-compat/tsconfig.json +++ b/packages/storage-compat/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/storage-types/tsconfig.json b/packages/storage-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/storage-types/tsconfig.json +++ b/packages/storage-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/storage/rollup.config.js b/packages/storage/rollup.config.js index 093cca0c654..4ce92722281 100644 --- a/packages/storage/rollup.config.js +++ b/packages/storage/rollup.config.js @@ -23,6 +23,7 @@ import alias from '@rollup/plugin-alias'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; function generateAliasConfig(platform) { return { @@ -44,6 +45,9 @@ const nodeDeps = [...deps, 'util']; const buildPlugins = [ typescriptPlugin({ typescript, + tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts'] + }, abortOnError: false }), json({ preferConst: true }) diff --git a/packages/storage/tsconfig.json b/packages/storage/tsconfig.json index a06ed9a374c..4e0ae05eebc 100644 --- a/packages/storage/tsconfig.json +++ b/packages/storage/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/template-types/tsconfig.json b/packages/template-types/tsconfig.json index 9a785433d90..ad532c5f58b 100644 --- a/packages/template-types/tsconfig.json +++ b/packages/template-types/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "noEmit": true }, - "exclude": [ - "dist/**/*" - ] + "exclude": ["dist/**/*"] } diff --git a/packages/template/tsconfig.json b/packages/template/tsconfig.json index a06ed9a374c..4e0ae05eebc 100644 --- a/packages/template/tsconfig.json +++ b/packages/template/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/util/tsconfig.json b/packages/util/tsconfig.json index a06ed9a374c..4e0ae05eebc 100644 --- a/packages/util/tsconfig.json +++ b/packages/util/tsconfig.json @@ -3,7 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/vertexai/rollup.config.js b/packages/vertexai/rollup.config.js index 3a1313a6bff..e93dd0319b5 100644 --- a/packages/vertexai/rollup.config.js +++ b/packages/vertexai/rollup.config.js @@ -20,6 +20,7 @@ import typescriptPlugin from 'rollup-plugin-typescript2'; import replace from 'rollup-plugin-replace'; import typescript from 'typescript'; import pkg from './package.json'; +import tsconfig from './tsconfig.json'; import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target'; import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file'; @@ -31,6 +32,7 @@ const buildPlugins = [ typescriptPlugin({ typescript, tsconfigOverride: { + exclude: [...tsconfig.exclude, '**/*.test.ts', 'test-utils'], compilerOptions: { target: 'es2017' } diff --git a/packages/vertexai/tsconfig.json b/packages/vertexai/tsconfig.json index ca3b32571f5..4e0ae05eebc 100644 --- a/packages/vertexai/tsconfig.json +++ b/packages/vertexai/tsconfig.json @@ -1,9 +1,7 @@ { "extends": "../../config/tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "exclude": [ - "dist/**/*" - ] -} \ No newline at end of file + "exclude": ["dist/**/*"] +} diff --git a/packages/webchannel-wrapper/tsconfig.json b/packages/webchannel-wrapper/tsconfig.json index 23e05a91330..dcb864330e7 100644 --- a/packages/webchannel-wrapper/tsconfig.json +++ b/packages/webchannel-wrapper/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "declaration": false, "outDir": "dist", - "downlevelIteration": true, + "downlevelIteration": true }, "include": ["../../node_modules/closure-net/firebase"] } diff --git a/scripts/build/rollup_emit_module_package_file.js b/scripts/build/rollup_emit_module_package_file.js index 626d984fc62..a0ab5e08be9 100644 --- a/scripts/build/rollup_emit_module_package_file.js +++ b/scripts/build/rollup_emit_module_package_file.js @@ -26,12 +26,14 @@ */ export function emitModulePackageFile() { return { - generateBundle() { + generateBundle(options) { this.emitFile({ fileName: 'package.json', source: `{"type":"module"}`, type: 'asset' }); + // I'm not sure why, this seems to prevent a rollup race condition? + console.log('Emitted module package.json file for:', options.file); }, name: 'emit-module-package-file' };