diff --git a/bin/wechat-devtools b/bin/wechat-devtools index 3c635f9..6fe8d4f 100755 --- a/bin/wechat-devtools +++ b/bin/wechat-devtools @@ -9,11 +9,11 @@ export PATH="$root_dir/wine:$root_dir/node/bin:$root_dir/nwjs:$PATH" # LANG=zh_CN.UTF-8 exec "$DIR"/../nwjs/nw --load-extension="$DIR"/../nwjs/package.nw/js/ideplugin "$@" EXTENSION1="--load-extension=$root_dir/nwjs/package.nw/js/ideplugin" -EXTENSION2="--load-extension=$( echo ~ )/.config/wechat_devtools/WeappPlugin" # 调试器AppData与Storage可用 +EXTENSION2="--load-extension=$( echo ~ )/.config/wechat_devtools/WeappPlugin" INSPECTOR1="--custom-devtools-frontend=file://$root_dir/package.nw/js/ideplugin/inspector" # 要加file://指明为本地文件路径 INSPECTOR2="--custom-devtools-frontend=file://$( echo ~ )/.config/wechat_devtools/WeappPlugin/inspector/" USERDATADIR="$( echo ~ )/.config/wechat_devtools" # "$@"参数 LANG=zh_CN.UTF-8 -exec "$root_dir/nwjs/nw" $root_dir/package.nw $EXTENSION2 $INSPECTOR2 "$@" \ No newline at end of file +exec "$root_dir/nwjs/nw" $root_dir/package.nw $EXTENSION2 $INSPECTOR1 "$@" \ No newline at end of file diff --git a/test/wcc/WCC.MD b/test/wcc/WCC.MD index 2b84c05..a8984ac 100644 --- a/test/wcc/WCC.MD +++ b/test/wcc/WCC.MD @@ -4,7 +4,26 @@ node_modules --- options.json 把options.json转换为命令行参数 -execute ---- +## Windows +``` +Wechat WXML Compiler, version v0.5vv_20200413_syb_scopedata +Usage: Z:\mnt\disk1\GitHub\wechat-devtools\cache\wechat_devtools_1.05.2201240_x64\code\package.nw\js\vendo +r\wcc.exe [-d] [-o OUTPUT] [-xc XComponentDefine] [-om XComponentDefine] [-cb [callback.js...]] [-llcommon +] [-llw/-lla XCPath] + Options: + -d: output code for debug + -o: output destination (default stdout) + -xc: output simplified code for custom component + -cc: output compelete code for custom component + -s: read from stdin + -ds: insert debug wxs info + -cb: add life cycle callback + -llw: compile in lazy load mode (webiew) + -lla: compile in lazy load mode (app service) + args XCPath: custom component paths connected by comma or --split (./page/index,./comp/comp) +``` + +## Linux ``` Wechat WXML Compiler, version v0.5vv_20200413_syb_scopedata Usage: ./wcc [-d] [-o OUTPUT] [-xc XComponentDefine] [-om XComponentDefine] [-cb [callback.js...]] [-ll XCPath] diff --git a/test/wcc/test.sh b/test/wcc/test.sh index 2782a67..af0b876 100644 --- a/test/wcc/test.sh +++ b/test/wcc/test.sh @@ -1,9 +1,18 @@ #!/bin/bash -cd /home/msojocs/Documents/we1 && \ -/mnt/disk1/GitHub/wechat-devtools/package.nw/node_modules/wcc/bin/linux/wcc -d --split ">_<9772" -cc "2>_<9772./pages/index/index.wxml>_<97720>_<9772./pages/logs/logs.wxml>_<97720" ./pages/index/index.wxml ./pages/logs/logs.wxml -gn $gwx +# cd /home/msojocs/Documents/we1 && \ +# /mnt/disk1/GitHub/wechat-devtools/package.nw/node_modules/wcc/bin/linux/wcc -d --split ">_<9772" -cc "2>_<9772./pages/index/index.wxml>_<97720>_<9772./pages/logs/logs.wxml>_<97720" ./pages/index/index.wxml ./pages/logs/logs.wxml -gn $gwx # | grep Z # cd /home/msojocs/Documents/we1 && \ # wine /mnt/disk1/GitHub/wechat-devtools/cache/wechat_devtools_1.05.2201240_x64/code/package.nw/js/vendor/wcc.exe \ # " -d --split >_<9772 -xc 2>_<9772./pages/index/index.wxml>_<97720>_<9772./pages/logs/logs.wxml>_<97720" \ -# " ./pages/logs/logs.wxml ./pages/index/index.wxml -gn $gwx" \ No newline at end of file +# " ./pages/logs/logs.wxml ./pages/index/index.wxml -gn $gwx" + + +cd /home/msojocs/Documents/we1 && \ +/mnt/disk1/GitHub/wechat-devtools/node_modules/miniprogram-compiler/bin/linux/wcc \ + "-d" "--split" ">_<1266" "-xc" "2>_<1266./pages/index/index.wxml>_<12660>_<1266./pages/logs/logs.wxml>_<12660" "-ll" "pages/index/index" "pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "$gwx" + +cd /home/msojocs/Documents/we1 && \ +wine /mnt/disk1/GitHub/wechat-devtools/node_modules/miniprogram-compiler/bin/windows/wcc.exe \ + "-d" "--split" ">_<1266" "-xc" "2>_<1266./pages/index/index.wxml>_<12660>_<1266./pages/logs/logs.wxml>_<12660" "-lla" "./pages/index/index>_<1266./pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "$gwx" \ No newline at end of file diff --git a/tools/rebuild-node-modules b/tools/rebuild-node-modules index dac76ce..3003438 100755 --- a/tools/rebuild-node-modules +++ b/tools/rebuild-node-modules @@ -102,14 +102,14 @@ cp -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep/bin/rg" "${p # wcc wcsc # 预览编译 -cd "${package_dir}/js/vendor/" && rm -rf "wcc.exe" "wcsc.exe" -cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.exe" -cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcsc" "${package_dir}/js/vendor/wcsc.exe" -cd "${package_dir}/js/vendor" && \ -wcc_md5=$( md5sum wcc.exe|cut -d ' ' -f1 ) && \ -sed -i 's/wcc.exe": ".*"/wcc.exe": "'"${wcc_md5}"'"/g' "config.json" && \ -wcsc_md5=$( md5sum wcsc.exe|cut -d ' ' -f1 ) && \ -sed -i 's/wcsc.exe": ".*"/wcsc.exe": "'"${wcsc_md5}"'"/g' "config.json" +# cd "${package_dir}/js/vendor/" && rm -rf "wcc.exe" "wcsc.exe" +# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.exe" +# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcsc" "${package_dir}/js/vendor/wcsc.exe" +# cd "${package_dir}/js/vendor" && \ +# wcc_md5=$( md5sum wcc.exe|cut -d ' ' -f1 ) && \ +# sed -i 's/wcc.exe": ".*"/wcc.exe": "'"${wcc_md5}"'"/g' "config.json" && \ +# wcsc_md5=$( md5sum wcsc.exe|cut -d ' ' -f1 ) && \ +# sed -i 's/wcsc.exe": ".*"/wcsc.exe": "'"${wcsc_md5}"'"/g' "config.json" # 可视化编译 (cd "${package_dir}/node_modules/" \