@angular/fire 7.1.0-rc.0 → 7.1.0-rc.4

package/schematics/deploy/schema.json

@@ -41,6 +41,10 @@
       "type": "string",
       "description": "The Firebase project name or project alias to use when deploying"
     },
+    "target": {
+      "type": "string",
+      "description": "The Firebase hosting target in firebase.json for multi-site"
+    },
     "firebaseHostingSite": {
       "type": "string",
       "description": "The Firebase Hosting site to deploy to"

package/schematics/setup/index.js

@@ -16,6 +16,8 @@ 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 setupProject = (tree, context, features, config) => __awaiter(void 0, void 0, void 0, function* () {
     const { path: workspacePath, workspace } = utils_1.getWorkspace(tree);
     const { project, projectName } = utils_1.getProject(config, tree);
@@ -24,6 +26,7 @@ const setupProject = (tree, context, features, config) => __awaiter(void 0, void
     const featuresToImport = features.filter(it => it !== 0);
     if (featuresToImport.length > 0) {
         utils_1.addToNgModule(tree, { features: featuresToImport, sourcePath });
+        utils_1.addFixesToServer(tree, { features: featuresToImport, sourcePath });
     }
     if (config.sdkConfig) {
         const source = `
@@ -82,26 +85,31 @@ ${Object.entries(config.sdkConfig).reduce((c, [k, v]) => c.concat(`    ${k}: '${
 });
 exports.setupProject = setupProject;
 const ngAddSetupProject = (options) => (host, context) => __awaiter(void 0, void 0, void 0, function* () {
+    const projectRoot = host._backend._root;
     const features = yield prompts_1.featuresPrompt();
     if (features.length > 0) {
         const firebaseTools = yield firebaseTools_1.getFirebaseTools();
-        yield firebaseTools.login();
+        if (!host.exists('/firebase.json')) {
+            fs_1.writeFileSync(path_1.join(projectRoot, 'firebase.json'), '{}');
+        }
+        const user = yield prompts_1.userPrompt({ projectRoot });
+        yield firebaseTools.login.use(user.email, { projectRoot });
         const { project: ngProject, projectName: ngProjectName } = utils_1.getProject(options, host);
         const [defaultProjectName] = utils_1.getFirebaseProjectNameFromHost(host, ngProjectName);
-        const firebaseProject = yield prompts_1.projectPrompt(defaultProjectName);
+        const firebaseProject = yield prompts_1.projectPrompt(defaultProjectName, { projectRoot });
         let hosting = { projectType: 0, prerender: false };
         let firebaseHostingSite;
         if (features.includes(0)) {
             const results = yield prompts_1.projectTypePrompt(ngProject, ngProjectName);
             hosting = Object.assign(Object.assign({}, hosting), results);
-            firebaseHostingSite = yield prompts_1.sitePrompt(firebaseProject);
+            firebaseHostingSite = yield prompts_1.sitePrompt(firebaseProject, { projectRoot });
         }
         let firebaseApp;
         let sdkConfig;
         if (features.find(it => it !== 0)) {
             const defaultAppId = firebaseHostingSite === null || firebaseHostingSite === void 0 ? void 0 : firebaseHostingSite.appId;
-            firebaseApp = yield prompts_1.appPrompt(firebaseProject, defaultAppId);
-            const result = yield firebaseTools.apps.sdkconfig('web', firebaseApp.appId, { nonInteractive: true });
+            firebaseApp = yield prompts_1.appPrompt(firebaseProject, defaultAppId, { projectRoot });
+            const result = yield firebaseTools.apps.sdkconfig('web', firebaseApp.appId, { nonInteractive: true, projectRoot });
             sdkConfig = result.sdkConfig;
         }
         yield exports.setupProject(host, context, features, Object.assign(Object.assign(Object.assign({}, options), hosting), { firebaseProject, firebaseApp, firebaseHostingSite, sdkConfig }));

package/schematics/setup/prompts.js

@@ -28,12 +28,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectTypePrompt = exports.prerenderPrompt = exports.sitePrompt = exports.appPrompt = exports.projectPrompt = exports.featuresPrompt = exports.searchSites = exports.searchApps = exports.searchProjects = void 0;
+exports.projectTypePrompt = exports.sitePrompt = exports.appPrompt = exports.projectPrompt = exports.userPrompt = exports.featuresPrompt = exports.searchSites = exports.searchApps = exports.searchProjects = void 0;
 const fuzzy = __importStar(require("fuzzy"));
 const inquirer = __importStar(require("inquirer"));
 const interfaces_1 = require("../interfaces");
 const utils_1 = require("../utils");
 const firebaseTools_1 = require("../firebaseTools");
+const common_1 = require("../common");
 inquirer.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
 const NEW_OPTION = '~~angularfire-new~~';
 const DEFAULT_SITE_TYPE = 'DEFAULT_SITE';
@@ -116,7 +117,7 @@ const searchSites = (promise) => (_, input) => promise.then(sites => {
         return {
             name: original.defaultUrl,
             title: original.defaultUrl,
-            value: utils_1.shortSiteName(original),
+            value: common_1.shortSiteName(original),
         };
     });
 });
@@ -133,9 +134,37 @@ const featuresPrompt = () => __awaiter(void 0, void 0, void 0, function* () {
     return features;
 });
 exports.featuresPrompt = featuresPrompt;
-const projectPrompt = (defaultProject) => __awaiter(void 0, void 0, void 0, function* () {
+const userPrompt = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const firebaseTools = yield firebaseTools_1.getFirebaseTools();
-    const projects = firebaseTools.projects.list({});
+    const users = yield firebaseTools.login.list();
+    if (!users || users.length === 0) {
+        yield firebaseTools.login();
+        const user = yield firebaseTools.login(options);
+        return user;
+    }
+    else {
+        const defaultUser = yield firebaseTools.login(options);
+        const choices = users.map(({ user }) => ({ name: user.email, value: user }));
+        const newChoice = { name: '[Login in with another account]', value: NEW_OPTION };
+        const { user } = yield inquirer.prompt({
+            type: 'list',
+            name: 'user',
+            choices: [newChoice].concat(choices),
+            message: 'Which Firebase account would you like to use?',
+            default: (_a = choices.find(it => it.value.email === defaultUser.email)) === null || _a === void 0 ? void 0 : _a.value,
+        });
+        if (user === NEW_OPTION) {
+            const { user } = yield firebaseTools.login.add();
+            return user;
+        }
+        return user;
+    }
+});
+exports.userPrompt = userPrompt;
+const projectPrompt = (defaultProject, options) => __awaiter(void 0, void 0, void 0, function* () {
+    const firebaseTools = yield firebaseTools_1.getFirebaseTools();
+    const projects = firebaseTools.projects.list(options);
     const { projectId } = yield autocomplete({
         type: 'autocomplete',
         name: 'projectId',
@@ -155,14 +184,14 @@ const projectPrompt = (defaultProject) => __awaiter(void 0, void 0, void 0, func
             message: 'What would you like to call your project?',
             default: projectId,
         });
-        return yield firebaseTools.projects.create(projectId, { displayName, nonInteractive: true });
+        return yield firebaseTools.projects.create(projectId, Object.assign(Object.assign({}, options), { displayName, nonInteractive: true }));
     }
     return (yield projects).find(it => it.projectId === projectId);
 });
 exports.projectPrompt = projectPrompt;
-const appPrompt = ({ projectId: project }, defaultAppId) => __awaiter(void 0, void 0, void 0, function* () {
+const appPrompt = ({ projectId: project }, defaultAppId, options) => __awaiter(void 0, void 0, void 0, function* () {
     const firebaseTools = yield firebaseTools_1.getFirebaseTools();
-    const apps = firebaseTools.apps.list('web', { project });
+    const apps = firebaseTools.apps.list('web', Object.assign(Object.assign({}, options), { project }));
     const { appId } = yield autocomplete({
         type: 'autocomplete',
         name: 'appId',
@@ -176,17 +205,14 @@ const appPrompt = ({ projectId: project }, defaultAppId) => __awaiter(void 0, vo
             name: 'displayName',
             message: 'What would you like to call your app?',
         });
-        return yield firebaseTools.apps.create('web', displayName, { nonInteractive: true, project });
+        return yield firebaseTools.apps.create('web', displayName, Object.assign(Object.assign({}, options), { nonInteractive: true, project }));
     }
     return (yield apps).find(it => utils_1.shortAppId(it) === appId);
 });
 exports.appPrompt = appPrompt;
-const sitePrompt = ({ projectId: project }) => __awaiter(void 0, void 0, void 0, function* () {
+const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0, void 0, function* () {
     const firebaseTools = yield firebaseTools_1.getFirebaseTools();
-    if (!firebaseTools.hosting.sites) {
-        return undefined;
-    }
-    const sites = firebaseTools.hosting.sites.list({ project }).then(it => {
+    const sites = firebaseTools.hosting.sites.list(Object.assign(Object.assign({}, options), { project })).then(it => {
         if (it.sites.length === 0) {
             return [{
                     name: project,
@@ -204,7 +230,7 @@ const sitePrompt = ({ projectId: project }) => __awaiter(void 0, void 0, void 0,
         name: 'siteName',
         source: exports.searchSites(sites),
         message: 'Please select a hosting site:',
-        default: _ => sites.then(it => utils_1.shortSiteName(it.find(it => it.type === DEFAULT_SITE_TYPE))),
+        default: _ => sites.then(it => common_1.shortSiteName(it.find(it => it.type === DEFAULT_SITE_TYPE))),
     });
     if (siteName === NEW_OPTION) {
         const { subdomain } = yield inquirer.prompt({
@@ -212,35 +238,23 @@ const sitePrompt = ({ projectId: project }) => __awaiter(void 0, void 0, void 0,
             name: 'subdomain',
             message: 'Please provide an unique, URL-friendly id for the site (<id>.web.app):',
         });
-        return yield firebaseTools.hosting.sites.create(subdomain, { nonInteractive: true, project });
+        return yield firebaseTools.hosting.sites.create(subdomain, Object.assign(Object.assign({}, options), { nonInteractive: true, project }));
     }
-    return (yield sites).find(it => utils_1.shortSiteName(it) === siteName);
+    return (yield sites).find(it => common_1.shortSiteName(it) === siteName);
 });
 exports.sitePrompt = sitePrompt;
-const prerenderPrompt = (project, prerender) => {
-    if (utils_1.isUniversalApp(project)) {
-        return inquirer.prompt({
-            type: 'prompt',
-            name: 'prerender',
-            message: 'We detected an Angular Universal project. How would you like to render server-side content?',
-            default: true
-        });
-    }
-    return Promise.resolve({ projectType: 0 });
-};
-exports.prerenderPrompt = prerenderPrompt;
 const projectTypePrompt = (project, name) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
     let prerender = false;
     let nodeVersion;
     let serverTarget;
-    let browserTarget = `${name}:build:${((_b = (_a = project.architect) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.defaultConfiguration) || 'production'}`;
+    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:${((_d = (_c = project.architect) === null || _c === void 0 ? void 0 : _c.server) === null || _d === void 0 ? void 0 : _d.defaultConfiguration) || 'production'}`;
-        browserTarget = `${name}:build:${((_f = (_e = project.architect) === null || _e === void 0 ? void 0 : _e.build) === null || _f === void 0 ? void 0 : _f.defaultConfiguration) || 'production'}`;
+        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:${((_h = (_g = project.architect) === null || _g === void 0 ? void 0 : _g.prerender) === null || _h === void 0 ? void 0 : _h.defaultConfiguration) || 'production'}`;
+            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',

package/schematics/setup/ssr.js

@@ -5,7 +5,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 const common_1 = require("../common");
 const versions_json_1 = require("../versions.json");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
-const utils_1 = require("../utils");
+const common_2 = require("../common");
 function generateHostingConfig(project, dist, functionName, projectType) {
     return {
         target: project,
@@ -15,7 +15,13 @@ function generateHostingConfig(project, dist, functionName, projectType) {
                 source: '*.[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].+(css|js)',
                 headers: [{
                         key: 'Cache-Control',
-                        value: 'public,max-age=31536000,immutable'
+                        value: 'public,max-age=31536000,immutable',
+                    }]
+            }, {
+                source: '/@(ngsw-worker.js|ngsw.json)',
+                headers: [{
+                        key: 'Cache-Control',
+                        value: 'no-cache',
                     }]
             }],
         rewrites: [
@@ -78,10 +84,14 @@ const setupUniversalDeployment = (config) => {
         `ssr_${options.project}`;
     project.architect.deploy = {
         builder: '@angular/fire:deploy',
-        options: Object.assign(Object.assign(Object.assign({ ssr: config.projectType === 2 ? 'cloud-run' : 'cloud-functions', prerender: options.prerender, firebaseProject: options.firebaseProject.projectId, firebaseHostingSite: utils_1.shortSiteName(options.firebaseHostingSite), functionName, functionsNodeVersion: config.nodeVersion, region: 'us-central1', browserTarget: options.browserTarget }, (options.serverTarget ? { serverTarget: options.serverTarget } : {})), (options.prerenderTarget ? { prerenderTarget: options.prerenderTarget } : {})), { outputPath: functionsOutput })
+        options: Object.assign(Object.assign(Object.assign({ ssr: config.projectType === 2 ? 'cloud-run' : 'cloud-functions', prerender: options.prerender, firebaseProject: options.firebaseProject.projectId, firebaseHostingSite: common_2.shortSiteName(options.firebaseHostingSite), functionName, functionsNodeVersion: config.nodeVersion, region: 'us-central1', browserTarget: options.browserTarget }, (options.serverTarget ? { serverTarget: options.serverTarget } : {})), (options.prerenderTarget ? { prerenderTarget: options.prerenderTarget } : {})), { outputPath: functionsOutput })
     };
     tree.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
-    common_1.addDependencies(tree, versions_json_1.firebaseFunctionsDependencies, config.context);
+    common_1.addDependencies(tree, Object.entries(versions_json_1.firebaseFunctionsDependencies).reduce((acc, [dep, deets]) => {
+        deets.dev = true;
+        acc[dep] = deets;
+        return acc;
+    }, {}), config.context);
     config.context.addTask(new tasks_1.NodePackageInstallTask());
     generateFirebaseJson(tree, 'firebase.json', options.project, staticOutput, functionsOutput, functionName, config.projectType);
     common_1.generateFirebaseRc(tree, '.firebaserc', options.firebaseProject.projectId, options.firebaseHostingSite, options.project);

package/schematics/setup/static.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupStaticDeployment = exports.generateFirebaseJson = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const common_1 = require("../common");
-const utils_1 = require("../utils");
+const common_2 = require("../common");
 function emptyFirebaseJson() {
     return {
         hosting: []
@@ -18,13 +18,19 @@ function generateHostingConfig(project, dist) {
                 source: '*.[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].+(css|js)',
                 headers: [{
                         key: 'Cache-Control',
-                        value: 'public,max-age=31536000,immutable'
-                    }]
+                        value: 'public,max-age=31536000,immutable',
+                    }],
+            }, {
+                source: '/@(ngsw-worker.js|ngsw.json)',
+                headers: [{
+                        key: 'Cache-Control',
+                        value: 'no-cache',
+                    }],
             }],
         rewrites: [
             {
                 source: '**',
-                destination: '/index.html'
+                destination: '/index.html',
             }
         ]
     };
@@ -62,7 +68,7 @@ const setupStaticDeployment = (config) => {
     const outputPath = project.architect.build.options.outputPath;
     project.architect.deploy = {
         builder: '@angular/fire:deploy',
-        options: Object.assign(Object.assign({ prerender: options.prerender, ssr: false, browserTarget: options.browserTarget, firebaseProject: options.firebaseProject.projectId, firebaseHostingSite: utils_1.shortSiteName(options.firebaseHostingSite) }, (options.serverTarget ? { serverTarget: options.serverTarget } : {})), (options.prerenderTarget ? { prerenderTarget: options.prerenderTarget } : {}))
+        options: Object.assign(Object.assign({ prerender: options.prerender, ssr: false, browserTarget: options.browserTarget, firebaseProject: options.firebaseProject.projectId, firebaseHostingSite: common_2.shortSiteName(options.firebaseHostingSite) }, (options.serverTarget ? { serverTarget: options.serverTarget } : {})), (options.prerenderTarget ? { prerenderTarget: options.prerenderTarget } : {}))
     };
     tree.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
     generateFirebaseJson(tree, 'firebase.json', options.project, outputPath);

package/schematics/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addIgnoreFiles = exports.addToNgModule = exports.addEnvironmentEntry = exports.getFirebaseProjectNameFromFs = exports.getFirebaseProjectNameFromHost = exports.getProject = exports.getWorkspace = exports.shortSiteName = exports.shortAppId = exports.hasPrerenderOption = exports.isUniversalApp = void 0;
+exports.addIgnoreFiles = exports.addToNgModule = exports.addFixesToServer = exports.addEnvironmentEntry = exports.getFirebaseProjectNameFromFs = exports.getFirebaseProjectNameFromHost = exports.getProject = exports.getWorkspace = exports.shortAppId = exports.hasPrerenderOption = exports.isUniversalApp = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const schematics_1 = require("@angular-devkit/schematics");
@@ -18,8 +18,6 @@ const hasPrerenderOption = (project) => { var _a; return (_a = project.architect
 exports.hasPrerenderOption = hasPrerenderOption;
 const shortAppId = (app) => (app === null || app === void 0 ? void 0 : app.appId) && app.appId.split('/').pop();
 exports.shortAppId = shortAppId;
-const shortSiteName = (site) => (site === null || site === void 0 ? void 0 : site.name) && site.name.split('/').pop();
-exports.shortSiteName = shortSiteName;
 function getWorkspace(host) {
     const path = '/angular.json';
     const configBuffer = path && host.read(path);
@@ -118,14 +116,29 @@ function addEnvironmentEntry(host, filePath, data) {
     return host;
 }
 exports.addEnvironmentEntry = addEnvironmentEntry;
-function addToNgModule(host, options) {
-    const modulePath = find_module_1.findModuleFromOptions(host, {
-        name: 'app',
-        path: options.sourcePath,
-    });
-    if (!modulePath) {
+function addFixesToServer(host, options) {
+    const serverPath = `/server.ts`;
+    if (!host.exists(serverPath)) {
         return host;
     }
+    const text = host.read(serverPath);
+    if (text === null) {
+        throw new schematics_1.SchematicsException(`File ${serverPath} does not exist.`);
+    }
+    const sourceText = text.toString('utf-8');
+    const addZonePatch = !sourceText.includes('import \'zone.js/dist/zone-patch-rxjs\';');
+    const addFirestorePatch = options.features.includes(7) &&
+        !sourceText.includes('import \'@angular/fire/firestore-protos\';');
+    if (addZonePatch || addFirestorePatch) {
+        common_1.overwriteIfExists(host, serverPath, sourceText.replace('import \'zone.js/dist/zone-node\';', `import 'zone.js/dist/zone-node';
+${addZonePatch ? 'import \'zone.js/dist/zone-patch-rxjs\';' : ''}
+${addFirestorePatch ? 'import \'@angular/fire/firestore-protos\';' : ''}`));
+    }
+    return host;
+}
+exports.addFixesToServer = addFixesToServer;
+function addToNgModule(host, options) {
+    const modulePath = `/${options.sourcePath}/app/app.module.ts`;
     if (!host.exists(modulePath)) {
         throw new Error(`Specified module path ${modulePath} does not exist`);
     }

package/schematics/versions.json

@@ -11,11 +11,11 @@
   },
   "firebaseFunctionsDependencies": {
     "firebase-admin": {
-      "dev": true,
+      "dev": false,
       "version": "^9.11.1"
     },
     "firebase-functions": {
-      "dev": true,
+      "dev": false,
       "version": "^3.6.0"
     }
   }