From 97431f932f7a97e97530637aeb9201f93010e1a2 Mon Sep 17 00:00:00 2001 From: mini2024 Date: Tue, 25 Feb 2025 00:27:05 +0800 Subject: [PATCH] feat: add unocss-preset-chinese and update related configurations --- .github/workflows/vercel.yaml | 3 +-- package.json | 3 ++- pnpm-lock.yaml | 51 +++++++++++++++++++++++++++++++++++ src/pages/index.page.vue | 5 ++++ typed-router.d.ts | 2 +- unocss.config.ts | 9 +++++-- 6 files changed, 67 insertions(+), 6 deletions(-) diff --git a/.github/workflows/vercel.yaml b/.github/workflows/vercel.yaml index ca9247c..fb8888d 100644 --- a/.github/workflows/vercel.yaml +++ b/.github/workflows/vercel.yaml @@ -6,8 +6,7 @@ env: TZ: Asia/Shanghai on: push: - branches: - - main + branches: [main] jobs: build-and-deploy-to-vercel: runs-on: ubuntu-latest diff --git a/package.json b/package.json index 8d95053..5dd97e6 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@formkit/auto-animate": "^0.8.2", "@intlify/unplugin-vue-i18n": "^6.0.3", "@pinia/colada": "^0.13.5", - "@primevue/themes": "^4.3.0-rc.1", + "@primevue/themes": "^4.3.0", "@unhead/vue": "^1.11.18", "@vant/use": "^1.6.0", "@vueuse/core": "^12.5.0", @@ -113,6 +113,7 @@ "terser": "^5.38.1", "typescript": "~5.7.3", "unocss": "^66.0.0", + "unocss-preset-chinese": "^0.3.3", "unplugin-auto-import": "^19.0.0", "unplugin-icons": "^22.0.0", "unplugin-vue-components": "^28.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 997901b..80b555b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -231,6 +231,9 @@ importers: unocss: specifier: ^66.0.0 version: 66.0.0(postcss@8.5.1)(vite@6.1.0(@types/node@22.13.1)(jiti@2.4.2)(less@4.2.2)(sass-embedded@1.83.4)(terser@5.38.2)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3)) + unocss-preset-chinese: + specifier: ^0.3.3 + version: 0.3.3(unocss@66.0.0(postcss@8.5.1)(vite@6.1.0(@types/node@22.13.1)(jiti@2.4.2)(less@4.2.2)(sass-embedded@1.83.4)(terser@5.38.2)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))) unplugin-auto-import: specifier: ^19.0.0 version: 19.0.0(@nuxt/kit@3.15.1(rollup@4.30.1))(@vueuse/core@12.5.0(typescript@5.7.3))(rollup@4.30.1) @@ -1506,9 +1509,15 @@ packages: resolution: {integrity: sha512-nFRGop/guBa4jLkrgXjaRDm5JPz4x3YpP10m5IQkHpHwlnHUVn1L9smyPl04ohYWhYn9ZcAHgR28Ih2jwta8hw==} engines: {node: '>=14'} + '@unocss/core@0.62.4': + resolution: {integrity: sha512-Cc+Vo6XlaQpyVejkJrrzzWtiK9pgMWzVVBpm9VCVtwZPUjD4GSc+g7VQCPXSsr7m03tmSuRySJx72QcASmauNQ==} + '@unocss/core@66.0.0': resolution: {integrity: sha512-PdVbSMHNDDkr++9nkqzsZRAkaU84gxMTEgYbqI7dt2p1DXp/5tomVtmMsr2/whXGYKRiUc0xZ3p4Pzraz8TcXA==} + '@unocss/extractor-arbitrary-variants@0.62.4': + resolution: {integrity: sha512-e4hJfBMyFr6T6dYSTTjNv9CQwaU1CVEKxDlYP0GpfSgxsV58pguID9j1mt0/XZD6LvEDzwxj9RTRWKpUSWqp+Q==} + '@unocss/extractor-arbitrary-variants@66.0.0': resolution: {integrity: sha512-vlkOIOuwBfaFBJcN6o7+obXjigjOlzVFN/jT6pG1WXbQDTRZ021jeF3i9INdb9D/0cQHSeDvNgi1TJ5oUxfiow==} @@ -1527,6 +1536,9 @@ packages: '@unocss/preset-icons@66.0.0': resolution: {integrity: sha512-6ObwTvEGuPBbKWRoMMiDioHtwwQTFI5oojFLJ32Y8tW6TdXvBLkO88d7qpgQxEjgVt4nJrqF1WEfR4niRgBm0Q==} + '@unocss/preset-mini@0.62.4': + resolution: {integrity: sha512-1O+QpQFx7FT61aheAZEYemW5e4AGib8TFGm+rWLudKq2IBNnXHcS5xsq5QvqdC7rp9Dn3lnW5du6ijow5kCBuw==} + '@unocss/preset-mini@66.0.0': resolution: {integrity: sha512-d62eACnuKtR0dwCFOQXgvw5VLh5YSyK56xCzpHkh0j0GstgfDLfKTys0T/XVAAvdSvAy/8A8vhSNJ4PlIc9V2A==} @@ -1554,6 +1566,10 @@ packages: '@unocss/reset@66.0.0': resolution: {integrity: sha512-YLFz/5yT7mFJC8JSmIUA5+bS3CBCJbtztOw+8rWzjQr/BEVSGuihWUUpI2Df6VVxXIXxKanZR6mIl59yvf+GEA==} + '@unocss/rule-utils@0.62.4': + resolution: {integrity: sha512-XUwLbLUzL+VSHCJNK5QBHC9RbFehumge1/XJmsRfmh0+oxgJoO1gvEvxi57gYEmdJdMRJHRJZ66se6+cB0Ymvw==} + engines: {node: '>=14'} + '@unocss/rule-utils@66.0.0': resolution: {integrity: sha512-UJ51YHbwxYTGyj35ugsPlOT4gaa7tCbXdywZ3m5Nn0JgywwIqGmBFyiN9ZjHBHfJuDxmmPd6lxojoBscih/WMQ==} engines: {node: '>=14'} @@ -4858,6 +4874,17 @@ packages: resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} engines: {node: '>= 10.0.0'} + unocss-preset-chinese@0.3.3: + resolution: {integrity: sha512-t6AZ5HMb2pMwSuBp1ntVViKUwPufLWRELoptkAIQrK53j9CtGU3wGXGcpas8HQXaG5fzSpwmGRJagB+7bz1ZZw==} + peerDependencies: + '@unocss/nuxt': '*' + unocss: '*' + peerDependenciesMeta: + '@unocss/nuxt': + optional: true + unocss: + optional: true + unocss@66.0.0: resolution: {integrity: sha512-SHstiv1s7zGPSjzOsADzlwRhQM+6817+OqQE3Fv+N/nn2QLNx1bi3WXybFfz5tWkzBtyTZlwdPmeecsIs1yOCA==} engines: {node: '>=14'} @@ -6532,8 +6559,14 @@ snapshots: '@unocss/core': 66.0.0 unconfig: 7.0.0 + '@unocss/core@0.62.4': {} + '@unocss/core@66.0.0': {} + '@unocss/extractor-arbitrary-variants@0.62.4': + dependencies: + '@unocss/core': 0.62.4 + '@unocss/extractor-arbitrary-variants@66.0.0': dependencies: '@unocss/core': 66.0.0 @@ -6570,6 +6603,12 @@ snapshots: transitivePeerDependencies: - supports-color + '@unocss/preset-mini@0.62.4': + dependencies: + '@unocss/core': 0.62.4 + '@unocss/extractor-arbitrary-variants': 0.62.4 + '@unocss/rule-utils': 0.62.4 + '@unocss/preset-mini@66.0.0': dependencies: '@unocss/core': 66.0.0 @@ -6613,6 +6652,11 @@ snapshots: '@unocss/reset@66.0.0': {} + '@unocss/rule-utils@0.62.4': + dependencies: + '@unocss/core': 0.62.4 + magic-string: 0.30.17 + '@unocss/rule-utils@66.0.0': dependencies: '@unocss/core': 66.0.0 @@ -10208,6 +10252,13 @@ snapshots: universalify@2.0.1: {} + unocss-preset-chinese@0.3.3(unocss@66.0.0(postcss@8.5.1)(vite@6.1.0(@types/node@22.13.1)(jiti@2.4.2)(less@4.2.2)(sass-embedded@1.83.4)(terser@5.38.2)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))): + dependencies: + '@unocss/core': 0.62.4 + '@unocss/preset-mini': 0.62.4 + optionalDependencies: + unocss: 66.0.0(postcss@8.5.1)(vite@6.1.0(@types/node@22.13.1)(jiti@2.4.2)(less@4.2.2)(sass-embedded@1.83.4)(terser@5.38.2)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3)) + unocss@66.0.0(postcss@8.5.1)(vite@6.1.0(@types/node@22.13.1)(jiti@2.4.2)(less@4.2.2)(sass-embedded@1.83.4)(terser@5.38.2)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3)): dependencies: '@unocss/astro': 66.0.0(vite@6.1.0(@types/node@22.13.1)(jiti@2.4.2)(less@4.2.2)(sass-embedded@1.83.4)(terser@5.38.2)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3)) diff --git a/src/pages/index.page.vue b/src/pages/index.page.vue index b6d4f79..90f81f7 100644 --- a/src/pages/index.page.vue +++ b/src/pages/index.page.vue @@ -47,6 +47,11 @@ const FComponent: import('vue').FunctionalComponent<{ prop: string }> = (props,
commit: {{ VITE_BUILD_COMMIT }}
+

+ unocss-preset-chinese 中文排版
https://unocss-preset-chinese-playground.vercel.app/ +

+

🔌 Vite Plugin Webfont DL

Fonts are downloaded directly from Google Fonts

diff --git a/typed-router.d.ts b/typed-router.d.ts index 27415f4..ac0e991 100644 --- a/typed-router.d.ts +++ b/typed-router.d.ts @@ -20,7 +20,7 @@ declare module 'vue-router/auto-routes' { export interface RouteNamedMap { 'Root': RouteRecordInfo<'Root', '/', Record, Record>, '$Path': RouteRecordInfo<'$Path', '/:path(.*)', { path: ParamValue }, { path: ParamValue }>, - 'API': RouteRecordInfo<'API', '/API', Record, Record>, + 'Api': RouteRecordInfo<'Api', '/api', Record, Record>, 'DataLoadersId': RouteRecordInfo<'DataLoadersId', '/data-loaders/:id', { id: ParamValue }, { id: ParamValue }>, 'DataLoadersIdSub1UserId': RouteRecordInfo<'DataLoadersIdSub1UserId', '/data-loaders/:id/sub-1/:userId', { id: ParamValue, userId: ParamValue }, { id: ParamValue, userId: ParamValue }>, 'Fonts': RouteRecordInfo<'Fonts', '/fonts', Record, Record>, diff --git a/unocss.config.ts b/unocss.config.ts index 6612078..8a78da1 100644 --- a/unocss.config.ts +++ b/unocss.config.ts @@ -1,5 +1,6 @@ // https://github.dev/unocss/unocss/tree/main/examples/vite-vue3 -import { defineConfig, presetAttributify, presetUno, transformerDirectives, transformerVariantGroup } from 'unocss'; +import { defineConfig, presetAttributify, presetWind3, transformerDirectives, transformerVariantGroup } from 'unocss'; +import presetChinese, { chineseTypography } from 'unocss-preset-chinese'; export default defineConfig({ theme: { @@ -49,12 +50,16 @@ export default defineConfig({ }, ], presets: [ - presetUno({ + presetWind3({ /* prefix: "u-", */ dark: { dark: '.app-dark', }, }), + chineseTypography(), + presetChinese({ + chineseType: 'simplified', // 指定文本为简体中文 + }), // https://unocss.dev/presets/attributify presetAttributify(),