@angular/fire 7.6.1 → 16.0.0-canary.4172abd

package/schematics/deploy/actions.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];
@@ -32,19 +36,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployToCloudRun = exports.deployToFunction = void 0;
-const architect_1 = require("@angular-devkit/architect");
+const child_process_1 = require("child_process");
 const fs_1 = require("fs");
-const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const child_process_1 = require("child_process");
-const functions_templates_1 = require("./functions-templates");
-const semver_1 = require("semver");
-const open_1 = __importDefault(require("open"));
+const architect_1 = require("@angular-devkit/architect");
 const schematics_1 = require("@angular-devkit/schematics");
-const versions_json_1 = require("../versions.json");
-const winston = __importStar(require("winston"));
-const triple_beam_1 = __importDefault(require("triple-beam"));
+const fs_extra_1 = require("fs-extra");
 const inquirer = __importStar(require("inquirer"));
+const open_1 = __importDefault(require("open"));
+const semver_1 = require("semver");
+const triple_beam_1 = __importDefault(require("triple-beam"));
+const winston = __importStar(require("winston"));
+const versions_json_1 = require("../versions.json");
+const functions_templates_1 = require("./functions-templates");
 const DEFAULT_EMULATOR_PORT = 5000;
 const DEFAULT_EMULATOR_HOST = 'localhost';
 const DEFAULT_CLOUD_RUN_OPTIONS = {
@@ -58,7 +62,7 @@ const DEFAULT_CLOUD_RUN_OPTIONS = {
 const spawnAsync = (command, options) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise((resolve, reject) => {
         const [spawnCommand, ...args] = command.split(/\s+/);
-        const spawnProcess = child_process_1.spawn(spawnCommand, args, options);
+        const spawnProcess = (0, child_process_1.spawn)(spawnCommand, args, options);
         const chunks = [];
         const errorChunks = [];
         spawnProcess.stdout.on('data', (data) => {
@@ -81,10 +85,10 @@ const spawnAsync = (command, options) => __awaiter(void 0, void 0, void 0, funct
         });
     });
 });
-const escapeRegExp = (str) => str.replace(/[\-\[\]\/{}()*+?.\\^$|]/g, '\\$&');
+const escapeRegExp = (str) => str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
 const moveSync = (src, dest) => {
-    fs_extra_1.copySync(src, dest);
-    fs_extra_1.removeSync(src);
+    (0, fs_extra_1.copySync)(src, dest);
+    (0, fs_extra_1.removeSync)(src);
 };
 const deployToHosting = (firebaseTools, context, workspaceRoot, options, firebaseToken) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
@@ -124,7 +128,7 @@ const defaultFsHost = {
     existsSync: fs_1.existsSync,
 };
 const findPackageVersion = (packageManager, name) => {
-    const match = child_process_1.execSync(`${packageManager} list ${name}`).toString().match(`[^|\s]${escapeRegExp(name)}[@| ][^\s]+(\s.+)?$`);
+    const match = (0, child_process_1.execSync)(`${packageManager} list ${name}`).toString().match(`[^|s]${escapeRegExp(name)}[@| ][^s]+(s.+)?$`);
     return match ? match[0].split(new RegExp(`${escapeRegExp(name)}[@| ]`))[1].split(/\s/)[0] : null;
 };
 const getPackageJson = (context, workspaceRoot, options, main) => {
@@ -137,8 +141,8 @@ const getPackageJson = (context, workspaceRoot, options, main) => {
             (dev ? devDependencies : dependencies)[name] = version;
         });
     }
-    if (fs_1.existsSync(path_1.join(workspaceRoot, 'angular.json'))) {
-        const angularJson = JSON.parse(fs_1.readFileSync(path_1.join(workspaceRoot, 'angular.json')).toString());
+    if ((0, fs_1.existsSync)((0, path_1.join)(workspaceRoot, 'angular.json'))) {
+        const angularJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(workspaceRoot, 'angular.json')).toString());
         const packageManager = (_b = (_a = angularJson.cli) === null || _a === void 0 ? void 0 : _a.packageManager) !== null && _b !== void 0 ? _b : 'npm';
         const server = angularJson.projects[context.target.project].architect.server;
         const externalDependencies = ((_c = server === null || server === void 0 ? void 0 : server.options) === null || _c === void 0 ? void 0 : _c.externalDependencies) || [];
