From 93882454624bdf50de644ffa90005813ef95e933 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Thu, 2 Sep 2021 10:39:49 +0800
Subject: [PATCH] chore: update vite

---
 components/descriptions/demo/size.vue |  4 ++--
 components/style/themes/dark.less     |  3 ++-
 site/themeConfig.ts                   |  6 ++++--
 site/vite.config.ts                   | 21 ++++++++++++++-------
 tsconfig.json                         |  5 +++++
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/components/descriptions/demo/size.vue b/components/descriptions/demo/size.vue
index ff51aecdf..9060521ea 100644
--- a/components/descriptions/demo/size.vue
+++ b/components/descriptions/demo/size.vue
@@ -1,7 +1,7 @@
 <docs>
 ---
 order: 2
-title: 
+title:
   zh-CN: 自定义尺寸
   en-US: Custom Size
 ---
@@ -68,7 +68,7 @@ Custom sizes to fit in a variety of containers.
 <script lang="ts">
 import { defineComponent, ref } from 'vue';
 // TODO
-import { RadioChangeEvent } from 'ant-design-vue/es/radio/interface';
+import type { RadioChangeEvent } from 'ant-design-vue/es/radio/interface';
 
 export default defineComponent({
   setup() {
diff --git a/components/style/themes/dark.less b/components/style/themes/dark.less
index 1a104b10b..f11cb04cc 100644
--- a/components/style/themes/dark.less
+++ b/components/style/themes/dark.less
@@ -290,7 +290,7 @@
 // Menu
 // ---
 // dark theme
-@menu-dark-submenu-bg: @component-background;
+@menu-dark-inline-submenu-bg: @component-background;
 @menu-dark-bg: @popover-background;
 @menu-popup-bg: @popover-background;
 
@@ -310,6 +310,7 @@
 @table-header-bg: #1d1d1d;
 @table-body-sort-bg: fade(@white, 1%);
 @table-row-hover-bg: #262626;
+@table-header-cell-split-color: fade(@white, 8%);
 @table-header-sort-bg: #262626;
 @table-header-filter-active-bg: #434343;
 @table-header-sort-active-bg: #303030;
diff --git a/site/themeConfig.ts b/site/themeConfig.ts
index 10779385d..6ec49e3e1 100644
--- a/site/themeConfig.ts
+++ b/site/themeConfig.ts
@@ -1,11 +1,13 @@
 import less from 'less';
-// import { getThemeVariables } from 'ant-design-vue/dist/theme';
+import defaultVars from '../scripts/default-vars';
+import dark from '../scripts/dark-vars';
 const themeConfig = [
   {
     theme: 'dark',
     htmlThemeAttr: 'dark',
     modifyVars: {
-      // ...getThemeVariables({ dark: true }),
+      ...defaultVars,
+      ...dark,
       'text-color': 'fade(@white, 65%)',
       'gray-8': '@text-color',
       'background-color-base': '#555',
diff --git a/site/vite.config.ts b/site/vite.config.ts
index f706f8b8f..f95a90da4 100644
--- a/site/vite.config.ts
+++ b/site/vite.config.ts
@@ -3,18 +3,14 @@ import vue from '@vitejs/plugin-vue';
 import md from '../plugin/md';
 import docs from '../plugin/docs';
 import vueJsx from '@vitejs/plugin-vue-jsx';
-// import { getThemeVariables } from 'ant-design-vue/dist/theme';
-// import { additionalData } from './themeConfig';
+import { additionalData } from './themeConfig';
 import defaultVar from '../scripts/default-vars';
-// import compact from '../scripts/compact-vars';
-// import dark from '../scripts/dark-vars';
 /**
  * @type {import('vite').UserConfig}
  */
 export default {
   resolve: {
     alias: {
-      // moment: 'moment/dist/moment.js',
       '@': path.join(__dirname, './src'),
       vue: 'vue/dist/vue.esm-bundler.js',
       'ant-design-vue': path.resolve(__dirname, '../components'),
@@ -23,6 +19,8 @@ export default {
   plugins: [
     vueJsx({
       // options are passed on to @vue/babel-plugin-jsx
+      mergeProps: false,
+      enableObjectSlots: false,
     }),
     docs(),
     md(),
@@ -31,7 +29,16 @@ export default {
     }),
   ],
   optimizeDeps: {
-    include: ['fetch-jsonp', '@ant-design/icons-vue', 'lodash-es'],
+    include: [
+      'fetch-jsonp',
+      '@ant-design/icons-vue',
+      'lodash-es',
+      'dayjs',
+      'vue',
+      'vue-router',
+      'vue-i18n',
+      'async-validator',
+    ],
   },
   css: {
     preprocessorOptions: {
@@ -39,7 +46,7 @@ export default {
         modifyVars: { ...defaultVar },
         javascriptEnabled: true,
         // includePaths: ["node_modules/"],
-        // additionalData,
+        additionalData,
       },
     },
   },
diff --git a/tsconfig.json b/tsconfig.json
index f60459ea0..8e6bf940a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,10 @@
 {
   "compilerOptions": {
+    "baseUrl": "./",
+    "paths": {
+      "ant-design-vue": ["components/index.tsx"],
+      "ant-design-vue/es/*": ["components/*"]
+    },
     "strictNullChecks": false,
     "moduleResolution": "node",
     "esModuleInterop": true,