firebase-tools 13.32.0 → 13.33.0

package/lib/deploy/functions/release/planner.js

@@ -16,6 +16,7 @@ function calculateChangesets(want, have, keyFn, deleteAll) {
         .filter((id) => deleteAll || (0, deploymentTool_1.isFirebaseManaged)(have[id].labels || {}))
         .map((id) => have[id]), keyFn);
     const toSkipPredicate = (id) => !!(!want[id].targetedByOnly &&
+        have[id].state === "ACTIVE" &&
         have[id].hash &&
         want[id].hash &&
         want[id].hash === have[id].hash);

package/lib/emulator/constants.js

@@ -103,6 +103,7 @@ Constants.FIREBASE_ENABLED_EXPERIMENTS = "FIREBASE_ENABLED_EXPERIMENTS";
 Constants.FIRESTORE_EMULATOR_HOST = "FIRESTORE_EMULATOR_HOST";
 Constants.FIRESTORE_EMULATOR_ENV_ALT = "FIREBASE_FIRESTORE_EMULATOR_ADDRESS";
 Constants.FIREBASE_DATABASE_EMULATOR_HOST = "FIREBASE_DATABASE_EMULATOR_HOST";
+Constants.FIREBASE_DATACONNECT_EMULATOR_HOST = "FIREBASE_DATACONNECT_EMULATOR_HOST";
 Constants.FIREBASE_AUTH_EMULATOR_HOST = "FIREBASE_AUTH_EMULATOR_HOST";
 Constants.FIREBASE_STORAGE_EMULATOR_HOST = "FIREBASE_STORAGE_EMULATOR_HOST";
 Constants.CLOUD_STORAGE_EMULATOR_HOST = "STORAGE_EMULATOR_HOST";

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.8.3",
-            expectedSize: 25535232,
-            expectedChecksum: "53fb0bf52f21a84b1d6afa70371dd00c",
+            version: "1.8.4",
+            expectedSize: 25588480,
+            expectedChecksum: "421f6226a0433b824642c03eb0b6862d",
         }
         : process.platform === "win32"
             ? {
-                version: "1.8.3",
-                expectedSize: 25965568,
-                expectedChecksum: "d717235f244e5bbbc00158eae3aa97f0",
+                version: "1.8.4",
+                expectedSize: 26020352,
+                expectedChecksum: "b78c95a7f071f127acda3a76cdcc8c48",
             }
             : {
-                version: "1.8.3",
-                expectedSize: 25448600,
-                expectedChecksum: "cd381e329a27ff0c81c41d7e635d6733",
+                version: "1.8.4",
+                expectedSize: 25501848,
+                expectedChecksum: "0aabd622b1a99b2a0d9c9dec4c7404fc",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/env.js

@@ -34,6 +34,8 @@ function setEnvVarsForEmulators(env, emulators) {
             case types_1.Emulators.TASKS:
                 env[constants_1.Constants.CLOUD_TASKS_EMULATOR_HOST] = host;
                 break;
+            case types_1.Emulators.DATACONNECT:
+                env[constants_1.Constants.FIREBASE_DATACONNECT_EMULATOR_HOST] = host;
         }
     }
 }

package/lib/gcp/cloudfunctions.js

@@ -265,6 +265,21 @@ function endpointFromFunction(gcfFunction) {
     if ((_h = gcfFunction.labels) === null || _h === void 0 ? void 0 : _h[constants_1.HASH_LABEL]) {
         endpoint.hash = gcfFunction.labels[constants_1.HASH_LABEL];
     }
+    proto.convertIfPresent(endpoint, gcfFunction, "state", "status", (status) => {
+        if (status === "ACTIVE") {
+            return "ACTIVE";
+        }
+        else if (status === "OFFLINE") {
+            return "FAILED";
+        }
+        else if (status === "DEPLOY_IN_PROGRESS") {
+            return "DEPLOYING";
+        }
+        else if (status === "DELETE_IN_PROGRESS") {
+            return "DELETING";
+        }
+        return "UNKONWN";
+    });
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;

package/lib/gcp/cloudfunctionsv2.js

@@ -91,7 +91,7 @@ async function createFunction(cloudFunction) {
     const components = cloudFunction.name.split("/");
     const functionId = components.splice(-1, 1)[0];
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."), LOG_EXECUTION_ID: "true" });
     try {
         const res = await client.post(components.join("/"), cloudFunction, { queryParams: { functionId } });
         return res.body;
@@ -147,7 +147,7 @@ async function updateFunction(cloudFunction) {
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables", "serviceConfig.secretEnvironmentVariables");
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
     fieldMasks.push("buildConfig.buildEnvironmentVariables");
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."), LOG_EXECUTION_ID: "true" });
     try {
         const queryParams = {
             updateMask: fieldMasks.join(","),
@@ -389,6 +389,7 @@ function endpointFromFunction(gcfFunction) {
     if ((_f = gcfFunction.labels) === null || _f === void 0 ? void 0 : _f[constants_1.HASH_LABEL]) {
         endpoint.hash = gcfFunction.labels[constants_1.HASH_LABEL];
     }
+    proto.copyIfPresent(endpoint, gcfFunction, "state");
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;

package/lib/management/apps.js

@@ -566,13 +566,16 @@ async function findIntelligentPathForAndroid(appDir, options) {
         const dirs = [];
         for (const fileOrDir of currentFiles) {
             if (fileOrDir.isDirectory()) {
+                if (fileOrDir.name !== "gradle") {
+                    dirs.push(fileOrDir.name);
+                }
                 if (fileOrDir.name === "src") {
                     return appDir;
                 }
             }
         }
         let module = path.join(appDir, "app");
-        if (dirs.length === 1) {
+        if (dirs.length === 1 && dirs[0] === "app") {
             return module;
         }
         if (!options.nonInteractive) {

package/package.json

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