From 5e17cc8802db73703c88b2479d394f4700869018 Mon Sep 17 00:00:00 2001 From: Vben Date: Tue, 3 Aug 2021 07:40:29 +0800 Subject: [PATCH] refactor: refactor tailwindcss to windicss --- .vscode/settings.json | 4 +- CHANGELOG.zh_CN.md | 9 + build/vite/plugin/index.ts | 5 +- package.json | 24 +- postcss.config.js | 1 - src/design/tailwind.css | 4 - src/main.ts | 4 +- .../analysis/components/GrowCard.vue | 4 +- src/views/dashboard/analysis/index.vue | 2 +- .../workbench/components/ProjectCard.vue | 2 +- src/views/dashboard/workbench/index.vue | 6 +- src/views/sys/login/LoginForm.vue | 4 +- yarn.lock | 511 ++++++------------ 13 files changed, 205 insertions(+), 375 deletions(-) delete mode 100644 src/design/tailwind.css diff --git a/.vscode/settings.json b/.vscode/settings.json index 7addde02..927eccd2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -147,6 +147,8 @@ "vueuse", "zxcvbn", "lintstagedrc", - "brotli" + "brotli", + "tailwindcss", + "sider" ] } diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index c0a1975b..f81e941d 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,3 +1,12 @@ +## 2.7.0(2021-08-03) + +## (破坏性更新) Breaking changes + +- 将项目`tailwindcss`还原回`windicss`，尝试了`tailwindcss`，问题可能还挺多，先切换回`windicss`提高开发效率，切换成本较低。 + - 目前项目不兼容地方有 + - `xl:!m-4` 之类的写法需要改为`!xl:m-4`,注意只有`!`这个不兼容，没用到则不用改 + - 内存溢出问题可能还在（频率低，重启下即可，重启 vite 较快） + ### ✨ Features - **Preview** 添加新的属性及事件 diff --git a/build/vite/plugin/index.ts b/build/vite/plugin/index.ts index 94ec6613..7cffc2e8 100644 --- a/build/vite/plugin/index.ts +++ b/build/vite/plugin/index.ts @@ -5,7 +5,7 @@ import vueJsx from '@vitejs/plugin-vue-jsx'; import legacy from '@vitejs/plugin-legacy'; import purgeIcons from 'vite-plugin-purge-icons'; - +import windiCSS from 'vite-plugin-windicss'; import { configHtmlPlugin } from './html'; import { configPwaConfig } from './pwa'; import { configMockPlugin } from './mock'; @@ -33,6 +33,9 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) { vueJsx(), ]; + // vite-plugin-windicss + vitePlugins.push(windiCSS()); + // TODO !isBuild && vitePlugins.push(configHmrPlugin()); diff --git a/package.json b/package.json index 9faee40a..62bbd2a6 100644 --- a/package.json +++ b/package.json @@ -35,8 +35,8 @@ }, "dependencies": { "@iconify/iconify": "^2.0.3", - "@logicflow/core": "^0.6.5", - "@logicflow/extension": "^0.6.5", + "@logicflow/core": "^0.6.6", + "@logicflow/extension": "^0.6.6", "@vueuse/core": "^5.2.0", "@zxcvbn-ts/core": "^1.0.0-beta.0", "ant-design-vue": "2.2.2", @@ -67,7 +67,7 @@ "devDependencies": { "@commitlint/cli": "^13.1.0", "@commitlint/config-conventional": "^13.1.0", - "@iconify/json": "^1.1.381", + "@iconify/json": "^1.1.382", "@purge-icons/generated": "^0.7.0", "@types/codemirror": "^5.60.2", "@types/crypto-js": "^4.0.2", @@ -77,13 +77,13 @@ "@types/jest": "^26.0.24", "@types/lodash-es": "^4.17.4", "@types/mockjs": "^1.0.4", - "@types/node": "^16.4.9", + "@types/node": "^16.4.10", "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.4.1", "@types/qs": "^6.9.7", "@types/sortablejs": "^1.10.7", - "@typescript-eslint/eslint-plugin": "^4.28.5", - "@typescript-eslint/parser": "^4.28.5", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", "@vitejs/plugin-legacy": "^1.5.0", "@vitejs/plugin-vue": "^1.3.0", "@vitejs/plugin-vue-jsx": "^1.1.7", @@ -119,20 +119,20 @@ "stylelint-config-prettier": "^8.0.2", "stylelint-config-standard": "^22.0.0", "stylelint-order": "^4.1.0", - "tailwindcss": "^2.2.7", "ts-jest": "^27.0.4", "ts-node": "^10.1.0", "typescript": "4.3.5", "vite": "2.4.4", - "vite-plugin-compression": "^0.3.1", + "vite-plugin-compression": "^0.3.3", "vite-plugin-html": "^2.0.7", - "vite-plugin-imagemin": "^0.4.1", - "vite-plugin-mock": "^2.9.3", + "vite-plugin-imagemin": "^0.4.3", + "vite-plugin-mock": "^2.9.4", "vite-plugin-purge-icons": "^0.7.0", "vite-plugin-pwa": "^0.9.3", - "vite-plugin-style-import": "^1.0.1", - "vite-plugin-svg-icons": "^1.0.1", + "vite-plugin-style-import": "^1.1.0", + "vite-plugin-svg-icons": "^1.0.3", "vite-plugin-theme": "^0.8.1", + "vite-plugin-windicss": "^1.2.7", "vue-eslint-parser": "^7.10.0", "vue-tsc": "^0.2.2" }, diff --git a/postcss.config.js b/postcss.config.js index 12a703d9..a47ef4f9 100755 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,6 +1,5 @@ module.exports = { plugins: { - tailwindcss: {}, autoprefixer: {}, }, }; diff --git a/src/design/tailwind.css b/src/design/tailwind.css deleted file mode 100644 index c187af78..00000000 --- a/src/design/tailwind.css +++ /dev/null @@ -1,4 +0,0 @@ -/*! @import */ -@tailwind base; -@tailwind components; -@tailwind utilities; diff --git a/src/main.ts b/src/main.ts index b0c561bd..89da4e21 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,5 +1,7 @@ import '/@/design/index.less'; -import '/@/design/tailwind.css'; + +// Register windi +import 'virtual:windi.css'; // Register icon sprite import 'virtual:svg-icons-register'; import App from './App.vue'; diff --git a/src/views/dashboard/analysis/components/GrowCard.vue b/src/views/dashboard/analysis/components/GrowCard.vue index b6976283..5c1c5dea 100644 --- a/src/views/dashboard/analysis/components/GrowCard.vue +++ b/src/views/dashboard/analysis/components/GrowCard.vue @@ -5,8 +5,8 @@ size="small" :loading="$attrs.loading" :title="item.title" - class="md:w-1/4 w-full md:!mt-0 !mt-4" - :class="[index + 1 < 4 && 'md:!mr-4']" + class="md:w-1/4 w-full !md:mt-0 !mt-4" + :class="[index + 1 < 4 && '!md:mr-4']" :canExpan="false" >