@angular/fire 7.5.0 → 7.6.0-canary.34e89a4

package/schematics/setup/prompts.js

@@ -243,61 +243,33 @@ const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0
     return (yield sites).find(it => common_1.shortSiteName(it) === siteName);
 });
 exports.sitePrompt = sitePrompt;
+const DEFAULT_REGION = 'us-central1';
+const ALLOWED_SSR_REGIONS = [
+    { name: 'us-central1 (Iowa)', value: 'us-central1' },
+    { name: 'us-west1 (Oregon)', value: 'us-west1' },
+    { name: 'us-east1 (South Carolina)', value: 'us-east1' },
+    { name: 'europe-west1 (Belgium)', value: 'europe-west1' },
+    { name: 'asia-east1 (Taiwan)', value: 'asia-east1' },
+];
 const projectTypePrompt = (project, name) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b, _c, _d, _e, _f, _g, _h, _j;
-    let prerender = false;
-    let nodeVersion;
+    var _b, _c, _d, _e, _f, _g;
     let serverTarget;
     let browserTarget = `${name}:build:${((_c = (_b = project.architect) === null || _b === void 0 ? void 0 : _b.build) === null || _c === void 0 ? void 0 : _c.defaultConfiguration) || 'production'}`;
     let prerenderTarget;
     if (utils_1.isUniversalApp(project)) {
         serverTarget = `${name}:server:${((_e = (_d = project.architect) === null || _d === void 0 ? void 0 : _d.server) === null || _e === void 0 ? void 0 : _e.defaultConfiguration) || 'production'}`;
         browserTarget = `${name}:build:${((_g = (_f = project.architect) === null || _f === void 0 ? void 0 : _f.build) === null || _g === void 0 ? void 0 : _g.defaultConfiguration) || 'production'}`;
-        if (utils_1.hasPrerenderOption(project)) {
-            prerenderTarget = `${name}:prerender:${((_j = (_h = project.architect) === null || _h === void 0 ? void 0 : _h.prerender) === null || _j === void 0 ? void 0 : _j.defaultConfiguration) || 'production'}`;
-            const { shouldPrerender } = yield inquirer.prompt({
-                type: 'confirm',
-                name: 'shouldPrerender',
-                message: 'Should we prerender before deployment?',
-                default: true
-            });
-            prerender = shouldPrerender;
-        }
-        const choices = [
-            { name: prerender ? 'Pre-render only' : 'Don\'t render universal content', value: 0 },
-            { name: 'Cloud Functions', value: 1 },
-            { name: 'Cloud Run', value: 2 },
-        ];
-        const { projectType } = yield inquirer.prompt({
+        const prerender = utils_1.hasPrerenderOption(project);
+        prerenderTarget = prerender && `${name}:prerender:${prerender.defaultConfiguration || 'production'}`;
+        const { ssrRegion } = yield inquirer.prompt({
             type: 'list',
-            name: 'projectType',
-            choices,
-            message: 'How would you like to render server-side content?',
-            default: 1,
+            name: 'ssrRegion',
+            choices: ALLOWED_SSR_REGIONS,
+            message: 'In which region would you like to host server-side content?',
+            default: DEFAULT_REGION,
         });
-        if (projectType === 1) {
-            const { newNodeVersion } = yield inquirer.prompt({
-                type: 'list',
-                name: 'newNodeVersion',
-                choices: ['12', '14', '16'],
-                message: 'What version of Node.js would you like to use?',
-                default: parseInt(process.versions.node, 10).toString(),
-            });
-            nodeVersion = newNodeVersion;
-        }
-        else if (projectType === 2) {
-            const fetch = require('node-fetch');
-            const { newNodeVersion } = yield inquirer.prompt({
-                type: 'input',
-                name: 'newNodeVersion',
-                message: 'What version of Node.js would you like to use?',
-                validate: it => fetch(`https://hub.docker.com/v2/repositories/library/node/tags/${it}-slim`).then(it => it.status === 200 || `Can't find node:${it}-slim docker image.`),
-                default: parseFloat(process.versions.node).toString(),
-            });
-            nodeVersion = newNodeVersion;
-        }
-        return { prerender, projectType, nodeVersion, browserTarget, serverTarget, prerenderTarget };
+        return { prerender, projectType: 3, ssrRegion, browserTarget, serverTarget, prerenderTarget };
     }
-    return { projectType: 0, prerender, nodeVersion, browserTarget, serverTarget, prerenderTarget };
+    return { projectType: 3, browserTarget, serverTarget, prerenderTarget };
 });
 exports.projectTypePrompt = projectTypePrompt;

package/schematics/utils.js

