Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"@joplin/lib": "~2.9",
"@types/jest": "^30.0.0",
"@types/node": "^18.7.13",
"axios": "^0.21.1",
"axios": "^0.32.0",
"chalk": "^4.1.0",
"copy-webpack-plugin": "^11.0.0",
"copy-webpack-plugin": "^14.0.0",
"dotenv": "^10.0.0",
"fs-extra": "^11.3.3",
"glob": "^8.0.3",
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"tcp-port-used": "1.0.2",
"uglifycss": "0.0.29",
"url-parse": "1.5.10",
"uuid": "11.1.0",
"uuid": "14.0.0",
"word-wrap": "1.2.5",
"xml2js": "0.4.23"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"samlify": "2.10.1",
"sqlite3": "5.1.6",
"stripe": "8.222.0",
"uuid": "11.1.0",
"uuid": "14.0.0",
"yargs": "17.7.2",
"zxcvbn": "4.4.2"
},
Expand Down
131 changes: 13 additions & 118 deletions deskutils/joplin-desktop/files/packagejsons/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -43309,7 +43309,7 @@ __metadata:
languageName: node
linkType: hard

"qs@npm:6.11.0, qs@npm:^6.10.3":
"qs@npm:6.11.0":
version: 6.11.0
resolution: "qs@npm:6.11.0"
dependencies:
Expand All @@ -43318,7 +43318,7 @@ __metadata:
languageName: node
linkType: hard

"qs@npm:6.13.0, qs@npm:^6.12.3":
"qs@npm:6.13.0":
version: 6.13.0
resolution: "qs@npm:6.13.0"
dependencies:
Expand All @@ -43327,25 +43327,7 @@ __metadata:
languageName: node
linkType: hard

"qs@npm:^6.11.0":
version: 6.11.2
resolution: "qs@npm:6.11.2"
dependencies:
side-channel: "npm:^1.0.4"
checksum: 10/f2321d0796664d0f94e92447ccd3bdfd6b6f3a50b6b762aa79d7f5b1ea3a7a9f94063ba896b82bc2a877ed6a7426d4081e4f16568fdb04f0ee188cca9d8505b4
languageName: node
linkType: hard

"qs@npm:^6.4.0, qs@npm:^6.9.4":
version: 6.10.2
resolution: "qs@npm:6.10.2"
dependencies:
side-channel: "npm:^1.0.4"
checksum: 10/fcdb4e8d545dbc6a5f18de94ca6b591d5ab3928d748d6401d9a96e29bbb48523887ec3bb3b9dfa067b6326859b0b36dfd04e01a37cae0498dbf70ce169fffcba
languageName: node
linkType: hard

"qs@npm:^6.5.2":
"qs@npm:^6.10.3, qs@npm:^6.11.0, qs@npm:^6.12.3, qs@npm:^6.4.0, qs@npm:^6.5.2, qs@npm:^6.9.4":
version: 6.14.0
resolution: "qs@npm:6.14.0"
dependencies:
Expand All @@ -43355,9 +43337,9 @@ __metadata:
linkType: hard

"qs@npm:~6.5.2":
version: 6.5.2
resolution: "qs@npm:6.5.2"
checksum: 10/ef17caa6e1c55de55e0ed9cdf96fd38f54128d1b5ac92734802eb39e159180098d153dd1cea87a3dc51ad234936d6fc9928d9551ef5619e352ab4860db852062
version: 6.5.5
resolution: "qs@npm:6.5.5"
checksum: 10/c9de23cf77edcf8fc1a1b9a997c8bb3c31a1c3657d2a11c994d39691ccfb5c48fa0b50ac01865c8a862801bdf38d05fd990f62c03141e2087dba8165ef5fbf7d
languageName: node
linkType: hard

Expand Down Expand Up @@ -46832,25 +46814,7 @@ __metadata:
languageName: node
linkType: hard

"serialize-javascript@npm:^6.0.0":
version: 6.0.0
resolution: "serialize-javascript@npm:6.0.0"
dependencies:
randombytes: "npm:^2.1.0"
checksum: 10/ed3dabfbb565c48c9eb1ca8fe58f0d256902ab70a8a605be634ddd68388d5f728bb0bd1268e94fab628748ba8ad8392f01b05f3cbe1e4878b5c58c669fd3d1b4
languageName: node
linkType: hard

