diff --git a/.npmrc b/.npmrc index 615e523accf..5ae1de62ddb 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="35.4.0" -ms_build_id="11602177" +target="35.5.0" +ms_build_id="11678209" runtime="electron" build_from_source="true" legacy-peer-deps="true" diff --git a/.nvmrc b/.nvmrc index 7d41c735d71..8320a6d2994 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22.14.0 +22.15.1 diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 7d4eaac3624..e38edb2eaa7 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -d58fb1a4db780585461df9c85fbc6c37247986220dd1185608ef2c51bb4d458b *chromedriver-v35.4.0-darwin-arm64.zip -5ac2f8865fff4bb4e5def11b468799b1806150bb8bd1106c9d6c8772b0f2492f *chromedriver-v35.4.0-darwin-x64.zip -22c62283e1a3427597433216ae6428af527e33b5be6bc39bb5d1b9654921826b *chromedriver-v35.4.0-linux-arm64.zip -95537f69b8558a334f60ed1a4684a8a68e8fcf05659843dcdd65f335a4c386d0 *chromedriver-v35.4.0-linux-armv7l.zip -8bf999921936c2be7caf60e8d7d970046e795a76432a0ec29c276588951a7157 *chromedriver-v35.4.0-linux-x64.zip -5ff0181ac82100cb9b7b6b8c85a59647e563b3a86c754de63f1b4a34bb541552 *chromedriver-v35.4.0-mas-arm64.zip -eed4a99a5b43f9be9f4818a2156caac8bdb53afc5489d16d11c7b6854e414148 *chromedriver-v35.4.0-mas-x64.zip -a6bec63988ed5bd95a60d35548b73c1e2611ff2f97c711ccac85c1e56efb8124 *chromedriver-v35.4.0-win32-arm64.zip -82b3c02d1464b5f5394068527430203ba5a81cfe522ca0de8641bbf32c599431 *chromedriver-v35.4.0-win32-ia32.zip -b014aa6649429e6db466c8a294b93bbb6d4f1af5f91e6da83188d7ce4ee99433 *chromedriver-v35.4.0-win32-x64.zip -bb327cc0b8516f808d27aed237003da30d79efd535f9369a780e649c8e7abe25 *electron-api.json -26480b21c4e1e5270fff3c51e9ee67f47bcc4361491a7227327542daecc406c4 *electron-v35.4.0-darwin-arm64-dsym-snapshot.zip -96d90717c51b80b7a36f5ca990065230c1165a7c9d9d38857fd211f115d23641 *electron-v35.4.0-darwin-arm64-dsym.zip -34ec66ec70a60d35a1848890c30d55ff54b4205e2054f33f0d6e4c5d737b7d66 *electron-v35.4.0-darwin-arm64-symbols.zip -787218e745af06757635a008a55a8073914ef3d27b3cc133593bd5af267fb945 *electron-v35.4.0-darwin-arm64.zip -c8557d79133955dcd87cf6714a3ef336e54b6a0c213f4c8b854e5f42f09662b0 *electron-v35.4.0-darwin-x64-dsym-snapshot.zip -e98fc354153d37aca12f6abd316f83c1c5e6983282b790519eecf22aab3d4b4f *electron-v35.4.0-darwin-x64-dsym.zip -da135b3443b9b0e56a8e0fe923263b0f0b7906de8b57597a284c90bf39f9a129 *electron-v35.4.0-darwin-x64-symbols.zip -714b3c92718ca23ed51870c03d70dbabe6ce82607927ae6dbcb7e5515ed57c72 *electron-v35.4.0-darwin-x64.zip -a8475812f5e615c32b7192d2f5f172597e2cdc3840b1383b122b0960ae3abe8e *electron-v35.4.0-linux-arm64-debug.zip -563e2ae32832587e2d69c9933592f019d25b87a71b57017058b2a4ef95c7b279 *electron-v35.4.0-linux-arm64-symbols.zip -7408f387c1e2d753819d647d0a67710ec4d25467484fb3d3bb7aeca0989d46bf *electron-v35.4.0-linux-arm64.zip -a8475812f5e615c32b7192d2f5f172597e2cdc3840b1383b122b0960ae3abe8e *electron-v35.4.0-linux-armv7l-debug.zip -b9881a91e847f53cce0cdd1fc4d298540c9a2f820a81bbf40963ebe0c919edd8 *electron-v35.4.0-linux-armv7l-symbols.zip -29db4fe1d218c932ee4c4f316ddd8bc62b7efae16b13b627cdf76721b168486a *electron-v35.4.0-linux-armv7l.zip -319953406d234638dcb988b008d1416c19d8d34b3aa083732d93e1bdb85bce28 *electron-v35.4.0-linux-x64-debug.zip -380aa70e7a72fd5a3675f9b79773a1473c001a9d91f544f48722e6bff4b2a14e *electron-v35.4.0-linux-x64-symbols.zip -48ef220fe1880774af9253bcebdf028a9a896a2f25b1a8bb24fdaeaecc06674e *electron-v35.4.0-linux-x64.zip -0566dad0246f084b48f5bc4df771261e663707c546cb42da492efe4117d0f397 *electron-v35.4.0-mas-arm64-dsym-snapshot.zip -37ab5b285a0256b6a994db2ee10a1f93ef6f89511cb4c1b5ca2b0a75589b1e21 *electron-v35.4.0-mas-arm64-dsym.zip -f6dce245d1d78f1cb195836c9fd05579b5e354e5d0a055b0566df9898acc5384 *electron-v35.4.0-mas-arm64-symbols.zip -845d97b1438e834e63d6388227a7512a874d3e093df99c0fc4f5c4e0341cc6a8 *electron-v35.4.0-mas-arm64.zip -a1939dc9b12cc7d18939a8af6df474fd9bc300bb9d8bbcdcecf401d79f400ef3 *electron-v35.4.0-mas-x64-dsym-snapshot.zip -7f004873262fd78bfe13d6e4f08730ac4ea8405b6ec64f27acf1c554abd66edb *electron-v35.4.0-mas-x64-dsym.zip -b83efb2c273391057e8aa6dd1947f85d3dea04b55562ba411218d09b9f67a416 *electron-v35.4.0-mas-x64-symbols.zip -179cfc14ed3da25903c2149631a6d4a00633e154881da3a038550c178f585db9 *electron-v35.4.0-mas-x64.zip -eeb4755e590ff68317d422ea6ddbde5d83a7ecb2d7417a6f45d7d03dae2d10d3 *electron-v35.4.0-win32-arm64-pdb.zip -6afa154d47c02949491722eaf0c94ea827a0c9a2fbe54aea94a96cb8c18e4491 *electron-v35.4.0-win32-arm64-symbols.zip -c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v35.4.0-win32-arm64-toolchain-profile.zip -72f623cd31b1f30ba8207cdbbcfa18d64a6d453c37b519daf655cdcde10cee9a *electron-v35.4.0-win32-arm64.zip -a7e97771a753b558c7163b3d72c5b5db12a57babdb84918017d3280dc928e578 *electron-v35.4.0-win32-ia32-pdb.zip -48c248d7eacb3a3be4c4c45859896a7fcccdd73d42564afe907ce1c6783f7889 *electron-v35.4.0-win32-ia32-symbols.zip -c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v35.4.0-win32-ia32-toolchain-profile.zip -adaca824caf152e2ae304452cdbacfd45b7ed3935da1211a9cc412ffe3c05087 *electron-v35.4.0-win32-ia32.zip -0bcc742f1fb41f3ebb0f1e030adb3a23f4ea09c3cd70fac68c09e5d16cee4fb4 *electron-v35.4.0-win32-x64-pdb.zip -50da8878d52b1182a723ac1d17227b33fcc2afc2babfdcc8889b436c28ca77d2 *electron-v35.4.0-win32-x64-symbols.zip -c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v35.4.0-win32-x64-toolchain-profile.zip -f45e637f85a3be3c8aa9571e48c29d7d7deae6372f827c3d9bacf69de598570e *electron-v35.4.0-win32-x64.zip -22c1723e008a8f2db879588d705ba528894c5d56053539f29de54de30cbe36a3 *electron.d.ts -f82f63b3c72e2ada752aaaa347c69634898693c19aacef8ffc41ee63d4763005 *ffmpeg-v35.4.0-darwin-arm64.zip -27637805014111051ed8c4690e98f15180a364ac5b2c97930c03d93592190ace *ffmpeg-v35.4.0-darwin-x64.zip -72e89440cbdd5b7eaae16f0ef5f1cb2ee43253938e07617954b8f9cd0cf6f462 *ffmpeg-v35.4.0-linux-arm64.zip -c09c0807f37170eaef01d6647ad691cd6ef8f35440c9dc42eb75c9af74e9ae93 *ffmpeg-v35.4.0-linux-armv7l.zip -c9faac57f5388d9ee280bfbd82eafab64955149eed99ee47e0e6f03316486fba *ffmpeg-v35.4.0-linux-x64.zip -f82f63b3c72e2ada752aaaa347c69634898693c19aacef8ffc41ee63d4763005 *ffmpeg-v35.4.0-mas-arm64.zip -27637805014111051ed8c4690e98f15180a364ac5b2c97930c03d93592190ace *ffmpeg-v35.4.0-mas-x64.zip -3a545b35793f2a3266ec259f9f553fe3972a91071e0979f5cb0b4cca7940bc7d *ffmpeg-v35.4.0-win32-arm64.zip -3a545b35793f2a3266ec259f9f553fe3972a91071e0979f5cb0b4cca7940bc7d *ffmpeg-v35.4.0-win32-ia32.zip -3a545b35793f2a3266ec259f9f553fe3972a91071e0979f5cb0b4cca7940bc7d *ffmpeg-v35.4.0-win32-x64.zip -064b7188a45bd1d909b7ef1b8bb4c16427d1a9fe3ca6c8a24f697b40a1cc293a *hunspell_dictionaries.zip -5c1024015c6b81260357a485f74e4e1f37de0a8021f17a07db3f31be4a932672 *libcxx-objects-v35.4.0-linux-arm64.zip -876e3bc167e654ccddfa6420691bf7104d69e670da4ceb2088837f89ff0d1863 *libcxx-objects-v35.4.0-linux-armv7l.zip -a496df1a893145759643ffc3f70c4d8d57a00a8f543d7d812419ef2641dc7bd1 *libcxx-objects-v35.4.0-linux-x64.zip -e152220857ff90c017daad55f541f86b126d4ecee0c4634a3755e73abc9d5004 *libcxx_headers.zip -a54dfee688fb899e9b0e6584aca8bcfbc1a621ff79ddd030da6515263553c845 *libcxxabi_headers.zip -9bdb0c19c10ebc1eeb346c2c250594f3d3efe7d2e5247c02caf10e4ff31d5833 *mksnapshot-v35.4.0-darwin-arm64.zip -44f3fa6199f6024082684ad5042770a30c03ebe3a3d7530d72b77bd0d6b05964 *mksnapshot-v35.4.0-darwin-x64.zip -42c6f0a5485c6edbee929d380328cc77126f502ca50b8ec23b97c16ad4020607 *mksnapshot-v35.4.0-linux-arm64-x64.zip -3795701f99875d00cc14aa83fdd213c99acda36621fe4186760a784f88c48c51 *mksnapshot-v35.4.0-linux-armv7l-x64.zip -c39524a78afb44e3f515607ab0dff9af7cf954305985d1835ae37b803765be24 *mksnapshot-v35.4.0-linux-x64.zip -29dfcbea2819ef4ed393e3427067d93b1163c113967da5b36d88a651f309a3fb *mksnapshot-v35.4.0-mas-arm64.zip -6b554f72f82b3bbbfcfc4d718c0b42ba2f3db2bfffe7a1675859c4af052c06bb *mksnapshot-v35.4.0-mas-x64.zip -df9f1d6081db0fe61a607e0761581e96680abb26ff66cec35cfd8e7234024979 *mksnapshot-v35.4.0-win32-arm64-x64.zip -633a1ee40e3474a18d11ddb860d60f67b98820093b71056ca973d93804056fbb *mksnapshot-v35.4.0-win32-ia32.zip -f5a9d1ca3f4e4d7a423ce0f5953a5c6441b3b67e5085e9fa465eb9795c172a02 *mksnapshot-v35.4.0-win32-x64.zip +511a3c6a6b6032985224bcbc1c4884f8673f7573bde7f3919e9797d6645b53c4 *chromedriver-v35.5.0-darwin-arm64.zip +c995faf74d2d7e5b6000b8a1e9551d60e396a19a29796608a090417388a9dd1a *chromedriver-v35.5.0-darwin-x64.zip +25923b319e958285847d4e5c154eb7877b49380042a20c781185d8b6eb558afa *chromedriver-v35.5.0-linux-arm64.zip +d67750b53d37699ade36ebe1912bd72b64af6e825d2d0ac5095531a0b84b191d *chromedriver-v35.5.0-linux-armv7l.zip +a1ef549561d64a9d10c1e658f8e86cd735d4261f0c4fc871d8c342240c23d9e0 *chromedriver-v35.5.0-linux-x64.zip +cbe181665b1353647ab76b314362f7ab0a1946fa5d50ad70c7cff0ac59e354ec *chromedriver-v35.5.0-mas-arm64.zip +6ee6c8b1e6ccd64530cf0398c208631815553431fde56f4fca787900598aac2b *chromedriver-v35.5.0-mas-x64.zip +c38d48a22376401ad10ce27d07efcbe6c0de01a3628d9c01c84427799a25f049 *chromedriver-v35.5.0-win32-arm64.zip +f73bbac9d8c2c459ba062696a0dac5307fe8db5641d07154ee693bc77d49658e *chromedriver-v35.5.0-win32-ia32.zip +3dd73818c88d3fea8bd51a8d4f9ad009548320a4664f9f4166ce679b6d3c6dbf *chromedriver-v35.5.0-win32-x64.zip +3d7afa3e5e78c07e91b0b161cc9a393aafe69b41c17fa5b72877019f3d11ed00 *electron-api.json +fd5a81799a95518ef1f1c71071bf7f0fe3d3123bf480089cdcc0f2e169ae8c79 *electron-v35.5.0-darwin-arm64-dsym-snapshot.zip +dd3e8ce297040302a2e696f1aa345d9b61bd9c27aa52601d7745366c55ca1803 *electron-v35.5.0-darwin-arm64-dsym.zip +3f3f8617e07ac8e4b995e020404863be0ff0c2dac5e5bceaf0b73dc9b5bf3ef3 *electron-v35.5.0-darwin-arm64-symbols.zip +03b2926356c6cf8718b2d62ee8dd1eaa0812c1f44c5a751c332401dd2867aa47 *electron-v35.5.0-darwin-arm64.zip +b3a1d0b98dad91b49a60290834b0880f83a2cd88e72c2a2566838f6df192b6d9 *electron-v35.5.0-darwin-x64-dsym-snapshot.zip +f74ab5d4ea70403ba21e468d3a4d9bb7870b8a558c645fd555adf65a952878c3 *electron-v35.5.0-darwin-x64-dsym.zip +c3d248d11e1b1281c3c0113d9a95ac18c2293fbf1cc18458a08851fe191e79d0 *electron-v35.5.0-darwin-x64-symbols.zip +3cfff8110bd11d2b3c342b56674d3fd5863698d8413a2a97be80169f61e23ddf *electron-v35.5.0-darwin-x64.zip +d2588802b2807d435bc6ae34bb1992e77fb974384e17d9125de12f562dd99d78 *electron-v35.5.0-linux-arm64-debug.zip +1125e2bb6b7c0a85794bf4de8fc705ac51c0a090e1f6f75e571090ab306f1306 *electron-v35.5.0-linux-arm64-symbols.zip +9e98b01d5c6611437e8eecece093307e3e59733bb64c068fc3f9bd226b92238d *electron-v35.5.0-linux-arm64.zip +d2588802b2807d435bc6ae34bb1992e77fb974384e17d9125de12f562dd99d78 *electron-v35.5.0-linux-armv7l-debug.zip +c5ab740a7451abf06ce49efee4e09fae5d73740607f72f9fcd4fa162f6b0c114 *electron-v35.5.0-linux-armv7l-symbols.zip +3072f6865c6f0202d4059224cb43ecab27f03852025addf09a4fa1b6606cb80c *electron-v35.5.0-linux-armv7l.zip +823eb873aab52ca5e7ae84359867f4f071b439f28d87a8b152ae963ca4ae03a5 *electron-v35.5.0-linux-x64-debug.zip +0324c07f4cbb1e8eea13ff5f5141d16620dcbb46907cf2cc31eb52b774f8c18c *electron-v35.5.0-linux-x64-symbols.zip +4e9d927a8edecf59dde02b98fe6bfde64814141898650ca1c69820ae0edbcfa4 *electron-v35.5.0-linux-x64.zip +9442026180241b98fbb253de3e177d3be984bf81162a159ccc2cc2d7a27f9d80 *electron-v35.5.0-mas-arm64-dsym-snapshot.zip +c01b600f49922defdcd21eb07373795cf1b1c40ed16c41c7337c42bb52512995 *electron-v35.5.0-mas-arm64-dsym.zip +15b097b5def53bf6c624ff1f2d0906862cb0159baa77a8dbf8c27c2fd31952af *electron-v35.5.0-mas-arm64-symbols.zip +d6c94b8890fc5bf323a548bca119b0f60285f645ea84afaa69f96a375f530720 *electron-v35.5.0-mas-arm64.zip +178fdfcf6f066248795970f3b6b23f5b00fd269421af5a086ed6f86ee540a723 *electron-v35.5.0-mas-x64-dsym-snapshot.zip +7bee00f723fb86227fe776b5c4065062af750ddb32aa9ef350467b17878ed3e1 *electron-v35.5.0-mas-x64-dsym.zip +e5f0add3894f345dbd7203dc24c7b3632891cd22fee353ef11ed61c7ebc46747 *electron-v35.5.0-mas-x64-symbols.zip +105193498be319f5a298550bb9ae41f700481f11d86776a4e252a49f1fdaf627 *electron-v35.5.0-mas-x64.zip +2c792a5cad686cfb78b3fe4e9452d78f9d4a2dc63b3416b58f752a16a99d39f6 *electron-v35.5.0-win32-arm64-pdb.zip +44d49aaacf775fbf97c0166c586092e452df024f02fc8f95ec4457951172bfa2 *electron-v35.5.0-win32-arm64-symbols.zip +a8e333590983ade618d66e396a229d3c7fd872ae8c1dfd85d7e36891dfeebfb7 *electron-v35.5.0-win32-arm64-toolchain-profile.zip +e82778f5566ebce86c5af8e807fcc94c1199e7801aa4abdfa204e39aec062ca1 *electron-v35.5.0-win32-arm64.zip +aff9c3bea0e5575a34816ecabbc0fb304a9d2feeebd5da80fc09306e00f4dcf2 *electron-v35.5.0-win32-ia32-pdb.zip +90939c8ec18ccdc3a88ce64aaeac8245b6f08f8a631b1c217d519bd5218f2d27 *electron-v35.5.0-win32-ia32-symbols.zip +a8e333590983ade618d66e396a229d3c7fd872ae8c1dfd85d7e36891dfeebfb7 *electron-v35.5.0-win32-ia32-toolchain-profile.zip +9d18e60785b1f8d93f3379cfb2750a1ce7533402e3bfed3bf9221e26896fbe92 *electron-v35.5.0-win32-ia32.zip +d2cb53960d2f01ab66463deec6183272c665ded0d7dee31bf5c6f94fc7a0e1b0 *electron-v35.5.0-win32-x64-pdb.zip +1709239d7821bb3b80711c19d8aa536a87d2eff0101caa089ab84a04cf362c5a *electron-v35.5.0-win32-x64-symbols.zip +a8e333590983ade618d66e396a229d3c7fd872ae8c1dfd85d7e36891dfeebfb7 *electron-v35.5.0-win32-x64-toolchain-profile.zip +3b346385a9ef5c35658e956718d8fb52f93b483a9af731d8d8b8deb3fc5aa084 *electron-v35.5.0-win32-x64.zip +1ab238b54560c0e89488db437c8cfa5c8257c974a52eb22dddc3f8fd6aeb1641 *electron.d.ts +f82f63b3c72e2ada752aaaa347c69634898693c19aacef8ffc41ee63d4763005 *ffmpeg-v35.5.0-darwin-arm64.zip +27637805014111051ed8c4690e98f15180a364ac5b2c97930c03d93592190ace *ffmpeg-v35.5.0-darwin-x64.zip +72e89440cbdd5b7eaae16f0ef5f1cb2ee43253938e07617954b8f9cd0cf6f462 *ffmpeg-v35.5.0-linux-arm64.zip +c09c0807f37170eaef01d6647ad691cd6ef8f35440c9dc42eb75c9af74e9ae93 *ffmpeg-v35.5.0-linux-armv7l.zip +c9faac57f5388d9ee280bfbd82eafab64955149eed99ee47e0e6f03316486fba *ffmpeg-v35.5.0-linux-x64.zip +f82f63b3c72e2ada752aaaa347c69634898693c19aacef8ffc41ee63d4763005 *ffmpeg-v35.5.0-mas-arm64.zip +27637805014111051ed8c4690e98f15180a364ac5b2c97930c03d93592190ace *ffmpeg-v35.5.0-mas-x64.zip +f8d0c0c14012940bdd0430228caf1df55a1e4e27473fef2a2ad283d2fcd7f8cb *ffmpeg-v35.5.0-win32-arm64.zip +f8d0c0c14012940bdd0430228caf1df55a1e4e27473fef2a2ad283d2fcd7f8cb *ffmpeg-v35.5.0-win32-ia32.zip +f8d0c0c14012940bdd0430228caf1df55a1e4e27473fef2a2ad283d2fcd7f8cb *ffmpeg-v35.5.0-win32-x64.zip +83e79c5d5a8a1dbe808d050e949062a1e76e491a6f50aa5d1970c650fb263797 *hunspell_dictionaries.zip +db360f881f5b965b104c2d5feef4fa7ae2f85f6d2cea7910d4afe1c3a12026b8 *libcxx-objects-v35.5.0-linux-arm64.zip +d18b612efa85c4bc7d3d434983aca4178430804f193d533d7d067f42bfa15a55 *libcxx-objects-v35.5.0-linux-armv7l.zip +3bc798f766e8e4c4cb074d717af281644b0e276af49730c3c284a16056f694bb *libcxx-objects-v35.5.0-linux-x64.zip +373e3f489b24df3cd96e0128e85716104490fbe4a17cb1dd70370c9d451fc914 *libcxx_headers.zip +de70af1f51d8627eb8ec3b257944deacde745bc54cd0c9927438db93f837a1e5 *libcxxabi_headers.zip +3e9350cb4b76d6ef106fce2a0c3e582a01a2de3cb5e6fc8aed820722f0cf21f6 *mksnapshot-v35.5.0-darwin-arm64.zip +6b9ab445181dabdfea094a2ddfd216d54f627523b46b7b58453ea64d2dc5462a *mksnapshot-v35.5.0-darwin-x64.zip +987da55d5df6f650957177504825b905adef237e726403c88d73d32ed5f3ebdb *mksnapshot-v35.5.0-linux-arm64-x64.zip +29c17e325e4b940458ab72d7a29a6b30f4ab9b3fae2208d6464a3b0fc93b3662 *mksnapshot-v35.5.0-linux-armv7l-x64.zip +0e26c47fb2030f5e2f26dc4502c93f0d49c389c13819a410972bc5d89b7c8a70 *mksnapshot-v35.5.0-linux-x64.zip +7a78c8472bedf7a9157abb08a6181625390d120a8206b57342cc3450148452d3 *mksnapshot-v35.5.0-mas-arm64.zip +504426631696d61ab0fed593484f06eed122d0ef8d3978ea0b0260eb4c23fa88 *mksnapshot-v35.5.0-mas-x64.zip +7d415d354935a8cbe39af5bc06c8d06c8dc9bd79e912f70275c376f6e16e39e0 *mksnapshot-v35.5.0-win32-arm64-x64.zip +2bd70a9723f6d6d118bc1712bb9018791deac4b6ccf4e6a8a506f73cb1194b5d *mksnapshot-v35.5.0-win32-ia32.zip +64fa865f8863c1e15711d470bde0cb69a0c1cdefb3bfa9207f7d1fc83dbeecd9 *mksnapshot-v35.5.0-win32-x64.zip diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt index adbb34a231c..5ac7c3f3b37 100644 --- a/build/checksums/nodejs.txt +++ b/build/checksums/nodejs.txt @@ -1,7 +1,7 @@ -92eb58f54d172ed9dee320b8450f1390db629d4262c936d5c074b25a110fed02 node-v22.15.0-darwin-arm64.tar.gz -f7f42bee60d602783d3a842f0a02a2ecd9cb9d7f6f3088686c79295b0222facf node-v22.15.0-darwin-x64.tar.gz -c3582722db988ed1eaefd590b877b86aaace65f68746726c1f8c79d26e5cc7de node-v22.15.0-linux-arm64.tar.gz -639a3ee3217049ba20e6f05651c7281a9d007111196387eb177081af8851e52f node-v22.15.0-linux-armv7l.tar.gz -29d1c60c5b64ccdb0bc4e5495135e68e08a872e0ae91f45d9ec34fc135a17981 node-v22.15.0-linux-x64.tar.gz -ebdab2adc9ff5fb09f852b665875af35138b9ee5725a3927bb85d7cfd36e059f win-arm64/node.exe -77bdff912b1c569b3e693fe126f619337c3e9d73dafbc4d0bf1d4f1f6a145761 win-x64/node.exe +d2689b86b17e1b51e76f801ffe2d9acca4225e76eda4b843c3d8438d4a7cd6fe node-v22.15.1-darwin-arm64.tar.gz +1c722d0dd6d3f60e8b0be014ea01b8a59f5088f4419197a1b37544854d61cc6f node-v22.15.1-darwin-x64.tar.gz +eb3f232b83dfe83397b98395ec77a973e888e8959c978b3e4eeb551b8845b74f node-v22.15.1-linux-arm64.tar.gz +346426e2bca62c98fb12213c39e80b0e349d7620238f74b7208d12e18fde87fd node-v22.15.1-linux-armv7l.tar.gz +f4b8eec683708acb1a2a73c7182ba2de5466a5dd5f705934a0830903df28821c node-v22.15.1-linux-x64.tar.gz +e9e669cf7e9772406e3a59cb4b9b606e75eb1d9f454b675e1c78a6aaa542b31d win-arm64/node.exe +b3191cc083480282f1edaa3324002c320704a00d7564cf1f7c48b610d1c060b6 win-x64/node.exe diff --git a/cgmanifest.json b/cgmanifest.json index b2d2d12bf30..9bd35e1cfdc 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -516,11 +516,11 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "b009466555c360513b8012ce549f716501090ee5" + "commitHash": "7039b12ae5e0913f7a14da4d9d58ad04d4a4a16e" } }, "isOnlyProductionDependency": true, - "version": "22.15.0" + "version": "22.15.1" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "9f4e0b9343bd25389191cc20cf62dbd023c022a2" + "commitHash": "a8cdd60c883ccdb29d111e4290974d02c1be539e" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "35.4.0" + "version": "35.5.0" }, { "component": { diff --git a/package-lock.json b/package-lock.json index b75638f29b6..4cfe4074333 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ "css-loader": "^6.9.1", "debounce": "^1.0.0", "deemon": "^1.13.4", - "electron": "35.4.0", + "electron": "35.5.0", "eslint": "^9.11.1", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", @@ -5865,9 +5865,9 @@ "dev": true }, "node_modules/electron": { - "version": "35.4.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-35.4.0.tgz", - "integrity": "sha512-VIPSNcUnic00aaE83w6BW4Dj1kE8A5DU0nVbvwqotN3+gseGunbP4WyHp/kfKXVKQj1S3No3HnYxU5LJmYbAtw==", + "version": "35.5.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-35.5.0.tgz", + "integrity": "sha512-16ScwDuKgnuL7tSrEgBvQe1Hm4CSK0vbOusPFrDs4oIs3QOdEFtrP9i8+4yKQGXpszj4f4F0MQjKv1tu9E4Gvg==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index 78b86c964be..5cb200c6a4d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.101.0", - "distro": "a4a51f792a6f0ce2060af18f27dcb4ae0895851d", + "distro": "5de5e121db5bba9b994f18f1fb31c1becec94793", "author": { "name": "Microsoft Corporation" }, @@ -154,7 +154,7 @@ "css-loader": "^6.9.1", "debounce": "^1.0.0", "deemon": "^1.13.4", - "electron": "35.4.0", + "electron": "35.5.0", "eslint": "^9.11.1", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", diff --git a/remote/.npmrc b/remote/.npmrc index f89f98d63f4..910703ce8df 100644 --- a/remote/.npmrc +++ b/remote/.npmrc @@ -1,6 +1,6 @@ disturl="https://nodejs.org/dist" -target="22.15.0" -ms_build_id="338827" +target="22.15.1" +ms_build_id="340892" runtime="node" build_from_source="true" legacy-peer-deps="true" diff --git a/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts b/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts index 9e653ef16d4..324779023c3 100644 --- a/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts +++ b/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts @@ -159,7 +159,7 @@ export class SharedProcess extends Disposable { const inspectParams = parseSharedProcessDebugPort(this.environmentMainService.args, this.environmentMainService.isBuilt); let execArgv: string[] | undefined = undefined; if (inspectParams.port) { - execArgv = ['--nolazy']; + execArgv = ['--nolazy', '--experimental-network-inspection']; if (inspectParams.break) { execArgv.push(`--inspect-brk=${inspectParams.port}`); } else { diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts index 05d904f6d51..804627f1ef6 100644 --- a/src/vs/platform/windows/electron-main/windowImpl.ts +++ b/src/vs/platform/windows/electron-main/windowImpl.ts @@ -173,7 +173,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow { } // Setup windows/linux system context menu so it only is allowed over the app icon - if ((isWindows || (isLinux && typeof electron.screen.screenToDipPoint === 'function') /* TODO@bpasero remove check */) && useCustomTitleStyle) { + if ((isWindows || isLinux) && useCustomTitleStyle) { this._register(Event.fromNodeEventEmitter(win, 'system-context-menu', (event: Electron.Event, point: Electron.Point) => ({ event, point }))(e => { const [x, y] = win.getPosition(); const cursorPos = electron.screen.screenToDipPoint(e.point); diff --git a/src/vs/server/node/extensionHostConnection.ts b/src/vs/server/node/extensionHostConnection.ts index a3584893505..1eb69bb8dfe 100644 --- a/src/vs/server/node/extensionHostConnection.ts +++ b/src/vs/server/node/extensionHostConnection.ts @@ -238,7 +238,10 @@ export class ExtensionHostConnection extends Disposable { try { let execArgv: string[] = process.execArgv ? process.execArgv.filter(a => !/^--inspect(-brk)?=/.test(a)) : []; if (startParams.port && !(process).pkg) { - execArgv = [`--inspect${startParams.break ? '-brk' : ''}=${startParams.port}`]; + execArgv = [ + `--inspect${startParams.break ? '-brk' : ''}=${startParams.port}`, + '--experimental-network-inspection' + ]; } const env = await buildUserEnvironment(startParams.env, true, startParams.language, this._environmentService, this._logService, this._configurationService); diff --git a/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts index e2d00c4ca96..41b8bc38af9 100644 --- a/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts @@ -240,7 +240,11 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost { } // Refs https://github.com/microsoft/vscode/issues/189805 - opts.execArgv.unshift('--dns-result-order=ipv4first'); + // + // Enable experimental network inspection + // inspector agent is always setup hence add this flag + // unconditionally. + opts.execArgv.unshift('--dns-result-order=ipv4first', '--experimental-network-inspection'); // Catch all output coming from the extension host process type Output = { data: string; format: string[] };