Skip to content

Commit

Permalink
Merge branch 'master' into ys/ui-v1.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
joehan committed May 20, 2024
2 parents 26f0e41 + d6d8028 commit b099767
Show file tree
Hide file tree
Showing 17 changed files with 1,319 additions and 718 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
- Upgrades the pubsub dependency to address a `npm audit` issue. (#7122)
- Fix path issue in Windows deployments for Next.js SSR (#7148)
- Update Emulator Suite UI logo
9 changes: 5 additions & 4 deletions firebase-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"Other"
],
"extensionDependencies": [
"graphql.vscode-graphql-syntax"
"graphql.vscode-graphql-syntax",
"redhat.vscode-yaml"
],
"activationEvents": [
"onStartupFinished",
Expand Down Expand Up @@ -110,7 +111,7 @@
"mono-firebase": {
"description": "Firebase icon",
"default": {
"fontPath": "./resources/Monicons.woff",
"fontPath": "./resources/monicons.woff",
"fontCharacter": "\\F101"
}
},
Expand Down Expand Up @@ -180,11 +181,11 @@
},
{
"fileMatch": "dataconnect.yaml",
"url": "./schema/dataconnect-yaml.json"
"url": "./dist/schema/dataconnect-yaml.json"
},
{
"fileMatch": "connector.yaml",
"url": "./schema/connector-yaml.json"
"url": "./dist/schema/connector-yaml.json"
}
]
},
Expand Down
Binary file modified firebase-vscode/resources/Monicons.woff
Binary file not shown.
Binary file modified firebase-vscode/resources/firebase_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 4 additions & 13 deletions firebase-vscode/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,10 @@ async function getServiceAccount() {
if (e.original?.message) {
errorMessage += ` (original: ${e.original.message})`;
}
if (process.env.MONOSPACE_ENV) {
// If it can't find a service account in Monospace, that's a blocking
// error and we should throw.
throw new Error(
`Unable to find service account. ` + `requireAuthError: ${errorMessage}`
);
} else {
// In other environments, it is common to not find a service account.
pluginLogger.debug(
`No service account found (this may be normal), ` +
`requireAuth error output: ${errorMessage}`
);
}
pluginLogger.debug(
`No service account found (this may be normal), ` +
`requireAuth error output: ${errorMessage}`
);
return null;
}
if (process.env.WORKSPACE_SERVICE_ACCOUNT_EMAIL) {
Expand Down
3 changes: 1 addition & 2 deletions firebase-vscode/src/core/project.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import vscode, { Disposable, ExtensionContext, QuickPickItem } from "vscode";
import vscode, { Disposable } from "vscode";
import { ExtensionBrokerImpl } from "../extension-broker";
import { computed, effect } from "@preact/signals-react";
import { firebaseRC, updateFirebaseRCProject } from "./config";
import { FirebaseProjectMetadata } from "../types/project";
import { currentUser, isServiceAccount } from "./user";
import { listProjects } from "../cli";
import { pluginLogger } from "../logger-wrapper";
import { currentOptions } from "../options";
import { globalSignal } from "../utils/globals";
import { firstWhereDefined } from "../utils/signal";

Expand Down

0 comments on commit b099767

Please sign in to comment.