"serialize-javascript@npm:^6.0.1":
version: 6.0.1
resolution: "serialize-javascript@npm:6.0.1"
dependencies:
randombytes: "npm:^2.1.0"
checksum: 10/f756b1ff34b655b2183c64dd6683d28d4d9b9a80284b264cac9fd421c73890491eafd6c5c2bbe93f1f21bf78b572037c5a18d24b044c317ee1c9dc44d22db94c
languageName: node
linkType: hard

"serialize-javascript@npm:^6.0.2":
"serialize-javascript@npm:^6.0.0, serialize-javascript@npm:^6.0.1, serialize-javascript@npm:^6.0.2":
version: 6.0.2
resolution: "serialize-javascript@npm:6.0.2"
dependencies:
Expand Down Expand Up @@ -53663,55 +53627,16 @@ __metadata:
languageName: node
linkType: hard

"ws@npm:^6.1.4":
version: 6.2.2
resolution: "ws@npm:6.2.2"
dependencies:
async-limiter: "npm:~1.0.0"
checksum: 10/bb791ac02ad7e59fd4208cc6dd3a5bf7a67dff4611a128ed33365996f9fc24fa0d699043559f1798b4bc8045639fd21a1fd3ceca81de560124444abd8e321afc
languageName: node
linkType: hard

"ws@npm:^6.2.3":
version: 6.2.3
resolution: "ws@npm:6.2.3"
"ws@npm:^6.1.4, ws@npm:^6.2.3":
version: 6.2.4
resolution: "ws@npm:6.2.4"
dependencies:
async-limiter: "npm:~1.0.0"
checksum: 10/19f8d1608317f4c98f63da6eebaa85260a6fe1ba459cbfedd83ebe436368177fb1e2944761e2392c6b7321cbb7a375c8a81f9e1be35d555b6b4647eb61eadd46
languageName: node
linkType: hard

"ws@npm:^7, ws@npm:^7.4.6":
version: 7.5.6
resolution: "ws@npm:7.5.6"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ^5.0.2
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
checksum: 10/745fc1a1cdac7e91f2c7340f7006aea06454b6ca4f24615a1e81124f46d99a7200839895c088a30c1d8d92dd1a9d349046bd4bc3475447aaf13b1f5cb48a18b7
checksum: 10/5ec88106f4f97fb175837a476e186b889ec8c57a5ee7c511c852fc1d129ad55cd1c1f45092af2df7419c1394f2000f9b1b6f68f2fcfe52d04d8882aafa1b3838
languageName: node
linkType: hard

"ws@npm:^7.3.1, ws@npm:^7.5.1, ws@npm:^7.5.5":
version: 7.5.9
resolution: "ws@npm:7.5.9"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ^5.0.2
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
checksum: 10/171e35012934bd8788150a7f46f963e50bac43a4dc524ee714c20f258693ac4d3ba2abadb00838fdac42a47af9e958c7ae7e6f4bc56db047ba897b8a2268cf7c
languageName: node
linkType: hard

"ws@npm:^7.5.10":
"ws@npm:^7, ws@npm:^7.3.1, ws@npm:^7.4.6, ws@npm:^7.5.1, ws@npm:^7.5.10, ws@npm:^7.5.5":
version: 7.5.10
resolution: "ws@npm:7.5.10"
peerDependencies:
Expand All @@ -53726,7 +53651,7 @@ __metadata:
languageName: node
linkType: hard

"ws@npm:^8.12.1, ws@npm:^8.18.0":
"ws@npm:^8.12.1, ws@npm:^8.13.0, ws@npm:^8.18.0, ws@npm:^8.9.0":
version: 8.18.0
resolution: "ws@npm:8.18.0"
peerDependencies:
Expand All @@ -53741,36 +53666,6 @@ __metadata:
languageName: node
linkType: hard

