v1.8.0

iCharlesZ · Nov 29, 2021 · c51f3f0 · c51f3f0
1 parent 2ba94c2
commit c51f3f0
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+### 1.8.0 | 2021-11-29
+
+- 修复新版本 VSCode 不能正常显示的问题
+
 ### 1.7.0 | 2020-11-19
 
 - 增加英文版本

diff --git a/README.md b/README.md
@@ -83,6 +83,10 @@ A: see here: https://github.com/lehni/vscode-fix-checksums
 
 ## Release Notes 版本说明
 
+### 1.8.0 | 2021-11-29
+
+- 修复新版本 VSCode 不能正常显示的问题
+
 ### 1.7.0 | 2020-11-19
 
 - 增加英文版本

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "vscode-live2d",
 	"displayName": "vscode-live2d",
 	"description": "vscode看板娘",
-	"version": "1.7.2",
+	"version": "1.8.0",
 	"publisher": "CharlesZ",
 	"engines": {
 		"vscode": "^1.47.0"

diff --git a/src/Dom.ts b/src/Dom.ts
@@ -4,6 +4,8 @@ import * as fs from 'fs';
 import FileType from './FileType';
 import vsHelp from './vsHelp';
 import getNewContent from './getJs';
+import getNewHTML from './allowScript';
+import getOriginalHtml from './originalHtml';
 
 export class Dom {
     //当前用户配置
@@ -88,6 +90,12 @@ export class Dom {
         newContent += content;
 
         this.saveContent(newContent);
+
+        // 设置新的HTML
+        let newHTML = getNewHTML().replace(/\s*$/, '');
+        const htmlPath = path.join(path.dirname(require.main.filename), 'vs', 'code', 'electron-browser', 'workbench', 'workbench.html');
+        fs.writeFileSync(htmlPath, newHTML, 'utf-8');
+
         vsHelp.showInfoRestart(this.extName + ' 已更新配置，请重新启动！');
 
     }
@@ -135,6 +143,12 @@ export class Dom {
             let content = this.getContent();
             content = this.clearJSContent(content);
             this.saveContent(content);
+
+            // 还原HTML
+            let originalHtml = getOriginalHtml().replace(/\s*$/, '');
+            const htmlPath = path.join(path.dirname(require.main.filename), 'vs', 'code', 'electron-browser', 'workbench', 'workbench.html');
+            fs.writeFileSync(htmlPath, originalHtml, 'utf-8');
+
             return true;
         }
         catch (ex) {

diff --git a/src/allowScript.ts b/src/allowScript.ts
@@ -1,21 +1,15 @@
 export default function () {
-  return `<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
-    <!DOCTYPE html>
-    <html>
-        <head>
-            <meta charset="utf-8" />
-            <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote-resource:; media-src 'none'; frame-src 'self' vscode-webview: https://*.vscode-webview-test.com; object-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote-resource:;"/>
-        </head>
-        <body aria-label="">
-        </body>
-    
-        <!-- Init Bootstrap Helpers -->
-        <script src="../../../../bootstrap.js"></script>
-        <script src="../../../../vs/loader.js"></script>
-        <script src="../../../../bootstrap-window.js"></script>
-    
-        <!-- Startup via workbench.js -->
-        <script src="workbench.js"></script>
-    </html>
-    `;
+  return `<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote-resource:; media-src 'none'; frame-src 'self' vscode-webview: https://*.vscode-webview-test.com; object-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote-resource:;"/>
+    </head>
+    <body aria-label="">
+    </body>
+    <script src="../../../../bootstrap.js"></script>
+    <script src="../../../../vs/loader.js"></script>
+    <script src="../../../../bootstrap-window.js"></script>
+    <script src="workbench.js"></script>
+</html>`;
 }
diff --git a/src/uninstall.ts b/src/uninstall.ts
@@ -1,5 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs';
+import getOriginalHtml from './originalHtml';
 
 const base = process.cwd();
 // 文件路径
@@ -19,6 +20,12 @@ function main() {
         saveContent(content);
         removeFiles(path.join(base, 'vs', 'code', 'electron-browser', 'workbench', 'live2d'));
         removeFiles(path.join(base, 'vs', 'code', 'electron-browser', 'workbench', 'models'));
+
+        // 还原HTML
+        let originalHtml = getOriginalHtml().replace(/\s*$/, '');
+        const htmlPath = path.join(path.dirname(require.main.filename), 'vs', 'code', 'electron-browser', 'workbench', 'workbench.html');
+        fs.writeFileSync(htmlPath, originalHtml, 'utf-8');
+
         return true;
     }
     catch (ex) {

diff --git a/src/version.ts b/src/version.ts
@@ -1 +1 @@
-export default '1.7.2';
+export default '1.8.0';