@angular/fire 7.5.0 → 7.6.0-canary.59b95af

package/schematics/deploy/actions.js

@@ -93,7 +93,7 @@ const deployToHosting = (firebaseTools, context, workspaceRoot, options, firebas
         yield firebaseTools.serve({
             port: DEFAULT_EMULATOR_PORT,
             host: DEFAULT_EMULATOR_HOST,
-            targets: [`hosting:${siteTarget}`],
+            only: `hosting:${siteTarget}`,
             nonInteractive: true,
             projectRoot: workspaceRoot,
         });
@@ -105,6 +105,7 @@ const deployToHosting = (firebaseTools, context, workspaceRoot, options, firebas
         if (!deployProject) {
             return;
         }
+        process.env.FIREBASE_FRAMEWORKS_SKIP_BUILD = 'true';
     }
     return yield firebaseTools.deploy({
         only: `hosting:${siteTarget}`,
@@ -319,22 +320,30 @@ function deploy(firebaseTools, context, staticBuildTarget, serverBuildTarget, pr
             const user = yield firebaseTools.login({ projectRoot: context.workspaceRoot });
             console.log(`Logged into Firebase as ${user.email}.`);
         }
-        if (prerenderBuildTarget) {
-            const run = yield context.scheduleTarget(architect_1.targetFromTargetString(prerenderBuildTarget.name), prerenderBuildTarget.options);
-            yield run.result;
+        if (options.version && options.version >= 2) {
+            if (semver_1.lt(firebaseTools.cli.version(), '12.2.0')) {
+                throw new schematics_1.SchematicsException('firebase-tools version 12.2+ is required.');
+            }
+            process.env.FIREBASE_FRAMEWORK_BUILD_TARGET = (prerenderBuildTarget || serverBuildTarget || staticBuildTarget).name;
         }
         else {
-            if (!context.target) {
-                throw new Error('Cannot execute the build target');
+            if (prerenderBuildTarget) {
+                const run = yield context.scheduleTarget(architect_1.targetFromTargetString(prerenderBuildTarget.name), prerenderBuildTarget.options);
+                yield run.result;
             }
-            context.logger.info(`📦 Building "${context.target.project}"`);
-            const builders = [
-                context.scheduleTarget(architect_1.targetFromTargetString(staticBuildTarget.name), staticBuildTarget.options).then(run => run.result)
-            ];
-            if (serverBuildTarget) {
-                builders.push(context.scheduleTarget(architect_1.targetFromTargetString(serverBuildTarget.name), serverBuildTarget.options).then(run => run.result));
+            else {
+                if (!context.target) {
+                    throw new Error('Cannot execute the build target');
+                }
+                context.logger.info(`📦 Building "${context.target.project}"`);
+                const builders = [
+                    context.scheduleTarget(architect_1.targetFromTargetString(staticBuildTarget.name), staticBuildTarget.options).then(run => run.result)
+                ];
+                if (serverBuildTarget) {
+                    builders.push(context.scheduleTarget(architect_1.targetFromTargetString(serverBuildTarget.name), serverBuildTarget.options).then(run => run.result));
+                }
+                yield Promise.all(builders);
             }
-            yield Promise.all(builders);
         }
         try {
             yield firebaseTools.use(firebaseProject, {
@@ -364,7 +373,7 @@ function deploy(firebaseTools, context, staticBuildTarget, serverBuildTarget, pr
             })
         });
         firebaseTools.logger.logger.add(logger);
-        if (serverBuildTarget) {
+        if ((!options.version || options.version < 2) && serverBuildTarget) {
             if (options.ssr === 'cloud-run') {
                 yield exports.deployToCloudRun(firebaseTools, context, context.workspaceRoot, staticBuildTarget, serverBuildTarget, options, firebaseToken);
             }

package/schematics/deploy/builder.js

@@ -23,14 +23,14 @@ exports.default = architect_1.createBuilder((options, context) => __awaiter(void
     const [defaultFirebaseProject, defulatFirebaseHostingSite] = utils_1.getFirebaseProjectNameFromFs(context.workspaceRoot, context.target.project);
     const firebaseProject = options.firebaseProject || defaultFirebaseProject;
     if (!firebaseProject) {
-        throw new Error('Cannot detirmine the Firebase Project from your angular.json or .firebaserc');
+        throw new Error('Cannot determine the Firebase Project from your angular.json or .firebaserc');
     }
     if (firebaseProject !== defaultFirebaseProject) {
         throw new Error('The Firebase Project specified by your angular.json or .firebaserc is in conflict');
     }
     const firebaseHostingSite = options.firebaseHostingSite || defulatFirebaseHostingSite;
     if (!firebaseHostingSite) {
-        throw new Error(`Cannot detirmine the Firebase Hosting Site from your angular.json or .firebaserc`);
+        throw new Error(`Cannot determine the Firebase Hosting Site from your angular.json or .firebaserc`);
     }
     if (firebaseHostingSite !== defulatFirebaseHostingSite) {
         throw new Error('The Firebase Hosting Site specified by your angular.json or .firebaserc is in conflict');

package/schematics/firebaseTools.js

@@ -29,12 +29,14 @@ const semver = __importStar(require("semver"));
 const getFirebaseTools = () => globalThis.firebaseTools ?
     Promise.resolve(globalThis.firebaseTools) :
     new Promise((resolve, reject) => {
+        var _a;
+        (_a = process.env).FIREBASE_CLI_EXPERIMENTS || (_a.FIREBASE_CLI_EXPERIMENTS = 'webframeworks');
         try {
             resolve(require('firebase-tools'));
         }
         catch (e) {
             try {
-                const root = child_process_1.execSync('npm root -g').toString().trim();
+                const root = child_process_1.execSync('npm root --location=global').toString().trim();
                 resolve(require(`${root}/firebase-tools`));
             }
             catch (e) {
@@ -42,7 +44,7 @@ const getFirebaseTools = () => globalThis.firebaseTools ?
                     text: `Installing firebase-tools...`,
                     discardStdin: process.platform !== 'win32',
                 }).start();
-                child_process_1.spawn('npm', ['i', '-g', 'firebase-tools'], {
+                child_process_1.spawn('npm', ['i', '--location=global', 'firebase-tools'], {
                     stdio: 'pipe',
                     shell: true,
                 }).on('close', (code) => {

package/schematics/setup/index.js

@@ -9,16 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ngAddSetupProject = exports.setupProject = void 0;
+exports.setupFirebase = exports.generateFirebaseJson = exports.ngAddSetupProject = exports.setupProject = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const utils_1 = require("../utils");
 const prompts_1 = require("./prompts");
-const ssr_1 = require("./ssr");
-const static_1 = require("./static");
 const firebaseTools_1 = require("../firebaseTools");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const common_1 = require("../common");
 const setupProject = (tree, context, features, config) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const { path: workspacePath, workspace } = utils_1.getWorkspace(tree);
@@ -53,36 +52,21 @@ ${Object.entries(config.sdkConfig).reduce((c, [k, v]) => c.concat(`    ${k}: '${
         firebaseApp: config.firebaseApp,
         firebaseHostingSite: config.firebaseHostingSite,
         sdkConfig: config.sdkConfig,
-        prerender: config.prerender,
+        prerender: undefined,
         browserTarget: config.browserTarget,
         serverTarget: config.serverTarget,
         prerenderTarget: config.prerenderTarget,
+        ssrRegion: config.ssrRegion,
     };
     if (features.includes(0)) {
-        switch (config.projectType) {
-            case 1:
-            case 2:
-                return ssr_1.setupUniversalDeployment({
-                    workspace,
-                    workspacePath,
-                    options,
-                    tree,
-                    context,
-                    project,
-                    projectType: config.projectType,
-                    nodeVersion: config.nodeVersion,
-                });
-            case 0:
-                return static_1.setupStaticDeployment({
-                    workspace,
-                    workspacePath,
-                    options,
-                    tree,
-                    context,
-                    project
-                });
-            default: throw (new schematics_1.SchematicsException(`Unimplemented PROJECT_TYPE ${config.projectType}`));
-        }
+        return exports.setupFirebase({
+            workspace,
+            workspacePath,
+            options,
+            tree,
+            context,
+            project
+        });
     }
     else {
         return Promise.resolve();
@@ -105,7 +89,7 @@ const ngAddSetupProject = (options) => (host, context) => __awaiter(void 0, void
         const { project: ngProject, projectName: ngProjectName } = utils_1.getProject(options, host);
         const [defaultProjectName] = utils_1.getFirebaseProjectNameFromHost(host, ngProjectName);
         const firebaseProject = yield prompts_1.projectPrompt(defaultProjectName, { projectRoot, account: user.email });
-        let hosting = { projectType: 0, prerender: false };
+        let hosting = {};
         let firebaseHostingSite;
         if (features.includes(0)) {
             const results = yield prompts_1.projectTypePrompt(ngProject, ngProjectName);
@@ -124,3 +108,48 @@ const ngAddSetupProject = (options) => (host, context) => __awaiter(void 0, void
     }
 });
 exports.ngAddSetupProject = ngAddSetupProject;
+function generateFirebaseJson(tree, path, project, region) {
+    const firebaseJson = tree.exists(path)
+        ? common_1.safeReadJSON(path, tree)
+        : {};
+    const newConfig = {
+        target: project,
+        source: '.',
+        frameworksBackend: {
+            region
+        }
+    };
+    if (firebaseJson.hosting === undefined) {
+        firebaseJson.hosting = [newConfig];
+    }
+    else if (Array.isArray(firebaseJson.hosting)) {
+        const existingConfigIndex = firebaseJson.hosting.findIndex(config => config.target === newConfig.target);
+        if (existingConfigIndex > -1) {
+            firebaseJson.hosting.splice(existingConfigIndex, 1, newConfig);
+        }
+        else {
+            firebaseJson.hosting.push(newConfig);
+        }
+    }
+    else {
+        firebaseJson.hosting = [firebaseJson.hosting, newConfig];
+    }
+    common_1.overwriteIfExists(tree, path, common_1.stringifyFormatted(firebaseJson));
+}
+exports.generateFirebaseJson = generateFirebaseJson;
+const setupFirebase = (config) => {
+    const { tree, workspacePath, workspace, options } = config;
+    const project = workspace.projects[options.project];
+    if (!project.architect) {
+        throw new schematics_1.SchematicsException(`Angular project "${options.project}" has a malformed angular.json`);
+    }
+    project.architect.deploy = {
+        builder: '@angular/fire:deploy',
+        options: Object.assign(Object.assign({ version: 2, browserTarget: options.browserTarget }, (options.serverTarget ? { serverTarget: options.serverTarget } : {})), (options.prerenderTarget ? { prerenderTarget: options.prerenderTarget } : {}))
+    };
+    tree.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
+    generateFirebaseJson(tree, 'firebase.json', options.project, options.ssrRegion);
+    common_1.generateFirebaseRc(tree, '.firebaserc', options.firebaseProject.projectId, options.firebaseHostingSite, options.project);
+    return tree;
+};
+exports.setupFirebase = setupFirebase;

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)