"ws@npm:^8.13.0":
version: 8.13.0
resolution: "ws@npm:8.13.0"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ">=5.0.2"
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
checksum: 10/1769532b6fdab9ff659f0b17810e7501831d34ecca23fd179ee64091dd93a51f42c59f6c7bb4c7a384b6c229aca8076fb312aa35626257c18081511ef62a161d
languageName: node
linkType: hard

"ws@npm:^8.9.0":
version: 8.11.0
resolution: "ws@npm:8.11.0"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ^5.0.2
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
checksum: 10/f759ea19e42f6d94727b3d8590693f2d92521a78ec2de5c6064c3356f50d4815d427b7ddb10bf39596cc67d3b18232a1b2dfbc3b6361d4772bdfec69d4c130f4
languageName: node
linkType: hard

"xcode@npm:^3.0.1":
version: 3.0.1
resolution: "xcode@npm:3.0.1"
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions devel/electron37/files/packagejsons/spec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
"send": "^0.19.0",
"sinon": "^9.0.1",
"split": "^1.0.1",
"uuid": "^3.3.3",
"uuid": "^14.0.0",
"winreg": "1.2.4",
"ws": "^7.5.10",
"ws": "^8.21.0",
"yargs": "^16.0.3"
}
}
82 changes: 59 additions & 23 deletions devel/electron37/files/packagejsons/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2127,12 +2127,12 @@ __metadata:
languageName: node
linkType: hard

"@types/ws@npm:^7.2.0":
version: 7.4.7
resolution: "@types/ws@npm:7.4.7"
"@types/ws@npm:^8.18.1":
version: 8.18.1
resolution: "@types/ws@npm:8.18.1"
dependencies:
"@types/node": "npm:*"
checksum: 10c0/f1f53febd8623a85cef2652949acd19d83967e350ea15a851593e3033501750a1e04f418552e487db90a3d48611a1cff3ffcf139b94190c10f2fd1e1dc95ff10
checksum: 10c0/61aff1129143fcc4312f083bc9e9e168aa3026b7dd6e70796276dcfb2c8211c4292603f9c4864fae702f2ed86e4abd4d38aa421831c2fd7f856c931a481afbab
languageName: node
linkType: hard

Expand Down Expand Up @@ -3110,13 +3110,14 @@ __metadata:
linkType: hard

"axios@npm:^1.12.1":
version: 1.13.2
resolution: "axios@npm:1.13.2"
version: 1.16.1
resolution: "axios@npm:1.16.1"
dependencies:
follow-redirects: "npm:^1.15.6"
form-data: "npm:^4.0.4"
proxy-from-env: "npm:^1.1.0"
checksum: 10c0/e8a42e37e5568ae9c7a28c348db0e8cf3e43d06fcbef73f0048669edfe4f71219664da7b6cc991b0c0f01c28a48f037c515263cb79be1f1ae8ff034cd813867b
follow-redirects: "npm:^1.16.0"
form-data: "npm:^4.0.5"
https-proxy-agent: "npm:^5.0.1"
proxy-from-env: "npm:^2.1.0"
checksum: 10c0/2f77e37e6552bbff8a772d058fb09500198e9188c6b20dc799d82dbe12a8cb506f6eed4e4e62a9ba612a35cbab496faa26d68f9bff14a53af6d15c3e136391a7
languageName: node
linkType: hard

Expand Down Expand Up @@ -4596,7 +4597,7 @@ __metadata:
"@types/split": "npm:^1.0.5"
"@types/uuid": "npm:^3.4.6"
"@types/w3c-web-serial": "npm:^1.0.7"
"@types/ws": "npm:^7.2.0"
"@types/ws": "npm:^8.18.1"
basic-auth: "npm:^2.0.1"
busboy: "npm:^1.6.0"
chai: "npm:^4.2.0"
Expand All @@ -4616,9 +4617,9 @@ __metadata:
send: "npm:^0.19.0"
sinon: "npm:^9.0.1"
split: "npm:^1.0.1"
uuid: "npm:^3.3.3"
uuid: "npm:^14.0.0"
winreg: "npm:1.2.4"
ws: "npm:^7.5.10"
ws: "npm:^8.21.0"
yargs: "npm:^16.0.3"
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -6062,13 +6063,13 @@ __metadata:
languageName: node
linkType: hard

