From f94b27000c8423c19a96528d09b518c2cbb60860 Mon Sep 17 00:00:00 2001 From: Robo Date: Wed, 12 Feb 2025 18:36:35 +0900 Subject: [PATCH] chore: update to Electron 34 (#237557) * chore: update electron@33.3.0 * chore: update for webFrameMain possibly being null Refs https://github.com/electron/electron/commit/ae9f2df082ceac3b100d2bb3cccb5608c9cd81a9 * chore: update debian deps * chore: update rpm deps * chore: bump electron@34.0.0-beta.12 * temp: use std::format for spdlog * chore: update debian deps * chore: update rpm deps * chore: bump electron@34.0.0 * chore: bump electron@34.0.1 * chore: bump electron@34.1.0 * chore: update required portal version * chore: use enableDeprecatedPaste * chore: update builds * chore: bump distro --- .npmrc | 4 +- build/azure-pipelines/linux/setup-env.sh | 10 +- build/checksums/electron.txt | 150 +++++++++--------- build/linux/debian/dep-lists.js | 12 +- build/linux/debian/dep-lists.ts | 12 +- build/linux/dependencies-generator.js | 2 +- build/linux/dependencies-generator.ts | 2 +- build/linux/rpm/dep-lists.js | 14 +- build/linux/rpm/dep-lists.ts | 14 +- cgmanifest.json | 8 +- package-lock.json | 8 +- package.json | 4 +- src/main.ts | 5 + .../base/parts/ipc/electron-main/ipcMain.ts | 4 +- src/vs/code/electron-main/app.ts | 8 +- src/vs/platform/environment/common/argv.ts | 1 + src/vs/platform/environment/node/argv.ts | 1 + .../platform/windows/electron-main/windows.ts | 5 +- 18 files changed, 144 insertions(+), 120 deletions(-) diff --git a/.npmrc b/.npmrc index 97b21295b9a..4a3500427e8 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="32.2.7" -ms_build_id="10982180" +target="34.1.0" +ms_build_id="10990655" 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 d836fb70fb0..dc444cc83f8 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.186/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/132.0.6834.194/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.186:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.186:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.186:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194: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++ -D__NO_INLINE__ -DSPDLOG_USE_STD_FORMAT -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE --sysroot=$VSCODE_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 diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 293250496af..7ea1ada127c 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -0729d2cb830425c4591b40d7189c2f7da020f5adb887a49a4faa022d551b1e6f *chromedriver-v32.2.7-darwin-arm64.zip -a7d61c68d3b3522c0ec383915b6ab3d9f269d9ada0e09aa87a4e7d9fc24fe928 *chromedriver-v32.2.7-darwin-x64.zip -45314c8c7127f6083469c2c067aa78beb20055ba4d7a63eb2108b27e594a647a *chromedriver-v32.2.7-linux-arm64.zip -7e976a7131dcfd55f781c073ae59c8a24a1393119d831fbac13c6a335eb71467 *chromedriver-v32.2.7-linux-armv7l.zip -3437feb5d8e7157476d2e7a6558346061cd7e46506874bc7870eed8a3a43642a *chromedriver-v32.2.7-linux-x64.zip -3737301add80a936374acb17b84bb3a715fab9fbce049816ea7a51fa53d3b35e *chromedriver-v32.2.7-mas-arm64.zip -8b8b62f48a5e8b8a340b47348a2cc5dd4ba38789f76bc5567c039587538081a9 *chromedriver-v32.2.7-mas-x64.zip -24b666e3ab41eb1c66ab0f2361af0529b2b8e1e5ef153cfcef36adc700f9ed6d *chromedriver-v32.2.7-win32-arm64.zip -6d40251661afb1835adbef85e317fd520c0f1378156614c82befb348c3122c2d *chromedriver-v32.2.7-win32-ia32.zip -483012da9903d8d75e5e251a3262667c9a0a012a492b93dbe1237c7827eba778 *chromedriver-v32.2.7-win32-x64.zip -1e9b2b9011f56fa26f4d9fa57254ef1d0bdb34405a9bdf83a652f6258347e46d *electron-api.json -c0ea4a21f2e7e946300bf587a4e31f72ef996c497eaa94e6b8f788b917b896e5 *electron-v32.2.7-darwin-arm64-dsym-snapshot.zip -1e6e84e56cfb3a2473cab41577c160d3afcbda8337dda17c5295da90266433c9 *electron-v32.2.7-darwin-arm64-dsym.zip -9f460100fb71ef098bec26e9a09978ec1b1663165d6a358bfc398f5548a844c3 *electron-v32.2.7-darwin-arm64-symbols.zip -71e76a0a81a0c1c10e9e4862caf96437ba85a18c8fa7d8e15d59e3c057b893bd *electron-v32.2.7-darwin-arm64.zip -e406d690365f332826843c86c6a1b5c0320a84b0527ad8700a0e995b12a35f8c *electron-v32.2.7-darwin-x64-dsym-snapshot.zip -53d6fb64d717af80f024284161a432aaffb47631ef7548f18f33016c3376871a *electron-v32.2.7-darwin-x64-dsym.zip -3c9187db2cc0570d7b01651fa78294df7d451c87c361335cee80a61c1c561b67 *electron-v32.2.7-darwin-x64-symbols.zip -34310ed51d32b6c02ba3e3f447b0807ea85804d1f2b239e02a9de58b9080fbf8 *electron-v32.2.7-darwin-x64.zip -e884f2f9f3d001488888929b8affe053a60a7a780af7d0ec8d7023023f40ca52 *electron-v32.2.7-linux-arm64-debug.zip -fd88e47e7b564b006f68641b5c328721bbc8d87cfc9e569d9733354d263cddee *electron-v32.2.7-linux-arm64-symbols.zip -fb6e1f24385c3058844bd768320d5b332b4cbd011ab930e7252dc330c8ee17b3 *electron-v32.2.7-linux-arm64.zip -e884f2f9f3d001488888929b8affe053a60a7a780af7d0ec8d7023023f40ca52 *electron-v32.2.7-linux-armv7l-debug.zip -f338ea7ea592c3ccdad1bb788e9b936610f825ac69290e48d394790d5266dce3 *electron-v32.2.7-linux-armv7l-symbols.zip -4a95643e88cadfb011354d25cafe242cdb8c5327d65f86b4fbabe64717367ed2 *electron-v32.2.7-linux-armv7l.zip -e6e0fce9f6d95a84653b537b741967cae48c4c70c8026c02293c979074225b46 *electron-v32.2.7-linux-x64-debug.zip -122cc565d0ccd2774e298645473869752d27d2632aa97583d93b499e9b02f22b *electron-v32.2.7-linux-x64-symbols.zip -98007545e1d3700b32de5cb5eebcc10b9d105fb0dad6396155fdab1b40abb638 *electron-v32.2.7-linux-x64.zip -556d9ca239ee1206c9d67affa836ebb651db88eea6bee48cb7b43fa75851c72d *electron-v32.2.7-mas-arm64-dsym-snapshot.zip -662a3742b94fcbf7ab91a7c20e1430825ae7852e915fcb558d6357a310d631c6 *electron-v32.2.7-mas-arm64-dsym.zip -edd0763ead7ffd5bf5072539e5ca0be9252b9590e674e6e44e69b2057c329d79 *electron-v32.2.7-mas-arm64-symbols.zip -a4483f5246ecadfa48b1fc671d92b5dfbc09fbd88fe386f2ce48f10de79f2127 *electron-v32.2.7-mas-arm64.zip -a9aad4c413d4851fa3463eeef7015e3a3e77a501192965db1c5b870fa31a9660 *electron-v32.2.7-mas-x64-dsym-snapshot.zip -96c20e5c4b73febd3458679e9cc939f5f8255a327b06f49188ab2e3fe8311ea3 *electron-v32.2.7-mas-x64-dsym.zip -6ac844957373114e04411d3af1cb6507e35174d1dc279cce41cb92bbf2ea5d26 *electron-v32.2.7-mas-x64-symbols.zip -888b830b991dab6cf2c4351e112a48f24a4748efefcd763d693a79161199e65a *electron-v32.2.7-mas-x64.zip -27759db6bcdd16d4ff5548684361ba4372d885d3142bf02db59837c3634b1934 *electron-v32.2.7-win32-arm64-pdb.zip -6019e6ec58e9b6da335f20874efebc42d034a179163180b3b6faedf2963ae577 *electron-v32.2.7-win32-arm64-symbols.zip -48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-arm64-toolchain-profile.zip -2c755fdd4f9fda618b2db6b8c7210c5f3106a88b1e87b83e8433b4ab4a628cc2 *electron-v32.2.7-win32-arm64.zip -4dce0b21d1c2093cc4f7c0eaf9453a38377e0076d811da3c7391f105fc1d6afb *electron-v32.2.7-win32-ia32-pdb.zip -9a0a9c3746cd40ddc9c926755633b16676714e2138d7a2d888f658a26f617039 *electron-v32.2.7-win32-ia32-symbols.zip -48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-ia32-toolchain-profile.zip -6c338c5cd0b0587349ab0f119ca8f7d2728b1c3a43fe241741087f5fdf139c9c *electron-v32.2.7-win32-ia32.zip -fa240d324c5376aa12ed2aef26597764d9bfc2fdd0d16d7f76afc2c3e3c65a29 *electron-v32.2.7-win32-x64-pdb.zip -f645b53771cbcdfaa041d9cf9581348821d82c1b185ddb913759e2d62ee2410a *electron-v32.2.7-win32-x64-symbols.zip -48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-x64-toolchain-profile.zip -819ab19b7111dfd39dff506b3cb5cd2e1d8f4bb17f96ba74b987b2eac14b6c63 *electron-v32.2.7-win32-x64.zip -ce41b10c28bd43249cd3b409e081b1c83a2b691381bdd2e3bf208ec40ca176b8 *electron.d.ts -d2491071a641ce2e0f63c1f52e3a412856dd83ca17d021af1166d6e5b4de5638 *ffmpeg-v32.2.7-darwin-arm64.zip -5c5589b2c93f834e595eb692aa768b934245d2631df69bc4cad3a6602bba0e67 *ffmpeg-v32.2.7-darwin-x64.zip -3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.7-linux-arm64.zip -3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.7-linux-armv7l.zip -fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.7-linux-x64.zip -feeef1ab10543c813f730cc7a482b43eda35d40f1285b950e1a6d7805db2332a *ffmpeg-v32.2.7-mas-arm64.zip -96ef45180589c854fedf2d0601a20e70a65220c0820c45d0dfd4ec64724c58e0 *ffmpeg-v32.2.7-mas-x64.zip -ab4ab9cd62e40c4d3064004caa9de680cb72d8180d4facc1be06bdc886c23410 *ffmpeg-v32.2.7-win32-arm64.zip -90b5e2ebd4ff683eda97cc43ebbdee9b133b27edd2a34ae7ef37e7969d1d68be *ffmpeg-v32.2.7-win32-ia32.zip -8452085c0a650035f30a4b76e2ce1791f9b392ea7262109d29f7fe383fc41ddb *ffmpeg-v32.2.7-win32-x64.zip -78b415ebb9040dacabb6eb776a8d4837dda9a9b1ec9d64ee15db28dbb8598862 *hunspell_dictionaries.zip -a30057c37e6be5732944084575a2278616297242ae51bd474c683263cbc0c3e4 *libcxx-objects-v32.2.7-linux-arm64.zip -f9e9d1ff1a03a3e609ab8e727b1f89e77934509a4afdb849698b70e701c2176f *libcxx-objects-v32.2.7-linux-armv7l.zip -bb66e3b48f8e0706126b2b8b08827a4adda6f56c509eae4d136fcffd5414c353 *libcxx-objects-v32.2.7-linux-x64.zip -5181518d7da83fea5d8b033ab4fb7ed300f73bd8d20b8c26b624128233bd6ab2 *libcxx_headers.zip -6030ad099859b62cbdd9021b2cdb453a744a2751cb1dab30519e3e8708ad72d6 *libcxxabi_headers.zip -d3dcc4925a6bd55bc305fd41805ffee77dc8821730ac75cf4ee9ed2ca4ebdccb *mksnapshot-v32.2.7-darwin-arm64.zip -e6dfad3c30f4f38509b2fc972dd05cef06142c4832d931edba19742e06161279 *mksnapshot-v32.2.7-darwin-x64.zip -25ba5be47a721700f16af10945e71408ed86ffd6800b5d5ef04d38c0d77aa446 *mksnapshot-v32.2.7-linux-arm64-x64.zip -f7e8b50691712206587d81844bd63271f2dd49253c946a5b66bd6f169ccf94d6 *mksnapshot-v32.2.7-linux-armv7l-x64.zip -a0b119abe93c0231601b6c699cce4b78e89def766c24f9a8a06cfab3feca8f6c *mksnapshot-v32.2.7-linux-x64.zip -e3e8a496a1eaf6c8ce623fa4b139e5458cf3ce3702ea3560cded839087b60792 *mksnapshot-v32.2.7-mas-arm64.zip -c03219273c82022c29e277d07ce1d0980d25c22d39269fa3eef9547f57ec410b *mksnapshot-v32.2.7-mas-x64.zip -7684cb9c6f621db05b6e68080fade81f46d0ff8eeac94080bd635f035069d13e *mksnapshot-v32.2.7-win32-arm64-x64.zip -f7ca1d557e3d0f878b13f57dc0e00932f7a97f3dd0f0cc3bbbd565a06718bd17 *mksnapshot-v32.2.7-win32-ia32.zip -d9d8dd33561eb648e5ebd00f99418122d9a915ec63fe967e7cb0ff64ef8ee199 *mksnapshot-v32.2.7-win32-x64.zip +2e7aec01196298a2d8ce2f348a7b7f73cb8aa5b368fc6793411b9b173716383a *chromedriver-v34.1.0-darwin-arm64.zip +beeaeef6fc09cebb0daeae09c77884a3e4ba8e136aa7ff5e7e2b73f9139d0c1c *chromedriver-v34.1.0-darwin-x64.zip +5914d3df6b44207d086eecab2297980f01cd0c2641de9338222547868ca752de *chromedriver-v34.1.0-linux-arm64.zip +4116d2237e5c1aeb829dedc4284e224453577b500b42dcf0854e3dc43eecd584 *chromedriver-v34.1.0-linux-armv7l.zip +a3198d2a4bfcb984e00fe4b4bc9b2bb6c886a1822ff97e99fad570cf5d346de7 *chromedriver-v34.1.0-linux-x64.zip +1be1aff31889fae70833e41f1d2c5c786e982db631f52930976367406bec2e99 *chromedriver-v34.1.0-mas-arm64.zip +8acd9a0d3be0e59fc9ef5eb041afbd8064a0b36e72b255e0266f9cc0d2a32a8e *chromedriver-v34.1.0-mas-x64.zip +ed9ef15dd34a37cc382fb1873b2c7f56a8012551d30fc1b2373d8fb5a7c370e9 *chromedriver-v34.1.0-win32-arm64.zip +97853f50cc657c53f970de66b9709ea2853ac0a7b07f61f5f491538bc9372af9 *chromedriver-v34.1.0-win32-ia32.zip +8342eec7aa41c1c383f13d9d6515ebfb50892e5ac4fe1f42c5111f4c5e2b7e6c *chromedriver-v34.1.0-win32-x64.zip +ed5fdef3441a90c9d7b2425d77575d92ce8c718ecf41caee9ae105b9f0519a2e *electron-api.json +82ee848a4c83c1390453cf1475a4a74a49fc3753ae899266d4db4227fe233a4b *electron-v34.1.0-darwin-arm64-dsym-snapshot.zip +3a45222b3978325b62c31cf85e7c68ce3f58222e53e2ef72acc2be6ed60f264b *electron-v34.1.0-darwin-arm64-dsym.zip +aee0826753792516d01c89edb77dbe6f43d3bd8a30b03288fd0d6d704a7d3f91 *electron-v34.1.0-darwin-arm64-symbols.zip +fce8fd9bd56d0bdfbed5dcaab44538a6b109db688719062d28419970883166de *electron-v34.1.0-darwin-arm64.zip +159d5c354c769bd6c67983f076a399d2c702e29341c06171185d3779dda7ea08 *electron-v34.1.0-darwin-x64-dsym-snapshot.zip +0415b02fa238326269ff32637a7c96f798ebbc5b948091231be036c1dc166260 *electron-v34.1.0-darwin-x64-dsym.zip +eeb1d0188adbeb007acc84328036d870938f1e6634c64f117a90bd05503555c0 *electron-v34.1.0-darwin-x64-symbols.zip +3a6c0ac76faee46d4d3f7be98f0b1f5b3a549589bcb996a21d1f6dccf2b3e986 *electron-v34.1.0-darwin-x64.zip +fb69e1089d16bd6cc8e66f7c517eb8447155497533b779a1becadbea942c537b *electron-v34.1.0-linux-arm64-debug.zip +f048b5257ccf022e4b0d2d69f3775dfe48286a9d375280652eb4394be45d47a0 *electron-v34.1.0-linux-arm64-symbols.zip +a15f59dbe664b3d711cc0f8a7b9693a44ad27a096341d9b9b15f05c880d65e64 *electron-v34.1.0-linux-arm64.zip +fb69e1089d16bd6cc8e66f7c517eb8447155497533b779a1becadbea942c537b *electron-v34.1.0-linux-armv7l-debug.zip +44b53952aa5730d1a1882f1e64a85e52894fb1c970ab334a49e44a4d09ac9db3 *electron-v34.1.0-linux-armv7l-symbols.zip +8136d1a88275d5e4b30c1f7fa2ffda966283d9a062460f844549e3d8cdac8cdd *electron-v34.1.0-linux-armv7l.zip +b66e225ecb4f5821bb2c0c06a587987b93a5c891bf170b2a6f18bd069ac585c2 *electron-v34.1.0-linux-x64-debug.zip +f067ae81ef451c2d5708cc55a37973072462063baca5a6bc57708f57bd7c626a *electron-v34.1.0-linux-x64-symbols.zip +ded3f8a3e603c06529b12c0400f1bbda7ae201863510a5aa8d78ae721773e5aa *electron-v34.1.0-linux-x64.zip +c5078be0a0c8acc9701b8f734909a45d8225aeb81a13a8b114cac16d016b4835 *electron-v34.1.0-mas-arm64-dsym-snapshot.zip +8a948ad2ef24fce9dc4844670a6c1a3f1af99ebb3a8410d666a1d2c8f4660d24 *electron-v34.1.0-mas-arm64-dsym.zip +8b45c07da9fb118416b6ba0217439378675045cd94e3a5340d6e02bde93c9115 *electron-v34.1.0-mas-arm64-symbols.zip +71aa2f5b0c2973b5700e75a24bdeb662d164096ed4bbbabc60629ec81e1c7abe *electron-v34.1.0-mas-arm64.zip +1f186d6067c2055b40d39baf06e4ee43f6b27711e835b86220ce95dfd3c8c29e *electron-v34.1.0-mas-x64-dsym-snapshot.zip +ab7a2fd2fd26932198603ec01194421ab141c4a9d0d9c5831457479ff4d67e3b *electron-v34.1.0-mas-x64-dsym.zip +d91423ac49e20dee1a3250ef3a24ecac48254a9e65a9d9e9826d1e675f9a98d5 *electron-v34.1.0-mas-x64-symbols.zip +c3c49687b910022d66aebecb93118c83035462d69591bc2c218cf21015700567 *electron-v34.1.0-mas-x64.zip +e395b2b2518a680c5632c0d607d04d7886583791b0041ef36e3a3aae6e4fbf18 *electron-v34.1.0-win32-arm64-pdb.zip +c85c78ff1336a7ade70bffe75f19ac71480b5b81462b4997a8bdd218921ea18f *electron-v34.1.0-win32-arm64-symbols.zip +0fb20c9c01fa1748309b4c3ef9ec0d9ec53828b333b7938d811c06923a2e3915 *electron-v34.1.0-win32-arm64-toolchain-profile.zip +b0e2c41af5146f5095c9b6f2de1de4a3332caf76f70142dfd1a2e53fd96f0f56 *electron-v34.1.0-win32-arm64.zip +f921c2c6dd52d5b550967f94d16e6029e829945102c1302e65255f46cab7ad90 *electron-v34.1.0-win32-ia32-pdb.zip +f093520765c39088adae7efd15bf2c13a70b64c6d3592cdfa9e05061b8f6e35f *electron-v34.1.0-win32-ia32-symbols.zip +0fb20c9c01fa1748309b4c3ef9ec0d9ec53828b333b7938d811c06923a2e3915 *electron-v34.1.0-win32-ia32-toolchain-profile.zip +5e5a4a87623920e03ac62b60f6a6cdbb146265437ae1deb20903f40b151eb3f0 *electron-v34.1.0-win32-ia32.zip +900b08d73c26b4277ba8abfb2ff9000b924aeffab910b3f983440f06ad8792b9 *electron-v34.1.0-win32-x64-pdb.zip +f834dc09210e2a326126ffb9b53e727af5fcaa5d900cf2e05bafa78634b3640a *electron-v34.1.0-win32-x64-symbols.zip +0fb20c9c01fa1748309b4c3ef9ec0d9ec53828b333b7938d811c06923a2e3915 *electron-v34.1.0-win32-x64-toolchain-profile.zip +059e628cb591a8eac961b255aa81d64d2b414295ff6984efd2b8fdf3dce9f40a *electron-v34.1.0-win32-x64.zip +52191fc329244f20416d07f2b7353a8eaa1d9e532587ede1211cede0bfbe5f71 *electron.d.ts +6f52f192329cc1df54e35ec94f7d8167790dcedbb1fb5ba7dcb90933df703bac *ffmpeg-v34.1.0-darwin-arm64.zip +801a45f22dfcd70b161b4a90b8cf011f7d7645ff4e140f8e4b214be2fe4dfe41 *ffmpeg-v34.1.0-darwin-x64.zip +3a4c3b1eeac3fdfc6258946ce072e2ef22668463baa3d45e142322f90ed55ebc *ffmpeg-v34.1.0-linux-arm64.zip +5b9e86fc74ecf4fd40f06792b69e402367d51e59be2ad2de1e93ed544c13fcd0 *ffmpeg-v34.1.0-linux-armv7l.zip +ce4a651403b866404353a9a2e2b9e385daf111888040664f3af955c602754b23 *ffmpeg-v34.1.0-linux-x64.zip +8b3aabc3d468229895592e0945222ead389f2c4bf31c2c52d062c1adcb21fbe6 *ffmpeg-v34.1.0-mas-arm64.zip +f5ed2bc39da590aeaf63c5f2ea8fc08b212dcd8d3cb0439802eb7e12d88dada4 *ffmpeg-v34.1.0-mas-x64.zip +e001821ce780541bb36fe6a101060ded7cff20537ea1ca5cdbf4e4a89fb93d45 *ffmpeg-v34.1.0-win32-arm64.zip +f1ef2f7a751b7894cc0bd08a01f8bc13999c769d5453ac1024b2df6d0dfa662d *ffmpeg-v34.1.0-win32-ia32.zip +8edefb7f2920ac87bef2407ff4c3486b295e0e48613cbacdf4211a0090396526 *ffmpeg-v34.1.0-win32-x64.zip +ce2a30a8784c19c446f8a2173c7fd23d0606443cef7c5b2d17bdb3a237d92481 *hunspell_dictionaries.zip +8ceacc2f2230da0431d9f8f7308fd30070a945cb4b95f84eeb977cec942c0019 *libcxx-objects-v34.1.0-linux-arm64.zip +0b6d462f60fd2cdc2282ae7dd239900568019b1b0b22b72b2536227a5c3a2b62 *libcxx-objects-v34.1.0-linux-armv7l.zip +bc53041d9a7cf26dd804e061e5ce72db84bdaa32c1646d7b8baa8bf3203984b3 *libcxx-objects-v34.1.0-linux-x64.zip +2934be982e54f49d9a0e1071cfb1f07890611a9505e9fa3885c534af7b521a12 *libcxx_headers.zip +23be04f992ee37ce8f29ffb9e53bd5bf461c50a91b6eddedaecc9f20b8967937 *libcxxabi_headers.zip +e45742b0a3f607840b7617dcd3ebcb6d3b5f5f88bbb252aba8d519e8287e28c1 *mksnapshot-v34.1.0-darwin-arm64.zip +74c4e22d2a23fa924da5ea3647755e1c24f279656017a9be9d0d494cd6bd6f02 *mksnapshot-v34.1.0-darwin-x64.zip +6eff2e983909137c89672dde61c4382f7f23e4848f3c1c767af90eda65e09c34 *mksnapshot-v34.1.0-linux-arm64-x64.zip +60221b726687a31f629ab703ce4adfa52381170ad23a5fa442ad875b1c231458 *mksnapshot-v34.1.0-linux-armv7l-x64.zip +3bd0ae894f8f124350be423ea25d34b959d13232f95d0843f4da361408d33894 *mksnapshot-v34.1.0-linux-x64.zip +422b1dee280db0b18ad501ede5feb19e41f6e69239d813ecafd49a6e38ebcba7 *mksnapshot-v34.1.0-mas-arm64.zip +78d3201cdcda856dc8b8adf12582e3a270b82e9aff50e070fd0fc3269ec98f22 *mksnapshot-v34.1.0-mas-x64.zip +175d9b23829676b5df18f996ed8d26750d865340302a4cfc98f19bd100e0c194 *mksnapshot-v34.1.0-win32-arm64-x64.zip +1fdb2437733687f079eb6bda27c8df30c358b2bb2b794d0f46c3de1119e7c6e1 *mksnapshot-v34.1.0-win32-ia32.zip +58e2ee0656fae9401b9dbb3e3521bcd414b817eb0894d6167d5a14827acdb76f *mksnapshot-v34.1.0-win32-x64.zip diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js index 3bb58fb1215..8ac57b94d7f 100644 --- a/build/linux/debian/dep-lists.js +++ b/build/linux/debian/dep-lists.js @@ -25,7 +25,7 @@ exports.referenceGeneratedDepsByArch = { 'ca-certificates', 'libasound2 (>= 1.0.17)', 'libatk-bridge2.0-0 (>= 2.5.3)', - 'libatk1.0-0 (>= 2.2.0)', + 'libatk1.0-0 (>= 2.11.90)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.14)', 'libc6 (>= 2.16)', @@ -36,7 +36,6 @@ exports.referenceGeneratedDepsByArch = { 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.9.14)', - 'libdrm2 (>= 2.4.75)', 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', @@ -46,6 +45,7 @@ exports.referenceGeneratedDepsByArch = { 'libnss3 (>= 2:3.30)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', + 'libudev1 (>= 183)', 'libx11-6', 'libx11-6 (>= 2:1.4.99.1)', 'libxcb1 (>= 1.9.2)', @@ -62,7 +62,7 @@ exports.referenceGeneratedDepsByArch = { 'ca-certificates', 'libasound2 (>= 1.0.17)', 'libatk-bridge2.0-0 (>= 2.5.3)', - 'libatk1.0-0 (>= 2.2.0)', + 'libatk1.0-0 (>= 2.11.90)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.16)', 'libc6 (>= 2.17)', @@ -73,7 +73,6 @@ exports.referenceGeneratedDepsByArch = { 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.9.14)', - 'libdrm2 (>= 2.4.75)', 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', @@ -87,6 +86,7 @@ exports.referenceGeneratedDepsByArch = { 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', + 'libudev1 (>= 183)', 'libx11-6', 'libx11-6 (>= 2:1.4.99.1)', 'libxcb1 (>= 1.9.2)', @@ -103,7 +103,7 @@ exports.referenceGeneratedDepsByArch = { 'ca-certificates', 'libasound2 (>= 1.0.17)', 'libatk-bridge2.0-0 (>= 2.5.3)', - 'libatk1.0-0 (>= 2.2.0)', + 'libatk1.0-0 (>= 2.11.90)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.17)', 'libc6 (>= 2.25)', @@ -111,7 +111,6 @@ exports.referenceGeneratedDepsByArch = { 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.9.14)', - 'libdrm2 (>= 2.4.75)', 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', @@ -125,6 +124,7 @@ exports.referenceGeneratedDepsByArch = { 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', + 'libudev1 (>= 183)', 'libx11-6', 'libx11-6 (>= 2:1.4.99.1)', 'libxcb1 (>= 1.9.2)', diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts index e3d78d1139a..df119e8b485 100644 --- a/build/linux/debian/dep-lists.ts +++ b/build/linux/debian/dep-lists.ts @@ -25,7 +25,7 @@ export const referenceGeneratedDepsByArch = { 'ca-certificates', 'libasound2 (>= 1.0.17)', 'libatk-bridge2.0-0 (>= 2.5.3)', - 'libatk1.0-0 (>= 2.2.0)', + 'libatk1.0-0 (>= 2.11.90)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.14)', 'libc6 (>= 2.16)', @@ -36,7 +36,6 @@ export const referenceGeneratedDepsByArch = { 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.9.14)', - 'libdrm2 (>= 2.4.75)', 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', @@ -46,6 +45,7 @@ export const referenceGeneratedDepsByArch = { 'libnss3 (>= 2:3.30)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', + 'libudev1 (>= 183)', 'libx11-6', 'libx11-6 (>= 2:1.4.99.1)', 'libxcb1 (>= 1.9.2)', @@ -62,7 +62,7 @@ export const referenceGeneratedDepsByArch = { 'ca-certificates', 'libasound2 (>= 1.0.17)', 'libatk-bridge2.0-0 (>= 2.5.3)', - 'libatk1.0-0 (>= 2.2.0)', + 'libatk1.0-0 (>= 2.11.90)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.16)', 'libc6 (>= 2.17)', @@ -73,7 +73,6 @@ export const referenceGeneratedDepsByArch = { 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.9.14)', - 'libdrm2 (>= 2.4.75)', 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', @@ -87,6 +86,7 @@ export const referenceGeneratedDepsByArch = { 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', + 'libudev1 (>= 183)', 'libx11-6', 'libx11-6 (>= 2:1.4.99.1)', 'libxcb1 (>= 1.9.2)', @@ -103,7 +103,7 @@ export const referenceGeneratedDepsByArch = { 'ca-certificates', 'libasound2 (>= 1.0.17)', 'libatk-bridge2.0-0 (>= 2.5.3)', - 'libatk1.0-0 (>= 2.2.0)', + 'libatk1.0-0 (>= 2.11.90)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.17)', 'libc6 (>= 2.25)', @@ -111,7 +111,6 @@ export const referenceGeneratedDepsByArch = { 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.9.14)', - 'libdrm2 (>= 2.4.75)', 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', @@ -125,6 +124,7 @@ export const referenceGeneratedDepsByArch = { 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', + 'libudev1 (>= 183)', 'libx11-6', 'libx11-6 (>= 2:1.4.99.1)', 'libxcb1 (>= 1.9.2)', diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index 38649559873..913de4df7d7 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -26,7 +26,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.186:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194: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 46be92eb847..4796980b96e 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.186:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194: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/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js index 6857f6b7c1a..13f32376037 100644 --- a/build/linux/rpm/dep-lists.js +++ b/build/linux/rpm/dep-lists.js @@ -52,7 +52,6 @@ exports.referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.3.3)(64bit)', 'libc.so.6(GLIBC_2.3.4)(64bit)', 'libc.so.6(GLIBC_2.4)(64bit)', - 'libc.so.6(GLIBC_2.5)(64bit)', 'libc.so.6(GLIBC_2.6)(64bit)', 'libc.so.6(GLIBC_2.7)(64bit)', 'libc.so.6(GLIBC_2.8)(64bit)', @@ -63,7 +62,6 @@ exports.referenceGeneratedDepsByArch = { 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', 'libdl.so.2()(64bit)', 'libdl.so.2(GLIBC_2.2.5)(64bit)', - 'libdrm.so.2()(64bit)', 'libexpat.so.1()(64bit)', 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', @@ -87,6 +85,7 @@ exports.referenceGeneratedDepsByArch = { 'libnss3.so(NSS_3.30)(64bit)', 'libnss3.so(NSS_3.4)(64bit)', 'libnss3.so(NSS_3.5)(64bit)', + 'libnss3.so(NSS_3.6)(64bit)', 'libnss3.so(NSS_3.9.2)(64bit)', 'libnssutil3.so()(64bit)', 'libnssutil3.so(NSSUTIL_3.12.3)(64bit)', @@ -103,6 +102,8 @@ exports.referenceGeneratedDepsByArch = { 'libsmime3.so(NSS_3.10)(64bit)', 'libsmime3.so(NSS_3.2)(64bit)', 'libssl3.so(NSS_3.28)(64bit)', + 'libudev.so.1()(64bit)', + 'libudev.so.1(LIBUDEV_183)(64bit)', 'libutil.so.1()(64bit)', 'libutil.so.1(GLIBC_2.2.5)(64bit)', 'libxcb.so.1()(64bit)', @@ -141,7 +142,6 @@ exports.referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.25)', 'libc.so.6(GLIBC_2.28)', 'libc.so.6(GLIBC_2.4)', - 'libc.so.6(GLIBC_2.5)', 'libc.so.6(GLIBC_2.6)', 'libc.so.6(GLIBC_2.7)', 'libc.so.6(GLIBC_2.8)', @@ -152,7 +152,6 @@ exports.referenceGeneratedDepsByArch = { 'libdbus-1.so.3(LIBDBUS_1_3)', 'libdl.so.2', 'libdl.so.2(GLIBC_2.4)', - 'libdrm.so.2', 'libexpat.so.1', 'libgbm.so.1', 'libgcc_s.so.1', @@ -178,6 +177,7 @@ exports.referenceGeneratedDepsByArch = { 'libnss3.so(NSS_3.30)', 'libnss3.so(NSS_3.4)', 'libnss3.so(NSS_3.5)', + 'libnss3.so(NSS_3.6)', 'libnss3.so(NSS_3.9.2)', 'libnssutil3.so', 'libnssutil3.so(NSSUTIL_3.12.3)', @@ -208,6 +208,8 @@ exports.referenceGeneratedDepsByArch = { 'libstdc++.so.6(GLIBCXX_3.4.22)', 'libstdc++.so.6(GLIBCXX_3.4.5)', 'libstdc++.so.6(GLIBCXX_3.4.9)', + 'libudev.so.1', + 'libudev.so.1(LIBUDEV_183)', 'libutil.so.1', 'libutil.so.1(GLIBC_2.4)', 'libxcb.so.1', @@ -245,7 +247,6 @@ exports.referenceGeneratedDepsByArch = { 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', 'libdl.so.2()(64bit)', 'libdl.so.2(GLIBC_2.17)(64bit)', - 'libdrm.so.2()(64bit)', 'libexpat.so.1()(64bit)', 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', @@ -270,6 +271,7 @@ exports.referenceGeneratedDepsByArch = { 'libnss3.so(NSS_3.30)(64bit)', 'libnss3.so(NSS_3.4)(64bit)', 'libnss3.so(NSS_3.5)(64bit)', + 'libnss3.so(NSS_3.6)(64bit)', 'libnss3.so(NSS_3.9.2)(64bit)', 'libnssutil3.so()(64bit)', 'libnssutil3.so(NSSUTIL_3.12.3)(64bit)', @@ -296,6 +298,8 @@ exports.referenceGeneratedDepsByArch = { 'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)', 'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)', 'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)', + 'libudev.so.1()(64bit)', + 'libudev.so.1(LIBUDEV_183)(64bit)', 'libutil.so.1()(64bit)', 'libutil.so.1(GLIBC_2.17)(64bit)', 'libxcb.so.1()(64bit)', diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts index 8fd025e51c2..63b47522d50 100644 --- a/build/linux/rpm/dep-lists.ts +++ b/build/linux/rpm/dep-lists.ts @@ -51,7 +51,6 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.3.3)(64bit)', 'libc.so.6(GLIBC_2.3.4)(64bit)', 'libc.so.6(GLIBC_2.4)(64bit)', - 'libc.so.6(GLIBC_2.5)(64bit)', 'libc.so.6(GLIBC_2.6)(64bit)', 'libc.so.6(GLIBC_2.7)(64bit)', 'libc.so.6(GLIBC_2.8)(64bit)', @@ -62,7 +61,6 @@ export const referenceGeneratedDepsByArch = { 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', 'libdl.so.2()(64bit)', 'libdl.so.2(GLIBC_2.2.5)(64bit)', - 'libdrm.so.2()(64bit)', 'libexpat.so.1()(64bit)', 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', @@ -86,6 +84,7 @@ export const referenceGeneratedDepsByArch = { 'libnss3.so(NSS_3.30)(64bit)', 'libnss3.so(NSS_3.4)(64bit)', 'libnss3.so(NSS_3.5)(64bit)', + 'libnss3.so(NSS_3.6)(64bit)', 'libnss3.so(NSS_3.9.2)(64bit)', 'libnssutil3.so()(64bit)', 'libnssutil3.so(NSSUTIL_3.12.3)(64bit)', @@ -102,6 +101,8 @@ export const referenceGeneratedDepsByArch = { 'libsmime3.so(NSS_3.10)(64bit)', 'libsmime3.so(NSS_3.2)(64bit)', 'libssl3.so(NSS_3.28)(64bit)', + 'libudev.so.1()(64bit)', + 'libudev.so.1(LIBUDEV_183)(64bit)', 'libutil.so.1()(64bit)', 'libutil.so.1(GLIBC_2.2.5)(64bit)', 'libxcb.so.1()(64bit)', @@ -140,7 +141,6 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.25)', 'libc.so.6(GLIBC_2.28)', 'libc.so.6(GLIBC_2.4)', - 'libc.so.6(GLIBC_2.5)', 'libc.so.6(GLIBC_2.6)', 'libc.so.6(GLIBC_2.7)', 'libc.so.6(GLIBC_2.8)', @@ -151,7 +151,6 @@ export const referenceGeneratedDepsByArch = { 'libdbus-1.so.3(LIBDBUS_1_3)', 'libdl.so.2', 'libdl.so.2(GLIBC_2.4)', - 'libdrm.so.2', 'libexpat.so.1', 'libgbm.so.1', 'libgcc_s.so.1', @@ -177,6 +176,7 @@ export const referenceGeneratedDepsByArch = { 'libnss3.so(NSS_3.30)', 'libnss3.so(NSS_3.4)', 'libnss3.so(NSS_3.5)', + 'libnss3.so(NSS_3.6)', 'libnss3.so(NSS_3.9.2)', 'libnssutil3.so', 'libnssutil3.so(NSSUTIL_3.12.3)', @@ -207,6 +207,8 @@ export const referenceGeneratedDepsByArch = { 'libstdc++.so.6(GLIBCXX_3.4.22)', 'libstdc++.so.6(GLIBCXX_3.4.5)', 'libstdc++.so.6(GLIBCXX_3.4.9)', + 'libudev.so.1', + 'libudev.so.1(LIBUDEV_183)', 'libutil.so.1', 'libutil.so.1(GLIBC_2.4)', 'libxcb.so.1', @@ -244,7 +246,6 @@ export const referenceGeneratedDepsByArch = { 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', 'libdl.so.2()(64bit)', 'libdl.so.2(GLIBC_2.17)(64bit)', - 'libdrm.so.2()(64bit)', 'libexpat.so.1()(64bit)', 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', @@ -269,6 +270,7 @@ export const referenceGeneratedDepsByArch = { 'libnss3.so(NSS_3.30)(64bit)', 'libnss3.so(NSS_3.4)(64bit)', 'libnss3.so(NSS_3.5)(64bit)', + 'libnss3.so(NSS_3.6)(64bit)', 'libnss3.so(NSS_3.9.2)(64bit)', 'libnssutil3.so()(64bit)', 'libnssutil3.so(NSSUTIL_3.12.3)(64bit)', @@ -295,6 +297,8 @@ export const referenceGeneratedDepsByArch = { 'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)', 'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)', 'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)', + 'libudev.so.1()(64bit)', + 'libudev.so.1(LIBUDEV_183)(64bit)', 'libutil.so.1()(64bit)', 'libutil.so.1(GLIBC_2.17)(64bit)', 'libxcb.so.1()(64bit)', diff --git a/cgmanifest.json b/cgmanifest.json index 1795c44c937..865be1331ce 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "545591e4a0b85ce8937a0ce751bacdc0fe92f1ed" + "commitHash": "84f6285324151a9aeb0422e3683e4ff85b9f77c8" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "128.0.6613.186" + "version": "132.0.6834.194" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "3007f859dad930ae80bafffc6042a146a45e4e4d" + "commitHash": "c1918f96cb88b61be2b54589f98038c01a0881de" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "32.2.7" + "version": "34.1.0" }, { "component": { diff --git a/package-lock.json b/package-lock.json index e4c0c0f3c70..4341d5c7dc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -96,7 +96,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "32.2.7", + "electron": "34.1.0", "eslint": "^9.11.1", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", @@ -6097,9 +6097,9 @@ "dev": true }, "node_modules/electron": { - "version": "32.2.7", - "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.7.tgz", - "integrity": "sha512-y8jbQRG3xogF70XPlk5c+dWe5iRfUBo28o2NMpKd/CcW7ENIaWtBlGima8/8nmRdAaYTy1+yIt6KB0Lon9H8cA==", + "version": "34.1.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-34.1.0.tgz", + "integrity": "sha512-ZUid8XrGPA0dfes97PPADc8ecWOUX/qYRNp1glze9coZLEYc+PsMvgjVDCHSvjfHfiI+V3unwngSVpBouX71YQ==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index 660b9341320..a35c5308b25 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.98.0", - "distro": "2d3521bc04c6b0b6b4b39d4a158680769e64993e", + "distro": "78e49eafa8cffd4c3e34aa87415fdbb3faf870f5", "author": { "name": "Microsoft Corporation" }, @@ -154,7 +154,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "32.2.7", + "electron": "34.1.0", "eslint": "^9.11.1", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", diff --git a/src/main.ts b/src/main.ts index 1504375283f..7e2ab209c01 100644 --- a/src/main.ts +++ b/src/main.ts @@ -306,6 +306,11 @@ function configureCommandlineSwitchesSync(cliArgs: NativeParsedArgs) { app.commandLine.appendSwitch('js-flags', jsFlags); } + // Use portal version 4 that supports current_folder option + // to address https://github.com/microsoft/vscode/issues/213780 + // Runtime sets the default version to 3, refs https://github.com/electron/electron/pull/44426 + app.commandLine.appendSwitch('xdg-portal-required-version', '4'); + return argvConfig; } diff --git a/src/vs/base/parts/ipc/electron-main/ipcMain.ts b/src/vs/base/parts/ipc/electron-main/ipcMain.ts index 9a46b9e85bf..0f8985406a6 100644 --- a/src/vs/base/parts/ipc/electron-main/ipcMain.ts +++ b/src/vs/base/parts/ipc/electron-main/ipcMain.ts @@ -111,7 +111,7 @@ class ValidatedIpcMain implements Event.NodeEventEmitter { const sender = event.senderFrame; - const url = sender.url; + const url = sender?.url; // `url` can be `undefined` when running tests from playwright https://github.com/microsoft/vscode/issues/147301 // and `url` can be `about:blank` when reloading the window // from performance tab of devtools https://github.com/electron/electron/issues/39427. @@ -133,7 +133,7 @@ class ValidatedIpcMain implements Event.NodeEventEmitter { return false; // unexpected sender } - if (sender.parent !== null) { + if (sender?.parent !== null) { onUnexpectedError(`Refused to handle ipcMain event for channel '${channel}' because sender of origin '${host}' is not a main frame.`); return false; // unexpected frame } diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 47481c0de3f..9c7c68572b6 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -167,11 +167,17 @@ export class CodeApplication extends Disposable { const allowedPermissionsInWebview = new Set([ 'clipboard-read', 'clipboard-sanitized-write', + // TODO(deepak1556): Should be removed once migration is complete + // https://github.com/microsoft/vscode/issues/239228 + 'deprecated-sync-clipboard-read', ]); const allowedPermissionsInCore = new Set([ 'media', 'local-fonts', + // TODO(deepak1556): Should be removed once migration is complete + // https://github.com/microsoft/vscode/issues/239228 + 'deprecated-sync-clipboard-read', ]); session.defaultSession.setPermissionRequestHandler((_webContents, permission, callback, details) => { @@ -202,7 +208,7 @@ export class CodeApplication extends Disposable { const supportedSvgSchemes = new Set([Schemas.file, Schemas.vscodeFileResource, Schemas.vscodeRemoteResource, Schemas.vscodeManagedRemoteResource, 'devtools']); // But allow them if they are made from inside an webview - const isSafeFrame = (requestFrame: WebFrameMain | undefined): boolean => { + const isSafeFrame = (requestFrame: WebFrameMain | null | undefined): boolean => { for (let frame: WebFrameMain | null | undefined = requestFrame; frame; frame = frame.parent) { if (frame.url.startsWith(`${Schemas.vscodeWebview}://`)) { return true; diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts index e0756ae8946..ba88dab2f39 100644 --- a/src/vs/platform/environment/common/argv.ts +++ b/src/vs/platform/environment/common/argv.ts @@ -147,4 +147,5 @@ export interface NativeParsedArgs { 'trace-startup-format'?: string; 'trace-startup-file'?: string; 'trace-startup-duration'?: string; + 'xdg-portal-required-version'?: string; } diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index 606aa8b277f..eb2fc365d59 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -211,6 +211,7 @@ export const OPTIONS: OptionDescriptions> = { 'trace-startup-format': { type: 'string' }, 'trace-startup-file': { type: 'string' }, 'trace-startup-duration': { type: 'string' }, + 'xdg-portal-required-version': { type: 'string' }, _: { type: 'string[]' } // main arguments }; diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts index f5461c31241..d8720996b91 100644 --- a/src/vs/platform/windows/electron-main/windows.ts +++ b/src/vs/platform/windows/electron-main/windows.ts @@ -151,7 +151,10 @@ export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowSt // Enable experimental css highlight api https://chromestatus.com/feature/5436441440026624 // Refs https://github.com/microsoft/vscode/issues/140098 enableBlinkFeatures: 'HighlightAPI', - sandbox: true + sandbox: true, + // TODO(deepak1556): Should be removed once migration is complete + // https://github.com/microsoft/vscode/issues/239228 + enableDeprecatedPaste: true, }, experimentalDarkMode: true };