Merge branch 'template' into release

meadmin-cn · Jan 6, 2023 · fda52b3 · fda52b3
2 parents ecb1457 + 31f3566
commit fda52b3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/plugins/autoImportApi.ts b/plugins/autoImportApi.ts
@@ -9,6 +9,6 @@ export default () =>
     // 自动加载API
     imports: ['vue', 'vue-router', 'pinia', '@vueuse/core'],
     // 可以选择auto-imports.d.ts生成的位置，使用ts建议设置为'src/auto-imports.d.ts'
-    dts: pathResolve('types/auto-imports.d.ts'),
+    dts: false, // pathResolve('types/auto-imports.d.ts'),
     resolvers: [ElementPlusResolver()],
   });
diff --git a/types/auto-imports.d.ts b/types/auto-imports.d.ts
@@ -3,6 +3,8 @@ export {};
 declare global {
   const EffectScope: typeof import('vue')['EffectScope'];
   const ElLoading: typeof import('element-plus/es')['ElLoading'];
+  const ElMessage: typeof import('element-plus/es')['ElMessage'];
+  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'];
   const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate'];
   const asyncComputed: typeof import('@vueuse/core')['asyncComputed'];
   const autoResetRef: typeof import('@vueuse/core')['autoResetRef'];

diff --git a/vite.config.ts b/vite.config.ts
@@ -47,15 +47,6 @@ export default async (configEnv: ConfigEnv): Promise<UserConfigExport> => {
       ],
       extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'],
     },
-    /* eslint-disable */
-    define: {
-      // __SSR__: `true`,
-      // __DEV__: mode === 'development' ? `true` : `false`,
-      // __COMPAT__: `false`,
-      // __FEATURE_SUSPENSE__: `true`,
-      // __FEATURE_PROD_DEVTOOLS__: `false`,
-    },
-    /* eslint-disable */
     build: {
       rollupOptions: {
         output: {