firebase-tools 11.1.0 → 11.2.0

package/lib/init/features/hosting/index.js

@@ -10,7 +10,7 @@ const logger_1 = require("../../../logger");
 const INDEX_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/index.html", "utf8");
 const MISSING_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/404.html", "utf8");
 const DEFAULT_IGNORES = ["firebase.json", "**/.*", "**/node_modules/**"];
-async function doSetup(setup, config, options) {
+async function doSetup(setup, config) {
     setup.hosting = {};
     logger_1.logger.info();
     logger_1.logger.info(`Your ${clc.bold("public")} directory is the folder (relative to your project directory) that`);
@@ -51,7 +51,7 @@ async function doSetup(setup, config, options) {
     const response = await c.get("/firebasejs/releases.json");
     await config.askWriteProjectFile(`${setup.hosting.public}/index.html`, INDEX_TEMPLATE.replace(/{{VERSION}}/g, response.body.current.version));
     if (setup.hosting.github) {
-        return (0, github_1.initGitHub)(setup, config, options);
+        return (0, github_1.initGitHub)(setup);
     }
 }
 exports.doSetup = doSetup;

package/lib/localFunction.js

@@ -38,13 +38,13 @@ LocalFunction.prototype._substituteParams = function (resource, params) {
     return resource.replace(wildcardRegex, function (wildcard) {
         var wildcardNoBraces = wildcard.slice(1, -1);
         var sub = _.get(params, wildcardNoBraces);
-        return sub || wildcardNoBraces + _.random(1, 9);
+        return sub || wildcardNoBraces + utils.randomInt(1, 9);
     });
 };
 LocalFunction.prototype._constructCallableFunc = function (data, opts) {
     opts = opts || {};
     var headers = {};
-    if (_.has(opts, "instanceIdToken")) {
+    if (opts.instanceIdToken) {
         headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
     }
     return request.post({
@@ -134,7 +134,7 @@ LocalFunction.prototype._call = function (data, opts) {
     }
     else if (this.eventTrigger) {
         if (this._isDatabaseFunc(this.eventTrigger)) {
-            operationType = _.last(this.eventTrigger.eventType.split("."));
+            operationType = utils.last(this.eventTrigger.eventType.split("."));
             switch (operationType) {
                 case "create":
                     dataPayload = {
@@ -159,7 +159,7 @@ LocalFunction.prototype._call = function (data, opts) {
             this.controller.call(this.name, dataPayload, opts);
         }
         else if (this._isFirestoreFunc(this.eventTrigger)) {
-            operationType = _.last(this.eventTrigger.eventType.split("."));
+            operationType = utils.last(this.eventTrigger.eventType.split("."));
             switch (operationType) {
                 case "create":
                     dataPayload = {

package/lib/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {

package/lib/profileReport.js

@@ -62,7 +62,7 @@ function formatBytes(bytes) {
 }
 exports.formatBytes = formatBytes;
 function extractReadableIndex(query) {
-    if (_.has(query, "orderBy")) {
+    if (query.orderBy) {
         return query.orderBy;
     }
     const indexPath = _.get(query, "index.path");
@@ -96,13 +96,13 @@ class ProfileReport {
         if (!data.unIndexed) {
             return;
         }
-        if (!_.has(this.state.unindexed, path)) {
+        if (!this.state.unindexed.path) {
             this.state.unindexed[path] = {};
         }
         const pathNode = this.state.unindexed[path];
         const query = data.querySet[0];
         const index = JSON.stringify(query.index);
-        if (!_.has(pathNode, index)) {
+        if (!pathNode[index]) {
             pathNode[index] = {
                 times: 0,
                 query: query,
@@ -132,7 +132,7 @@ class ProfileReport {
         }
     }
     collectSpeed(data, path, opType) {
-        if (!_.has(opType, path)) {
+        if (!opType[path]) {
             opType[path] = {
                 times: 0,
                 millis: 0,
@@ -155,7 +155,7 @@ class ProfileReport {
         }
     }
     collectBandwidth(bytes, path, direction) {
-        if (!_.has(direction, path)) {
+        if (!direction[path]) {
             direction[path] = {
                 times: 0,
                 bytes: 0,
@@ -239,7 +239,7 @@ class ProfileReport {
         if (!this.options.collapse) {
             return pathedObject;
         }
-        const allSegments = _.keys(pathedObject).map((path) => {
+        const allSegments = Object.keys(pathedObject).map((path) => {
             return path.split("/").filter((s) => {
                 return s !== "";
             });
@@ -302,9 +302,9 @@ class ProfileReport {
                 };
             });
         });
-        const paths = _.keys(unindexed);
+        const paths = Object.keys(unindexed);
         paths.forEach((path) => {
-            const indices = _.keys(unindexed[path]);
+            const indices = Object.keys(unindexed[path]);
             indices.forEach((index) => {
                 const data = unindexed[path][index];
                 const row = [path, extractReadableIndex(data.query), formatNumber(data.times)];
@@ -327,7 +327,7 @@ class ProfileReport {
                 times: b1.times + b2.times,
             };
         });
-        const paths = _.orderBy(_.keys(data), [(p) => data[p].bytes], ["desc"]);
+        const paths = _.orderBy(Object.keys(data), [(p) => data[p].bytes], ["desc"]);
         paths.forEach((path) => {
             const bandwidth = data[path];
             const row = [
@@ -392,7 +392,7 @@ class ProfileReport {
                 rejected: s1.rejected + s2.rejected,
             };
         });
-        let paths = _.keys(data);
+        let paths = Object.keys(data);
         paths = _.orderBy(paths, (path) => {
             const speed = data[path];
             return speed.millis / speed.times;

package/lib/prompt.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptOnce = exports.prompt = void 0;
 const inquirer = require("inquirer");
-const _ = require("lodash");
 const error_1 = require("./error");
 async function prompt(options, questions) {
     const prompts = [];
@@ -12,7 +11,7 @@ async function prompt(options, questions) {
         }
     }
     if (prompts.length && options.nonInteractive) {
-        const missingOptions = _.uniq(_.map(prompts, "name")).join(", ");
+        const missingOptions = Array.from(new Set(prompts.map((p) => p.name))).join(", ");
         throw new error_1.FirebaseError(`Missing required options (${missingOptions}) while running in non-interactive mode`, {
             children: prompts,
         });

package/lib/rc.js

@@ -93,7 +93,7 @@ class RC {
             }
         }
         const existing = this.target(project, type, targetName);
-        const list = _.uniq(existing.concat(resources)).sort();
+        const list = Array.from(new Set(existing.concat(resources))).sort();
         this.set(["targets", project, type, targetName], list);
         this.save();
         return changed;

package/lib/rulesDeploy.js

@@ -91,8 +91,8 @@ class RulesDeploy {
                 }, this.options);
                 if (confirm) {
                     const releases = await gcp.rules.listAllReleases(this.options.project);
-                    const unreleased = _.reject(history, (ruleset) => {
-                        return !!releases.find((release) => release.rulesetName === ruleset.name);
+                    const unreleased = history.filter((ruleset) => {
+                        return !releases.find((release) => release.rulesetName === ruleset.name);
                     });
                     const entriesToDelete = unreleased.reverse().slice(0, RULESETS_TO_GC);
                     for (const entry of entriesToDelete) {

package/lib/serve/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serve = void 0;
-const _ = require("lodash");
 const logger_1 = require("../logger");
 const frameworks_1 = require("../frameworks");
 const previews_1 = require("../previews");
@@ -11,23 +10,23 @@ const TARGETS = {
     functions: new FunctionsServer(),
 };
 async function serve(options) {
-    const targetNames = options.targets;
+    const targetNames = options.targets || [];
     options.port = parseInt(options.port, 10);
     if (previews_1.previews.frameworkawareness &&
         targetNames.includes("hosting") &&
         [].concat(options.config.get("hosting")).some((it) => it.source)) {
         await (0, frameworks_1.prepareFrameworks)(targetNames, options, options);
     }
-    await Promise.all(_.map(targetNames, (targetName) => {
+    await Promise.all(targetNames.map((targetName) => {
         return TARGETS[targetName].start(options);
     }));
-    await Promise.all(_.map(targetNames, (targetName) => {
+    await Promise.all(targetNames.map((targetName) => {
         return TARGETS[targetName].connect();
     }));
     await new Promise((resolve) => {
         process.on("SIGINT", () => {
             logger_1.logger.info("Shutting down...");
-            return Promise.all(_.map(targetNames, (targetName) => {
+            Promise.all(targetNames.map((targetName) => {
                 return TARGETS[targetName].stop(options);
             }))
                 .then(resolve)

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.assertDefined = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.assertDefined = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
 const _ = require("lodash");
 const url = require("url");
 const clc = require("cli-color");
@@ -28,7 +28,7 @@ exports.consoleUrl = consoleUrl;
 function getInheritedOption(options, key) {
     let target = options;
     while (target) {
-        if (_.has(target, key)) {
+        if (target[key] !== undefined) {
             return target[key];
         }
         target = target.parent;
@@ -184,13 +184,13 @@ function makeActiveProject(projectDir, newActive) {
 }
 exports.makeActiveProject = makeActiveProject;
 function endpoint(parts) {
-    return `/${_.join(parts, "/")}`;
+    return `/${parts.join("/")}`;
 }
 exports.endpoint = endpoint;
 function getFunctionsEventProvider(eventType) {
     const parts = eventType.split("/");
     if (parts.length > 1) {
-        const provider = _.last(parts[1].split("."));
+        const provider = last(parts[1].split("."));
         return _.capitalize(provider);
     }
     if (eventType.match(/google.pubsub/)) {
@@ -218,7 +218,7 @@ function getFunctionsEventProvider(eventType) {
 }
 exports.getFunctionsEventProvider = getFunctionsEventProvider;
 function promiseAllSettled(promises) {
-    const wrappedPromises = _.map(promises, async (p) => {
+    const wrappedPromises = promises.map(async (p) => {
         try {
             const val = await Promise.resolve(p);
             return { state: "fulfilled", value: val };
@@ -250,7 +250,7 @@ async function promiseWhile(action, check, interval = 2500) {
 exports.promiseWhile = promiseWhile;
 async function promiseProps(obj) {
     const resultObj = {};
-    const promises = _.keys(obj).map(async (key) => {
+    const promises = Object.keys(obj).map(async (key) => {
         const r = await Promise.resolve(obj[key]);
         resultObj[key] = r;
     });
@@ -435,3 +435,27 @@ function cloneDeep(obj) {
     return cloneObject(obj);
 }
 exports.cloneDeep = cloneDeep;
+function last(arr) {
+    if (!Array.isArray(arr)) {
+        return;
+    }
+    return arr[arr.length - 1];
+}
+exports.last = last;
+function debounce(fn, delay, { leading } = {}) {
+    let timer;
+    return (...args) => {
+        if (!timer && leading) {
+            fn(...args);
+        }
+        clearTimeout(timer);
+        timer = setTimeout(() => fn(...args), delay);
+    };
+}
+exports.debounce = debounce;
+function randomInt(min, max) {
+    min = Math.floor(min);
+    max = Math.ceil(max) + 1;
+    return Math.floor(Math.random() * (max - min) + min);
+}
+exports.randomInt = randomInt;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.1.0",
+  "version": "11.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.1.0",
+      "version": "11.2.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "11.1.0",
+  "version": "11.2.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -23,15 +23,16 @@
     "mocha": "nyc mocha 'src/test/**/*.{ts,js}'",
     "prepare": "npm run clean && npm run build -- --build tsconfig.publish.json",
     "test": "npm run lint:quiet && npm run test:compile && npm run mocha",
-    "test:client-integration": "./scripts/client-integration-tests/run.sh",
+    "test:client-integration": "bash ./scripts/client-integration-tests/run.sh",
     "test:compile": "tsc --project tsconfig.compile.json",
-    "test:emulator": "./scripts/emulator-tests/run.sh",
-    "test:extensions-deploy": "./scripts/extensions-deploy-tests/run.sh",
-    "test:extensions-emulator": "./scripts/extensions-emulator-tests/run.sh",
-    "test:hosting": "./scripts/hosting-tests/run.sh",
-    "test:triggers-end-to-end": "./scripts/triggers-end-to-end-tests/run.sh",
-    "test:storage-deploy": "./scripts/storage-deploy-tests/run.sh",
-    "test:storage-emulator-integration": "./scripts/storage-emulator-integration/run.sh"
+    "test:emulator": "bash ./scripts/emulator-tests/run.sh",
+    "test:import-export": "bash ./scripts/emulator-import-export-tests/run.sh",
+    "test:extensions-deploy": "bash ./scripts/extensions-deploy-tests/run.sh",
+    "test:extensions-emulator": "bash ./scripts/extensions-emulator-tests/run.sh",
+    "test:hosting": "bash ./scripts/hosting-tests/run.sh",
+    "test:triggers-end-to-end": "bash ./scripts/triggers-end-to-end-tests/run.sh",
+    "test:storage-deploy": "bash ./scripts/storage-deploy-tests/run.sh",
+    "test:storage-emulator-integration": "bash ./scripts/storage-emulator-integration/run.sh"
   },
   "files": [
     "lib",