Fixed webviews on Windows (close #2233) (#2352) (#2353)

Signed-off-by: Jake Turner <[email protected]> (cherry picked from commit f34a36b) # Conflicts: # CHANGELOG.md Co-authored-by: Jake <[email protected]> Co-authored-by: Caroline Fletcher <[email protected]>
IBM-Blockchain · May 26, 2020 · b430cef · b430cef
1 parent 17ef596
commit b430cef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@ Announcements
 * We’re still waiting for the gRPC v1.25.0 binaries to be published so you may be affected by [this issue](https://github.com/IBM-Blockchain/blockchain-vscode-extension/issues/1621), where gRPC fails to rebuild when using VS Code >1.40.x.
  > Please see [this comment](https://github.com/IBM-Blockchain/blockchain-vscode-extension/issues/1621#issuecomment-552926559) for a workaround. 
 Features & Enhancements
+
 ---
 * Updated gateway & wallet grouping - part of [#2023](https://github.com/IBM-Blockchain/blockchain-vscode-extension/issues/2023).
 

diff --git a/packages/blockchain-extension/RELEASE-NOTES.md b/packages/blockchain-extension/RELEASE-NOTES.md
@@ -18,8 +18,9 @@ Fixes
 
 * Only show right-click ‘Start’ option on local environments [#2285](https://github.com/IBM-Blockchain/blockchain-vscode-extension/issues/2285).
 
-* Updated ‘Open Tutorial’ buttons [#2275](https://github.com/IBM-Blockchain/blockchain-vscode-extension/pull/2275).
+* Updated ‘Open Tutorial’ buttons [#2275](https://github.com/IBM-Blockchain/blockchain-vscode-extension/issues/2275).
 
+* Fixed webview on Windows [#2233](https://github.com/IBM-Blockchain/blockchain-vscode-extension/issues/2233).
 
 This release's Conga Comic:
 ---

diff --git a/packages/blockchain-extension/extension/webview/ReactView.ts b/packages/blockchain-extension/extension/webview/ReactView.ts
@@ -36,15 +36,15 @@ export abstract class ReactView extends View {
         const mainScript: string = manifest.files['main.js'];
         const mainStyle: string = manifest.files['main.css'];
 
-        const scriptPathOnDisk: {scheme: string, authority: string, path: string} = vscode.Uri.file(
+        const scriptPathOnDisk: vscode.Uri = vscode.Uri.file(
             path.join(this._extensionPath, 'build', mainScript)
           );
-        const scriptContents: Buffer = fs.readFileSync(scriptPathOnDisk.path);
+        const scriptContents: Buffer = fs.readFileSync(scriptPathOnDisk.fsPath);
 
-        const stylePathOnDisk: {scheme: string, authority: string, path: string} = vscode.Uri.file(
+        const stylePathOnDisk: vscode.Uri = vscode.Uri.file(
             path.join(this._extensionPath, 'build', mainStyle)
           );
-        const styleContents: Buffer = fs.readFileSync(stylePathOnDisk.path);
+        const styleContents: Buffer = fs.readFileSync(stylePathOnDisk.fsPath);
 
         const actualExtensionPath: string = ExtensionUtil.getExtensionPath();