feat: handle extension content

shaobeichen · Sep 17, 2024 · c46bd0a · c46bd0a
1 parent 4262cfc
commit c46bd0a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -1,4 +1,5 @@
-<style data-gradient-theme-id>@charset "UTF-8";
+
+<style data-gradient-theme-id>
 .shaobeichen-gradient-theme-themes-gradient-bearded-theme-arc-json { /* git 待提交数量徽章样式 */
   /* 选中标签栏上边框 */
   /* html标签属性 */
@@ -48,7 +49,10 @@
   background-image: linear-gradient(45deg, #d0d7e4, #b78aff);
   -webkit-text-fill-color: transparent;
   -webkit-background-clip: text;
-}</style><style data-gradient-theme-id>@charset "UTF-8";
+}
+</style>
+
+<style data-gradient-theme-id>
 .shaobeichen-gradient-theme-themes-gradient-dracula-theme-json { /* git 待提交数量徽章样式 */
   /* 选中标签栏上边框 */
   /* html标签属性 */
@@ -98,4 +102,5 @@
 }
 .shaobeichen-gradient-theme-themes-gradient-dracula-theme-json .mkt8 {
   color: #ffc267;
-}</style>
+}
+</style>
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "gradient-theme",
     "displayName": "Gradient Theme",
     "description": "Multiple beautiful gradient themes",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "author": "shaobeichen",
     "publisher": "shaobeichen",
     "icon": "./icon.png",

diff --git a/scripts/build.js b/scripts/build.js
@@ -22,7 +22,15 @@ const output = config.themes.reduce((prev, cur) => {
   const cssText = fs.readFileSync(cssFileUrl, 'utf-8')
   const scssText = `.${config.classTemplate.replace('${themeName}', cur)}{${cssText}}`
   const scssCompile = sass.compileString(scssText, { sourceMap: false, style: 'expanded' })
-  return prev + `<style ${config.tagAttr}>${scssCompile.css.toString()}</style>`
+  const cssWithoutCharset = scssCompile.css.toString().replace(/^@charset "UTF-8";\s*/g, '')
+  return (
+    prev +
+    `
+<style ${config.tagAttr}>
+${cssWithoutCharset}
+</style>
+`
+  )
 }, '')
 
 fs.writeFileSync(indexFilePath, output, 'utf-8')
diff --git a/src/extension.js b/src/extension.js
@@ -62,11 +62,10 @@ function reset() {
 
 function install() {
   const distIndexHtmlFile = path.join(__dirname, '../dist/index.html')
-
   const html = getResetContent()
   const styleHtml = fs.readFileSync(distIndexHtmlFile, 'utf-8')
-
-  fs.writeFileSync(htmlFile, html + styleHtml, 'utf-8')
+  const output = html.replace('</html>', '') + styleHtml + '</html>'
+  fs.writeFileSync(htmlFile, output, 'utf-8')
 
   showReloadMessage(enableMessage)
 }