Skip to content

Commit

Permalink
Merge branch 'master' into ss-functions-untangle
Browse files Browse the repository at this point in the history
  • Loading branch information
samtstern committed Nov 14, 2019
2 parents 00ccb0a + a8cde5f commit 19f61ac
Show file tree
Hide file tree
Showing 69 changed files with 466 additions and 405 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -69,7 +69,7 @@
"cjson": "^0.3.1",
"cli-color": "^1.2.0",
"cli-table": "^0.3.1",
"commander": "^2.8.1",
"commander": "^4.0.1",
"configstore": "^1.2.0",
"cross-env": "^5.1.3",
"cross-spawn": "^4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/bin/firebase.js
Expand Up @@ -21,7 +21,7 @@ var updateNotifier = require("update-notifier")({ pkg: pkg });
updateNotifier.notify({ defer: true, isGlobal: true });

var client = require("..");
var errorOut = require("../errorOut");
var errorOut = require("../errorOut").errorOut;
var winston = require("winston");
var logger = require("../logger");
var fs = require("fs");
Expand Down Expand Up @@ -104,7 +104,7 @@ process.on("exit", function(code) {
require("exit-code");

process.on("uncaughtException", function(err) {
errorOut(client, err);
errorOut(err);
});

if (!handlePreviewToggles(args)) {
Expand Down
216 changes: 0 additions & 216 deletions src/command.js

This file was deleted.

0 comments on commit 19f61ac

Please sign in to comment.