From 940cd4a12d485b9026d63df2b5cacbb6feab2a20 Mon Sep 17 00:00:00 2001
From: msojocs <jiyecafe@gmail.com>
Date: Sat, 5 Jul 2025 10:03:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.MD        |  3 +++
 bin/wechat-devtools |  2 +-
 tools/fix-core.sh   |  3 ---
 tools/fix-menu.sh   | 22 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 3489193..a1005d9 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,3 +1,6 @@
+# 1.06.2503290-4 / 2025-07-
+- fix: 更新弹窗无法关闭。
+
 # 1.06.2503290-3 / 2025-05-23
 - update: compiler(Linux) v0.1.5
 - fix: worker无法使用 #145
diff --git a/bin/wechat-devtools b/bin/wechat-devtools
index 1d1621b..af5ab40 100755
--- a/bin/wechat-devtools
+++ b/bin/wechat-devtools
@@ -53,7 +53,7 @@ else
 fi;
 
 EXTENSION1="--load-extension=$root_dir/nwjs/package.nw/js/ideplugin"
-EXTENSION2=--load-extension=$APPDATA/WeappPlugin 
+EXTENSION2="--load-extension=$APPDATA/WeappPlugin"
 INSPECTOR1="--custom-devtools-frontend=file://$root_dir/package.nw/js/ideplugin/inspector" # 要加file://指明为本地文件路径
 INSPECTOR2="--custom-devtools-frontend=file://$APPDATA/WeappPlugin/inspector/"
 USERDATADIR="$APPDATA"
diff --git a/tools/fix-core.sh b/tools/fix-core.sh
index d65b382..513f94f 100755
--- a/tools/fix-core.sh
+++ b/tools/fix-core.sh
@@ -128,9 +128,6 @@ fi
 # fix update check
 notice "fix update check"
 sed -i 's#</body><script src=../js/core#</body><script src="../js/unpack/hackrequire/index.js"></script><script src=../js/core#' "$package_dir/html/whatsnew.html"
-find_result=$( grep -lr "whatsnew.html" "$tmp_dir/core.wxvpkg" )
-grep -lr "t=>{R(\"new_version_hint" "$find_result"
-sed -i 's#t=>{R("new_version_hint#t=>{const keys = ["shareData", "windowMap", "isSimple","masterProxyPort", "proxyPort", "masterH2ProxyPort", "h2ProxyPort"];for(let k of keys)t.window.global[k] = global[k];R("new_version_hint#' $find_result
 
 # pack 路径 到 文件
 notice "pack"
diff --git a/tools/fix-menu.sh b/tools/fix-menu.sh
index e0789c9..9ad8643 100755
--- a/tools/fix-menu.sh
+++ b/tools/fix-menu.sh
@@ -120,6 +120,28 @@ cat > "$tmp_file" <<EOF
             item.parentMenu = this;
             return originInsert.call(this, item, index);
         };
+        const originalOpen = nw.Window.open
+        nw.Window.open = function (url, options, callback) {
+            console.warn('[wechat-devtools] nw.Window.open is called, url:', url, 'options:', options);
+            let cb = callback
+            if (options.title === '版本更新提示') {
+                cb = (...args) => {
+                    const keys = [
+                        "shareData",
+                        "windowMap",
+                        "isSimple",
+                        "masterProxyPort",
+                        "proxyPort",
+                        "masterH2ProxyPort",
+                        "h2ProxyPort"
+                    ];
+                    for(let k of keys)
+                        args[0].window.global[k] = global[k];
+                    callback(...args)
+                }
+            }
+            return originalOpen.apply(this, [url, options, cb])
+        }
     } catch (error) {
         process.stderr.write(error.message);
         process.stderr.write(error.stack);