switched from using hardcoded vscode-resource scheme to Webview.asWebviewUri (fixes #101)

vstirbu · vstirbu · commit a150ddd03b26 · 2020-08-13T13:59:50.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.5.4 / 2020-08-13
+
+- switched from using hardcoded `vscode-resource` scheme to `Webview.asWebviewUri`
+
 ## 1.5.3 / 2020-04-16
 
 - updated mermaid
diff --git a/extension.js b/extension.js
@@ -16,27 +16,25 @@ function activate(context) {
       'Mermaid Preview',
       vscode.ViewColumn.Two,
       {
-        enableScripts: true
+        enableScripts: true,
       }
     );
 
     const getContent = () => {
       const config = vscode.workspace.getConfiguration('mermaid');
       const configString = JSON.stringify(config);
 
-      const faBase = vscode.Uri.file(
-        context.asAbsolutePath(
-          'previewer/dist/vendor/font-awesome/css/font-awesome.min.css'
+      const faBase = panel.webview.asWebviewUri(
+        vscode.Uri.file(
+          context.asAbsolutePath(
+            'previewer/dist/vendor/font-awesome/css/font-awesome.min.css'
+          )
         )
-      ).with({
-        scheme: 'vscode-resource'
-      });
+      );
 
-      const jsUrl = vscode.Uri.file(
-        context.asAbsolutePath('previewer/dist/index.js')
-      ).with({
-        scheme: 'vscode-resource'
-      });
+      const jsUrl = panel.webview.asWebviewUri(
+        vscode.Uri.file(context.asAbsolutePath('previewer/dist/index.js'))
+      );
 
       return `
 <!DOCTYPE html>
@@ -66,12 +64,12 @@ function activate(context) {
         : findDiagram(text, cursor);
 
       panel.webview.postMessage({
-        diagram
+        diagram,
       });
     };
 
     vscode.workspace.onDidChangeTextDocument(
-      e => {
+      (e) => {
         if (e.document === vscode.window.activeTextEditor.document) {
           previewHandler();
         }
@@ -81,15 +79,15 @@ function activate(context) {
     );
 
     vscode.workspace.onDidChangeConfiguration(
-      e => {
+      (e) => {
         panel.webview.html = getContent();
       },
       null,
       _disposables
     );
 
     vscode.window.onDidChangeTextEditorSelection(
-      e => {
+      (e) => {
         if (e.textEditor === vscode.window.activeTextEditor) {
           previewHandler();
         }
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "displayName": "Mermaid Preview",
   "description": "Previews Mermaid diagrams in Visual Studio Code",
   "license": "MIT",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "publisher": "vstirbu",
   "bugs": {
     "url": "https://github.com/vstirbu/vscode-mermaid-preview/issues"
