fix: exports common types

chaii3 · Sep 13, 2021 · 9a45b9b · 9a45b9b
1 parent d6ff749
commit 9a45b9b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/packages/core/index.ts b/packages/core/index.ts
@@ -80,4 +80,5 @@ export * from './useWebWorkerFn'
 export * from './useWindowFocus'
 export * from './useWindowScroll'
 export * from './useWindowSize'
+export * from './types'
 export * from '@vueuse/shared'
diff --git a/packages/core/_types.ts → packages/core/types.ts b/packages/core/_types.ts → packages/core/types.ts
diff --git a/packages/core/useDraggable/index.ts b/packages/core/useDraggable/index.ts
@@ -2,7 +2,7 @@ import { Ref, ref, unref, computed } from 'vue-demi'
 import { MaybeRef, toRefs, isClient } from '@vueuse/shared'
 import { useEventListener } from '../useEventListener'
 import { MaybeElementRef } from '../unrefElement'
-import { PointerType, Position } from '../_types'
+import { PointerType, Position } from '../types'
 import { defaultWindow } from '../_configurable'
 
 export interface UseDraggableOptions {

diff --git a/packages/core/useMouse/index.ts b/packages/core/useMouse/index.ts
@@ -1,7 +1,7 @@
 import { ref } from 'vue-demi'
 import { useEventListener } from '../useEventListener'
 import { ConfigurableWindow, defaultWindow } from '../_configurable'
-import { Position } from '../_types'
+import { Position } from '../types'
 
 export interface MouseOptions extends ConfigurableWindow {
   /**

diff --git a/packages/core/usePointer/index.ts b/packages/core/usePointer/index.ts
@@ -2,7 +2,7 @@ import { MaybeRef, objectPick, toRefs } from '@vueuse/shared'
 import { ref, Ref } from 'vue-demi'
 import { useEventListener } from '../useEventListener'
 import { ConfigurableWindow, defaultWindow } from '../_configurable'
-import { PointerType, Position } from '../_types'
+import { PointerType, Position } from '../types'
 import { MaybeElementRef } from '../unrefElement'
 
 export interface UsePointerState extends Position {

diff --git a/packages/core/usePointerSwipe/index.ts b/packages/core/usePointerSwipe/index.ts
@@ -2,7 +2,7 @@ import { MaybeRef } from '@vueuse/shared'
 import { computed, reactive, readonly, Ref, ref } from 'vue-demi'
 import { useEventListener } from '../useEventListener'
 import { SwipeDirection } from '../useSwipe/index'
-import { Position } from '../_types'
+import { Position } from '../types'
 
 export interface PointerSwipeOptions {
   /**

diff --git a/packages/core/useSwipe/index.ts b/packages/core/useSwipe/index.ts
@@ -1,9 +1,8 @@
 import { noop, MaybeRef } from '@vueuse/shared'
 import { computed, reactive, ref, ComputedRef, Ref } from 'vue-demi'
-
 import { useEventListener } from '../useEventListener'
 import { ConfigurableWindow, defaultWindow } from '../_configurable'
-import { Position } from '../_types'
+import { Position } from '../types'
 
 export enum SwipeDirection {
   UP = 'UP',

diff --git a/scripts/utils.ts b/scripts/utils.ts
@@ -178,9 +178,9 @@ export async function updateImport({ packages, functions }: PackageIndexes) {
     if (manualImport)
       continue
 
-    let content: string
+    let imports: string[]
     if (name === 'components') {
-      content = functions
+      imports = functions
         .sort((a, b) => a.name.localeCompare(b.name))
         .flatMap((fn) => {
           const arr = []
@@ -190,23 +190,23 @@ export async function updateImport({ packages, functions }: PackageIndexes) {
             arr.push(`export * from '../${fn.package}/${fn.name}/directive'`)
           return arr
         })
-        .join('\n')
     }
     else {
-      content = functions
+      imports = functions
         .filter(i => i.package === name)
         .map(f => f.name)
         .sort()
         .map(name => `export * from './${name}'`)
-        .join('\n')
     }
 
-    if (name === 'core')
-      content += '\nexport * from \'@vueuse/shared\''
-
-    content += '\n'
+    if (name === 'core') {
+      imports.push(
+        'export * from \'./types\'',
+        'export * from \'@vueuse/shared\'',
+      )
+    }
 
-    await fs.writeFile(join(dir, 'index.ts'), content)
+    await fs.writeFile(join(dir, 'index.ts'), `${imports.join('\n')}\n`)
   }
 }