"follow-redirects@npm:^1.15.6":
version: 1.15.11
resolution: "follow-redirects@npm:1.15.11"
"follow-redirects@npm:^1.16.0":
version: 1.16.0
resolution: "follow-redirects@npm:1.16.0"
peerDependenciesMeta:
debug:
optional: true
checksum: 10c0/d301f430542520a54058d4aeeb453233c564aaccac835d29d15e050beb33f339ad67d9bddbce01739c5dc46a6716dbe3d9d0d5134b1ca203effa11a7ef092343
checksum: 10c0/a1e2900163e6f1b4d1ed5c221b607f41decbab65534c63fe7e287e40a5d552a6496e7d9d7d976fa4ba77b4c51c11e5e9f683f10b43011ea11e442ff128d0e181
languageName: node
linkType: hard

Expand Down Expand Up @@ -6113,6 +6114,19 @@ __metadata:
languageName: node
linkType: hard

"form-data@npm:^4.0.5":
version: 4.0.5
resolution: "form-data@npm:4.0.5"
dependencies:
asynckit: "npm:^0.4.0"
combined-stream: "npm:^1.0.8"
es-set-tostringtag: "npm:^2.1.0"
hasown: "npm:^2.0.2"
mime-types: "npm:^2.1.12"
checksum: 10c0/dd6b767ee0bbd6d84039db12a0fa5a2028160ffbfaba1800695713b46ae974a5f6e08b3356c3195137f8530dcd9dfcb5d5ae1eeff53d0db1e5aad863b619ce3b
languageName: node
linkType: hard

"forwarded@npm:0.2.0":
version: 0.2.0
resolution: "forwarded@npm:0.2.0"
Expand Down Expand Up @@ -6954,7 +6968,7 @@ __metadata:
languageName: node
linkType: hard

"https-proxy-agent@npm:^5.0.0":
"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1":
version: 5.0.1
resolution: "https-proxy-agent@npm:5.0.1"
dependencies:
Expand Down Expand Up @@ -10621,6 +10635,13 @@ __metadata:
languageName: node
linkType: hard

"proxy-from-env@npm:^2.1.0":
version: 2.1.0
resolution: "proxy-from-env@npm:2.1.0"
checksum: 10c0/ed01729fd4d094eab619cd7e17ce3698b3413b31eb102c4904f9875e677cd207392795d5b4adee9cec359dfd31c44d5ad7595a3a3ad51c40250e141512281c58
languageName: node
linkType: hard

"prr@npm:~1.0.1":
version: 1.0.1
resolution: "prr@npm:1.0.1"
Expand Down Expand Up @@ -13837,12 +13858,12 @@ __metadata:
languageName: node
linkType: hard

"uuid@npm:^3.3.3":
version: 3.4.0
resolution: "uuid@npm:3.4.0"
"uuid@npm:^14.0.0":
version: 14.0.0
resolution: "uuid@npm:14.0.0"
bin:
uuid: ./bin/uuid
checksum: 10c0/1c13950df865c4f506ebfe0a24023571fa80edf2e62364297a537c80af09c618299797bbf2dbac6b1f8ae5ad182ba474b89db61e0e85839683991f7e08795347
uuid: dist-node/bin/uuid
checksum: 10c0/a57ae7794c45005c1a9208989196c5baf79a7679c30f43c1bee9033a2c4d113a2cea216fa6fcc9663b08b0d55635df1a7c6eb7e7f3d21c3e50688c698fa39a50
languageName: node
linkType: hard

Expand Down Expand Up @@ -14400,6 +14421,21 @@ __metadata:
languageName: node
linkType: hard

"ws@npm:^8.21.0":
version: 8.21.0
resolution: "ws@npm:8.21.0"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ">=5.0.2"
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
checksum: 10c0/ef4a243476283fc49bc7550966c4af4aa0eef56273837211e700de3b664e08604a760cdddcb5ba43c049140e74ccfec5b0ee0bb439e08c2adf9138902fdde5f9
languageName: node
linkType: hard

"xdg-basedir@npm:^4.0.0":
version: 4.0.0
resolution: "xdg-basedir@npm:4.0.0"
Expand Down
Binary file not shown.
Loading