firebase-tools 10.1.0 → 10.1.1

package/lib/deploy/functions/prepare.js

@@ -16,10 +16,10 @@ const projectUtils_1 = require("../../projectUtils");
 const track_1 = require("../../track");
 const runtimes = require("./runtimes");
 const validate = require("./validate");
-const utils = require("../../utils");
 const logger_1 = require("../../logger");
 const triggerRegionHelper_1 = require("./triggerRegionHelper");
 const checkIam_1 = require("./checkIam");
+const error_1 = require("../../error");
 function hasUserConfig(config) {
     return Object.keys(config).length > 1;
 }
@@ -34,15 +34,23 @@ async function maybeEnableAR(projectId) {
     return true;
 }
 async function prepare(context, options, payload) {
-    if (!options.config.src.functions) {
-        return;
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const sourceDirName = options.config.get("functions.source");
+    if (!sourceDirName) {
+        throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions.source defined in firebase.json`);
     }
-    const runtimeDelegate = await runtimes.getRuntimeDelegate(context, options);
+    const sourceDir = options.config.path(sourceDirName);
+    const delegateContext = {
+        projectId,
+        sourceDir,
+        projectDir: options.config.projectDir,
+        runtime: options.config.get("functions.runtime") || "",
+    };
+    const runtimeDelegate = await runtimes.getRuntimeDelegate(delegateContext);
     logger_1.logger.debug(`Validating ${runtimeDelegate.name} source`);
     await runtimeDelegate.validate();
     logger_1.logger.debug(`Building ${runtimeDelegate.name} source`);
     await runtimeDelegate.build();
-    const projectId = (0, projectUtils_1.needProjectId)(options);
     const checkAPIsEnabled = await Promise.all([
         ensureApiEnabled.ensure(projectId, "cloudfunctions.googleapis.com", "functions"),
         ensureApiEnabled.check(projectId, "runtimeconfig.googleapis.com", "runtimeconfig", true),
@@ -54,11 +62,9 @@ async function prepare(context, options, payload) {
     const firebaseConfig = await functionsConfig.getFirebaseConfig(options);
     context.firebaseConfig = firebaseConfig;
     const runtimeConfig = await (0, prepareFunctionsUpload_1.getFunctionsConfig)(context);
-    utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
-    const source = options.config.src.functions.source;
     const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
     const userEnvOpt = {
-        functionsSource: options.config.path(source),
+        functionsSource: sourceDir,
         projectId: projectId,
         projectAlias: options.projectAlias,
     };
@@ -92,7 +98,7 @@ async function prepare(context, options, payload) {
     if (backend.someEndpoint(wantBackend, () => true)) {
         (0, utils_1.logBullet)(clc.cyan.bold("functions:") +
             " preparing " +
-            clc.bold(options.config.src.functions.source) +
+            clc.bold(sourceDirName) +
             " directory for uploading...");
     }
     if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {

package/lib/deploy/functions/runtimes/golang/index.js

@@ -10,7 +10,6 @@ const spawn = require("cross-spawn");
 const error_1 = require("../../../../error");
 const logger_1 = require("../../../../logger");
 const discovery = require("../discovery");
-const projectUtils_1 = require("../../../../projectUtils");
 const gomod = require("./gomod");
 const VERSION_TO_RUNTIME = {
     "1.13": "go113",
@@ -19,11 +18,8 @@ exports.ADMIN_SDK = "firebase.google.com/go/v4";
 exports.FUNCTIONS_SDK = "github.com/FirebaseExtended/firebase-functions-go";
 exports.FUNCTIONS_CODEGEN = exports.FUNCTIONS_SDK + "/support/codegen";
 exports.FUNCTIONS_RUNTIME = exports.FUNCTIONS_SDK + "/support/runtime";
-async function tryCreateDelegate(context, options) {
-    const relativeSourceDir = options.config.get("functions.source");
-    const sourceDir = options.config.path(relativeSourceDir);
-    const goModPath = path.join(sourceDir, "go.mod");
-    const projectId = (0, projectUtils_1.needProjectId)(options);
+async function tryCreateDelegate(context) {
+    const goModPath = path.join(context.sourceDir, "go.mod");
     let module;
     try {
         const modBuffer = await (0, util_1.promisify)(fs.readFile)(goModPath);
@@ -33,7 +29,7 @@ async function tryCreateDelegate(context, options) {
         logger_1.logger.debug("Customer code is not Golang code (or they aren't using gomod)");
         return;
     }
-    let runtime = options.config.get("functions.runtime");
+    let runtime = context.runtime;
     if (!runtime) {
         if (!module.version) {
             throw new error_1.FirebaseError("Could not detect Golang version from go.mod");
@@ -43,7 +39,7 @@ async function tryCreateDelegate(context, options) {
         }
         runtime = VERSION_TO_RUNTIME[module.version];
     }
-    return new Delegate(projectId, sourceDir, runtime, module);
+    return new Delegate(context.projectId, context.sourceDir, runtime, module);
 }
 exports.tryCreateDelegate = tryCreateDelegate;
 class Delegate {

package/lib/deploy/functions/runtimes/index.js

@@ -30,22 +30,18 @@ function getHumanFriendlyRuntimeName(runtime) {
 }
 exports.getHumanFriendlyRuntimeName = getHumanFriendlyRuntimeName;
 const factories = [node.tryCreateDelegate, golang.tryCreateDelegate];
-async function getRuntimeDelegate(context, options) {
-    const sourceDirName = options.config.get("functions.source");
-    if (!sourceDirName) {
-        throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions.source defined in firebase.json`);
-    }
-    validate.functionsDirectoryExists(options, sourceDirName);
-    const runtime = options.config.get("functions.runtime");
+async function getRuntimeDelegate(context) {
+    const { projectDir, sourceDir, runtime } = context;
+    validate.functionsDirectoryExists(sourceDir, projectDir);
     if (runtime && !isValidRuntime(runtime)) {
-        throw new error_1.FirebaseError("Cannot deploy function with runtime " + runtime);
+        throw new error_1.FirebaseError(`Cannot deploy function with runtime ${runtime}`);
     }
     for (const factory of factories) {
-        const delegate = await factory(context, options);
+        const delegate = await factory(context);
         if (delegate) {
             return delegate;
         }
     }
-    throw new error_1.FirebaseError(`Could not detect language for functions at ${options.config.get("functions.source")}`);
+    throw new error_1.FirebaseError(`Could not detect language for functions at ${sourceDir}`);
 }
 exports.getRuntimeDelegate = getRuntimeDelegate;

package/lib/deploy/functions/runtimes/node/index.js

@@ -6,26 +6,22 @@ const fs = require("fs");
 const path = require("path");
 const error_1 = require("../../../../error");
 const parseRuntimeAndValidateSDK_1 = require("./parseRuntimeAndValidateSDK");
-const projectUtils_1 = require("../../../../projectUtils");
-const validate = require("./validate");
 const logger_1 = require("../../../../logger");
+const validate = require("./validate");
 const versioning = require("./versioning");
 const parseTriggers = require("./parseTriggers");
-async function tryCreateDelegate(context, options) {
-    const projectRelativeSourceDir = options.config.get("functions.source");
-    const sourceDir = options.config.path(projectRelativeSourceDir);
-    const packageJsonPath = path.join(sourceDir, "package.json");
+async function tryCreateDelegate(context) {
+    const packageJsonPath = path.join(context.sourceDir, "package.json");
     if (!(await (0, util_1.promisify)(fs.exists)(packageJsonPath))) {
         logger_1.logger.debug("Customer code is not Node");
         return undefined;
     }
-    let runtime = options.config.get("functions.runtime") || "";
-    runtime = (0, parseRuntimeAndValidateSDK_1.getRuntimeChoice)(sourceDir, runtime);
+    const runtime = (0, parseRuntimeAndValidateSDK_1.getRuntimeChoice)(context.sourceDir, context.runtime);
     if (!runtime.startsWith("nodejs")) {
         logger_1.logger.debug("Customer has a package.json but did not get a nodejs runtime. This should not happen");
         throw new error_1.FirebaseError(`Unexpected runtime ${runtime}`);
     }
-    return new Delegate((0, projectUtils_1.needProjectId)(options), options.config.projectDir, sourceDir, runtime);
+    return new Delegate(context.projectId, context.projectDir, context.sourceDir, runtime);
 }
 exports.tryCreateDelegate = tryCreateDelegate;
 class Delegate {

package/lib/deploy/functions/runtimes/node/validate.js

@@ -9,7 +9,8 @@ const cjson = require("cjson");
 function assertFunctionsSourcePresent(data, sourceDir, projectDir) {
     const indexJsFile = path.join(sourceDir, data.main || "index.js");
     if (!fsutils.fileExistsSync(indexJsFile)) {
-        const msg = `${path.relative(projectDir, indexJsFile)} does not exist, can't deploy Cloud Functions`;
+        const relativeMainPath = path.relative(projectDir, indexJsFile);
+        const msg = `${relativeMainPath} does not exist, can't deploy Cloud Functions`;
         throw new error_1.FirebaseError(msg);
     }
 }

package/lib/deploy/functions/validate.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionIdsAreValid = exports.functionsDirectoryExists = void 0;
+const path = require("path");
 const clc = require("cli-color");
 const error_1 = require("../../error");
 const fsutils = require("../../fsutils");
-const projectPath = require("../../projectPath");
-function functionsDirectoryExists(options, sourceDirName) {
-    if (!fsutils.dirExistsSync(projectPath.resolveProjectPath(options, sourceDirName))) {
+function functionsDirectoryExists(sourceDir, projectDir) {
+    if (!fsutils.dirExistsSync(sourceDir)) {
+        const sourceDirName = path.relative(projectDir, sourceDir);
         const msg = `could not deploy functions because the ${clc.bold('"' + sourceDirName + '"')} ` +
             `directory was not found. Please create it or specify a different source directory in firebase.json`;
         throw new error_1.FirebaseError(msg);

package/lib/emulator/auth/widget_ui.js

@@ -91,7 +91,7 @@ function sendAuthEventViaIframeRelay(authEvent, cb) {
           }, '*');
           sent = true;
         }
-      } catch (e: any) {
+      } catch (e) {
         // The frame does not have the same origin
       }
     }