revert: b503b58

target 从 .browserslistrc 中生成

Author: caixw

.browserslistrc

@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2024-2025 caixw
+#
+# SPDX-License-Identifier: MIT
+
+>5%, last 2 versions, not dead

apps/admin/package.json

@@ -29,6 +29,8 @@
 		"@cmfx/core": "workspace:*",
 		"@iconify/json": "catalog:",
 		"@solidjs/router": "catalog:",
+		"browserslist": "catalog:",
+		"browserslist-to-esbuild": "catalog:",
 		"echarts": "catalog:",
 		"tailwindcss": "catalog:",
 		"solid-js": "catalog:",

apps/admin/vite.config.ts

@@ -6,6 +6,7 @@ import path from 'node:path';
 //import basicSsl from '@vitejs/plugin-basic-ssl';
 import { about } from '@cmfx/vite-plugin-about';
 import tailwindcss from '@tailwindcss/vite';
+import browserslistToEsbuild from 'browserslist-to-esbuild';
 import Icons from 'unplugin-icons/vite';
 import { defineConfig } from 'vite';
 import solidPlugin from 'vite-plugin-solid';
@@ -23,6 +24,7 @@ export default defineConfig(({ mode }) => {
 		},
 
 		build: {
+			target: browserslistToEsbuild(),
 			sourcemap: true,
 			rolldownOptions: {
 				output: {

apps/docs/package.json

@@ -41,6 +41,8 @@
 		"@tailwindcss/vite": "catalog:",
 		"@types/node": "catalog:",
 		"autoprefixer": "catalog:",
+		"browserslist": "catalog:",
+		"browserslist-to-esbuild": "catalog:",
 		"typescript": "catalog:",
 		"unplugin-icons": "catalog:",
 		"vite": "catalog:",

apps/docs/src/main.tsx

@@ -104,9 +104,9 @@ function InternalApp(props: RouteSectionProps): JSX.Element {
 				title={options.title}
 				actions={
 					<>
-						<Drawer.ToggleButton square kind="flat" drawer={docsRef()} />
-						<Drawer.ToggleButton square kind="flat" drawer={demoRef()} />
-						<Drawer.ToggleButton square kind="flat" drawer={themeRef()} />
+						<Drawer.ToggleButton kind="flat" drawer={docsRef()} />
+						<Drawer.ToggleButton kind="flat" drawer={demoRef()} />
+						<Drawer.ToggleButton kind="flat" drawer={themeRef()} />
 
 						<Dropdown.Root
 							trigger="hover"
@@ -125,9 +125,7 @@ function InternalApp(props: RouteSectionProps): JSX.Element {
 						</Dropdown.Root>
 
 						<Dropdown.Root
-							ref={el => {
-								themeDropdown = el;
-							}}
+							ref={el => (themeDropdown = el)}
 							trigger="hover"
 							multiple
 							value={modeValues()}
@@ -217,13 +215,7 @@ function NotFound(): JSX.Element {
 				<Button.Root palette="primary" type="a" href="/">
 					{l.t('_d.error.backHome')}
 				</Button.Root>
-				<Button.Root
-					palette="primary"
-					type="button"
-					onclick={() => {
-						nav(-1);
-					}}
-				>
+				<Button.Root palette="primary" type="button" onclick={() => nav(-1)}>
 					{l.t('_d.error.backPrev')}
 				</Button.Root>
 			</div>

apps/docs/src/theme/builder/index.tsx

@@ -31,7 +31,7 @@ export function buildRoute(path: string, setDrawer: Setter<Drawer.RootRef | unde
 			const [act] = useOptions();
 
 			const t = useTheme();
-			const schemeFA = new Form.ObjectAccessor<Scheme>(convertSchemeVar2Color(unwrap(t.scheme)!));
+			const schemeFA = new Form.ObjectAccessor<Scheme>(convertSchemeVar2Color(unwrap(t.scheme)));
 
 			createEffect(() => {
 				act.setTitle(l.t('_d.theme.builder'));

apps/docs/src/theme/builder/utils.ts

@@ -5,19 +5,20 @@
 import { palettes, type Scheme } from '@cmfx/components';
 
 /**
- * 将参数 s 中的颜色变量转换为实际颜色值
+ * 将参数 s 中的颜色变量转换为实际颜色值并返回新的对象
  */
 export function convertSchemeVar2Color(s: Scheme): Scheme {
 	// 主题无法引用非全局的 CSS 变量。所以这里统一从全局解析变量的值
 	const style = window.getComputedStyle(document.documentElement);
 
+	const ret = {} as Scheme;
 	for (const p of palettes) {
 		const colorVal = s[p];
 		if (colorVal.startsWith('var(--')) {
 			// 值是变量，需要计算其真实的值。
-			s[p] = style.getPropertyValue(colorVal.slice(4, -1));
+			ret[p] = style.getPropertyValue(colorVal.slice(4, -1));
 		}
 	}
 
-	return s;
+	return ret;
 }

apps/docs/vite.config.ts

@@ -5,6 +5,7 @@
 import path from 'node:path';
 import { api } from '@cmfx/vite-plugin-api';
 import tailwindcss from '@tailwindcss/vite';
+import browserslistToEsbuild from 'browserslist-to-esbuild';
 import Icons from 'unplugin-icons/vite';
 import { defineConfig } from 'vite';
 import solidPlugin from 'vite-plugin-solid';
@@ -23,6 +24,7 @@ export default defineConfig(({ mode }) => {
 		},
 
 		build: {
+			target: browserslistToEsbuild(),
 			minify: true,
 			outDir: '../../docs',
 			rollupOptions: {

build/vite-plugin-about/vite.config.ts

@@ -5,7 +5,7 @@
 import { defineConfig } from 'vite';
 import dts from 'vite-plugin-dts';
 
-import { buildPostBanner, vitePluginCopyFile } from '../vite.config.common';
+import { buildPostBanner, pluginTarget, vitePluginCopyFile } from '../vite.config.common';
 import pkg from './package.json' with { type: 'json' };
 
 // https://vitejs.dev/config/
@@ -21,6 +21,7 @@ export default defineConfig({
 	],
 
 	build: {
+		target: pluginTarget(),
 		minify: true,
 		outDir: './lib',
 		lib: {

build/vite-plugin-api/vite.config.ts

@@ -5,7 +5,7 @@
 import { defineConfig } from 'vite';
 import dts from 'vite-plugin-dts';
 
-import { buildPostBanner, vitePluginCopyFile } from '../vite.config.common';
+import { buildPostBanner, pluginTarget, vitePluginCopyFile } from '../vite.config.common';
 import pkg from './package.json' with { type: 'json' };
 
 // https://vitejs.dev/config/
@@ -23,7 +23,7 @@ export default defineConfig({
 	build: {
 		minify: true,
 		outDir: './lib',
-		target: 'ESNext',
+		target: pluginTarget(),
 		lib: {
 			entry: {
 				index: './src/index.ts',