Skip to content

Commit b86bae7

Browse files
jamesdanielsjamesdaniels
authored
chore(release): Release candidate (#2894)
1 parent 05d6014 commit b86bae7

File tree

21 files changed

+680
-875
lines changed

21 files changed

+680
-875
lines changed

‎.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
id: node_modules_cache
3030
with:
3131
path: ./node_modules
32-
key: ${{ runner.os }}-14-beta-node_modules-${{ hashFiles('yarn.lock') }}
32+
key: ${{ runner.os }}-14-next-node_modules-${{ hashFiles('yarn.lock') }}
3333
restore-keys: |
34-
${{ runner.os }}-14-beta-node_modules-
34+
${{ runner.os }}-14-next-node_modules-
3535
${{ runner.os }}-14-node_modules-
3636
- name: Yarn offline cache
3737
if: steps.node_modules_cache.outputs.cache-hit != 'true'
@@ -62,7 +62,7 @@ jobs:
6262
strategy:
6363
matrix:
6464
node: ["12", "14", "16"]
65-
firebase: ["beta"]
65+
firebase: ["next"]
6666
fail-fast: false
6767
name: Test firebase@${{ matrix.firebase }} on Node.js ${{ matrix.node }}
6868
steps:
@@ -113,7 +113,7 @@ jobs:
113113
name: Test firebase@${{ matrix.firebase }} on ${{ matrix.browser }}
114114
strategy:
115115
matrix:
116-
firebase: ["beta"]
116+
firebase: ["next"]
117117
browser: ["chrome", "firefox"]
118118
fail-fast: false
119119
steps:

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@angular/platform-browser": "^12.0.0",
5353
"@angular/platform-browser-dynamic": "^12.0.0",
5454
"@angular/router": "^12.0.0",
55-
"firebase": "9.0.0-beta.8",
55+
"firebase": "9.0.0-202171919375",
5656
"firebase-admin": "^8.10.0",
5757
"firebase-functions": "^3.6.0",
5858
"firebase-tools": "^8.0.0 || ^9.0.0",
@@ -63,7 +63,7 @@
6363
"inquirer-autocomplete-prompt": "^1.0.1",
6464
"jsonc-parser": "^3.0.0",
6565
"open": "^7.0.3",
66-
"rxfire": "6.0.0-canary.92c6c26",
66+
"rxfire": "6.0.0-rc.0",
6767
"rxjs": "~6.6.0",
6868
"semver": "^7.1.3",
6969
"tslib": "^2.1.0",

‎sample-compat/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
"@angular/router": "~12.2.2",
3232
"@angular/service-worker": "~12.2.2",
3333
"core-js": "^3.6.5",
34-
"firebase": "^9.0.0-beta.8",
35-
"rxfire": "6.0.0-canary.92c6c26",
34+
"firebase": "9.0.0-202171919375",
3635
"first-input-delay": "^0.1.3",
3736
"proxy-polyfill": "^0.3.2",
37+
"rxfire": "6.0.0-rc.0",
3838
"rxjs": "~6.6.0",
3939
"tslib": "^2.1.0",
4040
"whatwg-fetch": "^3.4.1",
@@ -73,4 +73,4 @@
7373
"typescript": "~4.2.3",
7474
"webpack-bundle-analyzer": "^4.4.1"
7575
}
76-
}
76+
}

‎sample-compat/yarn.lock

+196-279
Large diffs are not rendered by default.

‎sample/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"@angular/platform-browser": "^12.0.0",
2323
"@angular/platform-browser-dynamic": "^12.0.0",
2424
"@angular/router": "^12.0.0",
25-
"firebase": "9.0.0-beta.8",
25+
"firebase": "9.0.0-202171919375",
2626
"lodash.isequal": "^4.5.0",
27-
"rxfire": "6.0.0-canary.92c6c26",
27+
"rxfire": "6.0.0-rc.0",
2828
"rxjs": "~6.6.0",
2929
"tslib": "^2.1.0",
3030
"zone.js": "~0.11.4"

‎sample/src/app/app.component.ts

+40-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
import { ApplicationRef, Component, NgZone } from '@angular/core';
22
import { FirebaseApp, FirebaseApps } from '@angular/fire/app';
33
import { Auth, AuthInstances, authState } from '@angular/fire/auth';
4-
import { Firestore, FirestoreInstances, getDoc, doc, DocumentSnapshot } from '@angular/fire/firestore/lite';
4+
import { Firestore as FirestoreLite, FirestoreInstances as FirestoreLiteInstances, getDoc, doc, DocumentSnapshot } from '@angular/fire/firestore/lite';
5+
import { Firestore, FirestoreInstances } from '@angular/fire/firestore';
56
import { DocumentData } from 'rxfire/firestore/lite/interfaces';
67
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
8+
import { Storage, StorageInstances } from '@angular/fire/storage';
9+
import { Messaging, MessagingInstances } from '@angular/fire/messaging';
10+
import { RemoteConfig, RemoteConfigInstances } from '@angular/fire/remote-config';
11+
import { Functions, FunctionsInstances } from '@angular/fire/functions';
12+
import { Database, DatabaseInstances } from '@angular/fire/database';
13+
import { Analytics, AnalyticsInstances } from '@angular/fire/analytics';
14+
import { Performance, PerformanceInstances } from '@angular/fire/performance';
715

