Skip to content

Commit 4d9e9b0

Browse files
committed
move next types to @firebase/app-types/next
1 parent 4fdc2db commit 4d9e9b0

File tree

11 files changed

+51
-69
lines changed

11 files changed

+51
-69
lines changed

packages/app-types/next/index.d.ts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import { ComponentContainer } from '@firebase/component';
2+
3+
export interface FirebaseAppNext {
4+
/**
5+
* The (read-only) name (identifier) for this App. '[DEFAULT]' is the default
6+
* App.
7+
*/
8+
readonly name: string;
9+
10+
/**
11+
* The (read-only) configuration options from the app initialization.
12+
*/
13+
readonly options: FirebaseOptionsNext;
14+
15+
/**
16+
* The settable config flag for GDPR opt-in/opt-out
17+
*/
18+
automaticDataCollectionEnabled: boolean;
19+
}
20+
21+
export interface FirebaseAppInternalNext extends FirebaseAppNext {
22+
container: ComponentContainer;
23+
isDeleted: boolean;
24+
checkDestroyed(): void;
25+
}
26+
27+
export interface FirebaseOptionsNext {
28+
apiKey?: string;
29+
authDomain?: string;
30+
databaseURL?: string;
31+
projectId?: string;
32+
storageBucket?: string;
33+
messagingSenderId?: string;
34+
appId?: string;
35+
measurementId?: string;
36+
}
37+
38+
export interface FirebaseAppConfigNext {
39+
name?: string;
40+
automaticDataCollectionEnabled?: boolean;
41+
}

packages/app/src/compat/firebaseApp.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
} from '@firebase/app-types/private';
2424
import { Component, ComponentType, Name } from '@firebase/component';
2525
import { DEFAULT_ENTRY_NAME } from '../constants';
26-
import { FirebaseAppInternalNext } from '../next/types';
26+
import { FirebaseAppInternalNext } from '@firebase/app-types/next';
2727
import { deleteApp } from '../next';
2828
import { addComponent, addOrOverwriteComponent } from '../next/internal';
2929

@@ -102,8 +102,7 @@ export class FirebaseAppImpl implements FirebaseApp {
102102
instanceIdentifier: string = DEFAULT_ENTRY_NAME
103103
): void {
104104
// eslint-disable-next-line @typescript-eslint/no-explicit-any
105-
this.app.container
106-
.getProvider(name as any)
105+
this.app.container.getProvider(name as any)
107106
.clearInstance(instanceIdentifier);
108107
}
109108

packages/app/src/compat/firebaseNamespaceCore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { FirebaseAppLiteImpl } from './lite/firebaseAppLite';
3333
import { DEFAULT_ENTRY_NAME } from '../constants';
3434
import { Component, ComponentType } from '@firebase/component';
3535
import { SDK_VERSION, initializeApp, registerVersion } from '../next';
36-
import { FirebaseAppInternalNext } from '../next/types';
36+
import { FirebaseAppInternalNext } from '@firebase/app-types/next';
3737
import { registerComponent } from '../next/internal';
3838

3939
/**

packages/app/src/compat/lite/firebaseAppLite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
} from '@firebase/app-types/private';
2424
import { DEFAULT_ENTRY_NAME } from '../../constants';
2525
import { Component, ComponentType, Name } from '@firebase/component';
26-
import { FirebaseAppInternalNext } from '../../next/types';
26+
import { FirebaseAppInternalNext } from '@firebase/app-types/next';
2727
import { addComponent } from '../../next/internal';
2828
import { deleteApp } from '../../next';
2929

packages/app/src/next/api.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
registerVersion
2727
} from './api';
2828
import { DEFAULT_ENTRY_NAME } from '../constants';
29-
import { FirebaseAppInternalNext } from './types';
29+
import { FirebaseAppInternalNext } from '@firebase/app-types/next';
3030
import { clearComponents, components, registerComponent } from './internal';
3131
import { createTestComponent } from '../../test/util';
3232

packages/app/src/next/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
FirebaseOptionsNext,
2121
FirebaseAppConfigNext,
2222
FirebaseAppInternalNext
23-
} from './types';
23+
} from '@firebase/app-types/next';
2424
import { DEFAULT_ENTRY_NAME, PLATFORM_LOG_STRING } from '../constants';
2525
import { ERROR_FACTORY, AppError } from '../errors';
2626
import {

packages/app/src/next/firebaseApp.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { expect } from 'chai';
1919
import '../../test/setup';
2020
import { FirebaseAppImplNext } from './firebaseApp';
2121
import { ComponentContainer } from '@firebase/component';
22-
import { FirebaseAppInternalNext } from './types';
22+
import { FirebaseAppInternalNext } from '@firebase/app-types/next';
2323

2424
describe('FirebaseAppNext', () => {
2525
it('has various accessors', () => {

packages/app/src/next/firebaseApp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
FirebaseAppNext,
2020
FirebaseOptionsNext,
2121
FirebaseAppConfigNext
22-
} from './types';
22+
} from '@firebase/app-types/next';
2323
import { ComponentContainer } from '@firebase/component';
2424
import { ERROR_FACTORY, AppError } from '../errors';
2525

packages/app/src/next/internal.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
components,
2828
clearComponents
2929
} from './internal';
30-
import { FirebaseAppInternalNext } from './types';
30+
import { FirebaseAppInternalNext } from '@firebase/app-types/next';
3131

3232
declare module '@firebase/component' {
3333
interface NameServiceMapping {

packages/app/src/next/internal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { FirebaseAppInternalNext, FirebaseAppNext } from './types';
18+
import { FirebaseAppInternalNext, FirebaseAppNext } from '@firebase/app-types/next';
1919
import { Component } from '@firebase/component';
2020
import { logger } from '../logger';
2121

packages/app/src/next/types.ts

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)