firebase-tools 13.12.0 → 13.13.1

package/lib/apphosting/githubConnections.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchAllRepositories = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.getOrCreateOauthConnection = exports.linkGitHubRepository = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
+exports.fetchAllRepositories = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.promptGitHubBranch = exports.getOrCreateOauthConnection = exports.linkGitHubRepository = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
 const clc = require("colorette");
 const devConnect = require("../gcp/devConnect");
 const rm = require("../gcp/resourceManager");
@@ -13,7 +13,7 @@ const api_1 = require("../api");
 const fuzzy = require("fuzzy");
 const inquirer = require("inquirer");
 const APPHOSTING_CONN_PATTERN = /.+\/apphosting-github-conn-.+$/;
-const APPHOSTING_OAUTH_CONN_NAME = "apphosting-github-oauth";
+const APPHOSTING_OAUTH_CONN_NAME = "firebase-app-hosting-github-oauth";
 const CONNECTION_NAME_REGEX = /^projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/connections\/(?<id>[^\/]+)$/;
 function parseConnectionName(name) {
     const match = CONNECTION_NAME_REGEX.exec(name);
@@ -56,7 +56,7 @@ async function linkGitHubRepository(projectId, location) {
     var _a, _b;
     utils.logBullet(clc.bold(`${clc.yellow("===")} Import a GitHub repository`));
     const oauthConn = await getOrCreateOauthConnection(projectId, location);
-    const existingConns = await listAppHostingConnections(projectId);
+    const existingConns = await listAppHostingConnections(projectId, location);
     if (existingConns.length === 0) {
         existingConns.push(await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn));
     }
@@ -157,6 +157,22 @@ async function promptCloneUri(projectId, connections) {
     });
     return { cloneUri, connection: cloneUriToConnection[cloneUri] };
 }
