@angular/fire 7.6.0 → 16.0.0-canary.1350920

package/schematics/firebaseTools.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -36,22 +40,22 @@ const getFirebaseTools = () => globalThis.firebaseTools ?
         }
         catch (e) {
             try {
-                const root = child_process_1.execSync('npm root --location=global').toString().trim();
+                const root = (0, child_process_1.execSync)('npm root --location=global').toString().trim();
                 resolve(require(`${root}/firebase-tools`));
             }
             catch (e) {
-                const spinner = ora_1.default({
+                const spinner = (0, ora_1.default)({
                     text: `Installing firebase-tools...`,
                     discardStdin: process.platform !== 'win32',
                 }).start();
-                child_process_1.spawn('npm', ['i', '--location=global', 'firebase-tools'], {
+                (0, child_process_1.spawn)('npm', ['i', '--location=global', 'firebase-tools'], {
                     stdio: 'pipe',
                     shell: true,
                 }).on('close', (code) => {
                     if (code === 0) {
                         spinner.succeed('firebase-tools installed globally.');
                         spinner.stop();
-                        const root = child_process_1.execSync('npm root -g').toString().trim();
+                        const root = (0, child_process_1.execSync)('npm root -g').toString().trim();
                         resolve(require(`${root}/firebase-tools`));
                     }
                     else {

package/schematics/interfaces.js

@@ -4,12 +4,13 @@ exports.featureOptions = void 0;
 exports.featureOptions = [
     { name: 'ng deploy -- hosting', value: 0 },
     { name: 'Authentication', value: 1 },
-    { name: 'Firestore', value: 7 },
-    { name: 'Realtime Database', value: 3 },
-    { name: 'Analytics', value: 2 },
-    { name: 'Cloud Functions (callable)', value: 4 },
-    { name: 'Cloud Messaging', value: 5 },
-    { name: 'Performance Monitoring', value: 6 },
-    { name: 'Cloud Storage', value: 8 },
-    { name: 'Remote Config', value: 9 },
+    { name: 'Google Analytics', value: 2 },
+    { name: 'App Check', value: 3 },
+    { name: 'Firestore', value: 8 },
+    { name: 'Realtime Database', value: 4 },
+    { name: 'Cloud Functions (callable)', value: 5 },
+    { name: 'Cloud Messaging', value: 6 },
+    { name: 'Performance Monitoring', value: 7 },
+    { name: 'Cloud Storage', value: 9 },
+    { name: 'Remote Config', value: 10 },
 ];

package/schematics/setup/index.js

@@ -10,107 +10,91 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupFirebase = exports.generateFirebaseJson = exports.ngAddSetupProject = exports.setupProject = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const utility_1 = require("@schematics/angular/utility");
+const common_1 = require("../common");
+const firebaseTools_1 = require("../firebaseTools");
 const utils_1 = require("../utils");
 const prompts_1 = require("./prompts");
-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);
-    const { project, projectName } = utils_1.getProject(config, tree);
-    const sourcePath = (_a = project.sourceRoot) !== null && _a !== void 0 ? _a : project.root;
-    utils_1.addIgnoreFiles(tree);
-    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 = `
-  firebase: {
-${Object.entries(config.sdkConfig).reduce((c, [k, v]) => c.concat(`    ${k}: '${v}'`), []).join(',\n')},
-  }`;
-        const environmentPath = `${sourcePath}/environments/environment.ts`;
-        utils_1.addEnvironmentEntry(tree, `/${environmentPath}`, source);
-        Object.values(project.architect || {}).forEach(builder => {
-            Object.values(builder.configurations || {}).forEach(configuration => {
-                (configuration.fileReplacements || []).forEach((replacement) => {
-                    if (replacement.replace === environmentPath) {
-                        utils_1.addEnvironmentEntry(tree, `/${replacement.with}`, source);
-                    }
-                });
-            });
-        });
-    }
-    const options = {
-        project: projectName,
-        firebaseProject: config.firebaseProject,
-        firebaseApp: config.firebaseApp,
-        firebaseHostingSite: config.firebaseHostingSite,
-        sdkConfig: config.sdkConfig,
-        prerender: undefined,
-        browserTarget: config.browserTarget,
-        serverTarget: config.serverTarget,
-        prerenderTarget: config.prerenderTarget,
-        ssrRegion: config.ssrRegion,
-    };
+const setupProject = (tree, context, features, config) => {
+    const { projectName } = (0, utils_1.getProject)(config, tree);
+    (0, utils_1.addIgnoreFiles)(tree);
     if (features.includes(0)) {
-        return exports.setupFirebase({
+        const { path: workspacePath, workspace } = (0, utils_1.getWorkspace)(tree);
+        const { project, projectName } = (0, utils_1.getProject)(config, tree);
+        (0, exports.setupFirebase)({
             workspace,
             workspacePath,
-            options,
+            options: {
+                project: projectName,
+                firebaseProject: config.firebaseProject,
+                firebaseApp: config.firebaseApp,
+                firebaseHostingSite: config.firebaseHostingSite,
+                sdkConfig: config.sdkConfig,
+                prerender: undefined,
+                browserTarget: config.browserTarget,
+                serverTarget: config.serverTarget,
+                prerenderTarget: config.prerenderTarget,
+                ssrRegion: config.ssrRegion,
+            },
             tree,
             context,
             project
         });
     }
-    else {
-        return Promise.resolve();
+    const featuresToImport = features.filter(it => it !== 0);
+    if (featuresToImport.length > 0) {
+        return (0, schematics_1.chain)([
+            (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                external('initializeApp', '@angular/fire/app');
+                return code `${external('provideFirebaseApp', '@angular/fire/app')}(() => initializeApp(${JSON.stringify(config.sdkConfig)}))`;
+            }),
+            ...(0, utils_1.featureToRules)(features, projectName),
+        ]);
     }
-});
+};
 exports.setupProject = setupProject;
 const ngAddSetupProject = (options) => (host, context) => __awaiter(void 0, void 0, void 0, function* () {
     let projectRoot = host._backend._root;
     if (process.platform.startsWith('win32')) {
-        projectRoot = core_1.asWindowsPath(core_1.normalize(projectRoot));
+        projectRoot = (0, core_1.asWindowsPath)((0, core_1.normalize)(projectRoot));
     }
-    const features = yield prompts_1.featuresPrompt();
+    const features = yield (0, prompts_1.featuresPrompt)();
     if (features.length > 0) {
-        const firebaseTools = yield firebaseTools_1.getFirebaseTools();
+        const firebaseTools = yield (0, firebaseTools_1.getFirebaseTools)();
         if (!host.exists('/firebase.json')) {
-            fs_1.writeFileSync(path_1.join(projectRoot, 'firebase.json'), '{}');
+            (0, fs_1.writeFileSync)((0, path_1.join)(projectRoot, 'firebase.json'), '{}');
         }
-        const user = yield prompts_1.userPrompt({ projectRoot });
+        const user = yield (0, 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, { projectRoot, account: user.email });
+        const { project: ngProject, projectName: ngProjectName } = (0, utils_1.getProject)(options, host);
+        const [defaultProjectName] = (0, utils_1.getFirebaseProjectNameFromHost)(host, ngProjectName);
+        const firebaseProject = yield (0, prompts_1.projectPrompt)(defaultProjectName, { projectRoot, account: user.email });
         let hosting = {};
         let firebaseHostingSite;
         if (features.includes(0)) {
-            const results = yield prompts_1.projectTypePrompt(ngProject, ngProjectName);
+            const results = yield (0, prompts_1.projectTypePrompt)(ngProject, ngProjectName);
             hosting = Object.assign(Object.assign({}, hosting), results);
-            firebaseHostingSite = yield prompts_1.sitePrompt(firebaseProject, { projectRoot });
+            firebaseHostingSite = yield (0, 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, { projectRoot });
+            firebaseApp = yield (0, 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 }));
+        return (0, exports.setupProject)(host, context, features, Object.assign(Object.assign(Object.assign({}, options), hosting), { firebaseProject, firebaseApp, firebaseHostingSite, sdkConfig }));
     }
 });
 exports.ngAddSetupProject = ngAddSetupProject;
 function generateFirebaseJson(tree, path, project, region) {
     const firebaseJson = tree.exists(path)
-        ? common_1.safeReadJSON(path, tree)
+        ? (0, common_1.safeReadJSON)(path, tree)
         : {};
     const newConfig = {
         target: project,
@@ -134,7 +118,7 @@ function generateFirebaseJson(tree, path, project, region) {
     else {
         firebaseJson.hosting = [firebaseJson.hosting, newConfig];
     }
-    common_1.overwriteIfExists(tree, path, common_1.stringifyFormatted(firebaseJson));
+    (0, common_1.overwriteIfExists)(tree, path, (0, common_1.stringifyFormatted)(firebaseJson));
 }
 exports.generateFirebaseJson = generateFirebaseJson;
 const setupFirebase = (config) => {
@@ -149,7 +133,7 @@ const setupFirebase = (config) => {
     };
     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);
+    (0, common_1.generateFirebaseRc)(tree, '.firebaserc', options.firebaseProject.projectId, options.firebaseHostingSite, options.project);
     return tree;
 };
 exports.setupFirebase = setupFirebase;

package/schematics/setup/prompts.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -31,10 +35,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 common_1 = require("../common");
+const firebaseTools_1 = require("../firebaseTools");
 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';
@@ -92,7 +96,7 @@ const searchApps = (apps) => (_, input) => __awaiter(void 0, void 0, void 0, fun
         return {
             name: original.displayName,
             title: original.displayName,
-            value: utils_1.shortAppId(original),
+            value: (0, utils_1.shortAppId)(original),
         };
     });
 });
@@ -117,7 +121,7 @@ const searchSites = (sites) => (_, input) => __awaiter(void 0, void 0, void 0, f
         return {
             name: original.defaultUrl,
             title: original.defaultUrl,
-            value: common_1.shortSiteName(original),
+            value: (0, common_1.shortSiteName)(original),
         };
     });
 });
@@ -136,7 +140,7 @@ const featuresPrompt = () => __awaiter(void 0, void 0, void 0, function* () {
 exports.featuresPrompt = featuresPrompt;
 const userPrompt = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const firebaseTools = yield firebaseTools_1.getFirebaseTools();
+    const firebaseTools = yield (0, firebaseTools_1.getFirebaseTools)();
     const users = yield firebaseTools.login.list();
     if (!users || users.length === 0) {
         yield firebaseTools.login();
@@ -163,12 +167,12 @@ const userPrompt = (options) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.userPrompt = userPrompt;
 const projectPrompt = (defaultProject, options) => __awaiter(void 0, void 0, void 0, function* () {
-    const firebaseTools = yield firebaseTools_1.getFirebaseTools();
+    const firebaseTools = yield (0, firebaseTools_1.getFirebaseTools)();
     const projects = yield firebaseTools.projects.list(options);
     const { projectId } = yield autocomplete({
         type: 'autocomplete',
         name: 'projectId',
-        source: exports.searchProjects(projects),
+        source: (0, exports.searchProjects)(projects),
         message: 'Please select a project:',
         default: defaultProject,
     });
@@ -186,16 +190,16 @@ const projectPrompt = (defaultProject, options) => __awaiter(void 0, void 0, voi
         });
         return yield firebaseTools.projects.create(projectId, { account: options.account, displayName, nonInteractive: true });
     }
-    return (yield projects).find(it => it.projectId === projectId);
+    return (projects).find(it => it.projectId === projectId);
 });
 exports.projectPrompt = projectPrompt;
 const appPrompt = ({ projectId: project }, defaultAppId, options) => __awaiter(void 0, void 0, void 0, function* () {
-    const firebaseTools = yield firebaseTools_1.getFirebaseTools();
+    const firebaseTools = yield (0, firebaseTools_1.getFirebaseTools)();
     const apps = yield firebaseTools.apps.list('web', Object.assign(Object.assign({}, options), { project }));
     const { appId } = yield autocomplete({
         type: 'autocomplete',
         name: 'appId',
-        source: exports.searchApps(apps),
+        source: (0, exports.searchApps)(apps),
         message: 'Please select an app:',
         default: defaultAppId,
     });
@@ -207,11 +211,11 @@ const appPrompt = ({ projectId: project }, defaultAppId, options) => __awaiter(v
         });
         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);
+    return (apps).find(it => (0, utils_1.shortAppId)(it) === appId);
 });
 exports.appPrompt = appPrompt;
 const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0, void 0, function* () {
-    const firebaseTools = yield firebaseTools_1.getFirebaseTools();
+    const firebaseTools = yield (0, firebaseTools_1.getFirebaseTools)();
     const sites = yield firebaseTools.hosting.sites.list(Object.assign(Object.assign({}, options), { project })).then(it => {
         if (it.sites.length === 0) {
             return [{
@@ -228,9 +232,9 @@ const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0
     const { siteName } = yield autocomplete({
         type: 'autocomplete',
         name: 'siteName',
-        source: exports.searchSites(sites),
+        source: (0, exports.searchSites)(sites),
         message: 'Please select a hosting site:',
-        default: _ => common_1.shortSiteName(sites.find(site => site.type === DEFAULT_SITE_TYPE)),
+        default: _ => (0, common_1.shortSiteName)(sites.find(site => site.type === DEFAULT_SITE_TYPE)),
     });
     if (siteName === NEW_OPTION) {
         const { subdomain } = yield inquirer.prompt({
@@ -240,7 +244,7 @@ const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0
         });
         return yield firebaseTools.hosting.sites.create(subdomain, Object.assign(Object.assign({}, options), { nonInteractive: true, project }));
     }
-    return (yield sites).find(it => common_1.shortSiteName(it) === siteName);
+    return (sites).find(it => (0, common_1.shortSiteName)(it) === siteName);
 });
 exports.sitePrompt = sitePrompt;
 const DEFAULT_REGION = 'us-central1';
@@ -256,10 +260,10 @@ const projectTypePrompt = (project, name) => __awaiter(void 0, void 0, void 0, f
     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)) {
+    if ((0, 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'}`;
-        const prerender = utils_1.hasPrerenderOption(project);
+        const prerender = (0, utils_1.hasPrerenderOption)(project);
         prerenderTarget = prerender && `${name}:prerender:${prerender.defaultConfiguration || 'production'}`;
         const { ssrRegion } = yield inquirer.prompt({
             type: 'list',

package/schematics/update/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngPostUpdate = void 0;
-const ngPostUpdate = () => (host, context) => {
+const ngPostUpdate = () => (host, _context) => {
     return host;
 };
 exports.ngPostUpdate = ngPostUpdate;

package/schematics/update/v7/index.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngUpdate = void 0;
+const path_1 = require("path");
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const common_1 = require("../../common");
 const versions_json_1 = require("../../versions.json");
-const path_1 = require("path");
-const IMPORT_REGEX = /(?<key>import|export)\s+(?:(?<alias>[\w,{}\s\*]+)\s+from)?\s*(?:(?<quote>["'])?(?<ref>[@\w\s\\\/.-]+)\3?)\s*(?<term>[;\n])/g;
+const IMPORT_REGEX = /(?<key>import|export)\s+(?:(?<alias>[\w,{}\s*]+)\s+from)?\s*(?:(?<quote>["'])?(?<ref>[@\w\s\\/.-]+)\3?)\s*(?<term>[;\n])/g;
 const ngUpdate = () => (host, context) => {
-    const packageJson = host.exists('package.json') && common_1.safeReadJSON('package.json', host);
+    const packageJson = host.exists('package.json') && (0, common_1.safeReadJSON)('package.json', host);
     if (packageJson === undefined) {
         throw new schematics_1.SchematicsException('Could not locate package.json');
     }
@@ -27,13 +27,13 @@ const ngUpdate = () => (host, context) => {
             packageJson.dependencies[depName] = dep.version;
         }
     });
-    common_1.overwriteIfExists(host, 'package.json', common_1.stringifyFormatted(packageJson));
+    (0, common_1.overwriteIfExists)(host, 'package.json', (0, common_1.stringifyFormatted)(packageJson));
     context.addTask(new tasks_1.NodePackageInstallTask());
-    const angularJson = host.exists('angular.json') && common_1.safeReadJSON('angular.json', host);
+    const angularJson = host.exists('angular.json') && (0, common_1.safeReadJSON)('angular.json', host);
     if (packageJson === undefined) {
         throw new schematics_1.SchematicsException('Could not locate angular.json');
     }
-    const srcRoots = Object.values(angularJson.projects).map((it) => path_1.join(...['/', it.root, it.sourceRoot].filter(it => !!it)));
+    const srcRoots = Object.values(angularJson.projects).map((it) => (0, path_1.join)(...['/', it.root, it.sourceRoot].filter(it => !!it)));
     host.visit(filePath => {
         var _a;
         if (!filePath.endsWith('.ts') ||
@@ -59,7 +59,7 @@ const ngUpdate = () => (host, context) => {
             return substring;
         });
         if (content !== newContent) {
-            common_1.overwriteIfExists(host, filePath, newContent);
+            (0, common_1.overwriteIfExists)(host, filePath, newContent);
         }
     });
     return host;