diff --git a/CHANGELOG.md b/CHANGELOG.md index 34cbed806..7dc292a1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ + +# [5.0.0](https://github.com/angular/angularfire2/compare/5.0.0-rc.12...5.0.0) (2018-09-04) + + +### Bug Fixes + +* **firestore:** Better handle enablePersistence failures, esp. for Universal ([#1850](https://github.com/angular/angularfire2/issues/1850)) ([334ba7b](https://github.com/angular/angularfire2/commit/334ba7b)) +* **firestore:** Add document `get()`, the options argument for `get()` should be optional, and subscriptions to `get()` should be run in the Angular Zone([#1849](https://github.com/angular/angularfire2/issues/1849)) ([185943f](https://github.com/angular/angularfire2/commit/185943f)) + + +### Breaking changes + +5.0 is now final and we're published under `@angular/fire`. + +```bash +npm i --save firebase @angular/fire +``` + + # [5.0.0-rc.12](https://github.com/angular/angularfire2/compare/5.0.0-rc.11...5.0.0-rc.12) (2018-08-24) diff --git a/README.md b/README.md index 8bb269210..dc9f59f4f 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ [![Build Status](https://travis-ci.org/angular/angularfire2.svg?branch=master)](https://travis-ci.org/angular/angularfire2) [![Join the chat at https://gitter.im/angular/angularfire2](https://badges.gitter.im/angular/angularfire2.svg)](https://gitter.im/angular/angularfire2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -Status: Release candidate - ## What is AngularFire? - **Observable based** - Use the power of RxJS, Angular, and Firebase. @@ -27,14 +25,14 @@ Status: Release candidate ## Install ```bash -npm install firebase angularfire2 --save +npm install firebase @angular/fire --save ``` ## Example use: ```ts import { Component } from '@angular/core'; -import { AngularFirestore } from 'angularfire2/firestore'; +import { AngularFirestore } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; @Component({ diff --git a/docs/auth/getting-started.md b/docs/auth/getting-started.md index 0e7309034..db5182549 100644 --- a/docs/auth/getting-started.md +++ b/docs/auth/getting-started.md @@ -10,7 +10,7 @@ the Firebase docs for more information on what methods are available.](https://f ```ts import { Component } from '@angular/core'; -import { AngularFireAuth } from 'angularfire2/auth'; +import { AngularFireAuth } from '@angular/fire/auth'; import { auth } from 'firebase'; @Component({ diff --git a/docs/firestore/collections.md b/docs/firestore/collections.md index d4d42aa82..70148d0e1 100644 --- a/docs/firestore/collections.md +++ b/docs/firestore/collections.md @@ -9,7 +9,7 @@ The `AngularFirestoreCollection` service is a wrapper around the native Firestor ```ts import { Component } from '@angular/core'; -import { AngularFirestore, AngularFirestoreCollection } from 'angularfire2/firestore'; +import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; export interface Item { name: string; } @@ -87,7 +87,7 @@ There are multiple ways of streaming collection data from Firestore. ```ts import { Component } from '@angular/core'; -import { AngularFirestore, AngularFirestoreCollection } from 'angularfire2/firestore'; +import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; export interface Item { id: string; name: string; } @@ -138,7 +138,7 @@ export class AppComponent { ```ts import { Component } from '@angular/core'; -import { AngularFirestore, AngularFirestoreCollection } from 'angularfire2/firestore'; +import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -186,7 +186,7 @@ export class AppComponent { ```ts import { Component } from '@angular/core'; -import { AngularFirestore, AngularFirestoreCollection } from 'angularfire2/firestore'; +import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -231,7 +231,7 @@ export class AppComponent { ```ts import { Component } from '@angular/core'; -import { AngularFirestore, AngularFirestoreCollection } from 'angularfire2/firestore'; +import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -281,7 +281,7 @@ There are three `DocumentChangeType`s in Firestore: `added`, `removed`, and `mod ```ts import { Component } from '@angular/core'; -import { AngularFirestore, AngularFirestoreCollection } from 'angularfire2/firestore'; +import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; @Component({ diff --git a/docs/firestore/documents.md b/docs/firestore/documents.md index 6cf7a6acb..d127e7bae 100644 --- a/docs/firestore/documents.md +++ b/docs/firestore/documents.md @@ -9,7 +9,7 @@ The `AngularFirestoreDocument` service is a wrapper around the native Firestore ```ts import { Component } from '@angular/core'; -import { AngularFirestore, AngularFirestoreDocument } from 'angularfire2/firestore'; +import { AngularFirestore, AngularFirestoreDocument } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; export interface Item { name: string; } diff --git a/docs/firestore/offline-data.md b/docs/firestore/offline-data.md index 6d008e06e..c2c8797ca 100644 --- a/docs/firestore/offline-data.md +++ b/docs/firestore/offline-data.md @@ -12,9 +12,9 @@ To enable offline persistence in your AngularFire application, call `enablePersi import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { AppComponent } from './app.component'; -import { AngularFireModule } from 'angularfire2'; -import { AngularFirestoreModule } from 'angularfire2/firestore'; -import { AngularFireAuthModule } from 'angularfire2/auth'; +import { AngularFireModule } from '@angular/fire'; +import { AngularFirestoreModule } from '@angular/fire/firestore'; +import { AngularFireAuthModule } from '@angular/fire/auth'; import { environment } from '../environments/environment'; @NgModule({ diff --git a/docs/firestore/querying-collections.md b/docs/firestore/querying-collections.md index 958edc4d7..87ada4c92 100644 --- a/docs/firestore/querying-collections.md +++ b/docs/firestore/querying-collections.md @@ -83,7 +83,7 @@ size$.next('small'); ```ts import { Component } from '@angular/core'; -import { AngularFirestore } from 'angularfire2/firestore'; +import { AngularFirestore } from '@angular/fire/firestore'; import { Observable, BehaviorSubject, combineLatest } from 'rxjs'; import { switchMap } from 'rxjs/operators'; diff --git a/docs/install-and-setup.md b/docs/install-and-setup.md index 186d13448..ae6f59b02 100644 --- a/docs/install-and-setup.md +++ b/docs/install-and-setup.md @@ -31,7 +31,7 @@ You should see a message on the page that says *App works!* ### 3. Install AngularFire and Firebase ```bash -npm install angularfire2 firebase --save +npm install @angular/fire firebase --save ``` Now that you have a new project setup, install AngularFire and Firebase from npm. @@ -62,7 +62,7 @@ Open `/src/app/app.module.ts`, inject the Firebase providers, and specify your F import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { AppComponent } from './app.component'; -import { AngularFireModule } from 'angularfire2'; +import { AngularFireModule } from '@angular/fire'; import { environment } from '../environments/environment'; @NgModule({ @@ -110,10 +110,10 @@ For example if your application was using both Firebase authentication and the F import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { AppComponent } from './app.component'; -import { AngularFireModule } from 'angularfire2'; -import { AngularFirestoreModule } from 'angularfire2/firestore'; -import { AngularFireStorageModule } from 'angularfire2/storage'; -import { AngularFireAuthModule } from 'angularfire2/auth'; +import { AngularFireModule } from '@angular/fire'; +import { AngularFirestoreModule } from '@angular/fire/firestore'; +import { AngularFireStorageModule } from '@angular/fire/storage'; +import { AngularFireAuthModule } from '@angular/fire/auth'; import { environment } from '../environments/environment'; @NgModule({ @@ -136,7 +136,7 @@ Open `/src/app/app.component.ts`, and make sure to modify/delete any tests to ge ```ts import { Component } from '@angular/core'; -import { AngularFirestore } from 'angularfire2/firestore'; +import { AngularFirestore } from '@angular/fire/firestore'; @Component({ selector: 'app-root', @@ -156,7 +156,7 @@ In `/src/app/app.component.ts`: ```ts import { Component } from '@angular/core'; -import { AngularFirestore } from 'angularfire2/firestore'; +import { AngularFirestore } from '@angular/fire/firestore'; import { Observable } from 'rxjs'; @Component({ diff --git a/docs/ionic/authentication.md b/docs/ionic/authentication.md index ea2486fa1..b18029ffe 100644 --- a/docs/ionic/authentication.md +++ b/docs/ionic/authentication.md @@ -46,7 +46,7 @@ Go to [Firebase console](https://console.firebase.google.com/) then click **Add at `login.service.ts` add this function: ```ts -import { AngularFireAuth } from 'angularfire2/auth'; +import { AngularFireAuth } from '@angular/fire/auth'; import firebase from 'firebase/app'; import AuthProvider = firebase.auth.AuthProvider; diff --git a/docs/ionic/cli.md b/docs/ionic/cli.md index fbf35391a..bbf1500c9 100644 --- a/docs/ionic/cli.md +++ b/docs/ionic/cli.md @@ -36,7 +36,7 @@ Your default browser should start up and display a working Ionic app. ### 3. Install AngularFire 2 and Firebase ```bash -npm install angularfire2 firebase --save +npm install @angular/fire firebase --save ``` Now that you have a new project setup, install AngularFire and Firebase from npm. @@ -69,7 +69,7 @@ import { NgModule } from '@angular/core'; import { IonicApp, IonicModule } from 'ionic-angular'; import { MyApp } from './app.component'; -import { AngularFireModule } from 'angularfire2'; +import { AngularFireModule } from '@angular/fire'; import { firebaseConfig } from '../environment'; @NgModule({ @@ -122,10 +122,10 @@ import { NgModule } from '@angular/core'; import { IonicApp, IonicModule } from 'ionic-angular'; import { MyApp } from './app.component'; -import { AngularFireModule } from 'angularfire2'; +import { AngularFireModule } from '@angular/fire'; import { firebaseConfig } from '../environment'; -import { AngularFireDatabaseModule } from 'angularfire2/database'; -import { AngularFireAuthModule } from 'angularfire2/auth'; +import { AngularFireDatabaseModule } from '@angular/fire/database'; +import { AngularFireAuthModule } from '@angular/fire/auth'; @NgModule({ @@ -149,7 +149,7 @@ Open `/src/pages/home/home.ts`, and start to import `AngularFireDatabase` and `F ```ts import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { AngularFireDatabase } from 'angularfire2/database'; +import { AngularFireDatabase } from '@angular/fire/database'; import { Observable } from 'rxjs/Observable'; @Component({ @@ -173,7 +173,7 @@ In `/src/pages/home/home.ts`: ```ts import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { AngularFireDatabase } from 'angularfire2/database'; +import { AngularFireDatabase } from '@angular/fire/database'; import { Observable } from 'rxjs/Observable'; @Component({ diff --git a/docs/ionic/v3.md b/docs/ionic/v3.md index 325e59230..32dc37417 100644 --- a/docs/ionic/v3.md +++ b/docs/ionic/v3.md @@ -198,9 +198,9 @@ import { StatusBar } from '@ionic-native/status-bar'; import { MyApp } from './app.component'; import { HomePage } from '../pages/home/home'; -import { AngularFireModule } from 'angularfire2'; -import { AngularFireDatabaseModule, AngularFireDatabase } from 'angularfire2/database'; -import { AngularFireAuthModule } from 'angularfire2/auth'; +import { AngularFireModule } from '@angular/fire'; +import { AngularFireDatabaseModule, AngularFireDatabase } from '@angular/fire/database'; +import { AngularFireAuthModule } from '@angular/fire/auth'; export const firebaseConfig = { apiKey: "xxxxxxxxxx", @@ -256,7 +256,7 @@ Your `home.ts` file should look like this: import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { AngularFireDatabase } from 'angularfire2/database'; +import { AngularFireDatabase } from '@angular/fire/database'; import { Observable } from 'rxjs/Observable'; @Component({ @@ -369,7 +369,7 @@ The `home.ts` should look like below import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { AngularFireAuth } from 'angularfire2/auth'; +import { AngularFireAuth } from '@angular/fire/auth'; import firebase from 'firebase/app'; @Component({ @@ -398,7 +398,7 @@ export class HomePage { Also, update your `app.module.ts` to contain following import -`import { AngularFireAuthModule } from 'angularfire2/auth';` +`import { AngularFireAuthModule } from '@angular/fire/auth';` and add it to the imports array. @@ -422,7 +422,7 @@ Your `home.ts` should look as follows: import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { AngularFireAuth } from 'angularfire2/auth'; +import { AngularFireAuth } from '@angular/fire/auth'; import firebase from 'firebase/app'; @Component({ @@ -580,7 +580,7 @@ Your `home.ts` should look as below: import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { AngularFireAuth } from 'angularfire2/auth'; +import { AngularFireAuth } from '@angular/fire/auth'; import firebase from 'firebase/app'; import { Platform } from 'ionic-angular'; @@ -643,9 +643,9 @@ import { StatusBar } from '@ionic-native/status-bar'; import { MyApp } from './app.component'; import { HomePage } from '../pages/home/home'; -import { AngularFireModule } from 'angularfire2'; -import { AngularFireDatabaseModule } from 'angularfire2/database'; -import { AngularFireAuthModule } from 'angularfire2/auth'; +import { AngularFireModule } from '@angular/fire'; +import { AngularFireDatabaseModule } from '@angular/fire/database'; +import { AngularFireAuthModule } from '@angular/fire/auth'; import { Facebook } from '@ionic-native/facebook'; export const firebaseConfig = { diff --git a/docs/rtdb/lists.md b/docs/rtdb/lists.md index 0e5f7d3a1..4eae3752d 100644 --- a/docs/rtdb/lists.md +++ b/docs/rtdb/lists.md @@ -17,7 +17,7 @@ Replace your `/src/app/app.component.ts` from previous step to look like below. ```ts import { Component } from '@angular/core'; -import { AngularFireDatabase } from 'angularfire2/database'; +import { AngularFireDatabase } from '@angular/fire/database'; @Component({ selector: 'app-root', @@ -46,11 +46,11 @@ To get the list in realtime, create a list binding as a property of your compone Then in your template, you can use the `async` pipe to unwrap the binding. -Update `/src/app/app.component.ts` to import `AngularFireList` from angularfire2 and iterate thru the list once data is retrieved. Also note the change in attribute `templateUrl` to inline `template` below. +Update `/src/app/app.component.ts` to import `AngularFireList` from `@angular/fire` and iterate thru the list once data is retrieved. Also note the change in attribute `templateUrl` to inline `template` below. ```ts import { Component } from '@angular/core'; -import { AngularFireDatabase } from 'angularfire2/database'; +import { AngularFireDatabase } from '@angular/fire/database'; import { Observable } from 'rxjs'; @Component({ @@ -206,7 +206,7 @@ itemsRef.remove(); ```ts import { Component } from '@angular/core'; -import { AngularFireDatabase, AngularFireList } from 'angularfire2/database'; +import { AngularFireDatabase, AngularFireList } from '@angular/fire/database'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/docs/rtdb/objects.md b/docs/rtdb/objects.md index 80dfcb85d..2ee979330 100644 --- a/docs/rtdb/objects.md +++ b/docs/rtdb/objects.md @@ -16,7 +16,7 @@ If you've followed the earlier step "Installation and Setup" your `/src/app/app ```ts import { Component } from '@angular/core'; -import { AngularFireDatabase } from 'angularfire2/database'; +import { AngularFireDatabase } from '@angular/fire/database'; import { Observable } from 'rxjs'; @Component({ @@ -48,7 +48,7 @@ Then in your template, you can use the `async` pipe to unwrap the binding. ```ts import { Component } from '@angular/core'; -import { AngularFireDatabase } from 'angularfire2/database'; +import { AngularFireDatabase } from '@angular/fire/database'; import { Observable } from 'rxjs'; @Component({ @@ -126,7 +126,7 @@ itemRef.remove(); ```ts import { Component } from '@angular/core'; -import { AngularFireDatabase, AngularFireObject } from 'angularfire2/database'; +import { AngularFireDatabase, AngularFireObject } from '@angular/fire/database'; import { Observable } from 'rxjs'; @Component({ diff --git a/docs/rtdb/querying-lists.md b/docs/rtdb/querying-lists.md index 2a223cbfa..cafabd12e 100644 --- a/docs/rtdb/querying-lists.md +++ b/docs/rtdb/querying-lists.md @@ -79,7 +79,7 @@ size$.next('small'); ```ts import { Component } from '@angular/core'; -import { AngularFireDatabase, AngularFireAction } from 'angularfire2/database'; +import { AngularFireDatabase, AngularFireAction } from '@angular/fire/database'; import { Observable, Subscription, BehaviorSubject } from 'rxjs'; import { switchMap } 'rxjs/operators'; diff --git a/docs/storage/storage.md b/docs/storage/storage.md index 0779ba589..3590438a1 100644 --- a/docs/storage/storage.md +++ b/docs/storage/storage.md @@ -4,14 +4,14 @@ ### Import the `NgModule` -Cloud Storage for AngularFire is contained in the `angularfire2/storage` module namespace. Import the `AngularFireStorageModule` in your `NgModule`. This sets up the `AngularFireStorage` service for dependency injection. +Cloud Storage for AngularFire is contained in the `@angular/fire/storage` module namespace. Import the `AngularFireStorageModule` in your `NgModule`. This sets up the `AngularFireStorage` service for dependency injection. ```ts import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { AppComponent } from './app.component'; -import { AngularFireModule } from 'angularfire2'; -import { AngularFireStorageModule } from 'angularfire2/storage'; +import { AngularFireModule } from '@angular/fire'; +import { AngularFireStorageModule } from '@angular/fire/storage'; import { environment } from '../environments/environment'; @NgModule({ @@ -32,7 +32,7 @@ Once the `AngularFireStorageModule` is registered you can inject the `AngularFir ```ts import { Component } from '@angular/core'; -import { AngularFireStorage } from 'angularfire2/storage'; +import { AngularFireStorage } from '@angular/fire/storage'; @Component({ selector: 'app-component', @@ -60,7 +60,7 @@ There are three options for uploading files. ```ts import { Component } from '@angular/core'; -import { AngularFireStorage } from 'angularfire2/storage'; +import { AngularFireStorage } from '@angular/fire/storage'; @Component({ selector: 'app-root', @@ -83,7 +83,7 @@ export class AppComponent { ```ts import { Component } from '@angular/core'; -import { AngularFireStorage } from 'angularfire2/storage'; +import { AngularFireStorage } from '@angular/fire/storage'; @Component({ selector: 'app-root', @@ -106,7 +106,7 @@ export class AppComponent { ```ts import { Component } from '@angular/core'; -import { AngularFireStorage } from 'angularfire2/storage'; +import { AngularFireStorage } from '@angular/fire/storage'; @Component({ selector: 'app-root', diff --git a/package.json b/package.json index e37aa04b7..9a7b5769f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angularfire2", - "version": "5.0.0-rc.12", + "version": "5.0.0", "description": "The official library of Firebase and Angular.", "private": true, "scripts": { @@ -34,14 +34,16 @@ "@angular/core": "^6.0.0", "@angular/platform-browser": "^6.0.0", "@angular/platform-browser-dynamic": "^6.0.0", - "bufferutil": "^3.0.3", "firebase": "^5.0.3", "rxjs": "^6.0.0", - "utf-8-validate": "^4.0.0", "ws": "^3.3.2", - "xmlhttprequest": "^1.8.0", + "xhr2": "^0.1.4", "zone.js": "^0.8.0" }, + "optionalDependencies": { + "bufferutil": "~3.0.0", + "utf-8-validate": "~4.0.0" + }, "devDependencies": { "@angular/compiler-cli": "^6.0.0", "@angular/platform-server": "^6.0.0", diff --git a/src/auth/auth.spec.ts b/src/auth/auth.spec.ts index 3e7fd6df1..aa4acc41a 100644 --- a/src/auth/auth.spec.ts +++ b/src/auth/auth.spec.ts @@ -1,8 +1,8 @@ import { User } from 'firebase'; import { Observable, Subject } from 'rxjs' import { TestBed, inject } from '@angular/core/testing'; -import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from 'angularfire2'; -import { AngularFireAuth, AngularFireAuthModule } from 'angularfire2/auth'; +import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire'; +import { AngularFireAuth, AngularFireAuthModule } from '@angular/fire/auth'; import { COMMON_CONFIG } from './test-config'; import { take, skip } from 'rxjs/operators'; diff --git a/src/auth/auth.ts b/src/auth/auth.ts index 8f12d57d8..713ad109f 100644 --- a/src/auth/auth.ts +++ b/src/auth/auth.ts @@ -1,10 +1,10 @@ import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core'; import { Observable, of, from } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { FirebaseAppConfig, FirebaseOptions } from 'angularfire2'; +import { FirebaseAppConfig, FirebaseOptions } from '@angular/fire'; import { User, auth } from 'firebase'; -import { FirebaseAuth, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2'; +import { FirebaseAuth, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire'; @Injectable() export class AngularFireAuth { diff --git a/src/auth/package.json b/src/auth/package.json index 481fa17a0..d1865d36d 100644 --- a/src/auth/package.json +++ b/src/auth/package.json @@ -1,5 +1,5 @@ { - "name": "angularfire2/auth", + "name": "@angular/fire/auth", "version": "ANGULARFIRE2_VERSION", "description": "The auth module", "main": "../bundles/auth.umd.js", @@ -17,7 +17,7 @@ "author": "angular,firebase", "license": "MIT", "peerDependencies": { - "angularfire2": "ANGULARFIRE2_VERSION", + "@angular/fire": "ANGULARFIRE2_VERSION", "@angular/common": "ANGULAR_VERSION", "@angular/core": "ANGULAR_VERSION", "@angular/platform-browser": "ANGULAR_VERSION", diff --git a/src/auth/tsconfig-build.json b/src/auth/tsconfig-build.json index 4b49e152b..c8589212c 100644 --- a/src/auth/tsconfig-build.json +++ b/src/auth/tsconfig-build.json @@ -17,7 +17,7 @@ "skipLibCheck": true, "moduleResolution": "node", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/auth/tsconfig-esm.json b/src/auth/tsconfig-esm.json index ac4bbeb96..405522ca3 100644 --- a/src/auth/tsconfig-esm.json +++ b/src/auth/tsconfig-esm.json @@ -14,6 +14,6 @@ "strictMetadataEmit": true, "enableSummariesForJit": false, "flatModuleOutFile": "index.js", - "flatModuleId": "angularfire2/auth" + "flatModuleId": "@angular/fire/auth" } } diff --git a/src/auth/tsconfig-test.json b/src/auth/tsconfig-test.json index 7623b3e2c..29d4b4f44 100644 --- a/src/auth/tsconfig-test.json +++ b/src/auth/tsconfig-test.json @@ -3,8 +3,8 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "angularfire2": ["../../dist/packages-dist"], - "angularfire2/auth": ["../../dist/packages-dist/auth"] + "@angular/fire": ["../../dist/packages-dist"], + "@angular/fire/auth": ["../../dist/packages-dist/auth"] } }, "files": [ diff --git a/src/core/angularfire2.spec.ts b/src/core/angularfire2.spec.ts index 0aa158b30..0fba824e2 100644 --- a/src/core/angularfire2.spec.ts +++ b/src/core/angularfire2.spec.ts @@ -1,6 +1,6 @@ import { TestBed, inject } from '@angular/core/testing'; import { PlatformRef, NgModule, CompilerFactory } from '@angular/core'; -import { FirebaseApp, AngularFireModule } from 'angularfire2'; +import { FirebaseApp, AngularFireModule } from '@angular/fire'; import { Subscription } from 'rxjs'; import { COMMON_CONFIG } from './test-config'; import { BrowserModule } from '@angular/platform-browser'; diff --git a/src/core/firebase.app.module.ts b/src/core/firebase.app.module.ts index 4cbe1355a..df87950c4 100644 --- a/src/core/firebase.app.module.ts +++ b/src/core/firebase.app.module.ts @@ -39,7 +39,7 @@ export function _firebaseAppFactory(options: FirebaseOptions, nameOrConfig?: str // Added any due to some inconsistency between @firebase/app and firebase types const existingApp = firebase.apps.filter(app => app && app.name === config.name)[0] as any; // We support FirebaseConfig, initializeApp's public type only accepts string; need to cast as any - // Should be solved with https://github.com/firebase/firebase-js-sdk/pull/1206 + // Could be solved with https://github.com/firebase/firebase-js-sdk/pull/1206 return (existingApp || firebase.initializeApp(options, config as any)) as FirebaseApp; } diff --git a/src/core/package.json b/src/core/package.json index 68835c85b..999ffaf63 100644 --- a/src/core/package.json +++ b/src/core/package.json @@ -1,5 +1,5 @@ { - "name": "angularfire2", + "name": "@angular/fire", "version": "ANGULARFIRE2_VERSION", "description": "The core module", "main": "./bundles/core.umd.js", diff --git a/src/core/tsconfig-build.json b/src/core/tsconfig-build.json index c925ea949..8097ff501 100644 --- a/src/core/tsconfig-build.json +++ b/src/core/tsconfig-build.json @@ -25,6 +25,6 @@ "strictMetadataEmit": true, "enableSummariesForJit": true, "flatModuleOutFile": "index.js", - "flatModuleId": "angularfire2" + "flatModuleId": "@angular/fire" } } diff --git a/src/core/tsconfig-esm.json b/src/core/tsconfig-esm.json index f67abce8a..3d1f35a60 100644 --- a/src/core/tsconfig-esm.json +++ b/src/core/tsconfig-esm.json @@ -14,6 +14,6 @@ "strictMetadataEmit": true, "enableSummariesForJit": false, "flatModuleOutFile": "index.js", - "flatModuleId": "angularfire2" + "flatModuleId": "@angular/fire" } } diff --git a/src/core/tsconfig-test.json b/src/core/tsconfig-test.json index fc0dc883b..f6ca2b3c2 100644 --- a/src/core/tsconfig-test.json +++ b/src/core/tsconfig-test.json @@ -3,7 +3,7 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/database-deprecated/database.ts b/src/database-deprecated/database.ts index d4ba4919b..dc797fe82 100644 --- a/src/database-deprecated/database.ts +++ b/src/database-deprecated/database.ts @@ -5,7 +5,7 @@ import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts, PathReference } fro import { FirebaseObjectFactory } from './firebase_object_factory'; import { FirebaseObjectObservable } from './firebase_object_observable'; import * as utils from './utils'; -import { FirebaseDatabase, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, RealtimeDatabaseURL, _firebaseAppFactory } from 'angularfire2'; +import { FirebaseDatabase, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, RealtimeDatabaseURL, _firebaseAppFactory } from '@angular/fire'; @Injectable() export class AngularFireDatabase { diff --git a/src/database-deprecated/firebase_list_factory.spec.ts b/src/database-deprecated/firebase_list_factory.spec.ts index 2fab28383..ec725a6d0 100644 --- a/src/database-deprecated/firebase_list_factory.spec.ts +++ b/src/database-deprecated/firebase_list_factory.spec.ts @@ -1,9 +1,9 @@ import { DataSnapshot } from '@firebase/database-types'; -import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from 'angularfire2'; +import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from '@angular/fire'; import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseListObservable, FirebaseListFactory, onChildAdded, onChildChanged, onChildRemoved, onChildUpdated, FirebaseObjectFactory -} from 'angularfire2/database-deprecated'; +} from '@angular/fire/database-deprecated'; import { TestBed, inject } from '@angular/core/testing'; import * as utils from './utils'; import { Query, AFUnwrappedDataSnapshot } from './interfaces'; diff --git a/src/database-deprecated/firebase_list_factory.ts b/src/database-deprecated/firebase_list_factory.ts index a1cacae31..9136e5803 100644 --- a/src/database-deprecated/firebase_list_factory.ts +++ b/src/database-deprecated/firebase_list_factory.ts @@ -1,5 +1,5 @@ import { NgZone } from '@angular/core'; -import { FirebaseZoneScheduler } from 'angularfire2'; +import { FirebaseZoneScheduler } from '@angular/fire'; import * as utils from './utils'; import { AFUnwrappedDataSnapshot } from './interfaces'; import { FirebaseListObservable } from './firebase_list_observable'; diff --git a/src/database-deprecated/firebase_list_observable.spec.ts b/src/database-deprecated/firebase_list_observable.spec.ts index 0ff28d7a4..5afdb184d 100644 --- a/src/database-deprecated/firebase_list_observable.spec.ts +++ b/src/database-deprecated/firebase_list_observable.spec.ts @@ -1,5 +1,5 @@ -import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from 'angularfire2'; -import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseListObservable, FirebaseObjectFactory } from 'angularfire2/database-deprecated'; +import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from '@angular/fire'; +import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseListObservable, FirebaseObjectFactory } from '@angular/fire/database-deprecated'; import { Observer } from 'rxjs'; import { map } from 'rxjs/operators'; import { unwrapMapFn } from './utils'; diff --git a/src/database-deprecated/firebase_object_factory.spec.ts b/src/database-deprecated/firebase_object_factory.spec.ts index 95e834a9d..d1273c358 100644 --- a/src/database-deprecated/firebase_object_factory.spec.ts +++ b/src/database-deprecated/firebase_object_factory.spec.ts @@ -1,6 +1,6 @@ import { Subscription } from 'rxjs'; -import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2'; -import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseObjectObservable, FirebaseObjectFactory } from 'angularfire2/database-deprecated'; +import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from '@angular/fire'; +import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseObjectObservable, FirebaseObjectFactory } from '@angular/fire/database-deprecated'; import { TestBed, inject } from '@angular/core/testing'; import { COMMON_CONFIG } from './test-config'; import { Reference } from './interfaces' diff --git a/src/database-deprecated/firebase_object_factory.ts b/src/database-deprecated/firebase_object_factory.ts index 1b76586c2..48e1d34db 100644 --- a/src/database-deprecated/firebase_object_factory.ts +++ b/src/database-deprecated/firebase_object_factory.ts @@ -1,6 +1,6 @@ import { NgZone } from '@angular/core'; import { FirebaseObjectObservable } from './firebase_object_observable'; -import { FirebaseZoneScheduler } from 'angularfire2'; +import { FirebaseZoneScheduler } from '@angular/fire'; import { Observer } from 'rxjs'; import { observeOn } from 'rxjs/operators'; import * as utils from './utils'; diff --git a/src/database-deprecated/firebase_object_observable.spec.ts b/src/database-deprecated/firebase_object_observable.spec.ts index 24267251e..d330041a7 100644 --- a/src/database-deprecated/firebase_object_observable.spec.ts +++ b/src/database-deprecated/firebase_object_observable.spec.ts @@ -1,7 +1,7 @@ import { TestBed, inject } from '@angular/core/testing'; -import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2'; +import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from '@angular/fire'; import { COMMON_CONFIG } from './test-config'; -import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseObjectObservable } from 'angularfire2/database-deprecated'; +import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseObjectObservable } from '@angular/fire/database-deprecated'; import { Observer } from 'rxjs'; import { map } from 'rxjs/operators'; import { Reference } from './interfaces'; diff --git a/src/database-deprecated/package.json b/src/database-deprecated/package.json index 7a0b8df58..cc7de793e 100644 --- a/src/database-deprecated/package.json +++ b/src/database-deprecated/package.json @@ -1,5 +1,5 @@ { - "name": "angularfire2/database-deprecated", + "name": "@angular/fire/database-deprecated", "version": "ANGULARFIRE2_VERSION", "description": "The database module", "main": "../bundles/database.umd.js", @@ -17,7 +17,7 @@ "author": "angular,firebase", "license": "MIT", "peerDependencies": { - "angularfire2": "ANGULARFIRE2_VERSION", + "@angular/fire": "ANGULARFIRE2_VERSION", "@angular/common": "ANGULAR_VERSION", "@angular/core": "ANGULAR_VERSION", "@angular/platform-browser": "ANGULAR_VERSION", diff --git a/src/database-deprecated/query_observable.spec.ts b/src/database-deprecated/query_observable.spec.ts index 81389852e..a22a91916 100644 --- a/src/database-deprecated/query_observable.spec.ts +++ b/src/database-deprecated/query_observable.spec.ts @@ -2,7 +2,7 @@ import { Observable } from 'rxjs/Observable'; import { Observer } from 'rxjs/Observer'; import { Subject } from 'rxjs/Subject'; import { Query, ScalarQuery } from './interfaces'; -import { getOrderObservables, observeQuery } from 'angularfire2/database-deprecated'; +import { getOrderObservables, observeQuery } from '@angular/fire/database-deprecated'; function scalarQueryTest(query: ScalarQuery, done: any) { const queryObservable = observeQuery(query); diff --git a/src/database-deprecated/tsconfig-build.json b/src/database-deprecated/tsconfig-build.json index 25bded965..c3752636f 100644 --- a/src/database-deprecated/tsconfig-build.json +++ b/src/database-deprecated/tsconfig-build.json @@ -17,7 +17,7 @@ "skipLibCheck": true, "moduleResolution": "node", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/database-deprecated/tsconfig-esm.json b/src/database-deprecated/tsconfig-esm.json index 782820ee1..99b5c8520 100644 --- a/src/database-deprecated/tsconfig-esm.json +++ b/src/database-deprecated/tsconfig-esm.json @@ -14,6 +14,6 @@ "strictMetadataEmit": true, "enableSummariesForJit": false, "flatModuleOutFile": "index.js", - "flatModuleId": "angularfire2/database-deprecated" + "flatModuleId": "@angular/fire/database-deprecated" } } diff --git a/src/database-deprecated/tsconfig-test.json b/src/database-deprecated/tsconfig-test.json index fff4598b4..db42d1c76 100644 --- a/src/database-deprecated/tsconfig-test.json +++ b/src/database-deprecated/tsconfig-test.json @@ -3,8 +3,8 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "angularfire2": ["../../dist/packages-dist"], - "angularfire2/database-deprecated": ["../../dist/packages-dist/database-deprecated"] + "@angular/fire": ["../../dist/packages-dist"], + "@angular/fire/database-deprecated": ["../../dist/packages-dist/database-deprecated"] } }, "files": [ diff --git a/src/database-deprecated/utils.ts b/src/database-deprecated/utils.ts index 455deff07..1ec0ae770 100644 --- a/src/database-deprecated/utils.ts +++ b/src/database-deprecated/utils.ts @@ -1,6 +1,6 @@ import { Subscription, Scheduler, queueScheduler as queue } from 'rxjs'; import { DataSnapshot, AFUnwrappedDataSnapshot, PathReference, DatabaseReference } from './interfaces'; -import { FirebaseDatabase } from 'angularfire2'; +import { FirebaseDatabase } from '@angular/fire'; const REGEX_ABSOLUTE_URL = /^[a-z]+:\/\/.*/; diff --git a/src/database/database.spec.ts b/src/database/database.spec.ts index febb15f9e..14654b1a2 100644 --- a/src/database/database.spec.ts +++ b/src/database/database.spec.ts @@ -1,5 +1,5 @@ -import { FirebaseApp, AngularFireModule, FirebaseOptionsToken, FirebaseNameOrConfigToken } from 'angularfire2'; -import { AngularFireDatabase, AngularFireDatabaseModule, RealtimeDatabaseURL } from 'angularfire2/database'; +import { FirebaseApp, AngularFireModule, FirebaseOptionsToken, FirebaseNameOrConfigToken } from '@angular/fire'; +import { AngularFireDatabase, AngularFireDatabaseModule, RealtimeDatabaseURL } from '@angular/fire/database'; import { TestBed, inject } from '@angular/core/testing'; import { COMMON_CONFIG } from './test-config'; import { NgZone } from '@angular/core'; diff --git a/src/database/database.ts b/src/database/database.ts index c154cb82b..cddac9ec5 100644 --- a/src/database/database.ts +++ b/src/database/database.ts @@ -4,7 +4,7 @@ import { getRef } from './utils'; import { InjectionToken } from '@angular/core'; import { createListReference } from './list/create-reference'; import { createObjectReference } from './object/create-reference'; -import { FirebaseDatabase, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, RealtimeDatabaseURL, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2'; +import { FirebaseDatabase, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, RealtimeDatabaseURL, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire'; @Injectable() export class AngularFireDatabase { diff --git a/src/database/list/audit-trail.spec.ts b/src/database/list/audit-trail.spec.ts index c865aeb4c..b2cc9d0a7 100644 --- a/src/database/list/audit-trail.spec.ts +++ b/src/database/list/audit-trail.spec.ts @@ -1,6 +1,6 @@ import { DatabaseReference } from '../interfaces'; -import { FirebaseApp, AngularFireModule } from 'angularfire2'; -import { AngularFireDatabase, AngularFireDatabaseModule, auditTrail, ChildEvent } from 'angularfire2/database'; +import { FirebaseApp, AngularFireModule } from '@angular/fire'; +import { AngularFireDatabase, AngularFireDatabaseModule, auditTrail, ChildEvent } from '@angular/fire/database'; import { TestBed, inject } from '@angular/core/testing'; import { COMMON_CONFIG } from '../test-config'; import { skip } from 'rxjs/operators'; diff --git a/src/database/list/changes.spec.ts b/src/database/list/changes.spec.ts index 147252c7a..d3be6eaac 100644 --- a/src/database/list/changes.spec.ts +++ b/src/database/list/changes.spec.ts @@ -1,6 +1,6 @@ import { database } from 'firebase'; -import { FirebaseApp, AngularFireModule } from 'angularfire2'; -import { AngularFireDatabase, AngularFireDatabaseModule, listChanges } from 'angularfire2/database'; +import { FirebaseApp, AngularFireModule } from '@angular/fire'; +import { AngularFireDatabase, AngularFireDatabaseModule, listChanges } from '@angular/fire/database'; import { TestBed, inject } from '@angular/core/testing'; import { COMMON_CONFIG } from '../test-config'; import { skip, take } from 'rxjs/operators'; diff --git a/src/database/list/snapshot-changes.spec.ts b/src/database/list/snapshot-changes.spec.ts index c4df5849e..fbd02d477 100644 --- a/src/database/list/snapshot-changes.spec.ts +++ b/src/database/list/snapshot-changes.spec.ts @@ -1,6 +1,6 @@ import { database } from 'firebase'; -import { FirebaseApp, AngularFireModule } from 'angularfire2'; -import { AngularFireDatabase, AngularFireDatabaseModule, snapshotChanges, ChildEvent } from 'angularfire2/database'; +import { FirebaseApp, AngularFireModule } from '@angular/fire'; +import { AngularFireDatabase, AngularFireDatabaseModule, snapshotChanges, ChildEvent } from '@angular/fire/database'; import { TestBed, inject } from '@angular/core/testing'; import { COMMON_CONFIG } from '../test-config'; import { BehaviorSubject } from 'rxjs'; diff --git a/src/database/list/state-changes.spec.ts b/src/database/list/state-changes.spec.ts index d594cb5cf..4675afd2a 100644 --- a/src/database/list/state-changes.spec.ts +++ b/src/database/list/state-changes.spec.ts @@ -1,6 +1,6 @@ import { database } from 'firebase'; -import { FirebaseApp, AngularFireModule } from 'angularfire2'; -import { AngularFireDatabase, AngularFireDatabaseModule, stateChanges, ChildEvent } from 'angularfire2/database'; +import { FirebaseApp, AngularFireModule } from '@angular/fire'; +import { AngularFireDatabase, AngularFireDatabaseModule, stateChanges, ChildEvent } from '@angular/fire/database'; import { TestBed, inject } from '@angular/core/testing'; import { COMMON_CONFIG } from '../test-config'; import { skip } from 'rxjs/operators'; diff --git a/src/database/observable/fromRef.spec.ts b/src/database/observable/fromRef.spec.ts index 5d58a6ea7..b734ea638 100644 --- a/src/database/observable/fromRef.spec.ts +++ b/src/database/observable/fromRef.spec.ts @@ -1,6 +1,6 @@ import { DatabaseReference } from '../interfaces'; -import { FirebaseApp, AngularFireModule } from 'angularfire2'; -import { AngularFireDatabase, AngularFireDatabaseModule, fromRef } from 'angularfire2/database'; +import { FirebaseApp, AngularFireModule } from '@angular/fire'; +import { AngularFireDatabase, AngularFireDatabaseModule, fromRef } from '@angular/fire/database'; import { TestBed, inject } from '@angular/core/testing'; import { COMMON_CONFIG } from '../test-config'; import { take } from 'rxjs/operators'; diff --git a/src/database/observable/fromRef.ts b/src/database/observable/fromRef.ts index ba19935fa..e3ccf8ba5 100644 --- a/src/database/observable/fromRef.ts +++ b/src/database/observable/fromRef.ts @@ -1,6 +1,6 @@ import { DatabaseQuery, DatabaseSnapshot, ListenEvent, AngularFireAction } from '../interfaces'; import { Observable } from 'rxjs'; -import { FirebaseZoneScheduler } from 'angularfire2'; +import { FirebaseZoneScheduler } from '@angular/fire'; import { map, delay, share } from 'rxjs/operators'; interface SnapshotPrevKey { diff --git a/src/database/package.json b/src/database/package.json index a78e9212f..9b68f75aa 100644 --- a/src/database/package.json +++ b/src/database/package.json @@ -1,5 +1,5 @@ { - "name": "angularfire2/database", + "name": "@angular/fire/database", "version": "ANGULARFIRE2_VERSION", "description": "The database module", "main": "../bundles/database.umd.js", @@ -17,7 +17,7 @@ "author": "angular,firebase", "license": "MIT", "peerDependencies": { - "angularfire2": "ANGULARFIRE2_VERSION", + "@angular/fire": "ANGULARFIRE2_VERSION", "@angular/common": "ANGULAR_VERSION", "@angular/core": "ANGULAR_VERSION", "@angular/platform-browser": "ANGULAR_VERSION", diff --git a/src/database/tsconfig-build.json b/src/database/tsconfig-build.json index 878236200..9da54db36 100644 --- a/src/database/tsconfig-build.json +++ b/src/database/tsconfig-build.json @@ -17,7 +17,7 @@ "skipLibCheck": true, "moduleResolution": "node", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/database/tsconfig-esm.json b/src/database/tsconfig-esm.json index 2a3460f2f..233ca6941 100644 --- a/src/database/tsconfig-esm.json +++ b/src/database/tsconfig-esm.json @@ -14,6 +14,6 @@ "strictMetadataEmit": true, "enableSummariesForJit": false, "flatModuleOutFile": "index.js", - "flatModuleId": "angularfire2/database" + "flatModuleId": "@angular/fire/database" } } diff --git a/src/database/tsconfig-test.json b/src/database/tsconfig-test.json index fc0dc883b..f6ca2b3c2 100644 --- a/src/database/tsconfig-test.json +++ b/src/database/tsconfig-test.json @@ -3,7 +3,7 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/database/utils.ts b/src/database/utils.ts index 43aa49243..a31b2429c 100644 --- a/src/database/utils.ts +++ b/src/database/utils.ts @@ -1,6 +1,6 @@ import { Subscription, Scheduler } from 'rxjs'; import { PathReference, DatabaseReference, FirebaseOperation, FirebaseOperationCases } from './interfaces'; -import { FirebaseDatabase } from 'angularfire2'; +import { FirebaseDatabase } from '@angular/fire'; export function isString(value: any): boolean { return typeof value === 'string'; diff --git a/src/firebase-node/index.js b/src/firebase-node/index.js index 2d2badb7a..b20549402 100644 --- a/src/firebase-node/index.js +++ b/src/firebase-node/index.js @@ -1,4 +1,4 @@ // Patches for loading angularfire in a Universal Context global['WebSocket'] = require("ws"); -global['XMLHttpRequest'] = require("xmlhttprequest").XMLHttpRequest; +global['XMLHttpRequest'] = require("xhr2"); diff --git a/src/firebase-node/package.json b/src/firebase-node/package.json index 831b63727..16f2bcb63 100644 --- a/src/firebase-node/package.json +++ b/src/firebase-node/package.json @@ -1,5 +1,5 @@ { - "name": "angularfire2", + "name": "@angular/fire/firebase-node", "version": "ANGULARFIRE2_VERSION", "description": "Fixes for Node.js", "main": "index.js", @@ -14,9 +14,11 @@ }, "author": "angular,firebase", "license": "MIT", - "peerDependencies": { - "xmlhttprequest": "XMLHTTPREQUEST_VERSION", - "ws": "WS_VERSION", + "dependencies": { + "xhr2": "XHR2_VERSION", + "ws": "WS_VERSION" + }, + "optionalDependencies": { "bufferutil": "BUFFERUTIL_VERSION", "utf-8-validate": "UTF_8_VALIDATE_VERSION" }, diff --git a/src/firestore/collection/collection.spec.ts b/src/firestore/collection/collection.spec.ts index 4e4605402..8134b9e35 100644 --- a/src/firestore/collection/collection.spec.ts +++ b/src/firestore/collection/collection.spec.ts @@ -1,4 +1,4 @@ -import { FirebaseApp, AngularFireModule } from 'angularfire2'; +import { FirebaseApp, AngularFireModule } from '@angular/fire'; import { AngularFirestore } from '../firestore'; import { AngularFirestoreModule } from '../firestore.module'; import { AngularFirestoreDocument } from '../document/document'; diff --git a/src/firestore/collection/collection.ts b/src/firestore/collection/collection.ts index 610bdb3b6..e3c86d0b7 100644 --- a/src/firestore/collection/collection.ts +++ b/src/firestore/collection/collection.ts @@ -7,7 +7,7 @@ import { DocumentChangeType, CollectionReference, Query, DocumentReference, Docu import { docChanges, sortedChanges } from './changes'; import { AngularFirestoreDocument } from '../document/document'; import { AngularFirestore } from '../firestore'; -import { runInZone } from 'angularfire2'; +import { runInZone } from '@angular/fire'; export function validateEventsArray(events?: DocumentChangeType[]) { if(!events || events!.length === 0) { diff --git a/src/firestore/document/document.spec.ts b/src/firestore/document/document.spec.ts index 276f4c645..8552934fd 100644 --- a/src/firestore/document/document.spec.ts +++ b/src/firestore/document/document.spec.ts @@ -1,4 +1,4 @@ -import { FirebaseApp, AngularFireModule } from 'angularfire2'; +import { FirebaseApp, AngularFireModule } from '@angular/fire'; import { AngularFirestore } from '../firestore'; import { AngularFirestoreModule } from '../firestore.module'; import { AngularFirestoreDocument } from '../document/document'; diff --git a/src/firestore/document/document.ts b/src/firestore/document/document.ts index dca90ca99..79a51a8aa 100644 --- a/src/firestore/document/document.ts +++ b/src/firestore/document/document.ts @@ -6,7 +6,7 @@ import { map } from 'rxjs/operators'; import { AngularFirestore, associateQuery } from '../firestore'; import { AngularFirestoreCollection } from '../collection/collection'; import { firestore } from 'firebase'; -import { runInZone } from 'angularfire2'; +import { runInZone } from '@angular/fire'; /** * AngularFirestoreDocument service diff --git a/src/firestore/firestore.spec.ts b/src/firestore/firestore.spec.ts index c6d0a5221..9a0d12b46 100644 --- a/src/firestore/firestore.spec.ts +++ b/src/firestore/firestore.spec.ts @@ -1,4 +1,4 @@ -import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from 'angularfire2'; +import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire'; import { AngularFirestore } from './firestore'; import { AngularFirestoreModule } from './firestore.module'; import { AngularFirestoreDocument } from './document/document'; diff --git a/src/firestore/firestore.ts b/src/firestore/firestore.ts index 646976461..1027feec5 100644 --- a/src/firestore/firestore.ts +++ b/src/firestore/firestore.ts @@ -8,7 +8,7 @@ import { Settings, CollectionReference, DocumentReference, QueryFn, AssociatedRe import { AngularFirestoreDocument } from './document/document'; import { AngularFirestoreCollection } from './collection/collection'; -import { FirebaseFirestore, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2'; +import { FirebaseFirestore, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire'; import { isPlatformBrowser } from '@angular/common'; /** @@ -47,7 +47,7 @@ export function associateQuery(collectionRef: CollectionReference, queryFn = ref * Example: * * import { Component } from '@angular/core'; - * import { AngularFirestore, AngularFirestoreCollection, AngularFirestoreDocument } from 'angularfire2/firestore'; + * import { AngularFirestore, AngularFirestoreCollection, AngularFirestoreDocument } from '@angular/fire/firestore'; * import { Observable } from 'rxjs/Observable'; * import { from } from 'rxjs/observable/from'; * diff --git a/src/firestore/package.json b/src/firestore/package.json index a0234d269..fe2fd830b 100644 --- a/src/firestore/package.json +++ b/src/firestore/package.json @@ -1,5 +1,5 @@ { - "name": "angularfire2/firestore", + "name": "@angular/fire/firestore", "version": "ANGULARFIRE2_VERSION", "description": "The firestore module", "main": "../bundles/firestore.umd.js", @@ -17,7 +17,7 @@ "author": "angular,firebase", "license": "MIT", "peerDependencies": { - "angularfire2": "ANGULARFIRE2_VERSION", + "@angular/fire": "ANGULARFIRE2_VERSION", "@angular/common": "ANGULAR_VERSION", "@angular/core": "ANGULAR_VERSION", "@angular/platform-browser": "ANGULAR_VERSION", diff --git a/src/firestore/tsconfig-build.json b/src/firestore/tsconfig-build.json index 4475d198a..ab31c053f 100644 --- a/src/firestore/tsconfig-build.json +++ b/src/firestore/tsconfig-build.json @@ -17,8 +17,8 @@ "skipLibCheck": true, "moduleResolution": "node", "paths": { - "angularfire2": ["../../dist/packages-dist"], - "angularfire2/firestore": ["../../dist/packages-dist/firestore"], + "@angular/fire": ["../../dist/packages-dist"], + "@angular/fire/firestore": ["../../dist/packages-dist/firestore"], "firestore": ["../../node_modules/firestore"] } }, diff --git a/src/firestore/tsconfig-esm.json b/src/firestore/tsconfig-esm.json index 80f14d4cb..6e4668de1 100644 --- a/src/firestore/tsconfig-esm.json +++ b/src/firestore/tsconfig-esm.json @@ -14,6 +14,6 @@ "strictMetadataEmit": true, "enableSummariesForJit": false, "flatModuleOutFile": "index.js", - "flatModuleId": "angularfire2/firestore" + "flatModuleId": "@angular/fire/firestore" } } diff --git a/src/firestore/tsconfig-test.json b/src/firestore/tsconfig-test.json index c8816448e..b6413c897 100644 --- a/src/firestore/tsconfig-test.json +++ b/src/firestore/tsconfig-test.json @@ -4,8 +4,8 @@ "baseUrl": ".", "target": "es2015", "paths": { - "angularfire2": ["../../dist/packages-dist"], - "angularfire2/firestore": ["../../dist/packages-dist/firestore"] + "@angular/fire": ["../../dist/packages-dist"], + "@angular/fire/firestore": ["../../dist/packages-dist/firestore"] } }, "files": [ diff --git a/src/functions/functions.spec.ts b/src/functions/functions.spec.ts index ec0a8109e..8f8b7e9be 100644 --- a/src/functions/functions.spec.ts +++ b/src/functions/functions.spec.ts @@ -1,7 +1,7 @@ import { ReflectiveInjector, Provider } from '@angular/core'; import { TestBed, inject } from '@angular/core/testing'; -import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from 'angularfire2'; -import { AngularFireFunctions, AngularFireFunctionsModule } from 'angularfire2/functions'; +import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire'; +import { AngularFireFunctions, AngularFireFunctionsModule } from '@angular/fire/functions'; import { COMMON_CONFIG } from './test-config'; describe('AngularFireFunctions', () => { diff --git a/src/functions/functions.ts b/src/functions/functions.ts index 20aefcb3a..60003b627 100644 --- a/src/functions/functions.ts +++ b/src/functions/functions.ts @@ -2,9 +2,9 @@ import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core import { Observable, from } from 'rxjs'; import { map } from 'rxjs/operators'; -import { FirebaseOptions, FirebaseAppConfig } from 'angularfire2'; +import { FirebaseOptions, FirebaseAppConfig } from '@angular/fire'; -import { FirebaseFunctions, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2'; +import { FirebaseFunctions, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire'; @Injectable() export class AngularFireFunctions { diff --git a/src/functions/package.json b/src/functions/package.json index 23a99d64b..b7961b880 100644 --- a/src/functions/package.json +++ b/src/functions/package.json @@ -1,5 +1,5 @@ { - "name": "angularfire2/functions", + "name": "@angular/fire/functions", "version": "ANGULARFIRE2_VERSION", "description": "The functions module", "main": "../bundles/functions.umd.js", @@ -17,7 +17,7 @@ "author": "angular,firebase", "license": "MIT", "peerDependencies": { - "angularfire2": "ANGULARFIRE2_VERSION", + "@angular/fire": "ANGULARFIRE2_VERSION", "@angular/common": "ANGULAR_VERSION", "@angular/core": "ANGULAR_VERSION", "@angular/platform-browser": "ANGULAR_VERSION", diff --git a/src/functions/tsconfig-build.json b/src/functions/tsconfig-build.json index 97c12201b..481083e2c 100644 --- a/src/functions/tsconfig-build.json +++ b/src/functions/tsconfig-build.json @@ -17,7 +17,7 @@ "skipLibCheck": true, "moduleResolution": "node", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/functions/tsconfig-esm.json b/src/functions/tsconfig-esm.json index c5d589d43..7d24ee380 100644 --- a/src/functions/tsconfig-esm.json +++ b/src/functions/tsconfig-esm.json @@ -14,6 +14,6 @@ "strictMetadataEmit": true, "enableSummariesForJit": false, "flatModuleOutFile": "index.js", - "flatModuleId": "angularfire2/functions" + "flatModuleId": "@angular/fire/functions" } } diff --git a/src/functions/tsconfig-test.json b/src/functions/tsconfig-test.json index 2f96c7bb9..d534f733d 100644 --- a/src/functions/tsconfig-test.json +++ b/src/functions/tsconfig-test.json @@ -3,8 +3,8 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "angularfire2": ["../../dist/packages-dist"], - "angularfire2/functions": ["../../dist/packages-dist/functions"] + "@angular/fire": ["../../dist/packages-dist"], + "@angular/fire/functions": ["../../dist/packages-dist/functions"] } }, "files": [ diff --git a/src/messaging/messaging.ts b/src/messaging/messaging.ts index 2fc84fc18..89c4fce64 100644 --- a/src/messaging/messaging.ts +++ b/src/messaging/messaging.ts @@ -3,8 +3,8 @@ import { isPlatformBrowser } from '@angular/common'; import { messaging } from 'firebase'; import { Observable, empty, from, of, throwError } from 'rxjs'; import { mergeMap, catchError, map, switchMap, concat, defaultIfEmpty } from 'rxjs/operators'; -import { FirebaseOptions, FirebaseAppConfig, runOutsideAngular } from 'angularfire2'; -import { FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2'; +import { FirebaseOptions, FirebaseAppConfig, runOutsideAngular } from '@angular/fire'; +import { FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire'; @Injectable() export class AngularFireMessaging { diff --git a/src/messaging/package.json b/src/messaging/package.json index 360fc5520..f881d7f59 100644 --- a/src/messaging/package.json +++ b/src/messaging/package.json @@ -1,5 +1,5 @@ { - "name": "angularfire2/messaging", + "name": "@angular/fire/messaging", "version": "ANGULARFIRE2_VERSION", "description": "The messaging module", "main": "../bundles/messaging.umd.js", @@ -17,7 +17,7 @@ "author": "angular,firebase", "license": "MIT", "peerDependencies": { - "angularfire2": "ANGULARFIRE2_VERSION", + "@angular/fire": "ANGULARFIRE2_VERSION", "@angular/common": "ANGULAR_VERSION", "@angular/core": "ANGULAR_VERSION", "@angular/platform-browser": "ANGULAR_VERSION", diff --git a/src/messaging/tsconfig-build.json b/src/messaging/tsconfig-build.json index 749fa92b6..6626a4aac 100644 --- a/src/messaging/tsconfig-build.json +++ b/src/messaging/tsconfig-build.json @@ -17,7 +17,7 @@ "skipLibCheck": true, "moduleResolution": "node", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/messaging/tsconfig-esm.json b/src/messaging/tsconfig-esm.json index 0b3d05820..2ae4eb6e2 100644 --- a/src/messaging/tsconfig-esm.json +++ b/src/messaging/tsconfig-esm.json @@ -14,6 +14,6 @@ "strictMetadataEmit": true, "enableSummariesForJit": false, "flatModuleOutFile": "index.js", - "flatModuleId": "angularfire2/messaging" + "flatModuleId": "@angular/fire/messaging" } } diff --git a/src/messaging/tsconfig-test.json b/src/messaging/tsconfig-test.json index fc0dc883b..f6ca2b3c2 100644 --- a/src/messaging/tsconfig-test.json +++ b/src/messaging/tsconfig-test.json @@ -3,7 +3,7 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/storage/package.json b/src/storage/package.json index 59187a236..60027bf9a 100644 --- a/src/storage/package.json +++ b/src/storage/package.json @@ -1,5 +1,5 @@ { - "name": "angularfire2/storage", + "name": "@angular/fire/storage", "version": "ANGULARFIRE2_VERSION", "description": "The storage module", "main": "../bundles/storage.umd.js", @@ -17,7 +17,7 @@ "author": "angular,firebase", "license": "MIT", "peerDependencies": { - "angularfire2": "ANGULARFIRE2_VERSION", + "@angular/fire": "ANGULARFIRE2_VERSION", "@angular/common": "ANGULAR_VERSION", "@angular/core": "ANGULAR_VERSION", "@angular/platform-browser": "ANGULAR_VERSION", diff --git a/src/storage/ref.ts b/src/storage/ref.ts index a583720d4..8b7c1e276 100644 --- a/src/storage/ref.ts +++ b/src/storage/ref.ts @@ -1,7 +1,7 @@ import { SettableMetadata, UploadMetadata, Reference, StringFormat } from './interfaces'; import { createUploadTask, AngularFireUploadTask } from './task'; import { Observable, from } from 'rxjs'; -import { FirebaseZoneScheduler } from 'angularfire2'; +import { FirebaseZoneScheduler } from '@angular/fire'; export interface AngularFireStorageReference { getDownloadURL(): Observable; diff --git a/src/storage/storage.spec.ts b/src/storage/storage.spec.ts index fd925a244..8104e13b5 100644 --- a/src/storage/storage.spec.ts +++ b/src/storage/storage.spec.ts @@ -1,8 +1,8 @@ import { Observable, forkJoin } from 'rxjs' import { map, mergeMap, tap } from 'rxjs/operators'; import { TestBed, inject } from '@angular/core/testing'; -import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from 'angularfire2'; -import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, StorageBucket } from 'angularfire2/storage'; +import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire'; +import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, StorageBucket } from '@angular/fire/storage'; import { COMMON_CONFIG } from './test-config'; describe('AngularFireStorage', () => { diff --git a/src/storage/storage.ts b/src/storage/storage.ts index 211b49bce..4cbadd2f4 100644 --- a/src/storage/storage.ts +++ b/src/storage/storage.ts @@ -2,7 +2,7 @@ import { Injectable, Inject, Optional, InjectionToken, NgZone, PLATFORM_ID } fro import { createStorageRef, AngularFireStorageReference } from './ref'; import { createUploadTask, AngularFireUploadTask } from './task'; import { Observable } from 'rxjs'; -import { FirebaseStorage, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, FirebaseZoneScheduler, _firebaseAppFactory } from 'angularfire2'; +import { FirebaseStorage, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, FirebaseZoneScheduler, _firebaseAppFactory } from '@angular/fire'; import { UploadMetadata } from './interfaces'; diff --git a/src/storage/tsconfig-build.json b/src/storage/tsconfig-build.json index 66527f81d..36d48e18b 100644 --- a/src/storage/tsconfig-build.json +++ b/src/storage/tsconfig-build.json @@ -17,7 +17,7 @@ "skipLibCheck": true, "moduleResolution": "node", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/storage/tsconfig-esm.json b/src/storage/tsconfig-esm.json index bf52d5164..41a56585e 100644 --- a/src/storage/tsconfig-esm.json +++ b/src/storage/tsconfig-esm.json @@ -14,6 +14,6 @@ "strictMetadataEmit": true, "enableSummariesForJit": false, "flatModuleOutFile": "index.js", - "flatModuleId": "angularfire2/storage" + "flatModuleId": "@angular/fire/storage" } } diff --git a/src/storage/tsconfig-test.json b/src/storage/tsconfig-test.json index fc0dc883b..f6ca2b3c2 100644 --- a/src/storage/tsconfig-test.json +++ b/src/storage/tsconfig-test.json @@ -3,7 +3,7 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "angularfire2": ["../../dist/packages-dist"] + "@angular/fire": ["../../dist/packages-dist"] } }, "files": [ diff --git a/src/tsconfig.json b/src/tsconfig.json index 241f63939..fd90550e8 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -10,14 +10,14 @@ "noImplicitAny": false, "noFallthroughCasesInSwitch": true, "paths": { - "angularfire2": ["./core"], - "angularfire2/auth": ["./auth"], - "angularfire2/database": ["./database"], - "angularfire2/firestore": ["./firestore"], - "angularfire2/functions": ["./functions"], - "angularfire2/storage": ["./storage"], - "angularfire2/messaging": ["./messaging"], - "angularfire2/database-deprecated": ["./database-deprecated"] + "@angular/fire": ["./core"], + "@angular/fire/auth": ["./auth"], + "@angular/fire/database": ["./database"], + "@angular/fire/firestore": ["./firestore"], + "@angular/fire/functions": ["./functions"], + "@angular/fire/storage": ["./storage"], + "@angular/fire/messaging": ["./messaging"], + "@angular/fire/database-deprecated": ["./database-deprecated"] }, "rootDir": ".", "inlineSourceMap": true, diff --git a/test/ng-build/ng6/package.json b/test/ng-build/ng6/package.json index 021b66633..bd5b5079c 100644 --- a/test/ng-build/ng6/package.json +++ b/test/ng-build/ng6/package.json @@ -22,7 +22,7 @@ "@angular/platform-browser": "6.0.1", "@angular/platform-browser-dynamic": "6.0.1", "@angular/router": "6.0.1", - "angularfire2": "../../../dist/packages-dist", + "@angular/fire": "../../../dist/packages-dist", "core-js": "^2.4.1", "rxjs": "^6.0.0", "zone.js": "^0.8.14" diff --git a/test/ng-build/ng6/src/app/app.component.ts b/test/ng-build/ng6/src/app/app.component.ts index 418bccb71..ce3de1251 100644 --- a/test/ng-build/ng6/src/app/app.component.ts +++ b/test/ng-build/ng6/src/app/app.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; -import { FirebaseApp } from 'angularfire2'; -import { AngularFireDatabase } from 'angularfire2/database'; -import { AngularFireAuth } from 'angularfire2/auth'; -import { AngularFirestore } from 'angularfire2/firestore'; +import { FirebaseApp } from '@angular/fire'; +import { AngularFireDatabase } from '@angular/fire/database'; +import { AngularFireAuth } from '@angular/fire/auth'; +import { AngularFirestore } from '@angular/fire/firestore'; @Component({ selector: 'app-root', diff --git a/test/ng-build/ng6/src/app/app.module.ts b/test/ng-build/ng6/src/app/app.module.ts index 495803d7c..03339d1c0 100644 --- a/test/ng-build/ng6/src/app/app.module.ts +++ b/test/ng-build/ng6/src/app/app.module.ts @@ -1,9 +1,9 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; -import { FirebaseOptionsToken, AngularFireModule } from 'angularfire2'; -import { AngularFireDatabaseModule } from 'angularfire2/database'; -import { AngularFireAuthModule } from 'angularfire2/auth'; -import { AngularFirestoreModule } from 'angularfire2/firestore'; +import { FirebaseOptionsToken, AngularFireModule } from '@angular/fire'; +import { AngularFireDatabaseModule } from '@angular/fire/database'; +import { AngularFireAuthModule } from '@angular/fire/auth'; +import { AngularFirestoreModule } from '@angular/fire/firestore'; import { AppComponent } from './app.component'; diff --git a/test/ng-build/ng6/yarn.lock b/test/ng-build/ng6/yarn.lock index dc8d85fd7..5465a8485 100644 --- a/test/ng-build/ng6/yarn.lock +++ b/test/ng-build/ng6/yarn.lock @@ -140,6 +140,9 @@ dependencies: tslib "^1.9.0" +"@angular/fire@../../../dist/packages-dist": + version "5.0.0" + "@angular/forms@6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.1.tgz#8ac4fbcd857a53613e8bcd58127e137d5ff0c98f" @@ -283,9 +286,6 @@ amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" -angularfire2@../../../dist/packages-dist: - version "5.0.0-rc.8" - ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" diff --git a/test/typings-test/package.sample.json b/test/typings-test/package.sample.json index efbf7183d..52563ed57 100644 --- a/test/typings-test/package.sample.json +++ b/test/typings-test/package.sample.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "angularfire2": "file:{{ANGULARFIRE_VERSION}}", + "@angular/firebase": "file:{{ANGULARFIRE_VERSION}}", "firebase": "{{FIREBASE_VERSION}}", "@angular/common": "{{ANGULAR_VERSION}}", "@angular/compiler": "{{ANGULAR_VERSION}}", diff --git a/test/universal-test/src/app/app.component.ts b/test/universal-test/src/app/app.component.ts index a1a1cd4ea..ad758fca9 100644 --- a/test/universal-test/src/app/app.component.ts +++ b/test/universal-test/src/app/app.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { AngularFireDatabase } from 'angularfire2/database'; +import { AngularFireDatabase } from '@angular/fire/database'; @Component({ selector: 'app-root', template: ` diff --git a/test/universal-test/src/app/app.module.ts b/test/universal-test/src/app/app.module.ts index 0486ead52..0c7fbee69 100644 --- a/test/universal-test/src/app/app.module.ts +++ b/test/universal-test/src/app/app.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { AngularFireModule } from 'angularfire2'; -import { AngularFireDatabaseModule } from 'angularfire2/database'; +import { AngularFireModule } from '@angular/fire'; +import { AngularFireDatabaseModule } from '@angular/fire/database'; import { AppComponent } from './app.component'; @NgModule({ diff --git a/tools/build.js b/tools/build.js index 004b17050..5882c7dd4 100644 --- a/tools/build.js +++ b/tools/build.js @@ -24,14 +24,14 @@ const GLOBALS = { 'firebase/firestore': 'firebase', 'firebase/functions': 'firebase', 'firebase/storage': 'firebase', - 'angularfire2': 'angularfire2', - 'angularfire2/auth': 'angularfire2.auth', - 'angularfire2/database': 'angularfire2.database', - 'angularfire2/database-deprecated': 'angularfire2.database_deprecated', - 'angularfire2/firestore': 'angularfire2.firestore', - 'angularfire2/functions': 'angularfire2.functions', - 'angularfire2/storage': 'angularfire2.storage', - 'angularfire2/messaging': 'angularfire2.messaging', + '@angular/fire': 'angularfire2', + '@angular/fire/auth': 'angularfire2.auth', + '@angular/fire/database': 'angularfire2.database', + '@angular/fire/database-deprecated': 'angularfire2.database_deprecated', + '@angular/fire/firestore': 'angularfire2.firestore', + '@angular/fire/functions': 'angularfire2.functions', + '@angular/fire/storage': 'angularfire2.storage', + '@angular/fire/messaging': 'angularfire2.messaging', }; // Map of dependency versions across all packages @@ -43,9 +43,9 @@ const VERSIONS = { ANGULARFIRE2_VERSION: pkg.version, FIRESTORE_VERSION: pkg.dependencies['firestore'], WS_VERSION: pkg.dependencies['ws'], - BUFFERUTIL_VERSION: pkg.dependencies['bufferutil'], - UTF_8_VALIDATE_VERSION: pkg.dependencies['utf-8-validate'], - XMLHTTPREQUEST_VERSION: pkg.dependencies['xmlhttprequest'] + BUFFERUTIL_VERSION: pkg.optionalDependencies['bufferutil'], + UTF_8_VALIDATE_VERSION: pkg.optionalDependencies['utf-8-validate'], + XHR2_VERSION: pkg.dependencies['xhr2'] }; const MODULE_NAMES = { diff --git a/yarn.lock b/yarn.lock index e136d1a83..9ca7fa8fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -810,7 +810,7 @@ bufferutil@1.2.x: bindings "1.2.x" nan "^2.0.5" -bufferutil@^3.0.3: +bufferutil@~3.0.0: version "3.0.5" resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-3.0.5.tgz#8abfc3b6da7aca6a13268b3f2482f0c7aa05fffb" dependencies: @@ -5575,7 +5575,7 @@ utf-8-validate@1.2.x: bindings "~1.2.1" nan "~2.4.0" -utf-8-validate@^4.0.0: +utf-8-validate@~4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-4.0.2.tgz#deadcedfbf5ec535e3c72874e9ddc0663c139691" dependencies: @@ -5797,7 +5797,7 @@ xmlhttprequest-ssl@~1.5.4: version "1.5.5" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" -xmlhttprequest@1.8.0, xmlhttprequest@^1.8.0: +xmlhttprequest@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"