diff --git a/.npmrc b/.npmrc
index e3a35cce6831a..30ecf60a970cc 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,6 +1,6 @@
disturl="https://electronjs.org/headers"
-target="32.2.1"
-ms_build_id="10427718"
+target="32.2.3"
+ms_build_id="10561341"
runtime="electron"
build_from_source="true"
legacy-peer-deps="true"
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index 4d7f8de85600b..bc6e80cdb9683 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-29acb63bb116a08e97797042505d48eecfa396f5d84a12114573aa70acaa48ec *chromedriver-v32.2.1-darwin-arm64.zip
-a1fd00f8634c6b4d9e28ce8ac69684ea24f5274c9f17c0e39bd149b34568b84b *chromedriver-v32.2.1-darwin-x64.zip
-6b311318f5a537e21d2d832609ce8306b4806e4c62aaa132ee87e063d45f5b00 *chromedriver-v32.2.1-linux-arm64.zip
-ac1529a8f6e4c77fdae3bc92bc5bfcb40c3b19def0772de9d1874da7223517b7 *chromedriver-v32.2.1-linux-armv7l.zip
-2329d1307729c714bef71d9f8250ed510b5a1ae07beefddee2371af70f712297 *chromedriver-v32.2.1-linux-x64.zip
-84566e08029ea9b3d939f2329332b6b6d0c4a886f2aa2f2f53818b90af16a717 *chromedriver-v32.2.1-mas-arm64.zip
-71c6e443617b6dd9b9962ff566ac7b8856db0a2e81b8b6ee7f985ffc96bb409a *chromedriver-v32.2.1-mas-x64.zip
-0340ecc564b68a1632ea76f7e77fc06a4f150ea2fbb3c599c0dc8d78499c39e3 *chromedriver-v32.2.1-win32-arm64.zip
-9d6d1a0b4863a4de2587e746b1a25da698076eda9268ef70ca24d43b39514859 *chromedriver-v32.2.1-win32-ia32.zip
-1dc504383f63b2f178b902de41ba0efa28650bde54c3b2ebeee827c87a2768f3 *chromedriver-v32.2.1-win32-x64.zip
-ba8e9ac663cc2edea61e7ddf12af835bf6ebb02b8d4ae6362c1f39c2390e7d22 *electron-api.json
-a3544e9894f1ca544b0c8231f7c34f90a29f0ce3fd7853d592d51eb4ad4b31c5 *electron-v32.2.1-darwin-arm64-dsym-snapshot.zip
-89377cde729f99707cb822e88999cfc312c4b82495600f38d13593c3de1b47f4 *electron-v32.2.1-darwin-arm64-dsym.zip
-4e13b04efd03c237c3421b551180bc2b8dc6c35d49acd475e42c11aaa6b199aa *electron-v32.2.1-darwin-arm64-symbols.zip
-906fbf9e7a5ee6d49ea107fdfd0e98bc80884fbf1f6ff38d824453f58c6ec259 *electron-v32.2.1-darwin-arm64.zip
-fb3e5eb15915b4328820ebaf2c4a056f4ac374eb8e24479bdfd6f0cf8e1da1be *electron-v32.2.1-darwin-x64-dsym-snapshot.zip
-0a95df2a44e0a42b9076e58d7e539e91ba7e583de77a8e94695d9c6dd03f201a *electron-v32.2.1-darwin-x64-dsym.zip
-4864122e38f423f6ff9a8625696f323e908e613ebdab8ed7d40b374d6f9dec13 *electron-v32.2.1-darwin-x64-symbols.zip
-56e2e4252b4d4e92075345f0b9dbefc8db49bdc6a4c45a87000f3cc705057907 *electron-v32.2.1-darwin-x64.zip
-692aaf464bdb7bd7538e6392885571ef4d5f4d02319f84b99ada1827fbdfabf9 *electron-v32.2.1-linux-arm64-debug.zip
-86161e2f6b1ca5cd6eb998863798186d9be270535d6912075001588e3e35e90d *electron-v32.2.1-linux-arm64-symbols.zip
-6500fdbff988e0cda909643ba8439660a207c9a2d393fa63f680a0337e530342 *electron-v32.2.1-linux-arm64.zip
-692aaf464bdb7bd7538e6392885571ef4d5f4d02319f84b99ada1827fbdfabf9 *electron-v32.2.1-linux-armv7l-debug.zip
-cfe4cfb7a6818902b5cc1b493ec2f7a9e4dc8fcb63346ddf75bec3496658a363 *electron-v32.2.1-linux-armv7l-symbols.zip
-7ffcce19ebdb30a9db78671c7f222edde66181a37c895834682d224e459200fc *electron-v32.2.1-linux-armv7l.zip
-1e0318a7d125ebe015a5d4f214d186cd10e36021cc8555d376d8fda15a28a5ac *electron-v32.2.1-linux-x64-debug.zip
-9d857cd5bdc81abb965e2e1bb73af8de31ef74cd182de52160b7afe805837574 *electron-v32.2.1-linux-x64-symbols.zip
-4fc58e6e79e5b5793ec9b5d35c8926fcad5352b6a1b21b3edf42343487c90185 *electron-v32.2.1-linux-x64.zip
-5fba9ea6c0d49ecd8bbbc87a9da6f860b901892e7ea487013e353bc2e951fbde *electron-v32.2.1-mas-arm64-dsym-snapshot.zip
-71c2cdc23e61b7f13bda837fb9dfb5fdb9c6ca4fa755f2596f70874caaeeacea *electron-v32.2.1-mas-arm64-dsym.zip
-448df71d1e62ca570b3f8b7d35b21eaa2870ce4877f12465cf6e54e90a16ac12 *electron-v32.2.1-mas-arm64-symbols.zip
-4c53ef19385ab5a0040e6eda3a8f88f42b5f53de0e9a6118333613a1388fc39f *electron-v32.2.1-mas-arm64.zip
-cbc5b08014cda37d6943f8a388ba1386f5ee1af3ca7a5ed28c12bf5fbd00f633 *electron-v32.2.1-mas-x64-dsym-snapshot.zip
-a6bfe31ea9cef19794418d169872d5b68130b49989d7e2ee3d83a2853d4e706c *electron-v32.2.1-mas-x64-dsym.zip
-a9ce94d21c61d3cf9f8319ae394c779058bc2377916e0330f0447e8c79b5b0e1 *electron-v32.2.1-mas-x64-symbols.zip
-8b57ced11b88fa80f9a986662658cf4cb40a1138811ad6129fc826988b31f9ab *electron-v32.2.1-mas-x64.zip
-5fcb399829066859399e8e3e7c5574b2e8885f632661fc2830da02be3d5803d2 *electron-v32.2.1-win32-arm64-pdb.zip
-eb16ad799a8db120b1e4b13533f9f52e844b6252308ea9e182f290c7657a5361 *electron-v32.2.1-win32-arm64-symbols.zip
-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.1-win32-arm64-toolchain-profile.zip
-3ac484f124c2012c0bff7640e82bed268876de1e3c6776716b5883d2de043a4f *electron-v32.2.1-win32-arm64.zip
-75b6117bd0462641d93de9e0a7aac9c6a1a052c688f59426a66aafe34c7bb914 *electron-v32.2.1-win32-ia32-pdb.zip
-10d4b64e7d2abeef1c93f2ec58d55715462229d20f61edf50bf5ceb4fce5719b *electron-v32.2.1-win32-ia32-symbols.zip
-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.1-win32-ia32-toolchain-profile.zip
-e5d4e2b10e5215b8a7133cc3fa39875ea18e8d4ea41f9ba9a9ae9f13a4090f53 *electron-v32.2.1-win32-ia32.zip
-83055f775e93c0be5c17a4312a552d3d0abb86a36b354f30973917a44d7a5656 *electron-v32.2.1-win32-x64-pdb.zip
-38158fd465eb41674767707bfbd87ec67874aac9bd42c550aad6901035884697 *electron-v32.2.1-win32-x64-symbols.zip
-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.1-win32-x64-toolchain-profile.zip
-494282c481eca93e1ee1d3e0df65ba0da5cec09b0c15bcc81521eee108839190 *electron-v32.2.1-win32-x64.zip
-27050115afac161a368be0b92e842f65d5c7021b5b508b71ad972ce252bbbb3f *electron.d.ts
-d8c054da57903f4e3297edd4de69177e9556feca9f2fc71b833608a486a7cae2 *ffmpeg-v32.2.1-darwin-arm64.zip
-ac22a993719b804b560ed73ff1ad339df3eb126eeb9f5d496174a293ba952d78 *ffmpeg-v32.2.1-darwin-x64.zip
-3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.1-linux-arm64.zip
-3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.1-linux-armv7l.zip
-fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.1-linux-x64.zip
-de4b05b040207d6807444f4289c0adc7f4947de0e32a0441073085cd76676648 *ffmpeg-v32.2.1-mas-arm64.zip
-b007a2c582cd55727453fdf51ca3521d76f3ebeda8bfb3c2eeb56d56ec17a6a7 *ffmpeg-v32.2.1-mas-x64.zip
-c72c467834669575ca1a5e34a624db71da3cbe63223f63d8f92bc4d2551a4164 *ffmpeg-v32.2.1-win32-arm64.zip
-a9d26ba87262631ba279f6eae4164bcb289abe99c5a10e56c2e28e1e05b530bf *ffmpeg-v32.2.1-win32-ia32.zip
-98c917caa3cd7ad10f2c48669c377a028d42673515034c05c3cac461213d5535 *ffmpeg-v32.2.1-win32-x64.zip
-8b685975c9aeae9e5d8df85ad797492419e6414aa68a87d14f6fbb923d0f7dad *hunspell_dictionaries.zip
-ee3871c7b533fc1c24baab89d25b60fc3e5f339b4c3e7767c768d833b0a828f4 *libcxx-objects-v32.2.1-linux-arm64.zip
-3a01ecfc2f4e91bdc20280d8d3954347c0abd1bd53256e79a053d05f6a3ec664 *libcxx-objects-v32.2.1-linux-armv7l.zip
-ab43146f8ca665a7064da6a82af2c7e3c3adce0788fb55862991f3a491bc692d *libcxx-objects-v32.2.1-linux-x64.zip
-bb9dc46ad47b265fa353c42fc54ba584c2c890521069ea9de4c12cddb96297ea *libcxx_headers.zip
-6846d928164a74dcad442da06cd79ecc788aa52815b8334e3a8a187f1650ce4f *libcxxabi_headers.zip
-8f4cb6c9358c1bf9a0c81dcf94dd1f3683c42f3407441ed1ce074851bca0cbed *mksnapshot-v32.2.1-darwin-arm64.zip
-ca0919eaa60722e8e864eeae331a571e10ecf02bb1bcd9028849436a15db4416 *mksnapshot-v32.2.1-darwin-x64.zip
-1858861baadfd453eac7e78de2b1837253d4e44084aff22d8b6813602e0a3f4e *mksnapshot-v32.2.1-linux-arm64-x64.zip
-15a713a85f2a3082c6b8943315bb7b9ab850f34a73544a619414f586e69b9b08 *mksnapshot-v32.2.1-linux-armv7l-x64.zip
-5b82fba9a2ee305ef4f0818c406c726cfebc090b84fdaf39e76954f360740445 *mksnapshot-v32.2.1-linux-x64.zip
-eef68fa0ea8ab11be45447e7e89fcac8dce3261d207807cd0d8366785964d7fc *mksnapshot-v32.2.1-mas-arm64.zip
-26fcd020007a857611adad7ce7ba0b83b008edb130d87c93183c053b73f61a76 *mksnapshot-v32.2.1-mas-x64.zip
-fbe7b665451fc4c48c4b09fe949374aedf95563b7d0b7f1927974b347205a8f9 *mksnapshot-v32.2.1-win32-arm64-x64.zip
-3e0cc1d1cfa749a6364e2124b63583d7543c95c744c10400a6834726337468d0 *mksnapshot-v32.2.1-win32-ia32.zip
-ef506867e5bb87c7e4380f9d9e93902d180a7425e1528acdd8283779e902f51e *mksnapshot-v32.2.1-win32-x64.zip
+3dd66ff8058b2f42de3b34435eb00c3efec52a96397519b5b406859400a479f5 *chromedriver-v32.2.3-darwin-arm64.zip
+b32a6da15cf24bc42cbfb54003d63317b7a5e6bbeb11f169c8734dc0988f0f4b *chromedriver-v32.2.3-darwin-x64.zip
+13836465f2b59cc60b6493c7e55c3d96bac1a27be903aabaf27b5f88100c3aeb *chromedriver-v32.2.3-linux-arm64.zip
+6f4933a7cb857b95ab8dda83e49679745d1d4b0753c680ad94919b88ad92469b *chromedriver-v32.2.3-linux-armv7l.zip
+9fd34aee11d83693f2cffabb7fd8748bf05eddf4531677398d503f6be1d10102 *chromedriver-v32.2.3-linux-x64.zip
+c1e7f22ffe54f07e849a06b62e4e540940760f1b58e3437517af971e1f61d733 *chromedriver-v32.2.3-mas-arm64.zip
+4a79bbe0fab80ffdb132ddb710bffd3eaec26cb45945479a65725915d47da2dd *chromedriver-v32.2.3-mas-x64.zip
+d29a542d87e84b3acef4d664c601771e4b6efce07123134cac80471397b7f062 *chromedriver-v32.2.3-win32-arm64.zip
+da40875c612f69f3f072500f40ea5d356395ef0a046eaf56a0c790e44724386e *chromedriver-v32.2.3-win32-ia32.zip
+8721a4ea9bf95ab37202e70b17f2bf8f43ca0f93560c34620276c15debacc732 *chromedriver-v32.2.3-win32-x64.zip
+cd847cf0bd4dc8677755d6943f354540a4d7a5271f788d389c01d16a5bae47e8 *electron-api.json
+438e4af8dd3c376228c34295ecdb144bb12caa51d855db621215afe975403603 *electron-v32.2.3-darwin-arm64-dsym-snapshot.zip
+b678040bb9f18b7284434d3a5fb994fc8b4d87e467caa10b66e28f72412273b5 *electron-v32.2.3-darwin-arm64-dsym.zip
+b8e14d9d964823c19bd69ceac044b2406c0b7f730c0a6757b02a6de4134e6c65 *electron-v32.2.3-darwin-arm64-symbols.zip
+a7e57f17813cfff459f60982bd07328ebaf1728e2e9abc2d9e4debc185749f83 *electron-v32.2.3-darwin-arm64.zip
+752f9ca100f8b2cdd6316783d509e52001f433cc79b6f2b66c67838bfe5b160a *electron-v32.2.3-darwin-x64-dsym-snapshot.zip
+7a733751aed9fbbbea90394122a488a08e498e165f53f0d9cf284f19fc12da8d *electron-v32.2.3-darwin-x64-dsym.zip
+7df6a51b10cf9d2f2d045d61fee05144a0db08495c89304eef41c07948254f8b *electron-v32.2.3-darwin-x64-symbols.zip
+5e824c357281d85415c215de58ebe5c5daaa4fab2bc76e563d3da78655a7d57d *electron-v32.2.3-darwin-x64.zip
+0f03c5002747c292388cacd0f95bfc01694cf0f54b63ec3224101eeae6b9896e *electron-v32.2.3-linux-arm64-debug.zip
+e70af1c2c36c54b0ed912e9af52063ce1f6d856338f207eb297611eaccd1afcd *electron-v32.2.3-linux-arm64-symbols.zip
+e435f44bad0f649f2a2b980197df3bfb581c5e78f41e4b5a8b7ca5bfb5d8e344 *electron-v32.2.3-linux-arm64.zip
+0f03c5002747c292388cacd0f95bfc01694cf0f54b63ec3224101eeae6b9896e *electron-v32.2.3-linux-armv7l-debug.zip
+49db1e2b7bf965af352d7fc41d74026a26ebabba443dafd71a8d7da8e7605690 *electron-v32.2.3-linux-armv7l-symbols.zip
+5483ef724d5b363645e039b299c9480bff0e6ef4ad9d9f677675061e0c7010c4 *electron-v32.2.3-linux-armv7l.zip
+72ccc7ebb4f46b034a6fdde0ba08b142141387c52086ab47ba647bdc82030ebb *electron-v32.2.3-linux-x64-debug.zip
+08e209e9740c9460f8f584c7b3fe58e67e6b62652e3051d18babe950400760b2 *electron-v32.2.3-linux-x64-symbols.zip
+f406b8c5f4a33da0c712f558a766348b26b8e2aac0e7bf945a00931161dc4229 *electron-v32.2.3-linux-x64.zip
+2b7debd213c4eb73a47040a067346266a37d4c9cad4c25451dc53511658ad806 *electron-v32.2.3-mas-arm64-dsym-snapshot.zip
+c603ff407f65233bfc58395e88d231743a96aaf6c27005e05826f6e02e5d124d *electron-v32.2.3-mas-arm64-dsym.zip
+26e974578a3c0417e45cf64abc8edfd87a703e4122de5fdfd0473cea7bb3eddd *electron-v32.2.3-mas-arm64-symbols.zip
+6427af76443900f5b1ba109ac83ab51bafae74166bb3cc8f17fd0ccba2fef9d4 *electron-v32.2.3-mas-arm64.zip
+7f95d9b8ee3f6ee77adbd5c5ef154cafa29da9b4824990d2793e746943124252 *electron-v32.2.3-mas-x64-dsym-snapshot.zip
+452c6f1bd79c3149a6acbee953b61454975879aecee882fcec2b80516e624c86 *electron-v32.2.3-mas-x64-dsym.zip
+1f35c9a4c88b8678b15716a52a5b436ceb873893414318d4e4b77554835aafdb *electron-v32.2.3-mas-x64-symbols.zip
+2a7910eae161e8a19102f037f1356e0a269a3291852dc278f966ff782dc740db *electron-v32.2.3-mas-x64.zip
+be1bdbb291c8cd81661947c3cba8529429aba9b919568c51b84dcf49b78b5505 *electron-v32.2.3-win32-arm64-pdb.zip
+7b9d111e1d744c1a5383bed379f2c98f7ee1ef8e6dd2c825340388cfbe4f091d *electron-v32.2.3-win32-arm64-symbols.zip
+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.3-win32-arm64-toolchain-profile.zip
+bda5da0bcc17cca0f8d58ab56a693aa9f95b513079380adf3509fe1484625fff *electron-v32.2.3-win32-arm64.zip
+22d67116167fd021042623283e662c0290a370b0dc63e117e9ca90a3adad19c0 *electron-v32.2.3-win32-ia32-pdb.zip
+6c032b28e246afdf36ceb1f648169ebc7b282756f3b3293949aa4e057236d3c3 *electron-v32.2.3-win32-ia32-symbols.zip
+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.3-win32-ia32-toolchain-profile.zip
+2b38140726382b7fbcb8d24f7a40e45f7567c3987e9fd2397010603d7c1661fc *electron-v32.2.3-win32-ia32.zip
+8ecf644906c7c65da1874a723388216e7dd1a7373326520fe8b040808c04fca5 *electron-v32.2.3-win32-x64-pdb.zip
+56a5a17300a226118eab5e4bac2e79de26ae2d7e380862de93540ed2fb0c464a *electron-v32.2.3-win32-x64-symbols.zip
+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.3-win32-x64-toolchain-profile.zip
+16c996275a3bfc00ac18a4ce733c688fb7cf260a3a5c166514acd047cefe9b78 *electron-v32.2.3-win32-x64.zip
+037ca881119c29a88425115b67c5feba8fba34f3b4fce72a225eeb3b55233518 *electron.d.ts
+f321aad7cab379e52fd564c2726ef1bba833a7a42b49b74eb01971fe1f21c615 *ffmpeg-v32.2.3-darwin-arm64.zip
+e4bda65b109fbc4b6575fdb610ddb0da2e5b6d45fab25cab04e83b858495599e *ffmpeg-v32.2.3-darwin-x64.zip
+3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.3-linux-arm64.zip
+3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.3-linux-armv7l.zip
+fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.3-linux-x64.zip
+6721b25ed05b2bbc7e4dfa4acad278ca50673aeb33dd98aab1bfdd2cfb775c7f *ffmpeg-v32.2.3-mas-arm64.zip
+0dbd22f17adcbcc9b61a129d1e5d2c61edbf8f9bcaeb21482ddb668ac5314f39 *ffmpeg-v32.2.3-mas-x64.zip
+e60af8bc9ac21fc23219d2d7be3bb50a787cae24a8950cb06ff63eff470da41a *ffmpeg-v32.2.3-win32-arm64.zip
+a952f14410d3dfd8e604467db93e186a9e79c48afdebcb9f70d4b8e6ab1cbc9f *ffmpeg-v32.2.3-win32-ia32.zip
+07335b144f838654abbbaa05d12828c2379dde8ff92c41b702b83a859103c856 *ffmpeg-v32.2.3-win32-x64.zip
+cbccfdbf9bdd62824622afaf1d03e587cfc3af15a17c0b0a6aee85dd8a8704cc *hunspell_dictionaries.zip
+32b03e672adb2dd6839a53fccd7bf69221fe5d2460a4159b143f5da90f2a3eb6 *libcxx-objects-v32.2.3-linux-arm64.zip
+bd307af290cebf9f89f7a13110e33f27f05c5a54e798f0651259944536cd1219 *libcxx-objects-v32.2.3-linux-armv7l.zip
+71eee68df857411eebd60240c4314c0fab5e52e7d38d20d95a0e957569255c7d *libcxx-objects-v32.2.3-linux-x64.zip
+d8e209919e726a30f0b1164c2973469f24e7927be32a8db37d51cf35a98f4a8a *libcxx_headers.zip
+153994318f1bb933bb26c5b8f02294da9baa586affd7f3e6ddcc363d1b363722 *libcxxabi_headers.zip
+30fd6c5205f18feafe47a9f0dbc75d5b0bb964dc9b3d744666410a67a3584b99 *mksnapshot-v32.2.3-darwin-arm64.zip
+5986e9ddc4dc8ed073c5cd7cec3f9041e94f9d5647c344071db3665e5e23c0e6 *mksnapshot-v32.2.3-darwin-x64.zip
+d5d94482a0d250c6c0714e33c0f21a03b0908007a97337a415f4bd8347dd5ae6 *mksnapshot-v32.2.3-linux-arm64-x64.zip
+21abdb1b267edefee9320ea5bd5fd91758844add73ffd6b6a16fb7a760c464c7 *mksnapshot-v32.2.3-linux-armv7l-x64.zip
+444dd1e5b56c1cee3f10be59ba9434aa6c7cbf21864f383f9f4c7f89b8bf7e8f *mksnapshot-v32.2.3-linux-x64.zip
+0410382fa750f770d1e22cd299d47545ceab27cdc795d19da5b7a3b708d2eef3 *mksnapshot-v32.2.3-mas-arm64.zip
+001c8cf8330f0e4f6c10e8dbcf9800b8a9a9f9a6e823a5514d3ad200d4d6b620 *mksnapshot-v32.2.3-mas-x64.zip
+f661a64e235a02c7ba7daa812a063f2b8c4d251515bf9b18f8bc4bc256190c73 *mksnapshot-v32.2.3-win32-arm64-x64.zip
+85c2eb6e3737511e367bf8492a612f5ef9f3107492aea5461c3acb7c48192264 *mksnapshot-v32.2.3-win32-ia32.zip
+626aa98144e94c585d0b87196c0d9c5b84381b0e2b4bcb379e550836139f93f3 *mksnapshot-v32.2.3-win32-x64.zip
diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js
index 57934e65799f5..bbcb6bfc3de47 100644
--- a/build/linux/debian/calculate-deps.js
+++ b/build/linux/debian/calculate-deps.js
@@ -72,19 +72,13 @@ function calculatePackageDeps(binaryPath, arch, chromiumSysroot, vscodeSysroot)
// libgcc-s1 is a dependency of libc6. This hack can be removed once
// support for Debian Buster and Ubuntu Bionic are dropped.
//
- // libgdk-pixbuf package has been renamed from libgdk-pixbuf2.0-0 to
- // libgdk-pixbuf-2.0-0 in recent distros. Since we only ship a single
- // linux package we cannot declare a dependeny on it. We can safely
- // exclude this dependency as GTK depends on it and we depend on GTK.
- //
// Remove kerberos native module related dependencies as the versions
// computed from sysroot will not satisfy the minimum supported distros
// Refs https://github.com/microsoft/vscode/issues/188881.
// TODO(deepak1556): remove this workaround in favor of computing the
// versions from build container for native modules.
const filteredDeps = depsStr.split(', ').filter(dependency => {
- return !dependency.startsWith('libgcc-s1') &&
- !dependency.startsWith('libgdk-pixbuf');
+ return !dependency.startsWith('libgcc-s1');
}).sort();
const requires = new Set(filteredDeps);
return requires;
diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
index c44e241388bbe..92f8065f26293 100644
--- a/build/linux/debian/calculate-deps.ts
+++ b/build/linux/debian/calculate-deps.ts
@@ -84,19 +84,13 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
// libgcc-s1 is a dependency of libc6. This hack can be removed once
// support for Debian Buster and Ubuntu Bionic are dropped.
//
- // libgdk-pixbuf package has been renamed from libgdk-pixbuf2.0-0 to
- // libgdk-pixbuf-2.0-0 in recent distros. Since we only ship a single
- // linux package we cannot declare a dependeny on it. We can safely
- // exclude this dependency as GTK depends on it and we depend on GTK.
- //
// Remove kerberos native module related dependencies as the versions
// computed from sysroot will not satisfy the minimum supported distros
// Refs https://github.com/microsoft/vscode/issues/188881.
// TODO(deepak1556): remove this workaround in favor of computing the
// versions from build container for native modules.
const filteredDeps = depsStr.split(', ').filter(dependency => {
- return !dependency.startsWith('libgcc-s1') &&
- !dependency.startsWith('libgdk-pixbuf');
+ return !dependency.startsWith('libgcc-s1');
}).sort();
const requires = new Set(filteredDeps);
return requires;
diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js
index 04abee1d30ac8..6857f6b7c1a13 100644
--- a/build/linux/rpm/dep-lists.js
+++ b/build/linux/rpm/dep-lists.js
@@ -70,7 +70,6 @@ exports.referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.0)(64bit)',
'libgcc_s.so.1(GCC_3.3)(64bit)',
'libgcc_s.so.1(GCC_4.2.0)(64bit)',
- 'libgdk_pixbuf-2.0.so.0()(64bit)',
'libgio-2.0.so.0()(64bit)',
'libglib-2.0.so.0()(64bit)',
'libgobject-2.0.so.0()(64bit)',
@@ -160,7 +159,6 @@ exports.referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.0)',
'libgcc_s.so.1(GCC_3.5)',
'libgcc_s.so.1(GCC_4.3.0)',
- 'libgdk_pixbuf-2.0.so.0',
'libgio-2.0.so.0',
'libglib-2.0.so.0',
'libgobject-2.0.so.0',
@@ -255,7 +253,6 @@ exports.referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.3)(64bit)',
'libgcc_s.so.1(GCC_4.2.0)(64bit)',
'libgcc_s.so.1(GCC_4.5.0)(64bit)',
- 'libgdk_pixbuf-2.0.so.0()(64bit)',
'libgio-2.0.so.0()(64bit)',
'libglib-2.0.so.0()(64bit)',
'libgobject-2.0.so.0()(64bit)',
diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts
index 8761e40cb1ec8..8fd025e51c238 100644
--- a/build/linux/rpm/dep-lists.ts
+++ b/build/linux/rpm/dep-lists.ts
@@ -69,7 +69,6 @@ export const referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.0)(64bit)',
'libgcc_s.so.1(GCC_3.3)(64bit)',
'libgcc_s.so.1(GCC_4.2.0)(64bit)',
- 'libgdk_pixbuf-2.0.so.0()(64bit)',
'libgio-2.0.so.0()(64bit)',
'libglib-2.0.so.0()(64bit)',
'libgobject-2.0.so.0()(64bit)',
@@ -159,7 +158,6 @@ export const referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.0)',
'libgcc_s.so.1(GCC_3.5)',
'libgcc_s.so.1(GCC_4.3.0)',
- 'libgdk_pixbuf-2.0.so.0',
'libgio-2.0.so.0',
'libglib-2.0.so.0',
'libgobject-2.0.so.0',
@@ -254,7 +252,6 @@ export const referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.3)(64bit)',
'libgcc_s.so.1(GCC_4.2.0)(64bit)',
'libgcc_s.so.1(GCC_4.5.0)(64bit)',
- 'libgdk_pixbuf-2.0.so.0()(64bit)',
'libgio-2.0.so.0()(64bit)',
'libglib-2.0.so.0()(64bit)',
'libgobject-2.0.so.0()(64bit)',
diff --git a/cgmanifest.json b/cgmanifest.json
index 57fd8db5f4503..5be1cdf48cd88 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -528,12 +528,12 @@
"git": {
"name": "electron",
"repositoryUrl": "https://github.com/electron/electron",
- "commitHash": "db2050e9d24022b5d7d1bf4873e4725d75383a1f"
+ "commitHash": "bcd7ac5481acc54ba28c6399b279d843ba427b19"
}
},
"isOnlyProductionDependency": true,
"license": "MIT",
- "version": "32.2.1"
+ "version": "32.2.3"
},
{
"component": {
diff --git a/cli/src/commands/serve_web.rs b/cli/src/commands/serve_web.rs
index eef4f331d1099..3dedf4b3f059d 100644
--- a/cli/src/commands/serve_web.rs
+++ b/cli/src/commands/serve_web.rs
@@ -252,6 +252,7 @@ fn get_release_from_path(path: &str, platform: Platform) -> Option<(Release, Str
let (quality_commit, remaining) = path.split_at(i);
let (quality, commit) = quality_commit.split_at(quality_commit_sep);
+ let commit = &commit[1..];
if !is_commit_hash(commit) {
return None;
diff --git a/package-lock.json b/package-lock.json
index 2150cf7f8c6d8..8495295338e5c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -96,7 +96,7 @@
"cssnano": "^6.0.3",
"debounce": "^1.0.0",
"deemon": "^1.8.0",
- "electron": "32.2.1",
+ "electron": "32.2.3",
"eslint": "^9.11.1",
"eslint-formatter-compact": "^8.40.0",
"eslint-plugin-header": "3.1.1",
@@ -5815,9 +5815,9 @@
"dev": true
},
"node_modules/electron": {
- "version": "32.2.1",
- "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.1.tgz",
- "integrity": "sha512-GCPI/5hU34pPcNltNpz+uylhhuTm9BM0N8RmrbVgaWBodLSmmcCkvpgN0BseKhO6IwQOPzWaovrcZ/nPIpfGaQ==",
+ "version": "32.2.3",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.3.tgz",
+ "integrity": "sha512-ClTJrFuwBdZpDNEnVZSV1gTIYSq7c/TYoUv9AmOypL43/xtbfxXkz2vE67ehVoamFobWsIU2by087R5Av8cxJg==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
diff --git a/package.json b/package.json
index 9b56e2f67de97..d8b0e933fa68f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.96.0",
- "distro": "4460d4a3498ebd6eabd7ab5552d3ca2600026f99",
+ "distro": "af82ec3330347ea13edd9b1501e3374a5dec8a86",
"author": {
"name": "Microsoft Corporation"
},
@@ -154,7 +154,7 @@
"cssnano": "^6.0.3",
"debounce": "^1.0.0",
"deemon": "^1.8.0",
- "electron": "32.2.1",
+ "electron": "32.2.3",
"eslint": "^9.11.1",
"eslint-formatter-compact": "^8.40.0",
"eslint-plugin-header": "3.1.1",
diff --git a/src/vs/editor/browser/gpu/viewGpuContext.ts b/src/vs/editor/browser/gpu/viewGpuContext.ts
index 3ce60a6c833cd..307636b37e1fe 100644
--- a/src/vs/editor/browser/gpu/viewGpuContext.ts
+++ b/src/vs/editor/browser/gpu/viewGpuContext.ts
@@ -138,4 +138,28 @@ export class ViewGpuContext extends Disposable {
}
return true;
}
+
+ /**
+ * Like {@link canRender} but returned detailed information about why the line cannot be rendered.
+ */
+ public static canRenderDetailed(options: ViewLineOptions, viewportData: ViewportData, lineNumber: number): string[] {
+ const data = viewportData.getViewLineRenderingData(lineNumber);
+ const reasons: string[] = [];
+ if (data.containsRTL) {
+ reasons.push('containsRTL');
+ }
+ if (data.maxColumn > GpuRenderLimits.maxGpuCols) {
+ reasons.push('maxColumn > maxGpuCols');
+ }
+ if (data.continuesWithWrappedLine) {
+ reasons.push('continuesWithWrappedLine');
+ }
+ if (data.inlineDecorations.length > 0) {
+ reasons.push('inlineDecorations > 0');
+ }
+ if (lineNumber >= GpuRenderLimits.maxGpuLines) {
+ reasons.push('lineNumber >= maxGpuLines');
+ }
+ return reasons;
+ }
}
diff --git a/src/vs/editor/browser/viewParts/gpuMark/gpuMark.css b/src/vs/editor/browser/viewParts/gpuMark/gpuMark.css
index 0aa4397ea7e15..988c4bcb24ad0 100644
--- a/src/vs/editor/browser/viewParts/gpuMark/gpuMark.css
+++ b/src/vs/editor/browser/viewParts/gpuMark/gpuMark.css
@@ -8,7 +8,13 @@
top: 0;
bottom: 0;
left: 0;
- width: 2px;
+ width: 100%;
display: inline-block;
- background: var(--vscode-editorLineNumber-foreground);
+ border-left: solid 2px var(--vscode-editorWarning-foreground);
+ opacity: 0.2;
+ transition: background-color 0.1s linear;
+}
+
+.monaco-editor .margin-view-overlays .gpu-mark:hover {
+ background-color: var(--vscode-editorWarning-foreground)
}
diff --git a/src/vs/editor/browser/viewParts/gpuMark/gpuMark.ts b/src/vs/editor/browser/viewParts/gpuMark/gpuMark.ts
index e1d25ac2794ac..7019eff5e007e 100644
--- a/src/vs/editor/browser/viewParts/gpuMark/gpuMark.ts
+++ b/src/vs/editor/browser/viewParts/gpuMark/gpuMark.ts
@@ -77,8 +77,8 @@ export class GpuMarkOverlay extends DynamicViewOverlay {
const output: string[] = [];
for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
const lineIndex = lineNumber - visibleStartLineNumber;
- const canRender = ViewGpuContext.canRender(options, viewportData, lineNumber);
- output[lineIndex] = canRender ? `` : '';
+ const cannotRenderReasons = ViewGpuContext.canRenderDetailed(options, viewportData, lineNumber);
+ output[lineIndex] = cannotRenderReasons.length ? `` : '';
}
this._renderResult = output;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts
index 5e2a44b7d94d9..4b41c60fea157 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts
@@ -18,6 +18,8 @@ import { hasUndecidedChatEditingResourceContextKey, IChatEditingService } from '
import { ChatContextKeys } from '../common/chatContextKeys.js';
import { isEqual } from '../../../../base/common/resources.js';
import { Range } from '../../../../editor/common/core/range.js';
+import { getNotebookEditorFromEditorPane } from '../../notebook/browser/notebookBrowser.js';
+import { ctxNotebookHasEditorModification } from '../../notebook/browser/chatEdit/notebookChatEditController.js';
abstract class NavigateAction extends Action2 {
@@ -36,7 +38,7 @@ abstract class NavigateAction extends Action2 {
? KeyMod.Alt | KeyCode.F5
: KeyMod.Alt | KeyMod.Shift | KeyCode.F5,
weight: KeybindingWeight.EditorContrib,
- when: ContextKeyExpr.and(ctxHasEditorModification, EditorContextKeys.focus),
+ when: ContextKeyExpr.and(ContextKeyExpr.or(ctxHasEditorModification, ctxNotebookHasEditorModification), EditorContextKeys.focus),
},
f1: true,
menu: {
@@ -120,7 +122,7 @@ abstract class AcceptDiscardAction extends Action2 {
? localize2('accept2', 'Accept')
: localize2('discard2', 'Discard'),
category: CHAT_CATEGORY,
- precondition: ContextKeyExpr.and(ChatContextKeys.requestInProgress.negate(), hasUndecidedChatEditingResourceContextKey, ctxHasEditorModification),
+ precondition: ContextKeyExpr.and(ChatContextKeys.requestInProgress.negate(), hasUndecidedChatEditingResourceContextKey, ContextKeyExpr.or(ctxHasEditorModification, ctxNotebookHasEditorModification)),
icon: accept
? Codicon.check
: Codicon.discard,
@@ -144,20 +146,24 @@ abstract class AcceptDiscardAction extends Action2 {
const chatEditingService = accessor.get(IChatEditingService);
const editorService = accessor.get(IEditorService);
- const editor = editorService.activeTextEditorControl;
- if (!isCodeEditor(editor) || !editor.hasModel()) {
+ let uri = getNotebookEditorFromEditorPane(editorService.activeEditorPane)?.textModel?.uri;
+ if (!uri) {
+ const editor = editorService.activeTextEditorControl;
+ uri = isCodeEditor(editor) && editor.hasModel() ? editor.getModel().uri : undefined;
+ }
+ if (!uri) {
return;
}
- const session = chatEditingService.getEditingSession(editor.getModel().uri);
+ const session = chatEditingService.getEditingSession(uri);
if (!session) {
return;
}
if (this.accept) {
- session.accept(editor.getModel().uri);
+ session.accept(uri);
} else {
- session.reject(editor.getModel().uri);
+ session.reject(uri);
}
}
}