diff --git a/.npmrc b/.npmrc index b6b2ee025a5..63aadeda2af 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="42.5.0" -ms_build_id="14525058" +target="42.6.0" +ms_build_id="14623276" runtime="electron" ignore-scripts=false build_from_source="true" diff --git a/.nvmrc b/.nvmrc index 1dd37d53743..ca5c350055c 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -24.17.0 +24.18.0 diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index b9dc1d80b99..df123593b1a 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -39,7 +39,7 @@ EOF if [ "$npm_config_arch" == "x64" ]; then # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/148.0.7778.271/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/148.0.7778.280/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux # Download libcxx headers and objects from upstream electron releases DEBUG=libcxx-fetcher \ @@ -51,9 +51,9 @@ if [ "$npm_config_arch" == "x64" ]; then # Set compiler toolchain # Flags for the client build are based on - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.271:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.271:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.271:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.280:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.280:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.280:build/config/c++/BUILD.gn export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu" export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu" export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -DSPDLOG_USE_STD_FORMAT -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE --sysroot=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 37aeada5f98..d32c6c6153d 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -f46a52e829e4e8d294887346e2cd65a43cda3cf0c4988f9e8c40bff083b21ca0 *chromedriver-v42.5.0-darwin-arm64.zip -95ea8ac2949531f92a69e935345fb5f2c49dabb4d03244e90431b54e4177d66c *chromedriver-v42.5.0-darwin-x64.zip -217eff942b1fb63767a2fccdf309b8af67bc85dcbe5b6a626159706f8b0f6549 *chromedriver-v42.5.0-linux-arm64.zip -af76c74bebd454a43e6ed463eba64b2d635661203c31bca8efbe829169f1df2a *chromedriver-v42.5.0-linux-armv7l.zip -ada1322977b76a42c97baa12a9388fb3d33e6043a9d4380ded3ccd003c9f3481 *chromedriver-v42.5.0-linux-x64.zip -9a1fc333f04178abc4985596ff5e6843e857d63bc05be8ae9b8d39adc184890c *chromedriver-v42.5.0-mas-arm64.zip -7c1357049a4f4d87e86f80f002b948dbd77f2987002c05d09f67495ae38d6235 *chromedriver-v42.5.0-mas-x64.zip -619bb88746f6708d9f291847ec8f9a360b9dd799cdda96c2125e6e64f6ba5dc6 *chromedriver-v42.5.0-win32-arm64.zip -d3cf1b135f8fd9c27d5736f64b4afd1044b851ba3122c7a0985188aba94f2df0 *chromedriver-v42.5.0-win32-ia32.zip -a22ffa5f552adf98609ce15511133f8d3d2a0dee3f7be21cbf252bac98364ef6 *chromedriver-v42.5.0-win32-x64.zip -9600be1460e73162fa0bc04b0d27f6af9f87af9c9e8c1979feeb81777a984fce *electron-api.json -d32ee862313327486bfe33c2d91d404d4ee20146773c8a5f87bd418f8a8e9a91 *electron-v42.5.0-darwin-arm64-dsym-snapshot.zip -606a47375b0e48343d3a96d3bada5add9e26768036edecbdb6e6f1aea754e55e *electron-v42.5.0-darwin-arm64-dsym.tar.xz -155e135264dfe1b4109140acc23e321e00495516089937ee0909ff3e70a9447f *electron-v42.5.0-darwin-arm64-symbols.zip -5e392f66b3f6d13caa6d50bbe10fce3d848ca16c5680529357aa26c5da58a1e6 *electron-v42.5.0-darwin-arm64.zip -7a4691f6648a10dfb3315a45e1ce4c297a606d1c475b65fbb5c9d80688cbb0bb *electron-v42.5.0-darwin-x64-dsym-snapshot.zip -fc620d7787958dbe74dc9acaf42fe35fcdbba7f0c727b376e979b1b86e0d99c9 *electron-v42.5.0-darwin-x64-dsym.tar.xz -9fca997d9f6187b398730b69819e3643dc182b869e1ad0b80a7b5e1cc55a9ad1 *electron-v42.5.0-darwin-x64-symbols.zip -ca4792d47e74a6afce1d39a019f201d1a47fa81fcf4e8bcaac6fe5756f172940 *electron-v42.5.0-darwin-x64.zip -f144b1025a7b8c5bf34cfbc6f17f47e594db186de4b5647286d40618c8efd5c4 *electron-v42.5.0-linux-arm64-debug.zip -54878afd06169b12e1e2908319883d2e3ecd4a3fc39187152a4110f13a20db46 *electron-v42.5.0-linux-arm64-symbols.zip -0188f1d86efe785e5721cfaa1ae51d6ef68260705c30037d0d271aaaf78af315 *electron-v42.5.0-linux-arm64.zip -d58cf9b92c9e74885d6fd0ea0740602fa368d87967ed35b8286aaf4170e053e1 *electron-v42.5.0-linux-armv7l-debug.zip -45cfe194be6c3af8c8f4f04e83d26cea2f0d01d822d6d0d39cf24ef11298b6f3 *electron-v42.5.0-linux-armv7l-symbols.zip -360ff6d128be77be83fb3eaf458380fdca226be06f247551049fe3b6ef8ac382 *electron-v42.5.0-linux-armv7l.zip -a0fad46643b7bf6bfce7b2d0a3bd26166079e81e0581d9f3420484984e135c4b *electron-v42.5.0-linux-x64-debug.zip -3c1a4dc6c79bad3d9bc7d3af17b22bc3c97543c27a49b18d852b9eeb3ced2c0a *electron-v42.5.0-linux-x64-symbols.zip -6705a9d0cc5c8f225d705d6e1c2607b2b5be8667d2befb18cdafe8b7b29b8008 *electron-v42.5.0-linux-x64.zip -11b3c08d04f8e89983bff6ee1fc872f8d94f0a92c07311c81da6ac493cbedcc9 *electron-v42.5.0-mas-arm64-dsym-snapshot.zip -1ed2d9702069c699e143366d86e24398349072209459d23883c8bda74f62a161 *electron-v42.5.0-mas-arm64-dsym.tar.xz -7a474a3498973aeb9344c193a383e3590fde4ce083b0f0d51a0eced4f6d31ac6 *electron-v42.5.0-mas-arm64-symbols.zip -33166a8b868cd6624cb0d70847b42067219a2f532050d1cdd128d8d7eb9f2b74 *electron-v42.5.0-mas-arm64.zip -b6eaf6f40e20f196974f675c936a2d25c97a3f660faecba8978fd59b838a7b40 *electron-v42.5.0-mas-x64-dsym-snapshot.zip -30ca0601ba38e804152d16805eb01b05a60452359ce3d6b9cebb1e21d024f4dc *electron-v42.5.0-mas-x64-dsym.tar.xz -5da55d91f5b4159f4bc6fa4831b995b621dcab6ef60d20d64aaf074dcba3943c *electron-v42.5.0-mas-x64-symbols.zip -b2c23925f3d6561dadc8f563576b7a222ea20606a8002986e5937bd066710870 *electron-v42.5.0-mas-x64.zip -d7cea2c82487a4af809c181c99cec529d0a00c86fcfc70684d9a2c5c0d295212 *electron-v42.5.0-win32-arm64-pdb.zip -2799cffe27425316d27336fc03d8c77581aa8e65e27964104da68d7780b1a040 *electron-v42.5.0-win32-arm64-symbols.zip -8e245a0179165d88b82f382dda3f68d0851a2f4b21b14b833b9b7c4374d7da3a *electron-v42.5.0-win32-arm64-toolchain-profile.zip -765370134fdd2dd851bb019d7b7d9379ed7087f288eb8bee4043b42cfd9c33d8 *electron-v42.5.0-win32-arm64.zip -d4b34eb9e4e1ac77f11a0be51d39e94548362d1df63f6b7675016e6cb7b9b904 *electron-v42.5.0-win32-ia32-pdb.zip -eaa1fa1bc6bb14f8877e8ec930b90d9cdbc9dc41765cf530f2c5e6aca1da1fe8 *electron-v42.5.0-win32-ia32-symbols.zip -8e245a0179165d88b82f382dda3f68d0851a2f4b21b14b833b9b7c4374d7da3a *electron-v42.5.0-win32-ia32-toolchain-profile.zip -aa040c36074046a723fca9173aac1c8bf70c19d8a156215e8dbeb17ea37f588b *electron-v42.5.0-win32-ia32.zip -615726602fd5d697c12fc9b66de28343919631b24ab1179d83da46508e8a87d4 *electron-v42.5.0-win32-x64-pdb.zip -a913f632a979b7b7fb964b4d43ad45976638a5673cec1b6a69fd6572f57adc0d *electron-v42.5.0-win32-x64-symbols.zip -8e245a0179165d88b82f382dda3f68d0851a2f4b21b14b833b9b7c4374d7da3a *electron-v42.5.0-win32-x64-toolchain-profile.zip -127bbf7a755b438612c076b22baee258a87cd3d07168cc82ea46ffc015936114 *electron-v42.5.0-win32-x64.zip -21ead4c9c384849887ca8cac0a2a7a683d0cf90a3b62a2a2ba8519224e16e249 *electron.d.ts -45d8022f3bd67995d90242c5176c832fdf3abbdaac575b2469ca0537d0eb58db *ffmpeg-v42.5.0-darwin-arm64.zip -3a5e8f19fd4aa38b3d31eeb7da40f0434e87703050912fc0ca9dbca2de06f0e2 *ffmpeg-v42.5.0-darwin-x64.zip -9efdc919ffd357f00f080a8b1e1baeea19dcfc3164ea02d5cd12b93f85e67b73 *ffmpeg-v42.5.0-linux-arm64.zip -2e24581796500f7d6ed0c16076d74b7fe0b7cf625844623535077df03886bc26 *ffmpeg-v42.5.0-linux-armv7l.zip -78e8d6fd7432e6cbf4ef024728b46aa0b7fa292a598fbbadcc42474f87380d42 *ffmpeg-v42.5.0-linux-x64.zip -28e44748d48b6168aefde8601225c5f3dfb9404d616de2e6035c634354e0a6ac *ffmpeg-v42.5.0-mas-arm64.zip -0bdb9e4050c4159935e8640d0facd6e868583d921386e9c2a5bf3c550c5baf3c *ffmpeg-v42.5.0-mas-x64.zip -81a1c0273c172f140fbf261c194d7ae7369a1e7abe27cae413c8590e2bca4cad *ffmpeg-v42.5.0-win32-arm64.zip -87cffd235b85029c21a1e962132b608209e9929d2a22611985fda317cfe7e95f *ffmpeg-v42.5.0-win32-ia32.zip -497790a714fffc090d217b66332dfe6896609aa24293dc3fb4effce57fe29c82 *ffmpeg-v42.5.0-win32-x64.zip -6db69261ec30c95e30cc3bcd526e8fcec59cd1ad785a7985e520f77bc974a03c *hunspell_dictionaries.zip -441e5c5d7ac9407438d1f2a9974bbc0ef1c3a28e9408051f577e790cd6c6d171 *libcxx-objects-v42.5.0-linux-arm64.zip -99a3a1f895debddf023f01631c2c2b81911992bbbc514718d2ad24599040e4da *libcxx-objects-v42.5.0-linux-armv7l.zip -c7e4c5c5ac5505f97a555cc21bd09014a2e740e5d25e999f2bdc7542a86256e0 *libcxx-objects-v42.5.0-linux-x64.zip -92cdadcc04957db6e7b65421790f77f56bc0c8e6dc1407ad1adbfbdf83dbbc06 *libcxx_headers.zip -a169c9558951055efc054d31c3b4c8a04aa588ef1533b4456b6b27950d121994 *libcxxabi_headers.zip -9611bdee31d4464a8b06e9d44e99adf290a898969a502cfc9ac5616ae1026a0c *mksnapshot-v42.5.0-darwin-arm64.zip -89f7e234802958438a115c96b2f6207153f776a13b07247947fd2e5ca9b1ce3d *mksnapshot-v42.5.0-darwin-x64.zip -2a6d92eb9eb89419dc3b2ab1287329acc16955a62833d32bda2bd90ded45a5b0 *mksnapshot-v42.5.0-linux-arm64-x64.zip -391263da6782b2536067113ce7dab8ef19d9b3d59a74430fef59a4d8a7364502 *mksnapshot-v42.5.0-linux-armv7l-x64.zip -f7752a92ad45041e0c00a74bdc10a0d13574849ad944ba2b3424dc255460465f *mksnapshot-v42.5.0-linux-x64.zip -b9425403b15e273be565d7a937c7d28fc09f421df9fa4d376d6932bfecc91ff5 *mksnapshot-v42.5.0-mas-arm64.zip -a7b7230be427b849f31467298c2c4a934c7273e731ea17513c5790c6d66c8205 *mksnapshot-v42.5.0-mas-x64.zip -4a32b6558fb9aaae703cdc2e6a87ce05e95184e6d0e49e350a956c0908724ef7 *mksnapshot-v42.5.0-win32-arm64-x64.zip -ca73fb8ef0d6e4cf92f569a0dee9770f13166e67be68b12688a7ecaa630a2163 *mksnapshot-v42.5.0-win32-ia32.zip -d8a484f4f3347d7fd73bc4af59ce743e90e14fe7743a1be5ea09452e9c3bbd5b *mksnapshot-v42.5.0-win32-x64.zip +3d9e4a137f245ba7bb299398c58a27706bb15f1946abadcd3397b473caf04285 *chromedriver-v42.6.0-darwin-arm64.zip +3c2e64c618b425b7a9d0aee0a3b325e1c49c55bdab22f738387fb7718929c3e0 *chromedriver-v42.6.0-darwin-x64.zip +12eefccaec789ce159802567b24c941f42edf93c1b11984109a94d89a5a4b9b8 *chromedriver-v42.6.0-linux-arm64.zip +df4d443d10f6dc472c480f6e6a2e25dae4957aab14cb88245f3ff8b2bd62d916 *chromedriver-v42.6.0-linux-armv7l.zip +41953afa1b0cd3aac545c250f578281738029622ecabfb0fbfe7d791977858f4 *chromedriver-v42.6.0-linux-x64.zip +f3a36803b7a9b0b876c819202223c142c6d4542d4657570c2d6cdaca43e5f79d *chromedriver-v42.6.0-mas-arm64.zip +fec6343940b1a06464757e6e56292c22038357fc684255f1296c6b28335f6640 *chromedriver-v42.6.0-mas-x64.zip +325c6c21d81757202cdb2d8b84608fb020575d9bea08d4f7531d3b02c10f6442 *chromedriver-v42.6.0-win32-arm64.zip +0736e562369b25fa711819f643c63a2e993557a336f699b4bc867bbbccc3e935 *chromedriver-v42.6.0-win32-ia32.zip +cc111aa1baa1713cd0e2abc2491885b914a36d6ad6d27a292eae07e47592ff1b *chromedriver-v42.6.0-win32-x64.zip +a765034ea82f97f8f7777151263482fe14da4d00aa590b24dd2637b7c8033170 *electron-api.json +9810d2d076108bea8e9bf4609bb4c3ed1c91b9661cebb28e3300729593211ec5 *electron-v42.6.0-darwin-arm64-dsym-snapshot.zip +aafe3d51ab991b30557a56b187685dc6e3eb2f924aed8a199ad44802a915cab7 *electron-v42.6.0-darwin-arm64-dsym.tar.xz +dc02ae59d8a4b087d666a4ca048d037aa15dbbfd2c2545af4c6e47152b9fcd05 *electron-v42.6.0-darwin-arm64-symbols.zip +331c4b3f024e4a019861ae389654c060715218bc3ec129f72eaa02449c96f1bf *electron-v42.6.0-darwin-arm64.zip +88ca2ba1978b41a532281c8ddca187e04906fc4f24e1a6fbaf93f85c9e5817fb *electron-v42.6.0-darwin-x64-dsym-snapshot.zip +66e0e1ed04ff346252e784f451c4c408d8dd4b9bee7ecec3a6c139b3f58507ec *electron-v42.6.0-darwin-x64-dsym.tar.xz +425e8e067915b92bf63c95d852ab34df1e2870d7afa71050db74f0edfb47aa14 *electron-v42.6.0-darwin-x64-symbols.zip +2ccd775c1d6aadf50a28b97f09631061d3cfd10db50a7ee5cbe70c03b987defc *electron-v42.6.0-darwin-x64.zip +b1b9e4addd5181543a561ccc8e9f5f2f191213d946699a8881473de59d76e3bc *electron-v42.6.0-linux-arm64-debug.zip +294db38886797f2b9428f7a88d0df5d25f55ab2993418009100e518823dc142f *electron-v42.6.0-linux-arm64-symbols.zip +8e3c69721cc7b009381a5be82f3fa0335d3a4420963bcd0f300c38dc072e1510 *electron-v42.6.0-linux-arm64.zip +9ccfcbeb9d1665930daa261a6522ae8e3477a2850be101a9e5df1610f5e918df *electron-v42.6.0-linux-armv7l-debug.zip +57aad752ab4cbc5309c838c5c5e0e71d264c4b8b616cc220480afe187c182c0a *electron-v42.6.0-linux-armv7l-symbols.zip +4838acb4ea6cbbebd6653b864702cceafef18032077166a9c3f7d9ef901c78a4 *electron-v42.6.0-linux-armv7l.zip +418f36d78b9b80a1c5a34ced3233c504b3de62d5964788c748e90bb4a0e2da06 *electron-v42.6.0-linux-x64-debug.zip +d1566df581edaa5e7308eb29ea3717c3800593f23f7b0465b7661cfbbce50fb8 *electron-v42.6.0-linux-x64-symbols.zip +aee1496b561509a6b7fd8ae1b2bc1bdb6f9a303966ddc7cff4989674ce8e043a *electron-v42.6.0-linux-x64.zip +0f670bc4a21e4207444d8e9be3334674bccbf735d03f3083e47c99e6440ab2da *electron-v42.6.0-mas-arm64-dsym-snapshot.zip +0a9e076859bfcf5387580e782f6f023eedcc807850d6aec3b62ddd622c47f6b3 *electron-v42.6.0-mas-arm64-dsym.tar.xz +f486b10bb98a63ab7d72d448c37cfffd6efdf75cfeb99f50ec7aa6afdb26cbfa *electron-v42.6.0-mas-arm64-symbols.zip +68480148c2ece0dcd359ec492cc0edba499beddfe39a7a7a91084ab72b552ba9 *electron-v42.6.0-mas-arm64.zip +8f047ed09fce7725df1e8682c546f29e6fbfb5e21186653bdab9be8464dcc37b *electron-v42.6.0-mas-x64-dsym-snapshot.zip +7c38d6e3bbc01a1eccd3513ae188a8f50dc55ee4204c74066cca9d0f898c08c5 *electron-v42.6.0-mas-x64-dsym.tar.xz +2be7778ea2efadd04cfc51ef1aa3eeb7fae21e41bedecff76b7aab0511a8a468 *electron-v42.6.0-mas-x64-symbols.zip +59ba0da7e78f2f9aba04c15e421b1a4c732ec56a0ba8ae4770af2d28ffd4bab0 *electron-v42.6.0-mas-x64.zip +97a391c6ba7bdc47792ca5371897949f13e6ebea955dc747d8454dbb6a8420c1 *electron-v42.6.0-win32-arm64-pdb.zip +930e19de4d6ab652c2984a393e5f32b92a24297188838d7cc022aae725e37ce1 *electron-v42.6.0-win32-arm64-symbols.zip +8e245a0179165d88b82f382dda3f68d0851a2f4b21b14b833b9b7c4374d7da3a *electron-v42.6.0-win32-arm64-toolchain-profile.zip +6521c1976e045f84442408d54711a88e0daae447ae98fd0decc3441cef6993f6 *electron-v42.6.0-win32-arm64.zip +43f6b3fc7b11398badec8d4d50706facb0ade0ae85ca4561c31a7f2b3cce16fc *electron-v42.6.0-win32-ia32-pdb.zip +db3e7c3c87f6c64dc58b2f281baca73973f04c11f34f6d13f0d1d76141388d4f *electron-v42.6.0-win32-ia32-symbols.zip +8e245a0179165d88b82f382dda3f68d0851a2f4b21b14b833b9b7c4374d7da3a *electron-v42.6.0-win32-ia32-toolchain-profile.zip +5922aa0e5ca4491d96d7c8d3a2063bce2d760984456ffd6d1553f38317571016 *electron-v42.6.0-win32-ia32.zip +6af75d7cc3548bcb5d8ffd50f3a4335e99ad89027e3d887dcc0b98954dbeaa67 *electron-v42.6.0-win32-x64-pdb.zip +a09dc87916de52312ca33ff84394977a8e8c6b620f2264d7f79e742746362744 *electron-v42.6.0-win32-x64-symbols.zip +8e245a0179165d88b82f382dda3f68d0851a2f4b21b14b833b9b7c4374d7da3a *electron-v42.6.0-win32-x64-toolchain-profile.zip +d40eb2429582c384e134634e07bf4e23666db8b9909ee38d8f13334e21511a23 *electron-v42.6.0-win32-x64.zip +1498b4d4533c4d6f85084b90f6bf49ed03b9d40524c1e7ee0e5d44cfbf3b1d8a *electron.d.ts +070a30e9cabb2884d19909df2547e94f026bf16d1128c21692758ecf54405651 *ffmpeg-v42.6.0-darwin-arm64.zip +f4e4a9fc847de637d607b3544139f3c37e96b4da13f8e862ebd8eff599c034dd *ffmpeg-v42.6.0-darwin-x64.zip +35d05568f3e4674c1b01d8e441f4b54f2c8f22107b728b630370f7bc1ce89a89 *ffmpeg-v42.6.0-linux-arm64.zip +2e24581796500f7d6ed0c16076d74b7fe0b7cf625844623535077df03886bc26 *ffmpeg-v42.6.0-linux-armv7l.zip +1aeffd0763761b6bca7db63e963f0b3f27300f2f934006525cc6605fa4c3f522 *ffmpeg-v42.6.0-linux-x64.zip +dcf33371df0136f12fb8b9c7f6e3a6c06b7aa30ae4edfc65369f4d0312ac8f0d *ffmpeg-v42.6.0-mas-arm64.zip +0765a733bc2220018262d6f711b8f9c01393eed9b6bca8bfeb8f67e96ce7f8db *ffmpeg-v42.6.0-mas-x64.zip +4f658e5d91dc03dae6ef67d7d89f0eec3c6bdadeebaef00ff790a65f0bc864c0 *ffmpeg-v42.6.0-win32-arm64.zip +65bc3d6bb32fb5e83aa1ab45c72085562de2ba85911135bc64e8b7ef5fa77bb8 *ffmpeg-v42.6.0-win32-ia32.zip +548ab3d9add928c98f2013b55a113579a48f6f7f8a2b6075db06b6806f0d4eea *ffmpeg-v42.6.0-win32-x64.zip +5df7178ac274809ece78d30fe9bf70c3a3dd4771e0093bb974bd3d6675333c99 *hunspell_dictionaries.zip +af64eb5b3653de4acc8f7e58d917d170cd113c278d53306eeb7eb6c3e81c6498 *libcxx-objects-v42.6.0-linux-arm64.zip +152ed45b46032a05ec8803ee687ec9854d6cabdcfef73f9367146e6b494db519 *libcxx-objects-v42.6.0-linux-armv7l.zip +64b375d055be84c9a221225c266d9f715816786513f626a41240e05f848add40 *libcxx-objects-v42.6.0-linux-x64.zip +1f36e09c5541dd18961568c9fd288ba49c3cee5732a8514b0cc4e69871281aec *libcxx_headers.zip +0ccd65db7b9278d87d7de7456c8936fc907f1601fd9f915436e59f84d7e602d5 *libcxxabi_headers.zip +985339c8a7590b51c33a3ba1ca84aab75a6c9b1d6d5f56231fd501d5e619d72d *mksnapshot-v42.6.0-darwin-arm64.zip +65d072a26335c70155628e6983ff92fe4b7063998ff2e06d8ed0624cdcc628ff *mksnapshot-v42.6.0-darwin-x64.zip +a07296b8cd64ba6516941a4cccd5807eabc849791de94832a8ed91094eb5f922 *mksnapshot-v42.6.0-linux-arm64-x64.zip +089cf2ec2ef8c84b9319faec55c6480b952b6d05596b146d4402372340632980 *mksnapshot-v42.6.0-linux-armv7l-x64.zip +573954c320723bc74a75b1849e0f1b249336b4f7b75fe29f845331429e347e59 *mksnapshot-v42.6.0-linux-x64.zip +f84c01cc815f51aa6da9d3acf8ea877813500d181ceed416bc3bed03567cd49e *mksnapshot-v42.6.0-mas-arm64.zip +c67baaaf24073c8b760261fc60d5077e7e20b2cf20ee80f64a9a59c8ad167936 *mksnapshot-v42.6.0-mas-x64.zip +19a8d075d25a4f0b484e6c5f0503f886ea6e6b33f7ad84e67b27a0fa1750a3f7 *mksnapshot-v42.6.0-win32-arm64-x64.zip +1ab80ccba251ea748762e1c071f725e6bbbd5b945199d92f4f7b066e6f2e364b *mksnapshot-v42.6.0-win32-ia32.zip +8df671d90ec18b82022b50ca107f5fe6a350303b139c7446813887bbb3084892 *mksnapshot-v42.6.0-win32-x64.zip diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt index a787f4a19a9..f7e86a6a78e 100644 --- a/build/checksums/nodejs.txt +++ b/build/checksums/nodejs.txt @@ -1,6 +1,6 @@ -4fc3266a3702eebc39cc37661cf4eeceeade307e242ab64e4d7ce7949197e11f node-v24.17.0-darwin-arm64.tar.gz -80da552fe037290cb130e9dea590f5eeeb7aa450636f0c89ab41415511c1ec27 node-v24.17.0-darwin-x64.tar.gz -faa0d59ba7fe7045c950ed09b190578fb8eee73e4358686d38fcc99ca58c1480 node-v24.17.0-linux-arm64.tar.gz -e0472427aa791ad80bdc426ff7cc73cdd28ed0f616d1ff9689a23a7f47f1265f node-v24.17.0-linux-x64.tar.gz -44999f9ec6486d01202d8961f343eac8c9f2847b234a8637c3fd0f1e2bb3288a win-arm64/node.exe -c6335d08331c23d68b9f2b18adb102002d76ef150b47248e954c507e0d033664 win-x64/node.exe +e1a97e14c99c803e96c7339403282ea05a499c32f8d83defe9ef5ec66f979ed1 node-v24.18.0-darwin-arm64.tar.gz +dfd0dbd3e721503434df7b7205e719f61b3a3a31b2bcf9729b8b91fea240f080 node-v24.18.0-darwin-x64.tar.gz +6b4484c2190274175df9aa8f28e2d758a819cb1c1fe6ab481e2f95b463ab8508 node-v24.18.0-linux-arm64.tar.gz +783130984963db7ba9cbd01089eaf2c2efb055c7c1693c943174b967b3050cb8 node-v24.18.0-linux-x64.tar.gz +c7225670c3f477778e18c43a55867f7a0d76468221245e5981ab80eb953c8102 win-arm64/node.exe +9a4eb5f1c29c6a2e93852ead46b999e284a6a5ca8bab4d4e241d587d025a52de win-x64/node.exe diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts index d7bd81ccd10..7db8c4b5dde 100644 --- a/build/linux/debian/dep-lists.ts +++ b/build/linux/debian/dep-lists.ts @@ -36,6 +36,7 @@ export const referenceGeneratedDepsByArch = { 'libc6 (>= 2.28)', 'libc6 (>= 2.4)', 'libcairo2 (>= 1.6.0)', + 'libcups2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.9.14)', 'libexpat1 (>= 2.1~beta3)', @@ -74,6 +75,7 @@ export const referenceGeneratedDepsByArch = { 'libc6 (>= 2.4)', 'libc6 (>= 2.9)', 'libcairo2 (>= 1.6.0)', + 'libcups2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.9.14)', 'libexpat1 (>= 2.1~beta3)', @@ -113,6 +115,7 @@ export const referenceGeneratedDepsByArch = { 'libc6 (>= 2.25)', 'libc6 (>= 2.28)', 'libcairo2 (>= 1.6.0)', + 'libcups2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.9.14)', 'libexpat1 (>= 2.1~beta3)', diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index e79a3b5ad99..80ea9889a3b 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -22,7 +22,7 @@ import product from '../../product.json' with { type: 'json' }; // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.271:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/148.0.7778.280: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.ts b/build/linux/rpm/dep-lists.ts index 9c5241350ca..8860fd27247 100644 --- a/build/linux/rpm/dep-lists.ts +++ b/build/linux/rpm/dep-lists.ts @@ -62,6 +62,7 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.8)(64bit)', 'libc.so.6(GLIBC_2.9)(64bit)', 'libcairo.so.2()(64bit)', + 'libcups.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', @@ -156,6 +157,7 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.8)', 'libc.so.6(GLIBC_2.9)', 'libcairo.so.2', + 'libcups.so.2', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3', 'libdbus-1.so.3(LIBDBUS_1_3)', @@ -254,6 +256,7 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.27)(64bit)', 'libc.so.6(GLIBC_2.28)(64bit)', 'libcairo.so.2()(64bit)', + 'libcups.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', diff --git a/build/package.json b/build/package.json index 2d9b532c951..6892c087b6a 100644 --- a/build/package.json +++ b/build/package.json @@ -80,5 +80,14 @@ "lru-cache": "11.2.1" }, "yauzl": "^3.3.1" + }, + "allowScripts": { + "@vscode/vsce-sign@2.0.7": true, + "esbuild@0.27.2": true, + "fsevents@2.3.3": true, + "keytar@7.9.0": true, + "tree-sitter@0.22.4": true, + "tree-sitter-javascript@0.23.1": true, + "tree-sitter-typescript@0.23.2": true } } diff --git a/build/vite/package.json b/build/vite/package.json index 503160a16fa..60bc420e2fc 100644 --- a/build/vite/package.json +++ b/build/vite/package.json @@ -14,5 +14,8 @@ "@vscode/rollup-plugin-esm-url": "^1.0.1-1", "rollup": "*", "vite": "npm:rolldown-vite@latest" + }, + "allowScripts": { + "fsevents@2.3.3": true } } diff --git a/cgmanifest.json b/cgmanifest.json index afc549e769e..94662d8f908 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "21c21077f4937668031f80089a90618b7e1fe779" + "commitHash": "bfe29217d60b6ee25ce4e4b2c0abcd6361ae6eb6" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "148.0.7778.271" + "version": "148.0.7778.280" }, { "component": { @@ -516,12 +516,12 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "413e874773eef1e27a8397ddc949dbbe19cadb31", - "tag": "24.17.0" + "commitHash": "20da4aeadabc5b0a01e3fcf520f91df8285c68a2", + "tag": "24.18.0" } }, "isOnlyProductionDependency": true, - "version": "24.17.0" + "version": "24.18.0" }, { "component": { @@ -529,13 +529,13 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "d7bccf5b2f27969b4e7f34cf877f55cf0813be7a", - "tag": "42.5.0" + "commitHash": "3c8db38c242c5c30be0d35a7c6fad19ddaf0f4c3", + "tag": "42.6.0" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "42.5.0" + "version": "42.6.0" }, { "component": { diff --git a/extensions/copilot/.nvmrc b/extensions/copilot/.nvmrc index 1dd37d53743..ca5c350055c 100644 --- a/extensions/copilot/.nvmrc +++ b/extensions/copilot/.nvmrc @@ -1 +1 @@ -24.17.0 +24.18.0 diff --git a/extensions/copilot/package.json b/extensions/copilot/package.json index fb3f6520415..0db61ac3b28 100644 --- a/extensions/copilot/package.json +++ b/extensions/copilot/package.json @@ -7320,5 +7320,14 @@ "flags": "verified" }, "publisherDisplayName": "GitHub" + }, + "allowScripts": { + "esbuild@0.28.1": true, + "keytar@7.9.0": true, + "@playwright/browser-chromium@1.61.1": true, + "@vscode/vsce-sign@2.0.5": true, + "protobufjs": false, + "fsevents@2.3.3": true, + "fsevents@2.3.2": true } } diff --git a/extensions/git/package.json b/extensions/git/package.json index a32bc546c02..8e9f296030e 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -4397,5 +4397,8 @@ "repository": { "type": "git", "url": "https://github.com/microsoft/vscode.git" + }, + "allowScripts": { + "@vscode/fs-copyfile@2.0.0": true } } diff --git a/extensions/mermaid-markdown-features/package.json b/extensions/mermaid-markdown-features/package.json index f3be8a77eab..1fa810cab8b 100644 --- a/extensions/mermaid-markdown-features/package.json +++ b/extensions/mermaid-markdown-features/package.json @@ -265,5 +265,8 @@ }, "overrides": { "lodash-es": "4.18.1" + }, + "allowScripts": { + "fsevents@2.3.3": true } } diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json index 821154fac52..19064e71091 100644 --- a/extensions/microsoft-authentication/package.json +++ b/extensions/microsoft-authentication/package.json @@ -154,5 +154,9 @@ "repository": { "type": "git", "url": "https://github.com/microsoft/vscode.git" + }, + "allowScripts": { + "@azure/msal-node-runtime@0.20.1": true, + "@azure/msal-node-extensions@5.3.2": true } } diff --git a/extensions/package.json b/extensions/package.json index 8ab1150dba9..60185fa8085 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -16,5 +16,9 @@ }, "overrides": { "node-gyp-build": "4.8.1" + }, + "allowScripts": { + "@parcel/watcher@2.5.6": true, + "esbuild@0.28.1": true } } diff --git a/package-lock.json b/package-lock.json index 890b820d258..679b4cb6358 100644 --- a/package-lock.json +++ b/package-lock.json @@ -125,7 +125,7 @@ "cookie": "^0.7.2", "debounce": "^1.0.0", "deemon": "^1.13.6", - "electron": "42.5.0", + "electron": "42.6.0", "eslint": "^9.36.0", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", @@ -5599,6 +5599,15 @@ "node": ">=6.14.2" } }, + "node_modules/buildcheck": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.7.tgz", + "integrity": "sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==", + "optional": true, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/bundle-name": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz", @@ -6488,6 +6497,20 @@ "url": "https://opencollective.com/express" } }, + "node_modules/cpu-features": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz", + "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "buildcheck": "~0.0.6", + "nan": "^2.19.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -7241,9 +7264,9 @@ "dev": true }, "node_modules/electron": { - "version": "42.5.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-42.5.0.tgz", - "integrity": "sha512-cYEKS9XFz+c9fAB4jI0x49yz1FFzB55r3q96wu9YkwwJMv7t9202IE/ltlgy6yitl/J4M7C8JQcmUqdzDvPl/w==", + "version": "42.6.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-42.6.0.tgz", + "integrity": "sha512-axGNgd+yCTg+vi1VEGrQqAj9WVWkePKwbICSAvMiT2eTaxhij9a/xhBHD6rXV8wrlW9ZfJzE5+xg752ImxrmTw==", "dev": true, "license": "MIT", "dependencies": { @@ -17476,9 +17499,6 @@ "nan": "^2.23.0" } }, - "node_modules/ssh2/node_modules/cpu-features": { - "optional": true - }, "node_modules/stable": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", diff --git a/package.json b/package.json index abb95cd2fec..e0525eecb34 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.129.0", - "distro": "a78eb8284ce7699e371b36071b579f557406f153", + "distro": "ac355fb4d039edb8cc28e1f8e45c6d5d8c437fe2", "author": { "name": "Microsoft Corporation" }, @@ -210,7 +210,7 @@ "cookie": "^0.7.2", "debounce": "^1.0.0", "deemon": "^1.13.6", - "electron": "42.5.0", + "electron": "42.6.0", "eslint": "^9.36.0", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", @@ -274,9 +274,6 @@ "node-addon-api": "7.1.0" }, "serialize-javascript": "^7.0.3", - "ssh2": { - "cpu-features": "0.0.0" - }, "yauzl": "^3.3.1" }, "repository": { @@ -288,5 +285,33 @@ }, "optionalDependencies": { "windows-foreground-love": "0.6.1" + }, + "allowScripts": { + "bufferutil@4.1.0": true, + "cpu-features": false, + "kerberos@2.1.1": true, + "native-keymap@3.3.9": true, + "native-is-elevated@0.9.0": true, + "node-pty@1.2.0-beta.13": true, + "utf-8-validate@5.0.10": true, + "windows-foreground-love@0.6.1": true, + "@parcel/watcher@2.5.6": true, + "@playwright/browser-chromium@1.61.1": true, + "@vscode/fs-copyfile@2.0.0": true, + "@vscode/native-watchdog@1.4.6": true, + "@vscode/ripgrep@1.17.1": true, + "@vscode/deviceid@0.1.5": true, + "@vscode/policy-watcher@1.4.0": true, + "@vscode/spdlog@0.15.8": true, + "@vscode/sqlite3@5.1.12-vscode": true, + "@vscode/windows-registry@1.2.0": true, + "@vscode/windows-mutex@0.5.3": true, + "@vscode/windows-process-tree@0.7.0": true, + "ssh2": false, + "fsevents@2.3.2": true, + "fsevents@1.2.13": true, + "es5-ext": false, + "husky": false, + "@vscode/windows-ca-certs@0.3.4": true } } diff --git a/remote/.npmrc b/remote/.npmrc index 36e023c6e74..e5fede19150 100644 --- a/remote/.npmrc +++ b/remote/.npmrc @@ -1,6 +1,6 @@ disturl="https://nodejs.org/dist" -target="24.17.0" -ms_build_id="451432" +target="24.18.0" +ms_build_id="455160" runtime="node" build_from_source="true" legacy-peer-deps="true" diff --git a/remote/package-lock.json b/remote/package-lock.json index ccd7119b416..d6279b76836 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -1011,6 +1011,15 @@ "node": "*" } }, + "node_modules/buildcheck": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.7.tgz", + "integrity": "sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==", + "optional": true, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", @@ -1034,6 +1043,20 @@ "node": ">= 0.6" } }, + "node_modules/cpu-features": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz", + "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "buildcheck": "~0.0.6", + "nan": "^2.19.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -1626,9 +1649,6 @@ "nan": "^2.23.0" } }, - "node_modules/ssh2/node_modules/cpu-features": { - "optional": true - }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", diff --git a/remote/package.json b/remote/package.json index c6930711fb7..5a370ff3250 100644 --- a/remote/package.json +++ b/remote/package.json @@ -58,9 +58,20 @@ "kerberos@2.1.1": { "node-addon-api": "7.1.0" }, - "ssh2": { - "cpu-features": "0.0.0" - }, "yauzl": "^3.3.1" + }, + "allowScripts": { + "kerberos@2.1.1": true, + "node-pty@1.2.0-beta.13": true, + "@parcel/watcher@2.5.6": true, + "@vscode/deviceid@0.1.5": true, + "@vscode/native-watchdog@1.4.6": true, + "@vscode/spdlog@0.15.8": true, + "@vscode/windows-registry@1.2.0": true, + "@vscode/windows-process-tree@0.7.0": true, + "ssh2": false, + "@vscode/sqlite3@5.1.12-vscode": true, + "cpu-features": false, + "@vscode/windows-ca-certs@0.3.4": true } } diff --git a/test/automation/package.json b/test/automation/package.json index f4f52d5c34e..5ac9e4d74b4 100644 --- a/test/automation/package.json +++ b/test/automation/package.json @@ -31,5 +31,8 @@ "cpx2": "3.0.0", "nodemon": "^3.1.9", "npm-run-all2": "^8.0.4" + }, + "allowScripts": { + "fsevents@2.3.3": true } }