From 9364cae5840e15a154c056af1738c0b234262a05 Mon Sep 17 00:00:00 2001
From: manhdinh141 <manhdinh141@gmail.com>
Date: Sat, 12 Nov 2022 17:40:51 +0000
Subject: [PATCH 1/2] fix: element-plus add base.css
---
.gitpod.yml | 9 +++++++++
src/core/resolvers/element-plus.ts | 8 ++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 .gitpod.yml
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 00000000..6ee94388
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,9 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
+# and commit this file to your remote git repository to share the goodness with others.
+
+tasks:
+ - init: pnpm install && pnpm run build
+ command: pnpm run dev
+
+
diff --git a/src/core/resolvers/element-plus.ts b/src/core/resolvers/element-plus.ts
index 1322fea6..46631a89 100644
--- a/src/core/resolvers/element-plus.ts
+++ b/src/core/resolvers/element-plus.ts
@@ -78,9 +78,13 @@ function getSideEffects(dirName: string, options: ElementPlusResolverOptionsReso
const esComponentsFolder = 'element-plus/es/components'
if (importStyle === 'sass')
- return ssr ? `${themeFolder}/src/${dirName}.scss` : `${esComponentsFolder}/${dirName}/style/index`
+ return ssr ?
+ [`${themeFolder}/src/base.scss`, `${themeFolder}/src/${dirName}.scss`] :
+ [`${esComponentsFolder}/base/style/index`, `${esComponentsFolder}/${dirName}/style/index`]
else if (importStyle === true || importStyle === 'css')
- return ssr ? `${themeFolder}/el-${dirName}.css` : `${esComponentsFolder}/${dirName}/style/css`
+ return ssr ?
+ [`${themeFolder}/base.css`, `${themeFolder}/el-${dirName}.css`] :
+ [`${esComponentsFolder}/base/style/css`, `${esComponentsFolder}/${dirName}/style/css`]
}
function resolveComponent(name: string, options: ElementPlusResolverOptionsResolved): ComponentInfo | undefined {
From 8ad8eefcb253255959b321ed218f45f4c315a9f1 Mon Sep 17 00:00:00 2001
From: manhdinh141 <manhdinh141@gmail.com>
Date: Sat, 12 Nov 2022 17:43:17 +0000
Subject: [PATCH 2/2] remove gitpod
---
.gitpod.yml | 9 ---------
1 file changed, 9 deletions(-)
delete mode 100644 .gitpod.yml
diff --git a/.gitpod.yml b/.gitpod.yml
deleted file mode 100644
index 6ee94388..00000000
--- a/.gitpod.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# This configuration file was automatically generated by Gitpod.
-# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
-# and commit this file to your remote git repository to share the goodness with others.
-
-tasks:
- - init: pnpm install && pnpm run build
- command: pnpm run dev
-
-