Skip to content

Commit c19d987

Browse files
jamesdanielsjamesdaniels
committed
/compat
1 parent f5af018 commit c19d987

File tree

133 files changed

+467
-364
lines changed

Some content is hidden

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

133 files changed

+467
-364
lines changed

‎.npmignore‎

Lines changed: 3 additions & 1 deletion
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

‎package.json‎

Lines changed: 1 addition & 1 deletion
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
},

‎sample/server.ts‎

Lines changed: 2 additions & 2 deletions
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) => {

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

Lines changed: 1 addition & 1 deletion
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({

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

Lines changed: 10 additions & 11 deletions
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' } },

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

Lines changed: 2 additions & 2 deletions
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

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

Lines changed: 2 additions & 2 deletions
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({

‎sample/src/app/firestore-offline/firestore-offline.component.ts‎

Lines changed: 2 additions & 2 deletions
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({

‎sample/src/app/firestore-offline/firestore-offline.module.ts‎

Lines changed: 5 additions & 4 deletions
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

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

Lines changed: 2 additions & 2 deletions
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',

0 commit comments

Comments
 (0)