File tree

133 files changed

+467
-364
lines changed

Some content is hidden

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

133 files changed

+467
-364
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
*.spec.*
22
test-config.*
3-
publish.sh
3+
publish.sh
4+
*.min.js
5+
*.min.js.map
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"test:typings": "node ./tools/run-typings-test.js",
1414
"test:build": "bash ./test/ng-build/build.sh",
1515
"test:all": "npm run test:node && npm run test:chrome-headless && npm run test:typings && npm run test:build",
16-
"build": "ttsc -p tsconfig.build.json; node ./tools/build.js",
16+
"build": "ttsc -p tsconfig.build.json; node --trace-warnings ./tools/build.js",
1717
"build:jasmine": "tsc -p tsconfig.jasmine.json; cp ./dist/packages-dist/schematics/versions.json ./dist/out-tsc/jasmine/schematics",
1818
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1"
1919
},
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ global['WebSocket'] = require('ws');
1515
/* tslint:enable:no-string-literal */
1616

1717
// include the protos required to bundle firestore
18-
import 'dir-loader!./firestore-protos';
18+
// import 'dir-loader!./firestore-protos';
1919

2020
// The Express app is exported so that it can be used by serverless Functions.
2121
export function app() {
@@ -36,7 +36,7 @@ export function app() {
3636
// Serve static files from /browser
3737
server.get('*.*', express.static(distFolder, {
3838
maxAge: '1y'
39-
}));
39+
}) as any); // TODO fix express types
4040

