update: 更新模块版本的编译器

新增懒加载template解析支持
新增懒加载cut参数支持

3 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 539a3d4413b1..0494877ea380 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wechat-devtools
 	pkgdesc = WeChat Devtools For Linux.
 	pkgver = 1.05.2204180
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 2
 	url = https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html
 	arch = x86_64
@@ -19,7 +19,7 @@ pkgbase = wechat-devtools
 	source = nwjs-v0.55.0.tar.gz::https://npm.taobao.org/mirrors/nwjs/v0.55.0/nwjs-sdk-v0.55.0-linux-x64.tar.gz
 	source = wechat_devtools_1.05.2204180_x64.exe::https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1052204180&version_type=1
 	source = node-v16.4.2.tar.gz::https://npm.taobao.org/mirrors/node/v16.4.2/node-v16.4.2-linux-x64.tar.gz
-	source = compiler.tar.gz::https://github.rc1844.workers.dev/msojocs/wechat-web-devtools-linux/releases/download/v1.05.2204180-1/compiler.tar.gz
+	source = compiler.tar.gz::https://github.rc1844.workers.dev/msojocs/wechat-web-devtools-linux/releases/download/v1.05.2204180-2/compiler.tar.gz
 	source = wechat-devtools.desktop
 	source = logo.svg
 	source = wechat-devtools
@@ -35,7 +35,7 @@ pkgbase = wechat-devtools
 	md5sums = ac7680788544c457daee11aaf69798fe
 	md5sums = 0cd12ab05211bb88c56aa38f8de76a1a
 	md5sums = 4d14589085ebbf79ce504dc27330d33b
-	md5sums = e5e51eb3adef2bc80adc1b2396d0df35
+	md5sums = fb119e9fb5d95dde6365ce2cad9e8eec
 	md5sums = 4d3f5273be80a74741c841fcfa4185d3
 	md5sums = 0f4353664123320280ea4d6bb295dce2
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6dcf4437cd9f..8468410056ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _node_version="16.4.2"
 
 pkgname=wechat-devtools
 pkgver="${_wechat_devtools_ver}"  # 主版本号
-pkgrel=1   # 修订版本号release
+pkgrel=2   # 修订版本号release
 epoch=2    # 大版本迭代强制更新（维护者变更，尽量不用）
 pkgdesc="WeChat Devtools For Linux. "
 arch=("x86_64")
@@ -32,7 +32,7 @@ makedepends=('p7zip' 'python2' 'openssl' 'gcc' 'make' 'libssh2' 'krb5')
 source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs_ver}/nwjs-sdk-v${_nwjs_ver}-linux-x64.tar.gz"
         "${_wechat_devtools_exe}::${_wechat_devtools_url}"
         "node-v${_node_version}.tar.gz::https://npm.taobao.org/mirrors/node/v${_node_version}/node-v${_node_version}-linux-x64.tar.gz"
-        "compiler.tar.gz::https://github.rc1844.workers.dev/msojocs/wechat-web-devtools-linux/releases/download/v1.05.2204180-1/compiler.tar.gz"
+        "compiler.tar.gz::https://github.rc1844.workers.dev/msojocs/wechat-web-devtools-linux/releases/download/v1.05.2204180-2/compiler.tar.gz"
         "wechat-devtools.desktop"
         "logo.svg"
         "wechat-devtools"
@@ -48,7 +48,7 @@ source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs
 md5sums=(ac7680788544c457daee11aaf69798fe   # nwjs
          "${_wechat_devtools_md5}"
          4d14589085ebbf79ce504dc27330d33b   # nodejs
-         e5e51eb3adef2bc80adc1b2396d0df35   # compiler
+         fb119e9fb5d95dde6365ce2cad9e8eec   # compiler
          4d3f5273be80a74741c841fcfa4185d3   # desktop
          0f4353664123320280ea4d6bb295dce2   # svg
          "SKIP"
diff --git a/fix-core.sh b/fix-core.sh
index dde996b986ff..1209d7643fa5 100755
--- a/fix-core.sh
+++ b/fix-core.sh
@@ -52,9 +52,16 @@ if [[ $NO_WINE == 'true' ]];then
     sed -i "s#{wcc:!0,wcsc:!0}#$new_str#g" "$find_result"
     new_str='"linux"===process.platform'
     sed -i "s#\"darwin\"===process.platform#$new_str#g" "$find_result"
-    # TODO: 看能不能动态识别函数名j,因为不同版本会发生变化
-    sed -i 's#return j("wcc")#return j("wcc.bin"),j("wcc")#g' "$find_result"
-    sed -i 's#return j("wcsc")#return j("wcsc.bin"),j("wcsc")#g' "$find_result"
+    
+    return_exp_wcc=$(cat $find_result | grep -P 'return [a-z]+\("wcc"\)' -o)  # return ?("wcc")
+    return_exp_wcc_replace="${return_exp_wcc//wcc/wcc.bin}" # return ?("wcc.bin")
+    return_exp_wcc_replace="${return_exp_wcc//return /${return_exp_wcc_replace},}" # return ?("wcc.bin")
+
+    return_exp_wcsc=$(cat $find_result | grep -P 'return [a-z]+\("wcsc"\)' -o)  # return ?("wcsc")
+    return_exp_wcsc_replace="${return_exp_wcc_replace//wcc/wcsc}"
+
+    sed -i "s#$return_exp_wcc#$return_exp_wcc_replace#g" "$find_result"
+    sed -i "s#$return_exp_wcsc#$return_exp_wcsc_replace#g" "$find_result"
   fi
   # 处理报错时控制台显示的环境
   find_result=$( grep -lr '(env:' "$tmp_dir/core.wxvpkg" )