angular · jamesdaniels · Jun 24, 2020 · Jun 24, 2020 · Jun 24, 2020 · Jun 24, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+<a name="6.0.1"></a>
+# [6.0.1](https://github.com/angular/angularfire2/compare/6.0.0...6.0.1) (2020-06-24)
+
+* Updating peer dependencies to allow for Angular 10
+* `ng add @angular/fire` should correctly add the `firebase` peer
+* `ng add @angular/fire` will not duplicate settings entries, if they're already present
+* `ng add @angular/fire` will error if there are peer incompatabilities
+* `ng deploy` should function correctly on Windows devices
+* `ng deploy` will now mark the Angular assets as immutable on Firebase Hosting
+* RTDB and Firestore CRUD operations should return in the ngZone
+* Use of `AngularFireAuthGuard` should no longer destablize Zone.js
+
 <a name="6.0.0"></a>
 # [6.0.0](https://github.com/angular/angularfire2/compare/6.0.0-rc.2...6.0.0) (2020-04-01)
 

diff --git a/docs/performance/getting-started.md b/docs/performance/getting-started.md
@@ -52,12 +52,12 @@ You can inject `AngularFirePerformance` to perform manual traces.
 ```ts
 constructor(private performance: AngularFirePerformance) {}
 
-ngOnInit() {
-  const trace = this.performance.trace('some-trace');
-  trace.start();
-  ...
-  trace.stop();
-}
+...
+
+const trace = await this.performance.trace('some-trace');
+trace.start();
+...
+trace.stop();
 ```
 
 ## RXJS operators

diff --git a/src/database/list/create-reference.ts b/src/database/list/create-reference.ts
@@ -9,12 +9,13 @@ import { map } from 'rxjs/operators';
 
 export function createListReference<T= any>(query: DatabaseQuery, afDatabase: AngularFireDatabase): AngularFireList<T> {
   const outsideAngularScheduler = afDatabase.schedulers.outsideAngular;
+  const refInZone = afDatabase.schedulers.ngZone.run(() => query.ref);
   return {
     query,
-    update: createDataOperationMethod<Partial<T>>(query.ref, 'update'),
-    set: createDataOperationMethod<T>(query.ref, 'set'),
-    push: (data: T) => query.ref.push(data),
-    remove: createRemoveMethod(query.ref),
+    update: createDataOperationMethod<Partial<T>>(refInZone, 'update'),
+    set: createDataOperationMethod<T>(refInZone, 'set'),
+    push: (data: T) => refInZone.push(data),
+    remove: createRemoveMethod(refInZone),
     snapshotChanges(events?: ChildEvent[]) {
       return snapshotChanges<T>(query, events, outsideAngularScheduler).pipe(afDatabase.keepUnstableUntilFirst);
     },

diff --git a/src/firestore/firestore.ts b/src/firestore/firestore.ts
@@ -182,7 +182,8 @@ export class AngularFirestore {
       collectionRef = pathOrRef;
     }
     const { ref, query } = associateQuery(collectionRef, queryFn);
-    return new AngularFirestoreCollection<T>(ref, query, this);
+    const refInZone = this.schedulers.ngZone.run(() => ref);
+    return new AngularFirestoreCollection<T>(refInZone, query, this);
   }
 
   /**
@@ -212,7 +213,8 @@ export class AngularFirestore {
     } else {
       ref = pathOrRef;
     }
-    return new AngularFirestoreDocument<T>(ref, this);
+    const refInZone = this.schedulers.ngZone.run(() => ref);
+    return new AngularFirestoreDocument<T>(refInZone, this);
   }
 
   /**

diff --git a/src/schematics/deploy/actions.ts b/src/schematics/deploy/actions.ts
@@ -183,11 +183,7 @@ export const deployToFunction = async (
       open(`http://localhost:${port}`);
     }, 1500);
 
-<<<<<<< HEAD
-    return firebaseTools.serve({ port, targets: ['hosting', 'functions'] }).then(() =>
-=======
-    return firebaseTools.serve({ port, targets: ["hosting", "functions"], host: 'localhost'}).then(() =>
->>>>>>> 074c477... fix(deploy): undefined:5000 -> localhost:5000
+    return firebaseTools.serve({ port, targets: ['hosting', 'functions'], host: 'localhost'}).then(() =>
       require('inquirer').prompt({
         type: 'confirm',
         name: 'deployProject',