From 3fa069465540f3a83ec545563de7cd5103a4b744 Mon Sep 17 00:00:00 2001 From: msojocs Date: Sun, 26 Nov 2023 20:00:43 +0800 Subject: [PATCH 1/3] update: nwjs to v0.76.0 --- conf/node_info | 2 +- conf/nwjs.json | 2 +- docs/nwjs.md | 20 ++++++++++++++++++++ test/core-test | 2 ++ test/node-pty/code/index.html | 14 ++++++++++++++ test/test.sh | 9 +++++---- tools/fix-core.sh | 2 +- tools/fix-nw-gyp.sh | 9 +++++++++ tools/rebuild-node-modules.sh | 7 +++++-- tools/setup-wechat-devtools-bash | 19 ++++++++++--------- 10 files changed, 68 insertions(+), 18 deletions(-) create mode 100644 docs/nwjs.md create mode 100755 tools/fix-nw-gyp.sh diff --git a/conf/node_info b/conf/node_info index 6b2c030..cfe7031 100644 --- a/conf/node_info +++ b/conf/node_info @@ -1,6 +1,6 @@ # 此处版本应与nwjs使用的node版本一致 if [ -z $NODE_VERSION ];then - NODE_VERSION=16.4.2 + NODE_VERSION=19.8.1 fi NODE_URL_CN=https://npmmirror.com/mirrors/node/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz NODE_URL_GLOBAL=https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz diff --git a/conf/nwjs.json b/conf/nwjs.json index e0107d6..eea1eed 100644 --- a/conf/nwjs.json +++ b/conf/nwjs.json @@ -1,5 +1,5 @@ { - "version": "0.55.0", + "version": "0.76.0", "url": "https://oss.npmmirror.com/dist/nwjs/v${version}/nwjs-sdk-v${version}-linux-x64.tar.gz", "url-global": "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-x64.tar.gz", "nw2node": { diff --git a/docs/nwjs.md b/docs/nwjs.md new file mode 100644 index 0000000..af033c3 --- /dev/null +++ b/docs/nwjs.md @@ -0,0 +1,20 @@ +| 版本 | 备注 | +|-----|------| +| 0.55.0 | 选择文件夹的cancel事件不会被触发 | +| 0.56.0 | 选择文件夹的cancel事件不会被触发 | +| 0.56.1 | 选择文件夹的cancel事件不会被触发 | +| 0.57.0 | 选择文件夹的cancel事件不会被触发 | +| 0.57.1 | 选择文件夹的cancel事件不会被触发 | +| 0.58.0 | 无法启动，选择文件夹的cancel事件不会被触发 | +| 0.59.0 | 无法启动，选择文件夹的cancel事件不会被触发 | +| 0.59.1 | 无法启动，选择文件夹的cancel事件不会被触发 | +| 0.60.0 | 无法启动，选择文件夹的cancel事件不会被触发 | +| 0.61.0 | 无法启动，选择文件夹的cancel事件不会被触发 | +| 0.62.0 | 无法启动，选择文件夹的cancel事件不会被触发 | +| 0.62.1 | 无法启动，选择文件夹的cancel事件不会被触发 | +| 0.70.0 | 无法启动，选择文件夹的cancel事件不会被触发 | +| 0.75.0 | 无法启动，选择文件夹的cancel事件不会被触发 | +| 0.76.0 | 无法启动 | +| 0.77.0 | 无法启动 | +| 0.80.0 | 无法启动 | +| 0.82.0 | 无法启动 | \ No newline at end of file diff --git a/test/core-test b/test/core-test index 1c7bb6a..f02ca72 100755 --- a/test/core-test +++ b/test/core-test @@ -4,10 +4,12 @@ set -e root_dir=$(cd `dirname $0`/.. && pwd -P) a=$1 if [ "$a" == '1' ];then + # 解压 rm -rf "$root_dir/package.nw/core.wxvpkg.ext" node tools/wxvpkg_unpack.js "$root_dir/package.nw/core.wxvpkg" "$root_dir/package.nw/core.wxvpkg.ext" mv "$root_dir/package.nw/core.wxvpkg" "$root_dir/package.nw/core.wxvpkg.orgi" else + # 打包测试 node tools/wxvpkg_pack.js package.nw/core.wxvpkg.ext package.nw/core.wxvpkg rm -rf ~/.config/wechat-devtools/WeappCache rm -rf ~/.config/wechat-devtools/WeappVendor diff --git a/test/node-pty/code/index.html b/test/node-pty/code/index.html index 46d8d37..562d3ba 100644 --- a/test/node-pty/code/index.html +++ b/test/node-pty/code/index.html @@ -4,8 +4,22 @@ Hello World! + +

Hello World!

We are using node.js 9999 +