修复升级vite3导致主题设置无效问题【issues/236】【插件@rys-fe/vite-plugin-theme非官方版,但可以用,后期跟踪vben官方是否更新】

package.json
src\logics\theme\index.ts
src\logics\theme\dark.ts
build\vite\plugin\theme.ts
pull/237/head
zhangdaiscott 2022-11-14 20:18:40 +08:00
parent bc4fbad872
commit 74bf90014d
6 changed files with 28 additions and 32 deletions

View File

@ -4,7 +4,7 @@
*/
import type { PluginOption } from 'vite';
import path from 'path';
import { viteThemePlugin, antdDarkThemePlugin, mixLighten, mixDarken, tinycolor } from 'vite-plugin-theme';
import { viteThemePlugin, antdDarkThemePlugin, mixLighten, mixDarken, tinycolor } from '@rys-fe/vite-plugin-theme';
import { getThemeColors, generateColors } from '../../config/themeConfig';
import { generateModifyVars } from '../../generate/generateModifyVars';

View File

@ -169,7 +169,7 @@
"vite-plugin-pwa": "^0.12.3",
"vite-plugin-style-import": "^2.0.0",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-theme": "^0.8.6",
"@rys-fe/vite-plugin-theme": "^0.8.6",
"vite-plugin-vue-setup-extend": "^0.4.0",
"vite-plugin-windicss": "^1.8.7",
"vue-eslint-parser": "^8.3.0",

View File

@ -15,6 +15,7 @@ specifiers:
'@logicflow/core': ^1.1.13
'@logicflow/extension': ^1.1.13
'@purge-icons/generated': ^0.8.1
'@rys-fe/vite-plugin-theme': ^0.8.6
'@types/codemirror': ^5.60.5
'@types/crypto-js': ^4.1.1
'@types/fs-extra': ^9.0.13
@ -124,7 +125,6 @@ specifiers:
vite-plugin-pwa: ^0.12.3
vite-plugin-style-import: ^2.0.0
vite-plugin-svg-icons: ^2.0.1
vite-plugin-theme: ^0.8.6
vite-plugin-vue-setup-extend: ^0.4.0
vite-plugin-windicss: ^1.8.7
vue: ^3.2.33
@ -206,6 +206,7 @@ devDependencies:
'@commitlint/config-conventional': registry.npmmirror.com/@commitlint/config-conventional/16.2.4
'@iconify/json': registry.npmmirror.com/@iconify/json/2.1.135
'@purge-icons/generated': registry.npmmirror.com/@purge-icons/generated/0.8.1
'@rys-fe/vite-plugin-theme': registry.npmmirror.com/@rys-fe/vite-plugin-theme/0.8.6_vite@3.2.3
'@types/codemirror': registry.npmmirror.com/@types/codemirror/5.60.5
'@types/crypto-js': registry.npmmirror.com/@types/crypto-js/4.1.1
'@types/fs-extra': registry.npmmirror.com/@types/fs-extra/9.0.13
@ -280,7 +281,6 @@ devDependencies:
vite-plugin-pwa: registry.npmmirror.com/vite-plugin-pwa/0.12.8_vite@3.2.3
vite-plugin-style-import: registry.npmmirror.com/vite-plugin-style-import/2.0.0_vite@3.2.3
vite-plugin-svg-icons: registry.npmmirror.com/vite-plugin-svg-icons/2.0.1_vite@3.2.3
vite-plugin-theme: registry.npmmirror.com/vite-plugin-theme/0.8.6_vite@3.2.3
vite-plugin-vue-setup-extend: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@3.2.3
vite-plugin-windicss: registry.npmmirror.com/vite-plugin-windicss/1.8.8_vite@3.2.3
vue-eslint-parser: registry.npmmirror.com/vue-eslint-parser/8.3.0_eslint@8.27.0
@ -2901,6 +2901,27 @@ packages:
picomatch: registry.npmmirror.com/picomatch/2.3.1
dev: true
registry.npmmirror.com/@rys-fe/vite-plugin-theme/0.8.6_vite@3.2.3:
resolution: {integrity: sha512-9j6yMhNRCDxv4Wpimo0EDZf/KU5FgJtjMPVYBaFv4SPClLOEx5kkpcRuDrVBaB4IzM1qizRlxUK4jd9Klxyqig==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@rys-fe/vite-plugin-theme/-/vite-plugin-theme-0.8.6.tgz}
id: registry.npmmirror.com/@rys-fe/vite-plugin-theme/0.8.6
name: '@rys-fe/vite-plugin-theme'
version: 0.8.6
peerDependencies:
vite: '>=2.0.0-beta.49'
dependencies:
'@types/node': registry.npmmirror.com/@types/node/14.18.33
'@types/tinycolor2': registry.npmmirror.com/@types/tinycolor2/1.4.3
chalk: registry.npmmirror.com/chalk/4.1.2
clean-css: registry.npmmirror.com/clean-css/5.3.1
debug: registry.npmmirror.com/debug/4.3.4
esbuild: registry.npmmirror.com/esbuild/0.11.23
esbuild-plugin-alias: registry.npmmirror.com/esbuild-plugin-alias/0.1.2
tinycolor2: registry.npmmirror.com/tinycolor2/1.4.2
vite: registry.npmmirror.com/vite/3.2.3_uakuilq6iygkg5ll5cv37w4i7m
transitivePeerDependencies:
- supports-color
dev: true
registry.npmmirror.com/@simonwep/pickr/1.8.2:
resolution: {integrity: sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@simonwep/pickr/-/pickr-1.8.2.tgz}
name: '@simonwep/pickr'
@ -15345,27 +15366,6 @@ packages:
- supports-color
dev: true
registry.npmmirror.com/vite-plugin-theme/0.8.6_vite@3.2.3:
resolution: {integrity: sha512-GyoP9JjGkF106AawBh1kvw2eQZ/CCPeZKN5p5XhQe1ah1LO7A/6aVGY5gYGWk2qHG9nXpM1IvxjdbMsg94bvYg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-theme/-/vite-plugin-theme-0.8.6.tgz}
id: registry.npmmirror.com/vite-plugin-theme/0.8.6
name: vite-plugin-theme
version: 0.8.6
peerDependencies:
vite: '>=2.0.0-beta.49'
dependencies:
'@types/node': registry.npmmirror.com/@types/node/14.18.33
'@types/tinycolor2': registry.npmmirror.com/@types/tinycolor2/1.4.3
chalk: registry.npmmirror.com/chalk/4.1.2
clean-css: registry.npmmirror.com/clean-css/5.3.1
debug: registry.npmmirror.com/debug/4.3.4
esbuild: registry.npmmirror.com/esbuild/0.11.23
esbuild-plugin-alias: registry.npmmirror.com/esbuild-plugin-alias/0.1.2
tinycolor2: registry.npmmirror.com/tinycolor2/1.4.2
vite: registry.npmmirror.com/vite/3.2.3_uakuilq6iygkg5ll5cv37w4i7m
transitivePeerDependencies:
- supports-color
dev: true
registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@3.2.3:
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-vue-setup-extend/-/vite-plugin-vue-setup-extend-0.4.0.tgz}
id: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0

