Skip to content

Commit 62edd80

Browse files
Copilotfengmk2
andauthored
chore: merge master and fix conflicts
Co-authored-by: fengmk2 <156269+fengmk2@users.noreply.github.com>
2 parents 846fcd0 + 2a21534 commit 62edd80

2 files changed

Lines changed: 41 additions & 41 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@
8888
"@types/qs": "^6.15.0",
8989
"@types/selfsigned": "^2.1.0",
9090
"@types/tar-stream": "^2.2.3",
91-
"@typescript/native-preview": "7.0.0-dev.20260329.1",
91+
"@typescript/native-preview": "7.0.0-dev.20260403.1",
9292
"@vitest/coverage-v8": "^4.1.0",
9393
"busboy": "^1.6.0",
9494
"cross-env": "^10.1.0",
95-
"iconv-lite": "^0.6.3",
95+
"iconv-lite": "^0.7.0",
9696
"proxy": "^1.0.2",
9797
"selfsigned": "^3.0.1",
9898
"tar-stream": "^2.2.0",

pnpm-lock.yaml

Lines changed: 39 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)