firebase-tools 13.0.0-canary.0 → 13.0.0

package/lib/frameworks/angular/utils.js

@@ -56,6 +56,7 @@ async function localesForTarget(dir, architectHost, target, workspaceProject) {
 const DEV_SERVER_TARGETS = [
     "@angular-devkit/build-angular:dev-server",
     "@nguniversal/builders:ssr-dev-server",
+    "@angular-devkit/build-angular:ssr-dev-server",
 ];
 function getValidBuilders(purpose) {
     return [
@@ -63,6 +64,7 @@ function getValidBuilders(purpose) {
         "@angular-devkit/build-angular:browser-esbuild",
         "@angular/fire:deploy",
         "@angular-devkit/build-angular:browser",
+        "@angular-devkit/build-angular:prerender",
         "@nguniversal/builders:prerender",
         ...(purpose === "deploy" ? [] : DEV_SERVER_TARGETS),
     ];
@@ -156,11 +158,13 @@ async function getContext(dir, targetOrConfiguration) {
             case "@angular-devkit/build-angular:browser":
                 browserTarget = overrideTarget;
                 break;
+            case "@angular-devkit/build-angular:prerender":
             case "@nguniversal/builders:prerender":
                 prerenderTarget = overrideTarget;
                 break;
             case "@angular-devkit/build-angular:dev-server":
             case "@nguniversal/builders:ssr-dev-server":
+            case "@angular-devkit/build-angular:ssr-dev-server":
                 serveTarget = overrideTarget;
                 break;
             default:
@@ -299,12 +303,16 @@ async function getContext(dir, targetOrConfiguration) {
                 continue;
             if (target === browserTarget && builder === "@angular-devkit/build-angular:browser")
                 continue;
+            if (target === prerenderTarget && builder === "@angular-devkit/build-angular:prerender")
+                continue;
             if (target === prerenderTarget && builder === "@nguniversal/builders:prerender")
                 continue;
             if (target === serverTarget && builder === "@angular-devkit/build-angular:server")
                 continue;
             if (target === serveTarget && builder === "@nguniversal/builders:ssr-dev-server")
                 continue;
+            if (target === serveTarget && builder === "@angular-devkit/build-angular:ssr-dev-server")
+                continue;
             if (target === serveTarget && builder === "@angular-devkit/build-angular:dev-server")
                 continue;
             throw new error_1.FirebaseError(`${definition.builder} (${targetString}) is not a recognized builder. Please check your angular.json`);

package/lib/frameworks/constants.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_SHOULD_USE_DEV_MODE_HANDLE = exports.GET_DEFAULT_BUILD_TARGETS = exports.I18N_ROOT = exports.ALLOWED_SSR_REGIONS = exports.DEFAULT_REGION = exports.VALID_LOCALE_FORMATS = exports.VALID_ENGINES = exports.NODE_VERSION = exports.SHARP_VERSION = exports.FIREBASE_ADMIN_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.FIREBASE_FRAMEWORKS_VERSION = exports.MAILING_LIST_URL = exports.FEATURE_REQUEST_URL = exports.FILE_BUG_URL = exports.DEFAULT_DOCS_URL = exports.SupportLevelWarnings = exports.NPM_COMMAND_TIMEOUT_MILLIES = void 0;
 const clc = require("colorette");
+const experiments = require("../experiments");
 exports.NPM_COMMAND_TIMEOUT_MILLIES = 10000;
 exports.SupportLevelWarnings = {
     ["experimental"]: (framework) => `Thank you for trying our ${clc.italic("experimental")} support for ${framework} on Firebase Hosting.
@@ -14,10 +15,12 @@ exports.DEFAULT_DOCS_URL = "https://firebase.google.com/docs/hosting/frameworks/
 exports.FILE_BUG_URL = "https://github.com/firebase/firebase-tools/issues/new?template=bug_report.md";
 exports.FEATURE_REQUEST_URL = "https://github.com/firebase/firebase-tools/issues/new?template=feature_request.md";
 exports.MAILING_LIST_URL = "https://goo.gle/41enW5X";
-exports.FIREBASE_FRAMEWORKS_VERSION = "^0.11.0";
+const DEFAULT_FIREBASE_FRAMEWORKS_VERSION = "^0.11.0";
+exports.FIREBASE_FRAMEWORKS_VERSION = (experiments.isEnabled("internaltesting") && process.env.FIREBASE_FRAMEWORKS_VERSION) ||
+    DEFAULT_FIREBASE_FRAMEWORKS_VERSION;
 exports.FIREBASE_FUNCTIONS_VERSION = "^4.5.0";
 exports.FIREBASE_ADMIN_VERSION = "^11.11.1";
-exports.SHARP_VERSION = "^0.33.0";
+exports.SHARP_VERSION = "^0.32.1";
 exports.NODE_VERSION = parseInt(process.versions.node, 10);
 exports.VALID_ENGINES = { node: [16, 18, 20] };
 exports.VALID_LOCALE_FORMATS = [/^ALL_[a-z]+$/, /^[a-z]+_ALL$/, /^[a-z]+(_[a-z]+)?$/];

package/lib/gcp/cloudbuild.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteRepository = exports.getRepository = exports.createRepository = exports.fetchLinkableRepositories = exports.deleteConnection = exports.getConnection = exports.createConnection = void 0;
+exports.deleteRepository = exports.getRepository = exports.createRepository = exports.fetchLinkableRepositories = exports.deleteConnection = exports.listConnections = exports.getConnection = exports.createConnection = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
+const PAGE_SIZE_MAX = 100;
 const client = new apiv2_1.Client({
     urlPrefix: api_1.cloudbuildOrigin,
     auth: true,
     apiVersion: "v2",
 });
-async function createConnection(projectId, location, connectionId) {
-    const res = await client.post(`projects/${projectId}/locations/${location}/connections`, { githubConfig: {} }, { queryParams: { connectionId } });
+async function createConnection(projectId, location, connectionId, githubConfig = {}) {
+    const res = await client.post(`projects/${projectId}/locations/${location}/connections`, { githubConfig }, { queryParams: { connectionId } });
     return res.body;
 }
 exports.createConnection = createConnection;
@@ -19,6 +20,26 @@ async function getConnection(projectId, location, connectionId) {
     return res.body;
 }
 exports.getConnection = getConnection;
+async function listConnections(projectId, location) {
+    const conns = [];
+    const getNextPage = async (pageToken = "") => {
+        const res = await client.get(`/projects/${projectId}/locations/${location}/connections`, {
+            queryParams: {
+                pageSize: PAGE_SIZE_MAX,
+                pageToken,
+            },
+        });
+        if (Array.isArray(res.body.connections)) {
+            conns.push(...res.body.connections);
+        }
+        if (res.body.nextPageToken) {
+            await getNextPage(res.body.nextPageToken);
+        }
+    };
+    await getNextPage();
+    return conns;
+}
+exports.listConnections = listConnections;
 async function deleteConnection(projectId, location, connectionId) {
     const name = `projects/${projectId}/locations/${location}/connections/${connectionId}`;
     const res = await client.delete(name);

package/lib/gcp/storage.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceAccount = exports.listBuckets = exports.getBucket = exports.deleteObject = exports.uploadObject = exports.upload = exports.getDefaultBucket = void 0;
 const path = require("path");
+const clc = require("colorette");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
@@ -20,7 +21,10 @@ async function getDefaultBucket(projectId) {
         return response.body.bucket.name.split("/").pop();
     }
     catch (err) {
-        logger_1.logger.info("\n\nThere was an issue deploying your functions. Verify that your project has a Google App Engine instance setup at https://console.cloud.google.com/appengine and try again. If this issue persists, please contact support.");
+        if ((err === null || err === void 0 ? void 0 : err.status) === 404) {
+            throw new error_1.FirebaseError(`Firebase Storage has not been set up on project '${clc.bold(projectId)}'. Go to https://console.firebase.google.com/project/${projectId}/storage and click 'Get Started' to set up Firebase Storage.`);
+        }
+        logger_1.logger.info("\n\nUnexpected error when fetching default storage bucket.");
         throw err;
     }
 }

package/lib/init/features/frameworks/index.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBackend = exports.getOrCreateBackend = exports.doSetup = void 0;
 const clc = require("colorette");
 const utils = require("../../../utils");
-const logger_1 = require("../../../logger");
-const prompt_1 = require("../../../prompt");
-const constants_1 = require("./constants");
 const repo = require("./repo");
 const poller = require("../../../operation-poller");
-const api_1 = require("../../../api");
 const gcp = require("../../../gcp/frameworks");
+const api_1 = require("../../../api");
 const frameworks_1 = require("../../../gcp/frameworks");
 const error_1 = require("../../../error");
+const logger_1 = require("../../../logger");
+const prompt_1 = require("../../../prompt");
+const constants_1 = require("./constants");
 const frameworksPollerOptions = {
     apiOrigin: api_1.frameworksOrigin,
     apiVersion: frameworks_1.API_VERSION,

package/lib/init/features/frameworks/repo.js

@@ -1,21 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrCreateRepository = exports.getOrCreateConnection = exports.linkGitHubRepository = void 0;
-const api_1 = require("../../../api");
-const error_1 = require("../../../error");
+exports.listFrameworksConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.linkGitHubRepository = exports.parseConnectionName = void 0;
+const clc = require("colorette");
 const gcb = require("../../../gcp/cloudbuild");
-const logger_1 = require("../../../logger");
 const poller = require("../../../operation-poller");
 const utils = require("../../../utils");
+const api_1 = require("../../../api");
+const error_1 = require("../../../error");
+const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
-const clc = require("colorette");
+const FRAMEWORKS_CONN_PATTERN = /.+\/frameworks-github-conn-.+$/;
+const FRAMEWORKS_OAUTH_CONN_NAME = "frameworks-github-oauth";
+const CONNECTION_NAME_REGEX = /^projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/connections\/(?<id>[^\/]+)$/;
+function parseConnectionName(name) {
+    const match = name.match(CONNECTION_NAME_REGEX);
+    if (!match || typeof match.groups === undefined) {
+        return;
+    }
+    const { projectId, location, id } = match.groups;
+    return {
+        projectId,
+        location,
+        id,
+    };
+}
+exports.parseConnectionName = parseConnectionName;
 const gcbPollerOptions = {
     apiOrigin: api_1.cloudbuildOrigin,
     apiVersion: "v2",
     masterTimeout: 25 * 60 * 1000,
     maxBackoff: 10000,
 };
-function extractRepoSlugFromURI(remoteUri) {
+function extractRepoSlugFromUri(remoteUri) {
     const match = /github.com\/(.+).git/.exec(remoteUri);
     if (!match) {
         return undefined;
@@ -24,77 +40,123 @@ function extractRepoSlugFromURI(remoteUri) {
 }
 function generateRepositoryId(remoteUri) {
     var _a;
-    return (_a = extractRepoSlugFromURI(remoteUri)) === null || _a === void 0 ? void 0 : _a.replaceAll("/", "-");
+    return (_a = extractRepoSlugFromUri(remoteUri)) === null || _a === void 0 ? void 0 : _a.replaceAll("/", "-");
 }
-function generateConnectionId(location) {
-    return `frameworks-${location}`;
+function generateConnectionId() {
+    const randomHash = Math.random().toString(36).slice(6);
+    return `frameworks-github-conn-${randomHash}`;
 }
 async function linkGitHubRepository(projectId, location) {
-    logger_1.logger.info(clc.bold(`\n${clc.white("===")} Connect a github repository`));
-    const connectionId = generateConnectionId(location);
-    await getOrCreateConnection(projectId, location, connectionId);
-    let remoteUri = await promptRepositoryURI(projectId, location, connectionId);
+    var _a, _b, _c;
+    logger_1.logger.info(clc.bold(`\n${clc.yellow("===")} Connect a GitHub repository`));
+    const existingConns = await listFrameworksConnections(projectId);
+    if (existingConns.length < 1) {
+        let oauthConn = await getOrCreateConnection(projectId, location, FRAMEWORKS_OAUTH_CONN_NAME);
+        while (oauthConn.installationState.stage === "PENDING_USER_OAUTH") {
+            oauthConn = await promptConnectionAuth(oauthConn);
+        }
+        const connectionId = generateConnectionId();
+        const conn = await createConnection(projectId, location, connectionId, {
+            authorizerCredential: (_a = oauthConn.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential,
+        });
+        let refreshedConn = conn;
+        while (refreshedConn.installationState.stage !== "COMPLETE") {
+            refreshedConn = await promptAppInstall(conn);
+        }
+        existingConns.push(refreshedConn);
+    }
+    let { remoteUri, connection } = await promptRepositoryUri(projectId, location, existingConns);
     while (remoteUri === "") {
         await utils.openInBrowser("https://github.com/apps/google-cloud-build/installations/new");
         await (0, prompt_1.promptOnce)({
             type: "input",
             message: "Press ENTER once you have finished configuring your installation's access settings.",
         });
-        remoteUri = await promptRepositoryURI(projectId, location, connectionId);
+        const selection = await promptRepositoryUri(projectId, location, existingConns);
+        remoteUri = selection.remoteUri;
+        connection = selection.connection;
     }
+    const { id: connectionId } = parseConnectionName(connection.name);
+    await getOrCreateConnection(projectId, location, connectionId, {
+        authorizerCredential: (_b = connection.githubConfig) === null || _b === void 0 ? void 0 : _b.authorizerCredential,
+        appInstallationId: (_c = connection.githubConfig) === null || _c === void 0 ? void 0 : _c.appInstallationId,
+    });
     const repo = await getOrCreateRepository(projectId, location, connectionId, remoteUri);
     logger_1.logger.info();
     utils.logSuccess(`Successfully linked GitHub repository at remote URI:\n ${remoteUri}`);
     return repo;
 }
 exports.linkGitHubRepository = linkGitHubRepository;
-async function promptRepositoryURI(projectId, location, connectionId) {
-    const resp = await gcb.fetchLinkableRepositories(projectId, location, connectionId);
-    if (!resp.repositories || resp.repositories.length === 0) {
-        throw new error_1.FirebaseError("The GitHub App does not have access to any repositories. Please configure " +
-            "your app installation permissions at https://github.com/settings/installations.");
+async function promptRepositoryUri(projectId, location, connections) {
+    const remoteUriToConnection = {};
+    for (const conn of connections) {
+        const { id } = parseConnectionName(conn.name);
+        const resp = await gcb.fetchLinkableRepositories(projectId, location, id);
+        if (resp.repositories && resp.repositories.length > 1) {
+            for (const repo of resp.repositories) {
+                remoteUriToConnection[repo.remoteUri] = conn;
+            }
+        }
     }
-    const choices = resp.repositories.map((repo) => ({
-        name: extractRepoSlugFromURI(repo.remoteUri) || repo.remoteUri,
-        value: repo.remoteUri,
+    const choices = Object.keys(remoteUriToConnection).map((remoteUri) => ({
+        name: extractRepoSlugFromUri(remoteUri) || remoteUri,
+        value: remoteUri,
     }));
     choices.push({
         name: "Missing a repo? Select this option to configure your installation's access settings",
         value: "",
     });
-    return await (0, prompt_1.promptOnce)({
+    const remoteUri = await (0, prompt_1.promptOnce)({
         type: "list",
         message: "Which of the following repositories would you like to deploy?",
         choices,
     });
+    return { remoteUri, connection: remoteUriToConnection[remoteUri] };
+}
+async function promptConnectionAuth(conn) {
+    logger_1.logger.info("You must authorize the Cloud Build GitHub app.");
+    logger_1.logger.info();
+    logger_1.logger.info("First, sign in to GitHub and authorize Cloud Build GitHub app:");
+    const cleanup = await utils.openInBrowserPopup(conn.installationState.actionUri, "Authorize the GitHub app");
+    await (0, prompt_1.promptOnce)({
+        type: "input",
+        message: "Press Enter once you have authorized the app",
+    });
+    cleanup();
+    const { projectId, location, id } = parseConnectionName(conn.name);
+    return await gcb.getConnection(projectId, location, id);
 }
-async function promptConnectionAuth(conn, projectId, location, connectionId) {
-    logger_1.logger.info("First, log in to GitHub, install and authorize Cloud Build app:");
-    logger_1.logger.info(conn.installationState.actionUri);
-    await utils.openInBrowser(conn.installationState.actionUri);
+async function promptAppInstall(conn) {
+    logger_1.logger.info("Now, install the Cloud Build GitHub app:");
+    const targetUri = conn.installationState.actionUri.replace("install_v2", "direct_install_v2");
+    logger_1.logger.info(targetUri);
+    await utils.openInBrowser(targetUri);
     await (0, prompt_1.promptOnce)({
         type: "input",
-        message: "Press Enter once you have authorized the app (Cloud Build) to access your GitHub repo.",
+        message: "Press Enter once you have installed or configured the Cloud Build GitHub app to access your GitHub repo.",
     });
-    return await gcb.getConnection(projectId, location, connectionId);
+    const { projectId, location, id } = parseConnectionName(conn.name);
+    return await gcb.getConnection(projectId, location, id);
+}
+async function createConnection(projectId, location, connectionId, githubConfig) {
+    const op = await gcb.createConnection(projectId, location, connectionId, githubConfig);
+    const conn = await poller.pollOperation(Object.assign(Object.assign({}, gcbPollerOptions), { pollerName: `create-${location}-${connectionId}`, operationResourceName: op.name }));
+    return conn;
 }
-async function getOrCreateConnection(projectId, location, connectionId) {
+exports.createConnection = createConnection;
+async function getOrCreateConnection(projectId, location, connectionId, githubConfig) {
     let conn;
     try {
         conn = await gcb.getConnection(projectId, location, connectionId);
     }
     catch (err) {
         if (err.status === 404) {
-            const op = await gcb.createConnection(projectId, location, connectionId);
-            conn = await poller.pollOperation(Object.assign(Object.assign({}, gcbPollerOptions), { pollerName: `create-${location}-${connectionId}`, operationResourceName: op.name }));
+            conn = await createConnection(projectId, location, connectionId, githubConfig);
         }
         else {
             throw err;
         }
     }
-    while (conn.installationState.stage !== "COMPLETE") {
-        conn = await promptConnectionAuth(conn, projectId, location, connectionId);
-    }
     return conn;
 }
 exports.getOrCreateConnection = getOrCreateConnection;
@@ -106,7 +168,7 @@ async function getOrCreateRepository(projectId, location, connectionId, remoteUr
     let repo;
     try {
         repo = await gcb.getRepository(projectId, location, connectionId, repositoryId);
-        const repoSlug = extractRepoSlugFromURI(repo.remoteUri);
+        const repoSlug = extractRepoSlugFromUri(repo.remoteUri);
         if (repoSlug) {
             throw new error_1.FirebaseError(`${repoSlug} has already been linked.`);
         }
@@ -123,3 +185,10 @@ async function getOrCreateRepository(projectId, location, connectionId, remoteUr
     return repo;
 }
 exports.getOrCreateRepository = getOrCreateRepository;
+async function listFrameworksConnections(projectId) {
+    const conns = await gcb.listConnections(projectId, "-");
+    return conns.filter((conn) => FRAMEWORKS_CONN_PATTERN.test(conn.name) &&
+        conn.installationState.stage === "COMPLETE" &&
+        !conn.disabled);
+}
+exports.listFrameworksConnections = listFrameworksConnections;

package/lib/utils.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isVSCodeExtension = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+exports.openInBrowserPopup = exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isVSCodeExtension = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+const fs = require("node:fs");
+const path = require("node:path");
 const _ = require("lodash");
 const url = require("url");
+const http = require("http");
 const clc = require("colorette");
 const open = require("open");
 const ora = require("ora");
@@ -12,6 +15,7 @@ const winston = require("winston");
 const triple_beam_1 = require("triple-beam");
 const assert_1 = require("assert");
 const stripAnsi = require("strip-ansi");
+const portfinder_1 = require("portfinder");
 const configstore_1 = require("./configstore");
 const error_1 = require("./error");
 const logger_1 = require("./logger");
@@ -486,3 +490,26 @@ async function openInBrowser(url) {
     await open(url);
 }
 exports.openInBrowser = openInBrowser;
+async function openInBrowserPopup(url, buttonText) {
+    const popupPage = fs
+        .readFileSync(path.join(__dirname, "../templates/popup.html"), { encoding: "utf-8" })
+        .replace("${url}", url)
+        .replace("${buttonText}", buttonText);
+    const port = await (0, portfinder_1.getPortPromise)();
+    const server = http.createServer((req, res) => {
+        res.writeHead(200, {
+            "Content-Length": popupPage.length,
+            "Content-Type": "text/html",
+        });
+        res.end(popupPage);
+        req.socket.destroy();
+    });
+    server.listen(port);
+    const popupPageUri = `http://localhost:${port}`;
+    logger_1.logger.info(popupPageUri);
+    await openInBrowser(popupPageUri);
+    return () => {
+        server.close();
+    };
+}
+exports.openInBrowserPopup = openInBrowserPopup;

package/package.json

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

package/templates/popup.html

@@ -0,0 +1,64 @@
+<head>
+  <style>
+    div {
+      font-family: sans-serif;
+    }
+    #popup {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      height: 100vh;
+      width: 100vw;
+      text-align: center;
+    }
+    #popup button {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 0.375rem;
+      font-size: 1.5rem;
+      font-weight: 500;
+      height: 2.5rem;
+      padding: 0.5rem 1rem;
+      background-color: black;
+      color: white;
+      outline: none;
+      transition: background-color 150ms ease-in-out;
+      margin-bottom: 20px;
+    }
+    #popup button:hover {
+      background-color: #333;
+    }
+    #popup button:disabled {
+      opacity: 0.5;
+      pointer-events: none;
+    }
+    #message {
+      height: 20px;
+      margin-bottom: 20px;
+      color: gray;
+      font-size: 1.5rem;
+    }
+  </style>
+</head>
+<body>
+  <div id="popup">
+    <button id="popupBtn" onclick="openPopup()">${buttonText}</button>
+    <div id="message">(Close this window after authorizing the app)</div>
+  </div>
+  <script>
+    function openPopup() {
+      var w = window.open("${url}", "newwindow", "popup=1");
+      var m = document.getElementById("message");
+      var d = document.getElementById("popupBtn");
+      var timer = setInterval(function () {
+        if (w.closed) {
+          m.innerText = "You can close this page now";
+          d.disabled = true;
+          clearInterval(timer);
+        }
+      }, 1000);
+    }
+  </script>
+</body>

package/standalone/config.js

@@ -1,19 +0,0 @@
-module.exports = {
-  /*
-    Headless mode forces the firepit builds to exactly imitate firebase-tools,
-    so the resulting binary "firebase" is a drop in replacement for the script
-    installed via npm. This is the behavior for CI / Cloud Shell / Docker etc.
-
-    When headless mode is disabled, the "double click" experience is enabled
-    which allows the binary to spawn a terminal on Windows and Mac. The is the
-    behavior for desktop users.
-  */
-  headless: true,
-
-  /*
-    This is generally set to "firebase-tools@latest" however a custom value
-    can be supplied for EAPs which would like to have builds pointed at
-    specific tgz bundles.
-   */
-  firebase_tools_package: "firebase-tools@latest"
-};

package/standalone/firepit-log.txt

@@ -1,4 +0,0 @@
-Welcome to firepit v1.1.0!
-Doing JSON parses for version checks at /snapshot/joehanley/Workspace/firebase-tools/standalone/vendor/node_modules/firebase-tools/package.json
-
-SyntaxError: Unexpected end of JSON input