Skip to content

Commit b3f2eef

Browse files
authored
Remove @firebase/app-types-exp (#4461)
* remove app-types * fix installations imports * fix perf imports * fix analytics imports * fix auth imports * fix imports for functions * fix app-compat imports * fix auth-compat imports * fix functions-compat imports * fix installations-compat imports * fix messaging-exp imports * fix remote-config-exp imports * fix remote-config-compat imports * fix firestore imports * fix storage imports * remove reference to app-types-exp * fix database imports * address comments * fix lint error * fix exp build
1 parent 5538349 commit b3f2eef

File tree

118 files changed

+571
-343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+571
-343
lines changed

.changeset/config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"firebase-firestore-integration-test",
1515
"firebase-messaging-integration-test",
1616
"@firebase/app-exp",
17-
"@firebase/app-types-exp",
1817
"@firebase/analytics-exp",
1918
"@firebase/analytics-types-exp",
2019
"@firebase/auth-exp",

common/api-review/analytics-exp.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ControlParams } from '@firebase/analytics-types-exp';
1010
import { CustomParams } from '@firebase/analytics-types-exp';
1111
import { EventNameString } from '@firebase/analytics-types-exp';
1212
import { EventParams } from '@firebase/analytics-types-exp';
13-
import { FirebaseApp } from '@firebase/app-types-exp';
13+
import { FirebaseApp } from '@firebase/app-exp';
1414
import { Item } from '@firebase/analytics-types-exp';
1515
import { Promotion } from '@firebase/analytics-types-exp';
1616
import { SettingsOptions } from '@firebase/analytics-types-exp';

common/api-review/app-exp.api.md

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
```ts
66

77
import { Component } from '@firebase/component';
8-
import { FirebaseApp } from '@firebase/app-types-exp';
9-
import { FirebaseAppConfig } from '@firebase/app-types-exp';
10-
import { FirebaseOptions } from '@firebase/app-types-exp';
8+
import { ComponentContainer } from '@firebase/component';
119
import { LogCallback } from '@firebase/logger';
1210
import { LogLevelString } from '@firebase/logger';
1311
import { LogOptions } from '@firebase/logger';
@@ -35,11 +33,55 @@ export const _DEFAULT_ENTRY_NAME = "[DEFAULT]";
3533
// @public
3634
export function deleteApp(app: FirebaseApp): Promise<void>;
3735

38-
export { FirebaseApp }
36+
// @public
37+
export interface FirebaseApp {
38+
automaticDataCollectionEnabled: boolean;
39+
readonly name: string;
40+
readonly options: FirebaseOptions;
41+
}
42+
43+
// @public
44+
export interface FirebaseAppConfig {
45+
automaticDataCollectionEnabled?: boolean;
46+
name?: string;
47+
}
3948

40-
export { FirebaseAppConfig }
49+
// @internal (undocumented)
50+
export interface _FirebaseAppInternal extends FirebaseApp {
51+
// (undocumented)
52+
checkDestroyed(): void;
53+
// (undocumented)
54+
container: ComponentContainer;
55+
// (undocumented)
56+
isDeleted: boolean;
57+
}
4158

42-
export { FirebaseOptions }
59+
// @public
60+
export interface FirebaseOptions {
61+
// (undocumented)
62+
apiKey?: string;
63+
// (undocumented)
64+
appId?: string;
65+
// (undocumented)
66+
authDomain?: string;
67+
// (undocumented)
68+
databaseURL?: string;
69+
// (undocumented)
70+
measurementId?: string;
71+
// (undocumented)
72+
messagingSenderId?: string;
73+
// (undocumented)
74+
projectId?: string;
75+
// (undocumented)
76+
storageBucket?: string;
77+
}
78+
79+
// @internal (undocumented)
80+
export interface _FirebaseService {
81+
// (undocumented)
82+
app: FirebaseApp;
83+
_delete(): Promise<void>;
84+
}
4385

4486
// @public
4587
export function getApp(name?: string): FirebaseApp;

common/api-review/auth-exp.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { ErrorFactory } from '@firebase/util';
2121
import { ErrorFn } from '@firebase/util';
2222
import * as externs from '@firebase/auth-types-exp';
2323
import { FactorId } from '@firebase/auth-types-exp';
24-
import { FirebaseApp } from '@firebase/app-types-exp';
24+
import { FirebaseApp } from '@firebase/app-exp';
2525
import { FirebaseError } from '@firebase/util';
2626
import { IdTokenResult } from '@firebase/auth-types-exp';
2727
import { MultiFactorAssertion } from '@firebase/auth-types-exp';

common/api-review/functions-exp.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-types-exp';
7+
import { FirebaseApp } from '@firebase/app-exp';
88
import { Functions } from '@firebase/functions-types-exp';
99
import { FunctionsError } from '@firebase/functions-types-exp';
1010
import { FunctionsErrorCode } from '@firebase/functions-types-exp';

common/api-review/installations-exp.api.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-types-exp';
7+
import { FirebaseApp } from '@firebase/app-exp';
88
import { FirebaseInstallations } from '@firebase/installations-types-exp';
99

1010
// @public
1111
export function deleteInstallations(installations: FirebaseInstallations): Promise<void>;
1212

13+
export { FirebaseInstallations }
14+
1315
// @public
1416
export function getId(installations: FirebaseInstallations): Promise<string>;
1517

common/api-review/messaging-exp.api.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-types-exp';
7+
import { FirebaseApp } from '@firebase/app-exp';
88
import { FirebaseMessaging } from '@firebase/messaging-types-exp';
99
import { MessagePayload } from '@firebase/messaging-types-exp';
1010
import { NextFn } from '@firebase/util';
@@ -14,6 +14,8 @@ import { Unsubscribe } from '@firebase/util';
1414
// @public
1515
export function deleteToken(messaging: FirebaseMessaging): Promise<boolean>;
1616

17+
export { FirebaseMessaging }
18+
1719
// @public
1820
export function getMessaging(app: FirebaseApp): FirebaseMessaging;
1921

@@ -23,6 +25,8 @@ export function getToken(messaging: FirebaseMessaging, options?: {
2325
swReg?: ServiceWorkerRegistration;
2426
}): Promise<string>;
2527

28+
export { MessagePayload }
29+
2630
// @public
2731
export function onMessage(messaging: FirebaseMessaging, nextOrObserver: NextFn<MessagePayload> | Observer<MessagePayload>): Unsubscribe;
2832

common/api-review/performance-exp.api.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-types-exp';
7+
import { FirebaseApp } from '@firebase/app-exp';
88
import { FirebasePerformance } from '@firebase/performance-types-exp';
99
import { PerformanceSettings } from '@firebase/performance-types-exp';
1010
import { PerformanceTrace } from '@firebase/performance-types-exp';
1111

12+
export { FirebasePerformance }
13+
1214
// @public
1315
export function getPerformance(app: FirebaseApp, settings?: PerformanceSettings): FirebasePerformance;
1416

17+
export { PerformanceSettings }
18+
19+
export { PerformanceTrace }
20+
1521
// @public
1622
export function trace(performance: FirebasePerformance, name: string): PerformanceTrace;
1723

common/api-review/remote-config-exp.api.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-types-exp';
8-
import { LogLevel } from '@firebase/remote-config-types-exp';
7+
import { FirebaseApp } from '@firebase/app-exp';
98
import { RemoteConfig } from '@firebase/remote-config-types-exp';
10-
import { Value } from '@firebase/remote-config-types-exp';
9+
import { LogLevel as RemoteConfigLogLevel } from '@firebase/remote-config-types-exp';
10+
import { Value as ValueType } from '@firebase/remote-config-types-exp';
1111

1212
// @public
1313
export function activate(remoteConfig: RemoteConfig): Promise<boolean>;
@@ -22,7 +22,7 @@ export function fetchAndActivate(remoteConfig: RemoteConfig): Promise<boolean>;
2222
export function fetchConfig(remoteConfig: RemoteConfig): Promise<void>;
2323

2424
// @public
25-
export function getAll(remoteConfig: RemoteConfig): Record<string, Value>;
25+
export function getAll(remoteConfig: RemoteConfig): Record<string, ValueType>;
2626

2727
// @public
2828
export function getBoolean(remoteConfig: RemoteConfig, key: string): boolean;
@@ -37,10 +37,16 @@ export function getRemoteConfig(app: FirebaseApp): RemoteConfig;
3737
export function getString(remoteConfig: RemoteConfig, key: string): string;
3838

3939
// @public
40-
export function getValue(remoteConfig: RemoteConfig, key: string): Value;
40+
export function getValue(remoteConfig: RemoteConfig, key: string): ValueType;
41+
42+
export { RemoteConfig }
43+
44+
export { RemoteConfigLogLevel }
4145

4246
// @public
43-
export function setLogLevel(remoteConfig: RemoteConfig, logLevel: LogLevel): void;
47+
export function setLogLevel(remoteConfig: RemoteConfig, logLevel: RemoteConfigLogLevel): void;
48+
49+
export { ValueType }
4450

4551

4652
// (No @packageDocumentation comment for this package)

packages-exp/analytics-exp/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
"build:doc": "yarn build && yarn doc"
2828
},
2929
"peerDependencies": {
30-
"@firebase/app-exp": "0.x",
31-
"@firebase/app-types-exp": "0.x"
30+
"@firebase/app-exp": "0.x"
3231
},
3332
"dependencies": {
3433
"@firebase/analytics-types-exp": "0.0.900",

0 commit comments

Comments
 (0)