From ad0b5d23c1c418b37b6c8e8fd2ffe416c185dd69 Mon Sep 17 00:00:00 2001 From: Robo Date: Tue, 26 Aug 2025 22:40:21 +0900 Subject: [PATCH] chore: update electron@37.3.1 (#262877) * chore: update electron@37.3.1 * chore: remove workaround for npm scripts argument parsing Refs https://github.com/nodejs/node/commit/f99aa748c09091ed6ba5bea0c52f23234cafddb1 * chore: update node.js@22.18.0 * chore: bump distro --- .github/workflows/pr-win32-test.yml | 8 +- .npmrc | 4 +- .nvmrc | 2 +- build/azure-pipelines/linux/setup-env.sh | 8 +- .../win32/product-build-win32-test.yml | 18 +-- .../win32/product-build-win32.yml | 6 +- build/checksums/electron.txt | 150 +++++++++--------- build/checksums/nodejs.txt | 14 +- build/linux/dependencies-generator.js | 2 +- build/linux/dependencies-generator.ts | 2 +- cgmanifest.json | 12 +- package-lock.json | 8 +- package.json | 4 +- remote/.npmrc | 4 +- 14 files changed, 117 insertions(+), 125 deletions(-) diff --git a/.github/workflows/pr-win32-test.yml b/.github/workflows/pr-win32-test.yml index a4bc311b787..e1a9127cfbc 100644 --- a/.github/workflows/pr-win32-test.yml +++ b/.github/workflows/pr-win32-test.yml @@ -121,7 +121,7 @@ jobs: run: | for ($i = 1; $i -le 3; $i++) { try { - npm exec -- -- npm-run-all -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install" + npm exec -- npm-run-all -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install" break } catch { @@ -230,19 +230,19 @@ jobs: if: ${{ inputs.electron_tests }} timeout-minutes: 20 shell: pwsh - run: npm run smoketest-no-compile -- -- --tracing + run: npm run smoketest-no-compile -- --tracing - name: 🧪 Run smoke tests (Browser, Chromium) if: ${{ inputs.browser_tests }} timeout-minutes: 20 shell: pwsh - run: npm run smoketest-no-compile -- -- --web --tracing --headless + run: npm run smoketest-no-compile -- --web --tracing --headless - name: 🧪 Run smoke tests (Remote) if: ${{ inputs.remote_tests }} timeout-minutes: 20 shell: pwsh - run: npm run smoketest-no-compile -- -- --remote --tracing + run: npm run smoketest-no-compile -- --remote --tracing - name: Diagnostics after smoke test run shell: pwsh diff --git a/.npmrc b/.npmrc index 43bde6e0ab4..a9027f192bf 100644 --- a/.npmrc +++ b/.npmrc @@ -1,6 +1,6 @@ disturl="https://electronjs.org/headers" -target="37.2.3" -ms_build_id="12035395" +target="37.3.1" +ms_build_id="12259562" runtime="electron" build_from_source="true" legacy-peer-deps="true" diff --git a/.nvmrc b/.nvmrc index fc37597bccd..91d5f6ff8e3 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22.17.0 +22.18.0 diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh index 6805633b9ba..5a467aff3a4 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -25,7 +25,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/138.0.7204.100/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/138.0.7204.235/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 \ @@ -37,9 +37,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/138.0.7204.100:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.100:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.100:build/config/c++/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235: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/azure-pipelines/win32/product-build-win32-test.yml b/build/azure-pipelines/win32/product-build-win32-test.yml index 0b23b23fc3c..d52682893c0 100644 --- a/build/azure-pipelines/win32/product-build-win32-test.yml +++ b/build/azure-pipelines/win32/product-build-win32-test.yml @@ -11,8 +11,7 @@ parameters: type: string steps: - # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375 - - powershell: npm exec -- -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" + - powershell: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Download Electron and Playwright @@ -22,14 +21,12 @@ steps: - powershell: .\scripts\test.bat --build --tfs "Unit Tests" displayName: 🧪 Run unit tests (Electron) timeoutInMinutes: 15 - # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375 - - powershell: npm run test-node -- -- --build + - powershell: npm run test-node -- --build displayName: 🧪 Run unit tests (node.js) timeoutInMinutes: 15 - ${{ if eq(parameters.VSCODE_RUN_BROWSER_TESTS, true) }}: - # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375 - - powershell: npm run test-browser-no-install -- -- --build --browser chromium --tfs "Browser Unit Tests" + - powershell: npm run test-browser-no-install -- --build --browser chromium --tfs "Browser Unit Tests" displayName: 🧪 Run unit tests (Browser, Chromium) timeoutInMinutes: 20 @@ -122,22 +119,19 @@ steps: condition: succeededOrFailed() - ${{ if eq(parameters.VSCODE_RUN_ELECTRON_TESTS, true) }}: - # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375 - - powershell: npm run smoketest-no-compile -- -- --tracing --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)" + - powershell: npm run smoketest-no-compile -- --tracing --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)" displayName: 🧪 Run smoke tests (Electron) timeoutInMinutes: 20 - ${{ if eq(parameters.VSCODE_RUN_BROWSER_TESTS, true) }}: - # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375 - - powershell: npm run smoketest-no-compile -- -- --web --tracing --headless + - powershell: npm run smoketest-no-compile -- --web --tracing --headless env: VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\test\vscode-server-win32-$(VSCODE_ARCH)-web displayName: 🧪 Run smoke tests (Browser, Chromium) timeoutInMinutes: 20 - ${{ if eq(parameters.VSCODE_RUN_REMOTE_TESTS, true) }}: - # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375 - - powershell: npm run smoketest-no-compile -- -- --tracing --remote --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)" + - powershell: npm run smoketest-no-compile -- --tracing --remote --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)" env: VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\test\vscode-server-win32-$(VSCODE_ARCH) displayName: 🧪 Run smoke tests (Remote) diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index 5063d429d99..15022ee2f62 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -256,12 +256,11 @@ steps: echo "##vso[task.setvariable variable=EsrpCliDllPath]$Version\net6.0\esrpcli.dll" displayName: Find ESRP CLI - # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375 - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" mkdir -Force .build/node-cpuprofile - exec { npx deemon --detach --wait -- -- npx zx build/azure-pipelines/win32/codesign.js } + exec { npx deemon --detach --wait -- npx zx build/azure-pipelines/win32/codesign.js } env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) NODE_DEBUG: "net,child_process" @@ -278,11 +277,10 @@ steps: VSCODE_TEST_ARTIFACT_NAME: ${{ parameters.VSCODE_TEST_ARTIFACT_NAME }} - ${{ if ne(parameters.VSCODE_CIBUILD, true) }}: - # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375 - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" - exec { npx deemon --attach -- -- npx zx build/azure-pipelines/win32/codesign.js } + exec { npx deemon --attach -- npx zx build/azure-pipelines/win32/codesign.js } condition: succeededOrFailed() env: NODE_DEBUG: "net,child_process" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 3f1d7d7f281..05a15cbe6b4 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -de5712504b5788c72fdb9f685e03973cee97376db3fd985db91d254c6d35ca67 *chromedriver-v37.2.3-darwin-arm64.zip -aa088058f7ca524fbf54dff0b32c4d1d3f838270556fc47f6e0e0ab8b4f7afbc *chromedriver-v37.2.3-darwin-x64.zip -c2723fd4abf560a907416d7cbdeba6ea7c7fbf3204381cba3651a21f93161914 *chromedriver-v37.2.3-linux-arm64.zip -90ec08ab96e4d72c75da592989104cebe4bc44ca7a1ab8a25c4d58f55908c84c *chromedriver-v37.2.3-linux-armv7l.zip -7fb75bc68ada0e75f324d392f91b37528b7d4b84ee07f236b29bddd8a658c9b8 *chromedriver-v37.2.3-linux-x64.zip -b0566801e6f1fab3119d284b4ef6521294f1c5385fddfca280f7b0b5d77b48b1 *chromedriver-v37.2.3-mas-arm64.zip -65a178f545e8227b122bcd5061151010cc8b81f7181d9b56167190de7b301e40 *chromedriver-v37.2.3-mas-x64.zip -e26c99c5c2e25268dff892edadb135cb432efff320a63f913dc699cb77d504f1 *chromedriver-v37.2.3-win32-arm64.zip -1bf7c781c8afe9c640f9d87a8599bf8b896e98436d20b2ea18bed2bdd64eb141 *chromedriver-v37.2.3-win32-ia32.zip -7a22e4bba4e47b352cc4d3fe2fb219c81cb571b4ab8e7ebb7fa4b0057dd72651 *chromedriver-v37.2.3-win32-x64.zip -0aaf0c84a9d45af7a5e6139d6491839df9a039fe7f24f14e11cc8fa481b23c2c *electron-api.json -a6e91e67743ab0d8b6f2bb42adcec5db79af02ffee462b7157a0c8463a1cbd5d *electron-v37.2.3-darwin-arm64-dsym-snapshot.zip -ae920fb7fe46bc561ab403a79691c9030d67b805941189d32f2bf490fa5fe179 *electron-v37.2.3-darwin-arm64-dsym.zip -e486968c91b8d43ee65604d9040063dc4ac24faa65c9b2b63757fc95ca984051 *electron-v37.2.3-darwin-arm64-symbols.zip -134e2ec499d5b1e7c63c0b3c8a1389555a4384f6efc7a3749daebff8d4c634ba *electron-v37.2.3-darwin-arm64.zip -97264a03101ff180aac09ecf173d570f3563359240eba98db0794257ab9f65a6 *electron-v37.2.3-darwin-x64-dsym-snapshot.zip -6ffd52a7a66a39b89ce19d0ce6ad77e8fabd172acde283c1b11cff2faad5aaf2 *electron-v37.2.3-darwin-x64-dsym.zip -df9ad784a2de4f47506796f99f427b75f9f698260dea103dc1e244c40c009daf *electron-v37.2.3-darwin-x64-symbols.zip -bed936d54fb1eb31712ed34c22e772392bcaf85f1d41f12653a027822c305383 *electron-v37.2.3-darwin-x64.zip -e9ce595710269f7ec03897aa50b6753d8dc15b3d4316b9260bd496c2d9bfe278 *electron-v37.2.3-linux-arm64-debug.zip -5611a6c2c76cdda7d396575886a3f4b2c0179a3dc208ad073e02f2b401cdff54 *electron-v37.2.3-linux-arm64-symbols.zip -95e5bd64f372598dff73673802f262e6feb4e4a308c3734b9b1e127020e6e36c *electron-v37.2.3-linux-arm64.zip -e9ce595710269f7ec03897aa50b6753d8dc15b3d4316b9260bd496c2d9bfe278 *electron-v37.2.3-linux-armv7l-debug.zip -732185759d1f1a16a5da57b0f71b70a9e29fdaaad2605a6b0ecdf2190318b32d *electron-v37.2.3-linux-armv7l-symbols.zip -50705d920c2feb03e7b57f700384349ed00bed2f9764b06bdbc2b8d2e97d000d *electron-v37.2.3-linux-armv7l.zip -4395be68ece00c54f1f0835103740526ab47ebed0ff4815a7866d6cb3988111e *electron-v37.2.3-linux-x64-debug.zip -8a88fec134b5bbf6b2bc834af996e02f79c1a2945997829a6089cf9bc748448c *electron-v37.2.3-linux-x64-symbols.zip -90aa32126cbd9c843fbbb844613f6bb41a8fad212cf7290e9383bfa1ef541022 *electron-v37.2.3-linux-x64.zip -01df2a4b0cef3d3a4ace426b00573f6f6cd271085e23542be29b58fa9b3011de *electron-v37.2.3-mas-arm64-dsym-snapshot.zip -9e4b33a8ef2f0532f1505bf3461388bcfe71c723cb743281e1ff560d59cf7621 *electron-v37.2.3-mas-arm64-dsym.zip -cec5a4e152cb0a9bb1ba631f8662d046bfe9077139b93a54b8353adc28e90014 *electron-v37.2.3-mas-arm64-symbols.zip -b4e8709061c82179b188c95a9058c938b2e8761131a912e8d58e8af8e60749ea *electron-v37.2.3-mas-arm64.zip -3d151d9d1447b2c4c370483eb870eb0dbfaba1a078ec272a4466387ad9327faa *electron-v37.2.3-mas-x64-dsym-snapshot.zip -180eda5fcbe1fafc0a200c732f810a5842a1903566e1a6c2c46e49ddbf7057d2 *electron-v37.2.3-mas-x64-dsym.zip -9d4ca373b4f9c21ebe767955d9cd887b6966a7bfc08ac31642ad1612184a1e53 *electron-v37.2.3-mas-x64-symbols.zip -ccba94267fb2e7eff125bc05ac82962cddd31774e6eaac71d45deca1a9ee8440 *electron-v37.2.3-mas-x64.zip -5a0c3715b9b4e68d2af24b01d70babaa2d3bef8a91f29f784225f2c29c53305a *electron-v37.2.3-win32-arm64-pdb.zip -0f77c4a013e2ba4db25d07b39f60ed036cef8c244b1d004b379ac66ff7fdcc31 *electron-v37.2.3-win32-arm64-symbols.zip -cb973ca0276f255cc7bfc78a753ea1f2494441d47bfcdbbabd83dcdacc95c72e *electron-v37.2.3-win32-arm64-toolchain-profile.zip -409b6c1b7f66fc837f10f8d3325d8f5f63b6f0c1e614e759883d3008c01e6f4f *electron-v37.2.3-win32-arm64.zip -989e4b559254ca0f086179b01b395aacd9d1662a216a59f6384375031855c5fb *electron-v37.2.3-win32-ia32-pdb.zip -8ef5da1a1e7922a95a6c9569a29926aaa3cfc0bf1ec538ae116e79dd23cb6068 *electron-v37.2.3-win32-ia32-symbols.zip -cb973ca0276f255cc7bfc78a753ea1f2494441d47bfcdbbabd83dcdacc95c72e *electron-v37.2.3-win32-ia32-toolchain-profile.zip -16980a3a4db73d03bc74bfdb8d9b5e63bc8dd55f0db02b8007182ff9e4290700 *electron-v37.2.3-win32-ia32.zip -176062444cf5d233a912f3068048521b26819843db40531890ffb343de01c585 *electron-v37.2.3-win32-x64-pdb.zip -e12c2bffd1f64387487353ba73b9abe342a9075f0e7a42a319dbb81b996a1451 *electron-v37.2.3-win32-x64-symbols.zip -cb973ca0276f255cc7bfc78a753ea1f2494441d47bfcdbbabd83dcdacc95c72e *electron-v37.2.3-win32-x64-toolchain-profile.zip -df2925e059f87316272d8a495602025561a133904f2275387710e15948ed8d8a *electron-v37.2.3-win32-x64.zip -6358a83a03a801d6a85559179e4f12307dee693043ffb26fd40585f369f7db76 *electron.d.ts -eee4934c3079592bad5d9f5249e6f848d75c635d57d4de3dc32deb8c41ddf24b *ffmpeg-v37.2.3-darwin-arm64.zip -34ee1b55530522a6ba14754734c239a2c3278d9d2b2dcb2003bed2468fd34056 *ffmpeg-v37.2.3-darwin-x64.zip -f7ba18d1f9eed9ff5440ab9683c30f9e224d39a7ee4f15b96860f7f997aba3e3 *ffmpeg-v37.2.3-linux-arm64.zip -9f6c3f968f74be387c8b35ff528ab7da02565c9bfc9e4c2055c222bc3dd4d1f4 *ffmpeg-v37.2.3-linux-armv7l.zip -eec1ae0dc0559e68f8df7e8cc48d15439f8cd5c31facf2b8ad6d64283b6cbb87 *ffmpeg-v37.2.3-linux-x64.zip -eee4934c3079592bad5d9f5249e6f848d75c635d57d4de3dc32deb8c41ddf24b *ffmpeg-v37.2.3-mas-arm64.zip -34ee1b55530522a6ba14754734c239a2c3278d9d2b2dcb2003bed2468fd34056 *ffmpeg-v37.2.3-mas-x64.zip -e56d02eedc01fd7c9568fe9a4ecbe639f12b0acfa8cdfa5fa4d5355d80e5f89a *ffmpeg-v37.2.3-win32-arm64.zip -e56d02eedc01fd7c9568fe9a4ecbe639f12b0acfa8cdfa5fa4d5355d80e5f89a *ffmpeg-v37.2.3-win32-ia32.zip -e56d02eedc01fd7c9568fe9a4ecbe639f12b0acfa8cdfa5fa4d5355d80e5f89a *ffmpeg-v37.2.3-win32-x64.zip -6db1dcb596e18554fcd74d1e765f3b3618f0bf0884fa647e007836a82d154b09 *hunspell_dictionaries.zip -4d713e685c862eba624029d73e05d51d3237ddd30e71dbc7c071a82cafd5ea2b *libcxx-objects-v37.2.3-linux-arm64.zip -6a8e546b643e0fb3b17f58d9d9ddbdfbc5ddae392a1e4e788380aa4cd4154acf *libcxx-objects-v37.2.3-linux-armv7l.zip -985ec7b7aedfd03daa0a8bf7984b685760ae9338fa9ad527b7301555677ba688 *libcxx-objects-v37.2.3-linux-x64.zip -3cbad550cb9e6ad542f61c8be23fb74c7c20491b1b89859c55fe9fcf0d2250f7 *libcxx_headers.zip -05d79984eb6648cd389100e7cb935c3244c2bad4c920cbc9b983954a55578b41 *libcxxabi_headers.zip -77536b90f7f0ad36a856f7744d326a140171d580a81c3296de3cfda8a388f95d *mksnapshot-v37.2.3-darwin-arm64.zip -740318b863aa2b172c04401c14e4a01a33ddc3d7a4b7de962d7314a82ea54dd6 *mksnapshot-v37.2.3-darwin-x64.zip -5fc8169bd8dd35dc52db50ec8d2f0e88ac28836b6ba75a58f0845ed38c343187 *mksnapshot-v37.2.3-linux-arm64-x64.zip -2c4a207668e9319eb79687af505688ceaca46f51e4d6ec387f1415456524adcd *mksnapshot-v37.2.3-linux-armv7l-x64.zip -072e0ab9f2bf0011ba4bed2ca304bf0a348f95ef3ee61d88ed284aaa991c8a03 *mksnapshot-v37.2.3-linux-x64.zip -db8449f46b1fd6efdff10b889c795001dd9174b84c27c9cf6146d55a261625eb *mksnapshot-v37.2.3-mas-arm64.zip -3906ef5f2acabaf8efc346a7623c853202fe65a96e0666d28d6d48dfcce4a588 *mksnapshot-v37.2.3-mas-x64.zip -d47b365febeeebb6479c51fb51d06e69d4e72afcf48827fe2371a0b043a3d21b *mksnapshot-v37.2.3-win32-arm64-x64.zip -7dee714ecf1e5900b8f9745f73d41ee420e66115bce8403daf106c6e56cc12a8 *mksnapshot-v37.2.3-win32-ia32.zip -2ac179b35e3648c34b23180153aa1107874f3b1ec2d0e1485cb1fa246aa1cb84 *mksnapshot-v37.2.3-win32-x64.zip +f6e9c5bdf45d3e17ef90036265a190e55fb2c15c840c2f898f7b503882dcbdac *chromedriver-v37.3.1-darwin-arm64.zip +473bae1c5226e2b1b7cebe71a2f983955e886d65683b00d302850071026e0bdb *chromedriver-v37.3.1-darwin-x64.zip +db0b310b297cb3c38655ca2d91c892e463f6e73d45b1487aa5f7271dd5f54315 *chromedriver-v37.3.1-linux-arm64.zip +e4cc211fc92da230acbf2139333051a105a97f7a6a52ace5b0f289bcffcf1ce4 *chromedriver-v37.3.1-linux-armv7l.zip +6f59f1b86c4538bdf7857fa90afd3f459a8f32bc600480774ae4dc50fc89208c *chromedriver-v37.3.1-linux-x64.zip +20cfc1a780d31560ba9aa3aea28ff0bcc7ef9fba7e3cd88411d6ecce71c64783 *chromedriver-v37.3.1-mas-arm64.zip +461f509e9dfef36e1afa1f458b0660df5fe8152418c87766a3b396582844695e *chromedriver-v37.3.1-mas-x64.zip +aa0d683f7d16dc4bb0d20cd9750f35b9297a815b3daee42c28f6cffa397ce05c *chromedriver-v37.3.1-win32-arm64.zip +85399e3f24d4c58b4b2dd0aa43cf4cfe729c95514429cadfe315768ae371f63d *chromedriver-v37.3.1-win32-ia32.zip +51478feb8295e6fddfb179943a52255bfe167ddba3d1992d70de446967f59a27 *chromedriver-v37.3.1-win32-x64.zip +ce50fd1f0868419830159291ab5dd8b50422d1cfb4e8e76fa6faa0adbd525fd8 *electron-api.json +d560b5b3eca64a42cf415674576d28535a619f3e2592d8301439f09eb7e9c44b *electron-v37.3.1-darwin-arm64-dsym-snapshot.zip +99db7059c2958ace970d5b91ca936b3684d786dfa628a39d7f05bf08df26dd25 *electron-v37.3.1-darwin-arm64-dsym.zip +bfe2ccab48e2ceb5248f913b8aca3d9249eae27e67e5f6a18bd94538e84979d2 *electron-v37.3.1-darwin-arm64-symbols.zip +7f390efeca2d2153e29c5ea13305915fb3f853b2a4e9a00be07183c6e09ac6de *electron-v37.3.1-darwin-arm64.zip +22b53f05594a0d9699dc60f29fc3cd217ae72a5b8c95887f8b56f550b40dfb4c *electron-v37.3.1-darwin-x64-dsym-snapshot.zip +f165d0aaca2dfdf034786f7c57a9212f0157cff44143910fad13c967aacef896 *electron-v37.3.1-darwin-x64-dsym.zip +bea0c8b15714c970f7772c4116f210ef51b4755fec7f5ebb65a5427df3aaaa32 *electron-v37.3.1-darwin-x64-symbols.zip +0a6a55de6c49d6eb929f01632701bd25f7e515d7b4042614dd5a1ec6c079f3f3 *electron-v37.3.1-darwin-x64.zip +4d058758fa31db78b2ca90ab35e8726e59a8ac400c453c449ccbb7b4b1f72985 *electron-v37.3.1-linux-arm64-debug.zip +ca1e80d12024d0586de824a49d77447e0e56b470cbb296d19d19b3fa10b156fb *electron-v37.3.1-linux-arm64-symbols.zip +c5c8ec46d9e291cd9dddb40c635d947d0f17873739f93b069e75b4bdadd75f5d *electron-v37.3.1-linux-arm64.zip +4d058758fa31db78b2ca90ab35e8726e59a8ac400c453c449ccbb7b4b1f72985 *electron-v37.3.1-linux-armv7l-debug.zip +94583e6468fa1870546b20468fb660d26c68fefe04536e4a0cd233cc5babf6c0 *electron-v37.3.1-linux-armv7l-symbols.zip +0871625623efb0edbb4d93ec9e036e01837f9d9ffaf4f1c05ae95f30ff823987 *electron-v37.3.1-linux-armv7l.zip +65c3b723888150cf39287e0b7344518ec34780dfc3555ab21bdb1711cf4dcadb *electron-v37.3.1-linux-x64-debug.zip +1a1d1a68471fc8634222c6e0b522490b1b71325c4050bbf605b5e388afc26a81 *electron-v37.3.1-linux-x64-symbols.zip +9c379b91f7ff65311f2b040299ee95c137fcb8e7e1bef87f9225d608cf579548 *electron-v37.3.1-linux-x64.zip +af77d211929ca0ac9be99c36ee67a685b07d85f7208529d8a902cc17a95ae137 *electron-v37.3.1-mas-arm64-dsym-snapshot.zip +51a76b7f69a2abaffc0cf6e21abb193900b2e8416bd57933dec8b90eed6dba23 *electron-v37.3.1-mas-arm64-dsym.zip +105235e95242ab8569640dff17629420d91112f850331707ef9809dfcbffc5e0 *electron-v37.3.1-mas-arm64-symbols.zip +b25b0e73ca90adf049001d130e23563860c017dd0932dc3b683b8fddd7450c26 *electron-v37.3.1-mas-arm64.zip +2623c5ad40f06b5cc3da6c8346790a0820641e7e257cc18fa0ed8d8fbe72973e *electron-v37.3.1-mas-x64-dsym-snapshot.zip +f6bad32fe64a747a00a65aa05a05949b71b52cb0276b885481d0ea0b2a9408f9 *electron-v37.3.1-mas-x64-dsym.zip +5e0cf1965b2022e5bdcd4aaf4ca951e48168f6a3275013cb2926c656fc2ac572 *electron-v37.3.1-mas-x64-symbols.zip +79b5d45c0e3d315d49789a358f0483b786b111b311e1ef70c1b877968ea7b3c9 *electron-v37.3.1-mas-x64.zip +62cfaee6d7b5e2aab4da0210b7dbeb562180aa463790515d42a411fd3809aa7a *electron-v37.3.1-win32-arm64-pdb.zip +b0163b74a6ddb801ff045707fbce432895c524f9fb114b2cdcb191b0e8aeab74 *electron-v37.3.1-win32-arm64-symbols.zip +d6170c4da775b061bf8acca64432a1bc16636251d0c2d0b777a12f759e3a0319 *electron-v37.3.1-win32-arm64-toolchain-profile.zip +bf4e9e622c09a4837493aa1184ef90c14f98459a68fcabf72ac16f9182cd2c8c *electron-v37.3.1-win32-arm64.zip +3f7f45c90ac6c3bade54ca3065a6eb7a84ceb014d133ac8aee25a7c1554eec5d *electron-v37.3.1-win32-ia32-pdb.zip +7c2ab030c6fa37f804593fe396baba664afc8e4475ea24b79ee861221713b64d *electron-v37.3.1-win32-ia32-symbols.zip +d6170c4da775b061bf8acca64432a1bc16636251d0c2d0b777a12f759e3a0319 *electron-v37.3.1-win32-ia32-toolchain-profile.zip +e6d2167adaa0b64b921a014eff2c6d670912b26ee3261357a4474cbc8dc79255 *electron-v37.3.1-win32-ia32.zip +b7e48513d06464bfcb97ef68b21c8601e9b584fa3ca59e0b32cae4ca5aa9f1bd *electron-v37.3.1-win32-x64-pdb.zip +b63200053e6f2e4d789918f77c55409136719ba83bdfc4852d8ec57ceeafee09 *electron-v37.3.1-win32-x64-symbols.zip +d6170c4da775b061bf8acca64432a1bc16636251d0c2d0b777a12f759e3a0319 *electron-v37.3.1-win32-x64-toolchain-profile.zip +32ad7124107ffef2aa92abb03175c4a8a60133d50cda338c2ab2917c5efc8c32 *electron-v37.3.1-win32-x64.zip +ad1fe6a7873a642885b6a95bf5e182a5d2f85bdfebb18d816fc39982f26a0f61 *electron.d.ts +5ec0166be035bfda6fa940d90e8eb3c2fb473c73022061d577d5c657b60399f6 *ffmpeg-v37.3.1-darwin-arm64.zip +1afd9975b951018f4d0b0c85dfd565516f5c49b74d9f10d06c6b9cd665bd42a0 *ffmpeg-v37.3.1-darwin-x64.zip +f0792bdd28ac2231e2d10bdb89da0221e9b15149a4761448e6bfd50ba8e76895 *ffmpeg-v37.3.1-linux-arm64.zip +5bd4adf23596c09bbb671952b73427f6701a7e9aee647979925e9cc4ff973045 *ffmpeg-v37.3.1-linux-armv7l.zip +561a7685536c133d2072e2e2b5a64ca3897bb8c71624158a6fe8e07cae9116c9 *ffmpeg-v37.3.1-linux-x64.zip +5ec0166be035bfda6fa940d90e8eb3c2fb473c73022061d577d5c657b60399f6 *ffmpeg-v37.3.1-mas-arm64.zip +1afd9975b951018f4d0b0c85dfd565516f5c49b74d9f10d06c6b9cd665bd42a0 *ffmpeg-v37.3.1-mas-x64.zip +f8ff1f5dbc7a974380fd26138247b51ec1b6a83b09c70310a5038ebab9f902b7 *ffmpeg-v37.3.1-win32-arm64.zip +257f11de301c99c256651f8ae38894a33190201e9ee275fb79a8419827eb070d *ffmpeg-v37.3.1-win32-ia32.zip +f51580bc5eef64cfe33ab6fbd1c9423c58f8904dd22a0a78256646be2b6f0706 *ffmpeg-v37.3.1-win32-x64.zip +9a3617b21cbd2c438997466f735ecbf8fe28565c060bb7548eaa9fdb2180efc9 *hunspell_dictionaries.zip +22f20c293a8c578089be2231f52312db8459a27fa7e9197d53753b3475c60184 *libcxx-objects-v37.3.1-linux-arm64.zip +420ce50e293e6f250e5e30c19b88ae010f1b4abc09b2421c16dd28b9badd3375 *libcxx-objects-v37.3.1-linux-armv7l.zip +a2f31afafb8e9d771ba8f667d6fde90d091739bdd1f568567c5a4b0a5bdd550d *libcxx-objects-v37.3.1-linux-x64.zip +5760013c0a4cc128a5cc2745756063b60552ecabe24206204ece2bfd808b0637 *libcxx_headers.zip +06659d8c13cf63ef52ee06be71be0e4d83612c577539f630c97274cbe1ec9ad2 *libcxxabi_headers.zip +c2e75472195627c3d7e5717d6ef058eede2aa098e27bdf7360e797f60ec0f120 *mksnapshot-v37.3.1-darwin-arm64.zip +c84cd7c3a6184c892602e38e682e09791bd1b8df138217ae433cbe7cddd6602a *mksnapshot-v37.3.1-darwin-x64.zip +078aed275562e60b14e55b2d700a11b660aa484bd98dc8b3567e4ddbeb3fd020 *mksnapshot-v37.3.1-linux-arm64-x64.zip +7cf2011a1274ec39bc5b1f6a7bb4c28aefa2e03cc0c49419199dc7f38d865420 *mksnapshot-v37.3.1-linux-armv7l-x64.zip +3099dc0eaedc447a76ed02cfd26498901ee4be449dea8f6873956c2abd4d640d *mksnapshot-v37.3.1-linux-x64.zip +d1ab919cc4edadf5781412e4962f3622f60664ca10787d4b6260dda52c4fbac1 *mksnapshot-v37.3.1-mas-arm64.zip +d62460a609d390c970e7919da040434d8968d2605214c3fde5e32b4b36b9bf38 *mksnapshot-v37.3.1-mas-x64.zip +c4358188116397a03f2d3c01de46dea440f1aac48e4165a0b5d884e6eb567d5f *mksnapshot-v37.3.1-win32-arm64-x64.zip +b27f88cd2bf7f1cfad9fabd68364548ba26311a1f1756fcccf18e49768040949 *mksnapshot-v37.3.1-win32-ia32.zip +ff8926915db67748ea168066e80e8b087fbfd99e4b0ff54c6c29c7049f0d23d9 *mksnapshot-v37.3.1-win32-x64.zip diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt index 23c7c218638..7bc49dadc7a 100644 --- a/build/checksums/nodejs.txt +++ b/build/checksums/nodejs.txt @@ -1,7 +1,7 @@ -615dda58b5fb41fad2be43940b6398ca56554cbe05800953afadc724729cb09e node-v22.17.0-darwin-arm64.tar.gz -c39c8ec3cdadedfcc75de0cb3305df95ae2aecebc5db8d68a9b67bd74616d2ad node-v22.17.0-darwin-x64.tar.gz -3e99df8b01b27dc8b334a2a30d1cd500442b3b0877d217b308fd61a9ccfc33d4 node-v22.17.0-linux-arm64.tar.gz -ce120efe921de3eaaba2394edaacfab3e61376a56199cb93fc7e9bf0b3f14a16 node-v22.17.0-linux-armv7l.tar.gz -0fa01328a0f3d10800623f7107fbcd654a60ec178fab1ef5b9779e94e0419e1a node-v22.17.0-linux-x64.tar.gz -b06cf160eca7522dc795b437289ebfcbd9fb309d6049a157120c3d1fd5835f55 win-arm64/node.exe -39d45b5933f339d3ebdebd76474893dab5d7da1038920f65cf5bbcf0f20f3636 win-x64/node.exe +2c12913cba67af77ded8a399df3fd91c2e7f8628c7079da40bb9ff33bf00dfc0 node-v22.18.0-darwin-arm64.tar.gz +9c8aa1e5ff5780b38cc1134e2263d84e2f4308eb84c02515e3af33936ca02cdc node-v22.18.0-darwin-x64.tar.gz +d415eeea90a2fdb60c66dd386b258acbfc4d1fa4720a8df5dea7369fbdbcddee node-v22.18.0-linux-arm64.tar.gz +57830914581dc3640e8d95378b76c6910860f42531959e4e88eb445e0cd982b0 node-v22.18.0-linux-armv7l.tar.gz +a2e703725d8683be86bb5da967bf8272f4518bdaf10f21389e2b2c9eaeae8c8a node-v22.18.0-linux-x64.tar.gz +9cdd74e4d0fde4d8b43f2370577a194ebf3fc844cd6d177e98bc7c3f432e972a win-arm64/node.exe +c22d1c59a1f767a1ed0178445a027f2257d318c55430fc819d48f269586822b7 win-x64/node.exe diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index 1dfaeb32a55..b544223cb65 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/138.0.7204.100:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235: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 1aab03f903a..00d7bc6ae25 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/138.0.7204.100:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235: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 660e9d91ebf..b0dbfd23271 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "5f45b4744e3d5ba82c2ca6d942f1e7a516110752" + "commitHash": "f15f401fb04924bb6505c6146a0dc3deb154b505" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "138.0.7204.100" + "version": "138.0.7204.235" }, { "component": { @@ -516,11 +516,11 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "3567fa7d70fee8831ab2891e6940ca63be568b08" + "commitHash": "c9ff1aecf268802fc29272c93aaa4b0691c7c6d8" } }, "isOnlyProductionDependency": true, - "version": "22.17.0" + "version": "22.18.0" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "e845d20789367bdfce1d46549ea83a2716b16922" + "commitHash": "23a02934510fcf951428e14573d9b2d2a3c4f28b" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "37.2.3" + "version": "37.3.1" }, { "component": { diff --git a/package-lock.json b/package-lock.json index fcd26170e75..91bd7824ee1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,7 +97,7 @@ "css-loader": "^6.9.1", "debounce": "^1.0.0", "deemon": "^1.13.5", - "electron": "37.2.3", + "electron": "37.3.1", "eslint": "^9.11.1", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", @@ -6603,9 +6603,9 @@ "dev": true }, "node_modules/electron": { - "version": "37.2.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-37.2.3.tgz", - "integrity": "sha512-JRKKn8cRDXDfkC+oWISbYs+c+L6RA776JM0NiB9bn2yV8H/LnBUlVPzKKfsXgrUIokN4YcbCw694vfAdEJwtGw==", + "version": "37.3.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-37.3.1.tgz", + "integrity": "sha512-7DhktRLqhe6OJh/Bo75bTI0puUYEmIwSzMinocgO63mx3MVjtIn2tYMzLmAleNIlud2htkjpsMG2zT4PiTCloA==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index 3cae3d2bc36..6e9e22abe9a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.104.0", - "distro": "38dbd6aa712cf6d7433b54fec2db3a801046fe9f", + "distro": "1affcd99f0b35544b4b871be973dc50a5ccb5300", "author": { "name": "Microsoft Corporation" }, @@ -157,7 +157,7 @@ "css-loader": "^6.9.1", "debounce": "^1.0.0", "deemon": "^1.13.5", - "electron": "37.2.3", + "electron": "37.3.1", "eslint": "^9.11.1", "eslint-formatter-compact": "^8.40.0", "eslint-plugin-header": "3.1.1", diff --git a/remote/.npmrc b/remote/.npmrc index 1e200b1cc52..0d4f2364f8f 100644 --- a/remote/.npmrc +++ b/remote/.npmrc @@ -1,6 +1,6 @@ disturl="https://nodejs.org/dist" -target="22.17.0" -ms_build_id="349259" +target="22.18.0" +ms_build_id="354241" runtime="node" build_from_source="true" legacy-peer-deps="true"