+async function promptGitHubBranch(repoLink) {
+    const branches = await devConnect.listAllBranches(repoLink.name);
+    while (true) {
+        const branch = await (0, prompt_1.promptOnce)({
+            name: "branch",
+            type: "input",
+            default: "main",
+            message: "Pick a branch for continuous deployment",
+        });
+        if (branches.has(branch)) {
+            return branch;
+        }
+        utils.logWarning(`The branch "${branch}" does not exist on "${extractRepoSlugFromUri(repoLink.cloneUri)}". Please enter a valid branch for this repo.`);
+    }
+}
+exports.promptGitHubBranch = promptGitHubBranch;
 async function ensureSecretManagerAdminGrant(projectId) {
     const projectNumber = await (0, getProjectNumber_1.getProjectNumber)({ projectId });
     const dcsaEmail = devConnect.serviceAgentEmail(projectNumber);
@@ -237,8 +253,8 @@ async function getOrCreateRepository(projectId, location, connectionId, cloneUri
     return repo;
 }
 exports.getOrCreateRepository = getOrCreateRepository;
-async function listAppHostingConnections(projectId) {
-    const conns = await devConnect.listAllConnections(projectId, "-");
+async function listAppHostingConnections(projectId, location) {
+    const conns = await devConnect.listAllConnections(projectId, location);
     return conns.filter((conn) => APPHOSTING_CONN_PATTERN.test(conn.name) &&
         conn.installationState.stage === "COMPLETE" &&
         !conn.disabled);

package/lib/apphosting/index.js

@@ -66,19 +66,14 @@ async function doSetup(projectId, webAppName, location, serviceAccount) {
     }
     location =
         location || (await promptLocation(projectId, "Select a location to host your backend:\n"));
-    const gitRepositoryConnection = await githubConnections.linkGitHubRepository(projectId, location);
+    const gitRepositoryLink = await githubConnections.linkGitHubRepository(projectId, location);
     const rootDir = await (0, prompt_1.promptOnce)({
         name: "rootDir",
         type: "input",
         default: "/",
         message: "Specify your app's root directory relative to your repository",
     });
-    const branch = await (0, prompt_1.promptOnce)({
-        name: "branch",
-        type: "input",
-        default: "main",
-        message: "Pick a branch for continuous deployment",
-    });
+    const branch = await githubConnections.promptGitHubBranch(gitRepositoryLink);
     (0, utils_1.logSuccess)(`Repo linked successfully!\n`);
     (0, utils_1.logBullet)(`${clc.yellow("===")} Set up your backend`);
     const backendId = await promptNewBackendId(projectId, location, {
@@ -93,7 +88,7 @@ async function doSetup(projectId, webAppName, location, serviceAccount) {
         (0, utils_1.logWarning)(`Firebase web app not set`);
     }
     const createBackendSpinner = ora("Creating your new backend...").start();
-    const backend = await createBackend(projectId, location, backendId, gitRepositoryConnection, serviceAccount, webApp === null || webApp === void 0 ? void 0 : webApp.id, rootDir);
+    const backend = await createBackend(projectId, location, backendId, gitRepositoryLink, serviceAccount, webApp === null || webApp === void 0 ? void 0 : webApp.id, rootDir);
     createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
     await setDefaultTrafficPolicy(projectId, location, backendId, branch);
     const confirmRollout = await (0, prompt_1.promptOnce)({

package/lib/auth.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
+exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setAccessToken = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
 const clc = require("colorette");
 const FormData = require("form-data");
 const http = require("http");
@@ -65,6 +65,9 @@ function setActiveAccount(options, account) {
     if (account.tokens.refresh_token) {
         setRefreshToken(account.tokens.refresh_token);
     }
+    if (account.tokens.access_token) {
+        setAccessToken(account.tokens.access_token);
+    }
     options.user = account.user;
     options.tokens = account.tokens;
 }
@@ -73,6 +76,10 @@ function setRefreshToken(token) {
     apiv2.setRefreshToken(token);
 }
 exports.setRefreshToken = setRefreshToken;
+function setAccessToken(token) {
+    apiv2.setAccessToken(token);
+}
+exports.setAccessToken = setAccessToken;
 function selectAccount(account, projectRoot) {
     const defaultUser = getProjectDefaultAccount(projectRoot);
     if (!account) {

package/lib/deploy/functions/build.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBackend = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
+exports.toBackend = exports.envWithTypes = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
 const backend = require("./backend");
 const proto = require("../../gcp/proto");
 const api = require("../../.../../api");
@@ -114,12 +114,21 @@ function envWithTypes(definedParams, rawEnvs) {
                         list: true,
                     };
                 }
+                else if (param.type === "secret") {
+                    providedType = {
+                        string: true,
+                        boolean: false,
+                        number: false,
+                        list: false,
+                    };
+                }
             }
         }
         out[envName] = new params.ParamValue(value, false, providedType);
     }
     return out;
 }
+exports.envWithTypes = envWithTypes;
 class Resolver {
     constructor(paramValues) {
         this.paramValues = paramValues;

package/lib/emulator/controller.js

@@ -322,6 +322,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
                 env: Object.assign({}, options.extDevEnv),
                 secretEnv: [],
                 predefinedTriggers: options.extDevTriggers,
+                ignore: cfg.ignore,
             });
         }
     }

package/lib/emulator/downloadableEmulators.js

@@ -46,20 +46,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.2.2",
-            expectedSize: 24007488,
-            expectedChecksum: "c1fb77895203681479ee5dd22d57249f",
+            version: "1.2.4",
+            expectedSize: 24097600,
+            expectedChecksum: "e0a344620b71d64b79d99b2c358e7646",
         }
         : process.platform === "win32"
             ? {
-                version: "1.2.2",
-                expectedSize: 24414208,
-                expectedChecksum: "7e263c2b2bc9055ead2db8102e883534",
+                version: "1.2.4",
+                expectedSize: 24509440,
+                expectedChecksum: "44ebc07e481a85bd735fe8007fab3efe",
             }
             : {
-                version: "1.2.2",
-                expectedSize: 24023300,
-                expectedChecksum: "12467418226ac9657fb64b4d719d0e1d",
+                version: "1.2.4",
+                expectedSize: 24010904,
+                expectedChecksum: "bf10e866f4c4e132bf8115460508e6e2",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/functionsEmulator.js

@@ -248,6 +248,7 @@ class FunctionsEmulator {
         return Promise.resolve();
     }
     async connect() {
+        var _a, _b;
         for (const backend of this.args.emulatableBackends) {
             this.logger.logLabeled("BULLET", "functions", `Watching "${backend.functionsDir}" for Cloud Functions...`);
             const watcher = chokidar.watch(backend.functionsDir, {
@@ -256,6 +257,7 @@ class FunctionsEmulator {
                     /(^|[\/\\])\../,
                     /.+\.log/,
                     /.+?[\\\/]venv[\\\/].+?/,
+                    ...((_b = (_a = backend.ignore) === null || _a === void 0 ? void 0 : _a.map((i) => `**/${i}`)) !== null && _b !== void 0 ? _b : []),
                 ],
                 persistent: true,
             });

package/lib/experiments.js

@@ -26,7 +26,7 @@ exports.ALL_EXPERIMENTS = experiments({
             "of deploys. This has been made an experiment due to backend bugs that are " +
             "temporarily causing failures in some regions with this optimization enabled",
         public: true,
-        default: false,
+        default: true,
     },
     deletegcfartifacts: {
         shortDescription: `Add the ${(0, colorette_1.bold)("functions:deletegcfartifacts")} command to purge docker build images`,

package/lib/frameworks/nuxt/index.js

@@ -87,9 +87,9 @@ async function getDevModeHandle(cwd) {
     return (0, utils_1.simpleProxy)(await host);
 }
 exports.getDevModeHandle = getDevModeHandle;
-async function getConfig(dir) {
-    const { loadNuxtConfig } = await (0, utils_1.relativeRequire)(dir, "@nuxt/kit");
-    return await loadNuxtConfig(dir);
+async function getConfig(cwd) {
+    const { loadNuxtConfig } = await (0, utils_1.relativeRequire)(cwd, "@nuxt/kit");
+    return await loadNuxtConfig({ cwd });
 }
 exports.getConfig = getConfig;
 function init(setup, config) {

package/lib/gcp/devConnect.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateP4SA = exports.serviceAgentEmail = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.deleteConnection = exports.createConnection = exports.client = void 0;
+exports.generateP4SA = exports.serviceAgentEmail = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.listAllBranches = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.deleteConnection = exports.createConnection = exports.client = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const serviceusage_1 = require("./serviceusage");
@@ -72,6 +72,29 @@ async function listAllLinkableGitRepositories(projectId, location, connectionId)
     return repos;
 }
 exports.listAllLinkableGitRepositories = listAllLinkableGitRepositories;
+async function listAllBranches(repoLinkName) {
+    const branches = new Set();
+    const getNextPage = async (pageToken = "") => {
+        const res = await exports.client.get(`${repoLinkName}:fetchGitRefs`, {
+            queryParams: {
+                refType: "BRANCH",
+                pageSize: PAGE_SIZE_MAX,
+                pageToken,
+            },
+        });
+        if (Array.isArray(res.body.refNames)) {
+            res.body.refNames.forEach((branch) => {
+                branches.add(branch);
+            });
+        }
+        if (res.body.nextPageToken) {
+            await getNextPage(res.body.nextPageToken);
+        }
+    };
+    await getNextPage();
+    return branches;
+}
+exports.listAllBranches = listAllBranches;
 async function createGitRepositoryLink(projectId, location, connectionId, gitRepositoryLinkId, cloneUri) {
     const res = await exports.client.post(`projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}/gitRepositoryLinks`, { cloneUri }, { queryParams: { gitRepositoryLinkId } });
     return res.body;

package/lib/init/features/dataconnect/sdk.js

@@ -50,11 +50,11 @@ async function doSetup(setup, config) {
         newConnectorYaml.generate = {};
     }
     if (platforms.includes(IOS)) {
-        const defaultOutputDir = (_a = newConnectorYaml.generate.swiftSdk) === null || _a === void 0 ? void 0 : _a.outputDir;
         const outputDir = await (0, prompt_1.promptOnce)({
             message: `What directory do you want to write your Swift SDK code to? (If not absolute, path will be relative to '${connectorInfo.directory}')`,
             type: "input",
-            default: defaultOutputDir,
+            default: ((_a = newConnectorYaml.generate.swiftSdk) === null || _a === void 0 ? void 0 : _a.outputDir) ||
+                `./../.dataconnect/generated/${newConnectorYaml.connectorId}/swift-sdk`,
         });
         const swiftSdk = { outputDir };
         newConnectorYaml.generate.swiftSdk = swiftSdk;
@@ -63,7 +63,8 @@ async function doSetup(setup, config) {
         const outputDir = await (0, prompt_1.promptOnce)({
             message: `What directory do you want to write your JavaScript SDK code to? (If not absolute, path will be relative to '${connectorInfo.directory}')`,
             type: "input",
-            default: (_b = newConnectorYaml.generate.javascriptSdk) === null || _b === void 0 ? void 0 : _b.outputDir,
+            default: ((_b = newConnectorYaml.generate.javascriptSdk) === null || _b === void 0 ? void 0 : _b.outputDir) ||
+                `./../.dataconnect/generated/${newConnectorYaml.connectorId}/javascript-sdk`,
         });
         const pkg = await (0, prompt_1.promptOnce)({
             message: "What package name do you want to use for your JavaScript SDK?",
@@ -88,7 +89,8 @@ async function doSetup(setup, config) {
         const outputDir = await (0, prompt_1.promptOnce)({
             message: `What directory do you want to write your Kotlin SDK code to? (If not absolute, path will be relative to '${connectorInfo.directory}')`,
             type: "input",
-            default: (_f = newConnectorYaml.generate.kotlinSdk) === null || _f === void 0 ? void 0 : _f.outputDir,
+            default: ((_f = newConnectorYaml.generate.kotlinSdk) === null || _f === void 0 ? void 0 : _f.outputDir) ||
+                `./../.dataconnect/generated/${newConnectorYaml.connectorId}/kotlin-sdk/src/main/kotlin/${newConnectorYaml.connectorId}`,
         });
         const pkg = await (0, prompt_1.promptOnce)({
             message: "What package name do you want to use for your Kotlin SDK?",

package/lib/requireAuth.js

@@ -20,9 +20,6 @@ function getAuthClient(config) {
     return authClient;
 }
 async function autoAuth(options, authScopes) {
-    if (process.env.MONOSPACE_ENV) {
-        throw new error_1.FirebaseError("autoAuth not yet implemented for IDX. Please run 'firebase login'");
-    }
     const client = getAuthClient({ scopes: authScopes, projectId: options.project });
     const token = await client.getAccessToken();
     token !== null ? apiv2.setAccessToken(token) : false;
@@ -34,6 +31,11 @@ async function autoAuth(options, authScopes) {
     catch (e) {
         logger_1.logger.debug(`Error getting account credentials.`);
     }
+    if (process.env.MONOSPACE_ENV && token && clientEmail) {
+        (0, auth_1.setActiveAccount)(options, { user: { email: clientEmail }, tokens: { access_token: token } });
+        (0, auth_1.setGlobalDefaultAccount)({ user: { email: clientEmail }, tokens: { access_token: token } });
+        options.projectId = await client.getProjectId();
+    }
     return clientEmail;
 }
 async function requireAuth(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.12.0",
+  "version": "13.13.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {