Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/pr-node-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,6 @@ jobs:
run: |
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
# Run preinstall script before root dependencies are installed
# so that Electron/v8 headers are patched correctly for native modules.
exec { node build/npm/preinstall.ts }
for ($i = 1; $i -le 5; $i++) {
try {
exec { npm ci }
Expand Down
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
disturl="https://electronjs.org/headers"
target="42.2.0"
target="42.3.0"
ms_build_id="14159160"
runtime="electron"
ignore-scripts=false
Expand Down
2 changes: 1 addition & 1 deletion build/.cachesalt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2026-05-13T00:00:00.000Z
2026-05-27T16:21:42.961Z
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ jobs:
- powershell: |
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
# Run preinstall script before root dependencies are installed
# so that Electron/v8 headers are patched correctly for native modules.
exec { node build/npm/preinstall.ts }
exec { npm ci }
env:
npm_config_arch: $(VSCODE_ARCH)
Expand Down
3 changes: 0 additions & 3 deletions build/azure-pipelines/win32/sdl-scan-win32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ steps:
- powershell: |
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
# Run preinstall script before root dependencies are installed
# so that Electron/v8 headers are patched correctly for native modules.
exec { node build/npm/preinstall.ts }
exec { npm ci }
env:
npm_config_arch: ${{ parameters.VSCODE_ARCH }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ steps:
- powershell: |
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
# Run preinstall script before root dependencies are installed
# so that Electron/v8 headers are patched correctly for native modules.
exec { node build/npm/preinstall.ts }
exec { npm ci }
env:
npm_config_arch: $(VSCODE_ARCH)
Expand Down
3 changes: 2 additions & 1 deletion build/lib/electron.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] },
});
}

const { electronVersion, msBuildId } = util.getElectronVersion();
const { msBuildId } = util.getElectronVersion();
const electronVersion = '42.2.0';
Comment thread
deepak1556 marked this conversation as resolved.

export const config = {
version: electronVersion,
Expand Down
226 changes: 0 additions & 226 deletions build/npm/gyp/custom-headers/cppgc/heap.h

This file was deleted.

2 changes: 0 additions & 2 deletions build/npm/preinstall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ function installHeaders() {
// the downloaded Electron headers. This is used to work around upstream issues:
// - v8-source-location.h: remove dependency on std::source_location (GCC 11+ requirement)
// Refs https://chromium-review.googlesource.com/c/v8/v8/+/6879784
// - cppgc/heap.h: replace GCC/Clang-only __builtin_frame_address(0) with the
// MSVC equivalent _AddressOfReturnAddress() so native modules build with MSVC.
if (local !== undefined) {
const localHeaderPath = getLocalHeaderPath(local.target);
if (localHeaderPath && fs.existsSync(localHeaderPath)) {
Expand Down
Loading