fix: vue app typing (element-plus#8137)

closes element-plus#8122
StetroF · Jun 7, 2022 · edaa6f6 · edaa6f6
1 parent b34ca0f
commit edaa6f6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/packages/constants/index.ts b/packages/constants/index.ts
@@ -1,4 +1,5 @@
 export * from './aria'
 export * from './date'
 export * from './event'
+export * from './key'
 export * from './size'
diff --git a/packages/constants/key.ts b/packages/constants/key.ts
@@ -0,0 +1 @@
+export const INSTALLED_KEY = Symbol('INSTALLED_KEY')
diff --git a/packages/element-plus/index.ts b/packages/element-plus/index.ts
@@ -4,7 +4,7 @@ export * from '@element-plus/constants'
 export * from '@element-plus/directives'
 export * from '@element-plus/hooks'
 export * from '@element-plus/tokens'
-export { makeInstaller } from './make-installer'
+export * from './make-installer'
 
 export const install = installer.install
 export const version = installer.version

diff --git a/packages/element-plus/make-installer.ts b/packages/element-plus/make-installer.ts
@@ -1,16 +1,9 @@
 import { provideGlobalConfig } from '@element-plus/hooks'
+import { INSTALLED_KEY } from '@element-plus/constants'
 import { version } from './version'
 import type { App, Plugin } from '@vue/runtime-core'
 import type { ConfigProviderContext } from '@element-plus/tokens'
 
-const INSTALLED_KEY = Symbol('INSTALLED_KEY')
-
-declare module '@vue/runtime-core' {
-  interface App {
-    [INSTALLED_KEY]?: boolean
-  }
-}
-
 export const makeInstaller = (components: Plugin[] = []) => {
   const install = (app: App, options?: ConfigProviderContext) => {
     if (app[INSTALLED_KEY]) return

diff --git a/tsconfig.web.json b/tsconfig.web.json
@@ -6,7 +6,7 @@
     "lib": ["ES2018", "DOM", "DOM.Iterable"],
     "types": ["unplugin-vue-define-options"]
   },
-  "include": ["packages", "typings/components.d.ts", "env.d.ts"],
+  "include": ["packages", "typings/components.d.ts", "typings/env.d.ts"],
   "exclude": [
     "node_modules",
     "**/dist",

diff --git a/typings/env.d.ts b/typings/env.d.ts
@@ -1,4 +1,5 @@
 import type { vShow } from 'vue'
+import type { INSTALLED_KEY } from '@element-plus/constants'
 
 declare global {
   const process: {
@@ -16,6 +17,10 @@ declare global {
 }
 
 declare module '@vue/runtime-core' {
+  export interface App {
+    [INSTALLED_KEY]?: boolean
+  }
+
   export interface GlobalComponents {
     Component: (props: { is: Component | string }) => void
   }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const INSTALLED_KEY = Symbol('INSTALLED_KEY')