firebase-tools 10.1.4 → 10.1.5

package/lib/apiv2.js

@@ -254,6 +254,7 @@ class Client {
                                 body = JSON.parse(text);
                             }
                             catch (err) {
+                                this.logResponse(res, text, options);
                                 throw new error_1.FirebaseError(`Unable to parse JSON: ${err}`);
                             }
                         }

package/lib/extensions/extensionsHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirm = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.getExtensionSourceFromName = exports.createSourceFromLocation = exports.publishExtensionVersionFromLocalSource = exports.ensureExtensionsApiEnabled = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
+exports.confirm = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.publishExtensionVersionFromLocalSource = exports.ensureExtensionsApiEnabled = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
 const ora = require("ora");
@@ -382,22 +382,6 @@ async function deleteUploadedSource(objectPath) {
         }
     }
 }
-async function getExtensionSourceFromName(extensionName) {
-    const officialExtensionRegex = /^[a-zA-Z\-]+[0-9@.]*$/;
-    const existingSourceRegex = /projects\/.+\/sources\/.+/;
-    if (officialExtensionRegex.test(extensionName)) {
-        const [name, version] = extensionName.split("@");
-        const registryEntry = await (0, resolveSource_1.resolveRegistryEntry)(name);
-        const sourceUrl = (0, resolveSource_1.resolveSourceUrl)(registryEntry, name, version);
-        return await (0, extensionsApi_1.getSource)(sourceUrl);
-    }
-    else if (existingSourceRegex.test(extensionName)) {
-        logger_1.logger.info(`Fetching the source "${extensionName}"...`);
-        return await (0, extensionsApi_1.getSource)(extensionName);
-    }
-    throw new error_1.FirebaseError(`Could not find an extension named '${extensionName}'. `);
-}
-exports.getExtensionSourceFromName = getExtensionSourceFromName;
 function getPublisherProjectFromName(publisherName) {
     const publisherNameRegex = /projects\/.+\/publisherProfile/;
     if (publisherNameRegex.test(publisherName)) {

package/lib/extensions/resolveSource.js

@@ -1,63 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrustedPublishers = exports.getExtensionRegistry = exports.getMinRequiredVersion = exports.getTargetVersion = exports.resolveRegistryEntry = exports.isOfficialSource = exports.resolveSourceUrl = exports.confirmUpdateWarning = void 0;
+exports.getTrustedPublishers = exports.getExtensionRegistry = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
-const { marked } = require("marked");
-const error_1 = require("../error");
 const logger_1 = require("../logger");
-const prompt_1 = require("../prompt");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const EXTENSIONS_REGISTRY_ENDPOINT = "/extensions.json";
-async function confirmUpdateWarning(updateWarning) {
-    logger_1.logger.info(marked(updateWarning.description));
-    if (updateWarning.action) {
-        logger_1.logger.info(marked(updateWarning.action));
-    }
-    const continueUpdate = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        message: "Do you wish to continue with this update?",
-        default: false,
-    });
-    if (!continueUpdate) {
-        throw new error_1.FirebaseError(`Update cancelled.`, { exit: 2 });
-    }
-}
-exports.confirmUpdateWarning = confirmUpdateWarning;
-function resolveSourceUrl(registryEntry, name, version) {
-    const targetVersion = getTargetVersion(registryEntry, version);
-    const sourceUrl = _.get(registryEntry, ["versions", targetVersion]);
-    if (!sourceUrl) {
-        throw new error_1.FirebaseError(`Could not find version ${clc.bold(version)} of extension ${clc.bold(name)}.`);
-    }
-    return sourceUrl;
-}
-exports.resolveSourceUrl = resolveSourceUrl;
-function isOfficialSource(registryEntry, sourceUrl) {
-    const versions = _.get(registryEntry, "versions");
-    return _.includes(versions, sourceUrl);
-}
-exports.isOfficialSource = isOfficialSource;
-async function resolveRegistryEntry(name) {
-    const extensionsRegistry = await getExtensionRegistry();
-    const registryEntry = _.get(extensionsRegistry, name);
-    if (!registryEntry) {
-        throw new error_1.FirebaseError(`Unable to find extension source named ${clc.bold(name)}.`);
-    }
-    return registryEntry;
-}
-exports.resolveRegistryEntry = resolveRegistryEntry;
-function getTargetVersion(registryEntry, versionOrLabel) {
-    const seekVersion = versionOrLabel || "latest";
-    const versionFromLabel = _.get(registryEntry, ["labels", seekVersion]);
-    return versionFromLabel || seekVersion;
-}
-exports.getTargetVersion = getTargetVersion;
-function getMinRequiredVersion(registryEntry) {
-    return _.get(registryEntry, ["labels", "minRequired"]);
-}
-exports.getMinRequiredVersion = getMinRequiredVersion;
 async function getExtensionRegistry(onlyFeatured) {
     const client = new apiv2_1.Client({ urlPrefix: api_1.firebaseExtensionsRegistryOrigin });
     const res = await client.get(EXTENSIONS_REGISTRY_ENDPOINT);

package/lib/extensions/updateHelper.js

@@ -6,7 +6,6 @@ const semver = require("semver");
 const { marked } = require("marked");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
-const resolveSource = require("./resolveSource");
 const extensionsApi = require("./extensionsApi");
 const refs = require("./refs");
 const extensionsHelper_1 = require("./extensionsHelper");
@@ -123,19 +122,6 @@ async function updateToVersionFromPublisherSource(projectId, instanceId, extVers
     catch (err) {
         throw new error_1.FirebaseError(`Could not find source '${clc.bold(extVersionRef)}' because (${clc.bold(version)}) is not a published version. To update, use the latest version of this extension (${clc.bold(extension.latestVersion)}).`);
     }
-    let registryEntry;
-    try {
-        registryEntry = await resolveSource.resolveRegistryEntry(existingSpec.name);
-    }
-    catch (err) {
-        logger_1.logger.debug(`Unable to fetch registry.json entry for ${existingSpec.name}`);
-    }
-    if (registryEntry) {
-        const minVer = resolveSource.getMinRequiredVersion(registryEntry);
-        if (minVer && semver.gt(minVer, source.spec.version)) {
-            throw new error_1.FirebaseError(`The version you are trying to update to (${clc.bold(source.spec.version)}) is less than the minimum version required (${clc.bold(minVer)}) to use this extension.`);
-        }
-    }
     showUpdateVersionInfo(instanceId, existingSpec.version, source.spec.version, extVersionRef);
     warningUpdateToOtherSource(extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION);
     const releaseNotes = await changelog.getReleaseNotesForUpdate({

package/lib/extensions/utils.js

@@ -22,12 +22,14 @@ function convertExtensionOptionToLabeledList(options) {
 }
 exports.convertExtensionOptionToLabeledList = convertExtensionOptionToLabeledList;
 function convertOfficialExtensionsToList(officialExts) {
-    return _.map(officialExts, (entry, key) => {
+    const l = _.map(officialExts, (entry, key) => {
         return {
             checked: false,
-            value: key,
+            value: `${entry.publisher}/${key}`,
         };
     });
+    l.sort((a, b) => a.value.localeCompare(b.value));
+    return l;
 }
 exports.convertOfficialExtensionsToList = convertOfficialExtensionsToList;
 function getRandomString(length) {

package/lib/gcp/storage.js

@@ -42,9 +42,9 @@ async function uploadObject(source, bucketName) {
     if (path.extname(source.file) !== ".zip") {
         throw new error_1.FirebaseError(`Expected a file name ending in .zip, got ${source.file}`);
     }
-    const storageAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin, apiVersion: "v1" });
+    const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
     const location = `/${bucketName}/${path.basename(source.file)}`;
-    const res = await storageAPIClient.request({
+    const res = await localAPIClient.request({
         method: "PUT",
         path: location,
         headers: {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.1.4",
+  "version": "10.1.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.1.4",
+      "version": "10.1.5",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",

package/package.json

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