refactor: add global scss

jdf2e · Nov 27, 2024 · 08923e5 · 08923e5
1 parent 9332996
commit 08923e5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/packages/nutui-taro-demo/src/app.scss b/packages/nutui-taro-demo/src/app.scss
@@ -1,3 +1,5 @@
+@import '../../../src/styles/jd-font.scss';
+
 body {
   font-size: 14px;
 }

diff --git a/scripts/build-taro.mjs b/scripts/build-taro.mjs
@@ -237,22 +237,19 @@ async function copyStyles() {
     resolve(__dirname, '../dist/styles'),
   )
 
-  const content = [
+  let content = [
     `@import '../theme-default.scss';`,
-    `@import '../variables.scss';`,
-    `@import '../mixins/index.scss';`,
-    `@import '../animation/index.scss';`,
+    `@import '../theme-dark.scss';`,
+    `@import '../font-face.scss';`,
   ]
   const projectID = process.env.VITE_APP_PROJECT_ID
   if (projectID) {
-    content[1] = `@import '../variables-${projectID}.scss';`
+    content = [
+      `@import '../theme-${projectID}.scss';`,
+      `@import '../font-face.scss';`,
+    ]
   }
-  const scssFiles = await glob(['dist/es/packages/**/*.scss'])
-  scssFiles.forEach((file) => {
-    content.push(
-      `@import '${relativeFilePath('/dist/styles/themes/default.scss', '/' + file)}';`,
-    )
-  })
+
   dest('dist/styles/themes/default.scss', content.join('\n'))
 }
 

diff --git a/scripts/build.mjs b/scripts/build.mjs
@@ -197,22 +197,19 @@ async function copyStyles() {
     resolve(__dirname, '../dist/styles')
   )
 
-  const content = [
+  let content = [
     `@import '../theme-default.scss';`,
-    `@import '../variables.scss';`,
-    `@import '../mixins/index.scss';`,
-    `@import '../animation/index.scss';`,
+    `@import '../theme-dark.scss';`,
+    `@import '../font-face.scss';`,
   ]
   const projectID = process.env.VITE_APP_PROJECT_ID
   if (projectID) {
-    content[1] = `@import '../variables-${projectID}.scss';`
+    content = [
+      `@import '../theme-${projectID}.scss';`,
+      `@import '../font-face.scss';`,
+    ]
   }
-  const scssFiles = await glob(['dist/es/packages/**/*.scss'])
-  scssFiles.forEach((file) => {
-    content.push(
-      `@import '${relativeFilePath('/dist/styles/themes/default.scss', '/' + file)}';`
-    )
-  })
+
   dest('dist/styles/themes/default.scss', content.join('\n'))
 }
 

diff --git a/src/sites/mobile/App.scss b/src/sites/mobile/App.scss
@@ -1,3 +1,5 @@
+@import '../../styles/jd-font.scss';
+
 html,
 body {
   &::-webkit-scrollbar {