@@ -152,32 +156,32 @@ const getPackageJson = (context, workspaceRoot, options, main) => {
             });
         }
         else {
-            if (fs_1.existsSync(path_1.join(workspaceRoot, 'package.json'))) {
-                const packageJson = JSON.parse(fs_1.readFileSync(path_1.join(workspaceRoot, 'package.json')).toString());
+            if ((0, fs_1.existsSync)((0, path_1.join)(workspaceRoot, 'package.json'))) {
+                const packageJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(workspaceRoot, 'package.json')).toString());
                 Object.keys(packageJson.dependencies).forEach((dependency) => {
                     dependencies[dependency] = packageJson.dependencies[dependency];
                 });
             }
         }
     }
-    return functions_templates_1.defaultPackage(dependencies, devDependencies, options, main);
+    return (0, functions_templates_1.defaultPackage)(dependencies, devDependencies, options, main);
 };
 const deployToFunction = (firebaseTools, context, workspaceRoot, staticBuildTarget, serverBuildTarget, options, firebaseToken, fsHost = defaultFsHost) => __awaiter(void 0, void 0, void 0, function* () {
     var _b;
-    const staticBuildOptions = yield context.getTargetOptions(architect_1.targetFromTargetString(staticBuildTarget.name));
+    const staticBuildOptions = yield context.getTargetOptions((0, architect_1.targetFromTargetString)(staticBuildTarget.name));
     if (!staticBuildOptions.outputPath || typeof staticBuildOptions.outputPath !== 'string') {
         throw new Error(`Cannot read the output path option of the Angular project '${staticBuildTarget.name}' in angular.json`);
     }
-    const serverBuildOptions = yield context.getTargetOptions(architect_1.targetFromTargetString(serverBuildTarget.name));
+    const serverBuildOptions = yield context.getTargetOptions((0, architect_1.targetFromTargetString)(serverBuildTarget.name));
     if (!serverBuildOptions.outputPath || typeof serverBuildOptions.outputPath !== 'string') {
         throw new Error(`Cannot read the output path option of the Angular project '${serverBuildTarget.name}' in angular.json`);
     }
-    const staticOut = path_1.join(workspaceRoot, staticBuildOptions.outputPath);
-    const serverOut = path_1.join(workspaceRoot, serverBuildOptions.outputPath);
-    const functionsOut = options.outputPath ? path_1.join(workspaceRoot, options.outputPath) : path_1.dirname(serverOut);
+    const staticOut = (0, path_1.join)(workspaceRoot, staticBuildOptions.outputPath);
+    const serverOut = (0, path_1.join)(workspaceRoot, serverBuildOptions.outputPath);
+    const functionsOut = options.outputPath ? (0, path_1.join)(workspaceRoot, options.outputPath) : (0, path_1.dirname)(serverOut);
     const functionName = options.functionName || functions_templates_1.DEFAULT_FUNCTION_NAME;
-    const newStaticOut = path_1.join(functionsOut, staticBuildOptions.outputPath);
-    const newServerOut = path_1.join(functionsOut, serverBuildOptions.outputPath);
+    const newStaticOut = (0, path_1.join)(functionsOut, staticBuildOptions.outputPath);
+    const newServerOut = (0, path_1.join)(functionsOut, serverBuildOptions.outputPath);
     if (options.outputPath) {
         fsHost.removeSync(functionsOut);
         fsHost.copySync(staticOut, newStaticOut);
@@ -189,26 +193,26 @@ const deployToFunction = (firebaseTools, context, workspaceRoot, staticBuildTarg
     }
     const packageJson = getPackageJson(context, workspaceRoot, options);
     const nodeVersion = packageJson.engines.node;
-    if (!semver_1.satisfies(process.versions.node, nodeVersion.toString())) {
+    if (!(0, semver_1.satisfies)(process.versions.node, nodeVersion.toString())) {
         context.logger.warn(`⚠️ Your Node.js version (${process.versions.node}) does not match the Firebase Functions runtime (${nodeVersion}).`);
     }
-    const functionsPackageJsonPath = path_1.join(functionsOut, 'package.json');
+    const functionsPackageJsonPath = (0, path_1.join)(functionsOut, 'package.json');
     fsHost.writeFileSync(functionsPackageJsonPath, JSON.stringify(packageJson, null, 2));
     if (options.CF3v2) {
-        fsHost.writeFileSync(path_1.join(functionsOut, 'index.js'), functions_templates_1.functionGen2(serverBuildOptions.outputPath, options, functionName));
+        fsHost.writeFileSync((0, path_1.join)(functionsOut, 'index.js'), (0, functions_templates_1.functionGen2)(serverBuildOptions.outputPath, options, functionName));
     }
     else {
-        fsHost.writeFileSync(path_1.join(functionsOut, 'index.js'), functions_templates_1.defaultFunction(serverBuildOptions.outputPath, options, functionName));
+        fsHost.writeFileSync((0, path_1.join)(functionsOut, 'index.js'), (0, functions_templates_1.defaultFunction)(serverBuildOptions.outputPath, options, functionName));
     }
     if (!options.prerender) {
         try {
-            fsHost.renameSync(path_1.join(newStaticOut, 'index.html'), path_1.join(newStaticOut, 'index.original.html'));
+            fsHost.renameSync((0, path_1.join)(newStaticOut, 'index.html'), (0, path_1.join)(newStaticOut, 'index.original.html'));
         }
         catch (e) { }
     }
     const siteTarget = (_b = options.target) !== null && _b !== void 0 ? _b : context.target.project;
     if (fsHost.existsSync(functionsPackageJsonPath)) {
-        child_process_1.execSync(`npm --prefix ${functionsOut} install`);
+        (0, child_process_1.execSync)(`npm --prefix ${functionsOut} install`);
     }
     else {
         console.error(`No package.json exists at ${functionsOut}`);
@@ -241,33 +245,33 @@ const deployToFunction = (firebaseTools, context, workspaceRoot, staticBuildTarg
 exports.deployToFunction = deployToFunction;
 const deployToCloudRun = (firebaseTools, context, workspaceRoot, staticBuildTarget, serverBuildTarget, options, firebaseToken, fsHost = defaultFsHost) => __awaiter(void 0, void 0, void 0, function* () {
     var _c;
-    const staticBuildOptions = yield context.getTargetOptions(architect_1.targetFromTargetString(staticBuildTarget.name));
+    const staticBuildOptions = yield context.getTargetOptions((0, architect_1.targetFromTargetString)(staticBuildTarget.name));
     if (!staticBuildOptions.outputPath || typeof staticBuildOptions.outputPath !== 'string') {
         throw new Error(`Cannot read the output path option of the Angular project '${staticBuildTarget.name}' in angular.json`);
     }
-    const serverBuildOptions = yield context.getTargetOptions(architect_1.targetFromTargetString(serverBuildTarget.name));
+    const serverBuildOptions = yield context.getTargetOptions((0, architect_1.targetFromTargetString)(serverBuildTarget.name));
     if (!serverBuildOptions.outputPath || typeof serverBuildOptions.outputPath !== 'string') {
         throw new Error(`Cannot read the output path option of the Angular project '${serverBuildTarget.name}' in angular.json`);
     }
-    const staticOut = path_1.join(workspaceRoot, staticBuildOptions.outputPath);
-    const serverOut = path_1.join(workspaceRoot, serverBuildOptions.outputPath);
-    const cloudRunOut = options.outputPath ? path_1.join(workspaceRoot, options.outputPath) : path_1.join(path_1.dirname(serverOut), 'run');
+    const staticOut = (0, path_1.join)(workspaceRoot, staticBuildOptions.outputPath);
+    const serverOut = (0, path_1.join)(workspaceRoot, serverBuildOptions.outputPath);
+    const cloudRunOut = options.outputPath ? (0, path_1.join)(workspaceRoot, options.outputPath) : (0, path_1.join)((0, path_1.dirname)(serverOut), 'run');
     const serviceId = options.functionName || functions_templates_1.DEFAULT_FUNCTION_NAME;
-    const newStaticOut = path_1.join(cloudRunOut, staticBuildOptions.outputPath);
-    const newServerOut = path_1.join(cloudRunOut, serverBuildOptions.outputPath);
+    const newStaticOut = (0, path_1.join)(cloudRunOut, staticBuildOptions.outputPath);
+    const newServerOut = (0, path_1.join)(cloudRunOut, serverBuildOptions.outputPath);
     fsHost.removeSync(cloudRunOut);
     fsHost.copySync(staticOut, newStaticOut);
     fsHost.copySync(serverOut, newServerOut);
-    const packageJson = getPackageJson(context, workspaceRoot, options, path_1.join(serverBuildOptions.outputPath, 'main.js'));
+    const packageJson = getPackageJson(context, workspaceRoot, options, (0, path_1.join)(serverBuildOptions.outputPath, 'main.js'));
     const nodeVersion = packageJson.engines.node;
-    if (!semver_1.satisfies(process.versions.node, nodeVersion.toString())) {
+    if (!(0, semver_1.satisfies)(process.versions.node, nodeVersion.toString())) {
         context.logger.warn(`⚠️ Your Node.js version (${process.versions.node}) does not match the Cloud Run runtime (${nodeVersion}).`);
     }
-    fsHost.writeFileSync(path_1.join(cloudRunOut, 'package.json'), JSON.stringify(packageJson, null, 2));
-    fsHost.writeFileSync(path_1.join(cloudRunOut, 'Dockerfile'), functions_templates_1.dockerfile(options));
+    fsHost.writeFileSync((0, path_1.join)(cloudRunOut, 'package.json'), JSON.stringify(packageJson, null, 2));
+    fsHost.writeFileSync((0, path_1.join)(cloudRunOut, 'Dockerfile'), (0, functions_templates_1.dockerfile)(options));
     if (!options.prerender) {
         try {
-            fsHost.renameSync(path_1.join(newStaticOut, 'index.html'), path_1.join(newStaticOut, 'index.original.html'));
+            fsHost.renameSync((0, path_1.join)(newStaticOut, 'index.html'), (0, path_1.join)(newStaticOut, 'index.original.html'));
         }
         catch (e) { }
     }
@@ -315,35 +319,31 @@ const deployToCloudRun = (firebaseTools, context, workspaceRoot, staticBuildTarg
 exports.deployToCloudRun = deployToCloudRun;
 function deploy(firebaseTools, context, staticBuildTarget, serverBuildTarget, prerenderBuildTarget, firebaseProject, options, firebaseToken) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!firebaseToken) {
+        if (!firebaseToken && !process.env.GOOGLE_APPLICATION_CREDENTIALS) {
             yield firebaseTools.login();
             const user = yield firebaseTools.login({ projectRoot: context.workspaceRoot });
             console.log(`Logged into Firebase as ${user.email}.`);
         }
-        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;
+        if (!firebaseToken && process.env.GOOGLE_APPLICATION_CREDENTIALS) {
+            yield spawnAsync(`gcloud auth activate-service-account --key-file ${process.env.GOOGLE_APPLICATION_CREDENTIALS}`);
+            console.log(`Using Google Application Credentials.`);
+        }
+        if (prerenderBuildTarget) {
+            const run = yield context.scheduleTarget((0, architect_1.targetFromTargetString)(prerenderBuildTarget.name), prerenderBuildTarget.options);
+            yield run.result;
         }
         else {
-            if (prerenderBuildTarget) {
-                const run = yield context.scheduleTarget(architect_1.targetFromTargetString(prerenderBuildTarget.name), prerenderBuildTarget.options);
-                yield run.result;
+            if (!context.target) {
+                throw new Error('Cannot execute the build target');
             }
-            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);
+            context.logger.info(`📦 Building "${context.target.project}"`);
+            const builders = [
+                context.scheduleTarget((0, architect_1.targetFromTargetString)(staticBuildTarget.name), staticBuildTarget.options).then(run => run.result)
+            ];
+            if (serverBuildTarget) {
+                builders.push(context.scheduleTarget((0, architect_1.targetFromTargetString)(serverBuildTarget.name), serverBuildTarget.options).then(run => run.result));
             }
+            yield Promise.all(builders);
         }
         try {
             yield firebaseTools.use(firebaseProject, {
@@ -364,7 +364,7 @@ function deploy(firebaseTools, context, staticBuildTarget, serverBuildTarget, pr
                 if (text === null || text === void 0 ? void 0 : text.replace) {
                     const plainText = text.replace(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]/g, '');
                     if ((emulator === null || emulator === void 0 ? void 0 : emulator.name) === 'hosting' && plainText.startsWith('Local server: ')) {
-                        open_1.default(plainText.split(': ')[1]);
+                        (0, open_1.default)(plainText.split(': ')[1]);
                     }
                 }
                 return [info.message, ...(info[triple_beam_1.default.SPLAT] || [])]
@@ -375,10 +375,10 @@ function deploy(firebaseTools, context, staticBuildTarget, serverBuildTarget, pr
         firebaseTools.logger.logger.add(logger);
         if ((!options.version || options.version < 2) && serverBuildTarget) {
             if (options.ssr === 'cloud-run') {
-                yield exports.deployToCloudRun(firebaseTools, context, context.workspaceRoot, staticBuildTarget, serverBuildTarget, options, firebaseToken);
+                yield (0, exports.deployToCloudRun)(firebaseTools, context, context.workspaceRoot, staticBuildTarget, serverBuildTarget, options, firebaseToken);
             }
             else {
-                yield exports.deployToFunction(firebaseTools, context, context.workspaceRoot, staticBuildTarget, serverBuildTarget, options, firebaseToken);
+                yield (0, exports.deployToFunction)(firebaseTools, context, context.workspaceRoot, staticBuildTarget, serverBuildTarget, options, firebaseToken);
             }
         }
         else {

package/schematics/deploy/builder.js

@@ -13,24 +13,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const architect_1 = require("@angular-devkit/architect");
-const actions_1 = __importDefault(require("./actions"));
-const utils_1 = require("../utils");
 const firebaseTools_1 = require("../firebaseTools");
-exports.default = architect_1.createBuilder((options, context) => __awaiter(void 0, void 0, void 0, function* () {
+const utils_1 = require("../utils");
+const actions_1 = __importDefault(require("./actions"));
+exports.default = (0, architect_1.createBuilder)((options, context) => __awaiter(void 0, void 0, void 0, function* () {
     if (!context.target) {
         throw new Error('Cannot deploy the application without a target');
     }
-    const [defaultFirebaseProject, defulatFirebaseHostingSite] = utils_1.getFirebaseProjectNameFromFs(context.workspaceRoot, context.target.project);
+    const [defaultFirebaseProject, defulatFirebaseHostingSite] = (0, 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');
@@ -50,7 +50,7 @@ exports.default = architect_1.createBuilder((options, context) => __awaiter(void
     }
     try {
         process.env.FIREBASE_DEPLOY_AGENT = 'angularfire';
-        yield actions_1.default((yield firebaseTools_1.getFirebaseTools()), context, staticBuildTarget, serverBuildTarget, prerenderBuildTarget, firebaseProject, options, process.env.FIREBASE_TOKEN);
+        yield (0, actions_1.default)((yield (0, firebaseTools_1.getFirebaseTools)()), context, staticBuildTarget, serverBuildTarget, prerenderBuildTarget, firebaseProject, options, process.env.FIREBASE_TOKEN);
     }
     catch (e) {
         console.error('Error when trying to deploy: ');

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/setup/index.js

@@ -10,24 +10,24 @@ 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 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 { path: workspacePath, workspace } = (0, utils_1.getWorkspace)(tree);
+    const { project, projectName } = (0, utils_1.getProject)(config, tree);
     const sourcePath = (_a = project.sourceRoot) !== null && _a !== void 0 ? _a : project.root;
-    utils_1.addIgnoreFiles(tree);
+    (0, 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 });
+        (0, utils_1.addToNgModule)(tree, { features: featuresToImport, sourcePath });
+        (0, utils_1.addFixesToServer)(tree);
     }
     if (config.sdkConfig) {
         const source = `
@@ -35,12 +35,12 @@ const setupProject = (tree, context, features, config) => __awaiter(void 0, void
 ${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);
+        (0, 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);
+                        (0, utils_1.addEnvironmentEntry)(tree, `/${replacement.with}`, source);
                     }
                 });
             });
@@ -59,7 +59,7 @@ ${Object.entries(config.sdkConfig).reduce((c, [k, v]) => c.concat(`    ${k}: '${
         ssrRegion: config.ssrRegion,
     };
     if (features.includes(0)) {
-        return exports.setupFirebase({
+        return (0, exports.setupFirebase)({
             workspace,
             workspacePath,
             options,
@@ -76,41 +76,41 @@ 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 }));
+        yield (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 +134,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 +149,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;