feat: more accurate signatures (#7)

Author: zheeeng

package.json

@@ -50,7 +50,7 @@
     "tsup": "^4.12.5",
     "typescript": "^4.2.4",
     "vite": "^2.2.1",
-    "vite-plugin-package-config": "^0.1.0"
+    "vite-plugin-package-config": "^0.1.1"
   },
   "peerDependencies": {
     "vite": "^2.0.0",

pnpm-lock.yaml

@@ -1,7 +1,7 @@
 import fs from 'fs-extra'
 import _debug from 'debug'
 import type { Plugin } from 'vite'
-import type { Options as PkgConfigOptions } from 'vite-plugin-package-config'
+import type { VitePluginPackageConfigPlugin } from 'vite-plugin-package-config'
 
 const debug = _debug('vite-plugin-optimize-persist')
 
@@ -21,28 +21,30 @@ export interface Options {
   filter?: (includeModule: string) => boolean
 }
 
-function VitePluginPackageConfig({ delay = 1000, filter = () => true }: Options = {}): Plugin {
-
-  return <Plugin> {
+function VitePluginOptimizePersist({ delay = 1000, filter = () => true }: Options = {}): Plugin {
+  return {
     name: 'hi',
     apply: 'serve',
     configureServer(server) {
-      const pkgConfig: Required<PkgConfigOptions> = (server.config.plugins as any).find((i: any) => i.name === 'vite-plugin-package-config')?.api.options
+      const vitePluginPackageConfigPlugin = server.config.plugins.find(plugin => plugin.name === 'vite-plugin-package-config') as VitePluginPackageConfigPlugin | undefined
+      const pkgConfig = vitePluginPackageConfigPlugin?.api.options
 
       if (!pkgConfig)
         throw new Error('[vite-config-optimize-persist] plugin "vite-plugin-package-config" not found, have you installed it ?')
 
+      const { packageJsonPath, field } = pkgConfig
+
       // @ts-expect-error
-      let optimizeDepsMetadata: any = server._ssrExternals
+      let optimizeDepsMetadata: { optimized: Record<string, string> } | undefined = server._ssrExternals
       const forceIncluded = server.config?.optimizeDeps?.include || []
       let newDeps: string[] = []
-      let timer: any
+      let timer: NodeJS.Timeout
 
       function update() {
         newDeps = Object.keys(
           optimizeDepsMetadata?.optimized || {},
         )
-          .filter(i => !forceIncluded.includes(i))
+          .filter(dep => !forceIncluded.includes(dep))
           .filter(filter)
         debug('newDeps', newDeps)
 
@@ -54,19 +56,19 @@ function VitePluginPackageConfig({ delay = 1000, filter = () => true }: Options
         if (!newDeps.length)
           return
 
-        debug(`writting to ${pkgConfig.packageJsonPath}`)
-        const pkg = await fs.readJSON(pkgConfig.packageJsonPath)
-        pkg[pkgConfig.field] = pkg[pkgConfig.field] || {}
-        const extend = pkg[pkgConfig.field]
+        debug(`writting to ${packageJsonPath}`)
+        const pkg = await fs.readJSON(packageJsonPath)
+        pkg[field] = pkg[field] || {}
+        const extend = pkg[field]
         extend.optimizeDeps = extend.optimizeDeps || {}
         extend.optimizeDeps.include = Array.from(new Set([
           ...(extend.optimizeDeps.include || []),
           ...newDeps,
         ]))
         extend.optimizeDeps.include.sort()
-        server.watcher.unwatch(pkgConfig.packageJsonPath)
-        await fs.writeJSON(pkgConfig.packageJsonPath, pkg, { spaces: 2 })
-        server.watcher.add(pkgConfig.packageJsonPath)
+        server.watcher.unwatch(packageJsonPath)
+        await fs.writeJSON(packageJsonPath, pkg, { spaces: 2 })
+        server.watcher.add(packageJsonPath)
         debug('written')
       }
 
@@ -83,4 +85,4 @@ function VitePluginPackageConfig({ delay = 1000, filter = () => true }: Options
   }
 }
 
-export default VitePluginPackageConfig
+export default VitePluginOptimizePersist