4141
// All regular routes use the Universal engine
4242
server.get('*', (req, res) => {
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ApplicationRef, Component } from '@angular/core';
2-
import { FirebaseApp } from '@angular/fire';
2+
import { FirebaseApp } from '@angular/fire/compat';
33
import { debounceTime } from 'rxjs/operators';
44

55
@Component({
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { AppComponent } from './app.component';
66
import { ServiceWorkerModule } from '@angular/service-worker';
77
import { environment } from '../environments/environment';
88

9-
import { AngularFireModule } from '@angular/fire';
9+
import { AngularFireModule } from '@angular/fire/compat';
1010

1111
import {
1212
AngularFireAnalyticsModule,
@@ -16,17 +16,17 @@ import {
1616
ScreenTrackingService,
1717
UserTrackingService,
1818
COLLECTION_ENABLED
19-
} from '@angular/fire/analytics';
19+
} from '@angular/fire/compat/analytics';
2020

2121
import { FirestoreComponent } from './firestore/firestore.component';
22-
import { AngularFireDatabaseModule, USE_EMULATOR as USE_DATABASE_EMULATOR } from '@angular/fire/database';
23-
import { AngularFirestoreModule, USE_EMULATOR as USE_FIRESTORE_EMULATOR, SETTINGS as FIRESTORE_SETTINGS } from '@angular/fire/firestore';
24-
import { AngularFireStorageModule } from '@angular/fire/storage';
25-
import { AngularFireAuthModule, USE_DEVICE_LANGUAGE, USE_EMULATOR as USE_AUTH_EMULATOR } from '@angular/fire/auth';
26-
import { AngularFireMessagingModule, SERVICE_WORKER, VAPID_KEY } from '@angular/fire/messaging';
27-
import { AngularFireFunctionsModule, USE_EMULATOR as USE_FUNCTIONS_EMULATOR, ORIGIN as FUNCTIONS_ORIGIN, NEW_ORIGIN_BEHAVIOR } from '@angular/fire/functions';
28-
import { AngularFireRemoteConfigModule, SETTINGS as REMOTE_CONFIG_SETTINGS, DEFAULTS as REMOTE_CONFIG_DEFAULTS } from '@angular/fire/remote-config';
29-
import { AngularFirePerformanceModule, PerformanceMonitoringService } from '@angular/fire/performance';
22+
import { AngularFireDatabaseModule, USE_EMULATOR as USE_DATABASE_EMULATOR } from '@angular/fire/compat/database';
23+
import { AngularFirestoreModule, USE_EMULATOR as USE_FIRESTORE_EMULATOR, SETTINGS as FIRESTORE_SETTINGS } from '@angular/fire/compat/firestore';
24+
import { AngularFireStorageModule } from '@angular/fire/compat/storage';
25+
import { AngularFireAuthModule, USE_DEVICE_LANGUAGE, USE_EMULATOR as USE_AUTH_EMULATOR } from '@angular/fire/compat/auth';
26+
import { AngularFireMessagingModule, SERVICE_WORKER, VAPID_KEY } from '@angular/fire/compat/messaging';
27+
import { AngularFireFunctionsModule, USE_EMULATOR as USE_FUNCTIONS_EMULATOR, ORIGIN as FUNCTIONS_ORIGIN } from '@angular/fire/compat/functions';
28+
import { AngularFireRemoteConfigModule, SETTINGS as REMOTE_CONFIG_SETTINGS, DEFAULTS as REMOTE_CONFIG_DEFAULTS } from '@angular/fire/compat/remote-config';
29+
import { AngularFirePerformanceModule, PerformanceMonitoringService } from '@angular/fire/compat/performance';
3030
import { AngularFireAuthGuardModule } from '@angular/fire/auth-guard';
3131
import { DatabaseComponent } from './database/database.component';
3232
import { StorageComponent } from './storage/storage.component';
@@ -82,7 +82,6 @@ import { UpboatsComponent } from './upboats/upboats.component';
8282
{ provide: USE_DATABASE_EMULATOR, useValue: environment.useEmulators ? ['localhost', 9000] : undefined },
8383
{ provide: USE_FIRESTORE_EMULATOR, useValue: environment.useEmulators ? ['localhost', 8080] : undefined },
8484
{ provide: USE_FUNCTIONS_EMULATOR, useValue: environment.useEmulators ? ['localhost', 5001] : undefined },
85-
{ provide: NEW_ORIGIN_BEHAVIOR, useValue: true },
8685
{ provide: FUNCTIONS_ORIGIN, useFactory: () => isDevMode() || typeof location === 'undefined' ? undefined : location.origin },
8786
{ provide: REMOTE_CONFIG_SETTINGS, useFactory: () => isDevMode() ? { minimumFetchIntervalMillis: 10_000 } : {} },
8887
{ provide: REMOTE_CONFIG_DEFAULTS, useValue: { background_color: 'red' } },
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component, OnInit, OnDestroy, PLATFORM_ID } from '@angular/core';
2-
import { AngularFireAuth } from '@angular/fire/auth';
2+
import { AngularFireAuth } from '@angular/fire/compat/auth';
33
import firebase from 'firebase/compat/app';
44
import { Subscription } from 'rxjs';
55
import { map } from 'rxjs/operators';
6-
import { trace } from '@angular/fire/performance';
6+
import { trace } from '@angular/fire/compat/performance';
77
import { Inject } from '@angular/core';
88
import { isPlatformServer } from '@angular/common';
99

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component, Inject, OnInit, PLATFORM_ID } from '@angular/core';
2-
import { AngularFireDatabase } from '@angular/fire/database';
2+
import { AngularFireDatabase } from '@angular/fire/compat/database';
33
import { EMPTY, Observable } from 'rxjs';
44
import { makeStateKey, TransferState } from '@angular/platform-browser';
55
import { startWith, tap } from 'rxjs/operators';
6-
import { trace } from '@angular/fire/performance';
6+
import { trace } from '@angular/fire/compat/performance';
77
import { isPlatformServer } from '@angular/common';
88

99
@Component({
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { AngularFirestore } from '@angular/fire/firestore';
2+
import { AngularFirestore } from '@angular/fire/compat/firestore';
33
import { Observable } from 'rxjs';
44
import { startWith, tap } from 'rxjs/operators';
55
import { makeStateKey, TransferState } from '@angular/platform-browser';
6-
import { trace } from '@angular/fire/performance';
6+
import { trace } from '@angular/fire/compat/performance';
77
import { AngularFirestoreOffline } from './firestore-offline.module';
88

99
@Component({
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { Inject, Injectable, InjectionToken, NgModule, NgZone, Optional, PLATFORM_ID } from '@angular/core';
2-
import { FirebaseOptions, FIREBASE_OPTIONS } from '@angular/fire';
3-
import { USE_EMULATOR } from '@angular/fire/firestore';
4-
import { AngularFirestore, SETTINGS, Settings } from '@angular/fire/firestore';
5-
import { USE_EMULATOR as USE_AUTH_EMULATOR } from '@angular/fire/auth';
2+
import { FIREBASE_OPTIONS } from '@angular/fire';
3+
import { FirebaseOptions } from 'firebase/app';
4+
import { USE_EMULATOR } from '@angular/fire/compat/firestore';
5+
import { AngularFirestore, SETTINGS, Settings } from '@angular/fire/compat/firestore';
6+
import { USE_EMULATOR as USE_AUTH_EMULATOR } from '@angular/fire/compat/auth';
67

78
export const FIRESTORE_OFFLINE = new InjectionToken<AngularFirestore>('my.firestore');
89

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { AngularFirestore } from '@angular/fire/firestore';
2+
import { AngularFirestore } from '@angular/fire/compat/firestore';
33
import { Observable } from 'rxjs';
44
import { startWith, tap } from 'rxjs/operators';
55
import { makeStateKey, TransferState } from '@angular/platform-browser';
6-
import { trace } from '@angular/fire/performance';
6+
import { trace } from '@angular/fire/compat/performance';
77

88
@Component({
99
selector: 'app-firestore',
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { AngularFireFunctions } from '@angular/fire/functions';
2+
import { AngularFireFunctions } from '@angular/fire/compat/functions';
33
import { EMPTY, Observable } from 'rxjs';
44

55
@Component({
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component } from '@angular/core';
2-
import { FirebaseApp } from '@angular/fire';
2+
import { FirebaseApp } from '@angular/fire/compat';
33

44
@Component({
55
selector: 'app-home',
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { AngularFireMessaging } from '@angular/fire/messaging';
3-
import { trace } from '@angular/fire/performance';
2+
import { AngularFireMessaging } from '@angular/fire/compat/messaging';
3+
import { trace } from '@angular/fire/compat/performance';
44
import { Observable } from 'rxjs';
55
import { tap } from 'rxjs/operators';
66

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { DocumentChangeAction } from '@angular/fire/firestore';
2+
import { DocumentChangeAction } from '@angular/fire/compat/firestore';
33
import { Observable } from 'rxjs';
44
import { AngularFirestoreOffline } from '../firestore-offline/firestore-offline.module';
55

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { AngularFireRemoteConfig, mapToObject } from '@angular/fire/remote-config';
3-
import { trace } from '@angular/fire/performance';
2+
import { AngularFireRemoteConfig, mapToObject } from '@angular/fire/compat/remote-config';
3+
import { trace } from '@angular/fire/compat/performance';
44
import { Observable } from 'rxjs';
55

66
@Component({
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { AngularFireStorage } from '@angular/fire/storage';
2+
import { AngularFireStorage } from '@angular/fire/compat/storage';
33
import { Observable, of } from 'rxjs';
44
import { startWith, tap } from 'rxjs/operators';
55
import { makeStateKey, TransferState } from '@angular/platform-browser';
6-
import { trace } from '@angular/fire/performance';
6+
import { trace } from '@angular/fire/compat/performance';
77

88
const TRANSPARENT_PNG
99
= 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { map, startWith, tap } from 'rxjs/operators';
44
import { AngularFirestoreOffline } from '../firestore-offline/firestore-offline.module';
55
import firebase from 'firebase/compat/app';
66
import { makeStateKey, TransferState } from '@angular/platform-browser';
7-
import { trace } from '@angular/fire/performance';
7+
import { trace } from '@angular/fire/compat/performance';
88

99
type Animal = { name: string, upboats: number, id: string, hasPendingWrites: boolean };
1010

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "../node_modules/ng-packagr/package.schema.json",
2+
"$schema": "../../node_modules/ng-packagr/package.schema.json",
33
"ngPackage": {
44
"lib": {
55
"umdModuleIds": {
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
export * from './analytics';
2-
export * from './analytics.module';
3-
export * from './screen-tracking.service';
4-
export * from './user-tracking.service';
1+
export const a = 1;
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { TestBed } from '@angular/core/testing';
2-
import { AngularFireModule, FirebaseApp } from '@angular/fire';
2+
import { AngularFireModule, FirebaseApp } from '@angular/fire/compat';
33
import { COMMON_CONFIG } from '../test-config';
44
import { AngularFireAuthGuard, AngularFireAuthGuardModule } from '@angular/fire/auth-guard';
55
import { Router, RouterModule } from '@angular/router';
66
import { APP_BASE_HREF } from '@angular/common';
7-
import { rando } from '../firestore/utils.spec';
7+
import { rando } from '../compat/firestore/utils.spec';
88

99
describe('AngularFireAuthGuard', () => {
1010
let app: FirebaseApp;
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from
33
import { Observable, of, pipe, UnaryFunction } from 'rxjs';
44
import { map, switchMap, take } from 'rxjs/operators';
55
import firebase from 'firebase/compat/app';
6-
import { AngularFireAuth } from '@angular/fire/auth';
6+
import { AngularFireAuth } from '@angular/fire/compat/auth';
77

88
export type AuthPipeGenerator = (next: ActivatedRouteSnapshot, state: RouterStateSnapshot) => AuthPipe;
99
export type AuthPipe = UnaryFunction<Observable<firebase.User|null>, Observable<boolean|string|any[]>>;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"lib": {
55
"entryFile": "public_api.ts",
66
"umdModuleIds": {
7-
"firebase/app": "firebase"
7+
"firebase/compat/app": "firebase"
88
}
99
}
1010
}
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "../../node_modules/ng-packagr/package.schema.json",
33
"ngPackage": {
44
"lib": {
5-
"entryFile": "public_api.ts",
65
"umdModuleIds": {
76
"firebase/app": "firebase"
8-
}
7+
},
8+
"entryFile": "public_api.ts"
99
}
1010
}
11-
}
11+
}
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
2-
import 'firebase/compat/auth'; // removed in build process when not UMD
3-
4-
export * from './auth';
5-
export * from './auth.module';
1+
export const a = 1;
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { TestBed } from '@angular/core/testing';
2-
import { AngularFireModule, FirebaseApp } from '@angular/fire';
3-
import { AngularFireAnalytics, AngularFireAnalyticsModule } from '@angular/fire/analytics';
4-
import { COMMON_CONFIG } from '../test-config';
2+
import { AngularFireModule, FirebaseApp } from '@angular/fire/compat';
3+
import { AngularFireAnalytics, AngularFireAnalyticsModule } from '@angular/fire/compat/analytics';
4+
import { COMMON_CONFIG } from '../../test-config';
55
import { rando } from '../firestore/utils.spec';
66

77

Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
ɵlazySDKProxy,
88
ɵPromiseProxy,
99
ɵapplyMixins,
10-
FirebaseApp
1110
} from '@angular/fire';
11+
import { FirebaseApp } from '@angular/fire/compat';
1212
import firebase from 'firebase/compat/app';
1313
import { proxyPolyfillCompat } from './base';
1414
import { ɵfetchInstance } from '@angular/fire';
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "../../../node_modules/ng-packagr/package.schema.json",
3+
"ngPackage": {
4+
"lib": {
5+
"umdModuleIds": {
6+
"firebase/compat/app": "firebase"
7+
},
8+
"entryFile": "public_api.ts"
9+
}
10+
}
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export * from './analytics';
2+
export * from './analytics.module';
3+
export * from './screen-tracking.service';
4+
export * from './user-tracking.service';
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { isPlatformServer } from '@angular/common';
22
import { Inject, Injectable, NgZone, OnDestroy, PLATFORM_ID } from '@angular/core';
33
import { AngularFireAnalytics } from './analytics';
4-
import { AngularFireAuth } from '@angular/fire/auth';
4+
import { AngularFireAuth } from '@angular/fire/compat/auth';
55
import { Subscription } from 'rxjs';
66

77
@Injectable()
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import firebase from 'firebase/compat/app';
22
import { Observable, Subject } from 'rxjs';
33
import { TestBed } from '@angular/core/testing';
4-
import { AngularFireModule, FIREBASE_APP_NAME, FIREBASE_OPTIONS, FirebaseApp } from '@angular/fire';
5-
import { AngularFireAuth, AngularFireAuthModule } from '@angular/fire/auth';
6-
import { COMMON_CONFIG } from '../test-config';
4+
import { AngularFireModule, FIREBASE_APP_NAME, FIREBASE_OPTIONS, FirebaseApp } from '@angular/fire/compat';
5+
import { AngularFireAuth, AngularFireAuthModule } from '@angular/fire/compat/auth';
6+
import { COMMON_CONFIG } from '../../test-config';
77
import 'firebase/compat/auth';
88
import { rando } from '../firestore/utils.spec';
99

Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@ import { Injectable, Inject, Optional, NgZone, PLATFORM_ID, InjectionToken } fro
22
import { Observable, of, from, merge, Subject, Subscriber } from 'rxjs';
33
import { switchMap, map, observeOn, shareReplay, first, filter, switchMapTo, subscribeOn } from 'rxjs/operators';
44
import {
5-
FIREBASE_OPTIONS,
6-
FIREBASE_APP_NAME,
7-
FirebaseOptions,
8-
FirebaseAppConfig,
95
ɵPromiseProxy,
106
ɵlazySDKProxy,
11-
ɵfirebaseAppFactory,
127
ɵAngularFireSchedulers,
138
ɵkeepUnstableUntilFirstFactory,
149
ɵapplyMixins
1510
} from '@angular/fire';
11+
import { ɵfirebaseAppFactory, FIREBASE_OPTIONS, FIREBASE_APP_NAME } from '@angular/fire/compat';
12+
import { FirebaseOptions } from 'firebase/app';
1613
import firebase from 'firebase/compat/app';
1714
import { isPlatformServer } from '@angular/common';
1815
import { proxyPolyfillCompat } from './base';
@@ -63,7 +60,7 @@ export class AngularFireAuth {
6360

6461
constructor(
6562
@Inject(FIREBASE_OPTIONS) options: FirebaseOptions,
66-
@Optional() @Inject(FIREBASE_APP_NAME) nameOrConfig: string|FirebaseAppConfig|null|undefined,
63+
@Optional() @Inject(FIREBASE_APP_NAME) name: string|null|undefined,
6764
// tslint:disable-next-line:ban-types
6865
@Inject(PLATFORM_ID) platformId: Object,
6966
zone: NgZone,
@@ -81,7 +78,7 @@ export class AngularFireAuth {
8178
const auth = of(undefined).pipe(
8279
observeOn(schedulers.outsideAngular),
8380
switchMap(() => zone.runOutsideAngular(() => import('firebase/compat/auth'))),
84-
map(() => ɵfirebaseAppFactory(options, zone, nameOrConfig)),
81+
map(() => ɵfirebaseAppFactory(options, zone, name)),
8582
map(app => zone.runOutsideAngular(() => {
8683
const useEmulator: UseEmulatorArguments | null = _useEmulator;
8784
const settings: firebase.auth.AuthSettings | null = _settings;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "../../../node_modules/ng-packagr/package.schema.json",
3+
"ngPackage": {
4+
"lib": {
5+
"entryFile": "public_api.ts",
6+
"umdModuleIds": {
7+
"firebase/compat/app": "firebase"
8+
}
9+
}
10+
}
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
import 'firebase/compat/auth'; // removed in build process when not UMD
3+
4+
export * from './auth';
5+
export * from './auth.module';
File renamed without changes.

0 commit comments

Comments
 (0)