firebase-tools 12.9.1 → 13.0.0

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,
@@ -20,12 +20,12 @@ const frameworksPollerOptions = {
 };
 async function doSetup(setup, projectId) {
     setup.frameworks = {};
-    utils.logBullet("First we need a few details to create your service.");
+    utils.logBullet("First we need a few details to create your backend.");
     await (0, prompt_1.promptOnce)({
         name: "serviceName",
         type: "input",
         default: "acme-inc-web",
-        message: "Create a name for your service [1-30 characters]",
+        message: "Create a name for your backend [1-30 characters]",
     }, setup.frameworks);
     await (0, prompt_1.promptOnce)({
         name: "region",
@@ -36,17 +36,15 @@ async function doSetup(setup, projectId) {
         choices: constants_1.ALLOWED_REGIONS,
     }, setup.frameworks);
     utils.logSuccess(`Region set to ${setup.frameworks.region}.`);
-    logger_1.logger.info(clc.bold(`\n${clc.white("===")} Deploy Setup`));
-    await (0, prompt_1.promptOnce)({
-        name: "deployMethod",
-        type: "list",
-        default: constants_1.DEFAULT_DEPLOY_METHOD,
-        message: "How do you want to deploy",
-        choices: constants_1.ALLOWED_DEPLOY_METHODS,
-    }, setup.frameworks);
     const backend = await getOrCreateBackend(projectId, setup);
     if (backend) {
-        utils.logSuccess(`Successfully created a backend: ${backend.name}`);
+        logger_1.logger.info();
+        utils.logSuccess(`Successfully created backend:\n ${backend.name}`);
+        logger_1.logger.info();
+        utils.logSuccess(`Your site is being deployed at:\n https://${backend.uri}`);
+        logger_1.logger.info();
+        utils.logSuccess(`View the rollout status by running:\n firebase backends:get --backend=${backend.name}`);
+        logger_1.logger.info();
     }
 }
 exports.doSetup = doSetup;
@@ -61,18 +59,22 @@ function toBackend(cloudBuildConnRepo) {
 }
 async function getOrCreateBackend(projectId, setup) {
     const location = setup.frameworks.region;
-    const deployMethod = setup.frameworks.deployMethod;
     try {
         return await getExistingBackend(projectId, setup, location);
     }
     catch (err) {
         if (err.status === 404) {
-            logger_1.logger.info("Creating new backend.");
-            if (deployMethod === "github") {
-                const cloudBuildConnRepo = await repo.linkGitHubRepository(projectId, location);
-                const backendDetails = toBackend(cloudBuildConnRepo);
-                return await createBackend(projectId, location, backendDetails, setup.frameworks.serviceName);
-            }
+            const cloudBuildConnRepo = await repo.linkGitHubRepository(projectId, location);
+            logger_1.logger.info();
+            await (0, prompt_1.promptOnce)({
+                name: "branchName",
+                type: "input",
+                default: "main",
+                message: "Which branch do you want to deploy?",
+            }, setup.frameworks);
+            const backendDetails = toBackend(cloudBuildConnRepo);
+            logger_1.logger.info(clc.bold(`\n${clc.white("===")} Creating your backend`));
+            return await createBackend(projectId, location, backendDetails, setup.frameworks.serviceName);
         }
         else {
             throw new error_1.FirebaseError(`Failed to get or create a backend using the given initialization details: ${err}`);

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

@@ -1,20 +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 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;
@@ -23,75 +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) {
-    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(`Successfully linked GitHub repository at remote URI ${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 link?",
+        message: "Which of the following repositories would you like to deploy?",
         choices,
     });
+    return { remoteUri, connection: remoteUriToConnection[remoteUri] };
 }
-async function promptConnectionAuth(conn, projectId, location, connectionId) {
-    logger_1.logger.info(conn.installationState.message);
-    logger_1.logger.info(conn.installationState.actionUri);
-    await utils.openInBrowser(conn.installationState.actionUri);
+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 any key once you have authorized the app (Cloud Build) to access your GitHub repo.",
+        message: "Press Enter once you have authorized the app",
     });
-    return await gcb.getConnection(projectId, location, connectionId);
+    cleanup();
+    const { projectId, location, id } = parseConnectionName(conn.name);
+    return await gcb.getConnection(projectId, location, id);
 }
-async function getOrCreateConnection(projectId, location, connectionId) {
+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 installed or configured the Cloud Build GitHub app to access your GitHub repo.",
+    });
+    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;
+}
+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;
@@ -103,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.`);
         }
@@ -120,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/localFunction.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.HTTPS_SENTINEL = void 0;
 const uuid = require("uuid");
-const request = require("request");
 const encodeFirestoreValue_1 = require("./firestore/encodeFirestoreValue");
 const utils = require("./utils");
+const apiv2_1 = require("./apiv2");
+exports.HTTPS_SENTINEL = "Request sent to function.";
 class LocalFunction {
     constructor(trigger, urls, controller) {
         this.trigger = trigger;
@@ -27,15 +29,73 @@ class LocalFunction {
         if (opts.instanceIdToken) {
             headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
         }
-        return request.post({
-            callback: (...args) => this.requestCallBack(...args),
-            baseUrl: this.url,
-            uri: "",
-            body: { data },
-            json: true,
-            headers: headers,
+        if (!this.url) {
+            throw new Error("No URL provided");
+        }
+        const client = new apiv2_1.Client({ urlPrefix: this.url, auth: false });
+        void client
+            .post("", data, { headers })
+            .then((res) => {
+            this.requestCallBack(undefined, res, res.body);
+        })
+            .catch((err) => {
+            this.requestCallBack(err);
         });
     }
+    constructHttpsFunc() {
+        if (!this.url) {
+            throw new Error("No URL provided");
+        }
+        const callClient = new apiv2_1.Client({ urlPrefix: this.url, auth: false });
+        const verbFactory = (hasRequestBody, method) => {
+            return async (pathOrOptions, options) => {
+                const { path, opts } = this.extractArgs(pathOrOptions, options);
+                try {
+                    const res = hasRequestBody
+                        ? await method(path, opts.body, toClientVerbOptions(opts))
+                        : await method(path, toClientVerbOptions(opts));
+                    this.requestCallBack(undefined, res, res.body);
+                }
+                catch (err) {
+                    this.requestCallBack(err);
+                }
+                return exports.HTTPS_SENTINEL;
+            };
+        };
+        const shim = verbFactory(true, (path, json, opts) => {
+            const req = Object.assign(opts || {}, {
+                path: path,
+                body: json,
+                method: (opts === null || opts === void 0 ? void 0 : opts.method) || "GET",
+            });
+            return callClient.request(req);
+        });
+        const verbs = {
+            post: verbFactory(true, (path, json, opts) => callClient.post(path, json, opts)),
+            put: verbFactory(true, (path, json, opts) => callClient.put(path, json, opts)),
+            patch: verbFactory(true, (path, json, opts) => callClient.patch(path, json, opts)),
+            get: verbFactory(false, (path, opts) => callClient.get(path, opts)),
+            del: verbFactory(false, (path, opts) => callClient.delete(path, opts)),
+            delete: verbFactory(false, (path, opts) => callClient.delete(path, opts)),
+            options: verbFactory(false, (path, opts) => callClient.options(path, opts)),
+        };
+        return Object.assign(shim, verbs);
+    }
+    extractArgs(pathOrOptions, options) {
+        if (!pathOrOptions && !options) {
+            return { path: "/", opts: {} };
+        }
+        if (typeof pathOrOptions === "string") {
+            return { path: pathOrOptions, opts: options || {} };
+        }
+        if (typeof pathOrOptions !== "string" && !!pathOrOptions && !options) {
+            return { path: "/", opts: pathOrOptions };
+        }
+        if (typeof pathOrOptions !== "string" || !options) {
+            throw new Error(`Invalid argument combination: Expected a string and/or HttpsOptions, got ${typeof pathOrOptions} and ${typeof options}`);
+        }
+        return { path: "/", opts: {} };
+    }
     constructAuth(auth, authType) {
         var _a, _b, _c;
         if ((auth === null || auth === void 0 ? void 0 : auth.admin) || (auth === null || auth === void 0 ? void 0 : auth.variable)) {
@@ -99,7 +159,7 @@ class LocalFunction {
         if (err) {
             return console.warn("\nERROR SENDING REQUEST: " + err);
         }
-        const status = response ? response.statusCode + ", " : "";
+        const status = response ? response.status + ", " : "";
         let bodyString = body;
         if (typeof bodyString === "string") {
             try {
@@ -207,11 +267,7 @@ class LocalFunction {
                 return (data, opt) => this.constructCallableFunc(data, opt);
             }
             else {
-                return request.defaults({
-                    callback: (...args) => this.requestCallBack(...args),
-                    baseUrl: this.url,
-                    uri: "",
-                });
+                return this.constructHttpsFunc();
             }
         }
         else {
@@ -220,3 +276,10 @@ class LocalFunction {
     }
 }
 exports.default = LocalFunction;
+function toClientVerbOptions(opts) {
+    return {
+        method: opts.method,
+        headers: opts.headers,
+        queryParams: opts.qs,
+    };
+}

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": "12.9.1",
+  "version": "13.0.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -29,7 +29,7 @@
   ],
   "preferGlobal": true,
   "engines": {
-    "node": ">=16.13.0 || >=18.0.0"
+    "node": ">=18.0.0 || >=20.0.0"
   },
   "author": "Firebase (https://firebase.google.com/)",
   "license": "MIT",
@@ -100,7 +100,6 @@
     "portfinder": "^1.0.32",
     "progress": "^2.0.3",
     "proxy-agent": "^6.3.0",
-    "request": "^2.87.0",
     "retry": "^0.13.1",
     "rimraf": "^3.0.0",
     "semver": "^7.5.2",

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/lib/commands/ext-dev-publish.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = void 0;
-const marked_1 = require("marked");
-const TerminalRenderer = require("marked-terminal");
-const command_1 = require("../command");
-const requireAuth_1 = require("../requireAuth");
-const ext_dev_upload_1 = require("./ext-dev-upload");
-const utils_1 = require("../utils");
-const extensionsHelper_1 = require("../extensions/extensionsHelper");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
-exports.command = new command_1.Command("ext:dev:publish <extensionRef>")
-    .description(`Deprecated. Use ext:dev:upload instead`)
-    .option(`-s, --stage <stage>`, `release stage (supports "alpha", "beta", "rc", and "stable")`)
-    .option(`--repo <repo>`, `Public GitHub repo URI that contains the extension source`)
-    .option(`--ref <ref>`, `commit hash, branch, or tag to build from the repo (defaults to HEAD)`)
-    .option(`--root <root>`, `root directory that contains this extension (defaults to last uploaded root or "/" if none set)`)
-    .withForce()
-    .help("if you have not previously uploaded a version of this extension, this will " +
-    "create the extension. If you have previously uploaded a version of this extension, this version must " +
-    "be greater than previous versions.")
-    .before(requireAuth_1.requireAuth)
-    .before(extensionsHelper_1.ensureExtensionsPublisherApiEnabled)
-    .action(async (extensionRef, options) => {
-    (0, utils_1.logLabeledWarning)("Extensions", "ext:dev:publish has been deprecated and will be removed in the future. Please use ext:dev:upload instead.");
-    if (!options.repo && !options.ref && !options.root) {
-        options.local = true;
-    }
-    return (0, ext_dev_upload_1.uploadExtensionAction)(extensionRef, options);
-});