View File

@ -1,4 +1,4 @@
import { darkCssIsReady, loadDarkThemeCss } from 'vite-plugin-theme/es/client';
import { darkCssIsReady, loadDarkThemeCss } from '@rys-fe/vite-plugin-theme/es/client';
import { addClass, hasClass, removeClass } from '/@/utils/domUtils';
export async function updateDarkTheme(mode: string | null = 'light') {

View File

@ -1,7 +1,7 @@
import { getThemeColors, generateColors } from '../../../build/config/themeConfig';
import { replaceStyleVariables } from 'vite-plugin-theme/es/client';
import { mixLighten, mixDarken, tinycolor } from 'vite-plugin-theme/es/colorUtils';
import { replaceStyleVariables } from '@rys-fe/vite-plugin-theme/es/client';
import { mixLighten, mixDarken, tinycolor } from '@rys-fe/vite-plugin-theme/es/colorUtils';
export async function changeTheme(color: string) {
const colors = generateColors({

View File

@ -82,10 +82,6 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
// Suppress warning
__INTLIFY_PROD_DEVTOOLS__: false,
__APP_INFO__: JSON.stringify(__APP_INFO__),
//新增以下变量,临时解决 https://github.com/vbenjs/vite-plugin-theme/issues/27
__COLOR_PLUGIN_OUTPUT_FILE_NAME__: undefined,
__PROD__: true,
__COLOR_PLUGIN_OPTIONS__: {},
},
css: {
preprocessorOptions: {