Skip to content

Commit 8961ea2

Browse files
worksofliamworksofliam
committed
Fix to webview-ui-toolkit with webpack
1 parent b66f82b commit 8961ea2

File tree

6 files changed

+16
-47
lines changed

6 files changed

+16
-47
lines changed

‎src/panels/procedure/index.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
const WebToolkit = require(`@vscode/webview-ui-toolkit/dist/toolkit.min.js`);
3+
24
const vscode = require(`vscode`);
35
const Tools = require(`../tools`);
46

@@ -45,14 +47,6 @@ module.exports = class ViewPanel {
4547
}
4648

4749
async _getContent() {
48-
const toolkitUri = Tools.getUri(this.panel.webview, this.extensionUri, [
49-
`node_modules`,
50-
`@vscode`,
51-
`webview-ui-toolkit`,
52-
`dist`,
53-
`toolkit.js`,
54-
]);
55-
5650
const proc = new Procedure(this.schema, this.procedure)
5751

5852
Tools.setLoadingText(this.panel.webview, `Fetching base info`);
@@ -75,7 +69,7 @@ module.exports = class ViewPanel {
7569
<head>
7670
<meta charset="UTF-8">
7771
<meta name="viewport" content="width=device-width, initial-scale=1.0">
78-
<script type="module" src="${toolkitUri}"></script>
72+
<script type="module">${WebToolkit}</script>
7973
<style type="text/css">
8074
.component {
8175
margin-bottom: 0.5rem;

‎src/panels/table/index.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
const WebToolkit = require(`@vscode/webview-ui-toolkit/dist/toolkit.min.js`);
3+
24
const vscode = require(`vscode`);
35
const Tools = require(`../tools`);
46

@@ -38,14 +40,6 @@ module.exports = class TablePanel {
3840
}
3941

4042
async _getContent() {
41-
const toolkitUri = Tools.getUri(this.panel.webview, this.extensionUri, [
42-
`node_modules`,
43-
`@vscode`,
44-
`webview-ui-toolkit`,
45-
`dist`,
46-
`toolkit.js`,
47-
]);
48-
4943
const table = new Table(this.schema, this.table);
5044

5145
// TODO: each await should also send an update to the frontend loading screen (below)
@@ -105,7 +99,7 @@ module.exports = class TablePanel {
10599
<head>
106100
<meta charset="UTF-8">
107101
<meta name="viewport" content="width=device-width, initial-scale=1.0">
108-
<script type="module" src="${toolkitUri}"></script>
102+
<script type="module">${WebToolkit}</script>
109103
<style type="text/css">
110104
.component {
111105
margin-bottom: 0.5rem;

‎src/panels/tools.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
const vscode = require(`vscode`);
33

4+
const WebToolkit = require(`@vscode/webview-ui-toolkit/dist/toolkit.min.js`);
5+
46
module.exports = class {
57
/**
68
* @param {vscode.Webview} webview
@@ -19,21 +21,13 @@ module.exports = class {
1921
}
2022

2123
static getLoadingHTML(webview, extensionUri) {
22-
const toolkitUri = this.getUri(webview, extensionUri, [
23-
`node_modules`,
24-
`@vscode`,
25-
`webview-ui-toolkit`,
26-
`dist`,
27-
`toolkit.js`,
28-
]);
29-
3024
return /*html*/ `
3125
<!DOCTYPE html>
3226
<html lang="en">
3327
<head>
3428
<meta charset="UTF-8">
3529
<meta name="viewport" content="width=device-width, initial-scale=1.0">
36-
<script type="module" src="${toolkitUri}"></script>
30+
<script type="module">${WebToolkit}</script>
3731
<script>
3832
window.addEventListener("message", (event) => {
3933
const command = event.data.command;

‎src/panels/trigger/index.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
const WebToolkit = require(`@vscode/webview-ui-toolkit/dist/toolkit.min.js`);
3+
24
const vscode = require(`vscode`);
35
const Tools = require(`../tools`);
46

@@ -44,14 +46,6 @@ module.exports = class ViewPanel {
4446
}
4547

4648
async _getContent() {
47-
const toolkitUri = Tools.getUri(this.panel.webview, this.extensionUri, [
48-
`node_modules`,
49-
`@vscode`,
50-
`webview-ui-toolkit`,
51-
`dist`,
52-
`toolkit.js`,
53-
]);
54-
5549
const trigger = new Trigger(this.schema, this.trigger);
5650

5751
Tools.setLoadingText(this.panel.webview, `Fetching base info`);
@@ -65,7 +59,7 @@ module.exports = class ViewPanel {
6559
<head>
6660
<meta charset="UTF-8">
6761
<meta name="viewport" content="width=device-width, initial-scale=1.0">
68-
<script type="module" src="${toolkitUri}"></script>
62+
<script type="module">${WebToolkit}</script>
6963
<style type="text/css">
7064
.component {
7165
margin-bottom: 0.5rem;

‎src/panels/view/index.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
const WebToolkit = require(`@vscode/webview-ui-toolkit/dist/toolkit.min.js`);
3+
24
const vscode = require(`vscode`);
35
const Tools = require(`../tools`);
46

@@ -45,14 +47,6 @@ module.exports = class ViewPanel {
4547
}
4648

4749
async _getContent() {
48-
const toolkitUri = Tools.getUri(this.panel.webview, this.extensionUri, [
49-
`node_modules`,
50-
`@vscode`,
51-
`webview-ui-toolkit`,
52-
`dist`,
53-
`toolkit.js`,
54-
]);
55-
5650
const view = new View(this.schema, this.view);
5751

5852
Tools.setLoadingText(this.panel.webview, `Fetching base info`);
@@ -75,7 +69,7 @@ module.exports = class ViewPanel {
7569
<head>
7670
<meta charset="UTF-8">
7771
<meta name="viewport" content="width=device-width, initial-scale=1.0">
78-
<script type="module" src="${toolkitUri}"></script>
72+
<script type="module">${WebToolkit}</script>
7973
<style type="text/css">
8074
.component {
8175
margin-bottom: 0.5rem;

‎webpack.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ const config = {
2525
extensions: [`.ts`, `.js`, `.svg`],
2626
},
2727
module: {
28-
2928
rules: [
3029
{
3130
test: /\.js$/,
32-
include: path.resolve(__dirname, `node_modules/@bendera/vscode-webview-elements/dist`),
31+
include: path.resolve(__dirname, `node_modules/@vscode/webview-ui-toolkit/dist/toolkit.min.js`),
3332
type: `asset/source`
3433
}
3534
]

0 commit comments

Comments
 (0)