Skip to content

rename imports to avoid conflicts #5534

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

Merged
merged 2 commits into from
Sep 23, 2021
Merged

rename imports to avoid conflicts #5534

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fff29f6
rename imports to avoid conflicts
Feiyang1 Sep 22, 2021
62a2cfc
update comment
Feiyang1 Sep 22, 2021
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
17 changes: 9 additions & 8 deletions packages/database-compat/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ import { enableLogging } from '@firebase/database';
import * as types from '@firebase/database-types';

import { name, version } from '../package.json';
import { Database } from '../src/api/Database';
import { Database as DatabaseCompat } from '../src/api/Database';
import * as INTERNAL from '../src/api/internal';
import { DataSnapshot, Query, Reference } from '../src/api/Reference';
// rename the imports to avoid conflicts with imports that will be added by "yarn add-compat-overloads" during a release build
import { DataSnapshot as DataSnapshotCompat, Query as QueryCompat, Reference } from '../src/api/Reference';

const ServerValue = Database.ServerValue;
const ServerValue = DatabaseCompat.ServerValue;

export function registerDatabase(instance: FirebaseNamespace) {
// Register the Database Service with the 'firebase' namespace.
Expand All @@ -43,17 +44,17 @@ export function registerDatabase(instance: FirebaseNamespace) {
const databaseExp = container
.getProvider('database')
.getImmediate({ identifier: url });
return new Database(databaseExp, app);
return new DatabaseCompat(databaseExp, app);
},
ComponentType.PUBLIC
)
.setServiceProps(
// firebase.database namespace properties
{
Reference,
Query,
Database,
DataSnapshot,
Query: QueryCompat,
Database: DatabaseCompat,
DataSnapshot: DataSnapshotCompat,
enableLogging,
INTERNAL,
ServerValue
Expand All @@ -69,7 +70,7 @@ registerDatabase(firebase);

// Types to export for the admin SDK. They are exported here in the browser entry point only for types
// The same symbol should be exported from the node entry point so their values can be accessed at runtime by admin SDK
export { Database, Query, Reference, enableLogging, ServerValue, DataSnapshot };
export { DatabaseCompat as Database, QueryCompat as Query, Reference, enableLogging, ServerValue, DataSnapshotCompat as DataSnapshot };
export { OnDisconnect } from '@firebase/database';

declare module '@firebase/app-compat' {
Expand Down