firebase-tools 10.1.1 → 10.1.5

package/lib/deploy/hosting/convertConfig.js

@@ -1,11 +1,24 @@
 "use strict";
-const _ = require("lodash");
-const { FirebaseError } = require("../../error");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertConfig = void 0;
+const error_1 = require("../../error");
+function has(obj, k) {
+    return obj[k] !== undefined;
+}
 function extractPattern(type, spec) {
-    const glob = spec.source || spec.glob;
-    const regex = spec.regex;
+    let glob = "";
+    let regex = "";
+    if ("source" in spec) {
+        glob = spec.source;
+    }
+    if ("glob" in spec) {
+        glob = spec.glob;
+    }
+    if ("regex" in spec) {
+        regex = spec.regex;
+    }
     if (glob && regex) {
-        throw new FirebaseError("Cannot specify a " + type + " pattern with both a glob and regex.");
+        throw new error_1.FirebaseError(`Cannot specify a ${type} pattern with both a glob and regex.`);
     }
     else if (glob) {
         return { glob: glob };
@@ -13,33 +26,38 @@ function extractPattern(type, spec) {
     else if (regex) {
         return { regex: regex };
     }
-    throw new FirebaseError("Cannot specify a " + type + " with no pattern (either a glob or regex required).");
+    throw new error_1.FirebaseError(`Cannot specify a ${type} with no pattern (either a glob or regex required).`);
 }
-module.exports = function (config) {
+function convertConfig(config) {
+    if (Array.isArray(config)) {
+        throw new error_1.FirebaseError(`convertConfig should be given a single configuration, not an array.`, {
+            exit: 2,
+        });
+    }
     const out = {};
     if (!config) {
         return out;
     }
-    if (_.isArray(config.rewrites)) {
-        out.rewrites = config.rewrites.map(function (rewrite) {
+    if (Array.isArray(config.rewrites)) {
+        out.rewrites = config.rewrites.map((rewrite) => {
             const vRewrite = extractPattern("rewrite", rewrite);
-            if (rewrite.destination) {
+            if ("destination" in rewrite) {
                 vRewrite.path = rewrite.destination;
             }
-            else if (rewrite.function) {
+            else if ("function" in rewrite) {
                 vRewrite.function = rewrite.function;
             }
-            else if (rewrite.dynamicLinks) {
+            else if ("dynamicLinks" in rewrite) {
                 vRewrite.dynamicLinks = rewrite.dynamicLinks;
             }
-            else if (rewrite.run) {
+            else if ("run" in rewrite) {
                 vRewrite.run = Object.assign({ region: "us-central1" }, rewrite.run);
             }
             return vRewrite;
         });
     }
-    if (_.isArray(config.redirects)) {
-        out.redirects = config.redirects.map(function (redirect) {
+    if (Array.isArray(config.redirects)) {
+        out.redirects = config.redirects.map((redirect) => {
             const vRedirect = extractPattern("redirect", redirect);
             vRedirect.location = redirect.destination;
             if (redirect.type) {
@@ -48,17 +66,19 @@ module.exports = function (config) {
             return vRedirect;
         });
     }
-    if (_.isArray(config.headers)) {
-        out.headers = config.headers.map(function (header) {
+    if (Array.isArray(config.headers)) {
+        out.headers = config.headers.map((header) => {
             const vHeader = extractPattern("header", header);
             vHeader.headers = {};
-            (header.headers || []).forEach(function (h) {
-                vHeader.headers[h.key] = h.value;
-            });
+            if (Array.isArray(header.headers) && header.headers.length) {
+                header.headers.forEach((h) => {
+                    vHeader.headers[h.key] = h.value;
+                });
+            }
             return vHeader;
         });
     }
-    if (_.has(config, "cleanUrls")) {
+    if (has(config, "cleanUrls")) {
         out.cleanUrls = config.cleanUrls;
     }
     if (config.trailingSlash === true) {
@@ -67,11 +87,12 @@ module.exports = function (config) {
     else if (config.trailingSlash === false) {
         out.trailingSlashBehavior = "REMOVE";
     }
-    if (_.has(config, "appAssociation")) {
+    if (has(config, "appAssociation")) {
         out.appAssociation = config.appAssociation;
     }
-    if (_.has(config, "i18n")) {
+    if (has(config, "i18n")) {
         out.i18n = config.i18n;
     }
     return out;
-};
+}
+exports.convertConfig = convertConfig;

package/lib/deploy/hosting/prepare.js

@@ -1,7 +1,7 @@
 "use strict";
 const _ = require("lodash");
 const api = require("../../api");
-const convertConfig = require("./convertConfig");
+const { convertConfig } = require("./convertConfig");
 const deploymentTool = require("../../deploymentTool");
 const { FirebaseError } = require("../../error");
 const { normalizedHostingConfigs } = require("../../hosting/normalizedHostingConfigs");

package/lib/emulator/downloadableEmulators.js

@@ -221,6 +221,7 @@ async function handleEmulatorProcessError(emulator, err) {
 exports.handleEmulatorProcessError = handleEmulatorProcessError;
 async function _runBinary(emulator, command, extraEnv) {
     return new Promise((resolve) => {
+        var _a, _b;
         const logger = emulatorLogger_1.EmulatorLogger.forEmulator(emulator.name);
         emulator.stdout = fs.createWriteStream(getLogFileName(emulator.name));
         try {
@@ -242,11 +243,11 @@ async function _runBinary(emulator, command, extraEnv) {
             return;
         }
         logger.logLabeled("BULLET", emulator.name, `${description} logging to ${clc.bold(getLogFileName(emulator.name))}`);
-        emulator.instance.stdout.on("data", (data) => {
+        (_a = emulator.instance.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
             logger.log("DEBUG", data.toString());
             emulator.stdout.write(data);
         });
-        emulator.instance.stderr.on("data", (data) => {
+        (_b = emulator.instance.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => {
             logger.log("DEBUG", data.toString());
             emulator.stdout.write(data);
             if (data.toString().includes("java.lang.UnsupportedClassVersionError")) {

package/lib/emulator/functionsEmulator.js

@@ -525,7 +525,9 @@ class FunctionsEmulator {
         if (requestedMajorVersion === hostMajorVersion) {
             this.logger.logLabeled("SUCCESS", "functions", `Using node@${requestedMajorVersion} from host.`);
         }
-        this.logger.log("WARN", `Your requested "node" version "${requestedMajorVersion}" doesn't match your global version "${hostMajorVersion}"`);
+        else {
+            this.logger.log("WARN", `Your requested "node" version "${requestedMajorVersion}" doesn't match your global version "${hostMajorVersion}". Using node@${hostMajorVersion} from host.`);
+        }
         return process.execPath;
     }
     getUserEnvs(backend) {
@@ -638,6 +640,12 @@ class FunctionsEmulator {
             cwd: frb.cwd,
             stdio: ["pipe", "pipe", "pipe", "ipc"],
         });
+        if (!childProcess.stderr) {
+            throw new error_1.FirebaseError(`childProcess.stderr is undefined.`);
+        }
+        if (!childProcess.stdout) {
+            throw new error_1.FirebaseError(`childProcess.stdout is undefined.`);
+        }
         const buffers = {
             stderr: { pipe: childProcess.stderr, value: "" },
             stdout: { pipe: childProcess.stdout, value: "" },

package/lib/emulator/functionsEmulatorRuntime.js

@@ -389,10 +389,10 @@ async function initializeFirebaseAdminStubs(frb) {
         return Proxied.getOriginal(target, "auth");
     })
         .finalize();
-    require.cache[adminResolution.resolution] = {
+    require.cache[adminResolution.resolution] = Object.assign(require.cache[adminResolution.resolution], {
         exports: proxiedAdminModule,
         path: path.dirname(adminResolution.resolution),
-    };
+    });
     logDebug("firebase-admin has been stubbed.", {
         adminResolution,
     });
@@ -456,10 +456,10 @@ async function initializeFunctionsConfigHelper(frb) {
         return proxiedConfig;
     })
         .finalize();
-    require.cache[functionsResolution.resolution] = {
+    require.cache[functionsResolution.resolution] = Object.assign(require.cache[functionsResolution.resolution], {
         exports: proxiedFunctionsModule,
         path: path.dirname(functionsResolution.resolution),
-    };
+    });
     logDebug("firebase-functions has been stubbed.", {
         functionsResolution,
     });

package/lib/emulator/storage/apis/gcloud.js

@@ -14,10 +14,10 @@ function createCloudEndpoints(emulator) {
         storageLayer.createBucket(req.params[0]);
         next();
     });
-    gcloudStorageAPI.get("/b", (req, res) => {
+    gcloudStorageAPI.get("/b", async (req, res) => {
         res.json({
             kind: "storage#buckets",
-            items: storageLayer.listBuckets(),
+            items: await storageLayer.listBuckets(),
         });
     });
     gcloudStorageAPI.get(["/b/:bucketId/o/:objectId", "/download/storage/v1/b/:bucketId/o/:objectId"], (req, res) => {

package/lib/emulator/storage/files.js

@@ -19,6 +19,7 @@ const fse = require("fs-extra");
 const rimraf = require("rimraf");
 const cloudFunctions_1 = require("./cloudFunctions");
 const logger_1 = require("../../logger");
+const adminSdkConfig_1 = require("../adminSdkConfig");
 class StoredFile {
     constructor(metadata, path) {
         this.metadata = metadata;
@@ -108,9 +109,13 @@ class StorageLayer {
             this._buckets.set(id, new metadata_1.CloudStorageBucketMetadata(id));
         }
     }
-    listBuckets() {
+    async listBuckets() {
         if (this._buckets.size == 0) {
-            this.createBucket("default-bucket");
+            let adminSdkConfig = await (0, adminSdkConfig_1.getProjectAdminSdkConfigOrCached)(this._projectId);
+            if (!adminSdkConfig) {
+                adminSdkConfig = (0, adminSdkConfig_1.constructDefaultAdminSdkConfig)(this._projectId);
+            }
+            this.createBucket(adminSdkConfig.storageBucket);
         }
         return [...this._buckets.values()];
     }
@@ -355,7 +360,7 @@ class StorageLayer {
         const bucketsList = {
             buckets: [],
         };
-        for (const b of this.listBuckets()) {
+        for (const b of await this.listBuckets()) {
             bucketsList.buckets.push({ id: b.id });
         }
         const bucketsFilePath = path.join(storageExportPath, "buckets.json");

package/lib/emulator/storage/rules/runtime.js

@@ -62,6 +62,7 @@ class StorageRulesRuntime {
         return this._alive;
     }
     async start(auto_download = true) {
+        var _a, _b;
         const downloadDetails = downloadableEmulators_1.DownloadDetails[types_2.Emulators.STORAGE];
         const hasEmulator = fs.existsSync(downloadDetails.downloadPath);
         if (!hasEmulator) {
@@ -99,7 +100,7 @@ class StorageRulesRuntime {
         this._childprocess.on("error", (err) => {
             (0, downloadableEmulators_1.handleEmulatorProcessError)(types_2.Emulators.STORAGE, err);
         });
-        this._childprocess.stderr.on("data", (buf) => {
+        (_a = this._childprocess.stderr) === null || _a === void 0 ? void 0 : _a.on("data", (buf) => {
             const error = buf.toString();
             if (error.includes("jarfile")) {
                 throw new error_1.FirebaseError("There was an issue starting the rules emulator, please run 'firebase setup:emulators:storage` again");
@@ -108,7 +109,7 @@ class StorageRulesRuntime {
                 emulatorLogger_1.EmulatorLogger.forEmulator(types_2.Emulators.STORAGE).log("WARN", `Unexpected rules runtime error: ${buf.toString()}`);
             }
         });
-        this._childprocess.stdout.on("data", (buf) => {
+        (_b = this._childprocess.stdout) === null || _b === void 0 ? void 0 : _b.on("data", (buf) => {
             const serializedRuntimeActionResponse = buf.toString("UTF8").trim();
             if (serializedRuntimeActionResponse != "") {
                 let rap;
@@ -148,13 +149,13 @@ class StorageRulesRuntime {
             throw new error_1.FirebaseError("Attempted to send Cloud Storage rules request with stale id");
         }
         return new Promise((resolve) => {
-            var _a;
+            var _a, _b;
             this._requests[runtimeActionRequest.id] = {
                 request: runtimeActionRequest,
                 handler: resolve,
             };
             const serializedRequest = JSON.stringify(runtimeActionRequest);
-            (_a = this._childprocess) === null || _a === void 0 ? void 0 : _a.stdin.write(serializedRequest + "\n");
+            (_b = (_a = this._childprocess) === null || _a === void 0 ? void 0 : _a.stdin) === null || _b === void 0 ? void 0 : _b.write(serializedRequest + "\n");
         });
     }
     async loadRuleset(source) {

package/lib/extensions/askUserForConsent.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptForPublisherTOS = exports.displayApis = exports.displayRoles = exports.retrieveRoleInfo = exports.formatDescription = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
-const marked = require("marked");
+const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const error_1 = require("../error");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");

package/lib/extensions/askUserForParam.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ask = exports.getInquirerDefault = exports.promptCreateSecret = exports.askForParam = exports.checkResponse = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
-const marked = require("marked");
+const { marked } = require("marked");
 const extensionsApi_1 = require("./extensionsApi");
 const secretManagerApi = require("../gcp/secretManager");
 const secretsUtils = require("./secretsUtils");

package/lib/extensions/billingMigrationHelper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.displayNode10CreateBillingNotice = exports.displayNode10UpdateBillingNotice = void 0;
-const marked = require("marked");
+const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const error_1 = require("../error");
 const extensionsHelper_1 = require("./extensionsHelper");

package/lib/extensions/changelog.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseChangelog = exports.getLocalChangelog = exports.breakingChangesInUpdate = exports.displayReleaseNotes = exports.getReleaseNotesForUpdate = void 0;
 const clc = require("cli-color");
-const marked = require("marked");
+const { marked } = require("marked");
 const path = require("path");
 const semver = require("semver");
 const TerminalRenderer = require("marked-terminal");

package/lib/extensions/displayExtensionInfo.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.printSourceDownloadLink = exports.displayUpdateChangesRequiringConfirmation = exports.displayUpdateChangesNoInput = exports.displayExtInfo = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
-const marked = require("marked");
+const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const utils = require("../utils");
 const extensionsHelper_1 = require("./extensionsHelper");