diff --git a/extensions/void/package.json b/extensions/void/package.json index 25c20cad..9e2b33ba 100644 --- a/extensions/void/package.json +++ b/extensions/void/package.json @@ -11,7 +11,7 @@ "Other" ], "activationEvents": [], - "main": "./out/extension.js", + "main": "./out/extension/extension.js", "contributes": { "configuration": { "title": "Void", diff --git a/extensions/void/src/extension/extensionLib/updateWebviewHTML.ts b/extensions/void/src/extension/extensionLib/updateWebviewHTML.ts index e309a7dc..d28c6e10 100644 --- a/extensions/void/src/extension/extensionLib/updateWebviewHTML.ts +++ b/extensions/void/src/extension/extensionLib/updateWebviewHTML.ts @@ -11,13 +11,13 @@ function generateNonce() { // call this when you have access to the webview to set its html -export const updateWebviewHTML = (webview: vscode.Webview, extensionUri: vscode.Uri, { jsLocation, cssLocation }: { jsLocation: string, cssLocation: string }) => { +export const updateWebviewHTML = (webview: vscode.Webview, extensionUri: vscode.Uri, { jsOutLocation, cssOutLocation }: { jsOutLocation: string, cssOutLocation: string }) => { // 'dist/sidebar/index.js' // 'dist/sidebar/styles.css' - const scriptUri = webview.asWebviewUri(vscode.Uri.joinPath(extensionUri, jsLocation)); - const stylesUri = webview.asWebviewUri(vscode.Uri.joinPath(extensionUri, cssLocation)); + const scriptUri = webview.asWebviewUri(vscode.Uri.joinPath(extensionUri, jsOutLocation)); + const stylesUri = webview.asWebviewUri(vscode.Uri.joinPath(extensionUri, cssOutLocation)); const rootUri = webview.asWebviewUri(vscode.Uri.joinPath(extensionUri)); const nonce = generateNonce(); diff --git a/extensions/void/src/extension/providers/CtrlKWebviewProvider.ts b/extensions/void/src/extension/providers/CtrlKWebviewProvider.ts index f0b6551d..62190caf 100644 --- a/extensions/void/src/extension/providers/CtrlKWebviewProvider.ts +++ b/extensions/void/src/extension/providers/CtrlKWebviewProvider.ts @@ -10,12 +10,10 @@ export class CtrlKWebviewProvider { constructor(context: vscode.ExtensionContext) { this._extensionUri = context.extensionUri - - } // called by us updateWebviewHTML(webview: vscode.Webview) { - _updateWebviewHTML(webview, this._extensionUri, { jsLocation: 'dist/webviews/ctrlk/index.js', cssLocation: 'dist/webviews/styles.css' }) + _updateWebviewHTML(webview, this._extensionUri, { jsOutLocation: 'dist/webviews/ctrlk/index.js', cssOutLocation: 'dist/webviews/styles.css' }) } } diff --git a/extensions/void/src/extension/providers/SidebarWebviewProvider.ts b/extensions/void/src/extension/providers/SidebarWebviewProvider.ts index 03ad986d..bbd909a8 100644 --- a/extensions/void/src/extension/providers/SidebarWebviewProvider.ts +++ b/extensions/void/src/extension/providers/SidebarWebviewProvider.ts @@ -23,7 +23,7 @@ export class SidebarWebviewProvider implements vscode.WebviewViewProvider { // called by us updateWebviewHTML(webview: vscode.Webview) { - _updateWebviewHTML(webview, this._extensionUri, { jsLocation: 'dist/webviews/sidebar/index.js', cssLocation: 'dist/webviews/styles.css' }) + _updateWebviewHTML(webview, this._extensionUri, { jsOutLocation: 'dist/webviews/sidebar/index.js', cssOutLocation: 'dist/webviews/styles.css' }) } // called internally by vscode