diff --git a/.npmrc b/.npmrc index 8c21e58ef14d5..f9e6fa24710bc 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="42.3.0" -ms_build_id="14159160" +target="42.4.0" +ms_build_id="14377746" runtime="electron" ignore-scripts=false build_from_source="true" diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index 2f275d1597581..072703d125f6f 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -39,7 +39,7 @@ EOF if [ "$npm_config_arch" == "x64" ]; then # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/148.0.7778.97/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/148.0.7778.254/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux # Download libcxx headers and objects from upstream electron releases DEBUG=libcxx-fetcher \ @@ -51,9 +51,9 @@ if [ "$npm_config_arch" == "x64" ]; then # Set compiler toolchain # Flags for the client build are based on - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.97:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.97:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.97:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.254:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.254:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.254:build/config/c++/BUILD.gn export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu" export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu" export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -DSPDLOG_USE_STD_FORMAT -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE --sysroot=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 7db96c8acfc3b..79ab7ee05dcea 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -6c25b7496a0f3f4e325965ac3d934f9460e6b39fc2aa05b2aefecb1e212e7535 *chromedriver-v42.2.0-darwin-arm64.zip -7ea0a5378a615b816c6652c1e8f62b25fee751f34c669eb3eff122dcde98dffc *chromedriver-v42.2.0-darwin-x64.zip -8f6c2462e05491ab7a6ea6492fe7f62c8de1b01900978dd3dcbc878fde6f5e3e *chromedriver-v42.2.0-linux-arm64.zip -72cdb458b48306ec4939021198696926651a6a6dd47b8acf4486d77689ffe88f *chromedriver-v42.2.0-linux-armv7l.zip -ebe0fb1e5eb8a83a20612d660191d8292826d46d93701fe6390a9a5ab69aede0 *chromedriver-v42.2.0-linux-x64.zip -f19d5491a6c5d2970b05a42e1e2a5bcab75206423cea9dfe8ef5c2b4a0ceb38b *chromedriver-v42.2.0-mas-arm64.zip -30c88509d9640b4bf0066da7b6df7c4bb61d894df20941daaeeead598da40c28 *chromedriver-v42.2.0-mas-x64.zip -a6a21d19b84938d32ea75ad19013370c8937536c049d4d5c44175fbcf3703c5b *chromedriver-v42.2.0-win32-arm64.zip -da076702e72317843754e72cc1895c4d223e423f177061342ae5aec78a7281a9 *chromedriver-v42.2.0-win32-ia32.zip -97074022e6b5048b0bd9932c011e8377148c04b0e5455ea2e24bfc048d888297 *chromedriver-v42.2.0-win32-x64.zip -4012c6a738d83799544cabd04e41c8eba2467e4de573664326eaea174f2f8b47 *electron-api.json -bffe18be718c641a0fdfa8bf2ab82dbce462b8809be97898a9c4dfd136be071d *electron-v42.2.0-darwin-arm64-dsym-snapshot.zip -5a341581905b84ae62b4f7664c0fd950ec78fef172042dd8b55dc2a8d9aea66a *electron-v42.2.0-darwin-arm64-dsym.tar.xz -110b25eadfd680ad44ba5b43bf59dcf31297976ee128735e3ef9bbc2a35758cf *electron-v42.2.0-darwin-arm64-symbols.zip -f45f80da0a2d005530b70f6f6b00756dbf875947a21e533041a05b3c4d629f79 *electron-v42.2.0-darwin-arm64.zip -aefc2008c08cd3795cf997a5c5d88772497f460c5cc6f5008b01c412d7534417 *electron-v42.2.0-darwin-x64-dsym-snapshot.zip -a6b70b51de1f05541e42138d02768ef72940c125379b0d7a929fc3e5f2e1eb75 *electron-v42.2.0-darwin-x64-dsym.tar.xz -2d64a5bf8af6b9dccecde9ac09f20cbae36a76be537c4b3e5c3a238add5a4a01 *electron-v42.2.0-darwin-x64-symbols.zip -cd6a2d4feca84b7e7b2c4a5a13a443fc3c1173e77b05f798deaab2f0f41002a1 *electron-v42.2.0-darwin-x64.zip -2c0e81bc0e82c9e1966d4042b565dbf4924bd6365c08e6cc715001b3842ff9cd *electron-v42.2.0-linux-arm64-debug.zip -30983431149fc5a813c2145843744292e2553577f19d75aa09cbf8f7100d9319 *electron-v42.2.0-linux-arm64-symbols.zip -1f2037dbdcb8b1327b855ec15fbe3fb8a7f27786b331d17866e88377a0606ad8 *electron-v42.2.0-linux-arm64.zip -948553edfe3fa5272327d867b68aceb6e272cdeb68df4a40a6ffa045976531d2 *electron-v42.2.0-linux-armv7l-debug.zip -fed24d4f0c4fa40c3dfe38fdea423d6f36dc09630a614fb9060373fe30f310c4 *electron-v42.2.0-linux-armv7l-symbols.zip -00de1cc51859a4e064a2178cb29c899feadfabf24d926d8f684c30e6ab9b72a7 *electron-v42.2.0-linux-armv7l.zip -e0a0c2f97e97321ca194bf2ed7275ad6b31c0c0f4f7e4989838c4fd74728f306 *electron-v42.2.0-linux-x64-debug.zip -cf65567a4c5ef25c24cbdc8a6059a419773756f79313a1e682272c42f5716f2a *electron-v42.2.0-linux-x64-symbols.zip -9caeeb15dada37cb3a2d80bf0f5899d175db026a4def11560890bd2f19684909 *electron-v42.2.0-linux-x64.zip -69ad3951065eb33bb6533f872267828e4ea728ca7d539c649cebc966c0ea1bab *electron-v42.2.0-mas-arm64-dsym-snapshot.zip -38c4beeb71171ab97f55e9a213aa44a45e20e62cc73207532f29ff70a2698539 *electron-v42.2.0-mas-arm64-dsym.tar.xz -359be04c4da1b1979f0e1275b3abd5bd2cbab43c2290d71bfdeb174c1f42beba *electron-v42.2.0-mas-arm64-symbols.zip -535aca88dbe2977d22dc63e47887d09c7e41e8ccf4c0f23d67b7ce593e2341dd *electron-v42.2.0-mas-arm64.zip -e621151d901eeab917e225c97e102fa33ba5225c5cd5b8c152948d8e4a60d104 *electron-v42.2.0-mas-x64-dsym-snapshot.zip -0d33ddacaa69b923fe0117f6ed7d92c8918de6e98daa5f0e9462acf1ea758c5e *electron-v42.2.0-mas-x64-dsym.tar.xz -1527430d26a58505c0e3e52f27afc5aa5feffa5dd17d83d1b89ebcb16dfb4c0c *electron-v42.2.0-mas-x64-symbols.zip -576abe887a65587910ffc481fcaac39bb42e2791c54ae3a2c000431a44299cd2 *electron-v42.2.0-mas-x64.zip -d4e06302625806acf6a39b15a22835de6d4c38ce0cedfe1716d4c0df8416fc2b *electron-v42.2.0-win32-arm64-pdb.zip -09792a89e357258afae9d3abe51f42592062bafb1b98e80d77daa1cc554e26f2 *electron-v42.2.0-win32-arm64-symbols.zip -615b0145f304e0eea0ffd20c0fcf0e8e7e5255e1c3f3ae0577725a16ebb91994 *electron-v42.2.0-win32-arm64-toolchain-profile.zip -1e6b5639cbbb0134f41e5cb62a283ebc34bc580a8fb21349d711f275d60f9705 *electron-v42.2.0-win32-arm64.zip -5b5803e32a2ddfb51bbf4a0097a6fb48f964b2844150cec9c6fb48d3eef16865 *electron-v42.2.0-win32-ia32-pdb.zip -218ce2ebacc35de9bc9ac83a1b65551fd53c9622b71516a484bcfed0aec2c4a6 *electron-v42.2.0-win32-ia32-symbols.zip -615b0145f304e0eea0ffd20c0fcf0e8e7e5255e1c3f3ae0577725a16ebb91994 *electron-v42.2.0-win32-ia32-toolchain-profile.zip -1a866e0634ff95f83a043c7c6738e148f38362ed0afa60aa5eb8dcab16def7b5 *electron-v42.2.0-win32-ia32.zip -82329a1c558392b1d2a80cfc24d1463cf88fd0bb7b542eee24305ae099935bf6 *electron-v42.2.0-win32-x64-pdb.zip -00b8c0437bb75b0db1dfa2bf23e6a6d2436c0665e2a627bd2732ccab0fd1e648 *electron-v42.2.0-win32-x64-symbols.zip -615b0145f304e0eea0ffd20c0fcf0e8e7e5255e1c3f3ae0577725a16ebb91994 *electron-v42.2.0-win32-x64-toolchain-profile.zip -6e034b748ad5ed9445bd3da4b7d0792ed49556774a541217b507c156b00dd69a *electron-v42.2.0-win32-x64.zip -acb2fdd6e99a2056ff88fe26d94b141922e30c5a6a2b11868aa5e708ba30266d *electron.d.ts -3099226c4eb0c13134bbdd970c0fac8a372547b401c54552a89fa1689470dbd7 *ffmpeg-v42.2.0-darwin-arm64.zip -1f4fac2e8f4f8b136bc29ce6be50598f217300e10c1a203b6b893f623ba516ba *ffmpeg-v42.2.0-darwin-x64.zip -1fd892c2195d89a7d4f926167c122c34ab7ce15a61b75c8e5ba0cbfc47ebdb4f *ffmpeg-v42.2.0-linux-arm64.zip -6b6a200705ded7211b02d7ee56396d99c2003aa6b0b83bdd8c89f95702ea459d *ffmpeg-v42.2.0-linux-armv7l.zip -ffb78ccf0b2cbf1a1c0da2a69d8021337ae5352642a2d84adae951f95c771696 *ffmpeg-v42.2.0-linux-x64.zip -3099226c4eb0c13134bbdd970c0fac8a372547b401c54552a89fa1689470dbd7 *ffmpeg-v42.2.0-mas-arm64.zip -1f4fac2e8f4f8b136bc29ce6be50598f217300e10c1a203b6b893f623ba516ba *ffmpeg-v42.2.0-mas-x64.zip -87ad1b3868751b2af34cfebd62f9874ced837fc4389adad3e7659a437afcffb1 *ffmpeg-v42.2.0-win32-arm64.zip -57af529a0cc217bb5f20c67554eb526926b853a1f1594a06e8423662cead9c09 *ffmpeg-v42.2.0-win32-ia32.zip -62dc51e9290b444c6640048a715d8d7b60fe3e546a98f0faff945e4a522250f8 *ffmpeg-v42.2.0-win32-x64.zip -72ea4fdeabf3a49dd86bdeb136c916f7b54952b439edd527321963a5dbb0460d *hunspell_dictionaries.zip -98e8f208b8fd697e2a035d03e83de5731ba92b23f13f826abc60c0b7eab0d952 *libcxx-objects-v42.2.0-linux-arm64.zip -7187c3f0406a04b8e19af6ca374e6d7ca7833e47ea2382f7fba1ed7061f7d8be *libcxx-objects-v42.2.0-linux-armv7l.zip -7254b02f7220aa47210c382f45668016710d07cd7c7c61da5c4c556cc2334446 *libcxx-objects-v42.2.0-linux-x64.zip -37ade3096c7362b9df8945311f55abb8d039f93aabacec086e449cee4a31dcab *libcxx_headers.zip -c623bfe37d755eb9020fc080d4ef0df799acf3439b7b588f9a62d9b6e3908b75 *libcxxabi_headers.zip -44b16dd0e2bade1253e6f36235a43f005ed6472c1017195ee1ea1e629b8ab504 *mksnapshot-v42.2.0-darwin-arm64.zip -9d59364581e6001d655cd6c659e76ab80799d794e22b0c990b181268faa0492c *mksnapshot-v42.2.0-darwin-x64.zip -6035f7f148470352c04f0591d360685724a7784780f6d74c4fdaa99c71b8be6f *mksnapshot-v42.2.0-linux-arm64-x64.zip -27d4c39086c376744bd606f55c7b6c1420d0267f94cd8974031ce4b1f88320e6 *mksnapshot-v42.2.0-linux-armv7l-x64.zip -ca549469050d6a360e6b95ea202cb61ea704db51f7d67aa67c457e5dfa98b459 *mksnapshot-v42.2.0-linux-x64.zip -8d2271bd6cb9a16d34e02dfc92efb1fd1a2908038165efc9aa161cf5e62dc7ae *mksnapshot-v42.2.0-mas-arm64.zip -ae8453efb615242dd27de97cf1f9c6b8f4c6ad9cfab5fc476671d8751c5ac319 *mksnapshot-v42.2.0-mas-x64.zip -f21cdde8044078ce14acd0c65af1e7cf999d78e6d40d467cc73f854c9e9ef481 *mksnapshot-v42.2.0-win32-arm64-x64.zip -4b5b7d68067f55a0fc4dd4c295ca115070f288684e7942e0e80badc2b64754a6 *mksnapshot-v42.2.0-win32-ia32.zip -25d850c5674e0a821bb5897197b6e38c0d55a5cf0505d4d79a39b608b54c4b5c *mksnapshot-v42.2.0-win32-x64.zip +0ad0294171f61678036771f0a9e9de84b79a063d6781f166991d52d21d41a31f *chromedriver-v42.4.0-darwin-arm64.zip +2a736793968997a9f312156a7cb6575b23479ae4f23539d2b0fd1774589576eb *chromedriver-v42.4.0-darwin-x64.zip +22fc9f5566d3a701965ae2cc77b0625644e827d67a80dfa86fbfd8076354a447 *chromedriver-v42.4.0-linux-arm64.zip +b1ec1b8aec371b3b13303074739ddcd006a08060150f10a6c7a364c4b1bfd40c *chromedriver-v42.4.0-linux-armv7l.zip +09b69da1569f2d0bbf2015a976a314cefa212243cbfcfb32dcb82ef263c52942 *chromedriver-v42.4.0-linux-x64.zip +45eb11e4a2c7ea57302acbba77c3774129730e14dab9e7282e6c5c503fa270d7 *chromedriver-v42.4.0-mas-arm64.zip +e321145bd328ad59ed602f2e2dd1ba63cded201dfa3d66da06a549209ade1ca5 *chromedriver-v42.4.0-mas-x64.zip +64fc814fb529a080e28f9b3e746621426be45d6d724fc33e3e5d8953adf31973 *chromedriver-v42.4.0-win32-arm64.zip +bb1ee8210ab365528fc246c2f30a8e8a18d94a2e46950b4e81d2eff4000f1394 *chromedriver-v42.4.0-win32-ia32.zip +7a6d59b5a1e2e887767134195b545ca3342886cfe96d72fc91309a3570366c86 *chromedriver-v42.4.0-win32-x64.zip +d4978a7750a02eb8ddc12dc137fd36f854bb7d4b2a0c413faee0d71e53075168 *electron-api.json +7a3947dad7e5b85825ca3a4aa7957f7083f9147a053393c1be351e95cf600ebf *electron-v42.4.0-darwin-arm64-dsym-snapshot.zip +6ff3e64b1525e3d2c9d71c97f0e6df23cf1924c77cf874f3ab1f66eca1f7e21d *electron-v42.4.0-darwin-arm64-dsym.tar.xz +b135bfb22cb5df6a924525c5c4bfaf451bdc693b4c9ef90fbe717d1f2fd15486 *electron-v42.4.0-darwin-arm64-symbols.zip +3ce55988c9998bcd1e9c69478dd26887b90e8f8010441172e520e94ba575e520 *electron-v42.4.0-darwin-arm64.zip +b13867775284a6b0bc8f9edf42375d6cac8a98dba453d3e0d80cdec40e38e0a5 *electron-v42.4.0-darwin-x64-dsym-snapshot.zip +e96379ba2c15178172d499f5d61489ce1ff4e5b9bef0e3ab015eb284ea59f6f9 *electron-v42.4.0-darwin-x64-dsym.tar.xz +9f69cccc8c4ef710bdf25e53da39a8d4066afdf720e6171114f3e403e7d332c1 *electron-v42.4.0-darwin-x64-symbols.zip +0f141809eebe3f3f8c8f8377c10c93f21a39433f71526598de5e989f452cae29 *electron-v42.4.0-darwin-x64.zip +035a4a3df9ab7fc9ffed742c85059f5517acad16f0384cc40288712b9cb427b9 *electron-v42.4.0-linux-arm64-debug.zip +418932b34a02803732c09376d68193fbe645daaf816a94aa778e9f2b0cab8de8 *electron-v42.4.0-linux-arm64-symbols.zip +d3bf612de0b651302fb46e50ed3282b609ea9d4d99bb296f7c9bb8ffd92fd69b *electron-v42.4.0-linux-arm64.zip +35933c6c356c14978d10e56939ea23afc4dfb0e8b06ccb4a3ebe6ca2681bd8c9 *electron-v42.4.0-linux-armv7l-debug.zip +77a7da0521362d6b475a079f9408ce100aeb7eb5a1f52ee1b3ae1d8bc0030af7 *electron-v42.4.0-linux-armv7l-symbols.zip +83f9017f9a77bfdc8628b05237336c319da45f75974c37c68c82687a18106a92 *electron-v42.4.0-linux-armv7l.zip +6f5f0dea63a28c1c0b4295d18cdb6f6b6d1fef39e9d87df7477870404fa76154 *electron-v42.4.0-linux-x64-debug.zip +485863683f6fb1e790e9ae00593af8a38aeed8dd4a31dc534770976d799d2823 *electron-v42.4.0-linux-x64-symbols.zip +9a8194635548490a56099cc4c2b116738ae56834dee4472506d5a8b262bcbda4 *electron-v42.4.0-linux-x64.zip +454ace3d5fadd6003bc5175c6cd343bc35ed50154ed3e820b5440b87c4ad8b5d *electron-v42.4.0-mas-arm64-dsym-snapshot.zip +8fbcb23697a1059d56671fa2a078f295822f191d42dff11b3501901db5140cd7 *electron-v42.4.0-mas-arm64-dsym.tar.xz +26557290747c1807510cc412a4c760d6e833cf4410f0facbe87b5aa0a6a63640 *electron-v42.4.0-mas-arm64-symbols.zip +a531adeccc08e7a7201a07eab837eb58c8a87bb919ec5e7a4a39a900bd7fa72d *electron-v42.4.0-mas-arm64.zip +e43bbcb9d3a84f81499cbfea11827f2191c26b5163b2bd7bfa97e3595819ad04 *electron-v42.4.0-mas-x64-dsym-snapshot.zip +82a909cfb7c7477971e425faa97bf90382c76f945ef9faf451318a74d81d4855 *electron-v42.4.0-mas-x64-dsym.tar.xz +de73ebefb988bd1ad16d6f24e93c277dd0fa88413867017f2d944ccb1017e15d *electron-v42.4.0-mas-x64-symbols.zip +e00c8c6c1976909a1ed2132d3a839e480a2dcaa9f486cba12ef0615682785c6f *electron-v42.4.0-mas-x64.zip +d95f7fbc3568fbde87ac435325edd33b502388a4e1b154fed5931a345e8d3571 *electron-v42.4.0-win32-arm64-pdb.zip +00be155db039ce1750bd4494d8cdf03c3b0fe225834522c73ce77b924ba565d5 *electron-v42.4.0-win32-arm64-symbols.zip +615b0145f304e0eea0ffd20c0fcf0e8e7e5255e1c3f3ae0577725a16ebb91994 *electron-v42.4.0-win32-arm64-toolchain-profile.zip +5d576f908c9e88209dfe8a17f7e84c4949288c2ef611637c301d562bc8d08d61 *electron-v42.4.0-win32-arm64.zip +262e6e00db599e901229babe8c9b1505acbaf3867d1d5831bc4a874dfa7abb9f *electron-v42.4.0-win32-ia32-pdb.zip +7675e9c7187e4f7ca455d48ade1e3365f3981e057e60c8d45c4434e8817047b5 *electron-v42.4.0-win32-ia32-symbols.zip +615b0145f304e0eea0ffd20c0fcf0e8e7e5255e1c3f3ae0577725a16ebb91994 *electron-v42.4.0-win32-ia32-toolchain-profile.zip +06c1cd7d72c0b645de602a9ec8a812552747c96152df8023d6f0c567dbdd2a37 *electron-v42.4.0-win32-ia32.zip +4216bc687fc821b1337d7aa32d0d4c726f9316239013d7494c2a805996a5d204 *electron-v42.4.0-win32-x64-pdb.zip +44a90caae1ff37d36ba3b1275cb44c68ae26daadb18f85541328baf36e61918a *electron-v42.4.0-win32-x64-symbols.zip +615b0145f304e0eea0ffd20c0fcf0e8e7e5255e1c3f3ae0577725a16ebb91994 *electron-v42.4.0-win32-x64-toolchain-profile.zip +ffc056685b4a769d7977ef3d58bdc332446d081f025ee074d77b498d2962e2cd *electron-v42.4.0-win32-x64.zip +2811b4a386a990e9884a92c3d93a9a6b7c811cfcde0ef95d35110828e8e6dab5 *electron.d.ts +d0217d50ff80ed66eee5c1643e039225a616413ddf29f55791a043da85ec9097 *ffmpeg-v42.4.0-darwin-arm64.zip +9e233495faf3e439ec63bd577e9d5b871b22f1002444dbacb23e1d5565d90f73 *ffmpeg-v42.4.0-darwin-x64.zip +b86deba0229280b12263f600e286c410514176c5f30158d3e077591c70682ebd *ffmpeg-v42.4.0-linux-arm64.zip +61affc83d44039980650431f6d66b7b5d3aa981c6894baa8b5f600c2c9a03b3e *ffmpeg-v42.4.0-linux-armv7l.zip +d1cd3585cff627f324824006f2b88d7ecb6421d91ced3d2019a65f426ce0f8e6 *ffmpeg-v42.4.0-linux-x64.zip +10fc4f1c8109eebd463b35d5542113ff33a443b7aa573808f5d9b0e1fc9f0cee *ffmpeg-v42.4.0-mas-arm64.zip +452e238e8818d51cc588c96460945f85af4f1159cd5872011572963a521bfec8 *ffmpeg-v42.4.0-mas-x64.zip +bb5e0622616166e5e3ceb7768e6132d9316203ca1126e64f4228f5373be72b3b *ffmpeg-v42.4.0-win32-arm64.zip +af767c8408fe60ca18bc77068b981cc77b18e4de496868f332d444055cea6a39 *ffmpeg-v42.4.0-win32-ia32.zip +6b3d22c1a562f144f005f07804fb8f93b04f8d8c8d4f4dbfe0628308f636bf73 *ffmpeg-v42.4.0-win32-x64.zip +75d5c6c23edf409d0dd1571b19b7e2136d8619dfb02d2dde021e37826c7fb90f *hunspell_dictionaries.zip +f5683e7033bc4966d42993310bb363f76a2726937abeb832c1361a9039da8af2 *libcxx-objects-v42.4.0-linux-arm64.zip +1fef5161bbef9b54c2dbf73e026e5b8ca6be60cf0f00d207b3249ee96efa564a *libcxx-objects-v42.4.0-linux-armv7l.zip +f02f1312fbbcaf33b87c2e511aa7382f004c1b8d8c4cf27c1104bda724b34d1f *libcxx-objects-v42.4.0-linux-x64.zip +cf3d9488d10e77bef131c15b273c991320e77e2f45594c1aa428edabd8a6659f *libcxx_headers.zip +4c150f4569cb6c661f2c6def9aac93bc396520fe0dccb9544a95958e74ccfa7b *libcxxabi_headers.zip +81dd8c494e08d9d5580948a8fe1b44a6488aa025711d64898e7829f0359f475c *mksnapshot-v42.4.0-darwin-arm64.zip +b1ae5da182aa8b090c8d505bdd82b252b61c62338669d7fce61fbc94eda0cc72 *mksnapshot-v42.4.0-darwin-x64.zip +619b41ec8d73465c4744382523be148d5f1768a888b2c9f89ea75ff6e07989b9 *mksnapshot-v42.4.0-linux-arm64-x64.zip +8da95a63fbda934e7f42a4e2c2673479cece009050fc60fc8c1bcb8d8e87c3a3 *mksnapshot-v42.4.0-linux-armv7l-x64.zip +345a4d07b3919d52b7c61c0d0c19473a07614e00b98c3420fda4ec57cc6ae7fc *mksnapshot-v42.4.0-linux-x64.zip +afc117f2f0e51476592e64cf7455715845a0294d4d3bf7755fb7a0bc8afd8c76 *mksnapshot-v42.4.0-mas-arm64.zip +3dfa4d157f2b155d9840daab0fb93d02c5662698e277fcf27104c38ad0a57e64 *mksnapshot-v42.4.0-mas-x64.zip +0f74651ff9ce6d5809acd46c5ba8dee672bb3fde54beb3434323aa6e0e199542 *mksnapshot-v42.4.0-win32-arm64-x64.zip +bae3a223778fc7ba2a2416f5edb57eb63bd61d557d64f8952669f0127fca2745 *mksnapshot-v42.4.0-win32-ia32.zip +fbe648a1b2bc66840a1ef941a888210835eac8042bd5899369d933f3d8f11b5a *mksnapshot-v42.4.0-win32-x64.zip diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt index 16e83546f49a1..1a3a81ec42e74 100644 --- a/build/checksums/nodejs.txt +++ b/build/checksums/nodejs.txt @@ -1,6 +1,6 @@ -372331b969779ab5d15b949884fc6eaf88d5afe87bde8ba881d6400b9100ffc4 node-v24.15.0-darwin-arm64.tar.gz -ffd5ee293467927f3ee731a553eb88fd1f48cf74eebc2d74a6babe4af228673b node-v24.15.0-darwin-x64.tar.gz -73afc234d558c24919875f51c2d1ea002a2ada4ea6f83601a383869fefa64eed node-v24.15.0-linux-arm64.tar.gz -44836872d9aec49f1e6b52a9a922872db9a2b02d235a616a5681b6a85fec8d89 node-v24.15.0-linux-x64.tar.gz -49a54c103f4919ce64199a043ef5cd309507de491d718085edee089cd8e87543 win-arm64/node.exe -3331e1ffe19874215472217c5e94f5a0c6d8e18c4ac7111d3937aa0ad5e9b4a5 win-x64/node.exe +39189dab4eeb15706c424af0ac08a3044c9e48f7db12a7d77f6b7aafc7dd5df6 node-v24.16.0-darwin-arm64.tar.gz +298b4c7b3cb80765c8703e42b90324a4ece3b6634947b89e769c3c980ab55185 node-v24.16.0-darwin-x64.tar.gz +589f5b6dd4fcfee4dfda73013903c966abaa8abd93dbc9d436544e472b4f0e74 node-v24.16.0-linux-arm64.tar.gz +2faf6a387e9b62b888e21c54f01249fb27537ffecf1842f29f4c919d0a59a0ff node-v24.16.0-linux-x64.tar.gz +6694c2553f41d6b7cd6e396536e9ad5a9f4e1b898d59e4e0ec5de127096eb6db win-arm64/node.exe +b3094d0b49f9ad602262a9921551737bb97637c05dd357a06ae98188d7290aa3 win-x64/node.exe diff --git a/build/lib/electron.ts b/build/lib/electron.ts index 016c25f7553db..43b15a96c3b91 100644 --- a/build/lib/electron.ts +++ b/build/lib/electron.ts @@ -100,8 +100,7 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] }, }); } -const { msBuildId } = util.getElectronVersion(); -const electronVersion = '42.2.0'; +const { electronVersion, msBuildId } = util.getElectronVersion(); export const config = { version: electronVersion, diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts index 7690e25d5fd31..4bfa19ba22fc8 100644 --- a/build/linux/debian/dep-lists.ts +++ b/build/linux/debian/dep-lists.ts @@ -40,6 +40,7 @@ export const referenceGeneratedDepsByArch = { 'libdbus-1-3 (>= 1.9.14)', 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', + 'libglib2.0-0 (>= 2.12.0)', 'libglib2.0-0 (>= 2.39.4)', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index eb1d73d011ac9..8dd580997fc11 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -22,7 +22,7 @@ import product from '../../product.json' with { type: 'json' }; // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.97:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.254:chrome/installer/linux/BUILD.gn;l=64-80 // and the Linux Archive build // Shared library dependencies that we already bundle. const bundledDeps = [ diff --git a/cgmanifest.json b/cgmanifest.json index b90a69f0349a5..35a5c430bf00b 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "6b3fa66a923a9442c8ab0bc71b4b41ff24528d3b" + "commitHash": "7993dcb54012012221738dbff5a7fe9df307a991" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "148.0.7778.97" + "version": "148.0.7778.254" }, { "component": { @@ -516,12 +516,12 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "848430679556aed0bd073f2bc263331ad84fa119", - "tag": "24.15.0" + "commitHash": "c7d10158bc31036de6783d66beaaaf551e3167aa", + "tag": "24.16.0" } }, "isOnlyProductionDependency": true, - "version": "24.15.0" + "version": "24.16.0" }, { "component": { @@ -529,13 +529,13 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "87740a867bddf434afec16e1f8b4f02235d3e7f7", - "tag": "42.2.0" + "commitHash": "86ce4b4b9d015432e5a52e39fab740dc88e545fc", + "tag": "42.4.0" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "42.2.0" + "version": "42.4.0" }, { "component": { diff --git a/package-lock.json b/package-lock.json index c1ebbfa6c7eb0..33dc1f6c19e0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -122,7 +122,7 @@ "cookie": "^0.7.2", "debounce": "^1.0.0", "deemon": "^1.13.6", - "electron": "42.2.0", + "electron": "42.4.0", "eslint": "^9.36.0", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", @@ -910,6 +910,16 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, + "node_modules/@electron-internal/extract-zip": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@electron-internal/extract-zip/-/extract-zip-1.0.3.tgz", + "integrity": "sha512-OjKpjB7gohtEjZiq6nDx1egqjZJhGPN1iFOIED+NFhB/MMkXw/XRcHjh1DGXKT5z2W9eW7Jy2UKU3gpjvusFTQ==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=22.12.0" + } + }, "node_modules/@electron/get": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@electron/get/-/get-5.0.0.tgz", @@ -7292,15 +7302,15 @@ "dev": true }, "node_modules/electron": { - "version": "42.2.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-42.2.0.tgz", - "integrity": "sha512-b2Tc7sIKiZEl0tBVwFM5GJ+FT5KYhmy9QJHjx8BGVZPVW2SctXWEvrE959ElB56qw7H05dBkhlikDA1DmpaAMw==", + "version": "42.4.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-42.4.0.tgz", + "integrity": "sha512-OXXqh9LD9KxXPv2Fe25EfU9N9AvWTuV6V81sfhQaNvTAXCd9ONA+Q4OWvMe+CmYD6xIwjFxGGtG/ZphDYYC5OQ==", "dev": true, "license": "MIT", "dependencies": { + "@electron-internal/extract-zip": "^1.0.1", "@electron/get": "^5.0.0", - "@types/node": "^24.9.0", - "extract-zip": "^2.0.1" + "@types/node": "^24.9.0" }, "bin": { "electron": "cli.js", @@ -8449,26 +8459,6 @@ "node": ">=0.10.0" } }, - "node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "bin": { - "extract-zip": "cli.js" - }, - "engines": { - "node": ">= 10.17.0" - }, - "optionalDependencies": { - "@types/yauzl": "^2.9.1" - } - }, "node_modules/fancy-log": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", @@ -9298,31 +9288,6 @@ "node": ">=8" } }, - "node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-stream/node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "node_modules/get-symbol-description": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", diff --git a/package.json b/package.json index 882bc400d0cec..bae2a3f1604ce 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.126.0", - "distro": "e6b302180cc8fecde16d482d0f2add78b067b6bf", + "distro": "7c8281472d5bf9b87d9a6eddbd7ee2d7615816a6", "author": { "name": "Microsoft Corporation" }, @@ -206,7 +206,7 @@ "cookie": "^0.7.2", "debounce": "^1.0.0", "deemon": "^1.13.6", - "electron": "42.2.0", + "electron": "42.4.0", "eslint": "^9.36.0", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", diff --git a/remote/.npmrc b/remote/.npmrc index 6f2d4e8df7b2c..be0a1b948620e 100644 --- a/remote/.npmrc +++ b/remote/.npmrc @@ -1,6 +1,6 @@ disturl="https://nodejs.org/dist" -target="24.15.0" -ms_build_id="438265" +target="24.16.0" +ms_build_id="448558" runtime="node" build_from_source="true" legacy-peer-deps="true" diff --git a/scripts/test-remote-integration.bat b/scripts/test-remote-integration.bat index 96288d35886d8..5e2c8864c2c21 100644 --- a/scripts/test-remote-integration.bat +++ b/scripts/test-remote-integration.bat @@ -3,6 +3,10 @@ setlocal pushd %~dp0\.. +:: TODO(deepak1556): Remove this once bumped > 24.16.0, refs https://github.com/nodejs/node/issues/63638 +for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set "TMP=%%i" +set "TEMP=%TMP%" + IF "%~1" == "" ( set AUTHORITY=vscode-remote://test+test/ :: backward to forward slashed diff --git a/scripts/test-web-integration.bat b/scripts/test-web-integration.bat index bc33dfc2a35c0..2f6c320e5878a 100644 --- a/scripts/test-web-integration.bat +++ b/scripts/test-web-integration.bat @@ -3,6 +3,10 @@ setlocal pushd %~dp0\.. +:: TODO(deepak1556): Remove this once bumped > 24.16.0, refs https://github.com/nodejs/node/issues/63638 +for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set "TMP=%%i" +set "TEMP=%TMP%" + IF "%~1" == "" ( set AUTHORITY=vscode-remote://test+test/ :: backward to forward slashed diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts index d51710a0a87b8..1c371eb67be8f 100644 --- a/test/smoke/src/main.ts +++ b/test/smoke/src/main.ts @@ -133,7 +133,19 @@ function getTestTypeSuffix(): string { } } -const testDataPath = path.join(os.tmpdir(), `vscsmoke-${getTestTypeSuffix()}`); +function getTmpDir(): string { + const tmpDir = os.tmpdir(); + if (process.platform === 'win32') { + try { + return fs.realpathSync.native(tmpDir); + } catch { + // ignore and fall back to the short path + } + } + return tmpDir; +} + +const testDataPath = path.join(getTmpDir(), `vscsmoke-${getTestTypeSuffix()}`); if (fs.existsSync(testDataPath)) { fs.rmSync(testDataPath, { recursive: true, force: true, maxRetries: 10, retryDelay: 1000 }); }