Skip to content

Commit

Permalink
Update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
tammam-g committed Oct 17, 2024
2 parents 057221c + 2518670 commit 1dd16fe
Show file tree
Hide file tree
Showing 29 changed files with 448 additions and 95 deletions.
3 changes: 0 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
- Fixed Flutter web apps that might require the --no-tree-shake-icons flag in order to build. (#7724)
- Removed outdated dependency on `rimraf`.
- Fixed an issue where the Extensions emulator would fail silently if started with a non-existant project without the `demo-` prefix. (#7779)
- Added new command dataconnect:sql:shell which allows users to directly connect and run queries against their dataconnect cloudsql instance (#7778).
2 changes: 2 additions & 0 deletions firebase-vscode/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## NEXT

## 0.10.5

- [Fixed] Fixed an issue where multiple instances of the extension would break the toolkit.

## 0.10.4
Expand Down
4 changes: 2 additions & 2 deletions firebase-vscode/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 firebase-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publisher": "GoogleCloudTools",
"icon": "./resources/firebase_dataconnect_logo.png",
"description": "Firebase Data Connect for VSCode",
"version": "0.10.4",
"version": "0.10.5",
"engines": {
"vscode": "^1.69.0"
},
Expand Down
28 changes: 15 additions & 13 deletions firebase-vscode/src/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ExtensionBrokerImpl } from "../extension-broker";
import { getRootFolders, registerConfig } from "./config";
import { EmulatorsController } from "./emulators";
import { registerEnv } from "./env";
import { pluginLogger, LogLevel } from '../logger-wrapper';
import { pluginLogger, LogLevel } from "../logger-wrapper";
import { getSettings } from "../utils/settings";
import { setEnabled } from "../../../src/experiments";
import { registerUser } from "./user";
Expand Down Expand Up @@ -55,18 +55,18 @@ export async function registerCore(
return;
}
const workspaceFolder = vscode.workspace.workspaceFolders[0];
const initCommand = currentProjectId.value ?
`${settings.firebasePath} init dataconnect --project ${currentProjectId.value}` :
`${settings.firebasePath} init dataconnect`;
vscode.tasks.executeTask(
new vscode.Task(
{ type: "shell" }, // this is the same type as in tasks.json
workspaceFolder, // The workspace folder
"firebase init dataconnect", // how you name the task
"firebase init dataconnect", // Shows up as MyTask: name
new vscode.ShellExecution(initCommand),
),
const initCommand = currentProjectId.value
? `${settings.firebasePath} init dataconnect --project ${currentProjectId.value}`
: `${settings.firebasePath} init dataconnect`;
const task = new vscode.Task(
{ type: "shell" }, // this is the same type as in tasks.json
workspaceFolder, // The workspace folder
"firebase init dataconnect", // how you name the task
"firebase init dataconnect", // Shows up as MyTask: name
new vscode.ShellExecution(initCommand),
);
task.presentationOptions = { focus: true };
vscode.tasks.executeTask(task);
});

const emulatorsController = new EmulatorsController(broker);
Expand All @@ -84,7 +84,9 @@ export async function registerCore(
"firebase.refresh",
async () => {
await vscode.commands.executeCommand("workbench.action.closeSidebar");
await vscode.commands.executeCommand("workbench.view.extension.firebase-data-connect");
await vscode.commands.executeCommand(
"workbench.view.extension.firebase-data-connect",
);
},
);

Expand Down
19 changes: 11 additions & 8 deletions firebase-vscode/src/data-connect/terminal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export function runCommand(command: string) {
export function runTerminalTask(
taskName: string,
command: string,
presentationOptions: vscode.TaskPresentationOptions = { focus: true },
): Promise<string> {
const type = "firebase-" + Date.now();
return new Promise(async (resolve, reject) => {
Expand All @@ -54,15 +55,15 @@ export function runTerminalTask(
}
}
});
const task = await vscode.tasks.executeTask(
new vscode.Task(
{ type },
vscode.TaskScope.Workspace,
taskName,
"firebase",
new vscode.ShellExecution(command, executionOptions),
),
const task = new vscode.Task(
{ type },
vscode.TaskScope.Workspace,
taskName,
"firebase",
new vscode.ShellExecution(command, executionOptions),
);
task.presentationOptions = presentationOptions;
await vscode.tasks.executeTask(task);
});
}

Expand All @@ -88,6 +89,8 @@ export function registerTerminalTasks(
runTerminalTask(
"firebase emulators",
`${settings.firebasePath} emulators:start --project ${currentProjectId.value}`,
// emulators:start almost never ask interactive questions.
{ focus: false },
);
});

Expand Down
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "firebase-tools",
"version": "13.22.0",
"version": "13.22.1",
"description": "Command-Line Interface for Firebase",
"main": "./lib/index.js",
"bin": {
Expand Down
4 changes: 2 additions & 2 deletions src/apiv2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -476,13 +476,13 @@ export class Client {
setAccessToken(await getAccessToken());
}
if (options.retryCodes?.includes(res.status)) {
const err = responseToError({ statusCode: res.status }, body) || undefined;
const err = responseToError({ statusCode: res.status }, body, fetchURL) || undefined;
if (operation.retry(err)) {
return;
}
}
if (!options.resolveOnHTTPError) {
return reject(responseToError({ statusCode: res.status }, body));
return reject(responseToError({ statusCode: res.status }, body, fetchURL));
}
}

Expand Down
Loading

0 comments on commit 1dd16fe

Please sign in to comment.