fix(cqhttp, puppeteer): typescript 4.1 compatibility

koishijs · Nov 23, 2020 · 1d77469 · 1d77469
1 parent be953f0
commit 1d77469
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,4 @@
 atri
 dist
 
-/packages/*/*.js
-/packages/*/*.d.ts
+/build/*.js
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,7 @@
 dist
 temp
 
-/packages/*/*.js
-/packages/*/*.d.ts
+/build/*.js
 
 /addons
 /atri

diff --git a/packages/adapter-cqhttp/src/channel.ts b/packages/adapter-cqhttp/src/channel.ts
@@ -23,7 +23,7 @@ export default class Channel {
 
   constructor(private server: Server) {}
 
-  connect = (resolve: () => void, reject: (error: Error) => void, bot: Bot, socket: WebSocket) => {
+  connect = (resolve: (value: void) => void, reject: (error: Error) => void, bot: Bot, socket: WebSocket) => {
     bot.ready = true
     bot.socket = socket
 

diff --git a/packages/adapter-cqhttp/src/ws.ts b/packages/adapter-cqhttp/src/ws.ts
@@ -24,7 +24,7 @@ export default class WsClient extends Server {
     const { token, server } = bot
     if (!server) return
     const Socket: typeof WebSocket = require('ws')
-    const connect = (resolve: () => void, reject: (reason: Error) => void) => {
+    const connect = (resolve: (value: void) => void, reject: (reason: Error) => void) => {
       logger.debug('websocket client opening')
       const headers: Record<string, string> = {}
       const { retryInterval, retryTimes } = this.app.options

diff --git a/packages/plugin-eval/src/internal.ts b/packages/plugin-eval/src/internal.ts
@@ -531,8 +531,10 @@ Helper.object = function (this: Helper, object, traps, deepTraps, mock) {
       }
       return success
     },
+    // @ts-ignore
     enumerate: () => {
       try {
+        // @ts-ignore
         return this.value(this.remote.Reflect.enumerate(object))
       } catch (e) {
         throw this.value(e)

diff --git a/packages/plugin-puppeteer/src/index.ts b/packages/plugin-puppeteer/src/index.ts
@@ -91,7 +91,7 @@ export function apply(ctx: Context, config: Config = {}) {
           }
         }
 
-        await new Promise((resolve, reject) => {
+        await new Promise<void>((resolve, reject) => {
           logger.debug(`navigating to ${url}`)
           const _resolve = () => {
             clearTimeout(timer)