chore: resolve conflict

This commit is contained in:
zhuzhengjian 2023-04-18 15:50:37 +08:00
commit 4e0a756239
6 changed files with 43 additions and 26 deletions

View File

@ -0,0 +1,17 @@
<script lang="ts" setup>
import { onMounted, shallowRef } from 'vue'
const comp = shallowRef()
onMounted(async () => {
const { AntdTheme } = await import('vite-plugin-vitepress-demo/theme')
comp.value = AntdTheme
})
</script>
<template>
<ClientOnly>
<component v-bind="$attrs" :is="comp"></component>
</ClientOnly>
</template>
<style scoped></style>

View File

@ -10,20 +10,19 @@ const baseSrc = fileURLToPath(new URL('./', import.meta.url))
export default defineConfig({ export default defineConfig({
rewrites: getRewrites(), rewrites: getRewrites(),
mpa: true,
lang: 'en-US', lang: 'en-US',
ignoreDeadLinks: true, ignoreDeadLinks: true,
locales: { locales: {
'zh-CN': { 'zh-CN': {
lang: 'zh-CN', lang: 'zh-CN',
title: 'vue3组件库站点', title: 'Antd Tiny Vue',
label: '简体中文', label: '简体中文',
description: 'vue3组件库站点', description: 'vue3组件库站点',
themeConfig: getZhCNConfig() themeConfig: getZhCNConfig()
}, },
root: { root: {
lang: 'en-US', lang: 'en-US',
title: 'vue3 component library site', title: 'Antd Tiny Vue',
label: 'English', label: 'English',
description: 'vue3 component library site', description: 'vue3 component library site',
themeConfig: getEnUSConfig() themeConfig: getEnUSConfig()

View File

@ -1,15 +1,17 @@
import type { Theme } from 'vitepress' import type { Theme } from 'vitepress'
// eslint-disable-next-line import/no-named-as-default // eslint-disable-next-line import/no-named-as-default
import DefaultTheme from 'vitepress/theme' import DefaultTheme from 'vitepress/theme'
import { AntdTheme } from 'vite-plugin-vitepress-demo/theme' import AntdTheme from '../components/demo.vue'
// @ts-expect-error this is a local module
import Antd from 'antd-tiny-vue'
export default { export default {
...DefaultTheme, ...DefaultTheme,
enhanceApp(ctx) { async enhanceApp(ctx) {
DefaultTheme.enhanceApp?.(ctx) DefaultTheme.enhanceApp?.(ctx)
ctx.app.component('Demo', AntdTheme) ctx.app.component('Demo', AntdTheme)
ctx.app.use(Antd) // @ts-expect-error this is a local module
if (!import.meta.env.SSR) {
// @ts-expect-error this is a local module
const Antd = (await import('antd-tiny-vue')).default
ctx.app.use(Antd)
}
} }
} as Theme } as Theme

View File

@ -20,7 +20,6 @@ const genSharedButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token token
): CSSObject => { ): CSSObject => {
const { componentCls, iconCls } = token const { componentCls, iconCls } = token
return { return {
[componentCls]: { [componentCls]: {
outline: 'none', outline: 'none',

View File

@ -1,6 +1,7 @@
{ {
"name": "antd-tiny-vue", "name": "antd-tiny-vue",
"version": "1.0.0", "version": "1.0.0",
"packageManager": "pnpm@8.2.0",
"description": "this is a tiny antd components for vue3", "description": "this is a tiny antd components for vue3",
"keywords": [ "keywords": [
"antd", "antd",
@ -20,13 +21,12 @@
"build:site": "vitepress build", "build:site": "vitepress build",
"preview": "vitepress preview" "preview": "vitepress preview"
}, },
"packageManager": "pnpm@8.2.0",
"dependencies": { "dependencies": {
"@ant-design/colors": "^7.0.0", "@ant-design/colors": "^7.0.0",
"@ant-design/icons-vue": "^6.1.0", "@ant-design/icons-vue": "^6.1.0",
"@antd-tiny-vue/cssinjs": "^0.0.4", "@antd-tiny-vue/cssinjs": "0.0.8",
"@ctrl/tinycolor": "^3.6.0", "@ctrl/tinycolor": "^3.6.0",
"@v-c/utils": "^0.0.19", "@v-c/utils": "^0.0.22",
"@vueuse/core": "^9.13.0", "@vueuse/core": "^9.13.0",
"vue": "^3.2.47" "vue": "^3.2.47"
}, },
@ -45,7 +45,7 @@
"typescript": "^4.9.5", "typescript": "^4.9.5",
"unbuild": "^1.1.2", "unbuild": "^1.1.2",
"vite": "^4.2.1", "vite": "^4.2.1",
"vite-plugin-vitepress-demo": "2.0.0-beta.28", "vite-plugin-vitepress-demo": "2.0.0-beta.29",
"vitepress": "1.0.0-alpha.69", "vitepress": "1.0.0-alpha.69",
"vitest": "^0.28.5" "vitest": "^0.28.5"
}, },

View File

@ -8,14 +8,14 @@ dependencies:
specifier: ^6.1.0 specifier: ^6.1.0
version: 6.1.0(vue@3.2.47) version: 6.1.0(vue@3.2.47)
'@antd-tiny-vue/cssinjs': '@antd-tiny-vue/cssinjs':
specifier: ^0.0.4 specifier: 0.0.8
version: 0.0.4(vue@3.2.47) version: 0.0.8(vue@3.2.47)
'@ctrl/tinycolor': '@ctrl/tinycolor':
specifier: ^3.6.0 specifier: ^3.6.0
version: 3.6.0 version: 3.6.0
'@v-c/utils': '@v-c/utils':
specifier: ^0.0.19 specifier: ^0.0.22
version: 0.0.19 version: 0.0.22
'@vueuse/core': '@vueuse/core':
specifier: ^9.13.0 specifier: ^9.13.0
version: 9.13.0(vue@3.2.47) version: 9.13.0(vue@3.2.47)
@ -67,8 +67,8 @@ devDependencies:
specifier: ^4.2.1 specifier: ^4.2.1
version: 4.2.1(@types/node@18.15.10) version: 4.2.1(@types/node@18.15.10)
vite-plugin-vitepress-demo: vite-plugin-vitepress-demo:
specifier: 2.0.0-beta.28 specifier: 2.0.0-beta.29
version: 2.0.0-beta.28(vitepress@1.0.0-alpha.69) version: 2.0.0-beta.29(vitepress@1.0.0-alpha.69)
vitepress: vitepress:
specifier: 1.0.0-alpha.69 specifier: 1.0.0-alpha.69
version: 1.0.0-alpha.69(@types/node@18.15.10) version: 1.0.0-alpha.69(@types/node@18.15.10)
@ -225,8 +225,8 @@ packages:
vue: 3.2.47 vue: 3.2.47
dev: false dev: false
/@antd-tiny-vue/cssinjs@0.0.4(vue@3.2.47): /@antd-tiny-vue/cssinjs@0.0.8(vue@3.2.47):
resolution: {integrity: sha512-o6eU9IN+nfzaeCLHaQ94FqgvZV7eHeyY/Qw0p7ETMOyEQup13LBb4feOQKHGtBKLRkeoTugpY6EhAuMhn10SYw==} resolution: {integrity: sha512-Q5/4ugRfaIn0jfG/D5eXu2DtGfmMbsNAvAcx6M0aRjY3gfvd4h/W7YDIfI4N9lfighnvJ8A4CgW6d9xAHlP5pw==}
peerDependencies: peerDependencies:
vue: ^3.2.0 vue: ^3.2.0
dependencies: dependencies:
@ -1459,8 +1459,8 @@ packages:
eslint-visitor-keys: 3.3.0 eslint-visitor-keys: 3.3.0
dev: true dev: true
/@v-c/utils@0.0.19: /@v-c/utils@0.0.22:
resolution: {integrity: sha512-f+ZifqMUCY7UsP1+Z7FZIq8bxE+2CDTaF69NQFfBJw/z6EC+oJEX7HXaVqliYXW+JM20Qfq6x4huNXjJXdDkMQ==} resolution: {integrity: sha512-fkFIpo6jAJ2CxQXFyd3woLHmBwHkWiOSA29eul0a2eWyRKtsESwRMVNAvis+hCKwexzLHY80wxlvWxpn3OCjbQ==}
dependencies: dependencies:
lodash.clonedeep: 4.5.0 lodash.clonedeep: 4.5.0
lodash.isequal: 4.5.0 lodash.isequal: 4.5.0
@ -5077,8 +5077,8 @@ packages:
- terser - terser
dev: true dev: true
/vite-plugin-vitepress-demo@2.0.0-beta.28(vitepress@1.0.0-alpha.69): /vite-plugin-vitepress-demo@2.0.0-beta.29(vitepress@1.0.0-alpha.69):
resolution: {integrity: sha512-Js/plBl72fPoHv00VJYo33v5YnbhWzLK2bwzCZ1+H28bS+JmdMVBa8SnMy8GAFiZgpAEudLf55sRlQY4BGCv2Q==} resolution: {integrity: sha512-9AvlF5Bz6kMfkvlLDdcuv/Xz9Va/HRuh8YCpwiz3NKeIo+BnZ6ehn7tc/Wj/RVH2XZlJTUNyEvMOvIwNlzY2sw==}
peerDependencies: peerDependencies:
vitepress: ^1.0.0-alpha.63 vitepress: ^1.0.0-alpha.63
dependencies: dependencies: