fix: types regression in v0.14.5 (#491)

vite-pwa · Mar 23, 2023 · 32841bb · 32841bb
1 parent 03f7c54
commit 32841bb
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -31,6 +31,9 @@
       "import": "./dist/index.mjs",
       "require": "./dist/index.js"
     },
+    "./types": {
+      "types": "./types/index.d.ts"
+    },
     "./preact": {
       "types": "./preact.d.ts"
     },

diff --git a/preact.d.ts b/preact.d.ts
@@ -2,8 +2,11 @@ declare module 'virtual:pwa-register/preact' {
   // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
   // @ts-ignore ignore when preact/hooks is not installed
   import type { StateUpdater } from 'preact/hooks'
+  import type { RegisterSWOptions } from 'vite-plugin-pwa/types'
 
-  export function useRegisterSW(options?: import('./types/register-options').RegisterSWOptions): {
+  export type { RegisterSWOptions }
+
+  export function useRegisterSW(options?: RegisterSWOptions): {
     needRefresh: [boolean, StateUpdater<boolean>]
     offlineReady: [boolean, StateUpdater<boolean>]
     /**

diff --git a/react.d.ts b/react.d.ts
@@ -2,8 +2,11 @@ declare module 'virtual:pwa-register/react' {
   // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
   // @ts-ignore ignore when react is not installed
   import type { Dispatch, SetStateAction } from 'react'
+  import type { RegisterSWOptions } from 'vite-plugin-pwa/types'
 
-  export function useRegisterSW(options?: import('./types/register-options').RegisterSWOptions): {
+  export type { RegisterSWOptions }
+
+  export function useRegisterSW(options?: RegisterSWOptions): {
     needRefresh: [boolean, Dispatch<SetStateAction<boolean>>]
     offlineReady: [boolean, Dispatch<SetStateAction<boolean>>]
     /**

diff --git a/solid.d.ts b/solid.d.ts
@@ -2,8 +2,11 @@ declare module 'virtual:pwa-register/solid' {
   // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
   // @ts-ignore ignore when solid-js is not installed
   import type { Accessor, Setter } from 'solid-js'
+  import type { RegisterSWOptions } from 'vite-plugin-pwa/types'
 
-  export function useRegisterSW(options?: import('./types/register-options').RegisterSWOptions): {
+  export type { RegisterSWOptions }
+
+  export function useRegisterSW(options?: RegisterSWOptions): {
     needRefresh: [Accessor<boolean>, Setter<boolean>]
     offlineReady: [Accessor<boolean>, Setter<boolean>]
     /**

diff --git a/svelte.d.ts b/svelte.d.ts
@@ -2,8 +2,11 @@ declare module 'virtual:pwa-register/svelte' {
   // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
   // @ts-ignore ignore when svelte is not installed
   import type { Writable } from 'svelte/store'
+  import type { RegisterSWOptions } from 'vite-plugin-pwa/types'
 
-  export function useRegisterSW(options?: import('./types/register-options').RegisterSWOptions): {
+  export type { RegisterSWOptions }
+
+  export function useRegisterSW(options?: RegisterSWOptions): {
     needRefresh: Writable<boolean>
     offlineReady: Writable<boolean>
     /**

diff --git a/types/register-options.d.ts → types/index.d.ts b/types/register-options.d.ts → types/index.d.ts
diff --git a/vanillajs.d.ts b/vanillajs.d.ts
@@ -1,9 +1,13 @@
 declare module 'virtual:pwa-register' {
+  import type { RegisterSWOptions } from 'vite-plugin-pwa/types'
+
+  export type { RegisterSWOptions }
+
   /**
    * Registers the service worker returning a callback to reload the current page when an update is found.
    *
    * @param options the options to register the service worker.
    * @return (reloadPage?: boolean) => Promise<void> From version 0.13.2+ `reloadPage` param is not used anymore.
    */
-  export function registerSW(options?: import('./types/register-options').RegisterSWOptions): (reloadPage?: boolean) => Promise<void>
+  export function registerSW(options?: RegisterSWOptions): (reloadPage?: boolean) => Promise<void>
 }
diff --git a/vue.d.ts b/vue.d.ts
@@ -2,8 +2,11 @@ declare module 'virtual:pwa-register/vue' {
   // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
   // @ts-ignore ignore when vue is not installed
   import type { Ref } from 'vue'
+  import type { RegisterSWOptions } from 'vite-plugin-pwa/types'
 
-  export function useRegisterSW(options?: import('./types/register-options').RegisterSWOptions): {
+  export type { RegisterSWOptions }
+
+  export function useRegisterSW(options?: RegisterSWOptions): {
     needRefresh: Ref<boolean>
     offlineReady: Ref<boolean>
     /**