From 031b2856a9eb123a4fd98913976cab017908072c Mon Sep 17 00:00:00 2001
From: zll600 <71714656+zll600@users.noreply.github.com>
Date: Wed, 21 Jan 2026 11:49:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#74354=20[docke?=
 =?UTF-8?q?rode]=20Improve=20ContainerStats=20type=20by=20@zll600?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 types/dockerode/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index ab089331b7d198..8afbfa2c0146da 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -828,6 +828,9 @@ declare namespace Dockerode {
     }
 
     interface ContainerStats {
+        id?: string;
+        name?: string;
+        os_type?: string;
         read: string;
         preread: string;
         pids_stats?: PidsStats;

From e12a5af662cb06a223a096290152de5bbf2392a0 Mon Sep 17 00:00:00 2001
From: Ke Qingrong <keqingrong@outlook.com>
Date: Wed, 21 Jan 2026 12:49:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#74148=20[wx-js?=
 =?UTF-8?q?-sdk-browser]=20fix=20type=20definition=20in=20checkJsApi=20by?=
 =?UTF-8?q?=20@keqingrong?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 types/wx-js-sdk-browser/index.d.ts                 | 2 +-
 types/wx-js-sdk-browser/wx-js-sdk-browser-tests.ts | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/types/wx-js-sdk-browser/index.d.ts b/types/wx-js-sdk-browser/index.d.ts
index 62cd3474b90018..a947b5b50393f5 100644
--- a/types/wx-js-sdk-browser/index.d.ts
+++ b/types/wx-js-sdk-browser/index.d.ts
@@ -105,7 +105,7 @@ declare namespace wx {
          * 以键值对的形式返回，可用的 api 值 true，不可用为 false
          * 如：{"checkResult":{"chooseImage":true},"errMsg":"checkJsApi:ok"}
          */
-        success(res: { checkResult: { [methodName: string]: boolean }; errMsg: { msg: string } }): void;
+        success(res: { checkResult: { [methodName: string]: boolean }; errMsg: string }): void;
     }
 
     /**
diff --git a/types/wx-js-sdk-browser/wx-js-sdk-browser-tests.ts b/types/wx-js-sdk-browser/wx-js-sdk-browser-tests.ts
index 39035d1e6da64a..e3969173f5a8b4 100644
--- a/types/wx-js-sdk-browser/wx-js-sdk-browser-tests.ts
+++ b/types/wx-js-sdk-browser/wx-js-sdk-browser-tests.ts
@@ -18,9 +18,7 @@ wx.checkJsApi({
     jsApiList: [""],
     success: res => {
         res.checkResult;
-        if (res.errMsg) {
-            res.errMsg.msg;
-        }
+        res.errMsg;
     },
     complete: () => {
     },