firebase-tools 13.15.1 → 13.15.3

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,

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/emulator/downloadableEmulators.js

@@ -46,20 +46,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.3.4",
-            expectedSize: 24216320,
-            expectedChecksum: "f57bc0b9a10837ecb4f2808c49ae3ff5",
+            version: "1.3.5",
+            expectedSize: 24232704,
+            expectedChecksum: "4eabf613a4a5feeaa173e1375b62bde0",
         }
         : process.platform === "win32"
             ? {
-                version: "1.3.4",
-                expectedSize: 24631296,
-                expectedChecksum: "c8f1433fbff26f5e9da30cf205f2af78",
+                version: "1.3.5",
+                expectedSize: 24651264,
+                expectedChecksum: "c7b2b7168ff7226f4e5626ae7d13e0ca",
             }
             : {
-                version: "1.3.4",
-                expectedSize: 24125592,
-                expectedChecksum: "a7b9a79d66fa5ebfb1a0f65e535d5c33",
+                version: "1.3.5",
+                expectedSize: 24146072,
+                expectedChecksum: "1457937751ce25fa332cdc16b561d64b",
             },
 };
 exports.DownloadDetails = {

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/lib/frameworks/next/index.js

@@ -22,6 +22,7 @@ const constants_1 = require("../constants");
 const constants_2 = require("./constants");
 const api_1 = require("../../hosting/api");
 const logger_1 = require("../../logger");
+const env_1 = require("../../functions/env");
 const DEFAULT_BUILD_SCRIPT = ["next build"];
 const PUBLIC_DIR = "public";
 exports.supportedRange = "12 - 14.0";
@@ -50,7 +51,14 @@ async function build(dir, target, context) {
     if (reactVersion && (0, semver_1.gte)(reactVersion, "18.0.0")) {
         process.env.__NEXT_REACT_ROOT = "true";
     }
-    const env = Object.assign({}, process.env);
+    let env = Object.assign({}, process.env);
+    if (context === null || context === void 0 ? void 0 : context.projectId) {
+        const projectEnvPath = (0, path_1.join)(dir, `.env.${context.projectId}`);
+        if (await (0, fs_extra_1.pathExists)(projectEnvPath)) {
+            const projectEnvVars = (0, env_1.parseStrict)((await (0, fs_extra_1.readFile)(projectEnvPath)).toString());
+            env = Object.assign(Object.assign({}, projectEnvVars), env);
+        }
+    }
     if ((context === null || context === void 0 ? void 0 : context.projectId) && (context === null || context === void 0 ? void 0 : context.site)) {
         const deploymentDomain = await (0, api_1.getDeploymentDomain)(context.projectId, context.site, context.hostingChannel);
         if (deploymentDomain) {

package/lib/frameworks/next/utils.js

@@ -244,9 +244,13 @@ async function whichNextConfigFile(dir) {
 }
 exports.whichNextConfigFile = whichNextConfigFile;
 function findEsbuildPath() {
+    var _a;
     try {
-        const esbuildBinPath = (0, child_process_1.execSync)("npx which esbuild", { encoding: "utf8" }).trim();
-        const globalVersion = getGlobalEsbuildVersion();
+        const esbuildBinPath = (_a = (0, child_process_1.execSync)("npx which esbuild", { encoding: "utf8" })) === null || _a === void 0 ? void 0 : _a.trim();
+        if (!esbuildBinPath) {
+            return null;
+        }
+        const globalVersion = getGlobalEsbuildVersion(esbuildBinPath);
         if (globalVersion && !(0, semver_1.satisfies)(globalVersion, constants_1.ESBUILD_VERSION)) {
             console.warn(`Warning: Global esbuild version (${globalVersion}) does not match the required version (${constants_1.ESBUILD_VERSION}).`);
         }
@@ -258,9 +262,13 @@ function findEsbuildPath() {
     }
 }
 exports.findEsbuildPath = findEsbuildPath;
-function getGlobalEsbuildVersion() {
+function getGlobalEsbuildVersion(binPath) {
+    var _a;
     try {
-        const versionOutput = (0, child_process_1.execSync)("esbuild --version", { encoding: "utf8" }).trim();
+        const versionOutput = (_a = (0, child_process_1.execSync)(`${binPath} --version`, { encoding: "utf8" })) === null || _a === void 0 ? void 0 : _a.trim();
+        if (!versionOutput) {
+            return null;
+        }
         const versionMatch = versionOutput.match(/(\d+\.\d+\.\d+)/);
         return versionMatch ? versionMatch[0] : null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.15.1",
+  "version": "13.15.3",
   "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"
   }
 }