feat: #1 代码块优化，项目结构重构

terwer · Feb 24, 2023 · 27dc8ae · 27dc8ae
1 parent 14e3cf0
commit 27dc8ae
Show file tree

Hide file tree

Showing 11 changed files with 153 additions and 43 deletions.
diff --git a/src/blog-theme.css b/src/blog-theme.css
diff --git a/src/blog-theme.css.map b/src/blog-theme.css.map
diff --git a/src/blog-theme.sass b/src/blog-theme.sass
@@ -22,6 +22,7 @@
  / or visit www.terwer.space if you need additional information or have any
  / questions.
  /
+@import "./styles/common/webfont.css"
 @import "./styles/common/common.sass"
 
 \:root

diff --git a/src/styles/app/BlogApp.css.map b/src/styles/app/BlogApp.css.map
diff --git a/src/styles/zhi/widgets/webfont.css → src/styles/common/webfont.css b/src/styles/zhi/widgets/webfont.css → src/styles/common/webfont.css
diff --git a/src/zhi-theme.sass b/src/zhi-theme.sass
@@ -22,11 +22,11 @@
  / or visit www.terwer.space if you need additional information or have any
  / questions.
  /
-@import "./styles/zhi/widgets/webfont.css"
-@import "./styles/zhi/widgets/code-block.css"
-
+@import "./styles/common/webfont.css"
 @import "./styles/common/common.sass"
 
+@import "./styles/zhi/widgets/code-block.css"
+
 \:root
   --b3-font-family: #{$font-family-mono}
   --b3-font-family-code: var(--b3-font-family)

diff --git a/theme.css b/theme.css
diff --git a/theme.css.map b/theme.css.map
diff --git a/theme.sass b/theme.sass
@@ -0,0 +1,27 @@
+/*!
+ / Copyright (c) 2023, Terwer . All rights reserved.
+ / DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ /
+ / This code is free software; you can redistribute it and/or modify it
+ / under the terms of the GNU General Public License version 2 only, as
+ / published by the Free Software Foundation.  Terwer designates this
+ / particular file as subject to the "Classpath" exception as provided
+ / by Terwer in the LICENSE file that accompanied this code.
+ /
+ / This code is distributed in the hope that it will be useful, but WITHOUT
+ / ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ / FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ / version 2 for more details (a copy is included in the LICENSE file that
+ / accompanied this code).
+ /
+ / You should have received a copy of the GNU General Public License version
+ / 2 along with this work; if not, write to the Free Software Foundation,
+ / Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ /
+ / Please contact Terwer, Shenzhen, Guangdong, China, youweics@163.com
+ / or visit www.terwer.space if you need additional information or have any
+ / questions.
+ /
+/* 思源笔记启动会自动加载此文件 */
+
+@import "./src/zhi-theme.sass"
diff --git a/vite.cjs.config.ts b/vite.cjs.config.ts
@@ -65,8 +65,8 @@ export default defineConfig({
           } else {
             return path.basename(id)
           }
-        }
-      }
-    }
-  }
+        },
+      },
+    },
+  },
 })
diff --git a/vite.config.ts b/vite.config.ts
@@ -47,17 +47,12 @@ export default defineConfig({
     rollupOptions: {
       input: {
         appEntry: "index.html",
-        themeStyle: "src/zhi-theme.sass"
       },
       output: {
         format: "esm",
         chunkFileNames: "chunk/[name]-[hash].js",
         assetFileNames: (asset) => {
-          if (asset.name == "zhi-theme.css") {
-            return "[name].[ext]"
-          } else {
-            return "static/[name]-[hash].[ext]"
-          }
+          return "static/[name]-[hash].[ext]"
         },
         manualChunks(id) {
           if (id.indexOf("node_modules") > -1) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,8 +65,8 @@ export default defineConfig({ @@
               } else {
                 return path.basename(id)
               }
-            }
-          }
-        }
-      }
+            },
+          },
+        },
+      },
     })