|
|
@@ -1,15 +1,8 @@ |
|
|
|
Arguments: |
|
|
|
<<<<<<< HEAD |
|
|
|
B:\nodejs\node.exe B:\nodejs\node_modules\yarn\bin\yarn.js add mic-recorder-to-mp3 |
|
|
|
C:\Program Files\nodejs\node.exe C:\Users\Holy-Knight-IX\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js |
|
|
|
|
|
|
|
PATH: |
|
|
|
C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;B:\nvm;B:\nodejs;B:\Git\Git\cmd;C:\Users\12574\AppData\Local\Microsoft\WindowsApps;B:\Microsoft VS Code\bin;B:\nvm;B:\nodejs |
|
|
|
======= |
|
|
|
C:\Program Files\nodejs\node.exe C:\Users\Holy-Knight-IX\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js add -D --prefer-offline @iconify-json/ph |
|
|
|
|
|
|
|
PATH: |
|
|
|
C:\Users\HOLY-K~1\AppData\Local\Temp\yarn--1685070845077-0.20825812772556618;C:\Users\Holy-Knight-IX\Desktop\Working Space\7.SuiMang\web_pc\node_modules\.bin;C:\Users\Holy-Knight-IX\AppData\Local\Yarn\Data\link\node_modules\.bin;C:\Users\Holy-Knight-IX\AppData\Local\Yarn\bin;C:\Program Files\libexec\lib\node_modules\npm\bin\node-gyp-bin;C:\Program Files\lib\node_modules\npm\bin\node-gyp-bin;C:\Program Files\nodejs\node_modules\npm\bin\node-gyp-bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\nodejs-10.24.1;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;E:\微信web开发者工具\dll;C:\Program Files\nodejs\nodejs-10.24.1\;C:\Program Files (x86)\Tencent\微信web开发者工具\dll;C:\Users\Holy-Knight-IX\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Users\Holy-Knight-IX\AppData\Local\Microsoft\WindowsApps;C:\Users\Holy-Knight-IX\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\Holy-Knight-IX\AppData\Roaming\npm;C:\Users\Holy-Knight-IX\AppData\Roaming\nvm;C:\Program Files\nodejs |
|
|
|
>>>>>>> 1130ab9f8d017215cbc06fc6125aa3933cb4eb82 |
|
|
|
C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\nodejs-10.24.1;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;E:\微信web开发者工具\dll;C:\Program Files\nodejs\nodejs-10.24.1\;C:\Program Files (x86)\Tencent\微信web开发者工具\dll;C:\Users\Holy-Knight-IX\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Users\Holy-Knight-IX\AppData\Local\Microsoft\WindowsApps;C:\Users\Holy-Knight-IX\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\Holy-Knight-IX\AppData\Roaming\npm;C:\Users\Holy-Knight-IX\AppData\Roaming\nvm;C:\Program Files\nodejs |
|
|
|
|
|
|
|
Yarn version: |
|
|
|
1.22.19 |
|
|
@@ -21,11 +14,7 @@ Platform: |
|
|
|
win32 x64 |
|
|
|
|
|
|
|
Trace: |
|
|
|
<<<<<<< HEAD |
|
|
|
Error: EPERM: operation not permitted, unlink 'B:\0work\0fm\Web-pc\node_modules\@esbuild\win32-x64\esbuild.exe' |
|
|
|
======= |
|
|
|
Error: EPERM: operation not permitted, unlink 'C:\Users\Holy-Knight-IX\Desktop\Working Space\7.SuiMang\web_pc\node_modules\@esbuild\win32-x64\esbuild.exe' |
|
|
|
>>>>>>> 1130ab9f8d017215cbc06fc6125aa3933cb4eb82 |
|
|
|
|
|
|
|
npm manifest: |
|
|
|
{ |
|
|
@@ -50,6 +39,7 @@ npm manifest: |
|
|
|
"axios": "^1.3.4", |
|
|
|
"echarts": "^5.2.2", |
|
|
|
"element-plus": "^2.3.1", |
|
|
|
"js-audio-recorder": "^1.0.7", |
|
|
|
"nprogress": "^0.2.0", |
|
|
|
"path-browserify": "^1.0.1", |
|
|
|
"path-to-regexp": "^6.2.0", |
|
|
@@ -3831,6 +3821,11 @@ Lockfile: |
|
|
|
resolved "https://registry.npmmirror.com/jiti/-/jiti-1.18.2.tgz" |
|
|
|
integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg== |
|
|
|
|
|
|
|
js-audio-recorder@^1.0.7: |
|
|
|
version "1.0.7" |
|
|
|
resolved "https://registry.yarnpkg.com/js-audio-recorder/-/js-audio-recorder-1.0.7.tgz#01501cb9eb143d57994b42bd5ae97974fda18908" |
|
|
|
integrity sha512-JiDODCElVHGrFyjGYwYyNi7zCbKk9va9C77w+zCPMmi4C6ix7zsX2h3ddHugmo4dOTOTCym9++b/wVW9nC0IaA== |
|
|
|
|
|
|
|
js-base64@^2.1.9: |
|
|
|
version "2.6.4" |
|
|
|
resolved "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz" |
|
|
|