Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
cjsewell committed Nov 16, 2022
2 parents 36ab693 + 392d8a8 commit f3b0306
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
6 changes: 0 additions & 6 deletions CHANGELOG.md
@@ -1,6 +0,0 @@
- Updated the pubsub emulator to v0.7.1.
- Updated some emulator download logic to pause after unzipping to avoid a file not found issue.
- Fixes gzipped file handling in Storage Emulator.
- Add support for object list using certain Admin SDKs (#5208)
- Fixes source token expiration issue by acquiring new source token upon expiration.
- Fix bug where emulated event triggered function broke in debug mode (#5211)
4 changes: 2 additions & 2 deletions npm-shrinkwrap.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
@@ -1,6 +1,6 @@
{
"name": "firebase-tools",
"version": "11.16.0",
"version": "11.16.1",
"description": "Command-Line Interface for Firebase",
"main": "./lib/index.js",
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion src/emulator/extensionsEmulator.ts
Expand Up @@ -67,7 +67,7 @@ export class ExtensionsEmulator implements EmulatorInstance {
"Extensions Emulator is running but Functions emulator is not. This should never happen."
);
}
return functionsEmulator.getInfo();
return { ...functionsEmulator.getInfo(), name: this.getName() };
}

public getName(): Emulators {
Expand Down

0 comments on commit f3b0306

Please sign in to comment.