From 718a04b72cd952274fd179f523c49934f12ddc5d Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 17 Jul 2024 15:14:31 +0900 Subject: [PATCH 01/41] chore: update electron@31.0.1 --- .npmrc | 4 +- build/azure-pipelines/linux/setup-env.sh | 8 +- build/checksums/electron.txt | 150 +++++++++++------------ build/linux/debian/install-sysroot.js | 5 +- build/linux/debian/install-sysroot.ts | 7 +- build/linux/dependencies-generator.js | 2 +- build/linux/dependencies-generator.ts | 2 +- cgmanifest.json | 10 +- package.json | 2 +- 9 files changed, 94 insertions(+), 96 deletions(-) diff --git a/.npmrc b/.npmrc index b54679bde3c87..3442ef10f6ede 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="30.5.1" -ms_build_id="10306386" +target="31.0.1" +ms_build_id="9781779" runtime="electron" build_from_source="true" legacy-peer-deps="true" diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index 1ce3ba742c188..4724971fd581a 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -18,7 +18,7 @@ fi if [ "$npm_config_arch" == "x64" ]; then if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/124.0.6367.243/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/126.0.6478.36/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 \ @@ -30,9 +30,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/124.0.6367.243:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.36:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.36:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.36:build/config/c++/BUILD.gn export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 5365421380969..137753fc8e25c 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -3de7da4462c7690f75680aecac8fddedc4b998d0da769136d8eff2932b36004e *chromedriver-v30.5.1-darwin-arm64.zip -d89b89f7c2ba45cb10df7fc23722bacf6f77e13002c42648762cd18ae3fa9182 *chromedriver-v30.5.1-darwin-x64.zip -3722d46929fd2c7b33c17d37464a08150e60d9269053eb67195795254fb5e947 *chromedriver-v30.5.1-linux-arm64.zip -a786d51f834c24b768bd415bf9a2fc5c1d9abdf9dc0b1a091bf9a8ff101becfe *chromedriver-v30.5.1-linux-armv7l.zip -688e4da8dbcb7dbfacab6f29341d96736e6d06e4c8029835b83ef30b69885b01 *chromedriver-v30.5.1-linux-x64.zip -786a7c2659ad97d5a09866b9aafd55edc015cb17a87bd8d72aa5925f2bfcf55a *chromedriver-v30.5.1-mas-arm64.zip -398759d1dc02fc4928d48ff0f8fbade8811347e1a51d1cedcb2ba9350fbed04d *chromedriver-v30.5.1-mas-x64.zip -65766f1270d1876e2a81acfb4b1130dc4a41eb7165842afa8f41ea438bf2fecb *chromedriver-v30.5.1-win32-arm64.zip -ca9fe0abd1032ebd51497049cb1bb2ae1dd9592697b278f6b1ee2a1a25148891 *chromedriver-v30.5.1-win32-ia32.zip -b6b6ea2202e0139ea436288add736d19078bfb190fc0b22937283927f3024bb9 *chromedriver-v30.5.1-win32-x64.zip -50e8b2d59916bc180873324fdbeb8227dbb8b2375cc936e58b7c9885fb23376d *electron-api.json -595db4fa3f755432bf59cbbaf591ee44b576e15952d014d83d3748646b2e338c *electron-v30.5.1-darwin-arm64-dsym-snapshot.zip -c1beb80553f3c9575e638625ce0ffbfdb87b6f8b23799eb132954b2bb74a9a2f *electron-v30.5.1-darwin-arm64-dsym.zip -cba315d6d6f607a2ee6cfc437b46f92da88daded86f0130d85129adb4742bc48 *electron-v30.5.1-darwin-arm64-symbols.zip -d312544ea29844cf328b44b9dbde12f4fdced90cb442dfca6df36c098dbb6e7a *electron-v30.5.1-darwin-arm64.zip -fd24d585d28909c082d703db3fcc5ffa0b55e1077ff320e25ed510f36e6a3761 *electron-v30.5.1-darwin-x64-dsym-snapshot.zip -4d1a2adea4b98c4d0b03c6561fca146aab102d636d359e48ce418c465df891ae *electron-v30.5.1-darwin-x64-dsym.zip -d9065eaf659f4c3e8a75f5453ceb65269763b2e57110bdcc01904b9a1e33a62c *electron-v30.5.1-darwin-x64-symbols.zip -faf9dcc20d525607ea205f2f6a1dfe3270f6268aa439bb0ba5646c7e4fbbd842 *electron-v30.5.1-darwin-x64.zip -b85dba1cdb49591542dcecff3e710f29b81285569c8c5db8c1181c3ed818ba44 *electron-v30.5.1-linux-arm64-debug.zip -5e97cc105282783d1c20d8e8dd4ca1134342839235288840cb50f314ca7a6ede *electron-v30.5.1-linux-arm64-symbols.zip -eb31470c0d7cd6e23e7ce0d89cc93a2356c9dac8bcc997e335353b8aa995afa0 *electron-v30.5.1-linux-arm64.zip -b85dba1cdb49591542dcecff3e710f29b81285569c8c5db8c1181c3ed818ba44 *electron-v30.5.1-linux-armv7l-debug.zip -137548cd73cd648107f6e01c777e411838173309848a492b42825857cec7d110 *electron-v30.5.1-linux-armv7l-symbols.zip -224bd46983e503101c756c72d10b195f14712a7a56438718acb126017dd04edf *electron-v30.5.1-linux-armv7l.zip -1f87fadebc444c9c0de43f52972a3f61af83ca0594c3de368f7579ce613fcb60 *electron-v30.5.1-linux-x64-debug.zip -aae78654f599a68310bdbdc0e3de8db644320ef44e58a5c6e5c693dff5cd1970 *electron-v30.5.1-linux-x64-symbols.zip -ec4707783d39e86005f42899e30ae59e50dd5d9c7f28531ed494eb43f2361403 *electron-v30.5.1-linux-x64.zip -c61f3121e52fd29987814b7805b597ef3fc78b2ce891eba5e3fc6bbe14128f23 *electron-v30.5.1-mas-arm64-dsym-snapshot.zip -f934e55ef6c986d3ec56626b2605fed16030efc45efcd8b05afa9322d625ec56 *electron-v30.5.1-mas-arm64-dsym.zip -3cc36e99f2cd59d7cb2f47b52d19609c2a2358f6ddde35fd832872abe241cc8d *electron-v30.5.1-mas-arm64-symbols.zip -c5085ab1fb74dfa4a4e463dcb688989bc63baf44007419fd96db4e7c974fb6db *electron-v30.5.1-mas-arm64.zip -47102b6dcd5892de734be2b48e40bbbdbc5e0a228bf5fec33071661d2724d946 *electron-v30.5.1-mas-x64-dsym-snapshot.zip -607091ddfd313ed27bb5a0acb6fa58b0d65cb87e6c6ce9b373949b4b152476d8 *electron-v30.5.1-mas-x64-dsym.zip -ac49568635d41e1075bca39c97aca1f2fcede702f721ddce5d80f18cc2dd1067 *electron-v30.5.1-mas-x64-symbols.zip -3746bc4ba32ab9c11398a393d54ba81733088729ae7cef4e5dccf1e64dc82b0a *electron-v30.5.1-mas-x64.zip -930ad941c8bc0aa5e4e3457b235f104846939974d71bde5b42a8980de2d4a35d *electron-v30.5.1-win32-arm64-pdb.zip -11c1252547b381ab6e40cc032ee60c5209dee9ea1102d1b47ad3fcd4da03049f *electron-v30.5.1-win32-arm64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-arm64-toolchain-profile.zip -f18baa98ba9c04b346fda9f40fc3150a57b539d0cd510971a073983f78e0a20c *electron-v30.5.1-win32-arm64.zip -b03c7297dc61aa234ab2273c419d9ae064e52c2c0c3dd56f09135f81964630b5 *electron-v30.5.1-win32-ia32-pdb.zip -8fc570c7f4d97eb6b745fb4af5932311d1da57058da8f39a3d97d6e099cd6982 *electron-v30.5.1-win32-ia32-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-ia32-toolchain-profile.zip -20845163bf9d5a4ead03c5f0280c9bae71f0ab1fc03362f3406ed12620e4d9cd *electron-v30.5.1-win32-ia32.zip -019f3ae97a69dc837d89c44d25e0e5dadc88564b74202c5a3524fc6ab59490bc *electron-v30.5.1-win32-x64-pdb.zip -2eb4889fe275e5ea42cf6f51821bcceb833d5714aa1b45ad7915495afb447e94 *electron-v30.5.1-win32-x64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-x64-toolchain-profile.zip -443119bb559fc2ca297a57cf79f2bce532e853ada070c1e71460c9657c13b4b3 *electron-v30.5.1-win32-x64.zip -deecdc1f3f5ea9548ef73774f412c7af489afeb7dca1c394b5add10e929aff42 *electron.d.ts -14319b51118a5c94e108731f6b5c4e701c700212e790198ba22242eb9674a334 *ffmpeg-v30.5.1-darwin-arm64.zip -bfd5110457438fa8b113a8806db45f30b8975304d95e5efb1b71b0f5e46757fe *ffmpeg-v30.5.1-darwin-x64.zip -44ebf3185fc24404647da0c1f9e496effefd32ff3dbc2499c022164b919d06ed *ffmpeg-v30.5.1-linux-arm64.zip -4f7583513d48b48c44a2cbc4430cbc9a33d8f9728622166db688e3de61190821 *ffmpeg-v30.5.1-linux-armv7l.zip -154900e5db5810f63e38fd4551cfff3d88d6eac39226e06e12e1e43558d360a4 *ffmpeg-v30.5.1-linux-x64.zip -14319b51118a5c94e108731f6b5c4e701c700212e790198ba22242eb9674a334 *ffmpeg-v30.5.1-mas-arm64.zip -bfd5110457438fa8b113a8806db45f30b8975304d95e5efb1b71b0f5e46757fe *ffmpeg-v30.5.1-mas-x64.zip -f2169c4b6b9f073c20652953599f2453947936e851ff25c9f2719e7d889faea3 *ffmpeg-v30.5.1-win32-arm64.zip -90745f1422ae0431b295cb5d27ff03e69c890f3572ef6c4655774b892419e94f *ffmpeg-v30.5.1-win32-ia32.zip -567fe8952f17b224d4492980af741b470e86b31d58e7c6a9262258eeae490122 *ffmpeg-v30.5.1-win32-x64.zip -8bbbadb52a19f074d9f8bd533891e2bacbe4813101ae6c344cfc88e28b1429a3 *hunspell_dictionaries.zip -61137508aee6837c70a2ead2e31dd106d753ec5fac01b49e7e8701be0e09e7aa *libcxx-objects-v30.5.1-linux-arm64.zip -3c285f012f256f767e777550a1f18054cfcffc4e13ad6fa4e4e90dd58ec22069 *libcxx-objects-v30.5.1-linux-armv7l.zip -9b96b53c8dfbc70a0f617f78dde89a1e8510ae2261bcddfbf7c12c61eb5a3d73 *libcxx-objects-v30.5.1-linux-x64.zip -1b5cbe24d6356a388e166bff60d7452583019ea7dec85f593c552eb287346f43 *libcxx_headers.zip -eae200a0d1fd0d4b881358bdef600111891c75ecc4db679b680b0cbaf87ecfc3 *libcxxabi_headers.zip -ed1f7463b5869acf57dd388208918652182b049b2846f572d52ed47e7c091d54 *mksnapshot-v30.5.1-darwin-arm64.zip -bc80de1f29b869cdb2676d2dc08cbb4bd6228a6825b1b0bfc13acee0b070ac3e *mksnapshot-v30.5.1-darwin-x64.zip -5e526ca4f4250a9b9b040d6eb60f1d2b8db974ab68c27e46198f4bf8dc1ef347 *mksnapshot-v30.5.1-linux-arm64-x64.zip -c40ca2a45cc9ab4e1668f063860ba243baef8c192a253638e4c93aaccb0ef8da *mksnapshot-v30.5.1-linux-armv7l-x64.zip -a3134e0b0980547167dd3ca2f17dd2f40a7db697ab563ba6257534f9ad0d256d *mksnapshot-v30.5.1-linux-x64.zip -82776eafcb3e4d053e275ad50d84151f41a651986baacda20c6ed722854cb8fb *mksnapshot-v30.5.1-mas-arm64.zip -9d6d95d4cb121a29fd68d64557edd8c9859345ac37d0645de8aff518391755ed *mksnapshot-v30.5.1-mas-x64.zip -94b9ce6cb40ae001962b77525d12483c3458776066a69a4e714b327bab1decfc *mksnapshot-v30.5.1-win32-arm64-x64.zip -4d89d06c2e85b25d52bb64f48258ad5d05b98ac21697ae9c49ccd19bad9d7d94 *mksnapshot-v30.5.1-win32-ia32.zip -ccfd322bafde0485a0ac6b0acc3669c7b08f30003a1c2e044eebc1bf02289de3 *mksnapshot-v30.5.1-win32-x64.zip +ceab82d2b84de13d61537bc985dd15c403b6acf55334d9ffa55b5f81a270c75f *chromedriver-v31.0.1-darwin-arm64.zip +18f4229338cdd7172ad63681a2f63d231c24ab82059125b737d29ed2f38b3269 *chromedriver-v31.0.1-darwin-x64.zip +4d059bbeca3eb3b01178eeeb6356d088dc5dfb5a95679d24797daef5f81aec11 *chromedriver-v31.0.1-linux-arm64.zip +251c17138d6f69b76b1409c0598c476510085e5295dc76ca896f7a5660483a55 *chromedriver-v31.0.1-linux-armv7l.zip +d55df73f0c5a318aa639cb3a3ac9d719913541fa545129e9003cc69bd4f80d4c *chromedriver-v31.0.1-linux-x64.zip +07a626b240d3a5eebf43eafba3816778f21f4dcb02563f7664bf8595b18c2a07 *chromedriver-v31.0.1-mas-arm64.zip +e263fef9ce2b84827372dd1529b60a74894a8bd23d35818c1d32f3fbc0178357 *chromedriver-v31.0.1-mas-x64.zip +2d1426a2256eb3eafa0b30b8d3c5d141325ee133ea8805fe355116d12e06697d *chromedriver-v31.0.1-win32-arm64.zip +2827073d912c13d65e986e3afd832a8b06339fd8001017b13d066b93ed2841bc *chromedriver-v31.0.1-win32-ia32.zip +d602711a95128caf89e51a9cd84a04f007ec7615d56dce8a92a35ae5f444f641 *chromedriver-v31.0.1-win32-x64.zip +19ed5d62633062b350e4e8307671f88f7e65d0c4fcedbc5b5672c30a2d486764 *electron-api.json +b678d3317e45d545d0f63010419d87afc029abbc90b50a743d7286d087f41c35 *electron-v31.0.1-darwin-arm64-dsym-snapshot.zip +9580917bcc27a1c04940fac9affa6957e27302244721861fd757a65b61781de3 *electron-v31.0.1-darwin-arm64-dsym.zip +6825f27387233a5ac0388a26df4204418a1a9ad5407beaa4577908e7d7fce10e *electron-v31.0.1-darwin-arm64-symbols.zip +68f90a6c6f1f8f616ee65f820f7c95394782c0e34775f9a81a6a6c628134dc3f *electron-v31.0.1-darwin-arm64.zip +c193d472d1c69d5835b449913633a83637a1f8d263719f2aaf09051068e41fec *electron-v31.0.1-darwin-x64-dsym-snapshot.zip +df8d8fc12f76f5690cddbc71431b939ee60770d63e16065037204a5abd14de29 *electron-v31.0.1-darwin-x64-dsym.zip +94808d5576fb285def4a86695fb5cac6a0130bae41c117ebb7d8fa74d5ec0a93 *electron-v31.0.1-darwin-x64-symbols.zip +7bb127f2c7d900ba15d40e2f21462f546e4d7a4461add8fd2ac7164df836e191 *electron-v31.0.1-darwin-x64.zip +f9807c864c9dec77fd6d8afffd284abf31388a6f3add991d1fb1223d29dd0853 *electron-v31.0.1-linux-arm64-debug.zip +f8cade58379fa680acfd0afb73d406709241c5cfb23216a0589a84a31aad926c *electron-v31.0.1-linux-arm64-symbols.zip +4f4a972f9cbfc0a8304c1356f05ec8b7d4956f0450ba425c20f90c24aa2dbcd7 *electron-v31.0.1-linux-arm64.zip +f9807c864c9dec77fd6d8afffd284abf31388a6f3add991d1fb1223d29dd0853 *electron-v31.0.1-linux-armv7l-debug.zip +130fbe9a1ad9f89af480475dfc1d08c823a3a9193560326628f0615b3ff0c449 *electron-v31.0.1-linux-armv7l-symbols.zip +d8f2fee75dc6aec4c30574fa0942439947cdbb34bba3e85607f1b9a02346f194 *electron-v31.0.1-linux-armv7l.zip +92bfd102fd3d44a75a15e4704f4e6d25bde6227529639d3a7443a0a6bb4ac44d *electron-v31.0.1-linux-x64-debug.zip +6feacd8d3b60b2b7781a7646b65271c695d2a6bba410651705f3f9065b7146a2 *electron-v31.0.1-linux-x64-symbols.zip +416dd969ee5e0ba769bb15d9a5d29411d38d1e6dd66204f590c95ea279365dcd *electron-v31.0.1-linux-x64.zip +f51d631fbb50b8633fa21459a07a29c61e2801b5a7b51e9a243aa48c305b9b4d *electron-v31.0.1-mas-arm64-dsym-snapshot.zip +5cc63f8c635b1cca53d4b9d46e2f3bfaa670aa2b74d86c8ecc482d8aa6fab5bd *electron-v31.0.1-mas-arm64-dsym.zip +8af28ade52c38cd97738654532b3fc3dbfea9111ea55542342488ebdccb8205c *electron-v31.0.1-mas-arm64-symbols.zip +cf073db7d79af58f89493ec0957dd3619a541d774c1bd8afc9c861bd21818fac *electron-v31.0.1-mas-arm64.zip +0807360deca6d4d5fffe4de0c5319ca036c315c0bd7e3a08592c2080ed158ee6 *electron-v31.0.1-mas-x64-dsym-snapshot.zip +8669dd3a0cfc4926de705b406bfc9ddb6c4950bc4d944d4a6bd512b474d09ada *electron-v31.0.1-mas-x64-dsym.zip +455a778c25c4ce438d179c238a2bc68a3fb88189579910b9092c22e9bb44a482 *electron-v31.0.1-mas-x64-symbols.zip +4050a3cb7222d96c8a0c2dd0f29a92a57a062e091ebfbd71f57673635bd2f91b *electron-v31.0.1-mas-x64.zip +7c28635b8428ffd44ccae3c205b88b512432d0676d81acf36ed1c7451ccfa229 *electron-v31.0.1-win32-arm64-pdb.zip +f17485fac8c962058cc13d0383cf0accc4980d42b2f3b05d68ca72d60b576696 *electron-v31.0.1-win32-arm64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.0.1-win32-arm64-toolchain-profile.zip +4a370b0ac90455ac68cc3e3db21e74c375f68bcc736c49cad1ae142f0857f1b5 *electron-v31.0.1-win32-arm64.zip +5e52e4c555b2e1ff72011381e92af717a3ba4295eda323606cb6e6cd08e366e0 *electron-v31.0.1-win32-ia32-pdb.zip +e58a7cb373fc0103ab374e893fc7f8a36dd2aa3fbe4fdbb04fe6609baafb5a5f *electron-v31.0.1-win32-ia32-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.0.1-win32-ia32-toolchain-profile.zip +16fda6510f7210cd62957257f026f721f6de25704eca2fff22763a1275cdd1ca *electron-v31.0.1-win32-ia32.zip +a36d70816f3ffd233105ec2af44034d7feb06e712757fe42fe7a38c2ebccad67 *electron-v31.0.1-win32-x64-pdb.zip +b3667157c20584fe214cbcaccf74eede36541bcc92d0e103c6e6b6b3797beee9 *electron-v31.0.1-win32-x64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.0.1-win32-x64-toolchain-profile.zip +990a46338b1ce0b74abcfe1e52f56dbd1326f1a062a7744582edc1c07985cf62 *electron-v31.0.1-win32-x64.zip +1e856ec00a8f68bca31ab1e93fbf18dc92cbdefc1b7245c67c89a126e59efb9e *electron.d.ts +51569f01e02c29dd5fd8ebc69b307ae7c774055788d45f37e29d956865a10dd0 *ffmpeg-v31.0.1-darwin-arm64.zip +404166847957245109aa97851e0e65c0d485b8c97b8ed13ebe246c9e70017ac4 *ffmpeg-v31.0.1-darwin-x64.zip +39a5b0c679fd58c3fc56635cc3991d999eabfc490abcc2bea0328d3918b70eaa *ffmpeg-v31.0.1-linux-arm64.zip +9e5fb6279b90e0b4929f0e72c4259f6ade761d643fb68e8878791fa06e9bbada *ffmpeg-v31.0.1-linux-armv7l.zip +9828dc7b92cb23f015e3f3bdc24ca29613fc6f51e2c6ef7363077c5f52c7844d *ffmpeg-v31.0.1-linux-x64.zip +ede00c22a0f1b9570419dc29c7f0c77e3eaa868eb1711acd403d6369af77c1f4 *ffmpeg-v31.0.1-mas-arm64.zip +49027eebe9e8612431b25ee6f3c7f0b03c431a85ca96145c98d78259d8344855 *ffmpeg-v31.0.1-mas-x64.zip +4a8ac179d7617307eafb2d28b9a5a88e9557c6b5ab6ab61b67a52927080158e8 *ffmpeg-v31.0.1-win32-arm64.zip +218340f36161e3bd6314352bd5708c89e602f9e7e55378ea3cb81f89219489b1 *ffmpeg-v31.0.1-win32-ia32.zip +8f3ef3b3c06bb609ee3e1bf21d5edcb2249728178df5e6a7b48cb294eb4775f1 *ffmpeg-v31.0.1-win32-x64.zip +a5e8fdedf1793737ad094943e08a5c8d2ed8c8d02a1848ca2a5bc98b582a2d86 *hunspell_dictionaries.zip +ab43a3b830f3a66e9d3ff75d3fd0b1e994dc013677edf43854cb988b1fb70705 *libcxx-objects-v31.0.1-linux-arm64.zip +5b601e7d684bd93568c2612fd8a4f8ed0cb2ebc2c11b03217902cb09cc3150e7 *libcxx-objects-v31.0.1-linux-armv7l.zip +c7b48845738b87d2dd6bbdaf69e39d2a18a4a9b02b7eb01583675ea14cb89d26 *libcxx-objects-v31.0.1-linux-x64.zip +5ef82da400c8d160a9932d8ca7bf7986ce69e4a93eda0f5d801f554821243097 *libcxx_headers.zip +43aa8873b8c97c39250cef6cb8f19c6b8e8a0bb5154b1acf29e5a5296fd73b49 *libcxxabi_headers.zip +01d2796cb0533c5f8731ec1c17805b1fd84299051aa067fbb6495e77b51030f0 *mksnapshot-v31.0.1-darwin-arm64.zip +1bf089ea614c8997f49b4fe960d3d1965cc67399fee7aaa6e8d8828fde7573f3 *mksnapshot-v31.0.1-darwin-x64.zip +a05e9dae9b2a967adbf263fd7c53bd6e47e370aafe86e63d1cb413c026b5d100 *mksnapshot-v31.0.1-linux-arm64-x64.zip +531af8e0ef7aeb28de6b01a8f72dbadb05cd9a1ff0b4093f0af0e8106d9a85ea *mksnapshot-v31.0.1-linux-armv7l-x64.zip +088714e80faca960fc3547715be1a3a9672bf074e330e5c5ec75d1cc30474be6 *mksnapshot-v31.0.1-linux-x64.zip +f8e4a0ad3cc319930538250a47ac736857de289e63f99b250cc9a383c72c61b4 *mksnapshot-v31.0.1-mas-arm64.zip +1df5e0add8d5c88ce979dd9002ce6770c875a50289ca34ae286f99bedd16bb3a *mksnapshot-v31.0.1-mas-x64.zip +716cea516f9eb9023df1b9a572fd1d1ca0d9e3898af0150d21fa674d085b2b88 *mksnapshot-v31.0.1-win32-arm64-x64.zip +e8d16ed38149905645f0118e397bb57f0a632aa4d7bbbff7cb2b3562fa71bcd7 *mksnapshot-v31.0.1-win32-ia32.zip +5a9f61c07b18b10dd56fc4371ae5d4e8c919255405615d5ca2b579892eaedf2c *mksnapshot-v31.0.1-win32-x64.zip diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js index 77ff92151e8ce..8fe5ba60c0f67 100644 --- a/build/linux/debian/install-sysroot.js +++ b/build/linux/debian/install-sysroot.js @@ -35,8 +35,7 @@ function getElectronVersion() { return { electronVersion, msBuildId }; } function getSha(filename) { - // CodeQL [SM04514] Hash logic cannot be changed due to external dependency, also the code is only used during build. - const hash = (0, crypto_1.createHash)('sha1'); + const hash = (0, crypto_1.createHash)('sha256'); // Read file 1 MB at a time const fd = fs.openSync(filename, 'r'); const buffer = Buffer.alloc(1024 * 1024); @@ -168,7 +167,7 @@ async function getChromiumSysroot(arch) { const sysrootArch = `bullseye_${arch}`; const sysrootDict = sysrootInfo[sysrootArch]; const tarballFilename = sysrootDict['Tarball']; - const tarballSha = sysrootDict['Sha1Sum']; + const tarballSha = sysrootDict['Sha256Sum']; const sysroot = path.join((0, os_1.tmpdir)(), sysrootDict['SysrootDir']); const url = [URL_PREFIX, URL_PATH, tarballSha, tarballFilename].join('/'); const stamp = path.join(sysroot, '.stamp'); diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts index 76a31d63cdbcc..645ad21964c17 100644 --- a/build/linux/debian/install-sysroot.ts +++ b/build/linux/debian/install-sysroot.ts @@ -45,8 +45,7 @@ function getElectronVersion(): Record { } function getSha(filename: fs.PathLike): string { - // CodeQL [SM04514] Hash logic cannot be changed due to external dependency, also the code is only used during build. - const hash = createHash('sha1'); + const hash = createHash('sha256'); // Read file 1 MB at a time const fd = fs.openSync(filename, 'r'); const buffer = Buffer.alloc(1024 * 1024); @@ -129,7 +128,7 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000) } type SysrootDictEntry = { - Sha1Sum: string; + Sha256Sum: string; SysrootDir: string; Tarball: string; }; @@ -186,7 +185,7 @@ export async function getChromiumSysroot(arch: DebianArchString): Promise Date: Wed, 17 Jul 2024 15:30:54 +0900 Subject: [PATCH 02/41] chore: bump electron@31.1.0 --- .npmrc | 4 +- build/azure-pipelines/linux/setup-env.sh | 8 +- build/checksums/electron.txt | 150 +++++++++++------------ build/linux/dependencies-generator.js | 2 +- build/linux/dependencies-generator.ts | 2 +- cgmanifest.json | 8 +- package.json | 2 +- 7 files changed, 88 insertions(+), 88 deletions(-) diff --git a/.npmrc b/.npmrc index 3442ef10f6ede..82caf800401ce 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="31.0.1" -ms_build_id="9781779" +target="31.1.0" +ms_build_id="9798048" runtime="electron" build_from_source="true" legacy-peer-deps="true" diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index 4724971fd581a..e6dc9fbaba101 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -18,7 +18,7 @@ fi if [ "$npm_config_arch" == "x64" ]; then if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/126.0.6478.36/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/126.0.6478.114/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 \ @@ -30,9 +30,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/126.0.6478.36:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.36:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.36:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.114:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.114:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.114:build/config/c++/BUILD.gn export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 137753fc8e25c..6bf8fd69de382 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -ceab82d2b84de13d61537bc985dd15c403b6acf55334d9ffa55b5f81a270c75f *chromedriver-v31.0.1-darwin-arm64.zip -18f4229338cdd7172ad63681a2f63d231c24ab82059125b737d29ed2f38b3269 *chromedriver-v31.0.1-darwin-x64.zip -4d059bbeca3eb3b01178eeeb6356d088dc5dfb5a95679d24797daef5f81aec11 *chromedriver-v31.0.1-linux-arm64.zip -251c17138d6f69b76b1409c0598c476510085e5295dc76ca896f7a5660483a55 *chromedriver-v31.0.1-linux-armv7l.zip -d55df73f0c5a318aa639cb3a3ac9d719913541fa545129e9003cc69bd4f80d4c *chromedriver-v31.0.1-linux-x64.zip -07a626b240d3a5eebf43eafba3816778f21f4dcb02563f7664bf8595b18c2a07 *chromedriver-v31.0.1-mas-arm64.zip -e263fef9ce2b84827372dd1529b60a74894a8bd23d35818c1d32f3fbc0178357 *chromedriver-v31.0.1-mas-x64.zip -2d1426a2256eb3eafa0b30b8d3c5d141325ee133ea8805fe355116d12e06697d *chromedriver-v31.0.1-win32-arm64.zip -2827073d912c13d65e986e3afd832a8b06339fd8001017b13d066b93ed2841bc *chromedriver-v31.0.1-win32-ia32.zip -d602711a95128caf89e51a9cd84a04f007ec7615d56dce8a92a35ae5f444f641 *chromedriver-v31.0.1-win32-x64.zip -19ed5d62633062b350e4e8307671f88f7e65d0c4fcedbc5b5672c30a2d486764 *electron-api.json -b678d3317e45d545d0f63010419d87afc029abbc90b50a743d7286d087f41c35 *electron-v31.0.1-darwin-arm64-dsym-snapshot.zip -9580917bcc27a1c04940fac9affa6957e27302244721861fd757a65b61781de3 *electron-v31.0.1-darwin-arm64-dsym.zip -6825f27387233a5ac0388a26df4204418a1a9ad5407beaa4577908e7d7fce10e *electron-v31.0.1-darwin-arm64-symbols.zip -68f90a6c6f1f8f616ee65f820f7c95394782c0e34775f9a81a6a6c628134dc3f *electron-v31.0.1-darwin-arm64.zip -c193d472d1c69d5835b449913633a83637a1f8d263719f2aaf09051068e41fec *electron-v31.0.1-darwin-x64-dsym-snapshot.zip -df8d8fc12f76f5690cddbc71431b939ee60770d63e16065037204a5abd14de29 *electron-v31.0.1-darwin-x64-dsym.zip -94808d5576fb285def4a86695fb5cac6a0130bae41c117ebb7d8fa74d5ec0a93 *electron-v31.0.1-darwin-x64-symbols.zip -7bb127f2c7d900ba15d40e2f21462f546e4d7a4461add8fd2ac7164df836e191 *electron-v31.0.1-darwin-x64.zip -f9807c864c9dec77fd6d8afffd284abf31388a6f3add991d1fb1223d29dd0853 *electron-v31.0.1-linux-arm64-debug.zip -f8cade58379fa680acfd0afb73d406709241c5cfb23216a0589a84a31aad926c *electron-v31.0.1-linux-arm64-symbols.zip -4f4a972f9cbfc0a8304c1356f05ec8b7d4956f0450ba425c20f90c24aa2dbcd7 *electron-v31.0.1-linux-arm64.zip -f9807c864c9dec77fd6d8afffd284abf31388a6f3add991d1fb1223d29dd0853 *electron-v31.0.1-linux-armv7l-debug.zip -130fbe9a1ad9f89af480475dfc1d08c823a3a9193560326628f0615b3ff0c449 *electron-v31.0.1-linux-armv7l-symbols.zip -d8f2fee75dc6aec4c30574fa0942439947cdbb34bba3e85607f1b9a02346f194 *electron-v31.0.1-linux-armv7l.zip -92bfd102fd3d44a75a15e4704f4e6d25bde6227529639d3a7443a0a6bb4ac44d *electron-v31.0.1-linux-x64-debug.zip -6feacd8d3b60b2b7781a7646b65271c695d2a6bba410651705f3f9065b7146a2 *electron-v31.0.1-linux-x64-symbols.zip -416dd969ee5e0ba769bb15d9a5d29411d38d1e6dd66204f590c95ea279365dcd *electron-v31.0.1-linux-x64.zip -f51d631fbb50b8633fa21459a07a29c61e2801b5a7b51e9a243aa48c305b9b4d *electron-v31.0.1-mas-arm64-dsym-snapshot.zip -5cc63f8c635b1cca53d4b9d46e2f3bfaa670aa2b74d86c8ecc482d8aa6fab5bd *electron-v31.0.1-mas-arm64-dsym.zip -8af28ade52c38cd97738654532b3fc3dbfea9111ea55542342488ebdccb8205c *electron-v31.0.1-mas-arm64-symbols.zip -cf073db7d79af58f89493ec0957dd3619a541d774c1bd8afc9c861bd21818fac *electron-v31.0.1-mas-arm64.zip -0807360deca6d4d5fffe4de0c5319ca036c315c0bd7e3a08592c2080ed158ee6 *electron-v31.0.1-mas-x64-dsym-snapshot.zip -8669dd3a0cfc4926de705b406bfc9ddb6c4950bc4d944d4a6bd512b474d09ada *electron-v31.0.1-mas-x64-dsym.zip -455a778c25c4ce438d179c238a2bc68a3fb88189579910b9092c22e9bb44a482 *electron-v31.0.1-mas-x64-symbols.zip -4050a3cb7222d96c8a0c2dd0f29a92a57a062e091ebfbd71f57673635bd2f91b *electron-v31.0.1-mas-x64.zip -7c28635b8428ffd44ccae3c205b88b512432d0676d81acf36ed1c7451ccfa229 *electron-v31.0.1-win32-arm64-pdb.zip -f17485fac8c962058cc13d0383cf0accc4980d42b2f3b05d68ca72d60b576696 *electron-v31.0.1-win32-arm64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.0.1-win32-arm64-toolchain-profile.zip -4a370b0ac90455ac68cc3e3db21e74c375f68bcc736c49cad1ae142f0857f1b5 *electron-v31.0.1-win32-arm64.zip -5e52e4c555b2e1ff72011381e92af717a3ba4295eda323606cb6e6cd08e366e0 *electron-v31.0.1-win32-ia32-pdb.zip -e58a7cb373fc0103ab374e893fc7f8a36dd2aa3fbe4fdbb04fe6609baafb5a5f *electron-v31.0.1-win32-ia32-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.0.1-win32-ia32-toolchain-profile.zip -16fda6510f7210cd62957257f026f721f6de25704eca2fff22763a1275cdd1ca *electron-v31.0.1-win32-ia32.zip -a36d70816f3ffd233105ec2af44034d7feb06e712757fe42fe7a38c2ebccad67 *electron-v31.0.1-win32-x64-pdb.zip -b3667157c20584fe214cbcaccf74eede36541bcc92d0e103c6e6b6b3797beee9 *electron-v31.0.1-win32-x64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.0.1-win32-x64-toolchain-profile.zip -990a46338b1ce0b74abcfe1e52f56dbd1326f1a062a7744582edc1c07985cf62 *electron-v31.0.1-win32-x64.zip -1e856ec00a8f68bca31ab1e93fbf18dc92cbdefc1b7245c67c89a126e59efb9e *electron.d.ts -51569f01e02c29dd5fd8ebc69b307ae7c774055788d45f37e29d956865a10dd0 *ffmpeg-v31.0.1-darwin-arm64.zip -404166847957245109aa97851e0e65c0d485b8c97b8ed13ebe246c9e70017ac4 *ffmpeg-v31.0.1-darwin-x64.zip -39a5b0c679fd58c3fc56635cc3991d999eabfc490abcc2bea0328d3918b70eaa *ffmpeg-v31.0.1-linux-arm64.zip -9e5fb6279b90e0b4929f0e72c4259f6ade761d643fb68e8878791fa06e9bbada *ffmpeg-v31.0.1-linux-armv7l.zip -9828dc7b92cb23f015e3f3bdc24ca29613fc6f51e2c6ef7363077c5f52c7844d *ffmpeg-v31.0.1-linux-x64.zip -ede00c22a0f1b9570419dc29c7f0c77e3eaa868eb1711acd403d6369af77c1f4 *ffmpeg-v31.0.1-mas-arm64.zip -49027eebe9e8612431b25ee6f3c7f0b03c431a85ca96145c98d78259d8344855 *ffmpeg-v31.0.1-mas-x64.zip -4a8ac179d7617307eafb2d28b9a5a88e9557c6b5ab6ab61b67a52927080158e8 *ffmpeg-v31.0.1-win32-arm64.zip -218340f36161e3bd6314352bd5708c89e602f9e7e55378ea3cb81f89219489b1 *ffmpeg-v31.0.1-win32-ia32.zip -8f3ef3b3c06bb609ee3e1bf21d5edcb2249728178df5e6a7b48cb294eb4775f1 *ffmpeg-v31.0.1-win32-x64.zip -a5e8fdedf1793737ad094943e08a5c8d2ed8c8d02a1848ca2a5bc98b582a2d86 *hunspell_dictionaries.zip -ab43a3b830f3a66e9d3ff75d3fd0b1e994dc013677edf43854cb988b1fb70705 *libcxx-objects-v31.0.1-linux-arm64.zip -5b601e7d684bd93568c2612fd8a4f8ed0cb2ebc2c11b03217902cb09cc3150e7 *libcxx-objects-v31.0.1-linux-armv7l.zip -c7b48845738b87d2dd6bbdaf69e39d2a18a4a9b02b7eb01583675ea14cb89d26 *libcxx-objects-v31.0.1-linux-x64.zip -5ef82da400c8d160a9932d8ca7bf7986ce69e4a93eda0f5d801f554821243097 *libcxx_headers.zip -43aa8873b8c97c39250cef6cb8f19c6b8e8a0bb5154b1acf29e5a5296fd73b49 *libcxxabi_headers.zip -01d2796cb0533c5f8731ec1c17805b1fd84299051aa067fbb6495e77b51030f0 *mksnapshot-v31.0.1-darwin-arm64.zip -1bf089ea614c8997f49b4fe960d3d1965cc67399fee7aaa6e8d8828fde7573f3 *mksnapshot-v31.0.1-darwin-x64.zip -a05e9dae9b2a967adbf263fd7c53bd6e47e370aafe86e63d1cb413c026b5d100 *mksnapshot-v31.0.1-linux-arm64-x64.zip -531af8e0ef7aeb28de6b01a8f72dbadb05cd9a1ff0b4093f0af0e8106d9a85ea *mksnapshot-v31.0.1-linux-armv7l-x64.zip -088714e80faca960fc3547715be1a3a9672bf074e330e5c5ec75d1cc30474be6 *mksnapshot-v31.0.1-linux-x64.zip -f8e4a0ad3cc319930538250a47ac736857de289e63f99b250cc9a383c72c61b4 *mksnapshot-v31.0.1-mas-arm64.zip -1df5e0add8d5c88ce979dd9002ce6770c875a50289ca34ae286f99bedd16bb3a *mksnapshot-v31.0.1-mas-x64.zip -716cea516f9eb9023df1b9a572fd1d1ca0d9e3898af0150d21fa674d085b2b88 *mksnapshot-v31.0.1-win32-arm64-x64.zip -e8d16ed38149905645f0118e397bb57f0a632aa4d7bbbff7cb2b3562fa71bcd7 *mksnapshot-v31.0.1-win32-ia32.zip -5a9f61c07b18b10dd56fc4371ae5d4e8c919255405615d5ca2b579892eaedf2c *mksnapshot-v31.0.1-win32-x64.zip +3027d066b41e8ebc334c8d7398bdd062410fb18d2db16c92778a0ede28208c2d *chromedriver-v31.1.0-darwin-arm64.zip +cab03d8de9cdc9d19e00e676e488ffee71c11454edc1215887cd8f208685aa3d *chromedriver-v31.1.0-darwin-x64.zip +9e89f9b5ab5d0e96c3707942fc94493c197f287c706f85016864f730025afd4a *chromedriver-v31.1.0-linux-arm64.zip +dd8abe775af3d56f1db63666d58c0fec711f84f412e368ab72e27ef166a75384 *chromedriver-v31.1.0-linux-armv7l.zip +a0b02d3d61fdd6591d893309fdd78daff3d5342c95832b1808ae7a72b2da3e2b *chromedriver-v31.1.0-linux-x64.zip +adbeebefb52152377123b4065f846052fd314f5f5e76168c078858f5a9afb967 *chromedriver-v31.1.0-mas-arm64.zip +50add394ee57c40d068b9f50f362081efc694edcb7f2042f3684a9899e28fe7c *chromedriver-v31.1.0-mas-x64.zip +1a7dc3f7850cf02cf7268eb09e8bc26ccab4a5695cb16f6b0b9689f7dfef0f89 *chromedriver-v31.1.0-win32-arm64.zip +982f0dd1b89a8b479c521298b5dd5204cf90b9a9455a01220a388ef4327e3206 *chromedriver-v31.1.0-win32-ia32.zip +eb4b6263b5d71dd6909f769d618bb27acd108b0ef9a6862fb1a281e8100fb4fb *chromedriver-v31.1.0-win32-x64.zip +d51481aaccec39bd9b048fbff3f5238adea957c4f5f50532cc78001848554f5c *electron-api.json +3f14beaeff4c84b0c138ee032a1dd53a84a40fb1b8a8afe5f5e46200ed841ad4 *electron-v31.1.0-darwin-arm64-dsym-snapshot.zip +c1552b396f016b4fd9ba57101f5e1cf3495f68040a1b7f2e3970e4e6f43831bf *electron-v31.1.0-darwin-arm64-dsym.zip +caa649768abee740b5384965760cf81c6cde0ea415dbe13aa7e574db2a9c0ad2 *electron-v31.1.0-darwin-arm64-symbols.zip +961b5ad80399f6e584e8ea94c9dfff2767232f0946bbd07f645a92f13da7aba4 *electron-v31.1.0-darwin-arm64.zip +e6d213240674359009e8d40d6ef1b77efa3be527f00759168ad78e841308ac80 *electron-v31.1.0-darwin-x64-dsym-snapshot.zip +ca8523b05a15cb05d25b7b1f445b0860ccfbea1b38ed04ebc33d24c7a404efbe *electron-v31.1.0-darwin-x64-dsym.zip +50446c277c23e9b3195c97f9a45899a9ffcc883abf1b9b7d8214537907b6347d *electron-v31.1.0-darwin-x64-symbols.zip +b74b1da1c141468e74a2914e13e00e3d6a80b9b7d75345b2d7b2a3b285922623 *electron-v31.1.0-darwin-x64.zip +060db0bfedb526ef376c7e50557afae361d8ba00f2ee9d4070a7319b038cd775 *electron-v31.1.0-linux-arm64-debug.zip +b474560ffc8ddfa1435dfb4081b6f6314b66f220f75c7c8037dddb8db0abd64e *electron-v31.1.0-linux-arm64-symbols.zip +38a6cc6e1890406b862091d9b573f0f285129151bc50b0abc41f8eeb03fa5e64 *electron-v31.1.0-linux-arm64.zip +060db0bfedb526ef376c7e50557afae361d8ba00f2ee9d4070a7319b038cd775 *electron-v31.1.0-linux-armv7l-debug.zip +6d5a838ec676f0de80f5518df94b16b7fb3d067481bf068a30f3300bb924297b *electron-v31.1.0-linux-armv7l-symbols.zip +b4c4eacaa539fdd9604e0242515f25fe26b8f0288347acebbd03659354391107 *electron-v31.1.0-linux-armv7l.zip +4e41ea7a84f20985408052b22b6cd4cb9ac23c9991974b165c15b260484b8d77 *electron-v31.1.0-linux-x64-debug.zip +95b584ca96bf56737f7497146371f755fad79e519cb875afa0a2426c45913ea8 *electron-v31.1.0-linux-x64-symbols.zip +9885ce5397c2751083f5ffd871a3247f2a8f09e71c2328e9c56ba1b9e84d2aa4 *electron-v31.1.0-linux-x64.zip +4a3f0e44f691defeb126ebd288a6a361d4c5cd512f9b1a6b3d89cf4e8f1c565d *electron-v31.1.0-mas-arm64-dsym-snapshot.zip +18acd7f674dde56be66d9388257dbd3323ee355ae9ae666a0322578c7d6af6e1 *electron-v31.1.0-mas-arm64-dsym.zip +1bccaa52080fb9b74d039dc0e2dc7a66ebaa77ecf3730ba104a834d097faa399 *electron-v31.1.0-mas-arm64-symbols.zip +5b30bc06dc200dfc97ef00d65dae5e314be8f0f92b98353c443d4df246c4cc3c *electron-v31.1.0-mas-arm64.zip +8a524de630e279d86b7d1105eec96e024c3170c7e74967406442913b4b7fdc14 *electron-v31.1.0-mas-x64-dsym-snapshot.zip +b5a2749e39f312bbb1e09acdb67058755974b44ba77d5f61e2a480c4b6377dd6 *electron-v31.1.0-mas-x64-dsym.zip +8fb1480c40a79e87a5a4b5323e598e645b949c170f6850ebb231ea204caddb65 *electron-v31.1.0-mas-x64-symbols.zip +79a48535bee9bff40e98164b4c9d62e9d2dd9ad187c76a63df373134c5edbe0c *electron-v31.1.0-mas-x64.zip +61736586e3018fd9fc83bf3619e2e0245f46756326ca3ff44ee0573ed04c03cd *electron-v31.1.0-win32-arm64-pdb.zip +d39627b84cbfedfec178e3ecc5ed59c57037f11292f47b416a8139e3ba9f4baa *electron-v31.1.0-win32-arm64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.1.0-win32-arm64-toolchain-profile.zip +2612b9b7644af27af368e8ffecd11bf6a2cf1558b6dc1a066967a45e79b25806 *electron-v31.1.0-win32-arm64.zip +1841571d175895d3ff3df8826610a29c06b5c1da3510403f4ff0ad50c2ae3ef3 *electron-v31.1.0-win32-ia32-pdb.zip +d474a9c5d56451a24eb3c32f8498a3b7d9a2b7321f26b5add829edf852346c82 *electron-v31.1.0-win32-ia32-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.1.0-win32-ia32-toolchain-profile.zip +9ddc3b9bcc9d16ed801ffe38b1201cf4010ff242ce613ded75f59bf1e9e6fefd *electron-v31.1.0-win32-ia32.zip +e43a3bc5ea39b3b6abb286d08f91fbacf5054c36f84ea3b392b03d3cb387b57c *electron-v31.1.0-win32-x64-pdb.zip +a196ba38749b3e6c1bf3d098c008c298dc472cedb477f80ebc3a0378bdc98933 *electron-v31.1.0-win32-x64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.1.0-win32-x64-toolchain-profile.zip +6b232d8cd2997812b17ee9cf8d962d10347e3b7be95bc669ec16ea06b44aaf47 *electron-v31.1.0-win32-x64.zip +eec5af5fc9525cb2fb2ed63a0e1a49dfb505cc4ec42fc4b01838f004a0afc6fd *electron.d.ts +7c6c17ae3a61e511649dfde4b8d0319c1faf3e1ec1fbf7675b168b3d1938a667 *ffmpeg-v31.1.0-darwin-arm64.zip +aae04cf033cb3de747761d989ad8823af0a51064af0c9b04469fd92fb7f33741 *ffmpeg-v31.1.0-darwin-x64.zip +e6d1937a647670adf27a9862aceedc4d9491118be192c81e22d27af1a3fdd736 *ffmpeg-v31.1.0-linux-arm64.zip +3ef77e31a41eb7f5796aa4cf283cd60bc160ad38ff6a5e6da0a4e5d32bd9a583 *ffmpeg-v31.1.0-linux-armv7l.zip +b0f42d433ae0a4c091740ff550d7fe8e812e20043d991671fab54563f798bc4d *ffmpeg-v31.1.0-linux-x64.zip +f122554367df53730a24f2f1a8beb1dad8daf36b67b40e8bcc7d2d3cb7ae65a9 *ffmpeg-v31.1.0-mas-arm64.zip +e545d8bc6e02b709806e52ec60f966b0309bc8cb8a3ec8cce9407b0d240b0db3 *ffmpeg-v31.1.0-mas-x64.zip +eed0ba18c66e08f6331bdfda00086c644771f2d46cdc672bf8c5431fb04d2307 *ffmpeg-v31.1.0-win32-arm64.zip +eeec282cfd028823bb67d118963e06957b6e979bced7f1926d704b0639887e26 *ffmpeg-v31.1.0-win32-ia32.zip +db3a42d4303258b864c735df362f76b987f5b75bfa7d102bd8b7154d6c53a221 *ffmpeg-v31.1.0-win32-x64.zip +823a20735172aeb0bded40d7f41d1eaedca1ed76b5b587f0dc3e3f878c8c09d6 *hunspell_dictionaries.zip +04b66452cea395266df506d327389c2282bd6aa605817d4a94d21c4c38f6916d *libcxx-objects-v31.1.0-linux-arm64.zip +6eada3c7251fcfe0534fb27d4c5698fc50474f8e8ac7bc64acbaab3ad2117017 *libcxx-objects-v31.1.0-linux-armv7l.zip +6e0c55b870c892ae7be1e7a37b6405c54b3787b00da9b5784b531f1c8e6ae984 *libcxx-objects-v31.1.0-linux-x64.zip +5a433de7bbf82f58a4b4e9b3de759578467e628a0a4ede1528c4c25bc33becce *libcxx_headers.zip +005402ab72aa8b3b5aec94eaca4db8a8cbc4f445eeb7a8277b5b9f80e157b20e *libcxxabi_headers.zip +9a5a7f4cb4b3511dc8b4e0936905c2c923ea23f3537d0fa57a7c31f94be759a5 *mksnapshot-v31.1.0-darwin-arm64.zip +80d12423e09d764bc1437ad2df800f29d694e8530c86c64229cfcb3bf4c065c0 *mksnapshot-v31.1.0-darwin-x64.zip +6e23dc0dd6a082869ebf36b033e129bc2d92de83d7ad296551ea673cae84b291 *mksnapshot-v31.1.0-linux-arm64-x64.zip +0cc676f1e158f9d37f8aea2e484c2501f18ee723c4734690cc0b4147c4ea6c56 *mksnapshot-v31.1.0-linux-armv7l-x64.zip +9c4ed815f9e4594ed67dc0c423c5602a3e9a45cde9163bcb2281ed41c149a47b *mksnapshot-v31.1.0-linux-x64.zip +445131f27772d7877035f2ad01ec0a9c8aff37bdc68095b98a600eea8f43cf89 *mksnapshot-v31.1.0-mas-arm64.zip +264db52881e7cb0b452a600042239dfd0d821fa19815ad15fa61eb6daff9df28 *mksnapshot-v31.1.0-mas-x64.zip +d853cdd1757e2b248e10e5e22a15ad4e5c4a3cefb7326271f8810ec0b99d688d *mksnapshot-v31.1.0-win32-arm64-x64.zip +d59cb03bb11fd4fb06417aa9643d8dfb4464f9829beed809efe13579ad8416d3 *mksnapshot-v31.1.0-win32-ia32.zip +8b8317293c94b42f76bfe52a8706f5b4e2ea24019884a2bc6fbfb40ab4765b6f *mksnapshot-v31.1.0-win32-x64.zip diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index f7a42e52e6f82..05b92564312b9 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -23,7 +23,7 @@ const product = require("../../product.json"); // The reference dependencies, which one has to update when the new dependencies // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.36:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.114: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/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index e64a99a928498..748acd3dfc44b 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -25,7 +25,7 @@ import product = require('../../product.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/126.0.6478.36:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.114: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 7e164fbe269e8..1ca661adee4e6 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "0a1a1d83444b540ed34849d6e92ceea1cc9f3868" + "commitHash": "044c187ce79bb8a266c5016ce749387a3480f81f" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "126.0.6478.36" + "version": "126.0.6478.114" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "8903eecbb66d72d537d91cd0d1a24867ef15ed5c" + "commitHash": "156dbd57ba92a7bb196620bdb9e4fa0d2cd7ea5c" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "31.0.1" + "version": "31.1.0" }, { "component": { diff --git a/package.json b/package.json index be20a070c1192..0f505edf02c5a 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "31.0.1", + "electron": "31.1.0", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", From b9fcdd1d7e39cc2f09780b6543b9c846290c9b57 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 6 Aug 2024 19:47:27 +0900 Subject: [PATCH 03/41] chore: update sysroot download url --- build/linux/debian/install-sysroot.js | 4 ++-- build/linux/debian/install-sysroot.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js index 8fe5ba60c0f67..354c67a2909eb 100644 --- a/build/linux/debian/install-sysroot.js +++ b/build/linux/debian/install-sysroot.js @@ -14,7 +14,7 @@ const path = require("path"); const crypto_1 = require("crypto"); const ansiColors = require("ansi-colors"); // Based on https://source.chromium.org/chromium/chromium/src/+/main:build/linux/sysroot_scripts/install-sysroot.py. -const URL_PREFIX = 'https://msftelectron.blob.core.windows.net'; +const URL_PREFIX = 'https://msftelectronbuild.z5.web.core.windows.net'; const URL_PATH = 'sysroots/toolchain'; const REPO_ROOT = path.dirname(path.dirname(path.dirname(__dirname))); const ghApiHeaders = { @@ -169,7 +169,7 @@ async function getChromiumSysroot(arch) { const tarballFilename = sysrootDict['Tarball']; const tarballSha = sysrootDict['Sha256Sum']; const sysroot = path.join((0, os_1.tmpdir)(), sysrootDict['SysrootDir']); - const url = [URL_PREFIX, URL_PATH, tarballSha, tarballFilename].join('/'); + const url = [URL_PREFIX, URL_PATH, tarballSha].join('/'); const stamp = path.join(sysroot, '.stamp'); if (fs.existsSync(stamp) && fs.readFileSync(stamp).toString() === url) { return sysroot; diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts index 645ad21964c17..8ea43a523cf3a 100644 --- a/build/linux/debian/install-sysroot.ts +++ b/build/linux/debian/install-sysroot.ts @@ -13,7 +13,7 @@ import { DebianArchString } from './types'; import * as ansiColors from 'ansi-colors'; // Based on https://source.chromium.org/chromium/chromium/src/+/main:build/linux/sysroot_scripts/install-sysroot.py. -const URL_PREFIX = 'https://msftelectron.blob.core.windows.net'; +const URL_PREFIX = 'https://msftelectronbuild.z5.web.core.windows.net'; const URL_PATH = 'sysroots/toolchain'; const REPO_ROOT = path.dirname(path.dirname(path.dirname(__dirname))); @@ -187,7 +187,7 @@ export async function getChromiumSysroot(arch: DebianArchString): Promise Date: Tue, 6 Aug 2024 19:56:26 +0900 Subject: [PATCH 04/41] chore: bump electron@31.3.0 --- .npmrc | 4 +- build/azure-pipelines/linux/setup-env.sh | 8 +- build/checksums/electron.txt | 150 +++++++++++------------ build/linux/dependencies-generator.js | 2 +- build/linux/dependencies-generator.ts | 2 +- cgmanifest.json | 8 +- package.json | 2 +- 7 files changed, 88 insertions(+), 88 deletions(-) diff --git a/.npmrc b/.npmrc index 82caf800401ce..c8f284a9bc4af 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="31.1.0" -ms_build_id="9798048" +target="31.3.0" +ms_build_id="9985512" runtime="electron" build_from_source="true" legacy-peer-deps="true" diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index e6dc9fbaba101..38387b4ffd7ff 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -18,7 +18,7 @@ fi if [ "$npm_config_arch" == "x64" ]; then if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/126.0.6478.114/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/126.0.6478.183/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 \ @@ -30,9 +30,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/126.0.6478.114:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.114:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.114:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.183:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.183:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.183:build/config/c++/BUILD.gn export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 6bf8fd69de382..bcda42feafdd7 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -3027d066b41e8ebc334c8d7398bdd062410fb18d2db16c92778a0ede28208c2d *chromedriver-v31.1.0-darwin-arm64.zip -cab03d8de9cdc9d19e00e676e488ffee71c11454edc1215887cd8f208685aa3d *chromedriver-v31.1.0-darwin-x64.zip -9e89f9b5ab5d0e96c3707942fc94493c197f287c706f85016864f730025afd4a *chromedriver-v31.1.0-linux-arm64.zip -dd8abe775af3d56f1db63666d58c0fec711f84f412e368ab72e27ef166a75384 *chromedriver-v31.1.0-linux-armv7l.zip -a0b02d3d61fdd6591d893309fdd78daff3d5342c95832b1808ae7a72b2da3e2b *chromedriver-v31.1.0-linux-x64.zip -adbeebefb52152377123b4065f846052fd314f5f5e76168c078858f5a9afb967 *chromedriver-v31.1.0-mas-arm64.zip -50add394ee57c40d068b9f50f362081efc694edcb7f2042f3684a9899e28fe7c *chromedriver-v31.1.0-mas-x64.zip -1a7dc3f7850cf02cf7268eb09e8bc26ccab4a5695cb16f6b0b9689f7dfef0f89 *chromedriver-v31.1.0-win32-arm64.zip -982f0dd1b89a8b479c521298b5dd5204cf90b9a9455a01220a388ef4327e3206 *chromedriver-v31.1.0-win32-ia32.zip -eb4b6263b5d71dd6909f769d618bb27acd108b0ef9a6862fb1a281e8100fb4fb *chromedriver-v31.1.0-win32-x64.zip -d51481aaccec39bd9b048fbff3f5238adea957c4f5f50532cc78001848554f5c *electron-api.json -3f14beaeff4c84b0c138ee032a1dd53a84a40fb1b8a8afe5f5e46200ed841ad4 *electron-v31.1.0-darwin-arm64-dsym-snapshot.zip -c1552b396f016b4fd9ba57101f5e1cf3495f68040a1b7f2e3970e4e6f43831bf *electron-v31.1.0-darwin-arm64-dsym.zip -caa649768abee740b5384965760cf81c6cde0ea415dbe13aa7e574db2a9c0ad2 *electron-v31.1.0-darwin-arm64-symbols.zip -961b5ad80399f6e584e8ea94c9dfff2767232f0946bbd07f645a92f13da7aba4 *electron-v31.1.0-darwin-arm64.zip -e6d213240674359009e8d40d6ef1b77efa3be527f00759168ad78e841308ac80 *electron-v31.1.0-darwin-x64-dsym-snapshot.zip -ca8523b05a15cb05d25b7b1f445b0860ccfbea1b38ed04ebc33d24c7a404efbe *electron-v31.1.0-darwin-x64-dsym.zip -50446c277c23e9b3195c97f9a45899a9ffcc883abf1b9b7d8214537907b6347d *electron-v31.1.0-darwin-x64-symbols.zip -b74b1da1c141468e74a2914e13e00e3d6a80b9b7d75345b2d7b2a3b285922623 *electron-v31.1.0-darwin-x64.zip -060db0bfedb526ef376c7e50557afae361d8ba00f2ee9d4070a7319b038cd775 *electron-v31.1.0-linux-arm64-debug.zip -b474560ffc8ddfa1435dfb4081b6f6314b66f220f75c7c8037dddb8db0abd64e *electron-v31.1.0-linux-arm64-symbols.zip -38a6cc6e1890406b862091d9b573f0f285129151bc50b0abc41f8eeb03fa5e64 *electron-v31.1.0-linux-arm64.zip -060db0bfedb526ef376c7e50557afae361d8ba00f2ee9d4070a7319b038cd775 *electron-v31.1.0-linux-armv7l-debug.zip -6d5a838ec676f0de80f5518df94b16b7fb3d067481bf068a30f3300bb924297b *electron-v31.1.0-linux-armv7l-symbols.zip -b4c4eacaa539fdd9604e0242515f25fe26b8f0288347acebbd03659354391107 *electron-v31.1.0-linux-armv7l.zip -4e41ea7a84f20985408052b22b6cd4cb9ac23c9991974b165c15b260484b8d77 *electron-v31.1.0-linux-x64-debug.zip -95b584ca96bf56737f7497146371f755fad79e519cb875afa0a2426c45913ea8 *electron-v31.1.0-linux-x64-symbols.zip -9885ce5397c2751083f5ffd871a3247f2a8f09e71c2328e9c56ba1b9e84d2aa4 *electron-v31.1.0-linux-x64.zip -4a3f0e44f691defeb126ebd288a6a361d4c5cd512f9b1a6b3d89cf4e8f1c565d *electron-v31.1.0-mas-arm64-dsym-snapshot.zip -18acd7f674dde56be66d9388257dbd3323ee355ae9ae666a0322578c7d6af6e1 *electron-v31.1.0-mas-arm64-dsym.zip -1bccaa52080fb9b74d039dc0e2dc7a66ebaa77ecf3730ba104a834d097faa399 *electron-v31.1.0-mas-arm64-symbols.zip -5b30bc06dc200dfc97ef00d65dae5e314be8f0f92b98353c443d4df246c4cc3c *electron-v31.1.0-mas-arm64.zip -8a524de630e279d86b7d1105eec96e024c3170c7e74967406442913b4b7fdc14 *electron-v31.1.0-mas-x64-dsym-snapshot.zip -b5a2749e39f312bbb1e09acdb67058755974b44ba77d5f61e2a480c4b6377dd6 *electron-v31.1.0-mas-x64-dsym.zip -8fb1480c40a79e87a5a4b5323e598e645b949c170f6850ebb231ea204caddb65 *electron-v31.1.0-mas-x64-symbols.zip -79a48535bee9bff40e98164b4c9d62e9d2dd9ad187c76a63df373134c5edbe0c *electron-v31.1.0-mas-x64.zip -61736586e3018fd9fc83bf3619e2e0245f46756326ca3ff44ee0573ed04c03cd *electron-v31.1.0-win32-arm64-pdb.zip -d39627b84cbfedfec178e3ecc5ed59c57037f11292f47b416a8139e3ba9f4baa *electron-v31.1.0-win32-arm64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.1.0-win32-arm64-toolchain-profile.zip -2612b9b7644af27af368e8ffecd11bf6a2cf1558b6dc1a066967a45e79b25806 *electron-v31.1.0-win32-arm64.zip -1841571d175895d3ff3df8826610a29c06b5c1da3510403f4ff0ad50c2ae3ef3 *electron-v31.1.0-win32-ia32-pdb.zip -d474a9c5d56451a24eb3c32f8498a3b7d9a2b7321f26b5add829edf852346c82 *electron-v31.1.0-win32-ia32-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.1.0-win32-ia32-toolchain-profile.zip -9ddc3b9bcc9d16ed801ffe38b1201cf4010ff242ce613ded75f59bf1e9e6fefd *electron-v31.1.0-win32-ia32.zip -e43a3bc5ea39b3b6abb286d08f91fbacf5054c36f84ea3b392b03d3cb387b57c *electron-v31.1.0-win32-x64-pdb.zip -a196ba38749b3e6c1bf3d098c008c298dc472cedb477f80ebc3a0378bdc98933 *electron-v31.1.0-win32-x64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.1.0-win32-x64-toolchain-profile.zip -6b232d8cd2997812b17ee9cf8d962d10347e3b7be95bc669ec16ea06b44aaf47 *electron-v31.1.0-win32-x64.zip -eec5af5fc9525cb2fb2ed63a0e1a49dfb505cc4ec42fc4b01838f004a0afc6fd *electron.d.ts -7c6c17ae3a61e511649dfde4b8d0319c1faf3e1ec1fbf7675b168b3d1938a667 *ffmpeg-v31.1.0-darwin-arm64.zip -aae04cf033cb3de747761d989ad8823af0a51064af0c9b04469fd92fb7f33741 *ffmpeg-v31.1.0-darwin-x64.zip -e6d1937a647670adf27a9862aceedc4d9491118be192c81e22d27af1a3fdd736 *ffmpeg-v31.1.0-linux-arm64.zip -3ef77e31a41eb7f5796aa4cf283cd60bc160ad38ff6a5e6da0a4e5d32bd9a583 *ffmpeg-v31.1.0-linux-armv7l.zip -b0f42d433ae0a4c091740ff550d7fe8e812e20043d991671fab54563f798bc4d *ffmpeg-v31.1.0-linux-x64.zip -f122554367df53730a24f2f1a8beb1dad8daf36b67b40e8bcc7d2d3cb7ae65a9 *ffmpeg-v31.1.0-mas-arm64.zip -e545d8bc6e02b709806e52ec60f966b0309bc8cb8a3ec8cce9407b0d240b0db3 *ffmpeg-v31.1.0-mas-x64.zip -eed0ba18c66e08f6331bdfda00086c644771f2d46cdc672bf8c5431fb04d2307 *ffmpeg-v31.1.0-win32-arm64.zip -eeec282cfd028823bb67d118963e06957b6e979bced7f1926d704b0639887e26 *ffmpeg-v31.1.0-win32-ia32.zip -db3a42d4303258b864c735df362f76b987f5b75bfa7d102bd8b7154d6c53a221 *ffmpeg-v31.1.0-win32-x64.zip -823a20735172aeb0bded40d7f41d1eaedca1ed76b5b587f0dc3e3f878c8c09d6 *hunspell_dictionaries.zip -04b66452cea395266df506d327389c2282bd6aa605817d4a94d21c4c38f6916d *libcxx-objects-v31.1.0-linux-arm64.zip -6eada3c7251fcfe0534fb27d4c5698fc50474f8e8ac7bc64acbaab3ad2117017 *libcxx-objects-v31.1.0-linux-armv7l.zip -6e0c55b870c892ae7be1e7a37b6405c54b3787b00da9b5784b531f1c8e6ae984 *libcxx-objects-v31.1.0-linux-x64.zip -5a433de7bbf82f58a4b4e9b3de759578467e628a0a4ede1528c4c25bc33becce *libcxx_headers.zip -005402ab72aa8b3b5aec94eaca4db8a8cbc4f445eeb7a8277b5b9f80e157b20e *libcxxabi_headers.zip -9a5a7f4cb4b3511dc8b4e0936905c2c923ea23f3537d0fa57a7c31f94be759a5 *mksnapshot-v31.1.0-darwin-arm64.zip -80d12423e09d764bc1437ad2df800f29d694e8530c86c64229cfcb3bf4c065c0 *mksnapshot-v31.1.0-darwin-x64.zip -6e23dc0dd6a082869ebf36b033e129bc2d92de83d7ad296551ea673cae84b291 *mksnapshot-v31.1.0-linux-arm64-x64.zip -0cc676f1e158f9d37f8aea2e484c2501f18ee723c4734690cc0b4147c4ea6c56 *mksnapshot-v31.1.0-linux-armv7l-x64.zip -9c4ed815f9e4594ed67dc0c423c5602a3e9a45cde9163bcb2281ed41c149a47b *mksnapshot-v31.1.0-linux-x64.zip -445131f27772d7877035f2ad01ec0a9c8aff37bdc68095b98a600eea8f43cf89 *mksnapshot-v31.1.0-mas-arm64.zip -264db52881e7cb0b452a600042239dfd0d821fa19815ad15fa61eb6daff9df28 *mksnapshot-v31.1.0-mas-x64.zip -d853cdd1757e2b248e10e5e22a15ad4e5c4a3cefb7326271f8810ec0b99d688d *mksnapshot-v31.1.0-win32-arm64-x64.zip -d59cb03bb11fd4fb06417aa9643d8dfb4464f9829beed809efe13579ad8416d3 *mksnapshot-v31.1.0-win32-ia32.zip -8b8317293c94b42f76bfe52a8706f5b4e2ea24019884a2bc6fbfb40ab4765b6f *mksnapshot-v31.1.0-win32-x64.zip +b2e85d41607d09d7645ca58c0243c8f00e15dcbe32f4ceeab9566235eadc7143 *chromedriver-v31.3.0-darwin-arm64.zip +5b2b7426c735a4979acb4e341256ab2342b85e3bf42b9da0ba9780d21f0bda6b *chromedriver-v31.3.0-darwin-x64.zip +8ab96b6db830746a026b9eb4233ff51577b1880f5595a65aa38edd593e700f7e *chromedriver-v31.3.0-linux-arm64.zip +e9cdc7e9d055a90932c2c739112bf89f85afe3125f72b8ae1ddb0eab3edcace2 *chromedriver-v31.3.0-linux-armv7l.zip +9feeaac10629f79334ef14a668f653b2fda09fbf0fa1019c3a58d7e1d79c1d1a *chromedriver-v31.3.0-linux-x64.zip +45553529d3aa6a4b1a11bf56727e035f450a15d0d7b7e41b0d1e53fde87a13a4 *chromedriver-v31.3.0-mas-arm64.zip +4404c921f5754fbc31bb2b3cdcad7ac9210ffe6c79cc244118c2622ba667ff6b *chromedriver-v31.3.0-mas-x64.zip +4a6d462ff3cfb65c3f5da59786ce9d69bd928e880e4bbcd03f3596a37277d120 *chromedriver-v31.3.0-win32-arm64.zip +2c97c4b298b811ab69278da5f5ba4ac419a359e2666db14e3efd3e0098f2af2d *chromedriver-v31.3.0-win32-ia32.zip +ea9231495c78f9354a63aa85a733b805be9acb6c7f2d29adb04b8b450777f4e7 *chromedriver-v31.3.0-win32-x64.zip +af0effb9f83107300fd92aaab2c42087a455f1de2fdda8b1f68f202a23785c75 *electron-api.json +36117d070d6f65db8a86e46a698d0a40f7ead062c8f8d4999b78d12e1fd4f55f *electron-v31.3.0-darwin-arm64-dsym-snapshot.zip +f26da3ec38bad154b66222b92b82f6fd65b027d6a8b0570a9ddbc7d7eb146c30 *electron-v31.3.0-darwin-arm64-dsym.zip +9117df44b237d5e9623bbba58bb5a7a6bba19d6946db783f0a64cd517f026519 *electron-v31.3.0-darwin-arm64-symbols.zip +185118e54a0929c29bf28dace4d025a6a5019f58e7f0ed6bf4a48a8ac8a3f216 *electron-v31.3.0-darwin-arm64.zip +e365b1c556bd56f8157ab172528d0f38745181173e10afd07102bd3376381064 *electron-v31.3.0-darwin-x64-dsym-snapshot.zip +b525ef35de458d64087251c28ee4587776879351247ab78313e0bdddb9a9c462 *electron-v31.3.0-darwin-x64-dsym.zip +af779fa1675294da5d80c50fd6073c456b6114b8dd26d0371690c5a0a50c64ac *electron-v31.3.0-darwin-x64-symbols.zip +3cffb20969e2b9ed4048458aabb5380e5ad89f5cc13432d9b28b547d85c62111 *electron-v31.3.0-darwin-x64.zip +3db1721681a459fb19ef26d49663e21e7a632df5a2ec9d7154644393b655f0f6 *electron-v31.3.0-linux-arm64-debug.zip +324fd7e56efaca748b3dee212033b84afe5a482885f960160ca8fc0522bb962c *electron-v31.3.0-linux-arm64-symbols.zip +b860aa3cd3bc9640ff7d28e66968df26a61aae2553705b0753ee5ee3f20f6fad *electron-v31.3.0-linux-arm64.zip +3db1721681a459fb19ef26d49663e21e7a632df5a2ec9d7154644393b655f0f6 *electron-v31.3.0-linux-armv7l-debug.zip +9f28db6e5f5afc6c2c991b18ec284dc8b7316b92709e4ac524668f7710b87bc7 *electron-v31.3.0-linux-armv7l-symbols.zip +2baf290d59e6e25c000ecccdab93d35249ea04cbccfa72580984a924eae88c7e *electron-v31.3.0-linux-armv7l.zip +8e3a3b0147cbb693ef39143fb2d1b8c6a76b152ce85ebcda5359e6622d04095a *electron-v31.3.0-linux-x64-debug.zip +ad7a89652caa90900e4a1b3ccf9e59b96bed3fb8377a873ab07f0217e35b14a0 *electron-v31.3.0-linux-x64-symbols.zip +f44e33a29019ce7f12a78d7dc376b467907f71936323feadae5a8ad932951856 *electron-v31.3.0-linux-x64.zip +2e5082565dfb97bcea2a4595f81aa61a1a6fa1f126e157708516706dba0ee116 *electron-v31.3.0-mas-arm64-dsym-snapshot.zip +ade5d2c6c87b91e6038aa1db0e69355f9705a9f13f9005642c75e793f342e853 *electron-v31.3.0-mas-arm64-dsym.zip +4c878260b27f83d2d5162abebc3d75f9336d7292f79d6ea35853bc6488a5f660 *electron-v31.3.0-mas-arm64-symbols.zip +7323ae7f769160d17ff7499194784c24af9d2e1df7bad7c53a9bce7bf5c29cb2 *electron-v31.3.0-mas-arm64.zip +1bc32274fdeb276ca914ce52609ab8e425f0e01986b39522addb1c6d7c8f3023 *electron-v31.3.0-mas-x64-dsym-snapshot.zip +11f88137256dc2c1c71988a23a13fc9dabf130e70580ffbb97dece2c0c4ac962 *electron-v31.3.0-mas-x64-dsym.zip +b6746b9682aed0fe83faabeba6efcfc69f95f643d95715770a0b40cca7bcb67a *electron-v31.3.0-mas-x64-symbols.zip +254a3d1ade524a1143a4875dbdeed765df003c363dc53aacfe2a693bae5ce44d *electron-v31.3.0-mas-x64.zip +3e27bddd52267dd57201f722d32707d49b0234122321a7ac1980593ab3f5e3e8 *electron-v31.3.0-win32-arm64-pdb.zip +9c72de271bd3c35feb055d90ccbbe83754c58f650b43baadd0ec75901952f634 *electron-v31.3.0-win32-arm64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.3.0-win32-arm64-toolchain-profile.zip +ea8faf1769cbdd6cd593a77f91dc96066017b50ec18c15c6594a1556c1a0c1ac *electron-v31.3.0-win32-arm64.zip +9562be4127754fb5b1b667c07dd5a5301853c830c4feb6b971faf55f62062a7d *electron-v31.3.0-win32-ia32-pdb.zip +0d9b357d2b239b5b539bfa00bf68c765c01d96ee7c94f37b1db74ab97575e1aa *electron-v31.3.0-win32-ia32-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.3.0-win32-ia32-toolchain-profile.zip +ff2f7ef969e08249c28318bf1525dc44b453de4ec4de14ff233c8697d7109050 *electron-v31.3.0-win32-ia32.zip +f53a6993603f4f328285308c6881a158cdc0f5d0023129ea34dfccc8518c7fef *electron-v31.3.0-win32-x64-pdb.zip +fb05f4620a93492d43a95621032f9fcdcbbddf038c5c17cf888343226a654618 *electron-v31.3.0-win32-x64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.3.0-win32-x64-toolchain-profile.zip +a2cef2b0f9c68480cb59c73a08b83670f587d2c245e73a65b3397cb4836d14d5 *electron-v31.3.0-win32-x64.zip +3d47b8e17de385b3a01c501f119566ffcf73ee008cc4e9ee813f5c6160391ada *electron.d.ts +a50c7d7a962e3df5fa8d4359890ebeaeb3ee0fdb1b126e60981e54a272095c4f *ffmpeg-v31.3.0-darwin-arm64.zip +bd020ccc30f8bbdde064cf6b039b930e389ffe3d35958c770a82a0b7d0573253 *ffmpeg-v31.3.0-darwin-x64.zip +e6d1937a647670adf27a9862aceedc4d9491118be192c81e22d27af1a3fdd736 *ffmpeg-v31.3.0-linux-arm64.zip +43eecd536bfed1228fed0cdf99168e0ed406bacc8d4ffd18c2a5ffa7ecdbbda8 *ffmpeg-v31.3.0-linux-armv7l.zip +b0f42d433ae0a4c091740ff550d7fe8e812e20043d991671fab54563f798bc4d *ffmpeg-v31.3.0-linux-x64.zip +a50c7d7a962e3df5fa8d4359890ebeaeb3ee0fdb1b126e60981e54a272095c4f *ffmpeg-v31.3.0-mas-arm64.zip +bd020ccc30f8bbdde064cf6b039b930e389ffe3d35958c770a82a0b7d0573253 *ffmpeg-v31.3.0-mas-x64.zip +43b127a3efee8f908b735e9018246c5f55fbf8c9620f49ccbba7fb0b99fec18f *ffmpeg-v31.3.0-win32-arm64.zip +dc601fc15ce4084d8bbeac7d3784fb4717db38d2b7bfba4445da102f6dcbd61a *ffmpeg-v31.3.0-win32-ia32.zip +6e70b32159b8c3207322635db049ca59119dbb4276fcfae7357a783ccf37a6f6 *ffmpeg-v31.3.0-win32-x64.zip +298897824cb5c81476d1e652454ac0347874bb4cdf307c7b26172a2f9393fddc *hunspell_dictionaries.zip +313ddbaf8e5086ea56fc1b432981f08fff1cbe3456152aa6f141b9ff0f8d3490 *libcxx-objects-v31.3.0-linux-arm64.zip +a15ce8555c6169abefb694137a2291e01b0bde62dbcf9bf8763e91e3d59f9ea9 *libcxx-objects-v31.3.0-linux-armv7l.zip +0db38b7382e7057457f930258ec6ba3fa1ff4fcc8d934a49556a2c78a81c2495 *libcxx-objects-v31.3.0-linux-x64.zip +1afb46d85e71661bd64791b0be8f7406720a4c9c998f628ecfe75c49308dc4ee *libcxx_headers.zip +3ab97cbfec2dad6c003a808987b47e7f649feb81273e70c32db2481b9929aea2 *libcxxabi_headers.zip +cd364aab3a9495c8a1836b5e72f64c2251d239cffa38921269b565b583c0f7f8 *mksnapshot-v31.3.0-darwin-arm64.zip +a53c93ff6eaab514ac8b6f635361954a705f2bcf513607ff013648fb06b6a284 *mksnapshot-v31.3.0-darwin-x64.zip +975dd2c07308f320f99e9f638713997099d51b0ae93bd7a54f080e5acd5d0d30 *mksnapshot-v31.3.0-linux-arm64-x64.zip +249753cdbb4b27486cb3c3bffc47510d0791dd64646bfd5d39b07bdd7bd96aa1 *mksnapshot-v31.3.0-linux-armv7l-x64.zip +8b9b683203d5cf4859629be69ee6f195bbff07304f94d223f79f2e32dc9f07ea *mksnapshot-v31.3.0-linux-x64.zip +65ac1bce3fd126cfa1bc46bb29e16693bfeafc35e8119f57938249fa99db0f1a *mksnapshot-v31.3.0-mas-arm64.zip +4b630d62761e89e2dec333608d1084c27df337685eb7f5bc2d2a6759b7ba4f40 *mksnapshot-v31.3.0-mas-x64.zip +ac5ddcf2dbf966c0710d5a90b8e1ab89d9f49542ad5ce90a3ce234714b9dfd81 *mksnapshot-v31.3.0-win32-arm64-x64.zip +cf8d44faee27e447601de9f4b5f45a921caf4fa33613e578e8d39a28ab49a8cc *mksnapshot-v31.3.0-win32-ia32.zip +ee1af94c821291a07789951e0a0d981e044c7da53db8a4928efb29045127fcbe *mksnapshot-v31.3.0-win32-x64.zip diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index 05b92564312b9..adcb796f15cfe 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -23,7 +23,7 @@ const product = require("../../product.json"); // The reference dependencies, which one has to update when the new dependencies // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.114:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.183: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/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index 748acd3dfc44b..e23f4c3d1f9cb 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -25,7 +25,7 @@ import product = require('../../product.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/126.0.6478.114:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.183: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 1ca661adee4e6..117a1cd6a6c97 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "044c187ce79bb8a266c5016ce749387a3480f81f" + "commitHash": "2e81dea53f5ecdc1c057e4c70ecd66151987296a" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "126.0.6478.114" + "version": "126.0.6478.183" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "156dbd57ba92a7bb196620bdb9e4fa0d2cd7ea5c" + "commitHash": "9e14f8d828d33ee195ebef6eee2731aa3af291db" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "31.1.0" + "version": "31.3.0" }, { "component": { diff --git a/package.json b/package.json index 0f505edf02c5a..24eb8b9f7eecc 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "31.1.0", + "electron": "31.3.0", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", From 8530320c41ca39ca4ff3854aa0488f04eaaeb871 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 6 Aug 2024 21:54:07 +0900 Subject: [PATCH 05/41] chore: update rpm deps for arm64 --- build/linux/rpm/dep-lists.js | 2 -- build/linux/rpm/dep-lists.ts | 2 -- 2 files changed, 4 deletions(-) diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js index fa393808c533d..6857f6b7c1a13 100644 --- a/build/linux/rpm/dep-lists.js +++ b/build/linux/rpm/dep-lists.js @@ -276,8 +276,6 @@ exports.referenceGeneratedDepsByArch = { 'libpango-1.0.so.0()(64bit)', 'libpthread.so.0()(64bit)', 'libpthread.so.0(GLIBC_2.17)(64bit)', - 'librt.so.1()(64bit)', - 'librt.so.1(GLIBC_2.17)(64bit)', 'libsmime3.so()(64bit)', 'libsmime3.so(NSS_3.10)(64bit)', 'libsmime3.so(NSS_3.2)(64bit)', diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts index 9eed3a79f7e45..8fd025e51c238 100644 --- a/build/linux/rpm/dep-lists.ts +++ b/build/linux/rpm/dep-lists.ts @@ -275,8 +275,6 @@ export const referenceGeneratedDepsByArch = { 'libpango-1.0.so.0()(64bit)', 'libpthread.so.0()(64bit)', 'libpthread.so.0(GLIBC_2.17)(64bit)', - 'librt.so.1()(64bit)', - 'librt.so.1(GLIBC_2.17)(64bit)', 'libsmime3.so()(64bit)', 'libsmime3.so(NSS_3.10)(64bit)', 'libsmime3.so(NSS_3.2)(64bit)', From da879afdde1299d829ebd3ecd34960a33a56d2e9 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Fri, 23 Aug 2024 14:00:34 +0900 Subject: [PATCH 06/41] chore: bump electron@31.4.0 --- .npmrc | 4 +- build/azure-pipelines/linux/setup-env.sh | 8 +- build/checksums/electron.txt | 150 +++++++++++------------ build/linux/dependencies-generator.js | 2 +- build/linux/dependencies-generator.ts | 2 +- cgmanifest.json | 8 +- package.json | 2 +- 7 files changed, 88 insertions(+), 88 deletions(-) diff --git a/.npmrc b/.npmrc index c8f284a9bc4af..6516b061ec1de 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="31.3.0" -ms_build_id="9985512" +target="31.4.0" +ms_build_id="10055708" runtime="electron" build_from_source="true" legacy-peer-deps="true" diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index 38387b4ffd7ff..e12a4e08eeab3 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -18,7 +18,7 @@ fi if [ "$npm_config_arch" == "x64" ]; then if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/126.0.6478.183/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/126.0.6478.234/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 \ @@ -30,9 +30,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/126.0.6478.183:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.183:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.183:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.234:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.234:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.234:build/config/c++/BUILD.gn export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index bcda42feafdd7..de9f4be11ae7c 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -b2e85d41607d09d7645ca58c0243c8f00e15dcbe32f4ceeab9566235eadc7143 *chromedriver-v31.3.0-darwin-arm64.zip -5b2b7426c735a4979acb4e341256ab2342b85e3bf42b9da0ba9780d21f0bda6b *chromedriver-v31.3.0-darwin-x64.zip -8ab96b6db830746a026b9eb4233ff51577b1880f5595a65aa38edd593e700f7e *chromedriver-v31.3.0-linux-arm64.zip -e9cdc7e9d055a90932c2c739112bf89f85afe3125f72b8ae1ddb0eab3edcace2 *chromedriver-v31.3.0-linux-armv7l.zip -9feeaac10629f79334ef14a668f653b2fda09fbf0fa1019c3a58d7e1d79c1d1a *chromedriver-v31.3.0-linux-x64.zip -45553529d3aa6a4b1a11bf56727e035f450a15d0d7b7e41b0d1e53fde87a13a4 *chromedriver-v31.3.0-mas-arm64.zip -4404c921f5754fbc31bb2b3cdcad7ac9210ffe6c79cc244118c2622ba667ff6b *chromedriver-v31.3.0-mas-x64.zip -4a6d462ff3cfb65c3f5da59786ce9d69bd928e880e4bbcd03f3596a37277d120 *chromedriver-v31.3.0-win32-arm64.zip -2c97c4b298b811ab69278da5f5ba4ac419a359e2666db14e3efd3e0098f2af2d *chromedriver-v31.3.0-win32-ia32.zip -ea9231495c78f9354a63aa85a733b805be9acb6c7f2d29adb04b8b450777f4e7 *chromedriver-v31.3.0-win32-x64.zip -af0effb9f83107300fd92aaab2c42087a455f1de2fdda8b1f68f202a23785c75 *electron-api.json -36117d070d6f65db8a86e46a698d0a40f7ead062c8f8d4999b78d12e1fd4f55f *electron-v31.3.0-darwin-arm64-dsym-snapshot.zip -f26da3ec38bad154b66222b92b82f6fd65b027d6a8b0570a9ddbc7d7eb146c30 *electron-v31.3.0-darwin-arm64-dsym.zip -9117df44b237d5e9623bbba58bb5a7a6bba19d6946db783f0a64cd517f026519 *electron-v31.3.0-darwin-arm64-symbols.zip -185118e54a0929c29bf28dace4d025a6a5019f58e7f0ed6bf4a48a8ac8a3f216 *electron-v31.3.0-darwin-arm64.zip -e365b1c556bd56f8157ab172528d0f38745181173e10afd07102bd3376381064 *electron-v31.3.0-darwin-x64-dsym-snapshot.zip -b525ef35de458d64087251c28ee4587776879351247ab78313e0bdddb9a9c462 *electron-v31.3.0-darwin-x64-dsym.zip -af779fa1675294da5d80c50fd6073c456b6114b8dd26d0371690c5a0a50c64ac *electron-v31.3.0-darwin-x64-symbols.zip -3cffb20969e2b9ed4048458aabb5380e5ad89f5cc13432d9b28b547d85c62111 *electron-v31.3.0-darwin-x64.zip -3db1721681a459fb19ef26d49663e21e7a632df5a2ec9d7154644393b655f0f6 *electron-v31.3.0-linux-arm64-debug.zip -324fd7e56efaca748b3dee212033b84afe5a482885f960160ca8fc0522bb962c *electron-v31.3.0-linux-arm64-symbols.zip -b860aa3cd3bc9640ff7d28e66968df26a61aae2553705b0753ee5ee3f20f6fad *electron-v31.3.0-linux-arm64.zip -3db1721681a459fb19ef26d49663e21e7a632df5a2ec9d7154644393b655f0f6 *electron-v31.3.0-linux-armv7l-debug.zip -9f28db6e5f5afc6c2c991b18ec284dc8b7316b92709e4ac524668f7710b87bc7 *electron-v31.3.0-linux-armv7l-symbols.zip -2baf290d59e6e25c000ecccdab93d35249ea04cbccfa72580984a924eae88c7e *electron-v31.3.0-linux-armv7l.zip -8e3a3b0147cbb693ef39143fb2d1b8c6a76b152ce85ebcda5359e6622d04095a *electron-v31.3.0-linux-x64-debug.zip -ad7a89652caa90900e4a1b3ccf9e59b96bed3fb8377a873ab07f0217e35b14a0 *electron-v31.3.0-linux-x64-symbols.zip -f44e33a29019ce7f12a78d7dc376b467907f71936323feadae5a8ad932951856 *electron-v31.3.0-linux-x64.zip -2e5082565dfb97bcea2a4595f81aa61a1a6fa1f126e157708516706dba0ee116 *electron-v31.3.0-mas-arm64-dsym-snapshot.zip -ade5d2c6c87b91e6038aa1db0e69355f9705a9f13f9005642c75e793f342e853 *electron-v31.3.0-mas-arm64-dsym.zip -4c878260b27f83d2d5162abebc3d75f9336d7292f79d6ea35853bc6488a5f660 *electron-v31.3.0-mas-arm64-symbols.zip -7323ae7f769160d17ff7499194784c24af9d2e1df7bad7c53a9bce7bf5c29cb2 *electron-v31.3.0-mas-arm64.zip -1bc32274fdeb276ca914ce52609ab8e425f0e01986b39522addb1c6d7c8f3023 *electron-v31.3.0-mas-x64-dsym-snapshot.zip -11f88137256dc2c1c71988a23a13fc9dabf130e70580ffbb97dece2c0c4ac962 *electron-v31.3.0-mas-x64-dsym.zip -b6746b9682aed0fe83faabeba6efcfc69f95f643d95715770a0b40cca7bcb67a *electron-v31.3.0-mas-x64-symbols.zip -254a3d1ade524a1143a4875dbdeed765df003c363dc53aacfe2a693bae5ce44d *electron-v31.3.0-mas-x64.zip -3e27bddd52267dd57201f722d32707d49b0234122321a7ac1980593ab3f5e3e8 *electron-v31.3.0-win32-arm64-pdb.zip -9c72de271bd3c35feb055d90ccbbe83754c58f650b43baadd0ec75901952f634 *electron-v31.3.0-win32-arm64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.3.0-win32-arm64-toolchain-profile.zip -ea8faf1769cbdd6cd593a77f91dc96066017b50ec18c15c6594a1556c1a0c1ac *electron-v31.3.0-win32-arm64.zip -9562be4127754fb5b1b667c07dd5a5301853c830c4feb6b971faf55f62062a7d *electron-v31.3.0-win32-ia32-pdb.zip -0d9b357d2b239b5b539bfa00bf68c765c01d96ee7c94f37b1db74ab97575e1aa *electron-v31.3.0-win32-ia32-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.3.0-win32-ia32-toolchain-profile.zip -ff2f7ef969e08249c28318bf1525dc44b453de4ec4de14ff233c8697d7109050 *electron-v31.3.0-win32-ia32.zip -f53a6993603f4f328285308c6881a158cdc0f5d0023129ea34dfccc8518c7fef *electron-v31.3.0-win32-x64-pdb.zip -fb05f4620a93492d43a95621032f9fcdcbbddf038c5c17cf888343226a654618 *electron-v31.3.0-win32-x64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.3.0-win32-x64-toolchain-profile.zip -a2cef2b0f9c68480cb59c73a08b83670f587d2c245e73a65b3397cb4836d14d5 *electron-v31.3.0-win32-x64.zip -3d47b8e17de385b3a01c501f119566ffcf73ee008cc4e9ee813f5c6160391ada *electron.d.ts -a50c7d7a962e3df5fa8d4359890ebeaeb3ee0fdb1b126e60981e54a272095c4f *ffmpeg-v31.3.0-darwin-arm64.zip -bd020ccc30f8bbdde064cf6b039b930e389ffe3d35958c770a82a0b7d0573253 *ffmpeg-v31.3.0-darwin-x64.zip -e6d1937a647670adf27a9862aceedc4d9491118be192c81e22d27af1a3fdd736 *ffmpeg-v31.3.0-linux-arm64.zip -43eecd536bfed1228fed0cdf99168e0ed406bacc8d4ffd18c2a5ffa7ecdbbda8 *ffmpeg-v31.3.0-linux-armv7l.zip -b0f42d433ae0a4c091740ff550d7fe8e812e20043d991671fab54563f798bc4d *ffmpeg-v31.3.0-linux-x64.zip -a50c7d7a962e3df5fa8d4359890ebeaeb3ee0fdb1b126e60981e54a272095c4f *ffmpeg-v31.3.0-mas-arm64.zip -bd020ccc30f8bbdde064cf6b039b930e389ffe3d35958c770a82a0b7d0573253 *ffmpeg-v31.3.0-mas-x64.zip -43b127a3efee8f908b735e9018246c5f55fbf8c9620f49ccbba7fb0b99fec18f *ffmpeg-v31.3.0-win32-arm64.zip -dc601fc15ce4084d8bbeac7d3784fb4717db38d2b7bfba4445da102f6dcbd61a *ffmpeg-v31.3.0-win32-ia32.zip -6e70b32159b8c3207322635db049ca59119dbb4276fcfae7357a783ccf37a6f6 *ffmpeg-v31.3.0-win32-x64.zip -298897824cb5c81476d1e652454ac0347874bb4cdf307c7b26172a2f9393fddc *hunspell_dictionaries.zip -313ddbaf8e5086ea56fc1b432981f08fff1cbe3456152aa6f141b9ff0f8d3490 *libcxx-objects-v31.3.0-linux-arm64.zip -a15ce8555c6169abefb694137a2291e01b0bde62dbcf9bf8763e91e3d59f9ea9 *libcxx-objects-v31.3.0-linux-armv7l.zip -0db38b7382e7057457f930258ec6ba3fa1ff4fcc8d934a49556a2c78a81c2495 *libcxx-objects-v31.3.0-linux-x64.zip -1afb46d85e71661bd64791b0be8f7406720a4c9c998f628ecfe75c49308dc4ee *libcxx_headers.zip -3ab97cbfec2dad6c003a808987b47e7f649feb81273e70c32db2481b9929aea2 *libcxxabi_headers.zip -cd364aab3a9495c8a1836b5e72f64c2251d239cffa38921269b565b583c0f7f8 *mksnapshot-v31.3.0-darwin-arm64.zip -a53c93ff6eaab514ac8b6f635361954a705f2bcf513607ff013648fb06b6a284 *mksnapshot-v31.3.0-darwin-x64.zip -975dd2c07308f320f99e9f638713997099d51b0ae93bd7a54f080e5acd5d0d30 *mksnapshot-v31.3.0-linux-arm64-x64.zip -249753cdbb4b27486cb3c3bffc47510d0791dd64646bfd5d39b07bdd7bd96aa1 *mksnapshot-v31.3.0-linux-armv7l-x64.zip -8b9b683203d5cf4859629be69ee6f195bbff07304f94d223f79f2e32dc9f07ea *mksnapshot-v31.3.0-linux-x64.zip -65ac1bce3fd126cfa1bc46bb29e16693bfeafc35e8119f57938249fa99db0f1a *mksnapshot-v31.3.0-mas-arm64.zip -4b630d62761e89e2dec333608d1084c27df337685eb7f5bc2d2a6759b7ba4f40 *mksnapshot-v31.3.0-mas-x64.zip -ac5ddcf2dbf966c0710d5a90b8e1ab89d9f49542ad5ce90a3ce234714b9dfd81 *mksnapshot-v31.3.0-win32-arm64-x64.zip -cf8d44faee27e447601de9f4b5f45a921caf4fa33613e578e8d39a28ab49a8cc *mksnapshot-v31.3.0-win32-ia32.zip -ee1af94c821291a07789951e0a0d981e044c7da53db8a4928efb29045127fcbe *mksnapshot-v31.3.0-win32-x64.zip +bca203c7705e56baa5c7c2f972dd3a606ee80589514a3d83283960b67bad446c *chromedriver-v31.4.0-darwin-arm64.zip +47a04768ed44c4f4128d1fe90818b58cbef6da63b1112acaf2bbb7c20d22ad7d *chromedriver-v31.4.0-darwin-x64.zip +a040723dc5c7860527f2718e5b3aaf43d219e35ae391a3338c7a85de2d08afb7 *chromedriver-v31.4.0-linux-arm64.zip +64306c594ad37c94e2562d3fe4832667191321f90ec797e41ceae4640da26289 *chromedriver-v31.4.0-linux-armv7l.zip +61225378c9a6097974638c241730db60230c9d774a2c7242aa9f001299bccf4b *chromedriver-v31.4.0-linux-x64.zip +fa03b302b9f524f646a0726f04bcca622e4f9e02bb96a114feba35f376242de8 *chromedriver-v31.4.0-mas-arm64.zip +cde78724129f7e9342aabf4cb6751d7bf9263383ebd94db920015662c63f69cb *chromedriver-v31.4.0-mas-x64.zip +4c4c8d0c2bc8f7686388c3a61531aa11f4e9aaa8df2e2c5829bc48cb247cd370 *chromedriver-v31.4.0-win32-arm64.zip +2ebfdf7b5f382438957d5605c299a6044aebf85f5a3f27d9ea25af46740ac64c *chromedriver-v31.4.0-win32-ia32.zip +5cfc0894b5e58c8365449d1c22ec56e47f7de9c8e82e50abda4e20a79449d00f *chromedriver-v31.4.0-win32-x64.zip +3b209f05fbe76754bfcdc3bdbc8b700697163a1a09ac8c0706153dbf59d7731d *electron-api.json +89e079f9f25fd89f73291e5d53eaad7e5545ee78239f9b05e5d44e32ac6e0299 *electron-v31.4.0-darwin-arm64-dsym-snapshot.zip +145599c86ae61f3346edaad0482b66c46c5cf95065e68806d62e8c1bcac1f21d *electron-v31.4.0-darwin-arm64-dsym.zip +f2459df26137742d917adf1c2312e90955fe98fa7d5acbd1024e7676cd3c8c96 *electron-v31.4.0-darwin-arm64-symbols.zip +4cd04f75e97f6cdfee1d166c7756b9a3c7341e51a7b12255c37bd46fa5a45da5 *electron-v31.4.0-darwin-arm64.zip +75adb477e186009d166c4a83b85c8ab48cbb26f01e558f8d988ece4f5c90e292 *electron-v31.4.0-darwin-x64-dsym-snapshot.zip +d5b70eb5f6f016c9760a18825dd867afa8efbc7130359928189528ddf3eaa25c *electron-v31.4.0-darwin-x64-dsym.zip +bff26c5e85a8e64de04297af6450527398cdf7af4078faa973aaca3aff058343 *electron-v31.4.0-darwin-x64-symbols.zip +e177e9846bfe63eefea3ecd6a889e9865e1fba21b93179a0cde08bd7c94796ee *electron-v31.4.0-darwin-x64.zip +eaa039467226c8ef797e86f4b34b7b9adefeae5d5b4193a3f27d0c8e02e1cac2 *electron-v31.4.0-linux-arm64-debug.zip +9b2d6c4f2b88967966ab0b78a4b95b9790f7d96628d6494b843d461287d1120b *electron-v31.4.0-linux-arm64-symbols.zip +37fbede76b30bad461cbfa3efec8aef07a34f6991c71c50a69ac489623413098 *electron-v31.4.0-linux-arm64.zip +eaa039467226c8ef797e86f4b34b7b9adefeae5d5b4193a3f27d0c8e02e1cac2 *electron-v31.4.0-linux-armv7l-debug.zip +ab7a25a3f53d2dd6164c3daf39c3925978984fbe382a9fd20a29819e94f4e425 *electron-v31.4.0-linux-armv7l-symbols.zip +7a6cba2d78ef3ff776d9482121f9b2400370da23b3065bfdafc4cd83c8bbe423 *electron-v31.4.0-linux-armv7l.zip +30dabccab6335f4eff75758bf752a493593d33e02e2fd34cfba27e0b589df46f *electron-v31.4.0-linux-x64-debug.zip +a1bbb8f0958c5897c9b7762b0f5134bada9c5728e0383bec5811594b2a6d180d *electron-v31.4.0-linux-x64-symbols.zip +9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7 *electron-v31.4.0-linux-x64.zip +60424e7f26a86655dc2cfd5e999d63b9d9a8a014de74135ed709e3ce5f512ae0 *electron-v31.4.0-mas-arm64-dsym-snapshot.zip +2f119f4c67c26fbc1991ad4e23bfe9da9225be8bad9b5321540420c6619d6eb6 *electron-v31.4.0-mas-arm64-dsym.zip +02c2c1d27a4e4ea789da50846044ae68cf02f997f6e42cc5f865b71e2dba8d77 *electron-v31.4.0-mas-arm64-symbols.zip +36c150bde011bc9d6eea03db088c30cc64707a829a64327c13f5079cd400b19d *electron-v31.4.0-mas-arm64.zip +c74ee1e76444c13217a0f16a246bda5b837d2fcc7f6dd51b19d1c01d9a403921 *electron-v31.4.0-mas-x64-dsym-snapshot.zip +647f35e01f74238d70a44d558618d147df179fe1f925258997a92a53d1ca58fb *electron-v31.4.0-mas-x64-dsym.zip +eb7d1daa0e6da2b0b7a63f83e38bc7106ec4fb67864e623f4f7f42e84b0975c3 *electron-v31.4.0-mas-x64-symbols.zip +526abb1727c117fb43747e3a73412b0210c1f3a9c63ae9a0417f916081f07189 *electron-v31.4.0-mas-x64.zip +e49b9c3ce34ce85585ae7a47d1f11bcbfcfdb35948acdd6b0dde17a872388459 *electron-v31.4.0-win32-arm64-pdb.zip +42c3f27df9c40b28e86e06c64c5f8dd029636824f2e5bf063ec514c880fdf072 *electron-v31.4.0-win32-arm64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.4.0-win32-arm64-toolchain-profile.zip +0cf599808cb005654b38cc64bcd6cb401b3243c40a6b10bef31331f970785b9f *electron-v31.4.0-win32-arm64.zip +7525078097e5221e814ec0edb14f5c5af684551ed9edee6d7bbd1eb9098e755e *electron-v31.4.0-win32-ia32-pdb.zip +d0f8dd4d8681a578328d632d21bcdf92bda5d07fbdf1ed8f2461dc33a890f341 *electron-v31.4.0-win32-ia32-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.4.0-win32-ia32-toolchain-profile.zip +a523351119680f38d27bc0abcb9051c8c55a38c494cd982af0377a65e28f7c11 *electron-v31.4.0-win32-ia32.zip +7d36667c5c4798246e018c0107f73596319adc1307db16ac4059dee3b2b1df8a *electron-v31.4.0-win32-x64-pdb.zip +9900ca38e29ea6d25e00a9ea170bbffb26fd37f5a8d7f255eed99ba0a3f0e785 *electron-v31.4.0-win32-x64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.4.0-win32-x64-toolchain-profile.zip +ec065fc23dac9c84685c8b67fa2bc738a809ef4428f6b7fe106a690f8c87db6b *electron-v31.4.0-win32-x64.zip +26a6b0db18a0d1ae209dc01b2aa754f11fdf0c1c1d7821581ab36096cf71a5fb *electron.d.ts +511de67b9098ec2dcc969469097de2cb90c8f6da5a4346eaec4061bb91c593de *ffmpeg-v31.4.0-darwin-arm64.zip +99602e8e03f9e5e1df91dbf3f0534a2e50e232a5c013c5a0b5b1e6055edf6fd5 *ffmpeg-v31.4.0-darwin-x64.zip +e6d1937a647670adf27a9862aceedc4d9491118be192c81e22d27af1a3fdd736 *ffmpeg-v31.4.0-linux-arm64.zip +43eecd536bfed1228fed0cdf99168e0ed406bacc8d4ffd18c2a5ffa7ecdbbda8 *ffmpeg-v31.4.0-linux-armv7l.zip +b0f42d433ae0a4c091740ff550d7fe8e812e20043d991671fab54563f798bc4d *ffmpeg-v31.4.0-linux-x64.zip +511de67b9098ec2dcc969469097de2cb90c8f6da5a4346eaec4061bb91c593de *ffmpeg-v31.4.0-mas-arm64.zip +99602e8e03f9e5e1df91dbf3f0534a2e50e232a5c013c5a0b5b1e6055edf6fd5 *ffmpeg-v31.4.0-mas-x64.zip +559f12a225bda71c3841d50cacdc03199df5b9a2bae8ef811a51b35df57387c4 *ffmpeg-v31.4.0-win32-arm64.zip +773f4050f6a38c804b6ce7e0c474c823a771aecfe02d94297b74d03d0886d8ee *ffmpeg-v31.4.0-win32-ia32.zip +abce730d1dbf7fb157ac4782798b235a9e5aca655184b8fddcb72be6005a69c0 *ffmpeg-v31.4.0-win32-x64.zip +ec22dd27de962eaf5d7a30cdbc5648f8b7917437d74cc860767e4dab7de45b53 *hunspell_dictionaries.zip +fb6ebd01f90a81eeebc9dbd7d1cf8fc2cdf31f41bcb46e48135a66b0f581d26e *libcxx-objects-v31.4.0-linux-arm64.zip +ebff481fab9f01a5219deff6e4e64bf68626abe822fcd0304310c2d85833c7f1 *libcxx-objects-v31.4.0-linux-armv7l.zip +1d61804223ed93f806c1e053b35f886284ae1bcb02f9d8bcbddcffc07c40e3ba *libcxx-objects-v31.4.0-linux-x64.zip +9a118d289e0de3273bd904a035a21f620da30b5a2882133926c3f695acd4491a *libcxx_headers.zip +43aa8873b8c97c39250cef6cb8f19c6b8e8a0bb5154b1acf29e5a5296fd73b49 *libcxxabi_headers.zip +0aec3c569b8f1f61eb5bfee7094b6cdc3668f1beec5750788e084567f7979079 *mksnapshot-v31.4.0-darwin-arm64.zip +14cc0725fcb15d3313920c50694dc435bf993c5ce064d6faa5dd01eb7725061c *mksnapshot-v31.4.0-darwin-x64.zip +26f190eba9d21bb3226016f4a4f34c1e8f949c5a8f7a950be8f3f7432add0a1f *mksnapshot-v31.4.0-linux-arm64-x64.zip +81a43b729d1c0652a2cc56df5436300bcb9e278c2c86afea16821d42d17650fb *mksnapshot-v31.4.0-linux-armv7l-x64.zip +3c4d0c427a4cd82765e0532a0fc0ff926e270476cb78e57073fad76dfaa881b4 *mksnapshot-v31.4.0-linux-x64.zip +0faf73e3897b68811603e8789eafa4f7069ad5f939b08f60bae1960efa0d9f0d *mksnapshot-v31.4.0-mas-arm64.zip +fb2f100d684f1b5366b44ead2138eae1e4d2869d347ab441421f20593e97d33e *mksnapshot-v31.4.0-mas-x64.zip +3653515f286529051d09e85d26058dcb47ef574ddeeca5da97593aa4dd2235f1 *mksnapshot-v31.4.0-win32-arm64-x64.zip +fb28b7f9a51a4c9b9d3d51fba5352a1822725d9e53b78168aa2b4ceb7cd35c3b *mksnapshot-v31.4.0-win32-ia32.zip +0975f47bdeee755a679a4bee9ebfca65ad69fd6d40b1f51e2c96fc330b413846 *mksnapshot-v31.4.0-win32-x64.zip diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index adcb796f15cfe..e762683b2ddb5 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -23,7 +23,7 @@ const product = require("../../product.json"); // The reference dependencies, which one has to update when the new dependencies // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.183:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.234: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/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index e23f4c3d1f9cb..e8635883cf618 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -25,7 +25,7 @@ import product = require('../../product.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/126.0.6478.183:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.234: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 117a1cd6a6c97..cec096311e422 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "2e81dea53f5ecdc1c057e4c70ecd66151987296a" + "commitHash": "2a4c54370053284b59406e15f7c99162e6fb411c" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "126.0.6478.183" + "version": "126.0.6478.234" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "9e14f8d828d33ee195ebef6eee2731aa3af291db" + "commitHash": "bd70c3a7404326f7711fafc8f0c550b510dbe095" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "31.3.0" + "version": "31.4.0" }, { "component": { diff --git a/package.json b/package.json index 24eb8b9f7eecc..9db57a7fff788 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "31.3.0", + "electron": "31.4.0", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", From bf31c0cc0a6ace3040f9e3e4aa9e67859a3270de Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 13:02:43 +0900 Subject: [PATCH 07/41] chore: bump electron@32.0.0 --- .npmrc | 4 +- .../darwin/product-build-darwin.yml | 6 + .../linux/product-build-linux.yml | 18 --- build/azure-pipelines/linux/setup-env.sh | 18 +-- build/checksums/electron.txt | 150 +++++++++--------- build/linux/dependencies-generator.js | 2 +- build/linux/dependencies-generator.ts | 2 +- cgmanifest.json | 8 +- package.json | 2 +- .../electron-main/utilityProcess.ts | 6 +- 10 files changed, 101 insertions(+), 115 deletions(-) diff --git a/.npmrc b/.npmrc index 6516b061ec1de..f2f87fb0abd59 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="31.4.0" -ms_build_id="10055708" +target="32.0.0" +ms_build_id="10133952" runtime="electron" build_from_source="true" legacy-peer-deps="true" diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index c863c60d5027c..2ed6bf2e79328 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -87,6 +87,12 @@ steps: c++ --version python3 -m pip install setuptools + # V8 >= 12.8 requies C++20 or later + # current headers shipped from Electron are missing + # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa + # Following is a workaround until the headers are fixed in upstream. + export CXXFLAGS="-std=gnu++20" + for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 3fb7b4fe679f3..453a3002b1c32 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -156,20 +156,6 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Mixin distro node modules - - ${{ else }}: - # Ref https://github.com/microsoft/vscode/issues/189019 - # for the node-gyp rebuild step - - script: | - set -e - - cd node_modules/native-keymap && npx node-gyp@9.4.0 -y rebuild --debug - cd ../.. && ./.github/workflows/check-clean-git-state.sh - env: - npm_config_arch: $(NPM_ARCH) - GITHUB_TOKEN: "$(github-distro-mixin-password)" - displayName: Rebuild debug version of native modules (OSS) - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - - script: | set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt @@ -248,8 +234,6 @@ steps: - script: | set -e - source ./build/azure-pipelines/linux/setup-env.sh - EXPECTED_GLIBC_VERSION="2.28" \ EXPECTED_GLIBCXX_VERSION="3.4.25" \ ./build/azure-pipelines/linux/verify-glibc-requirements.sh @@ -263,8 +247,6 @@ steps: - script: | set -e - source ./build/azure-pipelines/linux/setup-env.sh - EXPECTED_GLIBC_VERSION="2.28" \ EXPECTED_GLIBCXX_VERSION="3.4.26" \ ./build/azure-pipelines/linux/verify-glibc-requirements.sh diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index e12a4e08eeab3..45a1969213e7a 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -16,9 +16,8 @@ else fi if [ "$npm_config_arch" == "x64" ]; then - if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/126.0.6478.234/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/128.0.6613.36/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 \ @@ -30,14 +29,15 @@ 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/126.0.6478.234:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.234:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.234:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.36:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.36:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.36:build/config/c++/BUILD.gn export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" - export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" + export CXXFLAGS="-nostdinc++ -std=gnu++20 -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" export LDFLAGS="-stdlib=libc++ --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu -Wl,--lto-O0" + if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then # Set compiler toolchain for remote server export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++ @@ -45,13 +45,13 @@ if [ "$npm_config_arch" == "x64" ]; then export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu" fi elif [ "$npm_config_arch" == "arm64" ]; then - if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then # Set compiler toolchain for client native modules export CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc export CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++ - export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" + export CXXFLAGS="-std=gnu++20 --sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu" + if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then # Set compiler toolchain for remote server export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++ @@ -62,7 +62,7 @@ elif [ "$npm_config_arch" == "arm" ]; then # Set compiler toolchain for client native modules export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++ - export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" + export CXXFLAGS="-std=gnu++20 --sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf" # Set compiler toolchain for remote server diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index de9f4be11ae7c..2f95bbe96150c 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -bca203c7705e56baa5c7c2f972dd3a606ee80589514a3d83283960b67bad446c *chromedriver-v31.4.0-darwin-arm64.zip -47a04768ed44c4f4128d1fe90818b58cbef6da63b1112acaf2bbb7c20d22ad7d *chromedriver-v31.4.0-darwin-x64.zip -a040723dc5c7860527f2718e5b3aaf43d219e35ae391a3338c7a85de2d08afb7 *chromedriver-v31.4.0-linux-arm64.zip -64306c594ad37c94e2562d3fe4832667191321f90ec797e41ceae4640da26289 *chromedriver-v31.4.0-linux-armv7l.zip -61225378c9a6097974638c241730db60230c9d774a2c7242aa9f001299bccf4b *chromedriver-v31.4.0-linux-x64.zip -fa03b302b9f524f646a0726f04bcca622e4f9e02bb96a114feba35f376242de8 *chromedriver-v31.4.0-mas-arm64.zip -cde78724129f7e9342aabf4cb6751d7bf9263383ebd94db920015662c63f69cb *chromedriver-v31.4.0-mas-x64.zip -4c4c8d0c2bc8f7686388c3a61531aa11f4e9aaa8df2e2c5829bc48cb247cd370 *chromedriver-v31.4.0-win32-arm64.zip -2ebfdf7b5f382438957d5605c299a6044aebf85f5a3f27d9ea25af46740ac64c *chromedriver-v31.4.0-win32-ia32.zip -5cfc0894b5e58c8365449d1c22ec56e47f7de9c8e82e50abda4e20a79449d00f *chromedriver-v31.4.0-win32-x64.zip -3b209f05fbe76754bfcdc3bdbc8b700697163a1a09ac8c0706153dbf59d7731d *electron-api.json -89e079f9f25fd89f73291e5d53eaad7e5545ee78239f9b05e5d44e32ac6e0299 *electron-v31.4.0-darwin-arm64-dsym-snapshot.zip -145599c86ae61f3346edaad0482b66c46c5cf95065e68806d62e8c1bcac1f21d *electron-v31.4.0-darwin-arm64-dsym.zip -f2459df26137742d917adf1c2312e90955fe98fa7d5acbd1024e7676cd3c8c96 *electron-v31.4.0-darwin-arm64-symbols.zip -4cd04f75e97f6cdfee1d166c7756b9a3c7341e51a7b12255c37bd46fa5a45da5 *electron-v31.4.0-darwin-arm64.zip -75adb477e186009d166c4a83b85c8ab48cbb26f01e558f8d988ece4f5c90e292 *electron-v31.4.0-darwin-x64-dsym-snapshot.zip -d5b70eb5f6f016c9760a18825dd867afa8efbc7130359928189528ddf3eaa25c *electron-v31.4.0-darwin-x64-dsym.zip -bff26c5e85a8e64de04297af6450527398cdf7af4078faa973aaca3aff058343 *electron-v31.4.0-darwin-x64-symbols.zip -e177e9846bfe63eefea3ecd6a889e9865e1fba21b93179a0cde08bd7c94796ee *electron-v31.4.0-darwin-x64.zip -eaa039467226c8ef797e86f4b34b7b9adefeae5d5b4193a3f27d0c8e02e1cac2 *electron-v31.4.0-linux-arm64-debug.zip -9b2d6c4f2b88967966ab0b78a4b95b9790f7d96628d6494b843d461287d1120b *electron-v31.4.0-linux-arm64-symbols.zip -37fbede76b30bad461cbfa3efec8aef07a34f6991c71c50a69ac489623413098 *electron-v31.4.0-linux-arm64.zip -eaa039467226c8ef797e86f4b34b7b9adefeae5d5b4193a3f27d0c8e02e1cac2 *electron-v31.4.0-linux-armv7l-debug.zip -ab7a25a3f53d2dd6164c3daf39c3925978984fbe382a9fd20a29819e94f4e425 *electron-v31.4.0-linux-armv7l-symbols.zip -7a6cba2d78ef3ff776d9482121f9b2400370da23b3065bfdafc4cd83c8bbe423 *electron-v31.4.0-linux-armv7l.zip -30dabccab6335f4eff75758bf752a493593d33e02e2fd34cfba27e0b589df46f *electron-v31.4.0-linux-x64-debug.zip -a1bbb8f0958c5897c9b7762b0f5134bada9c5728e0383bec5811594b2a6d180d *electron-v31.4.0-linux-x64-symbols.zip -9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7 *electron-v31.4.0-linux-x64.zip -60424e7f26a86655dc2cfd5e999d63b9d9a8a014de74135ed709e3ce5f512ae0 *electron-v31.4.0-mas-arm64-dsym-snapshot.zip -2f119f4c67c26fbc1991ad4e23bfe9da9225be8bad9b5321540420c6619d6eb6 *electron-v31.4.0-mas-arm64-dsym.zip -02c2c1d27a4e4ea789da50846044ae68cf02f997f6e42cc5f865b71e2dba8d77 *electron-v31.4.0-mas-arm64-symbols.zip -36c150bde011bc9d6eea03db088c30cc64707a829a64327c13f5079cd400b19d *electron-v31.4.0-mas-arm64.zip -c74ee1e76444c13217a0f16a246bda5b837d2fcc7f6dd51b19d1c01d9a403921 *electron-v31.4.0-mas-x64-dsym-snapshot.zip -647f35e01f74238d70a44d558618d147df179fe1f925258997a92a53d1ca58fb *electron-v31.4.0-mas-x64-dsym.zip -eb7d1daa0e6da2b0b7a63f83e38bc7106ec4fb67864e623f4f7f42e84b0975c3 *electron-v31.4.0-mas-x64-symbols.zip -526abb1727c117fb43747e3a73412b0210c1f3a9c63ae9a0417f916081f07189 *electron-v31.4.0-mas-x64.zip -e49b9c3ce34ce85585ae7a47d1f11bcbfcfdb35948acdd6b0dde17a872388459 *electron-v31.4.0-win32-arm64-pdb.zip -42c3f27df9c40b28e86e06c64c5f8dd029636824f2e5bf063ec514c880fdf072 *electron-v31.4.0-win32-arm64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.4.0-win32-arm64-toolchain-profile.zip -0cf599808cb005654b38cc64bcd6cb401b3243c40a6b10bef31331f970785b9f *electron-v31.4.0-win32-arm64.zip -7525078097e5221e814ec0edb14f5c5af684551ed9edee6d7bbd1eb9098e755e *electron-v31.4.0-win32-ia32-pdb.zip -d0f8dd4d8681a578328d632d21bcdf92bda5d07fbdf1ed8f2461dc33a890f341 *electron-v31.4.0-win32-ia32-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.4.0-win32-ia32-toolchain-profile.zip -a523351119680f38d27bc0abcb9051c8c55a38c494cd982af0377a65e28f7c11 *electron-v31.4.0-win32-ia32.zip -7d36667c5c4798246e018c0107f73596319adc1307db16ac4059dee3b2b1df8a *electron-v31.4.0-win32-x64-pdb.zip -9900ca38e29ea6d25e00a9ea170bbffb26fd37f5a8d7f255eed99ba0a3f0e785 *electron-v31.4.0-win32-x64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v31.4.0-win32-x64-toolchain-profile.zip -ec065fc23dac9c84685c8b67fa2bc738a809ef4428f6b7fe106a690f8c87db6b *electron-v31.4.0-win32-x64.zip -26a6b0db18a0d1ae209dc01b2aa754f11fdf0c1c1d7821581ab36096cf71a5fb *electron.d.ts -511de67b9098ec2dcc969469097de2cb90c8f6da5a4346eaec4061bb91c593de *ffmpeg-v31.4.0-darwin-arm64.zip -99602e8e03f9e5e1df91dbf3f0534a2e50e232a5c013c5a0b5b1e6055edf6fd5 *ffmpeg-v31.4.0-darwin-x64.zip -e6d1937a647670adf27a9862aceedc4d9491118be192c81e22d27af1a3fdd736 *ffmpeg-v31.4.0-linux-arm64.zip -43eecd536bfed1228fed0cdf99168e0ed406bacc8d4ffd18c2a5ffa7ecdbbda8 *ffmpeg-v31.4.0-linux-armv7l.zip -b0f42d433ae0a4c091740ff550d7fe8e812e20043d991671fab54563f798bc4d *ffmpeg-v31.4.0-linux-x64.zip -511de67b9098ec2dcc969469097de2cb90c8f6da5a4346eaec4061bb91c593de *ffmpeg-v31.4.0-mas-arm64.zip -99602e8e03f9e5e1df91dbf3f0534a2e50e232a5c013c5a0b5b1e6055edf6fd5 *ffmpeg-v31.4.0-mas-x64.zip -559f12a225bda71c3841d50cacdc03199df5b9a2bae8ef811a51b35df57387c4 *ffmpeg-v31.4.0-win32-arm64.zip -773f4050f6a38c804b6ce7e0c474c823a771aecfe02d94297b74d03d0886d8ee *ffmpeg-v31.4.0-win32-ia32.zip -abce730d1dbf7fb157ac4782798b235a9e5aca655184b8fddcb72be6005a69c0 *ffmpeg-v31.4.0-win32-x64.zip -ec22dd27de962eaf5d7a30cdbc5648f8b7917437d74cc860767e4dab7de45b53 *hunspell_dictionaries.zip -fb6ebd01f90a81eeebc9dbd7d1cf8fc2cdf31f41bcb46e48135a66b0f581d26e *libcxx-objects-v31.4.0-linux-arm64.zip -ebff481fab9f01a5219deff6e4e64bf68626abe822fcd0304310c2d85833c7f1 *libcxx-objects-v31.4.0-linux-armv7l.zip -1d61804223ed93f806c1e053b35f886284ae1bcb02f9d8bcbddcffc07c40e3ba *libcxx-objects-v31.4.0-linux-x64.zip -9a118d289e0de3273bd904a035a21f620da30b5a2882133926c3f695acd4491a *libcxx_headers.zip -43aa8873b8c97c39250cef6cb8f19c6b8e8a0bb5154b1acf29e5a5296fd73b49 *libcxxabi_headers.zip -0aec3c569b8f1f61eb5bfee7094b6cdc3668f1beec5750788e084567f7979079 *mksnapshot-v31.4.0-darwin-arm64.zip -14cc0725fcb15d3313920c50694dc435bf993c5ce064d6faa5dd01eb7725061c *mksnapshot-v31.4.0-darwin-x64.zip -26f190eba9d21bb3226016f4a4f34c1e8f949c5a8f7a950be8f3f7432add0a1f *mksnapshot-v31.4.0-linux-arm64-x64.zip -81a43b729d1c0652a2cc56df5436300bcb9e278c2c86afea16821d42d17650fb *mksnapshot-v31.4.0-linux-armv7l-x64.zip -3c4d0c427a4cd82765e0532a0fc0ff926e270476cb78e57073fad76dfaa881b4 *mksnapshot-v31.4.0-linux-x64.zip -0faf73e3897b68811603e8789eafa4f7069ad5f939b08f60bae1960efa0d9f0d *mksnapshot-v31.4.0-mas-arm64.zip -fb2f100d684f1b5366b44ead2138eae1e4d2869d347ab441421f20593e97d33e *mksnapshot-v31.4.0-mas-x64.zip -3653515f286529051d09e85d26058dcb47ef574ddeeca5da97593aa4dd2235f1 *mksnapshot-v31.4.0-win32-arm64-x64.zip -fb28b7f9a51a4c9b9d3d51fba5352a1822725d9e53b78168aa2b4ceb7cd35c3b *mksnapshot-v31.4.0-win32-ia32.zip -0975f47bdeee755a679a4bee9ebfca65ad69fd6d40b1f51e2c96fc330b413846 *mksnapshot-v31.4.0-win32-x64.zip +e3fbb9c78281a502455acecd0c072cd6e8a557a802e2e664bcd11f3338060f8d *chromedriver-v32.0.0-darwin-arm64.zip +c02f34cde7c17130d75ab760865fef3112b02a91de5188381b917fa54e40a159 *chromedriver-v32.0.0-darwin-x64.zip +c549470d49f068f03f3d7bc60255a427812ba8cc33f21b3c92943f580b3a7daa *chromedriver-v32.0.0-linux-arm64.zip +5f5311604a7978679e82ddf1f61c2594cd32f961c5d35a0fd56e761cecac978a *chromedriver-v32.0.0-linux-armv7l.zip +2c9a206034d0e46276559c96e775f9a038a922092d8d87e5cafe019517a84acc *chromedriver-v32.0.0-linux-x64.zip +4e41c691d1b0c14b1b71f23ff0cf7cc35de855c918840115b7cc9881e5ed7d09 *chromedriver-v32.0.0-mas-arm64.zip +7ced5e5de9a27a51fa55c738c8cedf94a19e26222978c3bd7ca6284f3a15c087 *chromedriver-v32.0.0-mas-x64.zip +f8fba3c9a3f5da9b0144d1a28c82c246b035b0b78cc482ab29539a0f6fe58f1e *chromedriver-v32.0.0-win32-arm64.zip +6bc4028d33916018691cc933cb5b75e9df05b5cd48a58435891703cd9e58c66e *chromedriver-v32.0.0-win32-ia32.zip +aeaea67edd9b4dbcfb52f6b3c73b8e5c44cfb398d9c0af128fd94e1a50800feb *chromedriver-v32.0.0-win32-x64.zip +0627aebfc33fce3e3f5a7539efa6b2107041d562446ecd63bbf343f36d0f64fd *electron-api.json +ca31f9570b7048ca909257382a4e333703dcc35f89fb35fae40805daaea41129 *electron-v32.0.0-darwin-arm64-dsym-snapshot.zip +96797d2dde1e5030a2470b0123f52f99ce9f2265952fb0076d67876a28e19d75 *electron-v32.0.0-darwin-arm64-dsym.zip +6eef61369cb118ed7ca97c906c79b28c07fde79144ac4987c47e2005a44c3b95 *electron-v32.0.0-darwin-arm64-symbols.zip +f0dae4b47af64fcfd83123f3c98c9c02f8f8064fb1d56cd295c0347234157b48 *electron-v32.0.0-darwin-arm64.zip +994b8e12a5cc29e0617173b589091acda1b99af90a0e2f420505a618f2deb670 *electron-v32.0.0-darwin-x64-dsym-snapshot.zip +97690d1af19e532534b875e2d61c9c8dff56c23e0018c84889a7b4a2755f9589 *electron-v32.0.0-darwin-x64-dsym.zip +6a93cf32602c3393fc2da0bed0195c8cf1ffebbbe95a0525ecab2610f4e83b10 *electron-v32.0.0-darwin-x64-symbols.zip +685d791c4635194a84119c35671002590c829f13001bbf222d7b2ccd07bb8862 *electron-v32.0.0-darwin-x64.zip +675db0c60cce46b3de8d114d0635e9ee203799d63a75dfba9da34bf72f1f1193 *electron-v32.0.0-linux-arm64-debug.zip +2da131ebe46cc7bfbedc9e0f4468b3ddccfde1197848a965a1dfeed7fe449348 *electron-v32.0.0-linux-arm64-symbols.zip +71af014d5f2fa87289e86ffcc25c464ab9228a610d94a19eea7249c2f8a04878 *electron-v32.0.0-linux-arm64.zip +675db0c60cce46b3de8d114d0635e9ee203799d63a75dfba9da34bf72f1f1193 *electron-v32.0.0-linux-armv7l-debug.zip +5580946cec2de2329c75e71141da35ae3840b5d2938aeeaf781056a7d22bc262 *electron-v32.0.0-linux-armv7l-symbols.zip +ac2a56602ef3ba268148148f2bbfc6dae3fd4343221149edc5b3f543c3960dea *electron-v32.0.0-linux-armv7l.zip +e70c066d10c8d13ae517a6e54e6bc57ded78a30d66d4a01d8943f2d20f7ab6d8 *electron-v32.0.0-linux-x64-debug.zip +37547e7377eb97cc8efcd9072b7cb85aad55c02926a016a4e191d72cbb8f66ef *electron-v32.0.0-linux-x64-symbols.zip +1d4e3d6805c42cf69943e33b8691aaa4fbda88d7becd48d5b342ccaef512ff60 *electron-v32.0.0-linux-x64.zip +9fb1d3c9df9064e54b54092ecb0d494837a1c11783966a48dfea0f0c12e59018 *electron-v32.0.0-mas-arm64-dsym-snapshot.zip +653d1e32993c7aa82d70c4b8d94560332c631c66730add21d803d2ca23ea161e *electron-v32.0.0-mas-arm64-dsym.zip +4e3cf831ab3af6c2a96089996efa974243a7039119b85d600ed6f73e74027cd9 *electron-v32.0.0-mas-arm64-symbols.zip +be1733814f4cf25a4dd6f5b9d1e21b66a435b01b1f57920f82fe4776481af9aa *electron-v32.0.0-mas-arm64.zip +b9dbe824457b7ae4ca9861864127f079c7b388fd322101f532cd3bab951f546b *electron-v32.0.0-mas-x64-dsym-snapshot.zip +74877fe526f44fea8cb25ae065bdb8f4801b5dab6cead4528dd4bb195de2ffe8 *electron-v32.0.0-mas-x64-dsym.zip +88978d0f0ef6626e5afc65f53edc960428e83df7da02fb1230bd9936d5956543 *electron-v32.0.0-mas-x64-symbols.zip +472bd99085f02dbd400a30074305856a3823014d31459b3763fa4cdabfa9cda7 *electron-v32.0.0-mas-x64.zip +d3cad3cd21bcdbdd7c0b9e59835a20610288b840fca337496a4adec5920401b7 *electron-v32.0.0-win32-arm64-pdb.zip +f393329c74ca4b0e23b7ca0e8f2094576dc6d5353c92b8fbf32e6763cab7d8de *electron-v32.0.0-win32-arm64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.0-win32-arm64-toolchain-profile.zip +9ab24e69a57dd64232ca19bcf10ade2109b7e1a37c0d6bc41196327407d380c6 *electron-v32.0.0-win32-arm64.zip +12ba15646dd9413ff44935424b03661656892a4b811b450477ecbea8f1bb62d7 *electron-v32.0.0-win32-ia32-pdb.zip +f0316826a3b2362382e9b48efb0158a473874149f4d6d2decbebb4a514d9ad18 *electron-v32.0.0-win32-ia32-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.0-win32-ia32-toolchain-profile.zip +afa953a5a6ff6c7bce8313a2bb8fd1b6a75fc0f37f0229457205dc10f91232d1 *electron-v32.0.0-win32-ia32.zip +cf89f9e44a433e4c0380bc458006339a2c37afcdf28e7e23f4238d6114eae37b *electron-v32.0.0-win32-x64-pdb.zip +f5079bd52b09bd1d83f0ad69c5839b4262f480a013fd2ec89c4a3e1509240728 *electron-v32.0.0-win32-x64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.0-win32-x64-toolchain-profile.zip +e562b6d536191d11f1af210bf612ad980ca083817022eaa3616df316ce03ec72 *electron-v32.0.0-win32-x64.zip +b7f5c29e35ff5066efe3a24a589e13e9f0cdd445d74e946076d9598f3a503554 *electron.d.ts +0099c4a486bb4d43ade7a0596e289a2069a48732475953d5ad326594fc36a8bd *ffmpeg-v32.0.0-darwin-arm64.zip +78f4f4899f362292782b33909732528ef487ddff8af95a6822efbc54e8924219 *ffmpeg-v32.0.0-darwin-x64.zip +9b7c1a7618a50b77220cfbf8db3dfe558c896e6c3984e96b8b6cd19955d8e7d8 *ffmpeg-v32.0.0-linux-arm64.zip +f4283c971ccb6251123841413ba501bfc65bd7b908f9cb3487f3634be6471b27 *ffmpeg-v32.0.0-linux-armv7l.zip +4865234142e0b07e72f1fc68aeb4b3614937d8cc83029316e8f3960b8d71790f *ffmpeg-v32.0.0-linux-x64.zip +0099c4a486bb4d43ade7a0596e289a2069a48732475953d5ad326594fc36a8bd *ffmpeg-v32.0.0-mas-arm64.zip +78f4f4899f362292782b33909732528ef487ddff8af95a6822efbc54e8924219 *ffmpeg-v32.0.0-mas-x64.zip +c0adc5a146d7d766a83c8b0b4b88e7106728391ad3ad1c852d4d15ec91c4ee47 *ffmpeg-v32.0.0-win32-arm64.zip +5dbe24c9e11ce61274badbe12a27e9913c8fb010c7f6d60d77d7ef6fc8d8cb96 *ffmpeg-v32.0.0-win32-ia32.zip +96d55a91ecac39b9034fa115472a98424ae07eea620b822717156f6673b6f0fd *ffmpeg-v32.0.0-win32-x64.zip +cfc28dcf9728ae7572d7e05626b0860d3c8a8a5d43e649e3d51fb26b27716c7f *hunspell_dictionaries.zip +b35e4c32e6a8de02caa1ccd4c70bdd8ab52f517c572cb64ed3f8b440496b865c *libcxx-objects-v32.0.0-linux-arm64.zip +34334038e16ef209d10df4d7827f5f2a2ef16c3cf8b562373972780242d0f252 *libcxx-objects-v32.0.0-linux-armv7l.zip +87bbd642d16d7cfdb14e4550e2f8288df77483b1769f70ec0f9bed168ba70488 *libcxx-objects-v32.0.0-linux-x64.zip +01d72086c19a3ab426fff64efe23d4112291464785e32253b77b7820aa88e7c2 *libcxx_headers.zip +875d1697b3cde375ed63cb56104b1c53157bdd611fb3938f086be9579177bce2 *libcxxabi_headers.zip +b4c92acf69b4ba0c7a9332a93638d084a8aa16d3efe34bb90eb8e21407abb30e *mksnapshot-v32.0.0-darwin-arm64.zip +03b096e3fd274aa637b0ced6dfe94fee44a2c8e03c5d7cc84de426ac00f41b7c *mksnapshot-v32.0.0-darwin-x64.zip +ae8f4ffd7f879a7ff44b6c1f47682e1f94000d8e2fa94a05169a1a6e29f5839b *mksnapshot-v32.0.0-linux-arm64-x64.zip +eff15f9e0368a01d1bd715caf5048abf7a0581c3b855184cd8e49e542479368d *mksnapshot-v32.0.0-linux-armv7l-x64.zip +8efa852de9d2108ef95637c143ac2a5b3413a7eb961d9209391bbb644dc0ce41 *mksnapshot-v32.0.0-linux-x64.zip +65c256c40153549f0e098d18979be66da0f70aa1ad2e2961c6cd21ba64d69693 *mksnapshot-v32.0.0-mas-arm64.zip +cdb857e183bb4b444cbc7e0ea5a06a856d25b68e190d3b7eb3d173d528002353 *mksnapshot-v32.0.0-mas-x64.zip +de9c44f61f3f9a58e1eb4b5953270f3d358a96ce5f73be4bda3e79fa99a17981 *mksnapshot-v32.0.0-win32-arm64-x64.zip +b646c3a4fab6fbd6d9484a53526d8a738cdf57cefff597f0a95f8450f55a790e *mksnapshot-v32.0.0-win32-ia32.zip +950ebfc81ed18993630215139f001afd949360b720c536dca54a7d33fc851372 *mksnapshot-v32.0.0-win32-x64.zip diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index e762683b2ddb5..5298496269a07 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -23,7 +23,7 @@ const product = require("../../product.json"); // The reference dependencies, which one has to update when the new dependencies // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/126.0.6478.234:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.36: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/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index e8635883cf618..c484f07abac6e 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -25,7 +25,7 @@ import product = require('../../product.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/126.0.6478.234:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.36: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 cec096311e422..9a5b179b7b801 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "2a4c54370053284b59406e15f7c99162e6fb411c" + "commitHash": "616908133c9ceafb992a9d3f29b547160fe3ce16" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "126.0.6478.234" + "version": "128.0.6613.36" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "bd70c3a7404326f7711fafc8f0c550b510dbe095" + "commitHash": "9e421e8f437a02a131ffe0ae3b6691302f8e1108" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "31.4.0" + "version": "32.0.0" }, { "component": { diff --git a/package.json b/package.json index 9db57a7fff788..b8b63a854130e 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "31.4.0", + "electron": "32.0.0", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", diff --git a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts index 199813a3b8c7a..3cd587210d573 100644 --- a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts +++ b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts @@ -243,16 +243,14 @@ export class UtilityProcess extends Disposable { this.log('creating new...', Severity.Info); // Fork utility process - this.process = utilityProcess.fork(modulePath, args, upcast({ + this.process = utilityProcess.fork(modulePath, args, { serviceName, env, execArgv, allowLoadingUnsignedLibraries, respondToAuthRequestsFromMainProcess, stdio - })); + }); // Register to events this.registerListeners(this.process, this.configuration, serviceName); From 07f039c57e9e5d4c3270fe440796851f19f2d35c Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 13:11:44 +0900 Subject: [PATCH 08/41] fix: compile stage --- build/azure-pipelines/product-compile.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml index facc7af4bc282..ee27f6b847d17 100644 --- a/build/azure-pipelines/product-compile.yml +++ b/build/azure-pipelines/product-compile.yml @@ -60,6 +60,12 @@ steps: - script: | set -e + # V8 >= 12.8 requies C++20 or later + # current headers shipped from Electron are missing + # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa + # Following is a workaround until the headers are fixed in upstream. + export CXXFLAGS="-std=gnu++20" + for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then From d9c36d8bb7edd9c9b207002948e72cd541536d0d Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 13:55:38 +0900 Subject: [PATCH 09/41] fix: install on windows --- .../win32/product-build-win32.yml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index a30d4ca8029b2..449f2c44c2361 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -89,6 +89,35 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) displayName: Setup NPM Authentication + # V8 >= 12.8 requies C++20 or later + # current headers shipped from Electron are missing + # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa + # Following is a workaround until the headers are fixed in upstream. + - pwsh: | + $includes = @' + { + 'target_defaults': { + 'conditions': [ + ['OS=="win"', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ + '-std:c++20' + ], + }, + }, + }] + ] + } + } + '@ + + if (!(Test-Path "~/.gyp")) { + mkdir "~/.gyp" + } + echo $includes > "~/.gyp/include.gypi" + displayName: Create include.gypi + - powershell: | . build/azure-pipelines/win32/exec.ps1 . build/azure-pipelines/win32/retry.ps1 From d52606b1394f487b31c195560b0c7085e94234e0 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 14:59:01 +0900 Subject: [PATCH 10/41] fix: override node-addon-api to support c++20 with gcc-11 Brings in https://github.com/nodejs/node-addon-api/commit/fed13534c595c52fdd2cbf64d7bffe83de74ef35 to support compilation with gcc>=11 --- extensions/package.json | 5 +++-- package.json | 3 ++- remote/package.json | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/extensions/package.json b/extensions/package.json index 5cd6099229c08..3cc111c94af59 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -14,7 +14,8 @@ "esbuild": "0.23.0", "vscode-grammar-updater": "^1.1.0" }, - "resolutions": { - "node-gyp-build": "4.8.1" + "overrides": { + "node-gyp-build": "4.8.1", + "node-addon-api": "8.1.0" } } diff --git a/package.json b/package.json index b8b63a854130e..063900a66207e 100644 --- a/package.json +++ b/package.json @@ -221,7 +221,8 @@ "yaserver": "^0.4.0" }, "overrides": { - "node-gyp-build": "4.8.1" + "node-gyp-build": "4.8.1", + "node-addon-api": "8.1.0" }, "repository": { "type": "git", diff --git a/remote/package.json b/remote/package.json index 1c0d780abd877..8eedf07d361eb 100644 --- a/remote/package.json +++ b/remote/package.json @@ -39,6 +39,7 @@ "yazl": "^2.4.3" }, "overrides": { - "node-gyp-build": "4.8.1" + "node-gyp-build": "4.8.1", + "node-addon-api": "8.1.0" } } From 7a5dc72b5bb7ec885b999ba97e1acc8f8aa76469 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 17:10:51 +0900 Subject: [PATCH 11/41] ci: use gnu++2a for gcc <=9 --- build/azure-pipelines/linux/setup-env.sh | 4 ++-- build/azure-pipelines/product-compile.yml | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index 45a1969213e7a..65df5b16e40d1 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -48,7 +48,7 @@ elif [ "$npm_config_arch" == "arm64" ]; then # Set compiler toolchain for client native modules export CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc export CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++ - export CXXFLAGS="-std=gnu++20 --sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" + export CXXFLAGS="-std=gnu++2a --sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu" if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then @@ -62,7 +62,7 @@ elif [ "$npm_config_arch" == "arm" ]; then # Set compiler toolchain for client native modules export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++ - export CXXFLAGS="-std=gnu++20 --sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" + export CXXFLAGS="-std=gnu++2a --sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf" # Set compiler toolchain for remote server diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml index ee27f6b847d17..dcbc34798a6bd 100644 --- a/build/azure-pipelines/product-compile.yml +++ b/build/azure-pipelines/product-compile.yml @@ -64,7 +64,11 @@ steps: # current headers shipped from Electron are missing # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa # Following is a workaround until the headers are fixed in upstream. - export CXXFLAGS="-std=gnu++20" + if [ "$(g++ -dumpversion)" -lt 10 ]; then + export CXXFLAGS="-std=gnu++2a" + else + export CXXFLAGS="-std=gnu++20" + fi for i in {1..5}; do # try 5 times npm ci && break From 0539dcff24c6b10b121c77556f7762ca45786947 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 17:12:45 +0900 Subject: [PATCH 12/41] ci: fix sdl pipeline --- build/azure-pipelines/win32/sdl-scan-win32.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/azure-pipelines/win32/sdl-scan-win32.yml b/build/azure-pipelines/win32/sdl-scan-win32.yml index fc40b9a0e60d7..dc8d3585668fa 100644 --- a/build/azure-pipelines/win32/sdl-scan-win32.yml +++ b/build/azure-pipelines/win32/sdl-scan-win32.yml @@ -57,7 +57,8 @@ steps: 'VCCLCompilerTool': { 'AdditionalOptions': [ '/Zi', - '/FS' + '/FS', + '-std:c++20' ], }, 'VCLinkerTool': { From ad0fb1e22cdc2679eed03f2ea8a3732ac73e61f7 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 18:21:35 +0900 Subject: [PATCH 13/41] ci: web stage --- build/azure-pipelines/web/product-build-web.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml index 44122a2aad0d9..c46f6be3af29b 100644 --- a/build/azure-pipelines/web/product-build-web.yml +++ b/build/azure-pipelines/web/product-build-web.yml @@ -66,6 +66,17 @@ steps: - script: | set -e + + # V8 >= 12.8 requies C++20 or later + # current headers shipped from Electron are missing + # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa + # Following is a workaround until the headers are fixed in upstream. + if [ "$(g++ -dumpversion)" -lt 10 ]; then + export CXXFLAGS="-std=gnu++2a" + else + export CXXFLAGS="-std=gnu++20" + fi + for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then From 0bbe0b4aa7ea0387e90044b3e0dff4bde4078226 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 18:27:55 +0900 Subject: [PATCH 14/41] ci: fix alpine stage --- build/azure-pipelines/alpine/product-build-alpine.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/azure-pipelines/alpine/product-build-alpine.yml b/build/azure-pipelines/alpine/product-build-alpine.yml index 077ec0ba11b7c..415fb1998548d 100644 --- a/build/azure-pipelines/alpine/product-build-alpine.yml +++ b/build/azure-pipelines/alpine/product-build-alpine.yml @@ -73,6 +73,17 @@ steps: - script: | set -e + + # V8 >= 12.8 requies C++20 or later + # current headers shipped from Electron are missing + # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa + # Following is a workaround until the headers are fixed in upstream. + if [ "$(g++ -dumpversion)" -lt 10 ]; then + export CXXFLAGS="-std=gnu++2a" + else + export CXXFLAGS="-std=gnu++20" + fi + for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then From 79405a794eb22de69b1d4258db5f0a9b40e258b1 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 18:54:21 +0900 Subject: [PATCH 15/41] ci: fix legacy server stage --- .../linux/product-build-linux-legacy-server.yml | 2 +- build/azure-pipelines/linux/setup-env.sh | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml index 649a3d224d9d1..a442b7a8cd2fb 100644 --- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml +++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml @@ -101,7 +101,7 @@ steps: set -e export VSCODE_SYSROOT_PREFIX='-glibc-2.17' - source ./build/azure-pipelines/linux/setup-env.sh --only-remote + source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot for i in {1..5}; do # try 5 times npm ci && break diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index 65df5b16e40d1..9196ee72103c1 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -37,7 +37,7 @@ if [ "$npm_config_arch" == "x64" ]; then export CXXFLAGS="-nostdinc++ -std=gnu++20 -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" export LDFLAGS="-stdlib=libc++ --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu -Wl,--lto-O0" - if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then + if [ "$(echo "$@" | grep -c -- "--skip-sysroot")" -eq 0 ]; then # Set compiler toolchain for remote server export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++ @@ -45,13 +45,13 @@ if [ "$npm_config_arch" == "x64" ]; then export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu" fi elif [ "$npm_config_arch" == "arm64" ]; then + if [ "$(echo "$@" | grep -c -- "--skip-sysroot")" -eq 0 ]; then # Set compiler toolchain for client native modules export CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc export CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++ export CXXFLAGS="-std=gnu++2a --sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu" - if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then # Set compiler toolchain for remote server export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++ @@ -59,11 +59,13 @@ elif [ "$npm_config_arch" == "arm64" ]; then export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu" fi elif [ "$npm_config_arch" == "arm" ]; then - # Set compiler toolchain for client native modules - export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc - export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++ - export CXXFLAGS="-std=gnu++2a --sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" - export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf" + if [ "$(echo "$@" | grep -c -- "--skip-sysroot")" -eq 0 ]; then + # Set compiler toolchain for client native modules + export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc + export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++ + export CXXFLAGS="-std=gnu++2a --sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" + export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf" + fi # Set compiler toolchain for remote server export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc From bf0c4cafac27f74ac2058768452ac3cbeb9eba59 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 18:55:54 +0900 Subject: [PATCH 16/41] fix: node-addon-api resolution for remote --- extensions/package.json | 2 +- package.json | 2 +- remote/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/package.json b/extensions/package.json index 3cc111c94af59..363f870d345e1 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -16,6 +16,6 @@ }, "overrides": { "node-gyp-build": "4.8.1", - "node-addon-api": "8.1.0" + "node-addon-api": "7.1.0" } } diff --git a/package.json b/package.json index 063900a66207e..994e5b007eb98 100644 --- a/package.json +++ b/package.json @@ -222,7 +222,7 @@ }, "overrides": { "node-gyp-build": "4.8.1", - "node-addon-api": "8.1.0" + "node-addon-api": "7.1.0" }, "repository": { "type": "git", diff --git a/remote/package.json b/remote/package.json index 8eedf07d361eb..d8f16703f5f15 100644 --- a/remote/package.json +++ b/remote/package.json @@ -40,6 +40,6 @@ }, "overrides": { "node-gyp-build": "4.8.1", - "node-addon-api": "8.1.0" + "node-addon-api": "7.1.0" } } From 95dba4fd318d2f841dfb82d2417c371b0d4e671a Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 4 Sep 2024 20:39:36 +0900 Subject: [PATCH 17/41] ci: fix legacy arm stage --- .../linux/product-build-linux-legacy-server.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml index a442b7a8cd2fb..686ac40cfcdd7 100644 --- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml +++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml @@ -86,6 +86,16 @@ steps: - script: | set -e + # V8 >= 12.8 requies C++20 or later + # current headers shipped from Electron are missing + # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa + # Following is a workaround until the headers are fixed in upstream. + if [ "$(g++ -dumpversion)" -lt 10 ]; then + export CXXFLAGS="-std=gnu++2a" + else + export CXXFLAGS="-std=gnu++20" + fi + for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then From 999f497a1684a205d446e3b987c71f5a06d2f86d Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 10 Sep 2024 14:45:40 +0900 Subject: [PATCH 18/41] chore: sync npm dependencies --- extensions/package-lock.json | 12 ++++--- package-lock.json | 65 ++++++------------------------------ remote/package-lock.json | 39 ++++------------------ 3 files changed, 26 insertions(+), 90 deletions(-) diff --git a/extensions/package-lock.json b/extensions/package-lock.json index 32a0865af3d90..82f695dc38f5d 100644 --- a/extensions/package-lock.json +++ b/extensions/package-lock.json @@ -561,10 +561,14 @@ } }, "node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", + "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^16 || ^18 || >= 20" + } }, "node_modules/node-gyp-build": { "version": "4.8.1", diff --git a/package-lock.json b/package-lock.json index 0770fcbad1811..6a667a68db914 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "30.5.1", + "electron": "32.0.0", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", @@ -2888,11 +2888,6 @@ "node-addon-api": "^6.0.0" } }, - "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.0.0.tgz", - "integrity": "sha512-GyHvgPvUXBvAkXa0YvYnhilSB1A+FRYMpIVggKzPZqdaZfevZOuzfWzyvgzOwRLHBeo/MMswmJFsrNF4Nw1pmA==" - }, "node_modules/@vscode/proxy-agent": { "version": "0.22.0", "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.22.0.tgz", @@ -2940,14 +2935,6 @@ "node-addon-api": "7.1.0" } }, - "node_modules/@vscode/spdlog/node_modules/node-addon-api": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", - "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", - "engines": { - "node": "^16 || ^18 || >= 20" - } - }, "node_modules/@vscode/sqlite3": { "version": "5.1.6-vscode", "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.6-vscode.tgz", @@ -2958,11 +2945,6 @@ "tar": "^6.1.11" } }, - "node_modules/@vscode/sqlite3/node_modules/node-addon-api": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz", - "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==" - }, "node_modules/@vscode/sudo-prompt": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz", @@ -3287,14 +3269,6 @@ "node-addon-api": "7.1.0" } }, - "node_modules/@vscode/windows-mutex/node_modules/node-addon-api": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", - "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", - "engines": { - "node": "^16 || ^18 || >= 20" - } - }, "node_modules/@vscode/windows-process-tree": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.0.tgz", @@ -3304,14 +3278,6 @@ "node-addon-api": "7.1.0" } }, - "node_modules/@vscode/windows-process-tree/node_modules/node-addon-api": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", - "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", - "engines": { - "node": "^16 || ^18 || >= 20" - } - }, "node_modules/@vscode/windows-registry": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@vscode/windows-registry/-/windows-registry-1.1.0.tgz", @@ -6170,9 +6136,9 @@ "dev": true }, "node_modules/electron": { - "version": "30.5.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-30.5.1.tgz", - "integrity": "sha512-AhL7+mZ8Lg14iaNfoYTkXQ2qee8mmsQyllKdqxlpv/zrKgfxz6jNVtcRRbQtLxtF8yzcImWdfTQROpYiPumdbw==", + "version": "32.0.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-32.0.0.tgz", + "integrity": "sha512-rs+VkhztJd2LvRX7d3ikKH+EIHMW4vKM2l5qp7Dx/dLQAKKz3IFNKyYhYzczDnqO+/jUvx0ic0SQvqpv1/ZAsw==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -11178,11 +11144,6 @@ "node": ">=12.9.0" } }, - "node_modules/kerberos/node_modules/node-addon-api": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==" - }, "node_modules/keygrip": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", @@ -12693,9 +12654,13 @@ } }, "node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", + "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", + "license": "MIT", + "engines": { + "node": "^16 || ^18 || >= 20" + } }, "node_modules/node-fetch": { "version": "2.6.8", @@ -12758,14 +12723,6 @@ "node-addon-api": "^7.1.0" } }, - "node_modules/node-pty/node_modules/node-addon-api": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", - "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", - "engines": { - "node": "^16 || ^18 || >= 20" - } - }, "node_modules/node-releases": { "version": "2.0.14", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", diff --git a/remote/package-lock.json b/remote/package-lock.json index 34367ce686be1..0dd1d7dab0f45 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -175,14 +175,6 @@ "node-addon-api": "7.1.0" } }, - "node_modules/@vscode/spdlog/node_modules/node-addon-api": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", - "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", - "engines": { - "node": "^16 || ^18 || >= 20" - } - }, "node_modules/@vscode/tree-sitter-wasm": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.0.4.tgz", @@ -218,14 +210,6 @@ "node-addon-api": "7.1.0" } }, - "node_modules/@vscode/windows-process-tree/node_modules/node-addon-api": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", - "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", - "engines": { - "node": "^16 || ^18 || >= 20" - } - }, "node_modules/@vscode/windows-registry": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@vscode/windows-registry/-/windows-registry-1.1.0.tgz", @@ -646,11 +630,6 @@ "node": ">=12.9.0" } }, - "node_modules/kerberos/node_modules/node-addon-api": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==" - }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -734,9 +713,13 @@ } }, "node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", + "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", + "license": "MIT", + "engines": { + "node": "^16 || ^18 || >= 20" + } }, "node_modules/node-gyp-build": { "version": "4.8.1", @@ -757,14 +740,6 @@ "node-addon-api": "^7.1.0" } }, - "node_modules/node-pty/node_modules/node-addon-api": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", - "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", - "engines": { - "node": "^16 || ^18 || >= 20" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", From 1c9c02ffe18261adf82e29304570b4bcd73c87ea Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 10 Sep 2024 14:55:14 +0900 Subject: [PATCH 19/41] chore: bump electron@32.0.1 --- .npmrc | 4 +- build/checksums/electron.txt | 150 +++++++++++++++++------------------ cgmanifest.json | 4 +- package-lock.json | 8 +- package.json | 2 +- 5 files changed, 84 insertions(+), 84 deletions(-) diff --git a/.npmrc b/.npmrc index f2f87fb0abd59..d90e0d8a7751a 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="32.0.0" -ms_build_id="10133952" +target="32.0.1" +ms_build_id="10165920" runtime="electron" build_from_source="true" legacy-peer-deps="true" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 2f95bbe96150c..d8a9fcd1409c4 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -e3fbb9c78281a502455acecd0c072cd6e8a557a802e2e664bcd11f3338060f8d *chromedriver-v32.0.0-darwin-arm64.zip -c02f34cde7c17130d75ab760865fef3112b02a91de5188381b917fa54e40a159 *chromedriver-v32.0.0-darwin-x64.zip -c549470d49f068f03f3d7bc60255a427812ba8cc33f21b3c92943f580b3a7daa *chromedriver-v32.0.0-linux-arm64.zip -5f5311604a7978679e82ddf1f61c2594cd32f961c5d35a0fd56e761cecac978a *chromedriver-v32.0.0-linux-armv7l.zip -2c9a206034d0e46276559c96e775f9a038a922092d8d87e5cafe019517a84acc *chromedriver-v32.0.0-linux-x64.zip -4e41c691d1b0c14b1b71f23ff0cf7cc35de855c918840115b7cc9881e5ed7d09 *chromedriver-v32.0.0-mas-arm64.zip -7ced5e5de9a27a51fa55c738c8cedf94a19e26222978c3bd7ca6284f3a15c087 *chromedriver-v32.0.0-mas-x64.zip -f8fba3c9a3f5da9b0144d1a28c82c246b035b0b78cc482ab29539a0f6fe58f1e *chromedriver-v32.0.0-win32-arm64.zip -6bc4028d33916018691cc933cb5b75e9df05b5cd48a58435891703cd9e58c66e *chromedriver-v32.0.0-win32-ia32.zip -aeaea67edd9b4dbcfb52f6b3c73b8e5c44cfb398d9c0af128fd94e1a50800feb *chromedriver-v32.0.0-win32-x64.zip -0627aebfc33fce3e3f5a7539efa6b2107041d562446ecd63bbf343f36d0f64fd *electron-api.json -ca31f9570b7048ca909257382a4e333703dcc35f89fb35fae40805daaea41129 *electron-v32.0.0-darwin-arm64-dsym-snapshot.zip -96797d2dde1e5030a2470b0123f52f99ce9f2265952fb0076d67876a28e19d75 *electron-v32.0.0-darwin-arm64-dsym.zip -6eef61369cb118ed7ca97c906c79b28c07fde79144ac4987c47e2005a44c3b95 *electron-v32.0.0-darwin-arm64-symbols.zip -f0dae4b47af64fcfd83123f3c98c9c02f8f8064fb1d56cd295c0347234157b48 *electron-v32.0.0-darwin-arm64.zip -994b8e12a5cc29e0617173b589091acda1b99af90a0e2f420505a618f2deb670 *electron-v32.0.0-darwin-x64-dsym-snapshot.zip -97690d1af19e532534b875e2d61c9c8dff56c23e0018c84889a7b4a2755f9589 *electron-v32.0.0-darwin-x64-dsym.zip -6a93cf32602c3393fc2da0bed0195c8cf1ffebbbe95a0525ecab2610f4e83b10 *electron-v32.0.0-darwin-x64-symbols.zip -685d791c4635194a84119c35671002590c829f13001bbf222d7b2ccd07bb8862 *electron-v32.0.0-darwin-x64.zip -675db0c60cce46b3de8d114d0635e9ee203799d63a75dfba9da34bf72f1f1193 *electron-v32.0.0-linux-arm64-debug.zip -2da131ebe46cc7bfbedc9e0f4468b3ddccfde1197848a965a1dfeed7fe449348 *electron-v32.0.0-linux-arm64-symbols.zip -71af014d5f2fa87289e86ffcc25c464ab9228a610d94a19eea7249c2f8a04878 *electron-v32.0.0-linux-arm64.zip -675db0c60cce46b3de8d114d0635e9ee203799d63a75dfba9da34bf72f1f1193 *electron-v32.0.0-linux-armv7l-debug.zip -5580946cec2de2329c75e71141da35ae3840b5d2938aeeaf781056a7d22bc262 *electron-v32.0.0-linux-armv7l-symbols.zip -ac2a56602ef3ba268148148f2bbfc6dae3fd4343221149edc5b3f543c3960dea *electron-v32.0.0-linux-armv7l.zip -e70c066d10c8d13ae517a6e54e6bc57ded78a30d66d4a01d8943f2d20f7ab6d8 *electron-v32.0.0-linux-x64-debug.zip -37547e7377eb97cc8efcd9072b7cb85aad55c02926a016a4e191d72cbb8f66ef *electron-v32.0.0-linux-x64-symbols.zip -1d4e3d6805c42cf69943e33b8691aaa4fbda88d7becd48d5b342ccaef512ff60 *electron-v32.0.0-linux-x64.zip -9fb1d3c9df9064e54b54092ecb0d494837a1c11783966a48dfea0f0c12e59018 *electron-v32.0.0-mas-arm64-dsym-snapshot.zip -653d1e32993c7aa82d70c4b8d94560332c631c66730add21d803d2ca23ea161e *electron-v32.0.0-mas-arm64-dsym.zip -4e3cf831ab3af6c2a96089996efa974243a7039119b85d600ed6f73e74027cd9 *electron-v32.0.0-mas-arm64-symbols.zip -be1733814f4cf25a4dd6f5b9d1e21b66a435b01b1f57920f82fe4776481af9aa *electron-v32.0.0-mas-arm64.zip -b9dbe824457b7ae4ca9861864127f079c7b388fd322101f532cd3bab951f546b *electron-v32.0.0-mas-x64-dsym-snapshot.zip -74877fe526f44fea8cb25ae065bdb8f4801b5dab6cead4528dd4bb195de2ffe8 *electron-v32.0.0-mas-x64-dsym.zip -88978d0f0ef6626e5afc65f53edc960428e83df7da02fb1230bd9936d5956543 *electron-v32.0.0-mas-x64-symbols.zip -472bd99085f02dbd400a30074305856a3823014d31459b3763fa4cdabfa9cda7 *electron-v32.0.0-mas-x64.zip -d3cad3cd21bcdbdd7c0b9e59835a20610288b840fca337496a4adec5920401b7 *electron-v32.0.0-win32-arm64-pdb.zip -f393329c74ca4b0e23b7ca0e8f2094576dc6d5353c92b8fbf32e6763cab7d8de *electron-v32.0.0-win32-arm64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.0-win32-arm64-toolchain-profile.zip -9ab24e69a57dd64232ca19bcf10ade2109b7e1a37c0d6bc41196327407d380c6 *electron-v32.0.0-win32-arm64.zip -12ba15646dd9413ff44935424b03661656892a4b811b450477ecbea8f1bb62d7 *electron-v32.0.0-win32-ia32-pdb.zip -f0316826a3b2362382e9b48efb0158a473874149f4d6d2decbebb4a514d9ad18 *electron-v32.0.0-win32-ia32-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.0-win32-ia32-toolchain-profile.zip -afa953a5a6ff6c7bce8313a2bb8fd1b6a75fc0f37f0229457205dc10f91232d1 *electron-v32.0.0-win32-ia32.zip -cf89f9e44a433e4c0380bc458006339a2c37afcdf28e7e23f4238d6114eae37b *electron-v32.0.0-win32-x64-pdb.zip -f5079bd52b09bd1d83f0ad69c5839b4262f480a013fd2ec89c4a3e1509240728 *electron-v32.0.0-win32-x64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.0-win32-x64-toolchain-profile.zip -e562b6d536191d11f1af210bf612ad980ca083817022eaa3616df316ce03ec72 *electron-v32.0.0-win32-x64.zip -b7f5c29e35ff5066efe3a24a589e13e9f0cdd445d74e946076d9598f3a503554 *electron.d.ts -0099c4a486bb4d43ade7a0596e289a2069a48732475953d5ad326594fc36a8bd *ffmpeg-v32.0.0-darwin-arm64.zip -78f4f4899f362292782b33909732528ef487ddff8af95a6822efbc54e8924219 *ffmpeg-v32.0.0-darwin-x64.zip -9b7c1a7618a50b77220cfbf8db3dfe558c896e6c3984e96b8b6cd19955d8e7d8 *ffmpeg-v32.0.0-linux-arm64.zip -f4283c971ccb6251123841413ba501bfc65bd7b908f9cb3487f3634be6471b27 *ffmpeg-v32.0.0-linux-armv7l.zip -4865234142e0b07e72f1fc68aeb4b3614937d8cc83029316e8f3960b8d71790f *ffmpeg-v32.0.0-linux-x64.zip -0099c4a486bb4d43ade7a0596e289a2069a48732475953d5ad326594fc36a8bd *ffmpeg-v32.0.0-mas-arm64.zip -78f4f4899f362292782b33909732528ef487ddff8af95a6822efbc54e8924219 *ffmpeg-v32.0.0-mas-x64.zip -c0adc5a146d7d766a83c8b0b4b88e7106728391ad3ad1c852d4d15ec91c4ee47 *ffmpeg-v32.0.0-win32-arm64.zip -5dbe24c9e11ce61274badbe12a27e9913c8fb010c7f6d60d77d7ef6fc8d8cb96 *ffmpeg-v32.0.0-win32-ia32.zip -96d55a91ecac39b9034fa115472a98424ae07eea620b822717156f6673b6f0fd *ffmpeg-v32.0.0-win32-x64.zip -cfc28dcf9728ae7572d7e05626b0860d3c8a8a5d43e649e3d51fb26b27716c7f *hunspell_dictionaries.zip -b35e4c32e6a8de02caa1ccd4c70bdd8ab52f517c572cb64ed3f8b440496b865c *libcxx-objects-v32.0.0-linux-arm64.zip -34334038e16ef209d10df4d7827f5f2a2ef16c3cf8b562373972780242d0f252 *libcxx-objects-v32.0.0-linux-armv7l.zip -87bbd642d16d7cfdb14e4550e2f8288df77483b1769f70ec0f9bed168ba70488 *libcxx-objects-v32.0.0-linux-x64.zip -01d72086c19a3ab426fff64efe23d4112291464785e32253b77b7820aa88e7c2 *libcxx_headers.zip -875d1697b3cde375ed63cb56104b1c53157bdd611fb3938f086be9579177bce2 *libcxxabi_headers.zip -b4c92acf69b4ba0c7a9332a93638d084a8aa16d3efe34bb90eb8e21407abb30e *mksnapshot-v32.0.0-darwin-arm64.zip -03b096e3fd274aa637b0ced6dfe94fee44a2c8e03c5d7cc84de426ac00f41b7c *mksnapshot-v32.0.0-darwin-x64.zip -ae8f4ffd7f879a7ff44b6c1f47682e1f94000d8e2fa94a05169a1a6e29f5839b *mksnapshot-v32.0.0-linux-arm64-x64.zip -eff15f9e0368a01d1bd715caf5048abf7a0581c3b855184cd8e49e542479368d *mksnapshot-v32.0.0-linux-armv7l-x64.zip -8efa852de9d2108ef95637c143ac2a5b3413a7eb961d9209391bbb644dc0ce41 *mksnapshot-v32.0.0-linux-x64.zip -65c256c40153549f0e098d18979be66da0f70aa1ad2e2961c6cd21ba64d69693 *mksnapshot-v32.0.0-mas-arm64.zip -cdb857e183bb4b444cbc7e0ea5a06a856d25b68e190d3b7eb3d173d528002353 *mksnapshot-v32.0.0-mas-x64.zip -de9c44f61f3f9a58e1eb4b5953270f3d358a96ce5f73be4bda3e79fa99a17981 *mksnapshot-v32.0.0-win32-arm64-x64.zip -b646c3a4fab6fbd6d9484a53526d8a738cdf57cefff597f0a95f8450f55a790e *mksnapshot-v32.0.0-win32-ia32.zip -950ebfc81ed18993630215139f001afd949360b720c536dca54a7d33fc851372 *mksnapshot-v32.0.0-win32-x64.zip +f65f368fd4b87e7393c19c6d371b324e4f9dd813ae9236fb5daf8cfdc6d524c8 *chromedriver-v32.0.1-darwin-arm64.zip +6421a0a70b95ec3f29b23ba7922bd01eb20994ec85112b1419ba12dff4d43631 *chromedriver-v32.0.1-darwin-x64.zip +79d8a68e363357d578322290dc3d1544b429f6b86dce8f7b26fa8e6b2ede15a9 *chromedriver-v32.0.1-linux-arm64.zip +6de4a0d2141ef592fab3f98e30856ce2fc12adaff3debbf2f8c5f9c9778f7422 *chromedriver-v32.0.1-linux-armv7l.zip +be87aaeb50372c6bc4686e3b0b5d263025501a59ad940497da1ef9d4af3db30b *chromedriver-v32.0.1-linux-x64.zip +1724b8f7ebcd8f51684213f487d2d4aff4624f9cb99c226105c1a3c2c85c77ba *chromedriver-v32.0.1-mas-arm64.zip +2fe7dc34d75406fecdf8fc11a9baa31f147c1b5f2c7615c22fa2362541d173b9 *chromedriver-v32.0.1-mas-x64.zip +5592f8b94e386e6df43294015c0254c63a9911fd1133a4dc7b0137cf04763671 *chromedriver-v32.0.1-win32-arm64.zip +4b670fd6cddbea252b7d7d3a93571dec84226912055a8a2a3a8d17dd350f8945 *chromedriver-v32.0.1-win32-ia32.zip +5072f93376fc6b66a0e0f84d7cd40f5761bbbd669c6e37441764315ce3980c90 *chromedriver-v32.0.1-win32-x64.zip +817eb3a244e24b0794bdb6b2314a3994189d2e360a871e755c7242eadcceaf27 *electron-api.json +661e00cb1a27bba9b9e3f84be04a8a3ac5cf754187d2485f00b13ce0e8c8f2c1 *electron-v32.0.1-darwin-arm64-dsym-snapshot.zip +16e835537847ce01c2dae66a2795232ef16d109dd63a0eb87ad94f828f851ce6 *electron-v32.0.1-darwin-arm64-dsym.zip +c06bdaf7f4474767cc928a965e907df0e65028ec327aea2c9d5f87b9a3c32f55 *electron-v32.0.1-darwin-arm64-symbols.zip +8db368fd7353333b53092ccfdcd440b7bae1195e7950e1fb42b7606bd684802b *electron-v32.0.1-darwin-arm64.zip +7062a0fefa6abfb329339aa3636afb2310f0a730679571ef5112b6ec550ab6bc *electron-v32.0.1-darwin-x64-dsym-snapshot.zip +923b6ef18b5256c87ce9d6343167d4acdae0459cabc9daa37fdfb96e195d6e56 *electron-v32.0.1-darwin-x64-dsym.zip +df40b0b42831972c7e4bf975e65e132e5a0efdc00e89a0aded0884251a050ea6 *electron-v32.0.1-darwin-x64-symbols.zip +295f659e58a352043b91a3ea1251edc2f33692e00eb7b1f1b1d47e7b0b9bd02c *electron-v32.0.1-darwin-x64.zip +d95ea07cca74d4c6d2dcba682765263124d7100d41d60e247268c8d3072991cf *electron-v32.0.1-linux-arm64-debug.zip +7f0995ed399f8c74c952e9d6a3d7a6bd5bd7a485b7d08767a4527a74e5d61675 *electron-v32.0.1-linux-arm64-symbols.zip +a4f2e36b22a8aebd385a21012cfdb480de781240aafe5ddc4248565a10579242 *electron-v32.0.1-linux-arm64.zip +d95ea07cca74d4c6d2dcba682765263124d7100d41d60e247268c8d3072991cf *electron-v32.0.1-linux-armv7l-debug.zip +fb21700ec429b87a2999f5da3f6a805f2ed88ad94a7d7689e149a2e00813f2e8 *electron-v32.0.1-linux-armv7l-symbols.zip +fb28562242c38dac9ec2c7d3bc24993482174662d78820d2bffeb1cf8e72b7a7 *electron-v32.0.1-linux-armv7l.zip +3946bc6ee08bc0aeef87cc156ec5d454c2018d1cd85a9fefaddf7e5c4c995124 *electron-v32.0.1-linux-x64-debug.zip +d76ba18860e7ea618c7a691090bf611c9d29f67e79c0bdd22f9f9f238944b7d7 *electron-v32.0.1-linux-x64-symbols.zip +97d91b496a5eb6faf617d754fe6d6cdae29bf5684463c2b1b3a8c9b106977b85 *electron-v32.0.1-linux-x64.zip +bd5aa83d17fe4db2618d9adbae5e1d4afd9078b986ac8cce88dd00699a9c54b3 *electron-v32.0.1-mas-arm64-dsym-snapshot.zip +f118d42739cad33872aa670058fc49d6c106f5040449c4caee1cc17a666f3a93 *electron-v32.0.1-mas-arm64-dsym.zip +35f1b5b23feb21c8f75b97cb396897c79d710190f9af42dfe0be018cb1cbe960 *electron-v32.0.1-mas-arm64-symbols.zip +994a5c12ce2a4bb35a14b8be368c38f113a8cf1fe306efffd7ff52701a9fec5b *electron-v32.0.1-mas-arm64.zip +c75f27b7e558e6f8074f1ab0e1f7e3f52ea22cf3e78e5ea5759c2e24d005dbd5 *electron-v32.0.1-mas-x64-dsym-snapshot.zip +9cab61b9586c6456f0c632e517c31c5c71f76719aaa8854c77c02dbd6dfb7bc7 *electron-v32.0.1-mas-x64-dsym.zip +c9bed90f7766e48d3e8f2c4dc8dc5b08c3266ebfe31df4141f191fcd285bfb20 *electron-v32.0.1-mas-x64-symbols.zip +15a2b71e2477fb96caa580b42ae900cff1a74f538d68135ac66e68f1580a89a0 *electron-v32.0.1-mas-x64.zip +cf50ba6ee929dd8ca3e567f338d5cc437745ef69fcca20ac051b3a4aa1fa26f0 *electron-v32.0.1-win32-arm64-pdb.zip +013db571b332e23894d236ef70b17f194cdae9f0165e0be006b2b262d806f092 *electron-v32.0.1-win32-arm64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.1-win32-arm64-toolchain-profile.zip +a2d7ea265f7840ebda67b08906147055d16ab1ae581958c049f55ae35188ea38 *electron-v32.0.1-win32-arm64.zip +316e2f11dc494f1d0306b9294146c47ac0f206f2d39eb520cbb9b5b1402f82be *electron-v32.0.1-win32-ia32-pdb.zip +32002b7e23ef3d36cec1855800ee74c4a6bca46a44c3490116a313c835ca81b1 *electron-v32.0.1-win32-ia32-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.1-win32-ia32-toolchain-profile.zip +bb204179ed41c2f39fd0fe4accd6350e53c810c11e82c360813ce5260d7fac8c *electron-v32.0.1-win32-ia32.zip +89a2c2c057d4a073164e5b0047f6a8c4ebc679f21a9ac6f9b03e4d22739b7e7a *electron-v32.0.1-win32-x64-pdb.zip +26e7fcf5244e7bdd6d0992534d23ce37ad54bc19e5ce037486af3a5cfcbf3f65 *electron-v32.0.1-win32-x64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.1-win32-x64-toolchain-profile.zip +9153c1d72658472db6b34f094c190178099ebdfb02d6c82caf42010820580a52 *electron-v32.0.1-win32-x64.zip +b31efbf25b27bea7d85dbddcf50166efce223e209d6f842a761d27018bdffb92 *electron.d.ts +da9aae5322bd4f1aae5d5feefc4756c05aa8deda6f82a80b88701e1bdafb6a57 *ffmpeg-v32.0.1-darwin-arm64.zip +f0e6e4b5bcb2aa2a3aa801636a0536ebad8cef322bbf3147cce9118c567e85b6 *ffmpeg-v32.0.1-darwin-x64.zip +9b7c1a7618a50b77220cfbf8db3dfe558c896e6c3984e96b8b6cd19955d8e7d8 *ffmpeg-v32.0.1-linux-arm64.zip +f4283c971ccb6251123841413ba501bfc65bd7b908f9cb3487f3634be6471b27 *ffmpeg-v32.0.1-linux-armv7l.zip +4865234142e0b07e72f1fc68aeb4b3614937d8cc83029316e8f3960b8d71790f *ffmpeg-v32.0.1-linux-x64.zip +da9aae5322bd4f1aae5d5feefc4756c05aa8deda6f82a80b88701e1bdafb6a57 *ffmpeg-v32.0.1-mas-arm64.zip +f0e6e4b5bcb2aa2a3aa801636a0536ebad8cef322bbf3147cce9118c567e85b6 *ffmpeg-v32.0.1-mas-x64.zip +c0adc5a146d7d766a83c8b0b4b88e7106728391ad3ad1c852d4d15ec91c4ee47 *ffmpeg-v32.0.1-win32-arm64.zip +5dbe24c9e11ce61274badbe12a27e9913c8fb010c7f6d60d77d7ef6fc8d8cb96 *ffmpeg-v32.0.1-win32-ia32.zip +96d55a91ecac39b9034fa115472a98424ae07eea620b822717156f6673b6f0fd *ffmpeg-v32.0.1-win32-x64.zip +4ddd9ac99a5c0ec327329cd866e568a6a0d87574c8869583f4f63d6358dceb50 *hunspell_dictionaries.zip +ee73614839b16dd759bdbe6051889d041f893e3b29ecbc95cee3b773370a8745 *libcxx-objects-v32.0.1-linux-arm64.zip +55fd68d83766220a17068de9c028877fdd32a354493e3147a9543885539d499c *libcxx-objects-v32.0.1-linux-armv7l.zip +d1d5c5bf950ecdf0030a9dbe92feea51239e14023a7efa1eb36ae88dce69e6f3 *libcxx-objects-v32.0.1-linux-x64.zip +45f263e7401e8b036fed9675720a012d925cfd12a0023217fb34edd3073921ca *libcxx_headers.zip +730ccf546c71408ac92f66b143e30cf7987aee1db1ad5a36a204217dd44ae7de *libcxxabi_headers.zip +03f31b525f92a0c6865960fa51820d8b8e71586d1a5137abac231f4ce528e9f3 *mksnapshot-v32.0.1-darwin-arm64.zip +46dc4ccc6d43192d45cabde46fcb02de9b5edcdbaf3ec4694f5d01e6d1b6d54c *mksnapshot-v32.0.1-darwin-x64.zip +d06d50a4e03f7aad7935c69ea6d3679f542d5722534b6645ff5af232389aadc0 *mksnapshot-v32.0.1-linux-arm64-x64.zip +af5496c28707be16c3d6e1295ae44397d6420e3644016c7ef5469e96be2c0d4a *mksnapshot-v32.0.1-linux-armv7l-x64.zip +2eda6c0cb5dfe11ee778dc0e2038491b1066326b0aac9fc25f9d07e31a82832f *mksnapshot-v32.0.1-linux-x64.zip +42ead07fa0a3b264de03c2a34eae9b588f3e3895939c7c954f05239d8f72fddc *mksnapshot-v32.0.1-mas-arm64.zip +c6e6fb2c5d0ff06b36eeb7e5401932da507ee934d429d1487148e8e2c55fff1d *mksnapshot-v32.0.1-mas-x64.zip +f0464f335d64190494446dd8463a6383eddc3aa279d47caee914ddd6957af0f4 *mksnapshot-v32.0.1-win32-arm64-x64.zip +e677f10a7bce61bac05575bdfe387e7501e88c2d342120674f12d7945315fa11 *mksnapshot-v32.0.1-win32-ia32.zip +58a344560c8614912efd426bc7369ab0f9f50e69f3f665b5a0c548028ad95d47 *mksnapshot-v32.0.1-win32-x64.zip diff --git a/cgmanifest.json b/cgmanifest.json index 9a5b179b7b801..cfe4f19898906 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "9e421e8f437a02a131ffe0ae3b6691302f8e1108" + "commitHash": "a577d569ecddb3e4d374072f7bed62725d21c6ef" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "32.0.0" + "version": "32.0.1" }, { "component": { diff --git a/package-lock.json b/package-lock.json index 6a667a68db914..d4592348d981d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "32.0.0", + "electron": "32.0.1", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", @@ -6136,9 +6136,9 @@ "dev": true }, "node_modules/electron": { - "version": "32.0.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-32.0.0.tgz", - "integrity": "sha512-rs+VkhztJd2LvRX7d3ikKH+EIHMW4vKM2l5qp7Dx/dLQAKKz3IFNKyYhYzczDnqO+/jUvx0ic0SQvqpv1/ZAsw==", + "version": "32.0.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-32.0.1.tgz", + "integrity": "sha512-5Hd5Jaf9niYVR2hZxoRd3gOrcxPOxQV1XPV5WaoSfT9jLJHFadhlKtuSDIk3U6rQZke+aC7GqPPAv55nWFCMsA==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index 994e5b007eb98..c0a1c2a7acb22 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "32.0.0", + "electron": "32.0.1", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", From d42132ad366f163aa6bc39d4a995db483506bc68 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 10 Sep 2024 14:56:55 +0900 Subject: [PATCH 20/41] ci: fix monaco editor checks --- .github/workflows/monaco-editor.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml index 426999ce43b4a..26026aff994e9 100644 --- a/.github/workflows/monaco-editor.yml +++ b/.github/workflows/monaco-editor.yml @@ -56,6 +56,15 @@ jobs: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 ELECTRON_SKIP_BINARY_DOWNLOAD: 1 run: | + # V8 >= 12.8 requies C++20 or later + # current headers shipped from Electron are missing + # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa + # Following is a workaround until the headers are fixed in upstream. + if [ "$(g++ -dumpversion)" -lt 10 ]; then + export CXXFLAGS="-std=gnu++2a" + else + export CXXFLAGS="-std=gnu++20" + fi npm ci - name: Download Playwright From 98f2d8dbade4442fba52c9b3878d188c64730c6d Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 10 Sep 2024 17:06:33 +0900 Subject: [PATCH 21/41] ci: fix legacy server stage --- .../linux/product-build-linux-legacy-server.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml index 686ac40cfcdd7..913415414f221 100644 --- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml +++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml @@ -110,6 +110,16 @@ steps: - script: | set -e + # V8 >= 12.8 requies C++20 or later + # current headers shipped from Electron are missing + # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa + # Following is a workaround until the headers are fixed in upstream. + if [ "$(g++ -dumpversion)" -lt 10 ]; then + export CXXFLAGS="-std=gnu++2a" + else + export CXXFLAGS="-std=gnu++20" + fi + export VSCODE_SYSROOT_PREFIX='-glibc-2.17' source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot From bc21d2c28f3c4c0275e87d29cd2e65942eb7bc30 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 10 Sep 2024 20:00:13 +0900 Subject: [PATCH 22/41] ci: possible concurrent execution --- .github/workflows/ci.yml | 1 - .github/workflows/rich-navigation.yml.off | 2 -- build/azure-pipelines/oss/product-build-pr-cache-win32.yml | 7 +++---- .../azure-pipelines/win32/product-build-win32-cli-sign.yml | 5 ++--- build/azure-pipelines/win32/product-build-win32.yml | 5 ++--- build/azure-pipelines/win32/sdl-scan-win32.yml | 5 ++--- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b080362a56bfa..dca568e048dbb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,6 @@ jobs: runs-on: windows-2022 timeout-minutes: 60 env: - CHILD_CONCURRENCY: "1" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/rich-navigation.yml.off b/.github/workflows/rich-navigation.yml.off index cc22d83030d23..b1ae3243fe6bd 100644 --- a/.github/workflows/rich-navigation.yml.off +++ b/.github/workflows/rich-navigation.yml.off @@ -28,8 +28,6 @@ jobs: - name: Install dependencies if: steps.caching-stage.outputs.cache-hit != 'true' run: npm ci - env: - CHILD_CONCURRENCY: 1 - uses: microsoft/RichCodeNavIndexer@v0.1 with: diff --git a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml index e1c8305bbb2e3..8d32652de97d6 100644 --- a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml +++ b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml @@ -49,15 +49,14 @@ steps: - powershell: | . build/azure-pipelines/win32/exec.ps1 - . build/azure-pipelines/win32/retry.ps1 $ErrorActionPreference = "Stop" - $env:npm_config_arch="$(VSCODE_ARCH)" - $env:CHILD_CONCURRENCY="1" - retry { exec { npm ci } } + exec { npm ci } env: + npm_config_arch: $(VSCODE_ARCH) ELECTRON_SKIP_BINARY_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 GITHUB_TOKEN: "$(github-distro-mixin-password)" + retryCountOnTaskFailure: 5 displayName: Install dependencies condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) diff --git a/build/azure-pipelines/win32/product-build-win32-cli-sign.yml b/build/azure-pipelines/win32/product-build-win32-cli-sign.yml index 62b1b715af2fa..9d9af45d47473 100644 --- a/build/azure-pipelines/win32/product-build-win32-cli-sign.yml +++ b/build/azure-pipelines/win32/product-build-win32-cli-sign.yml @@ -36,11 +36,10 @@ steps: - powershell: | . azure-pipelines/win32/exec.ps1 - . azure-pipelines/win32/retry.ps1 $ErrorActionPreference = "Stop" - $env:CHILD_CONCURRENCY="1" - retry { exec { npm ci } } + exec { npm ci } workingDirectory: build + retryCountOnTaskFailure: 5 displayName: Install build dependencies - template: ../cli/cli-win32-sign.yml@self diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index 449f2c44c2361..e18344ef848a6 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -120,15 +120,14 @@ steps: - powershell: | . build/azure-pipelines/win32/exec.ps1 - . build/azure-pipelines/win32/retry.ps1 $ErrorActionPreference = "Stop" - retry { exec { npm ci } } + exec { npm ci } env: npm_config_arch: $(VSCODE_ARCH) - CHILD_CONCURRENCY: 1 ELECTRON_SKIP_BINARY_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 GITHUB_TOKEN: "$(github-distro-mixin-password)" + retryCountOnTaskFailure: 5 displayName: Install dependencies condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) diff --git a/build/azure-pipelines/win32/sdl-scan-win32.yml b/build/azure-pipelines/win32/sdl-scan-win32.yml index dc8d3585668fa..85e3c27c88b7c 100644 --- a/build/azure-pipelines/win32/sdl-scan-win32.yml +++ b/build/azure-pipelines/win32/sdl-scan-win32.yml @@ -81,15 +81,14 @@ steps: - powershell: | . build/azure-pipelines/win32/exec.ps1 - . build/azure-pipelines/win32/retry.ps1 $ErrorActionPreference = "Stop" - retry { exec { npm ci } } + exec { npm ci } env: npm_config_arch: ${{ parameters.VSCODE_ARCH }} - CHILD_CONCURRENCY: 1 ELECTRON_SKIP_BINARY_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 GITHUB_TOKEN: "$(github-distro-mixin-password)" + retryCountOnTaskFailure: 5 displayName: Install dependencies - script: node build/azure-pipelines/distro/mixin-npm From 1cbbb25d9153ec75518247c41fb33e9ffaa326a1 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 10 Sep 2024 20:08:34 +0900 Subject: [PATCH 23/41] ci: use foreground scripts on windows --- .github/workflows/ci.yml | 1 + .github/workflows/rich-navigation.yml.off | 2 ++ build/azure-pipelines/oss/product-build-pr-cache-win32.yml | 1 + build/azure-pipelines/win32/product-build-win32.yml | 1 + build/azure-pipelines/win32/sdl-scan-win32.yml | 1 + 5 files changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dca568e048dbb..359027206b3d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,6 +56,7 @@ jobs: - name: Execute npm if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} env: + npm_config_foreground_scripts: "true" PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 ELECTRON_SKIP_BINARY_DOWNLOAD: 1 run: npm ci diff --git a/.github/workflows/rich-navigation.yml.off b/.github/workflows/rich-navigation.yml.off index b1ae3243fe6bd..7850fed14cfb3 100644 --- a/.github/workflows/rich-navigation.yml.off +++ b/.github/workflows/rich-navigation.yml.off @@ -28,6 +28,8 @@ jobs: - name: Install dependencies if: steps.caching-stage.outputs.cache-hit != 'true' run: npm ci + env: + npm_config_foreground_scripts: "true" - uses: microsoft/RichCodeNavIndexer@v0.1 with: diff --git a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml index 8d32652de97d6..76944f69b1480 100644 --- a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml +++ b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml @@ -53,6 +53,7 @@ steps: exec { npm ci } env: npm_config_arch: $(VSCODE_ARCH) + npm_config_foreground_scripts: "true" ELECTRON_SKIP_BINARY_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 GITHUB_TOKEN: "$(github-distro-mixin-password)" diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index e18344ef848a6..b3ba71b0fb2aa 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -124,6 +124,7 @@ steps: exec { npm ci } env: npm_config_arch: $(VSCODE_ARCH) + npm_config_foreground_scripts: "true" ELECTRON_SKIP_BINARY_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 GITHUB_TOKEN: "$(github-distro-mixin-password)" diff --git a/build/azure-pipelines/win32/sdl-scan-win32.yml b/build/azure-pipelines/win32/sdl-scan-win32.yml index 85e3c27c88b7c..85177866ce8af 100644 --- a/build/azure-pipelines/win32/sdl-scan-win32.yml +++ b/build/azure-pipelines/win32/sdl-scan-win32.yml @@ -85,6 +85,7 @@ steps: exec { npm ci } env: npm_config_arch: ${{ parameters.VSCODE_ARCH }} + npm_config_foreground_scripts: "true" ELECTRON_SKIP_BINARY_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 GITHUB_TOKEN: "$(github-distro-mixin-password)" From 463a85f810bf07c6817123fc2582efcc2d4d1b78 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 18 Sep 2024 00:59:36 +0900 Subject: [PATCH 24/41] chore: bump electron@32.0.2 --- .npmrc | 4 +- build/checksums/electron.txt | 150 +++++++++++++++++------------------ cgmanifest.json | 8 +- package-lock.json | 8 +- package.json | 2 +- 5 files changed, 86 insertions(+), 86 deletions(-) diff --git a/.npmrc b/.npmrc index d90e0d8a7751a..52083f515ced3 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="32.0.1" -ms_build_id="10165920" +target="32.0.2" +ms_build_id="10207170" runtime="electron" build_from_source="true" legacy-peer-deps="true" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index d8a9fcd1409c4..57b5b50b9ab5c 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -f65f368fd4b87e7393c19c6d371b324e4f9dd813ae9236fb5daf8cfdc6d524c8 *chromedriver-v32.0.1-darwin-arm64.zip -6421a0a70b95ec3f29b23ba7922bd01eb20994ec85112b1419ba12dff4d43631 *chromedriver-v32.0.1-darwin-x64.zip -79d8a68e363357d578322290dc3d1544b429f6b86dce8f7b26fa8e6b2ede15a9 *chromedriver-v32.0.1-linux-arm64.zip -6de4a0d2141ef592fab3f98e30856ce2fc12adaff3debbf2f8c5f9c9778f7422 *chromedriver-v32.0.1-linux-armv7l.zip -be87aaeb50372c6bc4686e3b0b5d263025501a59ad940497da1ef9d4af3db30b *chromedriver-v32.0.1-linux-x64.zip -1724b8f7ebcd8f51684213f487d2d4aff4624f9cb99c226105c1a3c2c85c77ba *chromedriver-v32.0.1-mas-arm64.zip -2fe7dc34d75406fecdf8fc11a9baa31f147c1b5f2c7615c22fa2362541d173b9 *chromedriver-v32.0.1-mas-x64.zip -5592f8b94e386e6df43294015c0254c63a9911fd1133a4dc7b0137cf04763671 *chromedriver-v32.0.1-win32-arm64.zip -4b670fd6cddbea252b7d7d3a93571dec84226912055a8a2a3a8d17dd350f8945 *chromedriver-v32.0.1-win32-ia32.zip -5072f93376fc6b66a0e0f84d7cd40f5761bbbd669c6e37441764315ce3980c90 *chromedriver-v32.0.1-win32-x64.zip -817eb3a244e24b0794bdb6b2314a3994189d2e360a871e755c7242eadcceaf27 *electron-api.json -661e00cb1a27bba9b9e3f84be04a8a3ac5cf754187d2485f00b13ce0e8c8f2c1 *electron-v32.0.1-darwin-arm64-dsym-snapshot.zip -16e835537847ce01c2dae66a2795232ef16d109dd63a0eb87ad94f828f851ce6 *electron-v32.0.1-darwin-arm64-dsym.zip -c06bdaf7f4474767cc928a965e907df0e65028ec327aea2c9d5f87b9a3c32f55 *electron-v32.0.1-darwin-arm64-symbols.zip -8db368fd7353333b53092ccfdcd440b7bae1195e7950e1fb42b7606bd684802b *electron-v32.0.1-darwin-arm64.zip -7062a0fefa6abfb329339aa3636afb2310f0a730679571ef5112b6ec550ab6bc *electron-v32.0.1-darwin-x64-dsym-snapshot.zip -923b6ef18b5256c87ce9d6343167d4acdae0459cabc9daa37fdfb96e195d6e56 *electron-v32.0.1-darwin-x64-dsym.zip -df40b0b42831972c7e4bf975e65e132e5a0efdc00e89a0aded0884251a050ea6 *electron-v32.0.1-darwin-x64-symbols.zip -295f659e58a352043b91a3ea1251edc2f33692e00eb7b1f1b1d47e7b0b9bd02c *electron-v32.0.1-darwin-x64.zip -d95ea07cca74d4c6d2dcba682765263124d7100d41d60e247268c8d3072991cf *electron-v32.0.1-linux-arm64-debug.zip -7f0995ed399f8c74c952e9d6a3d7a6bd5bd7a485b7d08767a4527a74e5d61675 *electron-v32.0.1-linux-arm64-symbols.zip -a4f2e36b22a8aebd385a21012cfdb480de781240aafe5ddc4248565a10579242 *electron-v32.0.1-linux-arm64.zip -d95ea07cca74d4c6d2dcba682765263124d7100d41d60e247268c8d3072991cf *electron-v32.0.1-linux-armv7l-debug.zip -fb21700ec429b87a2999f5da3f6a805f2ed88ad94a7d7689e149a2e00813f2e8 *electron-v32.0.1-linux-armv7l-symbols.zip -fb28562242c38dac9ec2c7d3bc24993482174662d78820d2bffeb1cf8e72b7a7 *electron-v32.0.1-linux-armv7l.zip -3946bc6ee08bc0aeef87cc156ec5d454c2018d1cd85a9fefaddf7e5c4c995124 *electron-v32.0.1-linux-x64-debug.zip -d76ba18860e7ea618c7a691090bf611c9d29f67e79c0bdd22f9f9f238944b7d7 *electron-v32.0.1-linux-x64-symbols.zip -97d91b496a5eb6faf617d754fe6d6cdae29bf5684463c2b1b3a8c9b106977b85 *electron-v32.0.1-linux-x64.zip -bd5aa83d17fe4db2618d9adbae5e1d4afd9078b986ac8cce88dd00699a9c54b3 *electron-v32.0.1-mas-arm64-dsym-snapshot.zip -f118d42739cad33872aa670058fc49d6c106f5040449c4caee1cc17a666f3a93 *electron-v32.0.1-mas-arm64-dsym.zip -35f1b5b23feb21c8f75b97cb396897c79d710190f9af42dfe0be018cb1cbe960 *electron-v32.0.1-mas-arm64-symbols.zip -994a5c12ce2a4bb35a14b8be368c38f113a8cf1fe306efffd7ff52701a9fec5b *electron-v32.0.1-mas-arm64.zip -c75f27b7e558e6f8074f1ab0e1f7e3f52ea22cf3e78e5ea5759c2e24d005dbd5 *electron-v32.0.1-mas-x64-dsym-snapshot.zip -9cab61b9586c6456f0c632e517c31c5c71f76719aaa8854c77c02dbd6dfb7bc7 *electron-v32.0.1-mas-x64-dsym.zip -c9bed90f7766e48d3e8f2c4dc8dc5b08c3266ebfe31df4141f191fcd285bfb20 *electron-v32.0.1-mas-x64-symbols.zip -15a2b71e2477fb96caa580b42ae900cff1a74f538d68135ac66e68f1580a89a0 *electron-v32.0.1-mas-x64.zip -cf50ba6ee929dd8ca3e567f338d5cc437745ef69fcca20ac051b3a4aa1fa26f0 *electron-v32.0.1-win32-arm64-pdb.zip -013db571b332e23894d236ef70b17f194cdae9f0165e0be006b2b262d806f092 *electron-v32.0.1-win32-arm64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.1-win32-arm64-toolchain-profile.zip -a2d7ea265f7840ebda67b08906147055d16ab1ae581958c049f55ae35188ea38 *electron-v32.0.1-win32-arm64.zip -316e2f11dc494f1d0306b9294146c47ac0f206f2d39eb520cbb9b5b1402f82be *electron-v32.0.1-win32-ia32-pdb.zip -32002b7e23ef3d36cec1855800ee74c4a6bca46a44c3490116a313c835ca81b1 *electron-v32.0.1-win32-ia32-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.1-win32-ia32-toolchain-profile.zip -bb204179ed41c2f39fd0fe4accd6350e53c810c11e82c360813ce5260d7fac8c *electron-v32.0.1-win32-ia32.zip -89a2c2c057d4a073164e5b0047f6a8c4ebc679f21a9ac6f9b03e4d22739b7e7a *electron-v32.0.1-win32-x64-pdb.zip -26e7fcf5244e7bdd6d0992534d23ce37ad54bc19e5ce037486af3a5cfcbf3f65 *electron-v32.0.1-win32-x64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.1-win32-x64-toolchain-profile.zip -9153c1d72658472db6b34f094c190178099ebdfb02d6c82caf42010820580a52 *electron-v32.0.1-win32-x64.zip -b31efbf25b27bea7d85dbddcf50166efce223e209d6f842a761d27018bdffb92 *electron.d.ts -da9aae5322bd4f1aae5d5feefc4756c05aa8deda6f82a80b88701e1bdafb6a57 *ffmpeg-v32.0.1-darwin-arm64.zip -f0e6e4b5bcb2aa2a3aa801636a0536ebad8cef322bbf3147cce9118c567e85b6 *ffmpeg-v32.0.1-darwin-x64.zip -9b7c1a7618a50b77220cfbf8db3dfe558c896e6c3984e96b8b6cd19955d8e7d8 *ffmpeg-v32.0.1-linux-arm64.zip -f4283c971ccb6251123841413ba501bfc65bd7b908f9cb3487f3634be6471b27 *ffmpeg-v32.0.1-linux-armv7l.zip -4865234142e0b07e72f1fc68aeb4b3614937d8cc83029316e8f3960b8d71790f *ffmpeg-v32.0.1-linux-x64.zip -da9aae5322bd4f1aae5d5feefc4756c05aa8deda6f82a80b88701e1bdafb6a57 *ffmpeg-v32.0.1-mas-arm64.zip -f0e6e4b5bcb2aa2a3aa801636a0536ebad8cef322bbf3147cce9118c567e85b6 *ffmpeg-v32.0.1-mas-x64.zip -c0adc5a146d7d766a83c8b0b4b88e7106728391ad3ad1c852d4d15ec91c4ee47 *ffmpeg-v32.0.1-win32-arm64.zip -5dbe24c9e11ce61274badbe12a27e9913c8fb010c7f6d60d77d7ef6fc8d8cb96 *ffmpeg-v32.0.1-win32-ia32.zip -96d55a91ecac39b9034fa115472a98424ae07eea620b822717156f6673b6f0fd *ffmpeg-v32.0.1-win32-x64.zip -4ddd9ac99a5c0ec327329cd866e568a6a0d87574c8869583f4f63d6358dceb50 *hunspell_dictionaries.zip -ee73614839b16dd759bdbe6051889d041f893e3b29ecbc95cee3b773370a8745 *libcxx-objects-v32.0.1-linux-arm64.zip -55fd68d83766220a17068de9c028877fdd32a354493e3147a9543885539d499c *libcxx-objects-v32.0.1-linux-armv7l.zip -d1d5c5bf950ecdf0030a9dbe92feea51239e14023a7efa1eb36ae88dce69e6f3 *libcxx-objects-v32.0.1-linux-x64.zip -45f263e7401e8b036fed9675720a012d925cfd12a0023217fb34edd3073921ca *libcxx_headers.zip -730ccf546c71408ac92f66b143e30cf7987aee1db1ad5a36a204217dd44ae7de *libcxxabi_headers.zip -03f31b525f92a0c6865960fa51820d8b8e71586d1a5137abac231f4ce528e9f3 *mksnapshot-v32.0.1-darwin-arm64.zip -46dc4ccc6d43192d45cabde46fcb02de9b5edcdbaf3ec4694f5d01e6d1b6d54c *mksnapshot-v32.0.1-darwin-x64.zip -d06d50a4e03f7aad7935c69ea6d3679f542d5722534b6645ff5af232389aadc0 *mksnapshot-v32.0.1-linux-arm64-x64.zip -af5496c28707be16c3d6e1295ae44397d6420e3644016c7ef5469e96be2c0d4a *mksnapshot-v32.0.1-linux-armv7l-x64.zip -2eda6c0cb5dfe11ee778dc0e2038491b1066326b0aac9fc25f9d07e31a82832f *mksnapshot-v32.0.1-linux-x64.zip -42ead07fa0a3b264de03c2a34eae9b588f3e3895939c7c954f05239d8f72fddc *mksnapshot-v32.0.1-mas-arm64.zip -c6e6fb2c5d0ff06b36eeb7e5401932da507ee934d429d1487148e8e2c55fff1d *mksnapshot-v32.0.1-mas-x64.zip -f0464f335d64190494446dd8463a6383eddc3aa279d47caee914ddd6957af0f4 *mksnapshot-v32.0.1-win32-arm64-x64.zip -e677f10a7bce61bac05575bdfe387e7501e88c2d342120674f12d7945315fa11 *mksnapshot-v32.0.1-win32-ia32.zip -58a344560c8614912efd426bc7369ab0f9f50e69f3f665b5a0c548028ad95d47 *mksnapshot-v32.0.1-win32-x64.zip +54e85701fa636f43fcce588efc229be4fbc2543e35990897741737acfe43c145 *chromedriver-v32.0.2-darwin-arm64.zip +794aca44fbe876a06eb1f1b8ad8b4b4819328ccab9bacfbdf160fa64e9ab511b *chromedriver-v32.0.2-darwin-x64.zip +4bda2bc69ae924dfe741360f77920ca1cdff8fde77eb9a736429eb3013e5c6a6 *chromedriver-v32.0.2-linux-arm64.zip +b6937c74a5f89f266220ed40da461034ad6e833a06475da3da6cdab08855a865 *chromedriver-v32.0.2-linux-armv7l.zip +448f7d4c7764c88a1bcd9b25418154e2fc3899025fc2684830c2fc383c7a7234 *chromedriver-v32.0.2-linux-x64.zip +c514398c28c9b0f7dce23ce7f523bda9cca24c8d0cb28ba3d8f6572a0cd2d50b *chromedriver-v32.0.2-mas-arm64.zip +16597cd80c617ee374d7c3671b319e5341e02237c15d8f3dfa8a19ad277a2be3 *chromedriver-v32.0.2-mas-x64.zip +e5e33423a366cfafafe98de017d8bec11f36e7da7e474c4d5534c1a843a69a29 *chromedriver-v32.0.2-win32-arm64.zip +82060becde147a010d59facc6342362eeaaceb2397fed407e79af00714f54c77 *chromedriver-v32.0.2-win32-ia32.zip +30924f0cf1be605de535dee56349ef01f7e56e7760709b7011760e436e1a9fed *chromedriver-v32.0.2-win32-x64.zip +4ea63613cd16d8317a8786e84af116c3c3d9f1125ea9fbf9abb1ce97a3d40859 *electron-api.json +fafda0b385bb1b3d53d89a3b4e536af43a29e400b1bceff608c4a04b5ba31b73 *electron-v32.0.2-darwin-arm64-dsym-snapshot.zip +5b8c970d50077d72915f162d85cb9af00d6479cb65f9eaa6d40f0f7ac650f408 *electron-v32.0.2-darwin-arm64-dsym.zip +ef8ac97a6bc5ae407768a6958b9b548059e19e7df3ab1f8aa1008f00b83f1d02 *electron-v32.0.2-darwin-arm64-symbols.zip +de8b3c3e5278d45aa8fea9e9c261ce5c6daa3d0f569376014896fd03ba844b5f *electron-v32.0.2-darwin-arm64.zip +a2d4aab76d60ae5a750246a5a5cbfeceb5ceadae46ff2756a5b3f76a98fdc359 *electron-v32.0.2-darwin-x64-dsym-snapshot.zip +59595a3be688b8fe67dbf7fd8293e1abe36feab97adc34c2e23f81e077d564d6 *electron-v32.0.2-darwin-x64-dsym.zip +a9afaa20486fec6b9ab80d6df45d2b41e71016609aa6b01725fd4464befdd8c9 *electron-v32.0.2-darwin-x64-symbols.zip +a9a8b30a1847236dca495041644cea27a08823bf6a5d314bd21a8fbe92b91d67 *electron-v32.0.2-darwin-x64.zip +fedb2dc6068cedd17f2c4d4a736496ad86b6093208579c35e6c0191e4e860704 *electron-v32.0.2-linux-arm64-debug.zip +c3db22d2b30340c346da5f1426fa4bc52a7789000244a36c42fea1fb2f3ff418 *electron-v32.0.2-linux-arm64-symbols.zip +40aef35b2f31f2f0f21e39d46ea4d924dc9523043051c2e59fe590d89c211e8f *electron-v32.0.2-linux-arm64.zip +fedb2dc6068cedd17f2c4d4a736496ad86b6093208579c35e6c0191e4e860704 *electron-v32.0.2-linux-armv7l-debug.zip +24df468520904b6cd11928e76c2d0ee45a88fd3fd31e16c4edb209d72302c50b *electron-v32.0.2-linux-armv7l-symbols.zip +508de41622a31dc210d99afc4ec97305b51a8333c505e824422e6426314549b0 *electron-v32.0.2-linux-armv7l.zip +f2116966bebd9e74b1c5cb2faec11a881bc5286e36222180eb63a7528f364d2a *electron-v32.0.2-linux-x64-debug.zip +8e471d909a45cff1fe81ab5b62d5b0dd152e8794e2d1c3e13298f2551845d399 *electron-v32.0.2-linux-x64-symbols.zip +ac6171342dfc7fba4af12d2c379fd408904a6d91b66a41f1cf06a78fc0420b40 *electron-v32.0.2-linux-x64.zip +60e931dba33b99fe3c42806a530ebf5b024d48ce78378b528f0d186de4445484 *electron-v32.0.2-mas-arm64-dsym-snapshot.zip +15eb44c5e3e9ecfc7106f30925cd95f464c99e523bfbcf7c72c2cb7fa8f37221 *electron-v32.0.2-mas-arm64-dsym.zip +2406caa1bceb7d5c101ff5a62b9218a7a4c49a60cdbd7a2d13e9c9053d5cfb91 *electron-v32.0.2-mas-arm64-symbols.zip +7b170714ebfec9081dcbf80bf4b3e8d6e3bd95bf7c040c168d62bbbf66eea74d *electron-v32.0.2-mas-arm64.zip +e10481ffc01031efd8dab2e8a138516003a1b2b02469dfdfabb4028a6cc05a2d *electron-v32.0.2-mas-x64-dsym-snapshot.zip +fa48ccc081b252cd54eb8b041cdff5e9637a739bee87aee5678b2db38fb2f71d *electron-v32.0.2-mas-x64-dsym.zip +8b944f583257d088539c3753de85be7225c3e9e664d665f9ccffbf6a61b27948 *electron-v32.0.2-mas-x64-symbols.zip +6bd6ad41fec8caf31f50f5b3710957939c31237169344f0e1cc00097cc099ef1 *electron-v32.0.2-mas-x64.zip +00163cee45c03a253aec65b461489eb6bff3cbdba92c70fb334ecd423bb2a91d *electron-v32.0.2-win32-arm64-pdb.zip +77b3be8a9c831da961c33a47831a1370e358e6f996da50d044cc364dd237c941 *electron-v32.0.2-win32-arm64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.2-win32-arm64-toolchain-profile.zip +c02294789c3461fd1630c30f3cd738c33e204449418422caefd58f61373535a5 *electron-v32.0.2-win32-arm64.zip +dbc64585cebd2ef8a8edfbefcf569ba0d68ac87dab2b404b9306c5372965f33b *electron-v32.0.2-win32-ia32-pdb.zip +dde071cc12ab56459803124b59f28265ace68b2552a889ab76f10917a523a99d *electron-v32.0.2-win32-ia32-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.2-win32-ia32-toolchain-profile.zip +db51395aa835773b21390c3cd12d14c632f990b909621f01139234eb87a4c394 *electron-v32.0.2-win32-ia32.zip +f16a1128c03864ee979e9b6543af9fc4cc7c862854b40144082985c3e2bc6147 *electron-v32.0.2-win32-x64-pdb.zip +a0c39b29bb89216adf4d2613a2615b66865ee943108c4bd1226dc56a0432817e *electron-v32.0.2-win32-x64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.2-win32-x64-toolchain-profile.zip +16edf270a25c60f97e1efa86680ca53d5724d1a24ead250b0d40c0ce0119ce42 *electron-v32.0.2-win32-x64.zip +8eb281d02207d7ba9e9e71c2473ec1e11bfc183d2517aa157c340bbdb9b924af *electron.d.ts +db7b2808ebbf72d6d1622395e4957507b1c64a7938e81c365ee84d4eece7ab20 *ffmpeg-v32.0.2-darwin-arm64.zip +ac646dd0e4b9ec1b7b149d9d326dadf283714f640c90f64185c00714cd83a35e *ffmpeg-v32.0.2-darwin-x64.zip +862dd36d6fbb2ed971130c1ae1be334a3617576d4c5e56b525d5dc182ff9b173 *ffmpeg-v32.0.2-linux-arm64.zip +e1b00b48cc23e7ae366070392e25280f17cc8dfe5df5c47e8132a5d642c75fc3 *ffmpeg-v32.0.2-linux-armv7l.zip +7449dd3b9b61e843c6a9596f3e183a3c6c97f071c94da0850c1f196ada36cc94 *ffmpeg-v32.0.2-linux-x64.zip +db7b2808ebbf72d6d1622395e4957507b1c64a7938e81c365ee84d4eece7ab20 *ffmpeg-v32.0.2-mas-arm64.zip +ac646dd0e4b9ec1b7b149d9d326dadf283714f640c90f64185c00714cd83a35e *ffmpeg-v32.0.2-mas-x64.zip +4e4f2069333a79fddf611057028802a57ccd3cc248766dc5ffeca223f3d0bafa *ffmpeg-v32.0.2-win32-arm64.zip +46ee4e6dff6cdb4e65563e2accc023b776cb8b835c10884c780a2b74d8082c53 *ffmpeg-v32.0.2-win32-ia32.zip +e06344255184a7e406ed6d0b409da4c8ceea8457ad8e080a62e13788e6b3a97a *ffmpeg-v32.0.2-win32-x64.zip +3fadab9c42a4e4e27e0a3e5c8c5a48991afcf3aefb22002efc1d5d20b59702c5 *hunspell_dictionaries.zip +074d401d79b2faea6da2d50e6584e4b2995dc8837f9b7cd427c34fa63972a035 *libcxx-objects-v32.0.2-linux-arm64.zip +98742ae9006bc09e5ca7555b084d767195c6101cbb064393443e62b740655044 *libcxx-objects-v32.0.2-linux-armv7l.zip +36830b2d45f59a0ebce9d4bfb3e044cd1390791607995ed780590a5488a7b17f *libcxx-objects-v32.0.2-linux-x64.zip +82004d820be567fcac839deeabc975fd4a7fd30335369cef196539d656802d4a *libcxx_headers.zip +fd77f3df0c4870ee1bfa6abf8a984c8eff6cc52d9b4f720e038375a222962462 *libcxxabi_headers.zip +9307a3c7d29d7832a3bfd6d48fb235a39547692f3b6f853299b27d424db56f37 *mksnapshot-v32.0.2-darwin-arm64.zip +a94c08970f8dcd49b105847a7671feff9ae625309f7b66151f0f586322770043 *mksnapshot-v32.0.2-darwin-x64.zip +4b634cbe8a71837d081e7108e2d84ad2f523fe13d5a6667d361d03854f8a5072 *mksnapshot-v32.0.2-linux-arm64-x64.zip +4e0f49b7a1d91115bb70ba31edf1bc899fd3c961cb16fc90d01e1c261d476278 *mksnapshot-v32.0.2-linux-armv7l-x64.zip +6765974706698f2337d7fd23a0d2557ee461ebe607b6dc72403003d0f60a041d *mksnapshot-v32.0.2-linux-x64.zip +b071c40c148cb04581f834e84d76de5bba9003e232d25895a5273cfd2b913a13 *mksnapshot-v32.0.2-mas-arm64.zip +c307aded33ecf908f65733dc1fd30e63cfd27e2a842e7f6b6fdb159352afbab5 *mksnapshot-v32.0.2-mas-x64.zip +30c496f8de3a83af06c07d09b6fbec79dc805db2921eb2ff17a7285291480679 *mksnapshot-v32.0.2-win32-arm64-x64.zip +88fe727d7fcba7b8044427bf1bff2de0fec7179ae614089ae0cf5722e2faf4e6 *mksnapshot-v32.0.2-win32-ia32.zip +93686fa9fd90d2b0f66828895312251b3fc97c349a66058673c32641642dbaac *mksnapshot-v32.0.2-win32-x64.zip diff --git a/cgmanifest.json b/cgmanifest.json index cfe4f19898906..c3500db75c43e 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "616908133c9ceafb992a9d3f29b547160fe3ce16" + "commitHash": "606aa55c7d687518d34b55accc5a71ea0bd28727" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "128.0.6613.36" + "version": "128.0.6613.84" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "a577d569ecddb3e4d374072f7bed62725d21c6ef" + "commitHash": "61fbd29bc509e93a2f4b14435ec6ae58ef6c166c" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "32.0.1" + "version": "32.0.2" }, { "component": { diff --git a/package-lock.json b/package-lock.json index d4592348d981d..5ca13d3e8a40c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "32.0.1", + "electron": "32.0.2", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", @@ -6136,9 +6136,9 @@ "dev": true }, "node_modules/electron": { - "version": "32.0.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-32.0.1.tgz", - "integrity": "sha512-5Hd5Jaf9niYVR2hZxoRd3gOrcxPOxQV1XPV5WaoSfT9jLJHFadhlKtuSDIk3U6rQZke+aC7GqPPAv55nWFCMsA==", + "version": "32.0.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-32.0.2.tgz", + "integrity": "sha512-nmZblq8wW3HZ17MAyaUuiMI9Mb0Cgc7UR3To85h/rVopbfyF5s34NxtK4gvyRfYPxpDGP4k+HoQIPniPPrdE3w==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index c0a1c2a7acb22..cc6a99c647000 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "32.0.1", + "electron": "32.0.2", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", From 121b095706b078ec34878740a9e5e29f1b9bd3d3 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 18 Sep 2024 12:22:43 +0900 Subject: [PATCH 25/41] fix: compilation Refs https://github.com/electron/electron/commit/204011c3f2bfad1b6b2c9544932bf60b162be05f --- src/vs/platform/menubar/electron-main/menubar.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/platform/menubar/electron-main/menubar.ts b/src/vs/platform/menubar/electron-main/menubar.ts index 3ff82f2299158..f03e8832a52e8 100644 --- a/src/vs/platform/menubar/electron-main/menubar.ts +++ b/src/vs/platform/menubar/electron-main/menubar.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { app, BrowserWindow, KeyboardEvent, Menu, MenuItem, MenuItemConstructorOptions, WebContents } from 'electron'; +import { app, BrowserWindow, BaseWindow, KeyboardEvent, Menu, MenuItem, MenuItemConstructorOptions, WebContents } from 'electron'; import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../base/common/actions.js'; import { RunOnceScheduler } from '../../../base/common/async.js'; import { CancellationToken } from '../../../base/common/cancellation.js'; @@ -63,7 +63,7 @@ export class Menubar extends Disposable { private keybindings: { [commandId: string]: IMenubarKeybinding }; - private readonly fallbackMenuHandlers: { [id: string]: (menuItem: MenuItem, browserWindow: BrowserWindow | undefined, event: KeyboardEvent) => void } = Object.create(null); + private readonly fallbackMenuHandlers: { [id: string]: (menuItem: MenuItem, browserWindow: BaseWindow | undefined, event: KeyboardEvent) => void } = Object.create(null); constructor( @IUpdateService private readonly updateService: IUpdateService, @@ -744,8 +744,8 @@ export class Menubar extends Disposable { return new MenuItem(this.withKeybinding(commandId, options)); } - private makeContextAwareClickHandler(click: (menuItem: MenuItem, win: BrowserWindow, event: KeyboardEvent) => void, contextSpecificHandlers: IMenuItemClickHandler): (menuItem: MenuItem, win: BrowserWindow | undefined, event: KeyboardEvent) => void { - return (menuItem: MenuItem, win: BrowserWindow | undefined, event: KeyboardEvent) => { + private makeContextAwareClickHandler(click: (menuItem: MenuItem, win: BaseWindow, event: KeyboardEvent) => void, contextSpecificHandlers: IMenuItemClickHandler): (menuItem: MenuItem, win: BaseWindow | undefined, event: KeyboardEvent) => void { + return (menuItem: MenuItem, win: BaseWindow | undefined, event: KeyboardEvent) => { // No Active Window const activeWindow = BrowserWindow.getFocusedWindow(); From a0f537ac3d345775eacb342e200ead416f018b39 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 18 Sep 2024 12:36:24 +0900 Subject: [PATCH 26/41] Revert "wco - hardcode devtools location on Linux (#227084)" This reverts commit dfb96d11d39aa732fcb2883cd02aae7e35ccff30. --- .../parts/sandbox/common/electronTypes.ts | 18 ++++++++++++++ src/vs/platform/native/common/native.ts | 4 ++-- .../electron-main/nativeHostMainService.ts | 24 ++++--------------- .../electron-sandbox/workbenchTestServices.ts | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/vs/base/parts/sandbox/common/electronTypes.ts b/src/vs/base/parts/sandbox/common/electronTypes.ts index ef8c1026be25b..43fa75079d4cf 100644 --- a/src/vs/base/parts/sandbox/common/electronTypes.ts +++ b/src/vs/base/parts/sandbox/common/electronTypes.ts @@ -217,6 +217,24 @@ export interface FileFilter { name: string; } +export interface OpenDevToolsOptions { + /** + * Opens the devtools with specified dock state, can be `left`, `right`, `bottom`, + * `undocked`, `detach`. Defaults to last used dock state. In `undocked` mode it's + * possible to dock back. In `detach` mode it's not. + */ + mode: ('left' | 'right' | 'bottom' | 'undocked' | 'detach'); + /** + * Whether to bring the opened devtools window to the foreground. The default is + * `true`. + */ + activate?: boolean; + /** + * A title for the DevTools window (only in `undocked` or `detach` mode). + */ + title?: string; +} + interface InputEvent { // Docs: https://electronjs.org/docs/api/structures/input-event diff --git a/src/vs/platform/native/common/native.ts b/src/vs/platform/native/common/native.ts index f2c1930b017a8..b62a24bc148f1 100644 --- a/src/vs/platform/native/common/native.ts +++ b/src/vs/platform/native/common/native.ts @@ -6,7 +6,7 @@ import { VSBuffer } from '../../../base/common/buffer.js'; import { Event } from '../../../base/common/event.js'; import { URI } from '../../../base/common/uri.js'; -import { MessageBoxOptions, MessageBoxReturnValue, OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from '../../../base/parts/sandbox/common/electronTypes.js'; +import { MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from '../../../base/parts/sandbox/common/electronTypes.js'; import { ISerializableCommandAction } from '../../action/common/action.js'; import { INativeOpenDialogOptions } from '../../dialogs/common/dialogs.js'; import { createDecorator } from '../../instantiation/common/instantiation.js'; @@ -179,7 +179,7 @@ export interface ICommonNativeHostService { exit(code: number): Promise; // Development - openDevTools(options?: INativeHostOptions): Promise; + openDevTools(options?: Partial & INativeHostOptions): Promise; toggleDevTools(options?: INativeHostOptions): Promise; // Perf Introspection diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts index 6f57b9a7b44ac..26b5175291c31 100644 --- a/src/vs/platform/native/electron-main/nativeHostMainService.ts +++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts @@ -5,7 +5,7 @@ import * as fs from 'fs'; import { exec } from 'child_process'; -import { app, BrowserWindow, clipboard, Display, Menu, MessageBoxOptions, MessageBoxReturnValue, OpenDialogOptions, OpenDialogReturnValue, powerMonitor, SaveDialogOptions, SaveDialogReturnValue, screen, shell, webContents } from 'electron'; +import { app, BrowserWindow, clipboard, Display, Menu, MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, OpenDialogOptions, OpenDialogReturnValue, powerMonitor, SaveDialogOptions, SaveDialogReturnValue, screen, shell, webContents } from 'electron'; import { arch, cpus, freemem, loadavg, platform, release, totalmem, type } from 'os'; import { promisify } from 'util'; import { memoize } from '../../../base/common/decorators.js'; @@ -33,7 +33,7 @@ import { IProductService } from '../../product/common/productService.js'; import { IPartsSplash } from '../../theme/common/themeService.js'; import { IThemeMainService } from '../../theme/electron-main/themeMainService.js'; import { ICodeWindow } from '../../window/electron-main/window.js'; -import { IColorScheme, IOpenedAuxiliaryWindow, IOpenedMainWindow, IOpenEmptyWindowOptions, IOpenWindowOptions, IPoint, IRectangle, IWindowOpenable, useWindowControlsOverlay } from '../../window/common/window.js'; +import { IColorScheme, IOpenedAuxiliaryWindow, IOpenedMainWindow, IOpenEmptyWindowOptions, IOpenWindowOptions, IPoint, IRectangle, IWindowOpenable } from '../../window/common/window.js'; import { IWindowsMainService, OpenContext } from '../../windows/electron-main/windows.js'; import { isWorkspaceIdentifier, toWorkspaceIdentifier } from '../../workspace/common/workspace.js'; import { IWorkspacesManagementMainService } from '../../workspaces/electron-main/workspacesManagementMainService.js'; @@ -859,28 +859,14 @@ export class NativeHostMainService extends Disposable implements INativeHostMain //#region Development - async openDevTools(windowId: number | undefined, options?: INativeHostOptions): Promise { + async openDevTools(windowId: number | undefined, options?: Partial & INativeHostOptions): Promise { const window = this.windowById(options?.targetWindowId, windowId); - - let mode: 'bottom' | undefined = undefined; - if (isLinux && useWindowControlsOverlay(this.configurationService)) { - mode = 'bottom'; // TODO@bpasero WCO and devtools collide with default option 'right' - } - window?.win?.webContents.openDevTools(mode ? { mode } : undefined); + window?.win?.webContents.openDevTools(options?.mode ? { mode: options.mode, activate: options.activate } : undefined); } async toggleDevTools(windowId: number | undefined, options?: INativeHostOptions): Promise { const window = this.windowById(options?.targetWindowId, windowId); - const webContents = window?.win?.webContents; - if (!webContents) { - return; - } - - if (isLinux && useWindowControlsOverlay(this.configurationService) && !webContents.isDevToolsOpened()) { - webContents.openDevTools({ mode: 'bottom' }); // TODO@bpasero WCO and devtools collide with default option 'right' - } else { - webContents.toggleDevTools(); - } + window?.win?.webContents.toggleDevTools(); } //#endregion diff --git a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts index 3ae1a6afeabf7..8eb37abc43b28 100644 --- a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts +++ b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts @@ -143,7 +143,7 @@ export class TestNativeHostService implements INativeHostService { async closeWindow(): Promise { } async quit(): Promise { } async exit(code: number): Promise { } - async openDevTools(): Promise { } + async openDevTools(options?: Partial & INativeHostOptions | undefined): Promise { } async toggleDevTools(): Promise { } async resolveProxy(url: string): Promise { return undefined; } async lookupAuthorization(authInfo: AuthInfo): Promise { return undefined; } From 37b05bdb1b4b0d353484a1adfe5dfcce581cc803 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 25 Sep 2024 11:57:13 +0900 Subject: [PATCH 27/41] chore: bump electron@32.1.2 --- .npmrc | 2 +- .nvmrc | 2 +- build/checksums/electron.txt | 150 +++++++++--------- build/linux/dependencies-generator.js | 2 +- build/linux/dependencies-generator.ts | 2 +- cgmanifest.json | 12 +- package-lock.json | 8 +- package.json | 2 +- .../electron-main/utilityProcess.ts | 3 +- 9 files changed, 91 insertions(+), 92 deletions(-) diff --git a/.npmrc b/.npmrc index 52083f515ced3..f0f3c5bb2704c 100644 --- a/.npmrc +++ b/.npmrc @@ -1,5 +1,5 @@ disturl="https://electronjs.org/headers" -target="32.0.2" +target="32.1.2" ms_build_id="10207170" runtime="electron" build_from_source="true" diff --git a/.nvmrc b/.nvmrc index 8ce7030825b5e..3516580bbbc04 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.16.0 +20.17.0 diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 57b5b50b9ab5c..1653fbaa134fa 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -54e85701fa636f43fcce588efc229be4fbc2543e35990897741737acfe43c145 *chromedriver-v32.0.2-darwin-arm64.zip -794aca44fbe876a06eb1f1b8ad8b4b4819328ccab9bacfbdf160fa64e9ab511b *chromedriver-v32.0.2-darwin-x64.zip -4bda2bc69ae924dfe741360f77920ca1cdff8fde77eb9a736429eb3013e5c6a6 *chromedriver-v32.0.2-linux-arm64.zip -b6937c74a5f89f266220ed40da461034ad6e833a06475da3da6cdab08855a865 *chromedriver-v32.0.2-linux-armv7l.zip -448f7d4c7764c88a1bcd9b25418154e2fc3899025fc2684830c2fc383c7a7234 *chromedriver-v32.0.2-linux-x64.zip -c514398c28c9b0f7dce23ce7f523bda9cca24c8d0cb28ba3d8f6572a0cd2d50b *chromedriver-v32.0.2-mas-arm64.zip -16597cd80c617ee374d7c3671b319e5341e02237c15d8f3dfa8a19ad277a2be3 *chromedriver-v32.0.2-mas-x64.zip -e5e33423a366cfafafe98de017d8bec11f36e7da7e474c4d5534c1a843a69a29 *chromedriver-v32.0.2-win32-arm64.zip -82060becde147a010d59facc6342362eeaaceb2397fed407e79af00714f54c77 *chromedriver-v32.0.2-win32-ia32.zip -30924f0cf1be605de535dee56349ef01f7e56e7760709b7011760e436e1a9fed *chromedriver-v32.0.2-win32-x64.zip -4ea63613cd16d8317a8786e84af116c3c3d9f1125ea9fbf9abb1ce97a3d40859 *electron-api.json -fafda0b385bb1b3d53d89a3b4e536af43a29e400b1bceff608c4a04b5ba31b73 *electron-v32.0.2-darwin-arm64-dsym-snapshot.zip -5b8c970d50077d72915f162d85cb9af00d6479cb65f9eaa6d40f0f7ac650f408 *electron-v32.0.2-darwin-arm64-dsym.zip -ef8ac97a6bc5ae407768a6958b9b548059e19e7df3ab1f8aa1008f00b83f1d02 *electron-v32.0.2-darwin-arm64-symbols.zip -de8b3c3e5278d45aa8fea9e9c261ce5c6daa3d0f569376014896fd03ba844b5f *electron-v32.0.2-darwin-arm64.zip -a2d4aab76d60ae5a750246a5a5cbfeceb5ceadae46ff2756a5b3f76a98fdc359 *electron-v32.0.2-darwin-x64-dsym-snapshot.zip -59595a3be688b8fe67dbf7fd8293e1abe36feab97adc34c2e23f81e077d564d6 *electron-v32.0.2-darwin-x64-dsym.zip -a9afaa20486fec6b9ab80d6df45d2b41e71016609aa6b01725fd4464befdd8c9 *electron-v32.0.2-darwin-x64-symbols.zip -a9a8b30a1847236dca495041644cea27a08823bf6a5d314bd21a8fbe92b91d67 *electron-v32.0.2-darwin-x64.zip -fedb2dc6068cedd17f2c4d4a736496ad86b6093208579c35e6c0191e4e860704 *electron-v32.0.2-linux-arm64-debug.zip -c3db22d2b30340c346da5f1426fa4bc52a7789000244a36c42fea1fb2f3ff418 *electron-v32.0.2-linux-arm64-symbols.zip -40aef35b2f31f2f0f21e39d46ea4d924dc9523043051c2e59fe590d89c211e8f *electron-v32.0.2-linux-arm64.zip -fedb2dc6068cedd17f2c4d4a736496ad86b6093208579c35e6c0191e4e860704 *electron-v32.0.2-linux-armv7l-debug.zip -24df468520904b6cd11928e76c2d0ee45a88fd3fd31e16c4edb209d72302c50b *electron-v32.0.2-linux-armv7l-symbols.zip -508de41622a31dc210d99afc4ec97305b51a8333c505e824422e6426314549b0 *electron-v32.0.2-linux-armv7l.zip -f2116966bebd9e74b1c5cb2faec11a881bc5286e36222180eb63a7528f364d2a *electron-v32.0.2-linux-x64-debug.zip -8e471d909a45cff1fe81ab5b62d5b0dd152e8794e2d1c3e13298f2551845d399 *electron-v32.0.2-linux-x64-symbols.zip -ac6171342dfc7fba4af12d2c379fd408904a6d91b66a41f1cf06a78fc0420b40 *electron-v32.0.2-linux-x64.zip -60e931dba33b99fe3c42806a530ebf5b024d48ce78378b528f0d186de4445484 *electron-v32.0.2-mas-arm64-dsym-snapshot.zip -15eb44c5e3e9ecfc7106f30925cd95f464c99e523bfbcf7c72c2cb7fa8f37221 *electron-v32.0.2-mas-arm64-dsym.zip -2406caa1bceb7d5c101ff5a62b9218a7a4c49a60cdbd7a2d13e9c9053d5cfb91 *electron-v32.0.2-mas-arm64-symbols.zip -7b170714ebfec9081dcbf80bf4b3e8d6e3bd95bf7c040c168d62bbbf66eea74d *electron-v32.0.2-mas-arm64.zip -e10481ffc01031efd8dab2e8a138516003a1b2b02469dfdfabb4028a6cc05a2d *electron-v32.0.2-mas-x64-dsym-snapshot.zip -fa48ccc081b252cd54eb8b041cdff5e9637a739bee87aee5678b2db38fb2f71d *electron-v32.0.2-mas-x64-dsym.zip -8b944f583257d088539c3753de85be7225c3e9e664d665f9ccffbf6a61b27948 *electron-v32.0.2-mas-x64-symbols.zip -6bd6ad41fec8caf31f50f5b3710957939c31237169344f0e1cc00097cc099ef1 *electron-v32.0.2-mas-x64.zip -00163cee45c03a253aec65b461489eb6bff3cbdba92c70fb334ecd423bb2a91d *electron-v32.0.2-win32-arm64-pdb.zip -77b3be8a9c831da961c33a47831a1370e358e6f996da50d044cc364dd237c941 *electron-v32.0.2-win32-arm64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.2-win32-arm64-toolchain-profile.zip -c02294789c3461fd1630c30f3cd738c33e204449418422caefd58f61373535a5 *electron-v32.0.2-win32-arm64.zip -dbc64585cebd2ef8a8edfbefcf569ba0d68ac87dab2b404b9306c5372965f33b *electron-v32.0.2-win32-ia32-pdb.zip -dde071cc12ab56459803124b59f28265ace68b2552a889ab76f10917a523a99d *electron-v32.0.2-win32-ia32-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.2-win32-ia32-toolchain-profile.zip -db51395aa835773b21390c3cd12d14c632f990b909621f01139234eb87a4c394 *electron-v32.0.2-win32-ia32.zip -f16a1128c03864ee979e9b6543af9fc4cc7c862854b40144082985c3e2bc6147 *electron-v32.0.2-win32-x64-pdb.zip -a0c39b29bb89216adf4d2613a2615b66865ee943108c4bd1226dc56a0432817e *electron-v32.0.2-win32-x64-symbols.zip -7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.0.2-win32-x64-toolchain-profile.zip -16edf270a25c60f97e1efa86680ca53d5724d1a24ead250b0d40c0ce0119ce42 *electron-v32.0.2-win32-x64.zip -8eb281d02207d7ba9e9e71c2473ec1e11bfc183d2517aa157c340bbdb9b924af *electron.d.ts -db7b2808ebbf72d6d1622395e4957507b1c64a7938e81c365ee84d4eece7ab20 *ffmpeg-v32.0.2-darwin-arm64.zip -ac646dd0e4b9ec1b7b149d9d326dadf283714f640c90f64185c00714cd83a35e *ffmpeg-v32.0.2-darwin-x64.zip -862dd36d6fbb2ed971130c1ae1be334a3617576d4c5e56b525d5dc182ff9b173 *ffmpeg-v32.0.2-linux-arm64.zip -e1b00b48cc23e7ae366070392e25280f17cc8dfe5df5c47e8132a5d642c75fc3 *ffmpeg-v32.0.2-linux-armv7l.zip -7449dd3b9b61e843c6a9596f3e183a3c6c97f071c94da0850c1f196ada36cc94 *ffmpeg-v32.0.2-linux-x64.zip -db7b2808ebbf72d6d1622395e4957507b1c64a7938e81c365ee84d4eece7ab20 *ffmpeg-v32.0.2-mas-arm64.zip -ac646dd0e4b9ec1b7b149d9d326dadf283714f640c90f64185c00714cd83a35e *ffmpeg-v32.0.2-mas-x64.zip -4e4f2069333a79fddf611057028802a57ccd3cc248766dc5ffeca223f3d0bafa *ffmpeg-v32.0.2-win32-arm64.zip -46ee4e6dff6cdb4e65563e2accc023b776cb8b835c10884c780a2b74d8082c53 *ffmpeg-v32.0.2-win32-ia32.zip -e06344255184a7e406ed6d0b409da4c8ceea8457ad8e080a62e13788e6b3a97a *ffmpeg-v32.0.2-win32-x64.zip -3fadab9c42a4e4e27e0a3e5c8c5a48991afcf3aefb22002efc1d5d20b59702c5 *hunspell_dictionaries.zip -074d401d79b2faea6da2d50e6584e4b2995dc8837f9b7cd427c34fa63972a035 *libcxx-objects-v32.0.2-linux-arm64.zip -98742ae9006bc09e5ca7555b084d767195c6101cbb064393443e62b740655044 *libcxx-objects-v32.0.2-linux-armv7l.zip -36830b2d45f59a0ebce9d4bfb3e044cd1390791607995ed780590a5488a7b17f *libcxx-objects-v32.0.2-linux-x64.zip -82004d820be567fcac839deeabc975fd4a7fd30335369cef196539d656802d4a *libcxx_headers.zip -fd77f3df0c4870ee1bfa6abf8a984c8eff6cc52d9b4f720e038375a222962462 *libcxxabi_headers.zip -9307a3c7d29d7832a3bfd6d48fb235a39547692f3b6f853299b27d424db56f37 *mksnapshot-v32.0.2-darwin-arm64.zip -a94c08970f8dcd49b105847a7671feff9ae625309f7b66151f0f586322770043 *mksnapshot-v32.0.2-darwin-x64.zip -4b634cbe8a71837d081e7108e2d84ad2f523fe13d5a6667d361d03854f8a5072 *mksnapshot-v32.0.2-linux-arm64-x64.zip -4e0f49b7a1d91115bb70ba31edf1bc899fd3c961cb16fc90d01e1c261d476278 *mksnapshot-v32.0.2-linux-armv7l-x64.zip -6765974706698f2337d7fd23a0d2557ee461ebe607b6dc72403003d0f60a041d *mksnapshot-v32.0.2-linux-x64.zip -b071c40c148cb04581f834e84d76de5bba9003e232d25895a5273cfd2b913a13 *mksnapshot-v32.0.2-mas-arm64.zip -c307aded33ecf908f65733dc1fd30e63cfd27e2a842e7f6b6fdb159352afbab5 *mksnapshot-v32.0.2-mas-x64.zip -30c496f8de3a83af06c07d09b6fbec79dc805db2921eb2ff17a7285291480679 *mksnapshot-v32.0.2-win32-arm64-x64.zip -88fe727d7fcba7b8044427bf1bff2de0fec7179ae614089ae0cf5722e2faf4e6 *mksnapshot-v32.0.2-win32-ia32.zip -93686fa9fd90d2b0f66828895312251b3fc97c349a66058673c32641642dbaac *mksnapshot-v32.0.2-win32-x64.zip +7fb7b8736fcd9dbde92628e4aa951fd2c54d3136bf20c1821ce2a1b85fef3046 *chromedriver-v32.1.2-darwin-arm64.zip +a9e43916cbe91c9a905f2bf38d326d5dc462c3d8a7d88f52c25c1e7c1b9ce7cc *chromedriver-v32.1.2-darwin-x64.zip +405664c1b6529cd6c2af65778f2c84bfe262ad0b8d9d044a39d2eff2ed218828 *chromedriver-v32.1.2-linux-arm64.zip +32682f487ed9307d0f40d35c4b998cee75272effd228093be3e008ca7b39e16e *chromedriver-v32.1.2-linux-armv7l.zip +d98aa7a90ebfe519700e47fa6bcb94a157483fac615920c5ee467dcc41c46702 *chromedriver-v32.1.2-linux-x64.zip +046737617a523278ebe1786f64b723c3bb3fcc9811b98b224029d7fa730485dd *chromedriver-v32.1.2-mas-arm64.zip +e05d44d95ebd0bd897499a1012980d9a7d87f63f4da8ce82dc15a6f82008d3ea *chromedriver-v32.1.2-mas-x64.zip +9940246d4017db30673c9e77db590ff11a6616b24ad630ec33600129694c6570 *chromedriver-v32.1.2-win32-arm64.zip +c8580f7596b54400a6018ab5a43046c99d8370f61127b414f048200a8f7f303b *chromedriver-v32.1.2-win32-ia32.zip +ab40ffd5a1cc5e9c854f02d11773f1dfab8a78a89f5f31b79cf229489a672a09 *chromedriver-v32.1.2-win32-x64.zip +649584a630e9e4b21b8f42a06ed01d9d2e12444ed39500c78f0b76388dd704c7 *electron-api.json +7edc15b6c0d1cfb05f641e091186041f557fc23be7e8517e132f0ab0026a7cfd *electron-v32.1.2-darwin-arm64-dsym-snapshot.zip +b879508f26eec70407c79724a69d3a98901ba388491128ed3a2952b010cb9da8 *electron-v32.1.2-darwin-arm64-dsym.zip +218791e68ce0177ff994b446f67f60e028edaf1c6a39bb490602847ceb77e9da *electron-v32.1.2-darwin-arm64-symbols.zip +b5f6db900997ba931c98addaef28744a0a6af0f2ec2e8e5755f7f50db2fe8bbc *electron-v32.1.2-darwin-arm64.zip +e52950f675119c4fe67de927a2a8b20507f8496b07dab72be82b341a4c96227b *electron-v32.1.2-darwin-x64-dsym-snapshot.zip +a3c64201aa41cf6ebe32dbc92296c91b11dd321be9584b3c1a46ea0bbacc7201 *electron-v32.1.2-darwin-x64-dsym.zip +711736bee5238aecb1b424d2c8c7ffc3007a0de1d32f784db97c8e44e92daf83 *electron-v32.1.2-darwin-x64-symbols.zip +150ac6a59e31ad516685bdbb9cee67c7e927b872ad94ffc900fbf6616433f8ab *electron-v32.1.2-darwin-x64.zip +1bc88c381f835d21a4cb95d81429d6bc2f01105276ef02fde562cb03eb493729 *electron-v32.1.2-linux-arm64-debug.zip +11853479e086ec020ac85cc438c74c61473808382408614bd8c8afb6b496a9b9 *electron-v32.1.2-linux-arm64-symbols.zip +702326c51679ed705bc22d7e4049b29cef2d66366d3387c401836aaae0fa450c *electron-v32.1.2-linux-arm64.zip +1bc88c381f835d21a4cb95d81429d6bc2f01105276ef02fde562cb03eb493729 *electron-v32.1.2-linux-armv7l-debug.zip +bd99cb482559ba3c24152a3563bf8f4dd2650c62585bcced0e4b1bb4f58c2d33 *electron-v32.1.2-linux-armv7l-symbols.zip +d9511449c328f90f47e499f44c6d84c6204d4a3a2caec5c5d52f176cfc77f50d *electron-v32.1.2-linux-armv7l.zip +8177e8084aef855cd5c5a5b72210fc948bd27b362f73801cf0d99ee28d5aa7a6 *electron-v32.1.2-linux-x64-debug.zip +38269028f07a405b4012df80f7fa9a65099e325cea67a4c0e654af890d2dca7f *electron-v32.1.2-linux-x64-symbols.zip +b51e5f1296f8971d7eb4ca86606b6f5d31fb3dab8caa91dcfbfa522be5679691 *electron-v32.1.2-linux-x64.zip +ae2e09fe44b8bf7ed6ca5c3ee2fae6a25415469b83125f0c370e819d208e1ca8 *electron-v32.1.2-mas-arm64-dsym-snapshot.zip +b882dd1adc0da2444e220ea213eb4fde838958f637040f11c62f986cb64532aa *electron-v32.1.2-mas-arm64-dsym.zip +6559e93a3e9e4c3f828ca0c457827c9dbade9124d6d6b92f6ca7a56943032e0c *electron-v32.1.2-mas-arm64-symbols.zip +5235c3b5f417c8a196a00732ee6ef79a55610465ef51c32b8ea481393a8a2214 *electron-v32.1.2-mas-arm64.zip +db68c078b17d5bfbca5dfd3ebf7b9f9eec9c84ec4a257b248b14ac9080e83e34 *electron-v32.1.2-mas-x64-dsym-snapshot.zip +b5f552ca41c4b7f197b0d584ec7fd5c027ae28c9162a80e8be7899bc59003a35 *electron-v32.1.2-mas-x64-dsym.zip +c7347605cb44bce675f2b08efd9a2c3dd4ae85ac85fd9444afe529379ad1c160 *electron-v32.1.2-mas-x64-symbols.zip +f27569c1c20e3f982b526e5e4ae3c091417e0cada77b772804ffeb94bc0a6744 *electron-v32.1.2-mas-x64.zip +4615c90817f137568e93208cabd3c3b90cfb03658fa12eda5d47060c921121b4 *electron-v32.1.2-win32-arm64-pdb.zip +7075092d2888d761f45978935b56dcdc4f08272a0454ea46cca4c0b21f617220 *electron-v32.1.2-win32-arm64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.1.2-win32-arm64-toolchain-profile.zip +7eabd415f53b3180ce7ef73a6d12d67f8db62cac53db5edc9393acd4a1bb6312 *electron-v32.1.2-win32-arm64.zip +1524a0e4acc46c7f4d2a9361e60e1ef91bb2f3fdf14b8f58ee413219e4e1ed4c *electron-v32.1.2-win32-ia32-pdb.zip +58fd0edf38918f01d509750aad735fbbd811f603bfa67da1d5566a0ff3fc930d *electron-v32.1.2-win32-ia32-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.1.2-win32-ia32-toolchain-profile.zip +72cf49d2d54c474df4322c37ac2c1cee05db8e2cfd5066735bb9395271a05b6b *electron-v32.1.2-win32-ia32.zip +259b155478b26a69884683a2eb248819871c42ac777033e568068b7dcb668049 *electron-v32.1.2-win32-x64-pdb.zip +0246c4461414505ddcec690a48c77298446b96c5de61aba565840e0f8fb11167 *electron-v32.1.2-win32-x64-symbols.zip +7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v32.1.2-win32-x64-toolchain-profile.zip +02dadb152d508ba7ac4371ac84d9e1166cc96a63567022df155b4f1859707b8e *electron-v32.1.2-win32-x64.zip +6fd6176fd0f3214ef81b4a318663503fdcb0931f949eb7f98902fc7eee1502ee *electron.d.ts +4050fdcb3a783d67481653a7edf051d9df9b374a03a31c6f312d9b5a71b0dca7 *ffmpeg-v32.1.2-darwin-arm64.zip +55d758ad33095ef332ec528445f70499437b8da06b40b48ea8451e82caf87963 *ffmpeg-v32.1.2-darwin-x64.zip +b75410296a741951fab0a26a90c0dc986fdc0ffed090a18db511567cf572b02a *ffmpeg-v32.1.2-linux-arm64.zip +e70efbd03d587f2b772c0b40e92ea066fc4cb880a6df3a389552140cd70ad15c *ffmpeg-v32.1.2-linux-armv7l.zip +7b502f35be711a3d983754a4096751e5cb7c8df7cae349678f68407d51bc2123 *ffmpeg-v32.1.2-linux-x64.zip +7e4a3d9d32a9da96a3b4efbe413152c9da7a0a005a3e348e9afd5b2799b642f7 *ffmpeg-v32.1.2-mas-arm64.zip +153e20e4daaa9b5242d5260b3fafbb8d1f477e01d8bff4d5813c85e617ef7ac7 *ffmpeg-v32.1.2-mas-x64.zip +31061f9b762697c5bc85fb47b5838a1d391711c6efa58784c6f43e1e5347844e *ffmpeg-v32.1.2-win32-arm64.zip +726def466970a97c8001d311ae2ce044b4c7676e47037906f95d0bd70d3843ba *ffmpeg-v32.1.2-win32-ia32.zip +c1a6ab3a4d9f640a6cff7f287be7ee2c60c93b01ebba30cfd30851daeca06020 *ffmpeg-v32.1.2-win32-x64.zip +1a33ccc8d7c2327b578370c0bc55e44e93f3b2802a59b40621b5f595643c53d7 *hunspell_dictionaries.zip +c26dce5871a613b2f21fe5ba5c580e56e6444103c5f557cf2e026dc415e8a910 *libcxx-objects-v32.1.2-linux-arm64.zip +44f3c2ef522261187b0e919ea366be8489829580f3c2a593c0b971c382ff36db *libcxx-objects-v32.1.2-linux-armv7l.zip +2b544a48375d5bc24996ca6660bd09b55502982573d13a5d35ebccfa8d9d3433 *libcxx-objects-v32.1.2-linux-x64.zip +a69a52bc6cb45f39b1d441c03fc03b17665849e29db4c4a848b70e8b4dc8601a *libcxx_headers.zip +4da13f2694e3e07044d445492a28838f310e8082470c0b79cc341de9de6af9d4 *libcxxabi_headers.zip +7e0601c5b34eff190993a4e3e56978e5775e2449099a6c64b170605a7c05725d *mksnapshot-v32.1.2-darwin-arm64.zip +0c3e09d57fcf1401dc124c30b987e96dc0e97595fe9af23e49091d1ebbd1b6cb *mksnapshot-v32.1.2-darwin-x64.zip +a3897c6892a64d1ef3251e51d6711630ba5e8d4cc16d80f5941326ef089fd9d8 *mksnapshot-v32.1.2-linux-arm64-x64.zip +e30e6399ccf0a5207da201d5d8d32b83b7270a19e558a72936ea24eaf3f1772f *mksnapshot-v32.1.2-linux-armv7l-x64.zip +5ec39a59a1a2c2dd2a833406cf7ff0f155129e7f345a7d0c8b4efaa37825464a *mksnapshot-v32.1.2-linux-x64.zip +f9e493fc4a75012dcfb34bde465540fa0661275dec1c2aaee5a39cb957d89935 *mksnapshot-v32.1.2-mas-arm64.zip +1c32fd1892b77c58f3176046a2f60b6bdfc2f6f9b277e534e83da6b760b6aee8 *mksnapshot-v32.1.2-mas-x64.zip +286fbd00deb8e0c806230633703aeab692848235a2881fa746b6db0a5f425f97 *mksnapshot-v32.1.2-win32-arm64-x64.zip +a49e4c843e8f3e49fd8b8f35ab36d75eae56644d725eba3a9c68c2fc2a6aed17 *mksnapshot-v32.1.2-win32-ia32.zip +aaf24b934dddc724a171a550d18c2236fd660a0ef5b5b72385e4997519caf605 *mksnapshot-v32.1.2-win32-x64.zip diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index 5298496269a07..374c9b6299134 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -23,7 +23,7 @@ const product = require("../../product.json"); // The reference dependencies, which one has to update when the new dependencies // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.36:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.162: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/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index c484f07abac6e..3c7f6f5bc223c 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -25,7 +25,7 @@ import product = require('../../product.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/128.0.6613.36:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.162: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 c3500db75c43e..a77b2b35eb5f7 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "606aa55c7d687518d34b55accc5a71ea0bd28727" + "commitHash": "63df87866a2d74d20fb28e96d51ef32aea40c21e" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "128.0.6613.84" + "version": "128.0.6613.162" }, { "component": { @@ -516,11 +516,11 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "1968ef32415607643770efb320d7d4e941baaa25" + "commitHash": "efbec04208a3c8588d4e7f076c47d29dddf47976" } }, "isOnlyProductionDependency": true, - "version": "20.16.0" + "version": "20.17.0" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "61fbd29bc509e93a2f4b14435ec6ae58ef6c166c" + "commitHash": "8ac9d16162df2faf5d441158d77ff3adff79ee8d" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "32.0.2" + "version": "32.1.2" }, { "component": { diff --git a/package-lock.json b/package-lock.json index 5ca13d3e8a40c..fce5e4f9901d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "32.0.2", + "electron": "32.1.2", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", @@ -6136,9 +6136,9 @@ "dev": true }, "node_modules/electron": { - "version": "32.0.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-32.0.2.tgz", - "integrity": "sha512-nmZblq8wW3HZ17MAyaUuiMI9Mb0Cgc7UR3To85h/rVopbfyF5s34NxtK4gvyRfYPxpDGP4k+HoQIPniPPrdE3w==", + "version": "32.1.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-32.1.2.tgz", + "integrity": "sha512-CXe6doFzhmh1U7daOvUzmF6Cj8hssdYWMeEPRnRO6rB9/bbwMlWctcQ7P8NJXhLQ88/vYUJQrJvlJPh8qM0BRQ==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index cc6a99c647000..2085c52598f7f 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "32.0.2", + "electron": "32.1.2", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", diff --git a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts index 3cd587210d573..90b054ad13dd9 100644 --- a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts +++ b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { BrowserWindow, Details, MessageChannelMain, app, utilityProcess, UtilityProcess as ElectronUtilityProcess, ForkOptions } from 'electron'; +import { BrowserWindow, Details, MessageChannelMain, app, utilityProcess, UtilityProcess as ElectronUtilityProcess } from 'electron'; import { Disposable } from '../../../base/common/lifecycle.js'; import { Emitter, Event } from '../../../base/common/event.js'; import { ILogService } from '../../log/common/log.js'; @@ -18,7 +18,6 @@ import { removeDangerousEnvVariables } from '../../../base/common/processes.js'; import { deepClone } from '../../../base/common/objects.js'; import { isWindows } from '../../../base/common/platform.js'; import { isUNCAccessRestrictionsDisabled, getUNCHostAllowlist } from '../../../base/node/unc.js'; -import { upcast } from '../../../base/common/types.js'; export interface IUtilityProcessConfiguration { From 85122d5818c47d620a04d0bf140cf89ff6ab871e Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 25 Sep 2024 11:57:55 +0900 Subject: [PATCH 28/41] ci: remove workaround for missing c++20 flags --- .github/workflows/monaco-editor.yml | 9 ------ .../alpine/product-build-alpine.yml | 10 ------- .../darwin/product-build-darwin.yml | 14 +-------- .../product-build-linux-legacy-server.yml | 20 ------------- build/azure-pipelines/linux/setup-env.sh | 14 ++++----- build/azure-pipelines/product-compile.yml | 10 ------- .../azure-pipelines/web/product-build-web.yml | 10 ------- .../win32/product-build-win32.yml | 29 ------------------- .../azure-pipelines/win32/sdl-scan-win32.yml | 3 +- 9 files changed, 9 insertions(+), 110 deletions(-) diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml index 26026aff994e9..426999ce43b4a 100644 --- a/.github/workflows/monaco-editor.yml +++ b/.github/workflows/monaco-editor.yml @@ -56,15 +56,6 @@ jobs: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 ELECTRON_SKIP_BINARY_DOWNLOAD: 1 run: | - # V8 >= 12.8 requies C++20 or later - # current headers shipped from Electron are missing - # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa - # Following is a workaround until the headers are fixed in upstream. - if [ "$(g++ -dumpversion)" -lt 10 ]; then - export CXXFLAGS="-std=gnu++2a" - else - export CXXFLAGS="-std=gnu++20" - fi npm ci - name: Download Playwright diff --git a/build/azure-pipelines/alpine/product-build-alpine.yml b/build/azure-pipelines/alpine/product-build-alpine.yml index 415fb1998548d..890bc68c7380d 100644 --- a/build/azure-pipelines/alpine/product-build-alpine.yml +++ b/build/azure-pipelines/alpine/product-build-alpine.yml @@ -74,16 +74,6 @@ steps: - script: | set -e - # V8 >= 12.8 requies C++20 or later - # current headers shipped from Electron are missing - # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa - # Following is a workaround until the headers are fixed in upstream. - if [ "$(g++ -dumpversion)" -lt 10 ]; then - export CXXFLAGS="-std=gnu++2a" - else - export CXXFLAGS="-std=gnu++20" - fi - for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index 2ed6bf2e79328..19398a701429c 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -75,24 +75,12 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) displayName: Setup NPM Authentication - - script: | - set -e - # Refs https://github.com/microsoft/vscode/issues/219893#issuecomment-2209313109 - sudo xcode-select --switch /Applications/Xcode_15.2.app - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - displayName: Switch to Xcode >= 15.1 - - script: | set -e c++ --version + xcode-select -print-path python3 -m pip install setuptools - # V8 >= 12.8 requies C++20 or later - # current headers shipped from Electron are missing - # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa - # Following is a workaround until the headers are fixed in upstream. - export CXXFLAGS="-std=gnu++20" - for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml index 913415414f221..a442b7a8cd2fb 100644 --- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml +++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml @@ -86,16 +86,6 @@ steps: - script: | set -e - # V8 >= 12.8 requies C++20 or later - # current headers shipped from Electron are missing - # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa - # Following is a workaround until the headers are fixed in upstream. - if [ "$(g++ -dumpversion)" -lt 10 ]; then - export CXXFLAGS="-std=gnu++2a" - else - export CXXFLAGS="-std=gnu++20" - fi - for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then @@ -110,16 +100,6 @@ steps: - script: | set -e - # V8 >= 12.8 requies C++20 or later - # current headers shipped from Electron are missing - # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa - # Following is a workaround until the headers are fixed in upstream. - if [ "$(g++ -dumpversion)" -lt 10 ]; then - export CXXFLAGS="-std=gnu++2a" - else - export CXXFLAGS="-std=gnu++20" - fi - export VSCODE_SYSROOT_PREFIX='-glibc-2.17' source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index 9196ee72103c1..03e5b49d5b1a9 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -17,7 +17,7 @@ fi if [ "$npm_config_arch" == "x64" ]; then # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/128.0.6613.36/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/128.0.6613.162/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 \ @@ -29,12 +29,12 @@ 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/128.0.6613.36:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.36:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.36:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.162:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.162:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.162:build/config/c++/BUILD.gn export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" - export CXXFLAGS="-nostdinc++ -std=gnu++20 -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" + export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" export LDFLAGS="-stdlib=libc++ --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu -Wl,--lto-O0" if [ "$(echo "$@" | grep -c -- "--skip-sysroot")" -eq 0 ]; then @@ -49,7 +49,7 @@ elif [ "$npm_config_arch" == "arm64" ]; then # Set compiler toolchain for client native modules export CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc export CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++ - export CXXFLAGS="-std=gnu++2a --sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" + export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu" # Set compiler toolchain for remote server @@ -63,7 +63,7 @@ elif [ "$npm_config_arch" == "arm" ]; then # Set compiler toolchain for client native modules export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++ - export CXXFLAGS="-std=gnu++2a --sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" + export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf" fi diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml index dcbc34798a6bd..facc7af4bc282 100644 --- a/build/azure-pipelines/product-compile.yml +++ b/build/azure-pipelines/product-compile.yml @@ -60,16 +60,6 @@ steps: - script: | set -e - # V8 >= 12.8 requies C++20 or later - # current headers shipped from Electron are missing - # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa - # Following is a workaround until the headers are fixed in upstream. - if [ "$(g++ -dumpversion)" -lt 10 ]; then - export CXXFLAGS="-std=gnu++2a" - else - export CXXFLAGS="-std=gnu++20" - fi - for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml index c46f6be3af29b..eb589b70bbf01 100644 --- a/build/azure-pipelines/web/product-build-web.yml +++ b/build/azure-pipelines/web/product-build-web.yml @@ -67,16 +67,6 @@ steps: - script: | set -e - # V8 >= 12.8 requies C++20 or later - # current headers shipped from Electron are missing - # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa - # Following is a workaround until the headers are fixed in upstream. - if [ "$(g++ -dumpversion)" -lt 10 ]; then - export CXXFLAGS="-std=gnu++2a" - else - export CXXFLAGS="-std=gnu++20" - fi - for i in {1..5}; do # try 5 times npm ci && break if [ $i -eq 5 ]; then diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index b3ba71b0fb2aa..43020e27656e7 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -89,35 +89,6 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) displayName: Setup NPM Authentication - # V8 >= 12.8 requies C++20 or later - # current headers shipped from Electron are missing - # https://github.com/nodejs/node/commit/c7e42092f34f019fa0c4d9a2d0d49719af2f5daa - # Following is a workaround until the headers are fixed in upstream. - - pwsh: | - $includes = @' - { - 'target_defaults': { - 'conditions': [ - ['OS=="win"', { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': [ - '-std:c++20' - ], - }, - }, - }] - ] - } - } - '@ - - if (!(Test-Path "~/.gyp")) { - mkdir "~/.gyp" - } - echo $includes > "~/.gyp/include.gypi" - displayName: Create include.gypi - - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" diff --git a/build/azure-pipelines/win32/sdl-scan-win32.yml b/build/azure-pipelines/win32/sdl-scan-win32.yml index 85177866ce8af..3f453c323b1ec 100644 --- a/build/azure-pipelines/win32/sdl-scan-win32.yml +++ b/build/azure-pipelines/win32/sdl-scan-win32.yml @@ -57,8 +57,7 @@ steps: 'VCCLCompilerTool': { 'AdditionalOptions': [ '/Zi', - '/FS', - '-std:c++20' + '/FS' ], }, 'VCLinkerTool': { From 740921ec9603b472be4754d3e28b411a7b4d265b Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 26 Sep 2024 18:34:53 +0900 Subject: [PATCH 29/41] ci: use gnu++2a for gcc <=9 --- .../product-build-linux-legacy-server.yml | 22 +++++++++++++++++++ .../linux/product-build-linux.yml | 22 +++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml index a442b7a8cd2fb..63f71890f1994 100644 --- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml +++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml @@ -83,6 +83,28 @@ steps: imageName: vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH) containerCommand: uname + - ${{ if or(eq(parameters.VSCODE_ARCH, 'arm64'), eq(parameters.VSCODE_ARCH, 'armhf')) }}: + - script: | + set -e + includes=$(cat << 'EOF' + { + "target_defaults": { + "conditions": [ + ["OS=='linux'", { + 'cflags_cc!': [ '-std=gnu++20' ], + 'cflags_cc': [ '-std=gnu++2a' ], + }] + ] + } + } + EOF + ) + if [ ! -d "$HOME/.gyp" ]; then + mkdir -p "$HOME/.gyp" + fi + echo "$includes" > "$HOME/.gyp/include.gypi" + displayName: Override gnu target for arm64 and arm + - script: | set -e diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 453a3002b1c32..79a461c99d7a5 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -129,6 +129,28 @@ steps: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Download vscode sysroots + - ${{ if or(eq(parameters.VSCODE_ARCH, 'arm64'), eq(parameters.VSCODE_ARCH, 'armhf')) }}: + - script: | + set -e + includes=$(cat << 'EOF' + { + "target_defaults": { + "conditions": [ + ["OS=='linux'", { + 'cflags_cc!': [ '-std=gnu++20' ], + 'cflags_cc': [ '-std=gnu++2a' ], + }] + ] + } + } + EOF + ) + if [ ! -d "$HOME/.gyp" ]; then + mkdir -p "$HOME/.gyp" + fi + echo "$includes" > "$HOME/.gyp/include.gypi" + displayName: Override gnu target for arm64 and arm + - script: | set -e From c16b7453fc55f5f32f6c80aaab1ea2e034502f84 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 2 Oct 2024 18:19:37 +0900 Subject: [PATCH 30/41] chore: bump distro --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2085c52598f7f..067758e533339 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.95.0", - "distro": "1f05cd9b265f2477905f0b7688a66cfb2c6061f5", + "distro": "ae48a30e87ab1a9a5e39c25a58cd44855597d49a", "author": { "name": "Microsoft Corporation" }, From 181c4c231861403a76f36cd49d4be4fa999576a1 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 2 Oct 2024 18:47:00 +0900 Subject: [PATCH 31/41] ci: use gnu++17 for legacy arm servers --- .../azure-pipelines/linux/product-build-linux-legacy-server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml index 63f71890f1994..2826fdb6298b7 100644 --- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml +++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml @@ -92,7 +92,7 @@ steps: "conditions": [ ["OS=='linux'", { 'cflags_cc!': [ '-std=gnu++20' ], - 'cflags_cc': [ '-std=gnu++2a' ], + 'cflags_cc': [ '-std=gnu++17' ], }] ] } From cea5c996c66ec6f9b79c54f9a2e05f3b76953ba5 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 2 Oct 2024 19:12:47 +0900 Subject: [PATCH 32/41] fixup! override node-addon-api to support c++20 with gcc-11 Scope to only the affected package versions --- extensions/package.json | 4 +++- package-lock.json | 19 +++++++++++++++++++ package.json | 7 ++++++- remote/package-lock.json | 7 +++++++ remote/package.json | 7 ++++++- 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/extensions/package.json b/extensions/package.json index 363f870d345e1..7f3fad949be9d 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -16,6 +16,8 @@ }, "overrides": { "node-gyp-build": "4.8.1", - "node-addon-api": "7.1.0" + "@parcel/watcher@2.1.0": { + "node-addon-api": "7.1.0" + } } } diff --git a/package-lock.json b/package-lock.json index fce5e4f9901d2..ef5da3746e512 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2888,6 +2888,12 @@ "node-addon-api": "^6.0.0" } }, + "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", + "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", + "license": "MIT" + }, "node_modules/@vscode/proxy-agent": { "version": "0.22.0", "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.22.0.tgz", @@ -2945,6 +2951,12 @@ "tar": "^6.1.11" } }, + "node_modules/@vscode/sqlite3/node_modules/node-addon-api": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", + "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==", + "license": "MIT" + }, "node_modules/@vscode/sudo-prompt": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz", @@ -3259,6 +3271,13 @@ "node-addon-api": "^3.0.2" } }, + "node_modules/@vscode/windows-ca-certs/node_modules/node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "license": "MIT", + "optional": true + }, "node_modules/@vscode/windows-mutex": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/@vscode/windows-mutex/-/windows-mutex-0.5.0.tgz", diff --git a/package.json b/package.json index 067758e533339..0503fdc560d4f 100644 --- a/package.json +++ b/package.json @@ -222,7 +222,12 @@ }, "overrides": { "node-gyp-build": "4.8.1", - "node-addon-api": "7.1.0" + "kerberos@2.1.1": { + "node-addon-api": "7.1.0" + }, + "@parcel/watcher@2.1.0": { + "node-addon-api": "7.1.0" + } }, "repository": { "type": "git", diff --git a/remote/package-lock.json b/remote/package-lock.json index 0dd1d7dab0f45..323bee76454b3 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -201,6 +201,13 @@ "node-addon-api": "^3.0.2" } }, + "node_modules/@vscode/windows-ca-certs/node_modules/node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "license": "MIT", + "optional": true + }, "node_modules/@vscode/windows-process-tree": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.0.tgz", diff --git a/remote/package.json b/remote/package.json index d8f16703f5f15..e8ea8642b9821 100644 --- a/remote/package.json +++ b/remote/package.json @@ -40,6 +40,11 @@ }, "overrides": { "node-gyp-build": "4.8.1", - "node-addon-api": "7.1.0" + "kerberos@2.1.1": { + "node-addon-api": "7.1.0" + }, + "@parcel/watcher@2.1.0": { + "node-addon-api": "7.1.0" + } } } From ce3d6ff269cc24ddff8a64bef8d7f73e6c0a0671 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 2 Oct 2024 23:24:41 +0900 Subject: [PATCH 33/41] chore: bump @vscode/policy-watcher --- package-lock.json | 22 +++++++++++++--------- package.json | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef5da3746e512..4061f8e045a61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@parcel/watcher": "2.1.0", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/policy-watcher": "^1.1.4", + "@vscode/policy-watcher": "^1.1.7", "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", @@ -2879,20 +2879,24 @@ } }, "node_modules/@vscode/policy-watcher": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.6.tgz", - "integrity": "sha512-EoJizB6aq/mgsL42mcNLGZ5vOwdZs/EHcLQkdY6Rg4uzcRkCapQdNy20wnCsrBpv3QntgBibsS6m+JXm8efY/Q==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.7.tgz", + "integrity": "sha512-HpdDg9GuoScOc+b3Oq4CyN9PAuVRffw4F86cMYODK5rezNAaX+D0jDp04PcMmy60qV4dSS371zJeNFNSY0b9HA==", "hasInstallScript": true, + "license": "MIT", "dependencies": { "bindings": "^1.5.0", - "node-addon-api": "^6.0.0" + "node-addon-api": "^8.2.0" } }, "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", - "license": "MIT" + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz", + "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==", + "license": "MIT", + "engines": { + "node": "^18 || ^20 || >= 21" + } }, "node_modules/@vscode/proxy-agent": { "version": "0.22.0", diff --git a/package.json b/package.json index 0503fdc560d4f..61c720573baab 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "@parcel/watcher": "2.1.0", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/policy-watcher": "^1.1.4", + "@vscode/policy-watcher": "^1.1.7", "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", From a8ce7b5216c4634a9e4d90a49709f9a3e6cf9144 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 3 Oct 2024 00:11:41 +0900 Subject: [PATCH 34/41] chore: bump @vscode/sqlite3 --- package-lock.json | 22 +++++++++++++--------- package.json | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4061f8e045a61..cb19b87e8907a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", - "@vscode/sqlite3": "5.1.6-vscode", + "@vscode/sqlite3": "5.1.7-vscode", "@vscode/sudo-prompt": "9.3.1", "@vscode/tree-sitter-wasm": "^0.0.4", "@vscode/vscode-languagedetection": "1.0.21", @@ -2946,20 +2946,24 @@ } }, "node_modules/@vscode/sqlite3": { - "version": "5.1.6-vscode", - "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.6-vscode.tgz", - "integrity": "sha512-SzNUiijrRyJr1ly6eHIs5UcCqH/V8aaoz9mHNm5SdnJCJOX5T9RcHqO1AJ9VreHcPcRPKuG2paUpMkTeyynmYQ==", + "version": "5.1.7-vscode", + "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.7-vscode.tgz", + "integrity": "sha512-u8gJw//6fBsahk/3+a4Te8s6GTNeOXStiv9PhC30Ceur2JjjCais4nYo66/TbnDFUjbYI/iV+nGHPLbGS6jcqQ==", "hasInstallScript": true, + "license": "BSD-3-Clause", "dependencies": { - "node-addon-api": "^4.2.0", + "node-addon-api": "^8.2.0", "tar": "^6.1.11" } }, "node_modules/@vscode/sqlite3/node_modules/node-addon-api": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", - "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==", - "license": "MIT" + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz", + "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==", + "license": "MIT", + "engines": { + "node": "^18 || ^20 || >= 21" + } }, "node_modules/@vscode/sudo-prompt": { "version": "9.3.1", diff --git a/package.json b/package.json index 61c720573baab..858d524a996e9 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", - "@vscode/sqlite3": "5.1.6-vscode", + "@vscode/sqlite3": "5.1.7-vscode", "@vscode/sudo-prompt": "9.3.1", "@vscode/tree-sitter-wasm": "^0.0.4", "@vscode/vscode-languagedetection": "1.0.21", From 3ed3973b888d9c900a25e57e2cec70ef5f6ed15a Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 3 Oct 2024 01:10:21 +0900 Subject: [PATCH 35/41] chore: bump node.js v20.17.0 --- build/checksums/nodejs.txt | 14 +++++++------- remote/.npmrc | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt index 3436ff37cc581..d10698b073011 100644 --- a/build/checksums/nodejs.txt +++ b/build/checksums/nodejs.txt @@ -1,7 +1,7 @@ -fc7355e778b181575153b7dea4879e8021776eeb376c43c50f65893d2ea70aa3 node-v20.16.0-darwin-arm64.tar.gz -e18942cd706e4d69a4845ddacee2f1c17a72e853a229e3d2623d2edeb7efde72 node-v20.16.0-darwin-x64.tar.gz -551588f8f5ca05c04efb53f1b2bb7d9834603327bdc82d60a944d385569866e1 node-v20.16.0-linux-arm64.tar.gz -1c77c52ab507ddee479012f0b4bf523dd8400df4504447d623632353076e2e27 node-v20.16.0-linux-armv7l.tar.gz -b3f874ea84e440d69ed02ca92429d0eccd17737fde86db69c1c153d16ec654f2 node-v20.16.0-linux-x64.tar.gz -7e773fba3a19eac5ccbe85c1f87a05d7b112ecf41440076e6b6de1c7bffa0fdf win-arm64/node.exe -ba221658a3b68bd583e3068903eb675b5206d86a883c084ed95502e8f634b82a win-x64/node.exe +476324108c4361935465631eec47df1c943ba2c87bc050853385b1d1c71f0b1f node-v20.17.0-darwin-arm64.tar.gz +eefe9447dbb0b5b233d42730989c6c364487de4043145db2f63da94e9623c380 node-v20.17.0-darwin-x64.tar.gz +18afbf2781edfcc9918343f4bf74a8c35d74d778b85d40a0c09b232adc0ea82c node-v20.17.0-linux-arm64.tar.gz +fcc19311817622f2e4693c3fff488c72fa1ce7c2c423c2bd114c86b24fa8c388 node-v20.17.0-linux-armv7l.tar.gz +21e656f6f4e34080ddc5d75fbfe58ce8482fe6e70a76aeae14afdcdc1e23079d node-v20.17.0-linux-x64.tar.gz +6f9118a87189bc101160929a94ddc6b999c30228da7d3d97c2b15eb11b258b95 win-arm64/node.exe +0740b4a681b320f966b57f51c87c11f897e8605064b6ae62d03e177bc66f01b9 win-x64/node.exe diff --git a/remote/.npmrc b/remote/.npmrc index d6905a0c0f99a..122d9a51835e3 100644 --- a/remote/.npmrc +++ b/remote/.npmrc @@ -1,6 +1,6 @@ disturl="https://nodejs.org/dist" -target="20.16.0" -ms_build_id="289487" +target="20.17.0" +ms_build_id="296739" runtime="node" build_from_source="true" legacy-peer-deps="true" From 78393e39c19272306094bcca1d149e4a85d27aee Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 3 Oct 2024 01:13:17 +0900 Subject: [PATCH 36/41] chore: bump distro --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 858d524a996e9..753f54376ee95 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.95.0", - "distro": "ae48a30e87ab1a9a5e39c25a58cd44855597d49a", + "distro": "59b2855afd46b29b1c5c923b5de88e30c13bb9a1", "author": { "name": "Microsoft Corporation" }, From 426f6d0459f34a040f086730f0713831845c04e8 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 3 Oct 2024 01:24:21 +0900 Subject: [PATCH 37/41] chore: update @vscode/windows-ca-certs --- package-lock.json | 20 ++++++++++++-------- remote/package-lock.json | 20 ++++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb19b87e8907a..2f1300efdc549 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3267,24 +3267,28 @@ } }, "node_modules/@vscode/windows-ca-certs": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.1.tgz", - "integrity": "sha512-1B6hZAsqg125wuMsXiKIFkBgKx/J7YR4RT/ccYGkWAToPU9MVa40PRe+evLFUmLPH6NmPohEPlCzZLbqgvHCcQ==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.2.tgz", + "integrity": "sha512-iU/yUrVy37M0KiZA6FDiywItwvrZa5fbRXLt+lGBwkYUFRYBupI/R0+af+wAo3wF4kYyjyKcnaQTOyr08RTvgQ==", "hasInstallScript": true, + "license": "BSD", "optional": true, "os": [ "win32" ], "dependencies": { - "node-addon-api": "^3.0.2" + "node-addon-api": "^8.2.0" } }, "node_modules/@vscode/windows-ca-certs/node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz", + "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==", "license": "MIT", - "optional": true + "optional": true, + "engines": { + "node": "^18 || ^20 || >= 21" + } }, "node_modules/@vscode/windows-mutex": { "version": "0.5.0", diff --git a/remote/package-lock.json b/remote/package-lock.json index 323bee76454b3..94cbc6c989e07 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -189,24 +189,28 @@ } }, "node_modules/@vscode/windows-ca-certs": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.1.tgz", - "integrity": "sha512-1B6hZAsqg125wuMsXiKIFkBgKx/J7YR4RT/ccYGkWAToPU9MVa40PRe+evLFUmLPH6NmPohEPlCzZLbqgvHCcQ==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.2.tgz", + "integrity": "sha512-iU/yUrVy37M0KiZA6FDiywItwvrZa5fbRXLt+lGBwkYUFRYBupI/R0+af+wAo3wF4kYyjyKcnaQTOyr08RTvgQ==", "hasInstallScript": true, + "license": "BSD", "optional": true, "os": [ "win32" ], "dependencies": { - "node-addon-api": "^3.0.2" + "node-addon-api": "^8.2.0" } }, "node_modules/@vscode/windows-ca-certs/node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz", + "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==", "license": "MIT", - "optional": true + "optional": true, + "engines": { + "node": "^18 || ^20 || >= 21" + } }, "node_modules/@vscode/windows-process-tree": { "version": "0.6.0", From a1b47065210485d702d043d8d6ad9f50efae11c6 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 3 Oct 2024 17:53:56 +0900 Subject: [PATCH 38/41] chore: update builds for electron@32.1.2 --- .npmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.npmrc b/.npmrc index f0f3c5bb2704c..8addc73f673a6 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" target="32.1.2" -ms_build_id="10207170" +ms_build_id="10323173" runtime="electron" build_from_source="true" legacy-peer-deps="true" From fd7e7b19153d714d7618a3adbce12f4794956541 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 3 Oct 2024 17:57:55 +0900 Subject: [PATCH 39/41] chore: bump distro --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 753f54376ee95..e32c99f8cc165 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.95.0", - "distro": "59b2855afd46b29b1c5c923b5de88e30c13bb9a1", + "distro": "388bd7fe1d02a9631b51f2ab0d57300f0e028c47", "author": { "name": "Microsoft Corporation" }, From 7526f41cc9926bfc49b757a86e05f309166194fa Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Fri, 4 Oct 2024 03:32:13 +0900 Subject: [PATCH 40/41] chore: bump dependencies --- package-lock.json | 22 +++++++++++----------- package.json | 4 ++-- remote/package-lock.json | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f1300efdc549..950551b3de709 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,11 +15,11 @@ "@parcel/watcher": "2.1.0", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/policy-watcher": "^1.1.7", + "@vscode/policy-watcher": "^1.1.8", "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", - "@vscode/sqlite3": "5.1.7-vscode", + "@vscode/sqlite3": "5.1.8-vscode", "@vscode/sudo-prompt": "9.3.1", "@vscode/tree-sitter-wasm": "^0.0.4", "@vscode/vscode-languagedetection": "1.0.21", @@ -2879,9 +2879,9 @@ } }, "node_modules/@vscode/policy-watcher": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.7.tgz", - "integrity": "sha512-HpdDg9GuoScOc+b3Oq4CyN9PAuVRffw4F86cMYODK5rezNAaX+D0jDp04PcMmy60qV4dSS371zJeNFNSY0b9HA==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.8.tgz", + "integrity": "sha512-IFT3eIPLIcjjgyOUBvbxfKlqTjSDJU+ZJrTlrgdjZrwS3HRLexAMTCfmBqIgZ+vS5N9QWtQW0yp8vX8UJv8JFg==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -2946,9 +2946,9 @@ } }, "node_modules/@vscode/sqlite3": { - "version": "5.1.7-vscode", - "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.7-vscode.tgz", - "integrity": "sha512-u8gJw//6fBsahk/3+a4Te8s6GTNeOXStiv9PhC30Ceur2JjjCais4nYo66/TbnDFUjbYI/iV+nGHPLbGS6jcqQ==", + "version": "5.1.8-vscode", + "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.8-vscode.tgz", + "integrity": "sha512-9Ku18yZej1kxS7mh6dhCWxkCof043HljcLIdq+RRJr65QdOeAqPOUJ2i6qXRL63l1Kd72uXV/zLA2SBwhfgiOw==", "hasInstallScript": true, "license": "BSD-3-Clause", "dependencies": { @@ -3267,9 +3267,9 @@ } }, "node_modules/@vscode/windows-ca-certs": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.2.tgz", - "integrity": "sha512-iU/yUrVy37M0KiZA6FDiywItwvrZa5fbRXLt+lGBwkYUFRYBupI/R0+af+wAo3wF4kYyjyKcnaQTOyr08RTvgQ==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.3.tgz", + "integrity": "sha512-C0Iq5RcH+H31GUZ8bsMORsX3LySVkGAqe4kQfUSVcCqJ0QOhXkhgwUMU7oCiqYLXaQWyXFp6Fj6eMdt05uK7VA==", "hasInstallScript": true, "license": "BSD", "optional": true, diff --git a/package.json b/package.json index e32c99f8cc165..28051e63ba843 100644 --- a/package.json +++ b/package.json @@ -73,11 +73,11 @@ "@parcel/watcher": "2.1.0", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/policy-watcher": "^1.1.7", + "@vscode/policy-watcher": "^1.1.8", "@vscode/proxy-agent": "^0.22.0", "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", - "@vscode/sqlite3": "5.1.7-vscode", + "@vscode/sqlite3": "5.1.8-vscode", "@vscode/sudo-prompt": "9.3.1", "@vscode/tree-sitter-wasm": "^0.0.4", "@vscode/vscode-languagedetection": "1.0.21", diff --git a/remote/package-lock.json b/remote/package-lock.json index 94cbc6c989e07..290e188418f50 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -189,9 +189,9 @@ } }, "node_modules/@vscode/windows-ca-certs": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.2.tgz", - "integrity": "sha512-iU/yUrVy37M0KiZA6FDiywItwvrZa5fbRXLt+lGBwkYUFRYBupI/R0+af+wAo3wF4kYyjyKcnaQTOyr08RTvgQ==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.3.tgz", + "integrity": "sha512-C0Iq5RcH+H31GUZ8bsMORsX3LySVkGAqe4kQfUSVcCqJ0QOhXkhgwUMU7oCiqYLXaQWyXFp6Fj6eMdt05uK7VA==", "hasInstallScript": true, "license": "BSD", "optional": true, From ddbc88235b067e7a9a3a0a5e05ffa0f62eb95789 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Fri, 4 Oct 2024 10:48:24 +0900 Subject: [PATCH 41/41] ci: fix arm legacy servers --- .../product-build-linux-legacy-server.yml | 2 +- build/npm/postinstall.js | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml index 2826fdb6298b7..63f71890f1994 100644 --- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml +++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml @@ -92,7 +92,7 @@ steps: "conditions": [ ["OS=='linux'", { 'cflags_cc!': [ '-std=gnu++20' ], - 'cflags_cc': [ '-std=gnu++17' ], + 'cflags_cc': [ '-std=gnu++2a' ], }] ] } diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js index e38c2cb003e69..20234986ece80 100644 --- a/build/npm/postinstall.js +++ b/build/npm/postinstall.js @@ -131,7 +131,27 @@ for (let dir of dirs) { if (process.env['VSCODE_REMOTE_LDFLAGS']) { opts.env['LDFLAGS'] = process.env['VSCODE_REMOTE_LDFLAGS']; } if (process.env['VSCODE_REMOTE_NODE_GYP']) { opts.env['npm_config_node_gyp'] = process.env['VSCODE_REMOTE_NODE_GYP']; } + const globalGypPath = path.join(os.homedir(), '.gyp'); + const globalInclude = path.join(globalGypPath, 'include.gypi'); + const tempGlobalInclude = path.join(globalGypPath, 'include.gypi.bak'); + if (process.platform === 'linux' && + (process.env['CI'] || process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'])) { + // Following include file rename should be removed + // when `Override gnu target for arm64 and arm` step + // is removed from the product build pipeline. + if (fs.existsSync(globalInclude)) { + fs.renameSync(globalInclude, tempGlobalInclude); + } + } setNpmrcConfig('remote', opts.env); + npmInstall(dir, opts); + if (process.platform === 'linux' && + (process.env['CI'] || process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'])) { + if (fs.existsSync(tempGlobalInclude)) { + fs.renameSync(tempGlobalInclude, globalInclude); + } + } + continue; } npmInstall(dir, opts);