816
@Component({
917
selector: 'app-root',
@@ -17,19 +25,42 @@ export class AppComponent {
1725
myDocData: Promise<DocumentSnapshot<DocumentData>>;
1826
title = 'sample';
1927
constructor(
20-
public app: FirebaseApp, // default Firebase App
21-
public auth: Auth, // default Firbase Auth
22-
public apps: FirebaseApps, // all initialized App instances
23-
public authInstances: AuthInstances, // all initialized Auth instances
24-
public firestore: Firestore,
25-
public firestoreInstances: FirestoreInstances,
28+
app: FirebaseApp, // default Firebase App
29+
auth: Auth, // default Firbase Auth
30+
apps: FirebaseApps, // all initialized App instances
31+
authInstances: AuthInstances, // all initialized Auth instances
32+
firestoreLite: FirestoreLite,
33+
firestoreLiteInstances: FirestoreLiteInstances,
34+
firestore: Firestore,
35+
firestoreInstances: FirestoreInstances,
36+
storage: Storage,
37+
storageInstances: StorageInstances,
38+
messaging: Messaging,
39+
messagingInstances: MessagingInstances,
40+
remoteConfig: RemoteConfig,
41+
remoteConfigInstances: RemoteConfigInstances,
42+
functions: Functions,
43+
functionsInstances: FunctionsInstances,
44+
database: Database,
45+
databaseInstances: DatabaseInstances,
46+
analytics: Analytics,
47+
analyticsInstances: AnalyticsInstances,
48+
performance: Performance,
49+
performanceInstances: PerformanceInstances,
2650
appRef: ApplicationRef,
2751
zone: NgZone,
2852
) {
29-
console.log({app, auth, apps, authInstances, firestore, firestoreInstances });
53+
console.log({
54+
app, auth, apps, authInstances, firestore, firestoreInstances,
55+
firestoreLite, firestoreLiteInstances, storage, storageInstances,
56+
messaging, messagingInstances, performance, performanceInstances,
57+
analytics, analyticsInstances, functions, functionsInstances, database,
58+
databaseInstances, remoteConfig, remoteConfigInstances
59+
});
3060
authState(auth).subscribe(it => console.log('authState', it));
3161
appRef.isStable.pipe(distinctUntilChanged()).subscribe(it => console.log('isStable', it));
32-
this.myDocData = getDoc(doc(firestore, 'animals/NJdGQCv1P92SWsp4nSE7'));
62+
this.myDocData = getDoc(doc(firestoreLite, 'animals/NJdGQCv1P92SWsp4nSE7'));
63+
console.log((app as any).container);
3364
// firestoreInstance$.subscribe(it => console.log('$', it));
3465
// initializeFirestore$.subscribe(it => console.log('init', it));
3566
}

‎sample/src/app/app.module.ts

+22-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@ import { provideAuth, initializeAuth } from '@angular/fire/auth';
55
import { AppRoutingModule } from './app-routing.module';
66
import { AppComponent } from './app.component';
77
import { environment } from '../environments/environment';
8-
import { provideFirestore, getFirestore } from '@angular/fire/firestore/lite';
8+
import { provideFirestore as provideFirestoreLite, getFirestore as getFirestoreLite } from '@angular/fire/firestore/lite';
9+
import { getFirestore, provideFirestore } from '@angular/fire/firestore';
10+
import { getMessaging, provideMessaging } from '@angular/fire/messaging';
11+
import { getRemoteConfig, provideRemoteConfig } from '@angular/fire/remote-config';
12+
import { getStorage, provideStorage } from '@angular/fire/storage';
13+
import { getAnalytics, provideAnalytics } from '@angular/fire/analytics';
14+
import { getDatabase, provideDatabase } from '@angular/fire/database';
15+
import { getPerformance, providePerformance } from '@angular/fire/performance';
16+
import { getFunctions, provideFunctions } from '@angular/fire/functions';
917

1018
@NgModule({
1119
declarations: [
@@ -14,14 +22,26 @@ import { provideFirestore, getFirestore } from '@angular/fire/firestore/lite';
1422
imports: [
1523
BrowserModule,
1624
AppRoutingModule,
17-
provideFirebaseApp(() => initializeApp(environment.firebase)),
25+
provideFirebaseApp(() => {
26+
const app = initializeApp(environment.firebase);
27+
console.log(app);
28+
return app;
29+
}),
1830
provideFirebaseApp(() => {
1931
const app = initializeApp(environment.firebase, 'second');
2032
app.automaticDataCollectionEnabled = false;
2133
return app;
2234
}),
2335
provideAuth(() => initializeAuth(getApp())),
2436
provideFirestore(() => getFirestore()),
37+
provideFirestoreLite(() => getFirestoreLite()),
38+
provideDatabase(() => getDatabase()),
39+
provideRemoteConfig(() => getRemoteConfig()),
40+
provideStorage(() => getStorage()),
41+
provideAnalytics(() => getAnalytics()),
42+
provideMessaging(() => getMessaging()),
43+
providePerformance(() => getPerformance()),
44+
provideFunctions(() => getFunctions()),
2545
],
2646
providers: [ ],
2747
bootstrap: [AppComponent]

0 commit comments

Comments
 (0)