整理

docs/FAQ.MD

@@ -9,9 +9,9 @@
     ```
     如果不想用这个功能，可以自己通过修改`~/.config/wechat_devtools/Default/Editor/User/settings.json`文件关闭。也可以通过`tools/fix-selection-copy`命令来关闭该特性
 
-2. 为什么编辑器的字体是宋体？
+2. 为什么编辑器的字体看起来很异常？
   
-    新版本已经可以在设置中直接手工输入修改编辑器字体了，输入字体名称后界面就会更新
+    Linux嘛，换个字体就行，推荐 [FiraCode](https://github.com/tonsky/FiraCode)
 
 3. 为什么自己构筑或更新后的运行时编辑器和调试器是一片空白？
 
@@ -44,11 +44,3 @@
 10. 如何汇报自己遇到的问题？
   
     如果是界面功能上的奇怪表现，直接描述，并附上操作系统发行版版本，内核版本，桌面系统类型，wine版本，libstdc++版本即可。如果发现运行有问题，可以考虑复制命令行输出，条件允许的情况下，可以打开微信开发者工具菜单中的调试窗口，并截图提交问题
-
-11. 为什么nw.js版本为0.47.0？
-
-    请看nw.js更新日志，0.47.1修复了一个bug，这导致微信开发者工具使用后续nwjs版本作为环境时，打开项目会出现“nw undefined”错误; 微信官方使用的0.49.3版本并未出现过，且截止目前都是.049.3，这疑似微信团队自行编译的版本。
-    猜想：也许可以在0.49.2版本基础上，将这个fix操作回滚，形成0.49.3版本
-    Fix: Window opened with new_instance creates always mixed context
-    https://github.com/nwjs/nw.js/blob/nw60/CHANGELOG.md#0471--07-24-2020
-    似乎出现过：https://github.com/nwjs/nw.js/issues/7609

docs/FIX.MD

@@ -1,5 +0,0 @@
-# 终端修复
-
-  1. 执行`grep -lr "cmd.exe" .`
-  2. 解包`core.wxvpkg`
-  3. `s="darwin"===process.platform,a="win32"===process.platform`

docs/winEnv.json

@@ -1,56 +0,0 @@
-{
-    "ALLUSERSPROFILE": "C:\\ProgramData",
-    "ANDROID_AVD_HOME": "D:\\.android\\avd",
-    "ANT_HOME": "D:\\Tool\\apache-ant-1.10.12",
-    "APPDATA": "C:\\Users\\jiyec\\AppData\\Roaming",
-    "CHROME_CRASHPAD_PIPE_NAME": "\\\\.\\pipe\\crashpad_10032_NITNEKBDVYUIXYIN",
-    "CHROME_RESTART": "NW.js|Whoa! NW.js has crashed. Relaunch now?|LEFT_TO_RIGHT",
-    "CommonProgramFiles": "C:\\Program Files\\Common Files",
-    "CommonProgramFiles(x86)": "C:\\Program Files (x86)\\Common Files",
-    "CommonProgramW6432": "C:\\Program Files\\Common Files",
-    "COMPUTERNAME": "R24H55",
-    "ComSpec": "C:\\WINDOWS\\system32\\cmd.exe",
-    "DriverData": "C:\\Windows\\System32\\Drivers\\DriverData",
-    "FPS_BROWSER_APP_PROFILE_STRING": "Internet Explorer",
-    "FPS_BROWSER_USER_PROFILE_STRING": "Default",
-    "HOMEDRIVE": "C:",
-    "HOMEPATH": "\\Users\\jiyec",
-    "JAVA_HOME": "D:\\Program Files (x86)\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot",
-    "LOCALAPPDATA": "C:\\Users\\jiyec\\AppData\\Local",
-    "LOGONSERVER": "\\\\R24H55",
-    "M2_HOME": "D:\\Tool\\Maven\\apache-maven-3.8.1",
-    "NODE_ENV": "production",
-    "NODE_PATH": "D:\\nodejs\\node_modules",
-    "NUMBER_OF_PROCESSORS": "4",
-    "OneDrive": "C:\\Users\\jiyec\\OneDrive",
-    "OneDriveConsumer": "C:\\Users\\jiyec\\OneDrive",
-    "OS": "Windows_NT",
-    "Path": "C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;D:\\adb;D:\\Program Files\\Python39\\;D:\\Program Files\\Python39\\Scripts\\;D:\\Program Files\\Git\\cmd;D:\\Program Files\\Microsoft VS Code\\bin;D:\\Program Files\\PuTTY\\;D:\\Program Files (x86)\\NetSarang\\Xftp 7\\;D:\\Program Files (x86)\\NetSarang\\Xshell 7\\;D:\\nodejs\\node_modules;D:\\Tool\\Maven\\apache-maven-3.8.1\\bin;C:\\Program Files\\dotnet\\;D:\\Program Files (x86)\\AdoptOpenJDK\\jdk-11.0.11.9-hotspot\\bin;C:\\Program Files (x86)\\dotnet\\;D:\\mingw64\\bin;D:\\Program Files\\nodejs\\node-v14.17.3-x64\\;D:\\Program Files\\Firefox Developer Edition;D:\\Tool\\apache-ant-1.10.12\\bin;D:\\DATA\\大三上\\软件测试\\软件测试实验资料\\实验3\\实验3\\codecover-batch-1.0;C:\\Program Files\\Docker\\Docker\\resources\\bin;C:\\ProgramData\\DockerDesktop\\version-bin;D:\\PlatformTools\\php\\ts-8.1.1-x64;C:\\ProgramData\\ComposerSetup\\bin;D:\\Program Files (x86)\\Tencent\\微信web开发者工具\\dll;C:\\Users\\jiyec\\scoop\\shims;C:\\Users\\jiyec\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\jiyec\\AppData\\Local\\GitHubDesktop\\bin;C:\\Users\\jiyec\\.dotnet\\tools;D:\\Program Files (x86)\\Fiddler;C:\\Users\\jiyec\\AppData\\Roaming\\Composer\\vendor\\bin",
-    "PATHEXT": ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.PYW",
-    "PROCESSOR_ARCHITECTURE": "AMD64",
-    "PROCESSOR_IDENTIFIER": "Intel64 Family 6 Model 69 Stepping 1, GenuineIntel",
-    "PROCESSOR_LEVEL": "6",
-    "PROCESSOR_REVISION": "4501",
-    "ProgramData": "C:\\ProgramData",
-    "ProgramFiles": "C:\\Program Files",
-    "ProgramFiles(x86)": "C:\\Program Files (x86)",
-    "ProgramW6432": "C:\\Program Files",
-    "PSModulePath": "C:\\Program Files\\WindowsPowerShell\\Modules;C:\\WINDOWS\\system32\\WindowsPowerShell\\v1.0\\Modules",
-    "PUBLIC": "C:\\Users\\Public",
-    "SESSIONNAME": "Console",
-    "SSLKEYLOGFILE": "C:\\Temp\\sslkey.log",
-    "SynaProgDir": "Synaptics\\SynTP",
-    "SystemDrive": "C:",
-    "SystemRoot": "C:\\WINDOWS",
-    "TEMP": "C:\\Users\\jiyec\\AppData\\Local\\Temp",
-    "TMP": "C:\\Users\\jiyec\\AppData\\Local\\Temp",
-    "UNPACK_DIR_PATH": "D:\\Program Files (x86)\\Tencent\\微信web开发者工具\\code\\package.nw\\js\\unpack",
-    "USERDOMAIN": "R24H55",
-    "USERDOMAIN_ROAMINGPROFILE": "R24H55",
-    "USERNAME": "jiyec",
-    "USERPROFILE": "C:\\Users\\jiyec",
-    "VBOX_MSI_INSTALL_PATH": "D:\\Program Files\\Oracle\\VirtualBox\\",
-    "windir": "C:\\WINDOWS",
-    "XW_DAEMON_IDX": "1",
-    "SUB_PROCESS": "1"
-}

docs/winEnv.txt

@@ -1,50 +0,0 @@
-C:\Users\jiyec>set
-ALLUSERSPROFILE=C:\ProgramData
-ANDROID_AVD_HOME=D:\.android\avd
-ANT_HOME=D:\Tool\apache-ant-1.10.12
-APPDATA=C:\Users\jiyec\AppData\Roaming
-CommonProgramFiles=C:\Program Files\Common Files
-CommonProgramFiles(x86)=C:\Program Files (x86)\Common Files
-CommonProgramW6432=C:\Program Files\Common Files
-COMPUTERNAME=R24H55
-ComSpec=C:\WINDOWS\system32\cmd.exe
-DriverData=C:\Windows\System32\Drivers\DriverData
-HOMEDRIVE=C:
-HOMEPATH=\Users\jiyec
-JAVA_HOME=D:\Program Files (x86)\AdoptOpenJDK\jdk-11.0.11.9-hotspot
-LOCALAPPDATA=C:\Users\jiyec\AppData\Local
-LOGONSERVER=\\R24H55
-M2_HOME=D:\Tool\Maven\apache-maven-3.8.1
-NODE_PATH=D:\nodejs\node_modules
-NUMBER_OF_PROCESSORS=4
-OneDrive=C:\Users\jiyec\OneDrive
-OneDriveConsumer=C:\Users\jiyec\OneDrive
-OS=Windows_NT
-Path=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;D:\adb;D:\Program Files\Python39\;D:\Program Files\Python39\Scripts\;D:\Program Files\Git\cmd;D:\Program Files\Microsoft VS Code\bin;D:\Program Files\PuTTY\;D:\Program Files (x86)\NetSarang\Xftp 7\;D:\Program Files (x86)\NetSarang\Xshell 7\;D:\nodejs\node_modules;D:\Tool\Maven\apache-maven-3.8.1\bin;C:\Program Files\dotnet\;D:\Program Files (x86)\AdoptOpenJDK\jdk-11.0.11.9-hotspot\bin;C:\Program Files (x86)\dotnet\;D:\mingw64\bin;D:\Program Files\nodejs\node-v14.17.3-x64\;D:\Program Files\Firefox Developer Edition;D:\Tool\apache-ant-1.10.12\bin;D:\DATA\大三上\软件测试\软件测试实验资料\实验3\实验3\codecover-batch-1.0;C:\Program Files\Docker\Docker\resources\bin;C:\ProgramData\DockerDesktop\version-bin;D:\PlatformTools\php\ts-8.1.1-x64;C:\ProgramData\ComposerSetup\bin;D:\Program Files (x86)\Tencent\微信web开发 者工具\dll;C:\Users\jiyec\scoop\shims;C:\Users\jiyec\AppData\Local\Microsoft\WindowsApps;C:\Users\jiyec\AppData\Local\GitHubDesktop\bin;C:\Users\jiyec\.dotnet\tools;D:\Program Files (x86)\Fiddler;C:\Users\jiyec\AppData\Roaming\Composer\vendor\bin
-PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY;.PYW
-PROCESSOR_ARCHITECTURE=AMD64
-PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 69 Stepping 1, GenuineIntel
-PROCESSOR_LEVEL=6
-PROCESSOR_REVISION=4501
-ProgramData=C:\ProgramData
-ProgramFiles=C:\Program Files
-ProgramFiles(x86)=C:\Program Files (x86)
-ProgramW6432=C:\Program Files
-PROMPT=$P$G
-PSModulePath=C:\Program Files\WindowsPowerShell\Modules;C:\WINDOWS\system32\WindowsPowerShell\v1.0\Modules
-PUBLIC=C:\Users\Public
-SSLKEYLOGFILE=C:\Temp\sslkey.log
-SynaProgDir=Synaptics\SynTP
-SystemDrive=C:
-SystemRoot=C:\WINDOWS
-TEMP=C:\Users\jiyec\AppData\Local\Temp
-TMP=C:\Users\jiyec\AppData\Local\Temp
-USERDOMAIN=R24H55
-USERDOMAIN_ROAMINGPROFILE=R24H55
-USERNAME=jiyec
-USERPROFILE=C:\Users\jiyec
-VBOX_MSI_INSTALL_PATH=D:\Program Files\Oracle\VirtualBox\
-windir=C:\WINDOWS
-WSLENV=WT_SESSION::WT_PROFILE_ID
-WT_PROFILE_ID={0caa0dad-35be-5f56-a8ff-afceeeaa6101}
-WT_SESSION=3aa44fe4-ec68-4c87-a7a9-e80eeaaa7be8

readme.md

@@ -22,8 +22,7 @@
 
 # 使用方法
 
-可以在本项目的[发布](https://github.com/msojocs/wechat-devtools-linux/releases)中，寻找已经构筑好了的`.tar.xz`包（发布里也有度盘链接），下载解压后，运行其中的`bin/wechat-devtools`即可运行。
+可以在本项目的[发布](https://github.com/msojocs/wechat-devtools-linux/releases)中，寻找已经构筑好了的`.tar.xz`包，下载解压后，运行其中的`bin/wechat-devtools`即可运行。
-
 
 # 系统要求
 
@@ -125,4 +124,4 @@ git clone https://github.com/msojocs/wechat-devtools-linux.git
 
 # 免责声明
 
-微信开发者工具版权归腾讯公司所有，本项目旨在交流学习之用。如有不当之处，请联系本人，邮箱：dragonation@gmail.com
+微信开发者工具版权归腾讯公司所有，本项目旨在交流学习之用。如有不当之处，请联系本人，邮箱：jiyecafe@gmail.com

test/core-test

@@ -0,0 +1,4 @@
+#!/bin/bash
+node tools/wxvpkg/pack package.nw/core.wxvpkg.ext package.nw/core.wxvpkg
+rm -rf /home/msojocs/.config/wechat_devtools/WeappCache
+bin/wechat-devtools

tools/fix-wcc-wcsc

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+root_dir=$(cd `dirname $0`/.. && pwd -P)
+srcdir=$root_dir
+tmp_dir="$root_dir/tmp"
+package_dir="$root_dir/package.nw"
+
+mkdir "$tmp_dir/node_modules"
+cd $tmp_dir && npm install miniprogram-compiler
+# wcc wcsc
+# 预览编译
+# cd "${package_dir}/js/vendor/" && rm -rf "wcc.exe"
+# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.exe"
+# wcc_md5=$( md5sum wcc.exe|cut -d ' ' -f1 ) && \
+# sed -i  's/wcc.exe": ".*"/wcc.exe": "'"${wcc_md5}"'"/g' "config.json"
+# cd "${package_dir}/js/vendor/" && rm -rf "wcsc.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" && \
+# 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/" \
+&& rm -rf wcc wcsc \
+&& mkdir -p "wcc/bin/linux" "wcsc/bin/linux" \
+&& cp -r "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcc" "wcc/bin/linux/wcc" \
+&& cp -r "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcsc" "wcsc/bin/linux/wcsc" \
+&& cp -r "${srcdir}/compiler/wcc_node"/* "wcc" \
+&& cp -r "${srcdir}/compiler/wcsc_node"/* "wcsc"
+)
+rm -rf "$tmp_dir/node_modules"

tools/rebuild-node-modules

@@ -10,7 +10,6 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 NW_VERSION=$1
-srcdir=$(cd `dirname $0`/.. && pwd -P)
 package_dir="$DIR/../package.nw"
 
 export PATH="$DIR/../node/bin:$PATH"
@@ -73,7 +72,6 @@ rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node"
     trash \
     vscode-oniguruma \
     vscode-ripgrep \
-    miniprogram-compiler \
     nodegit \
     --registry=https://registry.npm.taobao.org \
     --nodegit_binary_host_mirror=https://npm.taobao.org/mirrors/nodegit/v0.27.0/) # reinstall modules
@@ -100,28 +98,6 @@ cp -fr "${package_dir}/node_modules_tmp/node_modules/nodegit" "${package_dir}/no
 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"
 
-# wcc wcsc
-# 预览编译
-# cd "${package_dir}/js/vendor/" && rm -rf "wcc.exe"
-# cp "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.exe"
-# wcc_md5=$( md5sum wcc.exe|cut -d ' ' -f1 ) && \
-# sed -i  's/wcc.exe": ".*"/wcc.exe": "'"${wcc_md5}"'"/g' "config.json"
-# cd "${package_dir}/js/vendor/" && rm -rf "wcsc.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" && \
-# 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/" \
-&& rm -rf wcc wcsc \
-&& mkdir -p "wcc/bin/linux" "wcsc/bin/linux" \
-&& cp -r "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcc" "wcc/bin/linux/wcc" \
-&& cp -r "${package_dir}/node_modules_tmp/node_modules/miniprogram-compiler/bin/linux/wcsc" "wcsc/bin/linux/wcsc" \
-&& cp -r "${srcdir}/compiler/wcc_node"/* "wcc" \
-&& cp -r "${srcdir}/compiler/wcsc_node"/* "wcsc"
-)
-
 rm -rf "${package_dir}/node_modules_tmp"
 
 # 移除旧配置

tools/update-wechat-devtools-node

@@ -302,6 +302,7 @@ const patch_wcc_wcsc = function () {
             path.resolve(__dirname, "../compiler/wine/wcsc"),
             path.resolve(__dirname, "../package.nw/js/vendor/wcsc")
         );
+        execSync(path.resolve(__dirname, "fix-wcc-wcsc"))
 
         resolve();
     });