Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6ac8276

Browse files
committed
switch to fork
1 parent5c12571 commit6ac8276

File tree

3 files changed

+26
-85
lines changed

3 files changed

+26
-85
lines changed

‎package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,10 @@
310310
"axios":"1.8.4",
311311
"date-fns":"^3.6.0",
312312
"eventsource":"^3.0.6",
313-
"find-process":"^1.4.7",
313+
"find-process":"https://github.com/coder/find-process#fix/sequoia-compat",
314314
"jsonc-parser":"^3.3.1",
315315
"memfs":"^4.9.3",
316316
"node-forge":"^1.3.1",
317-
"pid-port":"^1.0.2",
318317
"pretty-bytes":"^6.1.1",
319318
"proxy-agent":"^6.4.0",
320319
"semver":"^7.6.2",

‎src/remote.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import{isAxiosError}from"axios"
22
import{Api}from"coder/site/src/api/api"
33
import{Workspace}from"coder/site/src/api/typesGenerated"
4+
importfindfrom"find-process"
45
import*asfsfrom"fs/promises"
56
import*asjsoncfrom"jsonc-parser"
67
import*asosfrom"os"
78
import*aspathfrom"path"
8-
import{portToPid}from"pid-port"
99
importprettyBytesfrom"pretty-bytes"
1010
import*assemverfrom"semver"
1111
import*asvscodefrom"vscode"
@@ -794,8 +794,12 @@ export class Remote {
794794
if(!port){
795795
return
796796
}
797-
constpid=awaitportToPid(port)
798-
returnpid
797+
constprocesses=awaitfind("port",port)
798+
if(processes.length<1){
799+
return
800+
}
801+
constprocess=processes[0]
802+
returnprocess.pid
799803
}
800804
conststart=Date.now()
801805
constloop=async():Promise<number|undefined>=>{

‎yarn.lock

Lines changed: 18 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,7 +1580,7 @@ chalk@^2.1.0, chalk@^2.4.2:
15801580
escape-string-regexp "^1.0.5"
15811581
supports-color "^5.3.0"
15821582

1583-
chalk@^4.0.0, chalk@^4.1.0:
1583+
chalk@^4.0.0, chalk@^4.1.0, chalk@~4.1.2:
15841584
version "4.1.2"
15851585
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
15861586
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -1762,16 +1762,16 @@ commander@^10.0.1:
17621762
resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
17631763
integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
17641764

1765+
commander@^12.1.0:
1766+
version "12.1.0"
1767+
resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
1768+
integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
1769+
17651770
commander@^2.20.0:
17661771
version "2.20.3"
17671772
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
17681773
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
17691774

1770-
commander@^5.1.0:
1771-
version "5.1.0"
1772-
resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
1773-
integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
1774-
17751775
commander@^6.2.1:
17761776
version "6.2.1"
17771777
resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
@@ -2657,21 +2657,6 @@ eventsource@*, eventsource@^3.0.6:
26572657
dependencies:
26582658
eventsource-parser "^3.0.1"
26592659

2660-
execa@^8.0.1:
2661-
version "8.0.1"
2662-
resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
2663-
integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
2664-
dependencies:
2665-
cross-spawn "^7.0.3"
2666-
get-stream "^8.0.1"
2667-
human-signals "^5.0.0"
2668-
is-stream "^3.0.0"
2669-
merge-stream "^2.0.0"
2670-
npm-run-path "^5.1.0"
2671-
onetime "^6.0.0"
2672-
signal-exit "^4.1.0"
2673-
strip-final-newline "^3.0.0"
2674-
26752660
expand-template@^2.0.3:
26762661
version "2.0.3"
26772662
resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
@@ -2790,14 +2775,13 @@ find-cache-dir@^3.2.0:
27902775
make-dir "^3.0.2"
27912776
pkg-dir "^4.1.0"
27922777

2793-
find-process@^1.4.7:
2794-
version "1.4.7"
2795-
resolved "https://registry.yarnpkg.com/find-process/-/find-process-1.4.7.tgz#8c76962259216c381ef1099371465b5b439ea121"
2796-
integrity sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==
2778+
"find-process@https://github.com/coder/find-process#fix/sequoia-compat":
2779+
version "1.4.10"
2780+
resolved "https://github.com/coder/find-process#843bcd6dde534be0722ecd0d81b288f7d9f19667"
27972781
dependencies:
2798-
chalk "^4.0.0"
2799-
commander "^5.1.0"
2800-
debug "^4.1.1"
2782+
chalk "~4.1.2"
2783+
commander "^12.1.0"
2784+
loglevel "^1.9.2"
28012785

28022786
find-up@^4.0.0, find-up@^4.1.0:
28032787
version "4.1.0"
@@ -3024,11 +3008,6 @@ get-package-type@^0.1.0:
30243008
resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
30253009
integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
30263010

3027-
get-stream@^8.0.1:
3028-
version "8.0.1"
3029-
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
3030-
integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
3031-
30323011
get-symbol-description@^1.0.0:
30333012
version "1.0.0"
30343013
resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -3301,11 +3280,6 @@ https-proxy-agent@^7.0.2, https-proxy-agent@^7.0.3, https-proxy-agent@^7.0.5:
33013280
agent-base "^7.1.2"
33023281
debug "4"
33033282

3304-
human-signals@^5.0.0:
3305-
version "5.0.0"
3306-
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
3307-
integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
3308-
33093283
hyperdyperid@^1.2.0:
33103284
version "1.2.0"
33113285
resolved "https://registry.yarnpkg.com/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b"
@@ -3630,11 +3604,6 @@ is-stream@^2.0.0:
36303604
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
36313605
integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
36323606

3633-
is-stream@^3.0.0:
3634-
version "3.0.0"
3635-
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
3636-
integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
3637-
36383607
is-string@^1.0.5, is-string@^1.0.7:
36393608
version "1.0.7"
36403609
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -3991,6 +3960,11 @@ log-symbols@^5.1.0:
39913960
chalk "^5.0.0"
39923961
is-unicode-supported "^1.1.0"
39933962

3963+
loglevel@^1.9.2:
3964+
version "1.9.2"
3965+
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.2.tgz#c2e028d6c757720107df4e64508530db6621ba08"
3966+
integrity sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==
3967+
39943968
longest-streak@^2.0.1:
39953969
version "2.0.4"
39963970
resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
@@ -4151,11 +4125,6 @@ mimic-fn@^2.1.0:
41514125
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
41524126
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
41534127

4154-
mimic-fn@^4.0.0:
4155-
version "4.0.0"
4156-
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
4157-
integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
4158-
41594128
mimic-response@^3.1.0:
41604129
version "3.1.0"
41614130
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
@@ -4293,13 +4262,6 @@ node-releases@^2.0.18:
42934262
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
42944263
integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
42954264

4296-
npm-run-path@^5.1.0:
4297-
version "5.3.0"
4298-
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f"
4299-
integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==
4300-
dependencies:
4301-
path-key "^4.0.0"
4302-
43034265
nth-check@^2.0.1:
43044266
version "2.1.1"
43054267
resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
@@ -4417,13 +4379,6 @@ onetime@^5.1.0:
44174379
dependencies:
44184380
mimic-fn "^2.1.0"
44194381

4420-
onetime@^6.0.0:
4421-
version "6.0.0"
4422-
resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
4423-
integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
4424-
dependencies:
4425-
mimic-fn "^4.0.0"
4426-
44274382
optionator@^0.8.3:
44284383
version "0.8.3"
44294384
resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -4618,11 +4573,6 @@ path-key@^3.1.0:
46184573
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
46194574
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
46204575

4621-
path-key@^4.0.0:
4622-
version "4.0.0"
4623-
resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
4624-
integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
4625-
46264576
path-parse@^1.0.7:
46274577
version "1.0.7"
46284578
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -4683,13 +4633,6 @@ picomatch@^2.3.1:
46834633
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
46844634
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
46854635

4686-
pid-port@^1.0.2:
4687-
version "1.0.2"
4688-
resolved "https://registry.yarnpkg.com/pid-port/-/pid-port-1.0.2.tgz#23e4dd2780b122edba3c8ff97473472225a105e5"
4689-
integrity sha512-Khqp07zX8IJpmIg56bHrLxS3M0iSL4cq6wnMq8YE7r/hSw3Kn4QxYS6QJg8Bs22Z7CSVj7eSsxFuigYVIFWmjg==
4690-
dependencies:
4691-
execa "^8.0.1"
4692-
46934636
pkg-dir@^4.1.0, pkg-dir@^4.2.0:
46944637
version "4.2.0"
46954638
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
@@ -5824,7 +5767,7 @@ signal-exit@^3.0.2:
58245767
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
58255768
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
58265769

5827-
signal-exit@^4.0.1, signal-exit@^4.1.0:
5770+
signal-exit@^4.0.1:
58285771
version "4.1.0"
58295772
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
58305773
integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
@@ -6124,11 +6067,6 @@ strip-bom@^4.0.0:
61246067
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
61256068
integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
61266069

6127-
strip-final-newline@^3.0.0:
6128-
version "3.0.0"
6129-
resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
6130-
integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
6131-
61326070
strip-json-comments@^3.0.1, strip-json-comments@^3.1.1:
61336071
version "3.1.1"
61346072
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp