firebase-tools 13.15.2 → 13.15.4

package/lib/deploy/extensions/planner.js

@@ -73,6 +73,9 @@ exports.have = have;
 async function wantDynamic(args) {
     const instanceSpecs = [];
     const errors = [];
+    if (!args.extensions) {
+        return [];
+    }
     for (const [instanceId, ext] of Object.entries(args.extensions)) {
         const autoPopulatedParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId, args.emulatorMode);
         const subbedParams = (0, extensionsHelper_1.substituteParams)(ext.params, autoPopulatedParams);
@@ -117,6 +120,9 @@ exports.wantDynamic = wantDynamic;
 async function want(args) {
     const instanceSpecs = [];
     const errors = [];
+    if (!args.extensions) {
+        return [];
+    }
     for (const e of Object.entries(args.extensions)) {
         try {
             const instanceId = e[0];

package/lib/deploy/extensions/prepare.js

@@ -101,7 +101,8 @@ async function prepareHelper(context, options, payload, wantExtensions, noDelete
 async function prepareDynamicExtensions(context, options, payload, builds) {
     const filters = (0, functionsDeployHelper_1.getEndpointFilters)(options);
     const extensions = (0, common_1.extractExtensionsFromBuilds)(builds, filters);
-    if (Object.keys(extensions).length === 0) {
+    const isApiEnabled = await (0, extensionsHelper_1.checkExtensionsApiEnabled)(options);
+    if (Object.keys(extensions).length === 0 && !isApiEnabled) {
         return;
     }
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -109,9 +110,7 @@ async function prepareDynamicExtensions(context, options, payload, builds) {
     const aliases = (0, projectUtils_1.getAliases)(options, projectId);
     const projectDir = options.config.projectDir;
     const isPrimaryCall = !!options.only && !options.only.split(",").includes("extensions");
-    if (isPrimaryCall) {
-        await (0, extensionsHelper_1.ensureExtensionsApiEnabled)(options);
-    }
+    await (0, extensionsHelper_1.ensureExtensionsApiEnabled)(options);
     await (0, requirePermissions_1.requirePermissions)(options, ["firebaseextensions.instances.list"]);
     const dynamicWant = await planner.wantDynamic({
         projectId,
@@ -125,7 +124,7 @@ async function prepareDynamicExtensions(context, options, payload, builds) {
             projectNumber,
             aliases,
             projectDir,
-            extensions: options.config.get("extensions"),
+            extensions: options.config.get("extensions", {}),
         });
         noDeleteExtensions = noDeleteExtensions.concat(firebaseJsonWant);
         if (hasNonDeployingCodebases(options)) {
@@ -165,7 +164,7 @@ async function prepare(context, options, payload) {
         projectNumber,
         aliases,
         projectDir,
-        extensions: options.config.get("extensions"),
+        extensions: options.config.get("extensions", {}),
     });
     const dynamicWant = await planner.wantDynamic({
         projectId,

package/lib/deploy/extensions/release.js

@@ -11,6 +11,12 @@ const etags_1 = require("../../extensions/etags");
 const track_1 = require("../../track");
 async function release(context, options, payload) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    if (!payload.instancesToCreate &&
+        !payload.instancesToUpdate &&
+        !payload.instancesToConfigure &&
+        !payload.instancesToDelete) {
+        return;
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const errorHandler = new errors_1.ErrorHandler();
     const deploymentQueue = new queue_1.default({

package/lib/extensions/extensionsHelper.js

@@ -7,7 +7,7 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteSecretParams = 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.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.checkExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteSecretParams = 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 clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
@@ -385,6 +385,14 @@ async function promptForReleaseStage(args) {
     }
     return stage;
 }
+async function checkExtensionsApiEnabled(options) {
+    const projectId = (0, projectUtils_1.getProjectId)(options);
+    if (!projectId) {
+        return false;
+    }
+    return await (0, ensureApiEnabled_1.check)(projectId, (0, api_1.extensionsOrigin)(), "extensions", options.markdown);
+}
+exports.checkExtensionsApiEnabled = checkExtensionsApiEnabled;
 async function ensureExtensionsApiEnabled(options) {
     const projectId = (0, projectUtils_1.getProjectId)(options);
     if (!projectId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.15.2",
+  "version": "13.15.4",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -124,7 +124,7 @@
     "uuid": "^8.3.2",
     "winston": "^3.0.0",
     "winston-transport": "^4.4.0",
-    "ws": "^7.2.3",
+    "ws": "^7.5.10",
     "yaml": "^2.4.1"
   }
 }