From 42c222b34d38e0103d464ec4174b18377825c755 Mon Sep 17 00:00:00 2001
From: msojocs <jiyecafe@gmail.com>
Date: Sun, 10 Apr 2022 09:43:35 +0800
Subject: [PATCH] =?UTF-8?q?update:=20nwjs=200.55.0=20=E7=94=A8=E4=BB=A5?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98=E6=97=B6?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=E9=87=8D=E6=96=B0=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20#35=20fix:=20=E5=A4=84=E7=90=86vs?=
 =?UTF-8?q?code-ripgrep=E5=AE=89=E8=A3=85=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/node_info                |  2 +-
 conf/nwjs.json                |  2 +-
 test/fix-spdlog               | 11 +++++++++++
 tools/rebuild-node-modules.sh |  4 +++-
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 test/fix-spdlog

diff --git a/conf/node_info b/conf/node_info
index 7abe10d..6b2c030 100644
--- a/conf/node_info
+++ b/conf/node_info
@@ -1,6 +1,6 @@
 # 此处版本应与nwjs使用的node版本一致
 if [ -z $NODE_VERSION ];then
-  NODE_VERSION=16.1.0
+  NODE_VERSION=16.4.2
 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 e3c8dce..e0107d6 100644
--- a/conf/nwjs.json
+++ b/conf/nwjs.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.53.1",
+    "version": "0.55.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/test/fix-spdlog b/test/fix-spdlog
new file mode 100644
index 0000000..7f48fa6
--- /dev/null
+++ b/test/fix-spdlog
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+root_dir=$(cd `dirname $0`/.. && pwd -P)
+export PATH="$root_dir/node/bin:$PATH"
+
+cd "$root_dir/tmp"
+mkdir -p node_test/node_modules
+cd node_test
+npm install spdlog --save
+rm -rf "$root_dir/package.nw/node_modules/spdlog"
+cp -rf "$root_dir/tmp/node_test/node_modules/spdlog" "$root_dir/package.nw/node_modules"
diff --git a/tools/rebuild-node-modules.sh b/tools/rebuild-node-modules.sh
index 952c3b5..99c9f3b 100755
--- a/tools/rebuild-node-modules.sh
+++ b/tools/rebuild-node-modules.sh
@@ -104,7 +104,9 @@ cp -fr "${package_dir}/node_modules_tmp/node_modules/nodegit" "${package_dir}/no
 (cd "${package_dir}/node_modules_tmp/node_modules" && find -name ".deps" | xargs -I{} rm -rf {} && find -name "obj.target" | xargs -I{} rm -rf {} && find -name "*.a" -delete && find -name "*.lib" -delete && find -name "*.mk" -delete)
 (cd "${package_dir}/node_modules_tmp/node_modules" && find -name "*.node" | xargs -I{} \cp -rf {} ${package_dir}/node_modules/{})
 
-cd "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep" && npm run postinstall
+cd "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep" && \
+sed -i 's/response.headers.location,/response.headers.location.replace("objects.githubusercontent.com", "objects.jiyecafe.workers.dev"),/' lib/download.js && \
+npm run postinstall
 mkdir -p "${package_dir}/node_modules/vscode-ripgrep/bin"
 \cp -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep/bin/rg" "${package_dir}/node_modules/vscode-ripgrep/bin/rg"