Skip to content

Commit 843c78e

Browse files
jamesdanielsjamesdaniels
committed
Updating things
1 parent 40bb84d commit 843c78e

File tree

19 files changed

+1309
-1909
lines changed

19 files changed

+1309
-1909
lines changed

‎package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,29 @@
4343
"@angular/platform-browser": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
4444
"@angular/platform-browser-dynamic": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
4545
"@angular/router": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
46-
"firebase": ">= 7.6.1 <8",
46+
"firebase": "^7.6.2",
4747
"firebase-tools": "^7.11.0",
4848
"fuzzy": "^0.1.3",
4949
"inquirer": "^6.2.2",
5050
"inquirer-autocomplete-prompt": "^1.0.1",
51+
"rxfire": "^3.9.7",
5152
"rxjs": "^6.5.3",
52-
"ws": "^3.3.2",
53-
"xhr2": "^0.1.4",
5453
"tslib": "^1.10.0",
54+
"ws": "^7.2.1",
55+
"xhr2": "^0.1.4",
5556
"zone.js": "~0.10.2"
5657
},
5758
"optionalDependencies": {
58-
"bufferutil": "~3.0.0",
59-
"utf-8-validate": "~4.0.0"
59+
"bufferutil": "^4.0.1",
60+
"utf-8-validate": "^5.0.2"
6061
},
6162
"devDependencies": {
62-
"@angular/animations": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
63-
"@angular/compiler-cli": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
64-
"@angular/platform-server": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
6563
"@angular-devkit/build-angular": "^0.900.0-0 || ^0.900.0",
6664
"@angular-devkit/build-ng-packagr": "^0.900.0-0 || ^0.900.0",
65+
"@angular/animations": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
6766
"@angular/cli": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
67+
"@angular/compiler-cli": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
68+
"@angular/platform-server": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
6869
"@types/fs-extra": "^7.0.0",
6970
"@types/gzip-size": "^5.1.1",
7071
"@types/inquirer": "^0.0.44",
@@ -94,10 +95,10 @@
9495
"systemjs": "^0.19.16",
9596
"systemjs-builder": "^0.15.7",
9697
"traceur": "0.0.96",
97-
"typescript": "~3.6.4",
9898
"tsconfig-paths": "^3.8.0",
9999
"tsickle": "^0.35.0",
100-
"tslint": "^5.17.0"
100+
"tslint": "^5.17.0",
101+
"typescript": "~3.6.4"
101102
},
102103
"typings": "index.d.ts"
103104
}

‎src/analytics/analytics.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Injectable, Inject, Optional, NgZone, InjectionToken, PLATFORM_ID } from '@angular/core';
2-
import { of } from 'rxjs';
2+
import { of, empty, throwError } from 'rxjs';
33
import { isPlatformBrowser } from '@angular/common';
4-
import { map, tap, shareReplay, switchMap } from 'rxjs/operators';
4+
import { map, tap, shareReplay, switchMap, catchError } from 'rxjs/operators';
55
import { FirebaseAppConfig, FirebaseOptions, ɵrunOutsideAngular, ɵlazySDKProxy, FIREBASE_OPTIONS, FIREBASE_APP_NAME, ɵfirebaseAppFactory, PromiseProxy } from '@angular/fire';
66
import { analytics } from 'firebase';
77

