diff --git a/extensions/vscode/src/ContinueConsoleWebviewViewProvider.ts b/extensions/vscode/src/ContinueConsoleWebviewViewProvider.ts index 6427091ff11..766f9100c5e 100644 --- a/extensions/vscode/src/ContinueConsoleWebviewViewProvider.ts +++ b/extensions/vscode/src/ContinueConsoleWebviewViewProvider.ts @@ -37,7 +37,7 @@ export class ContinueConsoleWebviewViewProvider this._webview.onDidReceiveMessage((message: FromConsoleView) => { if (message.type === "start") { this._currentUuid = message.uuid; - this._webview?.postMessage({ + void this._webview?.postMessage({ type: "init", uuid: this._currentUuid, items: this.getAllItems(), @@ -70,7 +70,7 @@ export class ContinueConsoleWebviewViewProvider if (e.affectsConfiguration(`${EXTENSION_NAME}.enableConsole`)) { const config = vscode.workspace.getConfiguration(EXTENSION_NAME); this._saveLog = config.get("enableConsole"); - if (!this._saveLog) { + if (this._saveLog === false) { this.clearLog(); } } @@ -103,7 +103,7 @@ export class ContinueConsoleWebviewViewProvider } if (this._currentUuid) { - this._webview?.postMessage({ + void this._webview?.postMessage({ type: "item", uuid: this._currentUuid, item, @@ -116,7 +116,7 @@ export class ContinueConsoleWebviewViewProvider MAX_INTERACTIONS ) { let toRemove = this._completedInteractions.shift(); - this._webview?.postMessage({ + void this._webview?.postMessage({ type: "remove", uuid: this._currentUuid, interactionId: toRemove![0].interactionId, @@ -139,7 +139,7 @@ export class ContinueConsoleWebviewViewProvider this._currentInteractions = new Map(); if (this._currentUuid) { - this._webview?.postMessage({ + void this._webview?.postMessage({ type: "clear", uuid: this._currentUuid, }); @@ -157,7 +157,10 @@ export class ContinueConsoleWebviewViewProvider const inDevelopmentMode = context?.extensionMode === vscode.ExtensionMode.Development; - if (!inDevelopmentMode) { + if (inDevelopmentMode) { + scriptUri = "http://localhost:5173/src/console.tsx"; + styleMainUri = "http://localhost:5173/src/indexConsole.css"; + } else { scriptUri = panel.webview .asWebviewUri( vscode.Uri.joinPath(extensionUri, "gui/assets/indexConsole.js"), @@ -168,9 +171,6 @@ export class ContinueConsoleWebviewViewProvider vscode.Uri.joinPath(extensionUri, "gui/assets/indexConsole.css"), ) .toString(); - } else { - scriptUri = "http://localhost:5173/src/console.tsx"; - styleMainUri = "http://localhost:5173/src/indexConsole.css"; } panel.webview.options = { diff --git a/extensions/vscode/src/ContinueGUIWebviewViewProvider.ts b/extensions/vscode/src/ContinueGUIWebviewViewProvider.ts index 6059e2ad7ec..443275cbdfa 100644 --- a/extensions/vscode/src/ContinueGUIWebviewViewProvider.ts +++ b/extensions/vscode/src/ContinueGUIWebviewViewProvider.ts @@ -43,11 +43,11 @@ export class ContinueGUIWebviewViewProvider } public resetWebviewProtocolWebview(): void { - if (this._webview) { - this.webviewProtocol.webview = this._webview; - } else { + if (!this._webview) { console.warn("no webview found during reset"); + return; } + this.webviewProtocol.webview = this._webview; } sendMainUserInput(input: string) { @@ -80,16 +80,16 @@ export class ContinueGUIWebviewViewProvider const inDevelopmentMode = context?.extensionMode === vscode.ExtensionMode.Development; - if (!inDevelopmentMode) { + if (inDevelopmentMode) { + scriptUri = "http://localhost:5173/src/main.tsx"; + styleMainUri = "http://localhost:5173/src/index.css"; + } else { scriptUri = panel.webview .asWebviewUri(vscode.Uri.joinPath(extensionUri, "gui/assets/index.js")) .toString(); styleMainUri = panel.webview .asWebviewUri(vscode.Uri.joinPath(extensionUri, "gui/assets/index.css")) .toString(); - } else { - scriptUri = "http://localhost:5173/src/main.tsx"; - styleMainUri = "http://localhost:5173/src/index.css"; } panel.webview.options = { @@ -121,7 +121,7 @@ export class ContinueGUIWebviewViewProvider e.affectsConfiguration("workbench.preferredHighContrastLightColorTheme") ) { // Send new theme to GUI to update embedded Monaco themes - this.webviewProtocol?.request("setTheme", { theme: getTheme() }); + void this.webviewProtocol?.request("setTheme", { theme: getTheme() }); } }); diff --git a/extensions/vscode/src/VsCodeIde.ts b/extensions/vscode/src/VsCodeIde.ts index ab5e8270266..b09bf215627 100644 --- a/extensions/vscode/src/VsCodeIde.ts +++ b/extensions/vscode/src/VsCodeIde.ts @@ -15,6 +15,7 @@ import { import { Repository } from "./otherExtensions/git"; import { SecretStorage } from "./stubs/SecretStorage"; import { VsCodeIdeUtils } from "./util/ideUtils"; +import { getExtensionVersion, isExtensionPrerelease } from "./util/util"; import { getExtensionUri, openEditorAndRevealRange } from "./util/vscode"; import { VsCodeWebviewProtocol } from "./webviewProtocol"; @@ -33,7 +34,6 @@ import type { TerminalOptions, Thread, } from "core"; -import { getExtensionVersion, isExtensionPrerelease } from "./util/util"; class VsCodeIde implements IDE { ideUtils: VsCodeIdeUtils; diff --git a/gui/package-lock.json b/gui/package-lock.json index 545c478fcb0..9974b5ad9ab 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -19,7 +19,7 @@ "@tiptap/extension-document": "^2.27.0", "@tiptap/extension-dropcursor": "^2.27.0", "@tiptap/extension-history": "^2.27.1", - "@tiptap/extension-image": "^2.1.16", + "@tiptap/extension-image": "^2.27.1", "@tiptap/extension-mention": "^2.1.13", "@tiptap/extension-paragraph": "^2.3.2", "@tiptap/extension-placeholder": "^2.1.13", @@ -3294,9 +3294,10 @@ } }, "node_modules/@tiptap/extension-image": { - "version": "2.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-2.26.1.tgz", - "integrity": "sha512-96+MaYBJebQlR/ik5W72GLUfXdEoxFs+6jsoERxbM5qEdhb7TEnodBFtWZOwgDO27kFd6rSNZuW9r5KJNtljEg==", + "version": "2.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-2.27.1.tgz", + "integrity": "sha512-wu3vMKDYWJwKS6Hrw5PPCKBO2RxyHNeFLiA/uDErEV7axzNpievK/U9DyaDXmtK3K/h1XzJAJz19X+2d/pY68w==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" diff --git a/gui/package.json b/gui/package.json index 1927f643211..ef44d12bd1d 100644 --- a/gui/package.json +++ b/gui/package.json @@ -28,7 +28,7 @@ "@tiptap/extension-document": "^2.27.0", "@tiptap/extension-dropcursor": "^2.27.0", "@tiptap/extension-history": "^2.27.1", - "@tiptap/extension-image": "^2.1.16", + "@tiptap/extension-image": "^2.27.1", "@tiptap/extension-mention": "^2.1.13", "@tiptap/extension-paragraph": "^2.3.2", "@tiptap/extension-placeholder": "^2.1.13",