Skip to content

Commit 5b90766

Browse files
gjsjohnmurraygjsjohnmurray
committed
Merge remote-tracking branch 'upstream/main' into do-198248
2 parents 8e649b4 + 3481f35 commit 5b90766

File tree

149 files changed

+3530
-1118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+3530
-1118
lines changed

‎.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
},
260260
{
261261
"files": [
262-
"src/**/{browser,electron-sandbox}/*.ts"
262+
"src/**/{browser,electron-sandbox}/**/*.ts"
263263
],
264264
"rules": {
265265
"local/code-no-global-document-listener": "warn",

‎.yarnrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
disturl "https://electronjs.org/headers"
2-
target "25.9.4"
3-
ms_build_id "25127168"
2+
target "25.9.6"
3+
ms_build_id "25427645"
44
runtime "electron"
55
build_from_source "true"

‎build/checksums/electron.txt

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
1-
004cb2a93a7094449675ac49998f1c1572dd74b7839039332525f44a2a4d6905 *chromedriver-v25.9.4-darwin-arm64.zip
2-
e578c2b7c88ae066664c0562ca77f776d419a6ae5045383df9718e743147f880 *chromedriver-v25.9.4-darwin-x64.zip
3-
7c0f030cf143d682ae838e078d560b76b5f0af8c65d67f6026167c0a04c8f60b *chromedriver-v25.9.4-linux-arm64.zip
4-
320026f620bdd708aff88c97ee9bf40d2fbad4fce4be0be3c8252876c9a629ec *chromedriver-v25.9.4-linux-armv7l.zip
5-
65d4473294f024e4ba56a72ba9f87bec51207a7c924fda998acf499e5db4da9c *chromedriver-v25.9.4-linux-x64.zip
6-
191ba934dace5851f60ec5cdb040202dacebf837ae6b8483649cc85da698ffeb *chromedriver-v25.9.4-mas-arm64.zip
7-
1da9b56db091b1825cb3913de5eb12e30bb55f55023e044bed9e6d1518ab86f7 *chromedriver-v25.9.4-mas-x64.zip
8-
3efd22a6d4500603f629f5c58af44570909df6871eccc9d17c01d04ab17ca47e *chromedriver-v25.9.4-win32-arm64.zip
9-
cd8b4be4d491f39aebc97102e2a48e43260eff693163c1526f1fb0b401ec0a81 *chromedriver-v25.9.4-win32-ia32.zip
10-
03df2f38e3a07f70b766a5f0a9548acf8b35148dcb97d12e0479fd527da423e3 *chromedriver-v25.9.4-win32-x64.zip
11-
f1c4c82db5b9649d7e9cdb4c482a76ded439f6b11267f4b5eb869616a7f8244a *electron-api.json
12-
ac61c1f78f4bebf74073b4dbca356bc3aef6b44b4b069f8f2bfdb03d562e50f9 *electron-v25.9.4-darwin-arm64-dsym-snapshot.zip
13-
54424b0db7f38794dbc5aff1bf3a20fc93f0f35a03fce8eaaf523bbc075fef83 *electron-v25.9.4-darwin-arm64-dsym.zip
14-
1d816ad4c6a6e198d8ae6bb49698982f0f0298a605db09d46d3d4509c16a84a1 *electron-v25.9.4-darwin-arm64-symbols.zip
15-
8022153ed1437a5785a0f819d14f41ae1026c1c5c1406d535a32c2a0ec1e4ba3 *electron-v25.9.4-darwin-arm64.zip
16-
1a76a3c9ef80989488ed5a5cb9d4f54d284f79931f98907e6dbe3437271b33c0 *electron-v25.9.4-darwin-x64-dsym-snapshot.zip
17-
92b14aa0a6dbbf9dd4829464ecea4ee77536f6c45cd393aa00b502eb5d72e480 *electron-v25.9.4-darwin-x64-dsym.zip
18-
0bd268108df307e6d7770fea8882b5072ced5da23a0914e3e660e26c80314174 *electron-v25.9.4-darwin-x64-symbols.zip
19-
4a3b55cfdb3fedbe188f51c552ffa1f9d17d145926990ca914faccbb72634ee6 *electron-v25.9.4-darwin-x64.zip
20-
59bde360b480228cb166836d678682146d6f4cf9c8e6a534087c974e827b11bb *electron-v25.9.4-linux-arm64-debug.zip
21-
c8a2174ddfa18eeb326c830cbaf944931038de422d7e8492a9a5680dd54c77eb *electron-v25.9.4-linux-arm64-symbols.zip
22-
119481d318dec273434f9f4f43fb808ff66858cc0da1f17deccc6b08a99fbb83 *electron-v25.9.4-linux-arm64.zip
23-
59bde360b480228cb166836d678682146d6f4cf9c8e6a534087c974e827b11bb *electron-v25.9.4-linux-armv7l-debug.zip
24-
f791ce6c4bfe8ae7a00df9ac9dad766ce5ac4e502092b02c0361327a84ac07a8 *electron-v25.9.4-linux-armv7l-symbols.zip
25-
2ef1673f4c6b943b35dc1dd3379aae7534f2456c91eabc704e2db35012aac706 *electron-v25.9.4-linux-armv7l.zip
26-
ff0e6cd86b963d87edd02202284e1fd29842f5fa85b4ca7a21ab753507ab3a9d *electron-v25.9.4-linux-x64-debug.zip
27-
add83741ede569ec1ed243aea8a77d782674a59c62221a4b9bd07507af62441e *electron-v25.9.4-linux-x64-symbols.zip
28-
84f92675e3a9616cc163de673ebfafaad3c2976dc500612875a23849bc3661ce *electron-v25.9.4-linux-x64.zip
29-
ac61c1f78f4bebf74073b4dbca356bc3aef6b44b4b069f8f2bfdb03d562e50f9 *electron-v25.9.4-mas-arm64-dsym-snapshot.zip
30-
a76831375f19b4d48766211026446f2b073247c1e1a29edb52683caa0d0fc349 *electron-v25.9.4-mas-arm64-dsym.zip
31-
5a8a82ac24fdd31389391a157509b0a45e23d7e70236968b7b4a2130d930d04f *electron-v25.9.4-mas-arm64-symbols.zip
32-
c7e47d78ee8fc6d9112a38977cf1ebbec31cdf06b8a0540f120e7a69500c56f7 *electron-v25.9.4-mas-arm64.zip
33-
94253d587d9ed00b1741a64ca36e32fe8bc60cc32df48675bef89af081c4f0ec *electron-v25.9.4-mas-x64-dsym-snapshot.zip
34-
bf6e83d683c7fb88e21b93d4926b1e3dc9151f94e1bb4635ae2b77992b2c6598 *electron-v25.9.4-mas-x64-dsym.zip
35-
4b9758d4a74e21f66eedb95392d098e057e509a1f0eecc09729fa36747918838 *electron-v25.9.4-mas-x64-symbols.zip
36-
6e26f31b8088563b2cc4d1552d9ff00e61bc7ef1b95b7cfe404564f84b5b210d *electron-v25.9.4-mas-x64.zip
37-
c6fe73f028eff3dfdd6408b8762b5e0d2a67b3bd110b5910d1bec1fa85da8a5a *electron-v25.9.4-win32-arm64-pdb.zip
38-
ccccad00e4e16048743d5252023665b74ab804a7482606dc0dc9ad01f94c988b *electron-v25.9.4-win32-arm64-symbols.zip
39-
e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.4-win32-arm64-toolchain-profile.zip
40-
667c212b51400bfd1ab78a83d2adcdd6c9624a71b1a6892432e38ce9658d8093 *electron-v25.9.4-win32-arm64.zip
41-
320dab9a57c4f0efa1ecadb4a07ec15adecaa913ef62524cacaa9f011292571f *electron-v25.9.4-win32-ia32-pdb.zip
42-
2875e171ebba7fc12be3133cabbd38cdca30d3cedbb89a1e1e11270380b4afc5 *electron-v25.9.4-win32-ia32-symbols.zip
43-
e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.4-win32-ia32-toolchain-profile.zip
44-
18b11abf7b1f2f4568c3cf5dc9a2a0fc5349b6e3f40ecb91e086b030f254510d *electron-v25.9.4-win32-ia32.zip
45-
a4b49fee1139071eb33c014ed8ac49cf83065a6d95255c44acc78c3922c56185 *electron-v25.9.4-win32-x64-pdb.zip
46-
1712567ed6b050501a974e33a9a46cd806965d73b36ec8e18346d49022f74a8a *electron-v25.9.4-win32-x64-symbols.zip
47-
e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.4-win32-x64-toolchain-profile.zip
48-
03abc9d5b2b28b440e9e5b0fc61806e3f3c2888dac5d5939957726bd68955113 *electron-v25.9.4-win32-x64.zip
49-
706c40b11144551b2da43cdfd191c2e3e2bf0d7600b8d2751f3a806f72d0ede2 *electron.d.ts
50-
859e7f8f6b6faf1fd004ef335ccff6f25f18c17f1aa63031e0af238899513958 *ffmpeg-v25.9.4-darwin-arm64.zip
51-
3b63d30acb2bc5cdcc94ac2dc9e69e0919bf5038d3fd61f822c183280684cc4e *ffmpeg-v25.9.4-darwin-x64.zip
52-
bd52d57ff97fb56ac01a3482af905d04f0d4e9c13c53858c6d9f99957eca82da *ffmpeg-v25.9.4-linux-arm64.zip
53-
9b3d09177fa1e63e2a6beecfa70aeec30aeb5c1873ff21128a68051c4e23f95d *ffmpeg-v25.9.4-linux-armv7l.zip
54-
edc7b1c9f1a0733f109a2c0375a4e40c5bfe0bf28b7f06dcc76e1ada0aa2f125 *ffmpeg-v25.9.4-linux-x64.zip
55-
dae4d7857e7cf2d1333ce522ed3c8e3639a95432015a649a6cc3d064ddc076eb *ffmpeg-v25.9.4-mas-arm64.zip
56-
b2d9a72f57a18c68c30cbbde305ba91e740656746e37d5ce22e8895e7ec36a74 *ffmpeg-v25.9.4-mas-x64.zip
57-
7ebbd70835b6bbd1d12e432a2b0df4fb5fccd4039c6b5125401069b1c0ff6f0e *ffmpeg-v25.9.4-win32-arm64.zip
58-
128499e322306bf4900106d1120e28d93cafd7af5c5052109f2739360c7e212a *ffmpeg-v25.9.4-win32-ia32.zip
59-
00a2e9d9b783899662b430feb5fb030e89ae7682ef4e3bf8eb4c8ecbfd435b84 *ffmpeg-v25.9.4-win32-x64.zip
60-
1b9943e151314644652f738afa309d1d4f3cb18fc505e568c1f80e66e0ccf1b3 *hunspell_dictionaries.zip
61-
631aac564c555332dbf9d7acdcce6852c594cd84d3afd3056e738c64f4b1cb1b *libcxx-objects-v25.9.4-linux-arm64.zip
62-
4ad907d1b04bb93aba78b086ffdf16e2c0aa23f5a3901ad23ab4fd1aa46e80a3 *libcxx-objects-v25.9.4-linux-armv7l.zip
63-
c8950fb9555c33015cb0d2299dfb2b35daa1c0c7d392bf53a96f570b8c064c93 *libcxx-objects-v25.9.4-linux-x64.zip
64-
aaafbf6dfc756d3244d6085c419eec5dc3aa7b12face8a0bab1733aed3e7f3e7 *libcxx_headers.zip
65-
c571e713663bdc68f5956e45b975b89bd23cc2e401a1161321167d224b1dea3d *libcxxabi_headers.zip
66-
cf42b5f0e4e6500b89ab8313267a459584be8a175cc6c7e20c1fee50277c65f4 *mksnapshot-v25.9.4-darwin-arm64.zip
67-
6f1b74306d691214218e2894f813af1d0fde5e6ded31ad94c1ad4f44b4582b29 *mksnapshot-v25.9.4-darwin-x64.zip
68-
9a0e09332db556357288b46738a409269cc4c83816396c70fd5b518548eb884d *mksnapshot-v25.9.4-linux-arm64-x64.zip
69-
80692a923553ae0172f5a981ff44d7194a307d826be5c39473f2555c1af4a025 *mksnapshot-v25.9.4-linux-armv7l-x64.zip
70-
6dfb2d094b96f8507b4984ad8dcb14c56a8df5cd5bf89533ff6c7714009da4a0 *mksnapshot-v25.9.4-linux-x64.zip
71-
50c800e3aa75997ec377e3d91682f9f4b49dd4e95555dd9acbbdd083d73718ac *mksnapshot-v25.9.4-mas-arm64.zip
72-
81ea7704f3453c6d8e55525dd7e2999664e45002dab70dd250b2194b6ddccc7c *mksnapshot-v25.9.4-mas-x64.zip
73-
e817d7637498531c4de3bcbdfbd45a6255f04e349b2aa8ffdf454817f2c78b54 *mksnapshot-v25.9.4-win32-arm64-x64.zip
74-
f61be226a7c303d1b2502561de5093b0a9d364ae6d0a3b51d9c1d8b793ac97ef *mksnapshot-v25.9.4-win32-ia32.zip
75-
73c65b7356aa3d703ca8ca43ec2436ee9c9475ce8b27b71b4313c0b3d4d76e10 *mksnapshot-v25.9.4-win32-x64.zip
1+
bd1bd27fb2724748b50ed9978146e9f3c28f21f09144901da4fb09c2412ef6b8 *chromedriver-v25.9.6-darwin-arm64.zip
2+
c8fc339dcf9d93940d9e85be0ca8ef992ee12c93f191b79b074f8c5624c195e8 *chromedriver-v25.9.6-darwin-x64.zip
3+
77331490233bd58c1fcd8c930e8a346b50ffe4e790278370c83a7c4bfe2e91b5 *chromedriver-v25.9.6-linux-arm64.zip
4+
2a050686a8b455ad3ff799f50844b64849db8d0b3b7354850bfb62b21408dc6c *chromedriver-v25.9.6-linux-armv7l.zip
5+
4999e2bb69c65c84e562a9ad3420b0323ad0cffb04979ed6db8211b3bd90783e *chromedriver-v25.9.6-linux-x64.zip
6+
42273234489748b2c16886dd4c8afada9ecf972e60ce4323fd810fb101097738 *chromedriver-v25.9.6-mas-arm64.zip
7+
d63b3ef6eb49bc0d1d048a77e8f5059599aa8b7d74a4032cb90b6b8978dd822f *chromedriver-v25.9.6-mas-x64.zip
8+
88337702ae3854fdd01978383753d125548f45614422e0bc1979b84e9ee4568e *chromedriver-v25.9.6-win32-arm64.zip
9+
4e6191def9c9975d44eba453218186ebd1511c61ab739f018c6ee887b9df87e5 *chromedriver-v25.9.6-win32-ia32.zip
10+
002e6a0e331013c8679a3835110f6f73c6b297b091bb3a82dff3ae96fbf167f6 *chromedriver-v25.9.6-win32-x64.zip
11+
5cf2cf7f78c6c4e2411f2fca3e8a68ea8b627478d12da7f9d1066b12c2c3ad30 *electron-api.json
12+
e18f9801837e0cf3d9818bb0829819b57545fcaebf1355999f2cb8d0eada09f1 *electron-v25.9.6-darwin-arm64-dsym-snapshot.zip
13+
dd961d0f2de707ce5153adc0f5d62fb97e0b251f0512cf3f364ba9cb4e043161 *electron-v25.9.6-darwin-arm64-dsym.zip
14+
14f9d7c37a85ef03300edc335ba3b43583c121bb05d23e7496adfc001a552feb *electron-v25.9.6-darwin-arm64-symbols.zip
15+
dc06bbd7378b68d67469b958bf049944e08dc67c7fc9d0a5f94828f85982f5b9 *electron-v25.9.6-darwin-arm64.zip
16+
d5cef8cdaa0d697ec82d1c8ca2252d7debe4a6beeab34cbd14e2af294bec6745 *electron-v25.9.6-darwin-x64-dsym-snapshot.zip
17+
d3da17c9e8b9bcaf52871f8dfbf8589401613e4ba8dd09316bccf0606ac68fb3 *electron-v25.9.6-darwin-x64-dsym.zip
18+
7cac10c7b4ff45f90fd8e15dbc33f69931abaf06e9791f0d4e6af5b589face64 *electron-v25.9.6-darwin-x64-symbols.zip
19+
0accf891874030cac28632cc36ac4b88398e99aa3c39be0947ed9e3d3457c0ba *electron-v25.9.6-darwin-x64.zip
20+
4374a1513e6829f241855bfe11b2aa6eb276a8f3cfbf4f5b8f67b0f561016219 *electron-v25.9.6-linux-arm64-debug.zip
21+
127ba3c914d978e62765b1a6be1ffe963aa9d7ed91dbb8442bb94ebd0e45fec1 *electron-v25.9.6-linux-arm64-symbols.zip
22+
6ced27b15114c868d2ec0e479a4cd4c32a42014f28a3cfac274c0cf5d26c8433 *electron-v25.9.6-linux-arm64.zip
23+
4374a1513e6829f241855bfe11b2aa6eb276a8f3cfbf4f5b8f67b0f561016219 *electron-v25.9.6-linux-armv7l-debug.zip
24+
a6f605e2174ebcaa8f508a49a1ca3d3273295f8d5547a77e7d71d1e631a40baa *electron-v25.9.6-linux-armv7l-symbols.zip
25+
311e463b02ed81788c2ab0d462f1efcf45efa49f325b0e9383a2894cdd6bf25c *electron-v25.9.6-linux-armv7l.zip
26+
b58e46a687f69df227567083487818d10a31fd010bf377c8c4269a8c5b0f03bf *electron-v25.9.6-linux-x64-debug.zip
27+
17661fd7bf9ee53d5f45e7d85a8e00e02c91ef67a1fcd8f04854392910cdca44 *electron-v25.9.6-linux-x64-symbols.zip
28+
aa6b7e15c303f3c6a75c5d46c2809975a33848600cdcfc08023085a3fb490799 *electron-v25.9.6-linux-x64.zip
29+
e18f9801837e0cf3d9818bb0829819b57545fcaebf1355999f2cb8d0eada09f1 *electron-v25.9.6-mas-arm64-dsym-snapshot.zip
30+
d3c688a5a6297fba598f96fc315cd1712120f9f75966c82c7cd4f727159dfa60 *electron-v25.9.6-mas-arm64-dsym.zip
31+
49706b64eed5929236c94b74622fee539c84287a2c2b6c7391307f38817750d3 *electron-v25.9.6-mas-arm64-symbols.zip
32+
4920d36bc45e07a4705ab779a11db5339af6e0ba52c38dd2e9add007c96399fb *electron-v25.9.6-mas-arm64.zip
33+
3601d1a6d5f686944798b58ea95ccbfc92584d2eec7c9e73bf3acb87eb570fb0 *electron-v25.9.6-mas-x64-dsym-snapshot.zip
34+
5ccda3381211819ab87cd3a34f22ed9cf422dbe9d36bb4e5458a6b5d523b87bc *electron-v25.9.6-mas-x64-dsym.zip
35+
d9d01d00ebbdc8a6a4894d5486c1eec657925bfdf6948b2123051c7eadc06369 *electron-v25.9.6-mas-x64-symbols.zip
36+
8cf6f477b9468fb0ae693c96f47852d3f1be96eb5b4ca45b1946295c3677d28f *electron-v25.9.6-mas-x64.zip
37+
568fbe49277eb0458e79c7793ea6038c419624b654628892535bc58f1f86c5f8 *electron-v25.9.6-win32-arm64-pdb.zip
38+
9cbcf9e64c0f2611d27cea77105595a7ab9c57cc933da3bf162edb1b7f1a9808 *electron-v25.9.6-win32-arm64-symbols.zip
39+
e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.6-win32-arm64-toolchain-profile.zip
40+
6c4f9beed89c7bfd1538815861e2b1128a28a82fd729429dca1757dc4f77ccbd *electron-v25.9.6-win32-arm64.zip
41+
b8eb0490a78757f61ca4438a1f78eb7874eb8da66544432adbdb97fa84bad2d6 *electron-v25.9.6-win32-ia32-pdb.zip
42+
87edb1f236e7728b0c2b7a055e9f56f375fc2cafda880c3a6dc6df06678308ce *electron-v25.9.6-win32-ia32-symbols.zip
43+
e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.6-win32-ia32-toolchain-profile.zip
44+
ba25e44570ec2ba476052a43220011ee36609c70af9a96255385987ef9aafee4 *electron-v25.9.6-win32-ia32.zip
45+
e9b4061feadf44020976bde51427e8f19d5921cf0bee1a6f7f2c91428896a0f6 *electron-v25.9.6-win32-x64-pdb.zip
46+
5f85dc477fd1cb780dddfb6b62ef758a36a7973a1c51e58e5ba00b5b2c0a2eaa *electron-v25.9.6-win32-x64-symbols.zip
47+
e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.6-win32-x64-toolchain-profile.zip
48+
ed6410951228470ff976227042a0b430b72ce6c1e241a48fec367a86df8fa0a1 *electron-v25.9.6-win32-x64.zip
49+
fc51b357c0fff78487b91a927076e2520d57081abe6a4ddbb8d15e3f462cbdb3 *electron.d.ts
50+
0cf917e3270eeb935152a02e223cd551e43f59d40f2951a93cc24be2497f60de *ffmpeg-v25.9.6-darwin-arm64.zip
51+
9254e94359efac66a2d9161d8e9312a43d174eab56ce4fb8cab202e5516a3ad0 *ffmpeg-v25.9.6-darwin-x64.zip
52+
bd52d57ff97fb56ac01a3482af905d04f0d4e9c13c53858c6d9f99957eca82da *ffmpeg-v25.9.6-linux-arm64.zip
53+
9b3d09177fa1e63e2a6beecfa70aeec30aeb5c1873ff21128a68051c4e23f95d *ffmpeg-v25.9.6-linux-armv7l.zip
54+
edc7b1c9f1a0733f109a2c0375a4e40c5bfe0bf28b7f06dcc76e1ada0aa2f125 *ffmpeg-v25.9.6-linux-x64.zip
55+
d50d1880a1c9e4ef11d8e712091b8faa0f47bcbdf339cbf276dd952892c64dbe *ffmpeg-v25.9.6-mas-arm64.zip
56+
d61f6ecb96cb28876e9f53944763cac2d9b85a9d9dba53851f477ac3dc3301ef *ffmpeg-v25.9.6-mas-x64.zip
57+
198d05aaef020af1a98453246a3e3ff999331b63967607fb706586f08cc43fac *ffmpeg-v25.9.6-win32-arm64.zip
58+
2b80110b470491dbf33f2dcf1188a865980c94fb2a940cff5610e5b86701b51b *ffmpeg-v25.9.6-win32-ia32.zip
59+
37f260ab3ae666df594705b400ff6592ddc4f088d95b585acd37ba529db5fff2 *ffmpeg-v25.9.6-win32-x64.zip
60+
b1423529a11f5348b6b78a36d355134aec2760a1a2744699c83cd0b6b03cd425 *hunspell_dictionaries.zip
61+
c89b061fe0b8835df41b8c00d3f791bc0830fb9be6b0955518c78bcacb5dd75f *libcxx-objects-v25.9.6-linux-arm64.zip
62+
098e9f8af88085189e4c04f324baafa09d7a64c350576fd38d9dbf32ff0e8d30 *libcxx-objects-v25.9.6-linux-armv7l.zip
63+
2e4e4faac500704cf16db656a870b9981659671ebaef4dfc972b5ad222422a81 *libcxx-objects-v25.9.6-linux-x64.zip
64+
b61068bc99d5144f1f31f6a5d9862ebd7f091c745dba0ddfd1135be395540721 *libcxx_headers.zip
65+
3a13e19e8633bea161650a6b3eba8a0b08b98e84d0246a72eea099d0807cba3c *libcxxabi_headers.zip
66+
a33a708edab6fd2cab24eba6ea520e4b762bfd642e7a8e5548281c190b94a2a1 *mksnapshot-v25.9.6-darwin-arm64.zip
67+
3ac987f47d898a8ef3f3ac2703be1aad4c10dc44dc01f5c2a495a8ca9ec9c660 *mksnapshot-v25.9.6-darwin-x64.zip
68+
c3ee9b1d7d899c9211154fd56b2403cd882d77bb58fb48bbe744a668fe05256d *mksnapshot-v25.9.6-linux-arm64-x64.zip
69+
440e7a903decccf95c1e0a1b01bef286413a59bd2c0831553f52872ba3790e22 *mksnapshot-v25.9.6-linux-armv7l-x64.zip
70+
7240fa92f34beb0c6e5f455bc1f08f693de4480e852c986989f799849b1c6961 *mksnapshot-v25.9.6-linux-x64.zip
71+
4a4f0337d444fa390ed7dffc70c73b67db0d37c978683aa0d41ee9cac741b690 *mksnapshot-v25.9.6-mas-arm64.zip
72+
10de1874b5d168e9cdce9c825a1a29eee830495a9c4c0ab1c2849e89641b35b0 *mksnapshot-v25.9.6-mas-x64.zip
73+
b2a15fdb3cca2085fdd72bc991fd8f945a028c0ed5872e9d271a79c8f61efb1d *mksnapshot-v25.9.6-win32-arm64-x64.zip
74+
bd625b4089e43ece3246f92bfa1d0d401efe522cf9a3cba52bcc484aa86ec7a5 *mksnapshot-v25.9.6-win32-ia32.zip
75+
f82a10a340568bcfc6605e69853f84b2158f0e86561c42036ee2232b23fccbec *mksnapshot-v25.9.6-win32-x64.zip

‎build/hygiene.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function hygiene(some, linting = true) {
4141
const unicode = es.through(function (file) {
4242
const lines = file.contents.toString('utf8').split(/\r\n|\r|\n/);
4343
file.__lines = lines;
44-
44+
const allowInComments = lines.some(line => /allow-any-unicode-comment-file/.test(line));
4545
let skipNext = false;
4646
lines.forEach((line, i) => {
4747
if (/allow-any-unicode-next-line/.test(line)) {
@@ -52,6 +52,15 @@ function hygiene(some, linting = true) {
5252
skipNext = false;
5353
return;
5454
}
55+
// If unicode is allowed in comments, trim the comment from the line
56+
if (allowInComments) {
57+
if (line.match(/\s+(\*)/)) { // Naive multi-line comment check
58+
line = '';
59+
} else {
60+
const index = line.indexOf('\/\/');
61+
line = index === -1 ? line : line.substring(0, index);
62+
}
63+
}
5564
// Please do not add symbols that resemble ASCII letters!
5665
const m = /([^\t\n\r\x20-\x7E⊃⊇✔︎✓🎯⚠️🛑🔴🚗🚙🚕🎉✨❗⇧⌥⌘×÷¦⋯…↑↓￫→←↔⟷·•●◆▼⟪⟫┌└├⏎↩√φ]+)/g.exec(line);
5766
if (m) {
@@ -192,7 +201,7 @@ function hygiene(some, linting = true) {
192201
result.pipe(filter(stylelintFilter)).pipe(gulpstylelint(((message, isError) => {
193202
if (isError) {
194203
console.error(message);
195-
errorCount++;
204+
errorCount++;
196205
} else {
197206
console.warn(message);
198207
}

‎cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,12 +528,12 @@
528528
"git": {
529529
"name": "electron",
530530
"repositoryUrl": "https://github.com/electron/electron",
531-
"commitHash": "bb6a7d443b4f00680d05cc703b4d7ae180fdde03"
531+
"commitHash": "7916733f5ff0cf319972a0df44de01e40bbfa40e"
532532
}
533533
},
534534
"isOnlyProductionDependency": true,
535535
"license": "MIT",
536-
"version": "25.9.4"
536+
"version": "25.9.6"
537537
},
538538
{
539539
"component": {

‎extensions/css-language-features/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"browser": "./dist/browser/cssServerMain",
1212
"dependencies": {
1313
"@vscode/l10n": "^0.0.16",
14-
"vscode-css-languageservice": "^6.2.10",
14+
"vscode-css-languageservice": "^6.2.11",
1515
"vscode-languageserver": "^9.0.1",
1616
"vscode-uri": "^3.0.8"
1717
},

‎extensions/css-language-features/server/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.16.tgz#f075db346d0b08419a12540171b230bd803c42be"
1818
integrity sha512-JT5CvrIYYCrmB+dCana8sUqJEcGB1ZDXNLMQ2+42bW995WmNoenijWMUdZfwmuQUTQcEVVIa2OecZzTYWUW9Cg==
1919

20-
vscode-css-languageservice@^6.2.10:
21-
version "6.2.10"
22-
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.10.tgz#ba114d92d634df7b45f572a6eaaccd29cbde5d9d"
23-
integrity sha512-sYUZPku4mQ06AWGCbMyjv2tdR6juBW6hTbVPFwbJvNVzdtEfBioQOgkdXg7yMJNWnXkvWSU1FL2kb4Vxu5Cdyw==
20+
vscode-css-languageservice@^6.2.11:
21+
version "6.2.11"
22+
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.11.tgz#40de8b34adb6d68ee96795ffb34e34d99fc26801"
23+
integrity sha512-qn49Wa6K94LnizpVxmlYrcPf1Cb36gq1nNueW0COhi4shylXBzET5wuDbH8ZWQlJD0HM5Mmnn7WE9vQVVs+ULA==
2424
dependencies:
2525
"@vscode/l10n" "^0.0.16"
2626
vscode-languageserver-textdocument "^1.0.11"

0 commit comments

Comments
 (0)