@@ -74,6 +74,7 @@ export class AngularFireAnalytics {
7474
const analytics = of(undefined).pipe(
7575
// @ts-ignore zapping in the UMD in the build script
7676
switchMap(() => zone.runOutsideAngular(() => import('firebase/analytics'))),
77+
catchError(err => err.message === 'Not supported' ? empty() : throwError(err) ),
7778
map(() => ɵfirebaseAppFactory(options, zone, nameOrConfig)),
7879
map(app => app.analytics()),
7980
tap(analytics => {

‎src/analytics/index.spec.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/auth/auth.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } f
55
import { AngularFireAuth, AngularFireAuthModule } from '@angular/fire/auth';
66
import { COMMON_CONFIG } from '../test-config';
77
import { take, skip } from 'rxjs/operators';
8+
import 'firebase/auth';
89

910
function authTake(auth: Observable<any>, count: number): Observable<any> {
1011
return take.call(auth, 1);

‎src/database/database.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AngularFireDatabase, AngularFireDatabaseModule, URL } from '@angular/fi
33
import { TestBed, inject } from '@angular/core/testing';
44
import { COMMON_CONFIG } from '../test-config';
55
import { NgZone } from '@angular/core';
6+
import 'firebase/database';
67

78
// generate random string to test fidelity of naming
89
const APP_NAME = (Math.random() + 1).toString(36).substring(7);
@@ -57,7 +58,7 @@ describe('AngularFireDatabase', () => {
5758
});
5859

5960
const FIREBASE_APP_NAME_TOO = (Math.random() + 1).toString(36).substring(7);
60-
const FIREBASE_DB_NAME = `https://angularfire2-test2.firebaseio.com/`;
61+
const FIREBASE_DB_NAME = 'http://localhost:9000/';
6162
const QUERY = (Math.random() + 1).toString(36).substring(7)
6263

6364
describe('AngularFireDatabase w/options', () => {

‎src/database/list/audit-trail.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { AngularFireDatabase, AngularFireDatabaseModule, auditTrail, ChildEvent,
44
import { TestBed, inject } from '@angular/core/testing';
55
import { COMMON_CONFIG } from '../../test-config';
66
import { skip } from 'rxjs/operators';
7+
import 'firebase/database';
78

89
// generate random string to test fidelity of naming
910
const rando = () => (Math.random() + 1).toString(36).substring(7);
@@ -35,8 +36,7 @@ describe('auditTrail', () => {
3536
inject([FirebaseApp, AngularFireDatabase], (app_: FirebaseApp, _db: AngularFireDatabase) => {
3637
app = app_;
3738
db = _db;
38-
app.database().goOffline();
39-
createRef = (path: string) => { app.database().goOffline(); return app.database().ref(path); };
39+
createRef = (path: string) => app.database().ref(path);
4040
})();
4141
});
4242

‎src/database/list/changes.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { AngularFireDatabase, AngularFireDatabaseModule, listChanges, URL } from
44
import { TestBed, inject } from '@angular/core/testing';
55
import { COMMON_CONFIG } from '../../test-config';
66
import { skip, take } from 'rxjs/operators';
7+
import 'firebase/database';
78

89
// generate random string to test fidelity of naming
910
const rando = () => (Math.random() + 1).toString(36).substring(7);
@@ -35,8 +36,7 @@ describe('listChanges', () => {
3536
inject([FirebaseApp, AngularFireDatabase], (app_: FirebaseApp, _db: AngularFireDatabase) => {
3637
app = app_;
3738
db = _db;
38-
app.database().goOffline();
39-
ref = (path: string) => { app.database().goOffline(); return app.database().ref(path); };
39+
ref = (path: string) => app.database().ref(path);
4040
})();
4141
});
4242

‎src/database/list/snapshot-changes.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { TestBed, inject } from '@angular/core/testing';
55
import { COMMON_CONFIG } from '../../test-config';
66
import { BehaviorSubject } from 'rxjs';
77
import { skip, take, switchMap } from 'rxjs/operators';
8+
import 'firebase/database';
89

910
// generate random string to test fidelity of naming
1011
const rando = () => (Math.random() + 1).toString(36).substring(7);
@@ -36,8 +37,7 @@ describe('snapshotChanges', () => {
3637
inject([FirebaseApp, AngularFireDatabase], (app_: FirebaseApp, _db: AngularFireDatabase) => {
3738
app = app_;
3839
db = _db;
39-
app.database().goOffline();
40-
createRef = (path: string) => { app.database().goOffline(); return app.database().ref(path); };
40+
createRef = (path: string) => app.database().ref(path);;
4141
})();
4242
});
4343

‎src/database/list/state-changes.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { AngularFireDatabase, AngularFireDatabaseModule, stateChanges, ChildEven
44
import { TestBed, inject } from '@angular/core/testing';
55
import { COMMON_CONFIG } from '../../test-config';
66
import { skip } from 'rxjs/operators';
7+
import 'firebase/database';
78

89
// generate random string to test fidelity of naming
910
const rando = () => (Math.random() + 1).toString(36).substring(7);
@@ -35,8 +36,7 @@ describe('stateChanges', () => {
3536
inject([FirebaseApp, AngularFireDatabase], (app_: FirebaseApp, _db: AngularFireDatabase) => {
3637
app = app_;
3738
db = _db;
38-
app.database().goOffline();
39-
createRef = (path: string) => { app.database().goOffline(); return app.database().ref(path); };
39+
createRef = (path: string) => app.database().ref(path);
4040
})();
4141
});
4242

‎src/database/observable/fromRef.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { AngularFireDatabase, AngularFireDatabaseModule, fromRef, URL } from '@a
44
import { TestBed, inject } from '@angular/core/testing';
55
import { COMMON_CONFIG } from '../../test-config';
66
import { take } from 'rxjs/operators';
7+
import 'firebase/database';
78

89
// generate random string to test fidelity of naming
910
const rando = () => (Math.random() + 1).toString(36).substring(7);
@@ -33,8 +34,7 @@ describe('fromRef', () => {
3334
});
3435
inject([FirebaseApp], (app_: FirebaseApp) => {
3536
app = app_;
36-
app.database().goOffline();
37-
ref = (path: string) => { app.database().goOffline(); return app.database().ref(path); };
37+
ref = (path: string) => app.database().ref(path);
3838
})();
3939
});
4040

‎src/firestore/collection-group/collection-group.spec.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import { FirebaseApp, AngularFireModule } from '@angular/fire';
2-
import { AngularFirestore, SETTINGS } from '../firestore';
3-
import { AngularFirestoreModule } from '../firestore.module';
4-
import { AngularFirestoreDocument } from '../document/document';
5-
import { AngularFirestoreCollectionGroup } from './collection-group';
2+
import { AngularFirestore, AngularFirestoreModule, AngularFirestoreDocument, AngularFirestoreCollectionGroup, SETTINGS } from '@angular/fire/firestore';
63
import { QueryGroupFn, Query } from '../interfaces';
74
import { Observable, BehaviorSubject, Subscription } from 'rxjs';
85
import { skip, take, switchMap } from 'rxjs/operators';
9-
106
import { TestBed, inject } from '@angular/core/testing';
117
import { FIRESTORE_CONFIG } from '../../test-config';
8+
import 'firebase/firestore';
129

1310
import { Stock, randomName, FAKE_STOCK_DATA, createRandomStocks, delayAdd, delayDelete, delayUpdate, deleteThemAll } from '../utils.spec';
1411

‎src/firestore/collection/collection.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { AngularFirestoreCollection } from './collection';
55
import { QueryFn } from '../interfaces';
66
import { Observable, BehaviorSubject, Subscription } from 'rxjs';
77
import { skip, take, switchMap } from 'rxjs/operators';
8+
import 'firebase/firestore';
89

910
import { TestBed, inject } from '@angular/core/testing';
1011
import { FIRESTORE_CONFIG } from '../../test-config';

‎src/firestore/document/document.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { TestBed, inject } from '@angular/core/testing';
99
import { FIRESTORE_CONFIG } from '../../test-config';
1010

1111
import { Stock, randomName, FAKE_STOCK_DATA } from '../utils.spec';
12+
import 'firebase/firestore';
1213

1314
describe('AngularFirestoreDocument', () => {
1415
let app: FirebaseApp;

‎src/firestore/firestore.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { Observable, Subscription } from 'rxjs';
88

99
import { TestBed, inject } from '@angular/core/testing';
1010
import { FIRESTORE_CONFIG } from '../test-config';
11+
import 'firebase/firestore';
1112

1213
interface Stock {
1314
name: string;

‎src/functions/functions.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { TestBed, inject } from '@angular/core/testing';
22
import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
33
import { AngularFireFunctions, AngularFireFunctionsModule, REGION, ORIGIN } from '@angular/fire/functions';
44
import { COMMON_CONFIG } from '../test-config';
5+
import 'firebase/functions';
56

67
describe('AngularFireFunctions', () => {
78
let app: FirebaseApp;

‎src/remote-config/index.spec.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/remote-config/remote-config.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Injectable, Inject, Optional, NgZone, InjectionToken } from '@angular/core';
2-
import { Observable, concat, of, pipe, OperatorFunction, MonoTypeOperatorFunction } from 'rxjs';
3-
import { map, switchMap, tap, shareReplay, distinctUntilChanged, filter, groupBy, mergeMap, scan, withLatestFrom, startWith, debounceTime } from 'rxjs/operators';
2+
import { Observable, concat, of, pipe, OperatorFunction, MonoTypeOperatorFunction, empty, throwError } from 'rxjs';
3+
import { map, switchMap, tap, shareReplay, distinctUntilChanged, filter, groupBy, mergeMap, scan, withLatestFrom, startWith, debounceTime, catchError } from 'rxjs/operators';
44
import { FirebaseAppConfig, FirebaseOptions, ɵlazySDKProxy, FIREBASE_OPTIONS, FIREBASE_APP_NAME, PromiseProxy } from '@angular/fire';
55
import { remoteConfig } from 'firebase/app';
66
import { ɵfirebaseAppFactory, ɵrunOutsideAngular } from '@angular/fire';
@@ -58,6 +58,7 @@ export class AngularFireRemoteConfig {
5858
const remoteConfig$ = of(undefined).pipe(
5959
// @ts-ignore zapping in the UMD in the build script
6060
switchMap(() => zone.runOutsideAngular(() => import('firebase/remote-config'))),
61+
catchError(err => err.message === 'Not supported' ? empty() : throwError(err) ),
6162
map(() => ɵfirebaseAppFactory(options, zone, nameOrConfig)),
6263
map(app => app.remoteConfig()),
6364
tap(rc => {

‎src/storage/storage.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { TestBed, inject } from '@angular/core/testing';
44
import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
55
import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, BUCKET } from '@angular/fire/storage';
66
import { COMMON_CONFIG } from '../test-config';
7+
import 'firebase/storage';
78

89
describe('AngularFireStorage', () => {
910
let app: FirebaseApp;

0 commit comments

Comments
 (0)