@@ -80,39 +80,43 @@ const projectFromRc = (rc, target) => {
     return [project || defaultProject, site];
 };
 function addEnvironmentEntry(host, filePath, data) {
-    if (!host.exists(filePath)) {
-        throw new Error(`File ${filePath} does not exist`);
-    }
-    const buffer = host.read(filePath);
-    if (!buffer) {
-        throw new schematics_1.SchematicsException(`Cannot read ${filePath}`);
-    }
-    const sourceFile = typescript_1.default.createSourceFile(filePath, buffer.toString('utf-8'), typescript_1.default.ScriptTarget.Latest, true);
-    const envIdentifier = ast_utils_1.findNode(sourceFile, typescript_1.default.SyntaxKind.Identifier, 'environment');
-    if (!envIdentifier || !envIdentifier.parent) {
-        throw new schematics_1.SchematicsException(`Cannot find 'environment' identifier in ${filePath}`);
-    }
-    const envObjectLiteral = envIdentifier.parent.getChildren().find(({ kind }) => kind === typescript_1.default.SyntaxKind.ObjectLiteralExpression);
-    if (!envObjectLiteral) {
-        throw new schematics_1.SchematicsException(`${filePath} is not in the expected format`);
-    }
-    const firebaseIdentifier = ast_utils_1.findNode(envObjectLiteral, typescript_1.default.SyntaxKind.Identifier, 'firebase');
-    const recorder = host.beginUpdate(filePath);
-    if (firebaseIdentifier && firebaseIdentifier.parent) {
-        const change = new change_1.ReplaceChange(filePath, firebaseIdentifier.parent.pos, firebaseIdentifier.parent.getFullText(), data);
-        change_1.applyToUpdateRecorder(recorder, [change]);
-    }
-    else {
-        const openBracketToken = envObjectLiteral.getChildren().find(({ kind }) => kind === typescript_1.default.SyntaxKind.OpenBraceToken);
-        if (openBracketToken) {
-            const change = new change_1.InsertChange(filePath, openBracketToken.end, `${data},`);
+    const fileExists = host.exists(filePath);
+    if (fileExists) {
+        const buffer = host.read(filePath);
+        if (!buffer) {
+            throw new schematics_1.SchematicsException(`Cannot read ${filePath}`);
+        }
+        const sourceFile = typescript_1.default.createSourceFile(filePath, buffer.toString('utf-8'), typescript_1.default.ScriptTarget.Latest, true);
+        const envIdentifier = ast_utils_1.findNode(sourceFile, typescript_1.default.SyntaxKind.Identifier, 'environment');
+        if (!envIdentifier || !envIdentifier.parent) {
+            throw new schematics_1.SchematicsException(`Cannot find 'environment' identifier in ${filePath}`);
+        }
+        const envObjectLiteral = envIdentifier.parent.getChildren().find(({ kind }) => kind === typescript_1.default.SyntaxKind.ObjectLiteralExpression);
+        if (!envObjectLiteral) {
+            throw new schematics_1.SchematicsException(`${filePath} is not in the expected format`);
+        }
+        const firebaseIdentifier = ast_utils_1.findNode(envObjectLiteral, typescript_1.default.SyntaxKind.Identifier, 'firebase');
+        const recorder = host.beginUpdate(filePath);
+        if (firebaseIdentifier && firebaseIdentifier.parent) {
+            const change = new change_1.ReplaceChange(filePath, firebaseIdentifier.parent.pos, firebaseIdentifier.parent.getFullText(), data);
             change_1.applyToUpdateRecorder(recorder, [change]);
         }
         else {
-            throw new schematics_1.SchematicsException(`${filePath} is not in the expected format`);
+            const openBracketToken = envObjectLiteral.getChildren().find(({ kind }) => kind === typescript_1.default.SyntaxKind.OpenBraceToken);
+            if (openBracketToken) {
+                const change = new change_1.InsertChange(filePath, openBracketToken.end, `${data},`);
+                change_1.applyToUpdateRecorder(recorder, [change]);
+            }
+            else {
+                throw new schematics_1.SchematicsException(`${filePath} is not in the expected format`);
+            }
         }
+        host.commitUpdate(recorder);
+    }
+    else {
+        host.create(filePath, `export const environment = {${data},
+};`);
     }
-    host.commitUpdate(recorder);
     return host;
 }
 exports.addEnvironmentEntry = addEnvironmentEntry;

package/docs/ionic/authentication.md

@@ -1,104 +0,0 @@
-# Step 1: install this plugin: 
-```
-ionic cordova plugin add cordova-universal-links-plugin
-ionic cordova plugin add cordova-plugin-buildinfo
-ionic cordova plugin add cordova-plugin-browsertab
-ionic cordova plugin add cordova-plugin-inappbrowser
-(for ios)
-ionic cordova plugin add cordova-plugin-customurlscheme 
-```
-
-# Step 2: Add Firebase to your Ionic
-
- **Install Firebase to Angular project**
-
-Follow [this tutorial](https://github.com/angular/angularfire2/blob/master/docs/install-and-setup.md) to make a basic setup for your Ionic project.
-
- **To set up in an Android app** 
-
-Go to [Firebase console](https://console.firebase.google.com/) then click **Add Firebase to your Android app** and follow the setup steps.
-
-
-# Step 3: Set up Firebase Authentication for Cordova
-
-*This is a summary from the [Firebase instructions](https://firebase.google.com/docs/auth/web/cordova).*
-
- **Setup Dynamic Link**
- In the Firebase console, open the **Dynamic Links** section at bottom left panel, setup by their instruction
-
- **Add dynamic link**
- *Add this to config.xml at root level of project:*
-```xml
-     <universal-links>
-        <!-- this is dynamic link created in firebase -->
-        <host name="zm4e4.app.goo.gl" scheme="https" />
-        <!-- this is your firebase app link -->
-        <host name="routing-aadd4.firebaseapp.com" scheme="https">
-            <path url="/__/auth/callback" />
-        </host>
-    </universal-links>
-    <!-- for android -->
-    <preference name="AndroidLaunchMode" value="singleTask" />
-```
-
-  *Make sure your `<widget id="com.yourandroid.id" ... >` the same with Android app's id you 
-  added in Firebase.*
-
-# Step 4: Add login code
-In `login.service.ts` add this function: 
-```ts
-
-import { AngularFireAuth } from '@angular/fire/compat/auth';
-import firebase from 'firebase/app';
-import AuthProvider = firebase.auth.AuthProvider;
-
-export class AuthService {
-    private user: firebase.User;
-	constructor(public afAuth: AngularFireAuth) {
-		afAuth.authState.subscribe(user => {
-			this.user = user;
-		});
-	}
-  
-  signInWithFacebook() {
-		console.log('Sign in with Facebook');
-		return this.oauthSignIn(new firebase.auth.FacebookAuthProvider());
-	}
-
-  signInWithGoogle() {
-		console.log('Sign in with Google');
-		return this.oauthSignIn(new firebase.auth.GoogleAuthProvider());
-	}
-
-  private oauthSignIn(provider: AuthProvider) {
-		if (!(<any>window).cordova) {
-			return this.afAuth.auth.signInWithPopup(provider);
-		} else {
-			return this.afAuth.auth.signInWithRedirect(provider)
-			.then(() => {
-				return this.afAuth.auth.getRedirectResult().then( result => {
-					// This gives you an Access Token. You can use it to access the associated APIs.
-					let token = result.credential.accessToken;
-					// The signed-in user info.
-					let user = result.user;
-					console.log(token, user);
-				}).catch(function(error) {
-					// Handle Errors here.
-					alert(error.message);
-				});
-			});
-		}
-	}
-}
-```
-
-# Common problems
-
-If you get an error, when you build the code, that looks like this:
-```
-UnhandledPromiseRejectionWarning: Unhandled promise rejection (rejection id: 1): TypeError: Cannot read property 'manifest' of undefined
-```
-
-Please take a look at the fix from [this issue](https://github.com/nordnet/cordova-universal-links-plugin/issues/134):
-> Making this change in 'cordova-universal-links-plugin/hooks/lib/android/manifestWriter.js' fixed this issue for me:
-> [b2c5784#diff-d5955d9f4d88b42e5efd7a3385be79e9](https://github.com/nordnet/cordova-universal-links-plugin/commit/b2c5784764225319648e26aa5d3f42ede6d1b289#diff-d5955d9f4d88b42e5efd7a3385be79e9)

package/docs/ionic/cli.md

@@ -1,218 +0,0 @@
-# Installation and Setup with Ionic CLI
-
-### 0. Prerequisites
-
-Before you start installing AngularFire, make sure you have latest version of Ionic cli installed.
-To verify run the command `ionic -v` and check your version. The CLI should be at least version 3.0.0 or greater.
-
-If not, you may need to do the following:
-
-```bash
-# if you have the wrong cli version only
-npm uninstall -g ionic
-npm cache clean
-
-# reinstall clean version
-npm install -g @ionic/cli
-```
-
-### 1. Create a new project
-
-```bash
-ionic start <project-name>
-cd <project-name>
-```
-
-The Ionic CLI's `start` command will prompt you to pick a starting template, and scaffold out the project for you.
-
-### 2. Test your Setup
-
-```bash
-ionic serve
-```
-
-Your default browser should start up and display a working Ionic app.
-
-### 3. Install AngularFire 2 and Firebase
-
-```bash
-npm install @angular/fire firebase --save
-```
-
-Now that you have a new project setup, install AngularFire and Firebase from npm.
-
-### 4. Add Firebase config to environments variable
-
-Let's create a new file, `src/environment.ts` and start adding our Firebase config:
-
-```ts
-export const firebaseConfig = {
-  apiKey: '<your-key>',
-  authDomain: '<your-project-authdomain>',
-  databaseURL: '<your-database-URL>',
-  projectId: '<your-project-id>',
-  storageBucket: '<your-storage-bucket>',
-  messagingSenderId: '<your-messaging-sender-id>'
-};
-
-```
-
-
-### 5. Setup @NgModule for the AngularFireModule
-
-Open `/src/app/app.module.ts`, inject the Firebase providers, and specify your Firebase configuration.
-This can be found in your project at [the Firebase Console](https://console.firebase.google.com):
-
-```ts
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from 'ionic-angular';
-import { MyApp } from './app.component';
-
-import { AngularFireModule } from '@angular/fire/compat';
-import { firebaseConfig } from '../environment';
-
-@NgModule({
-  declarations: [ MyApp ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(MyApp),
-    AngularFireModule.initializeApp(firebaseConfig)
-  ],
-  bootstrap: [IonicApp],
-})
-export class AppModule {}
-
-```
-
-There will be more or less imports depending on your app. This is just an example setup.
-
-
-#### Custom FirebaseApp Names
-You can optionally provide a custom FirebaseApp name with `initializeApp`.
-
-```ts
-@NgModule({
-  declarations: [ MyApp ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(MyApp),
-    AngularFireModule.initializeApp(firebaseConfig, 'my-app-name')
-  ],
-  bootstrap: [IonicApp],
-})
-export class AppModule {}
-```
-
-### 6. Setup individual @NgModules
-
-After adding the AngularFireModule you also need to add modules for the individual @NgModules that your application needs.
- - AngularFireAuthModule
- - AngularFireDatabaseModule
- - AngularFireFunctionsModule
- - AngularFirestoreModule
- - AngularFireStorageModule
- - AngularFireMessagingModule
-
-#### Adding the Firebase Database and Auth Modules
-
-For example if you application was using both Firebase authentication and the Firebase database you would add:
-
-```ts
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from 'ionic-angular';
-import { MyApp } from './app.component';
-
-import { AngularFireModule } from '@angular/fire/compat';
-import { firebaseConfig } from '../environment';
-import { AngularFireDatabaseModule } from '@angular/fire/compat/database';
-import { AngularFireAuthModule } from '@angular/fire/compat/auth';
-
-
-@NgModule({
-  declarations: [ MyApp ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(MyApp),
-    AngularFireModule.initializeApp(firebaseConfig), // imports firebase/app needed for everything
-    AngularFireDatabaseModule, // imports firebase/database, only needed for database features
-    AngularFireAuthModule, // imports firebase/auth, only needed for auth features
-  ],
-  bootstrap: [IonicApp],
-})
-
-```
-
-### 7. Inject AngularFireDatabase
-
-Open `/src/pages/home/home.ts`, and start to import `AngularFireDatabase` and `FirebaseListObservable`:
-
-```ts
-import { Component } from '@angular/core';
-import { NavController } from 'ionic-angular';
-import { AngularFireDatabase } from '@angular/fire/compat/database';
-import { Observable } from 'rxjs/Observable';
-
-@Component({
-  selector: 'page-home',
-  templateUrl: 'home.html'
-})
-export class HomePage {
-  items: Observable<any[]>;
-  constructor(
-    public db: AngularFireDatabase,
-    public navCtrl: NavController,
-  ) {}
-
-}
-```
-
-### 8. Bind to a list
-
-In `/src/pages/home/home.ts`:
-
-```ts
-import { Component } from '@angular/core';
-import { NavController } from 'ionic-angular';
-import { AngularFireDatabase } from '@angular/fire/compat/database';
-import { Observable } from 'rxjs/Observable';
-
-@Component({
-  selector: 'page-home',
-  templateUrl: 'home.html'
-})
-export class HomePage {
-  items: Observable<any[]>;
-  constructor(
-    public db: AngularFireDatabase,
-    public navCtrl: NavController,
-  ) {
-    this.items = db.list('list').valueChanges();
-  }
-
-}
-```
-
-Open `/src/pages/home/home.html`:
-
-```html
-<ion-header>
-  ---
-</ion-header>
-
-<ion-content padding>
-  <ion-item *ngFor="let item of items | async">
-    {{item | json}}
-  </ion-item>
-</ion-content>
-```
-
-### 9. Run your app
-
-```bash
-ionic serve
-```
-
-That's it! If there's any issues, be sure to file an issue on the AngularFire repo or the Ionic repo, depending on who's to blame :smile:
-