diff --git a/bin/wechat-devtools b/bin/wechat-devtools index 1d1621b..6f76cd9 100755 --- a/bin/wechat-devtools +++ b/bin/wechat-devtools @@ -60,4 +60,4 @@ USERDATADIR="$APPDATA" # "$@"参数 LANG=zh_CN.UTF-8 -exec "$root_dir/nwjs/nw" $root_dir/package.nw $EXTENSION2 $INSPECTOR1 "$@" \ No newline at end of file +exec "$root_dir/nwjs/nw" $root_dir/package.nw $INSPECTOR1 "$@" \ No newline at end of file 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/docker-compose.yml b/docker-compose.yml index f4b31d5..4938f13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,13 @@ version: "3" services: wechat_devtools: - image: jiyecafe/wechat-devtools-build:v3 - # build: - # context: ./docker - # dockerfile: Dockerfile + # image: jiyecafe/wechat-devtools-build:v3 + build: + context: ./docker + dockerfile: Dockerfile volumes: - .:/workspace - - ./cache/.npm:/root/.npm + # - ./cache/.npm:/root/.npm environment: - ACTION_MODE=${ACTION_MODE:-false} # - https_proxy=${https_proxy:-} diff --git a/docker/Dockerfile b/docker/Dockerfile index d594a5e..06b8f65 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,31 +1,23 @@ -FROM ubuntu:16.04 +FROM ubuntu:20.04 WORKDIR /workspace - +ARG DEBIAN_FRONTEND=noninteractive RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ sed -i 's/security.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ - mkdir -p /build_temp/python36 /build_temp/nodejs && \ + sed -i 's/security.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ + mkdir -p /build_temp/nodejs && \ apt update && \ apt install -y binutils software-properties-common gcc g++ \ - gconf2 libxkbfile-dev p7zip-full make libssh2-1-dev libkrb5-dev wget curl \ + gconf2 libxkbfile-dev p7zip-full make libssh2-1-dev libkrb5-dev wget curl python python3 \ openssl pkg-config build-essential && \ - cd /build_temp/python36 && \ - apt-get install -y aptitude &&\ - aptitude -y install gcc make zlib1g-dev libffi-dev libssl-dev &&\ - mkdir -p test && cd test &&\ - wget http://npmmirror.com/mirrors/python/3.6.5/Python-3.6.5.tgz &&\ - tar -xvf Python-3.6.5.tgz &&\ - chmod -R +x Python-3.6.5 &&\ - cd Python-3.6.5/ &&\ - ./configure &&\ - aptitude -y install libffi-dev libssl-dev &&\ - make && make install &&\ cd /build_temp/nodejs &&\ - wget https://deb.nodesource.com/setup_16.x &&\ - chmod +x setup_16.x &&\ - ./setup_16.x &&\ - apt-get install -y nodejs &&\ + apt-get update && apt-get install -y ca-certificates curl gnupg + +RUN mkdir -p /etc/apt/keyrings && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg &&\ + NODE_MAJOR=16 &&\ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\ + apt-get update && apt-get install nodejs -y &&\ rm -rf /build_temp && \ apt install -y gosu && \ gosu nobody true && \ 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 +