Skip to content

Commit f4ca651

Browse files
committed
Zone wrapping rxfire exports
1 parent b72a87b commit f4ca651

Some content is hidden

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

53 files changed

+1142
-922
lines changed

.gitignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ tools/build.js
1919
coverage
2020
*.log
2121
api-*.json
22-
src/**/base.ts
2322
angularfire.tgz
2423
unpack.sh
25-
publish.sh
24+
publish.sh
25+
26+
# auto-gen files
27+
src/compat/**/base.ts
28+
src/**/rxfire.ts

package.json

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

sample/package.json

+14-13
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,27 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "~12.0.0-rc.0",
17-
"@angular/common": "~12.0.0-rc.0",
18-
"@angular/compiler": "~12.0.0-rc.0",
19-
"@angular/core": "~12.0.0-rc.0",
16+
"@angular/animations": "^12.0.0",
17+
"@angular/common": "^12.0.0",
18+
"@angular/compiler": "^12.0.0",
19+
"@angular/core": "^12.0.0",
2020
"@angular/fire": "../dist/packages-dist",
21-
"@angular/forms": "~12.0.0-rc.0",
22-
"@angular/platform-browser": "~12.0.0-rc.0",
23-
"@angular/platform-browser-dynamic": "~12.0.0-rc.0",
24-
"@angular/router": "~12.0.0-rc.0",
25-
"firebase": "^9.0.0-beta.1",
21+
"@angular/forms": "^12.0.0",
22+
"@angular/platform-browser": "^12.0.0",
23+
"@angular/platform-browser-dynamic": "^12.0.0",
24+
"@angular/router": "^12.0.0",
25+
"firebase": "9.0.0-beta.2",
2626
"lodash.isequal": "^4.5.0",
27+
"rxfire": "6.0.0-canary.da26625",
2728
"rxjs": "~6.6.0",
2829
"tslib": "^2.1.0",
2930
"zone.js": "~0.11.4"
3031
},
3132
"devDependencies": {
32-
"@angular-devkit/architect": ">= 0.900 < 0.1200",
33-
"@angular-devkit/build-angular": "~12.0.0-rc.0",
34-
"@angular/cli": "~12.0.0-rc.0",
35-
"@angular/compiler-cli": "~12.0.0-rc.0",
33+
"@angular-devkit/architect": "^0.1200.0",
34+
"@angular-devkit/build-angular": "^12.0.0",
35+
"@angular/cli": "^12.0.0",
36+
"@angular/compiler-cli": "^12.0.0",
3637
"@types/jasmine": "~3.6.0",
3738
"@types/node": "^12.11.1",
3839
"firebase-tools": "^8.0.0",

sample/src/app/app.component.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
import { Component, Inject, Optional } from '@angular/core';
1+
import { ApplicationRef, Component, Inject, Optional } from '@angular/core';
22
import { FirebaseApp, Auth, AUTH_INSTANCES, FIREBASE_APPS } from '@angular/fire';
3+
import { authState } from '@angular/fire/auth';
4+
import { debounceTime } from 'rxjs/operators';
35

46
@Component({
57
selector: 'app-root',
@@ -35,7 +37,12 @@ export class AppComponent {
3537
public auth: Auth, // default Firbase Auth
3638
@Inject(FIREBASE_APPS) public apps: FirebaseApp[], // all initialized App instances
3739
@Optional() @Inject(AUTH_INSTANCES) public authInstances: Auth[], // all initialized Auth instances
40+
appRef: ApplicationRef,
3841
) {
3942
console.log(app, auth, apps, authInstances, 'hi!...');
43+
// onAuthStateChanged should destablize the zone
44+
// onAuthStateChanged(auth, it => console.log('onAuthStateChanged', it));
45+
authState(auth).subscribe(it => console.log('authState', it));
46+
appRef.isStable.pipe(debounceTime(200)).subscribe(it => console.log('isStable', it));
4047
}
4148
}

sample/src/app/app.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
33
import { provideFirebaseApp, provideAuth } from '@angular/fire';
44
import { initializeApp, getApp } from 'firebase/app';
5-
import { initializeAuth } from '@firebase/auth';
5+
import { initializeAuth, getAuth } from '@firebase/auth';
66

77
import { AppRoutingModule } from './app-routing.module';
88
import { AppComponent } from './app.component';
@@ -21,7 +21,7 @@ import { environment } from '../environments/environment';
2121
app.automaticDataCollectionEnabled = false;
2222
return app;
2323
}),
24-
provideAuth(() => initializeAuth(getApp())),
24+
provideAuth(() => getAuth()),
2525
provideAuth(() => {
2626
const auth = initializeAuth(getApp('second'));
2727
auth.useDeviceLanguage();

0 commit comments

Comments
 (0)