chore: cherry-pick 1 changes from 1-M137 (#47352)

* chore: [37-x-y] cherry-pick 1 changes from 1-M137

* 7bc0a67ebfbf from v8

* chore: update patches

.github/actions/checkout/action.yml

@@ -136,11 +136,6 @@ runs:
     run: |
       echo "::remove-matcher owner=merge-conflict::"
       echo "::remove-matcher owner=patch-conflict::"
-  - name: Upload patches stats
-    if: ${{ inputs.target-platform == 'linux' && github.ref == 'refs/heads/main' }}
-    shell: bash
-    run: |
-      npx node src/electron/script/patches-stats.mjs --upload-stats || true
   # delete all .git directories under src/ except for
   # third_party/angle/ and third_party/dawn/ because of build time generation of files
   # gen/angle/commit.h depends on third_party/angle/.git/HEAD

.github/workflows/audit-branch-ci.yml

@@ -1,137 +0,0 @@
-name: Audit CI on Branches
-
-on:
-  workflow_dispatch:
-  schedule:
-    # Run every 2 hours
-    - cron: '0 */2 * * *'
-
-permissions: {}
-
-jobs:
-  audit_branch_ci:
-    name: Audit CI on Branches
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - run: npm install @actions/cache @electron/fiddle-core
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const cache = require('@actions/cache');
-            const { ElectronVersions } = require('@electron/fiddle-core');
-
-            const runsWithErrors = [];
-
-            // Only want the most recent workflow run that wasn't skipped or cancelled
-            const isValidWorkflowRun = (run) => !['skipped', 'cancelled'].includes(run.conclusion);
-
-            const versions = await ElectronVersions.create(undefined, { ignoreCache: true });
-            const branches = versions.supportedMajors.map((branch) => `${branch}-x-y`);
-
-            for (const branch of ["main", ...branches]) {
-              const latestCheckRuns = new Map();
-              const allCheckRuns = await github.paginate(github.rest.checks.listForRef, {
-                owner: "electron",
-                repo: "electron",
-                ref: branch,
-                status: 'completed',
-              });
-
-              // Sort the check runs by completed_at so that multiple check runs on the
-              // same ref (like a scheduled workflow) only looks at the most recent one
-              for (const checkRun of allCheckRuns.filter(
-                (run) => !['skipped', 'cancelled'].includes(run.conclusion),
-              ).sort((a, b) => new Date(b.completed_at) - new Date(a.completed_at))) {
-                if (!latestCheckRuns.has(checkRun.name)) {
-                  latestCheckRuns.set(checkRun.name, checkRun);
-                }
-              }
-
-              // Check for runs which had error annotations
-              for (const checkRun of Array.from(latestCheckRuns.values())) {
-                const annotations = (await github.rest.checks.listAnnotations({
-                  owner: "electron",
-                  repo: "electron",
-                  check_run_id: checkRun.id,
-                })).data ?? [];
-                console.log(checkRun);
-                console.log(annotations);
-
-                if (
-                  annotations.find(
-                    ({ annotation_level, message }) =>
-                      annotation_level === 'failure' && !message.startsWith("Process completed with exit code")
-                  )
-                ) {
-                  checkRun.hasErrorAnnotations = true;
-                } else {
-                  continue;
-                }
-
-                // Check if this is a known failure from a previous audit run
-                const cacheKey = `check-run-error-annotations-${checkRun.id}`;
-                const cacheHit =
-                  (await cache.restoreCache(['/dev/null'], cacheKey, undefined, {
-                    lookupOnly: true,
-                  })) !== undefined;
-
-                if (cacheHit) {
-                  checkRun.isStale = true;
-                }
-
-                checkRun.branch = branch;
-                runsWithErrors.push(checkRun);
-  
-                // Create a cache entry (only the name matters) to keep track of
-                // failures we've seen from previous runs to mark them as stale
-                if (!cacheHit) {
-                  await cache.saveCache(['/dev/null'], cacheKey);
-                }
-              }
-            }
-
-            if (runsWithErrors.length > 0) {
-              core.summary.addHeading('⚠️ Runs with Errors');
-              core.summary.addTable([
-                [
-                  { data: 'Branch', header: true },
-                  { data: 'Workflow Run', header: true },
-                  { data: 'Status', header: true },
-                ],
-                ...runsWithErrors
-                  .sort(
-                    (a, b) =>
-                      a.branch.localeCompare(b.branch) ||
-                      a.name.localeCompare(b.name),
-                  )
-                  .map((run) => [
-                    run.branch,
-                    `<a href="${run.html_url}">${run.name}</a>`,
-                    run.isStale
-                      ? '📅 Stale'
-                      : run.hasErrorAnnotations
-                      ? '⚠️ Errors'
-                      : '✅ Succeeded',
-                  ]),
-              ]);
-
-              // Set this as failed so it's easy to scan runs to find failures
-              if (runsWithErrors.find((run) => !run.isStale)) {
-                process.exitCode = 1;
-              }
-            } else {
-              core.summary.addRaw('🎉 No runs with errors');
-            }
-
-            await core.summary.write();
-      - name: Send Slack message if errors
-        if: failure()
-        uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0
-        with:
-          payload: |
-            link: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          webhook: ${{ secrets.CI_ERRORS_SLACK_WEBHOOK_URL }}
-          webhook-type: webhook-trigger

.github/workflows/build.yml

@@ -131,7 +131,6 @@ jobs:
     env:
       CHROMIUM_GIT_AUTH: ${{ secrets.CHROMIUM_GIT_AUTH }}
       CHROMIUM_GIT_USER: ${{ secrets.CHROMIUM_GIT_USER }}
-      DD_API_KEY: ${{ secrets.DD_API_KEY }}
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
       PATCH_UP_APP_CREDS: ${{ secrets.PATCH_UP_APP_CREDS }}
     outputs:
@@ -145,8 +144,6 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Checkout & Sync & Save
       uses: ./src/electron/.github/actions/checkout
-      with:
-        target-platform: linux
 
   checkout-windows:
     needs: setup

.github/workflows/pull-request-labeled.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger Slack workflow
-        uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0
+        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
         with:
           webhook: ${{ secrets.BACKPORT_REQUESTED_SLACK_WEBHOOK_URL }} 
           webhook-type: webhook-trigger

.github/workflows/scorecards.yml

@@ -28,7 +28,7 @@ jobs:
 
       # This is a pre-submit / pre-release.
       - name: "Run analysis"
-        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -50,6 +50,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
         with:
           sarif_file: results.sarif

DEPS

@@ -4,7 +4,7 @@ vars = {
   'chromium_version':
     '138.0.7190.0',
   'node_version':
-    'v22.16.0',
+    'v22.15.1',
   'nan_version':
     'e14bdcd1f72d62bca1d541b66da43130384ec213',
   'squirrel.mac_version':

docs/.eslintrc.json

@@ -1,35 +0,0 @@
-{
-  "extends": "standard",
-  "plugins": [
-    "markdown",
-    "unicorn"
-  ],
-  "overrides": [
-    {
-      "files": ["*.md", "**/*.md"],
-      "processor": "markdown/markdown"
-    }
-  ],
-  "rules": {
-    "@typescript-eslint/no-unused-vars": "off",
-    "import/order": ["error", {
-      "alphabetize": {
-        "order": "asc"
-      },
-      "newlines-between": "always",
-      "pathGroups": [
-        {
-          "pattern": "{electron,electron/**}",
-          "group": "builtin",
-          "position": "before"
-        }
-      ],
-      "pathGroupsExcludedImportTypes": []
-    }],
-    "n/no-callback-literal": "off",
-    "no-undef": "off",
-    "no-unused-expressions": "off",
-    "no-unused-vars": "off",
-    "unicorn/prefer-node-protocol": "error"
-  }
-}

docs/api/app.md

@@ -9,7 +9,6 @@ closed:
 
 ```js
 const { app } = require('electron')
-
 app.on('window-all-closed', () => {
   app.quit()
 })
@@ -1024,7 +1023,6 @@ starts:
 
 ```js
 const { app, BrowserWindow } = require('electron')
-
 let myWindow = null
 
 const additionalData = { myKey: 'myValue' }
@@ -1228,8 +1226,6 @@ For `infoType` equal to `complete`:
 For `infoType` equal to `basic`:
   Promise is fulfilled with `Object` containing fewer attributes than when requested with `complete`. Here's an example of basic response:
 
-<!-- eslint-skip -->
-
 ```js
 {
   auxAttributes:
@@ -1343,7 +1339,6 @@ latest version.
 
 ``` js
 const { app } = require('electron')
-
 const path = require('node:path')
 
 const appFolder = path.dirname(process.execPath)
@@ -1418,7 +1413,6 @@ Returns `Function` - This function **must** be called once you have finished acc
 
 ```js
 const { app, dialog } = require('electron')
-
 const fs = require('node:fs')
 
 let filepath

docs/api/base-window.md

@@ -294,7 +294,6 @@ e.g. `APPCOMMAND_BROWSER_BACKWARD` is emitted as `browser-backward`.
 
 ```js
 const { BaseWindow } = require('electron')
-
 const win = new BaseWindow()
 win.on('app-command', (e, cmd) => {
   // Navigate the window back when the user hits their mouse back button
@@ -503,7 +502,6 @@ A `boolean` property that determines whether the window is excluded from the app
 
 ```js @ts-expect-error=[12]
 const { Menu, BaseWindow } = require('electron')
-
 const win = new BaseWindow({ height: 600, width: 600 })
 
 const template = [
@@ -729,7 +727,6 @@ Resizes and moves the window to the supplied bounds. Any properties that are not
 
 ```js
 const { BaseWindow } = require('electron')
-
 const win = new BaseWindow()
 
 // set all bounds properties
@@ -990,7 +987,6 @@ a HTML-rendered toolbar. For example:
 
 ```js
 const { BaseWindow } = require('electron')
-
 const win = new BaseWindow()
 
 const toolbarRect = document.getElementById('toolbar').getBoundingClientRect()
@@ -1350,10 +1346,6 @@ On Windows it calls SetWindowDisplayAffinity with `WDA_EXCLUDEFROMCAPTURE`.
 For Windows 10 version 2004 and up the window will be removed from capture entirely,
 older Windows versions behave as if `WDA_MONITOR` is applied capturing a black window.
 
-#### `win.isContentProtected()` _macOS_ _Windows_
-
-Returns `boolean` - whether or not content protection is currently enabled.
-
 #### `win.setFocusable(focusable)` _macOS_ _Windows_
 
 * `focusable` boolean

docs/api/browser-window.md

@@ -40,7 +40,6 @@ the window after this event will have no visual flash:
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow({ show: false })
 win.once('ready-to-show', () => {
   win.show()
@@ -374,7 +373,6 @@ e.g. `APPCOMMAND_BROWSER_BACKWARD` is emitted as `browser-backward`.
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 win.on('app-command', (e, cmd) => {
   // Navigate the window back when the user hits their mouse back button
@@ -822,7 +820,6 @@ Resizes and moves the window to the supplied bounds. Any properties that are not
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 
 // set all bounds properties
@@ -1083,7 +1080,6 @@ a HTML-rendered toolbar. For example:
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 
 const toolbarRect = document.getElementById('toolbar').getBoundingClientRect()
@@ -1236,10 +1232,9 @@ method:
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 
-const url = require('node:url').format({
+const url = require('url').format({
   protocol: 'file',
   slashes: true,
   pathname: require('node:path').join(__dirname, 'index.html')
@@ -1253,7 +1248,6 @@ the following:
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 
 win.loadURL('http://localhost:8000/post', {
@@ -1534,10 +1528,6 @@ On Windows it calls SetWindowDisplayAffinity with `WDA_EXCLUDEFROMCAPTURE`.
 For Windows 10 version 2004 and up the window will be removed from capture entirely,
 older Windows versions behave as if `WDA_MONITOR` is applied capturing a black window.
 
-#### `win.isContentProtected()` _macOS_ _Windows_
-
-Returns `boolean` - whether or not content protection is currently enabled.
-
 #### `win.setFocusable(focusable)` _macOS_ _Windows_
 
 * `focusable` boolean

docs/api/client-request.md

@@ -60,10 +60,6 @@ following properties:
     `strict-origin-when-cross-origin`.
   * `cache` string (optional) - can be `default`, `no-store`, `reload`,
     `no-cache`, `force-cache` or `only-if-cached`.
-  * `priority` string (optional) - can be `throttled`, `idle`, `lowest`,
-    `low`, `medium`, or `highest`. Defaults to `idle`.
-  * `priorityIncremental` boolean (optional) - the incremental loading flag as part
-    of HTTP extensible priorities (RFC 9218). Default is `true`.
 
 `options` properties such as `protocol`, `host`, `hostname`, `port` and `path`
 strictly follow the Node.js model as described in the

docs/api/command-line-switches.md

@@ -8,7 +8,6 @@ is emitted:
 
 ```js
 const { app } = require('electron')
-
 app.commandLine.appendSwitch('remote-debugging-port', '8315')
 app.commandLine.appendSwitch('host-rules', 'MAP * 127.0.0.1')
 
@@ -189,7 +188,6 @@ For example:
 
 ```js
 const { app } = require('electron')
-
 app.commandLine.appendSwitch('proxy-bypass-list', '<local>;*.google.com;*foo.com;1.2.3.4:5678')
 ```
 

docs/api/command-line.md

@@ -9,7 +9,6 @@ The following example shows how to check if the `--disable-gpu` flag is set.
 
 ```js
 const { app } = require('electron')
-
 app.commandLine.hasSwitch('disable-gpu')
 ```
 

docs/api/context-bridge.md

@@ -189,9 +189,7 @@ Be very cautious about which globals and APIs you expose to untrusted remote con
 
 ```js
 const { contextBridge } = require('electron')
-
 const crypto = require('node:crypto')
-
 contextBridge.exposeInMainWorld('nodeCrypto', {
   sha256sum (data) {
     const hash = crypto.createHash('sha256')

docs/api/debugger.md

@@ -10,7 +10,6 @@ runtime that allows interacting with pages and instrumenting them.
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 
 try {

docs/api/dialog.md

@@ -8,7 +8,6 @@ An example of showing a dialog to select multiple files:
 
 ```js
 const { dialog } = require('electron')
-
 console.log(dialog.showOpenDialog({ properties: ['openFile', 'multiSelections'] }))
 ```
 
@@ -53,8 +52,6 @@ The `window` argument allows the dialog to attach itself to a parent window, mak
 The `filters` specifies an array of file types that can be displayed or
 selected when you want to limit the user to a specific type. For example:
 
-<!-- eslint-skip -->
-
 ```js
 {
   filters: [
@@ -129,8 +126,6 @@ The `window` argument allows the dialog to attach itself to a parent window, mak
 The `filters` specifies an array of file types that can be displayed or
 selected when you want to limit the user to a specific type. For example:
 
-<!-- eslint-skip -->
-
 ```js
 {
   filters: [

docs/api/dock.md

@@ -9,7 +9,6 @@ The following example shows how to bounce your icon on the dock.
 
 ```js
 const { app } = require('electron')
-
 app.dock?.bounce()
 ```
 

docs/api/download-item.md

@@ -12,7 +12,6 @@ control the download item.
 ```js
 // In the main process.
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 win.webContents.session.on('will-download', (event, item, webContents) => {
   // Set the save path, making Electron not to prompt a save dialog.

docs/api/environment-variables.md

@@ -104,7 +104,7 @@ you would when running the normal Node.js executable, with the exception of the
 These flags are disabled owing to the fact that Electron uses BoringSSL instead of OpenSSL when building Node.js'
 `crypto` module, and so will not work as designed.
 
-If the [`runAsNode` fuse](../tutorial/fuses.md#runasnode) is disabled, `ELECTRON_RUN_AS_NODE` will be ignored.
+If the [`runAsNode` fuse](../tutorial/fuses.md#L13) is disabled, `ELECTRON_RUN_AS_NODE` will be ignored.
 
 ### `ELECTRON_NO_ATTACH_CONSOLE` _Windows_
 

docs/api/extensions-api.md

@@ -77,7 +77,6 @@ extension to be loaded.
 
 ```js
 const { app, session } = require('electron')
-
 const path = require('node:path')
 
 app.whenReady().then(async () => {

docs/api/image-view.md

@@ -14,7 +14,6 @@ Note that `ImageView` is experimental and may be changed or removed in the futur
 
 ```js
 const { BaseWindow, ImageView, nativeImage, WebContentsView } = require('electron')
-
 const path = require('node:path')
 
 const win = new BaseWindow({ width: 800, height: 600 })

docs/api/menu-item.md

@@ -16,14 +16,8 @@ See [`Menu`](menu.md) for examples.
     * `event` [KeyboardEvent](structures/keyboard-event.md)
   * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `showSubstitutions`, `toggleSmartQuotes`, `toggleSmartDashes`, `toggleTextReplacement`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `showAllTabs`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
     `click` property will be ignored. See [roles](#roles).
-  * `type` string (optional)
-    * `normal`
-    * `separator`
-    * `submenu`
-    * `checkbox`
-    * `radio`
-    * `header` - Only available on macOS 14 and up.
-    * `palette` - Only available on macOS 14 and up.
+  * `type` string (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
+    `radio`.
   * `label` string (optional)
   * `sublabel` string (optional) _macOS_ - Available in macOS >= 14.4
   * `toolTip` string (optional) _macOS_ - Hover text for this menu item.
@@ -164,10 +158,7 @@ item's submenu, if present.
 
 #### `menuItem.type`
 
-A `string` indicating the type of the item. Can be `normal`, `separator`, `submenu`, `checkbox`, `radio`, `header` or `palette`.
-
-> [!NOTE]
-> `header` and `palette` are only available on macOS 14 and up.
+A `string` indicating the type of the item. Can be `normal`, `separator`, `submenu`, `checkbox` or `radio`.
 
 #### `menuItem.role`
 

docs/api/message-channel-main.md

@@ -15,12 +15,9 @@ Process: [Main](../glossary.md#main-process)
 
 Example:
 
-<!-- eslint-disable import/order -->
-
 ```js
 // Main process
 const { BrowserWindow, MessageChannelMain } = require('electron')
-
 const w = new BrowserWindow()
 const { port1, port2 } = new MessageChannelMain()
 w.webContents.postMessage('port', null, [port2])
@@ -28,7 +25,6 @@ port1.postMessage({ some: 'message' })
 
 // Renderer process
 const { ipcRenderer } = require('electron')
-
 ipcRenderer.on('port', (e) => {
   // e.ports is a list of ports sent along with this message
   e.ports[0].onmessage = (messageEvent) => {

docs/api/native-image.md

@@ -86,7 +86,6 @@ images/
 
 ```js title='Main Process'
 const { Tray } = require('electron')
-
 const appTray = new Tray('/Users/somebody/images/icon.png')
 ```
 

docs/api/net.md

@@ -28,7 +28,6 @@ Example usage:
 
 ```js
 const { app } = require('electron')
-
 app.whenReady().then(() => {
   const { net } = require('electron')
   const request = net.request('https://github.com')

docs/api/protocol.md

@@ -9,7 +9,6 @@ An example of implementing a protocol that has the same effect as the
 
 ```js
 const { app, protocol, net } = require('electron')
-
 const path = require('node:path')
 const url = require('node:url')
 
@@ -39,9 +38,8 @@ to register it to that session explicitly.
 
 ```js
 const { app, BrowserWindow, net, protocol, session } = require('electron')
-
 const path = require('node:path')
-const url = require('node:url')
+const url = require('url')
 
 app.whenReady().then(() => {
   const partition = 'persist:example'
@@ -78,7 +76,6 @@ Policy:
 
 ```js
 const { protocol } = require('electron')
-
 protocol.registerSchemesAsPrivileged([
   { scheme: 'foo', privileges: { bypassCSP: true } }
 ])
@@ -131,9 +128,8 @@ Example:
 
 ```js
 const { app, net, protocol } = require('electron')
-
 const path = require('node:path')
-const { pathToFileURL } = require('node:url')
+const { pathToFileURL } = require('url')
 
 protocol.registerSchemesAsPrivileged([
   {
@@ -334,8 +330,7 @@ Example:
 
 ```js
 const { protocol } = require('electron')
-
-const { PassThrough } = require('node:stream')
+const { PassThrough } = require('stream')
 
 function createStream (text) {
   const rv = new PassThrough() // PassThrough is also a Readable stream

docs/api/service-workers.md

@@ -109,7 +109,6 @@ Starts the service worker or does nothing if already running.
 
 ```js
 const { app, session } = require('electron')
-
 const { serviceWorkers } = session.defaultSession
 
 // Collect service workers scopes

docs/api/session.md

@@ -79,7 +79,6 @@ You can create a `Session` object in the `session` module:
 
 ```js
 const { session } = require('electron')
-
 const ses = session.fromPartition('persist:name')
 console.log(ses.getUserAgent())
 ```
@@ -101,9 +100,8 @@ Emitted when Electron is about to download `item` in `webContents`.
 Calling `event.preventDefault()` will cancel the download and `item` will not be
 available from next tick of the process.
 
-```js @ts-expect-error=[5]
+```js @ts-expect-error=[4]
 const { session } = require('electron')
-
 session.defaultSession.on('will-download', (event, item, webContents) => {
   event.preventDefault()
   require('got')(item.getURL()).then((response) => {
@@ -854,7 +852,6 @@ verify proc.
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 
 win.webContents.session.setCertificateVerifyProc((request, callback) => {
@@ -906,7 +903,6 @@ Most web APIs do a permission check and then make a permission request if the ch
 
 ```js
 const { session } = require('electron')
-
 session.fromPartition('some-partition').setPermissionRequestHandler((webContents, permission, callback) => {
   if (webContents.getURL() === 'some-host' && permission === 'notifications') {
     return callback(false) // denied.
@@ -956,9 +952,7 @@ To clear the handler, call `setPermissionCheckHandler(null)`.
 
 ```js
 const { session } = require('electron')
-
-const url = require('node:url')
-
+const url = require('url')
 session.fromPartition('some-partition').setPermissionCheckHandler((webContents, permission, requestingOrigin) => {
   if (new URL(requestingOrigin).hostname === 'some-host' && permission === 'notifications') {
     return true // granted
@@ -1195,7 +1189,6 @@ automatically.  To clear the handler, call `setBluetoothPairingHandler(null)`.
 
 ```js
 const { app, BrowserWindow, session } = require('electron')
-
 const path = require('node:path')
 
 function createWindow () {
@@ -1525,7 +1518,6 @@ extension to be loaded.
 
 ```js
 const { app, session } = require('electron')
-
 const path = require('node:path')
 
 app.whenReady().then(async () => {
@@ -1667,7 +1659,6 @@ A [`Protocol`](protocol.md) object for this session.
 
 ```js
 const { app, session } = require('electron')
-
 const path = require('node:path')
 
 app.whenReady().then(() => {

docs/api/structures/printer-info.md

@@ -12,8 +12,6 @@ The number represented by `status` means different things on different platforms
 Below is an example of some of the additional options that may be set which
 may be different on each platform.
 
-<!-- eslint-skip -->
-
 ```js
 {
   name: 'Austin_4th_Floor_Printer___C02XK13BJHD4',

docs/api/structures/trace-config.md

@@ -26,8 +26,6 @@
 
 An example TraceConfig that roughly matches what Chrome DevTools records:
 
-<!-- eslint-skip -->
-
 ```js
 {
   recording_mode: 'record-until-full',

docs/api/system-preferences.md

@@ -6,7 +6,6 @@ Process: [Main](../glossary.md#main-process), [Utility](../glossary.md#utility-p
 
 ```js
 const { systemPreferences } = require('electron')
-
 console.log(systemPreferences.getEffectiveAppearance())
 ```
 

docs/api/view.md

@@ -9,7 +9,6 @@ module is emitted.
 
 ```js
 const { BaseWindow, View } = require('electron')
-
 const win = new BaseWindow()
 const view = new View()
 

docs/api/web-contents-view.md

@@ -9,7 +9,6 @@ module is emitted.
 
 ```js
 const { BaseWindow, WebContentsView } = require('electron')
-
 const win = new BaseWindow({ width: 800, height: 400 })
 
 const view1 = new WebContentsView()
@@ -53,7 +52,6 @@ Use this to interact with the `WebContents`, for instance to load a URL.
 
 ```js
 const { WebContentsView } = require('electron')
-
 const view = new WebContentsView()
 view.webContents.loadURL('https://electronjs.org/')
 ```

docs/api/web-contents.md

@@ -55,7 +55,6 @@ These methods can be accessed from the `webContents` module:
 
 ```js
 const { webContents } = require('electron')
-
 console.log(webContents)
 ```
 
@@ -447,7 +446,6 @@ and allow the page to be unloaded.
 
 ```js
 const { BrowserWindow, dialog } = require('electron')
-
 const win = new BrowserWindow({ width: 800, height: 600 })
 win.webContents.on('will-prevent-unload', (event) => {
   const choice = dialog.showMessageBoxSync(win, {
@@ -536,55 +534,14 @@ To only prevent the menu shortcuts, use
 [`setIgnoreMenuShortcuts`](#contentssetignoremenushortcutsignore):
 
 ```js
-const { app, BrowserWindow } = require('electron')
+const { BrowserWindow } = require('electron')
 
-app.whenReady().then(() => {
-  const win = new BrowserWindow({ width: 800, height: 600 })
+const win = new BrowserWindow({ width: 800, height: 600 })
 
-  win.webContents.on('before-input-event', (event, input) => {
-    // Enable application menu keyboard shortcuts when Ctrl/Cmd are down.
-    win.webContents.setIgnoreMenuShortcuts(!input.control && !input.meta)
-  })
-})
-```
-
-#### Event: 'before-mouse-event'
-
-Returns:
-
-* `event` Event
-* `mouse` [MouseInputEvent](structures/mouse-input-event.md)
-
-Emitted before dispatching mouse events in the page.
-
-Calling `event.preventDefault` will prevent the page mouse events.
-
-```js
-const { app, BrowserWindow } = require('electron')
-
-app.whenReady().then(() => {
-  const win = new BrowserWindow({ width: 800, height: 600 })
-
-  win.webContents.on('before-mouse-event', (event, mouse) => {
-    // Prevent mouseDown events.
-    if (mouse.type === 'mouseDown') {
-      console.log(mouse)
-      /*
-      {
-        type: 'mouseDown',
-        clickCount: 1,
-        movementX: 0,
-        movementY: 0,
-        button: 'left',
-        x: 632.359375,
-        y: 480.6875,
-        globalX: 168.359375,
-        globalY: 193.6875
-      }
-      */
-      event.preventDefault()
-    }
-  })
+win.webContents.on('before-input-event', (event, input) => {
+  // For example, only enable application menu keyboard shortcuts when
+  // Ctrl/Cmd are down.
+  win.webContents.setIgnoreMenuShortcuts(!input.control && !input.meta)
 })
 ```
 
@@ -1147,7 +1104,6 @@ Returns `string` - The URL of the current web page.
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('https://github.com').then(() => {
   const currentURL = win.webContents.getURL()
@@ -1767,12 +1723,6 @@ When a custom `pageSize` is passed, Chromium attempts to validate platform speci
 Prints window's web page. When `silent` is set to `true`, Electron will pick
 the system's default printer if `deviceName` is empty and the default settings for printing.
 
-Some possible `failureReason`s for print failure include:
-
-* "Invalid printer settings"
-* "Print job canceled"
-* "Print job failed"
-
 Use `page-break-before: always;` CSS style to force to print to a new page.
 
 Example usage:
@@ -1823,10 +1773,9 @@ An example of `webContents.printToPDF`:
 
 ```js
 const { app, BrowserWindow } = require('electron')
-
 const fs = require('node:fs')
-const os = require('node:os')
 const path = require('node:path')
+const os = require('node:os')
 
 app.whenReady().then(() => {
   const win = new BrowserWindow()
@@ -1858,7 +1807,6 @@ creation:
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 win.webContents.on('devtools-opened', () => {
   win.webContents.addWorkSpace(__dirname)
@@ -1925,7 +1873,6 @@ An example of showing devtools in a `<webview>` tag:
 ```js
 // Main process
 const { ipcMain, webContents } = require('electron')
-
 ipcMain.on('open-devtools', (event, targetContentsId, devtoolsContentsId) => {
   const target = webContents.fromId(targetContentsId)
   const devtools = webContents.fromId(devtoolsContentsId)
@@ -2185,7 +2132,6 @@ Returns `Promise<void>` - resolves if the page is saved.
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 
 win.loadURL('https://github.com')

docs/api/web-frame.md

@@ -99,11 +99,9 @@ with an array of misspelt words when complete.
 
 An example of using [node-spellchecker][spellchecker] as provider:
 
-```js @ts-expect-error=[3,8]
+```js @ts-expect-error=[2,6]
 const { webFrame } = require('electron')
-
 const spellChecker = require('spellchecker')
-
 webFrame.setSpellCheckProvider('en-US', {
   spellCheck (words, callback) {
     setTimeout(() => {
@@ -214,14 +212,11 @@ caches.
 
 ```js
 const { webFrame } = require('electron')
-
 console.log(webFrame.getResourceUsage())
 ```
 
 This will generate:
 
-<!-- eslint-skip -->
-
 ```js
 {
   images: {

docs/api/web-utils.md

@@ -22,6 +22,5 @@ const oldPath = document.querySelector('input').files[0].path
 
 // After
 const { webUtils } = require('electron')
-
 const newPath = webUtils.getPathForFile(document.querySelector('input').files[0])
 ```

docs/api/webview-tag.md

@@ -987,7 +987,6 @@ webview.send('ping')
 ```js
 // In guest page.
 const { ipcRenderer } = require('electron')
-
 ipcRenderer.on('ping', () => {
   ipcRenderer.sendToHost('pong')
 })

docs/development/creating-api.md

@@ -165,10 +165,8 @@ An example of the contents of this file can be found [here](https://github.com/e
 
 Add your module to the module list found at `"lib/browser/api/module-list.ts"` like so:
 
-<!-- eslint-disable semi -->
-
 ```ts title='lib/browser/api/module-list.ts' @ts-nocheck
 export const browserModuleList: ElectronInternal.ModuleEntry[] = [
-  { name: 'apiName', loader: () => require('./api-name') }
+  { name: 'apiName', loader: () => require('./api-name') },
 ];
 ```

docs/development/pull-requests.md

@@ -81,11 +81,6 @@ $ git commit
 
 Note that multiple commits get squashed when they are landed.
 
-#### Commit signing
-
-The `electron/electron` repo enforces [commit signatures](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) for all incoming PRs.
-To sign your commits, see GitHub's documentation on [Telling Git about your signing key](https://docs.github.com/en/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key).
-
 #### Commit message guidelines
 
 A good commit message should describe what changed and why. The Electron project

docs/faq.md

@@ -67,7 +67,6 @@ code from this:
 
 ```js
 const { app, Tray } = require('electron')
-
 app.whenReady().then(() => {
   const tray = new Tray('/path/to/icon.png')
   tray.setTitle('hello world')
@@ -78,7 +77,6 @@ to this:
 
 ```js
 const { app, Tray } = require('electron')
-
 let tray = null
 app.whenReady().then(() => {
   tray = new Tray('/path/to/icon.png')
@@ -97,7 +95,6 @@ To solve this, you can turn off node integration in Electron:
 ```js
 // In the main process.
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow({
   webPreferences: {
     nodeIntegration: false
@@ -146,7 +143,6 @@ To achieve this goal, set the background in the constructor for [BrowserWindow][
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow({
   backgroundColor: '#fff'
 })

docs/fiddles/.eslintrc.json

@@ -1,6 +0,0 @@
-{
-  "extends": "standard",
-  "rules": {
-    "import/order": "off"
-  }
-}

docs/tutorial/asar-archives.md

@@ -42,7 +42,6 @@ Read a file in the ASAR archive:
 
 ```js
 const fs = require('node:fs')
-
 fs.readFileSync('/path/to/example.asar/file.txt')
 ```
 
@@ -50,7 +49,6 @@ List all files under the root of the archive:
 
 ```js
 const fs = require('node:fs')
-
 fs.readdirSync('/path/to/example.asar')
 ```
 
@@ -64,7 +62,6 @@ You can also display a web page in an ASAR archive with `BrowserWindow`:
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 
 win.loadURL('file:///path/to/example.asar/static/index.html')
@@ -94,7 +91,6 @@ content of an ASAR archive as a file. For this purpose you can use the built-in
 
 ```js
 const originalFs = require('original-fs')
-
 originalFs.readFileSync('/path/to/example.asar')
 ```
 
@@ -103,7 +99,6 @@ the `fs` module:
 
 ```js
 const fs = require('node:fs')
-
 process.noAsar = true
 fs.readFileSync('/path/to/example.asar')
 ```

docs/tutorial/automated-testing.md

@@ -95,7 +95,6 @@ or to retrieve other Electron process information:
 ```js @ts-nocheck
 import fs from 'node:fs'
 import path from 'node:path'
-
 import { browser, expect } from '@wdio/globals'
 
 const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), { encoding: 'utf-8' }))
@@ -166,7 +165,6 @@ ChromeDriver and where to find the binary of your Electron app:
 
 ```js title='test.js' @ts-expect-error=[1]
 const webdriver = require('selenium-webdriver')
-
 const driver = new webdriver.Builder()
   // The "9515" is the port opened by ChromeDriver.
   .usingServer('http://localhost:9515')
@@ -319,9 +317,8 @@ To create a custom driver, we'll use Node.js' [`child_process`](https://nodejs.o
 The test suite will spawn the Electron process, then establish a simple messaging protocol:
 
 ```js title='testDriver.js' @ts-nocheck
-const electronPath = require('electron')
-
 const childProcess = require('node:child_process')
+const electronPath = require('electron')
 
 // spawn the process
 const env = { /* ... */ }
@@ -439,10 +436,8 @@ framework of your choosing. The following example uses
 or Mocha would work as well:
 
 ```js title='test.js' @ts-nocheck
-const electronPath = require('electron')
-
 const test = require('ava')
-
+const electronPath = require('electron')
 const { TestDriver } = require('./testDriver')
 
 const app = new TestDriver({

docs/tutorial/custom-title-bar.md

@@ -76,7 +76,6 @@ use the native UI to control the window.
 
 ```js
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow({ titleBarStyle: 'customButtonsOnHover' })
 ```
 
@@ -90,7 +89,6 @@ by a fixed amount.
 
 ```js title='main.js'
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow({ titleBarStyle: 'hiddenInset' })
 ```
 
@@ -100,7 +98,6 @@ constructor.
 
 ```js title='main.js'
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow({
   titleBarStyle: 'hidden',
   trafficLightPosition: { x: 10, y: 10 }
@@ -115,7 +112,6 @@ on the value of its boolean parameter.
 
 ```js title='main.js'
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 // hides the traffic lights
 win.setWindowButtonVisibility(false)
@@ -153,7 +149,6 @@ default to the standard system height:
 
 ```js title='main.js'
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow({
   titleBarStyle: 'hidden',
   titleBarOverlay: {

docs/tutorial/custom-window-interactions.md

@@ -62,7 +62,6 @@ API:
 
 ```js title='main.js'
 const { BrowserWindow } = require('electron')
-
 const win = new BrowserWindow()
 win.setIgnoreMouseEvents(true)
 ```
@@ -76,7 +75,6 @@ allowing events such as `mouseleave` to be emitted:
 
 ```js title='main.js'
 const { BrowserWindow, ipcMain } = require('electron')
-
 const path = require('node:path')
 
 const win = new BrowserWindow({

docs/tutorial/dark-mode.md

@@ -135,7 +135,6 @@ Finally, the `main.js` file represents the main process and contains the actual
 
 ```js
 const { app, BrowserWindow, ipcMain, nativeTheme } = require('electron')
-
 const path = require('node:path')
 
 const createWindow = () => {

docs/tutorial/devtools-extension.md

@@ -35,16 +35,15 @@ Using the [React Developer Tools][react-devtools] as an example:
 
    ```js
    const { app, session } = require('electron')
-   
-   const os = require('node:os')
    const path = require('node:path')
-   
+   const os = require('node:os')
+
    // on macOS
    const reactDevToolsPath = path.join(
      os.homedir(),
      '/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/4.9.0_0'
    )
-   
+
    app.whenReady().then(async () => {
      await session.defaultSession.loadExtension(reactDevToolsPath)
    })

docs/tutorial/esm.md

@@ -85,8 +85,6 @@ The `@babel/plugin-transform-modules-commonjs` plugin will transform
 ESM imports down to `require` calls. The exact syntax will depend on the
 [`importInterop` setting](https://babeljs.io/docs/babel-plugin-transform-modules-commonjs#importinterop).
 
-<!-- eslint-skip -->
-
 ```js @nolint @ts-nocheck title='@babel/plugin-transform-modules-commonjs'
 import foo from "foo";
 import { bar } from "bar";

docs/tutorial/in-app-purchases.md

@@ -37,7 +37,6 @@ Here is an example that shows how to use In-App Purchases in Electron. You'll ha
 ```js
 // Main process
 const { inAppPurchase } = require('electron')
-
 const PRODUCT_IDS = ['id1', 'id2']
 
 // Listen for transactions as soon as possible.

docs/tutorial/ipc.md

@@ -52,7 +52,6 @@ In the main process, set an IPC listener on the `set-title` channel with the `ip
 
 ```js {6-10,22} title='main.js (Main Process)'
 const { app, BrowserWindow, ipcMain } = require('electron')
-
 const path = require('node:path')
 
 // ...
@@ -184,7 +183,6 @@ provided to the renderer process. Please refer to
 
 ```js {6-13,25} title='main.js (Main Process)'
 const { app, BrowserWindow, dialog, ipcMain } = require('electron')
-
 const path = require('node:path')
 
 // ...
@@ -336,7 +334,6 @@ response.
 
 ```js title='main.js (Main Process)'
 const { ipcMain } = require('electron')
-
 ipcMain.on('synchronous-message', (event, arg) => {
   console.log(arg) // prints "ping" in the Node console
   event.returnValue = 'pong'
@@ -381,7 +378,6 @@ target renderer.
 
 ```js {11-26} title='main.js (Main Process)'
 const { app, BrowserWindow, Menu, ipcMain } = require('electron')
-
 const path = require('node:path')
 
 function createWindow () {
@@ -416,8 +412,6 @@ function createWindow () {
 For the purposes of the tutorial, it's important to note that the `click` handler
 sends a message (either `1` or `-1`) to the renderer process through the `update-counter` channel.
 
-<!-- eslint-skip -->
-
 ```js @ts-type={mainWindow:Electron.BrowserWindow}
 click: () => mainWindow.webContents.send('update-counter', -1)
 ```

docs/tutorial/launch-app-from-url-in-another-app.md

@@ -27,7 +27,6 @@ control our application lifecycle and create a native browser window.
 
 ```js
 const { app, BrowserWindow, shell } = require('electron')
-
 const path = require('node:path')
 ```
 

docs/tutorial/message-ports.md

@@ -303,7 +303,6 @@ without having to step through the isolated world.
 
 ```js title='main.js (Main Process)'
 const { BrowserWindow, app, MessageChannelMain } = require('electron')
-
 const path = require('node:path')
 
 app.whenReady().then(async () => {

docs/tutorial/native-code-and-electron-objc-macos.md

@@ -1075,7 +1075,7 @@ NODE_API_MODULE(objc_addon, Init)
 You're so close! We now have working Objective-C and thread-safe ways to expose methods and events to JavaScript. In this final step, let's create a JavaScript wrapper in `js/index.js` to provide a more friendly API:
 
 ```js title='js/index.js' @ts-expect-error=[10]
-const EventEmitter = require('node:events')
+const EventEmitter = require('events')
 
 class ObjcMacosAddon extends EventEmitter {
   constructor () {

docs/tutorial/native-code-and-electron.md

@@ -269,10 +269,8 @@ Let's break down this code:
 
 Now, let's create a JavaScript wrapper to make the addon easier to use. Create `js/index.js`:
 
-<!-- eslint-disable import/newline-after-import,import/order -->
-
 ```js title='js/index.js' @ts-expect-error=[5]
-const EventEmitter = require('node:events')
+const EventEmitter = require('events')
 
 // Load the native addon using the 'bindings' module
 // This will look for the compiled .node file in various places
@@ -364,7 +362,6 @@ To use this addon in an Electron application, you would:
 ```js @ts-expect-error=[2]
 // In your main process
 const myAddon = require('my-native-addon')
-
 console.log(myAddon.helloWorld('Electron'))
 ```
 

docs/tutorial/navigation-history.md

@@ -74,6 +74,7 @@ if (navigationHistory.canGoToOffset(2)) {
 A common flow is that you want to restore the history of a webContents - for instance to implement an "undo close tab" feature. To do so, you can call `navigationHistory.restore({ index, entries })`. This will restore the webContent's navigation history and the webContents location in said history, meaning that `goBack()` and `goForward()` navigate you through the stack as expected.
 
 ```js @ts-type={navigationHistory:Electron.NavigationHistory}
+
 const firstWindow = new BrowserWindow()
 
 // Later, you want a second window to have the same history and navigation position

docs/tutorial/performance.md

@@ -175,7 +175,6 @@ you might write code that eagerly loads dependencies:
 
 ```js title='parser.js' @ts-expect-error=[2]
 const fs = require('node:fs')
-
 const fooParser = require('foo-parser')
 
 class Parser {

docs/tutorial/process-model.md

@@ -242,8 +242,8 @@ These aliases have no impact on runtime, but can be used for typechecking
 and autocomplete.
 
 ```js title="Usage example"
-const { shell } = require('electron/common')
 const { app } = require('electron/main')
+const { shell } = require('electron/common')
 ```
 
 [window-mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Window

docs/tutorial/security.md

@@ -281,8 +281,7 @@ security-conscious developers might want to assume the very opposite.
 
 ```js title='main.js (Main Process)'
 const { session } = require('electron')
-
-const { URL } = require('node:url')
+const { URL } = require('url')
 
 session
   .fromPartition('some-partition')
@@ -612,10 +611,9 @@ sometimes be fooled - a `startsWith('https://example.com')` test would let
 `https://example.com.attacker.com` through.
 
 ```js title='main.js (Main Process)'
+const { URL } = require('url')
 const { app } = require('electron')
 
-const { URL } = require('node:url')
-
 app.on('web-contents-created', (event, contents) => {
   contents.on('will-navigate', (event, navigationUrl) => {
     const parsedUrl = new URL(navigationUrl)
@@ -692,14 +690,12 @@ leveraged to execute arbitrary commands.
 ```js title='main.js (Main Process)' @ts-type={USER_CONTROLLED_DATA_HERE:string}
 //  Bad
 const { shell } = require('electron')
-
 shell.openExternal(USER_CONTROLLED_DATA_HERE)
 ```
 
 ```js title='main.js (Main Process)'
 //  Good
 const { shell } = require('electron')
-
 shell.openExternal('https://example.com/index.html')
 ```
 

docs/tutorial/tutorial-3-preload.md

@@ -83,7 +83,6 @@ To attach this script to your renderer process, pass its path to the
 
 ```js {2,8-10} title="main.js"
 const { app, BrowserWindow } = require('electron')
-
 const path = require('node:path')
 
 const createWindow = () => {
@@ -205,7 +204,6 @@ you send out the `invoke` call from the renderer.
 
 ```js {1,15} title="main.js"
 const { app, BrowserWindow, ipcMain } = require('electron/main')
-
 const path = require('node:path')
 
 const createWindow = () => {

docs/tutorial/windows-taskbar.md

@@ -126,7 +126,6 @@ following lines:
 
 ```js
 const { BrowserWindow, nativeImage } = require('electron')
-
 const path = require('node:path')
 
 const win = new BrowserWindow()

filenames.gni

@@ -652,6 +652,8 @@ filenames = {
     "shell/common/gin_helper/function_template_extensions.h",
     "shell/common/gin_helper/locker.cc",
     "shell/common/gin_helper/locker.h",
+    "shell/common/gin_helper/microtasks_scope.cc",
+    "shell/common/gin_helper/microtasks_scope.h",
     "shell/common/gin_helper/object_template_builder.cc",
     "shell/common/gin_helper/object_template_builder.h",
     "shell/common/gin_helper/persistent_dictionary.cc",

lib/browser/api/menu-item.ts

@@ -71,7 +71,7 @@ const MenuItem = function (this: any, options: any) {
   };
 };
 
-MenuItem.types = ['normal', 'separator', 'submenu', 'checkbox', 'radio', 'header', 'palette'];
+MenuItem.types = ['normal', 'separator', 'submenu', 'checkbox', 'radio'];
 
 MenuItem.prototype.getDefaultRoleAccelerator = function () {
   return roles.getDefaultAccelerator(this.role);

lib/browser/api/menu.ts

@@ -143,9 +143,6 @@ Menu.prototype.insert = function (pos, item) {
   if (item.toolTip) this.setToolTip(pos, item.toolTip);
   if (item.icon) this.setIcon(pos, item.icon);
   if (item.role) this.setRole(pos, item.role);
-  if (item.type === 'palette' || item.type === 'header') {
-    this.setCustomType(pos, item.type);
-  }
 
   // Make menu accessible to items.
   item.overrideReadOnlyProperty('menu', this);
@@ -267,11 +264,9 @@ function removeExtraSeparators (items: (MenuItemConstructorOptions | MenuItem)[]
 function insertItemByType (this: MenuType, item: MenuItem, pos: number) {
   const types = {
     normal: () => this.insertItem(pos, item.commandId, item.label),
-    header: () => this.insertItem(pos, item.commandId, item.label),
     checkbox: () => this.insertCheckItem(pos, item.commandId, item.label),
     separator: () => this.insertSeparator(pos),
     submenu: () => this.insertSubMenu(pos, item.commandId, item.label, item.submenu),
-    palette: () => this.insertSubMenu(pos, item.commandId, item.label, item.submenu),
     radio: () => {
       // Grouping radio menu items
       item.overrideReadOnlyProperty('groupId', generateGroupId(this.items, pos));

lib/common/api/net-client-request.ts

@@ -288,12 +288,8 @@ function parseOptions (optionsIn: ClientRequestConstructorOptions | string): Nod
     origin: options.origin,
     referrerPolicy: options.referrerPolicy,
     cache: options.cache,
-    allowNonHttpProtocols: Object.hasOwn(options, kAllowNonHttpProtocols),
-    priority: options.priority
+    allowNonHttpProtocols: Object.hasOwn(options, kAllowNonHttpProtocols)
   };
-  if ('priorityIncremental' in options) {
-    urlLoaderOptions.priorityIncremental = options.priorityIncremental;
-  }
   const headers: Record<string, string | string[]> = options.headers || {};
   for (const [name, value] of Object.entries(headers)) {
     validateHeader(name, value);

package.json

@@ -20,7 +20,7 @@
     "@types/temp": "^0.9.4",
     "@types/webpack": "^5.28.5",
     "@types/webpack-env": "^1.18.5",
-    "@typescript-eslint/eslint-plugin": "^8.32.1",
+    "@typescript-eslint/eslint-plugin": "^8.7.0",
     "@typescript-eslint/parser": "^8.7.0",
     "buffer": "^6.0.3",
     "chalk": "^4.1.0",
@@ -29,11 +29,11 @@
     "eslint": "^8.57.1",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.30.0",
-    "eslint-plugin-markdown": "^5.1.0",
     "eslint-plugin-mocha": "^10.5.0",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.6.0",
+    "eslint-plugin-standard": "^5.0.0",
     "eslint-plugin-unicorn": "^55.0.0",
     "events": "^3.2.0",
     "folder-hash": "^2.1.1",
@@ -48,6 +48,7 @@
     "remark-cli": "^12.0.1",
     "remark-preset-lint-markdown-style-guide": "^4.0.0",
     "semver": "^7.6.3",
+    "shx": "^0.3.4",
     "stream-json": "^1.8.0",
     "tap-xunit": "^2.4.1",
     "temp": "^0.9.4",
@@ -81,7 +82,7 @@
     "lint:api-history": "lint-roller-markdown-api-history --root \"./docs/api/\" --schema \"./docs/api-history.schema.json\" --breaking-changes-file \"./docs/breaking-changes.md\" --check-placement --check-strings \"*.md\"",
     "create-api-json": "node script/create-api-json.mjs",
     "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js",
-    "gn-typescript-definitions": "npm run create-typescript-definitions && node script/cp.mjs electron.d.ts",
+    "gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts",
     "pre-flight": "pre-flight",
     "gn-check": "node ./script/gn-check.js",
     "gn-format": "python3 script/run-gn-format.py",

patches/chromium/.patches

@@ -49,6 +49,7 @@ upload_list_add_loadsync_method.patch
 allow_setting_secondary_label_via_simplemenumodel.patch
 feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
 adjust_accessibility_ui_for_electron.patch
+skip_atk_toolchain_check.patch
 worker_feat_add_hook_to_notify_script_ready.patch
 chore_provide_iswebcontentscreationoverridden_with_full_params.patch
 fix_properly_honor_printing_page_ranges.patch
@@ -56,10 +57,12 @@ export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
 fix_export_zlib_symbols.patch
 web_contents.patch
 webview_fullscreen.patch
+disable_unload_metrics.patch
 extend_apply_webpreferences.patch
 build_libc_as_static_library.patch
 build_do_not_depend_on_packed_resource_integrity.patch
 refactor_restore_base_adaptcallbackforrepeating.patch
+hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
 logging_win32_only_create_a_console_if_logging_to_stderr.patch
 fix_media_key_usage_with_globalshortcuts.patch
 feat_expose_raw_response_headers_from_urlloader.patch
@@ -72,9 +75,11 @@ fix_aspect_ratio_with_max_size.patch
 port_autofill_colors_to_the_color_pipeline.patch
 fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
 build_make_libcxx_abi_unstable_false_for_electron.patch
+introduce_ozoneplatform_electron_can_call_x11_property.patch
 make_gtk_getlibgtk_public.patch
 custom_protocols_plzserviceworker.patch
 feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
+disable_freezing_flags_after_init_in_node.patch
 short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
 chore_add_electron_deps_to_gitignores.patch
 chore_modify_chromium_handling_of_mouse_events.patch
@@ -89,11 +94,14 @@ fix_remove_caption-removing_style_call.patch
 build_allow_electron_to_use_exec_script.patch
 chore_introduce_blocking_api_for_electron.patch
 chore_patch_out_partition_attribute_dcheck_for_webviews.patch
-chore_patch_out_profile_methods.patch
+chore_patch_out_profile_methods_in_profile_selections_cc.patch
 add_gin_converter_support_for_arraybufferview.patch
 chore_defer_usb_service_getdevices_request_until_usb_service_is.patch
 refactor_expose_hostimportmoduledynamically_and.patch
 feat_expose_documentloader_setdefersloading_on_webdocumentloader.patch
+fix_remove_profiles_from_spellcheck_service.patch
+chore_patch_out_profile_methods_in_chrome_browser_pdf.patch
+chore_patch_out_profile_methods_in_titlebar_config.patch
 fix_disabling_background_throttling_in_compositor.patch
 fix_select_the_first_menu_item_when_opened_via_keyboard.patch
 fix_return_v8_value_from_localframe_requestexecutescript.patch
@@ -132,6 +140,7 @@ feat_add_signals_when_embedder_cleanup_callbacks_run_for.patch
 feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch
 fix_win32_synchronous_spellcheck.patch
 fix_enable_wrap_iter_in_string_view_and_array.patch
+fix_linter_error.patch
 chore_grandfather_in_electron_views_and_delegates.patch
 refactor_patch_electron_permissiontypes_into_blink.patch
 revert_webgl_add_stub_webgl_2_renderingcontextwebgpu.patch

patches/chromium/chore_patch_out_profile_methods.patch

@@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Charles Kerr <charles@charleskerr.com>
-Date: Wed, 17 May 2023 14:42:09 -0500
-Subject: chore: patch out Profile methods
-
-Electron does not support Profiles, so we need to patch it out of any
-code that we use.
-
-diff --git a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
-index e3b9f14a4cf2167064ce6716053e663adffa1542..65f13a4607c8145858fd47d81cb9960c44272d79 100644
---- a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
-+++ b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
-@@ -45,6 +45,7 @@ namespace {
- // hierarchy is: enterprise policy > user choice > finch experiment.
- bool ShouldEnableSkiaRenderer(content::WebContents* contents) {
-   CHECK(contents);
-+#if 0
-   const PrefService* prefs =
-       Profile::FromBrowserContext(contents->GetBrowserContext())->GetPrefs();
- 
-@@ -52,6 +53,7 @@ bool ShouldEnableSkiaRenderer(content::WebContents* contents) {
-   if (prefs->IsManagedPreference(prefs::kPdfUseSkiaRendererEnabled)) {
-     return prefs->GetBoolean(prefs::kPdfUseSkiaRendererEnabled);
-   }
-+#endif
- 
-   //  When the enterprise policy is not set, use finch/feature flag choice.
-   return base::FeatureList::IsEnabled(
-diff --git a/chrome/browser/profiles/profile_selections.cc b/chrome/browser/profiles/profile_selections.cc
-index bc0bad82ebcdceadc505e912ff27202b452fefab..6b77c57fccc4619a1df3b4ed661d2bdd60960228 100644
---- a/chrome/browser/profiles/profile_selections.cc
-+++ b/chrome/browser/profiles/profile_selections.cc
-@@ -13,6 +13,7 @@
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) {
-+#if 0
-   // By default disable all services for System Profile.
-   // Even though having no services is also the default value for Guest Profile,
-   // this is not really the case in practice because a lot of Service Factories
-@@ -20,7 +21,7 @@ bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) {
-   if (profile && profile->IsSystemProfile()) {
-     return true;
-   }
--
-+#endif
-   return false;
- }
- 
-@@ -104,6 +105,7 @@ ProfileSelections ProfileSelections::BuildRedirectedInIncognito() {
- }
- 
- Profile* ProfileSelections::ApplyProfileSelection(Profile* profile) const {
-+#if 0
-   CHECK(profile);
- 
-   ProfileSelection selection = GetProfileSelection(profile);
-@@ -119,6 +121,9 @@ Profile* ProfileSelections::ApplyProfileSelection(Profile* profile) const {
-     case ProfileSelection::kOffTheRecordOnly:
-       return profile->IsOffTheRecord() ? profile : nullptr;
-   }
-+#else
-+  return nullptr;
-+#endif
- }
- 
- ProfileSelection ProfileSelections::GetProfileSelection(
-diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
-index 910534aac947890b16b176b10ac8eae9857bd2d7..1bb22b89b6ec4d620354bb7747c37cae9dd3a57e 100644
---- a/chrome/browser/spellchecker/spellcheck_service.cc
-+++ b/chrome/browser/spellchecker/spellcheck_service.cc
-@@ -20,8 +20,10 @@
- #include "base/synchronization/waitable_event.h"
- #include "base/values.h"
- #include "build/build_config.h"
-+#if 0
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/profiles/profiles_state.h"
-+#endif
- #include "chrome/browser/spellchecker/spellcheck_factory.h"
- #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h"
- #include "components/language/core/browser/pref_names.h"
-@@ -66,7 +68,10 @@ SpellcheckService::SpellCheckerBinder& GetSpellCheckerBinderOverride() {
- // Only record spelling-configuration metrics for profiles in which the user
- // can configure spelling.
- bool RecordSpellingConfigurationMetrics(content::BrowserContext* context) {
-+#if 0
-   return profiles::IsRegularUserProfile(Profile::FromBrowserContext(context));
-+#endif
-+  return true;
- }
- 
- }  // namespace
-diff --git a/chrome/browser/win/titlebar_config.cc b/chrome/browser/win/titlebar_config.cc
-index 7898ea88ca529660e52c1f9e2517d6f016b740a5..114046912999f4ca9d21f7d5859d14ecaaab9f56 100644
---- a/chrome/browser/win/titlebar_config.cc
-+++ b/chrome/browser/win/titlebar_config.cc
-@@ -12,8 +12,10 @@
- 
- bool ShouldBrowserCustomDrawTitlebar(BrowserView* browser_view) {
-   return !ShouldDefaultThemeUseMicaTitlebar() ||
-+#if 0
-          !ThemeServiceFactory::GetForProfile(browser_view->GetProfile())
-               ->UsingSystemTheme() ||
-+#endif
-          (!browser_view->browser()->is_type_normal() &&
-           !browser_view->browser()->is_type_popup() &&
-           !browser_view->browser()->is_type_devtools());

patches/chromium/chore_patch_out_profile_methods_in_chrome_browser_pdf.patch

@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Charles Kerr <charles@charleskerr.com>
+Date: Wed, 17 May 2023 14:42:09 -0500
+Subject: chore: patch out Profile methods in chrome_browser_pdf
+
+Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4482679
+
+Electron does not support Profiles, so this Profile::FromBrowserContext()
+call is not needed and will not link. This change patches it out.
+
+diff --git a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
+index e3b9f14a4cf2167064ce6716053e663adffa1542..65f13a4607c8145858fd47d81cb9960c44272d79 100644
+--- a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
++++ b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
+@@ -45,6 +45,7 @@ namespace {
+ // hierarchy is: enterprise policy > user choice > finch experiment.
+ bool ShouldEnableSkiaRenderer(content::WebContents* contents) {
+   CHECK(contents);
++#if 0
+   const PrefService* prefs =
+       Profile::FromBrowserContext(contents->GetBrowserContext())->GetPrefs();
+ 
+@@ -52,6 +53,7 @@ bool ShouldEnableSkiaRenderer(content::WebContents* contents) {
+   if (prefs->IsManagedPreference(prefs::kPdfUseSkiaRendererEnabled)) {
+     return prefs->GetBoolean(prefs::kPdfUseSkiaRendererEnabled);
+   }
++#endif
+ 
+   //  When the enterprise policy is not set, use finch/feature flag choice.
+   return base::FeatureList::IsEnabled(

patches/chromium/chore_patch_out_profile_methods_in_profile_selections_cc.patch

@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Thu, 24 Nov 2022 12:29:41 +0100
+Subject: chore: patch out Profile methods in profile_selections.cc
+
+We do not support the concept of Profiles and profile->IsSystemProfile()
+is therefore not a method that will compile given we don't include
+relevant files.
+
+diff --git a/chrome/browser/profiles/profile_selections.cc b/chrome/browser/profiles/profile_selections.cc
+index bc0bad82ebcdceadc505e912ff27202b452fefab..23355e00f9ff99c1b0d981076df97b5d4af355c2 100644
+--- a/chrome/browser/profiles/profile_selections.cc
++++ b/chrome/browser/profiles/profile_selections.cc
+@@ -13,6 +13,7 @@
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+ bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) {
++#if 0
+   // By default disable all services for System Profile.
+   // Even though having no services is also the default value for Guest Profile,
+   // this is not really the case in practice because a lot of Service Factories
+@@ -20,7 +21,7 @@ bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) {
+   if (profile && profile->IsSystemProfile()) {
+     return true;
+   }
+-
++#endif
+   return false;
+ }
+ 

patches/chromium/chore_patch_out_profile_methods_in_titlebar_config.patch

@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Charles Kerr <charles@charleskerr.com>
+Date: Thu, 18 May 2023 22:43:53 -0500
+Subject: chore: patch out Profile methods in titlebar_config
+
+Make this code linkable in Electron by removing Profile references.
+
+diff --git a/chrome/browser/win/titlebar_config.cc b/chrome/browser/win/titlebar_config.cc
+index 7898ea88ca529660e52c1f9e2517d6f016b740a5..114046912999f4ca9d21f7d5859d14ecaaab9f56 100644
+--- a/chrome/browser/win/titlebar_config.cc
++++ b/chrome/browser/win/titlebar_config.cc
+@@ -12,8 +12,10 @@
+ 
+ bool ShouldBrowserCustomDrawTitlebar(BrowserView* browser_view) {
+   return !ShouldDefaultThemeUseMicaTitlebar() ||
++#if 0
+          !ThemeServiceFactory::GetForProfile(browser_view->GetProfile())
+               ->UsingSystemTheme() ||
++#endif
+          (!browser_view->browser()->is_type_normal() &&
+           !browser_view->browser()->is_type_popup() &&
+           !browser_view->browser()->is_type_devtools());

patches/chromium/disable_freezing_flags_after_init_in_node.patch

@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <japthorp@slack-corp.com>
+Date: Mon, 20 Jun 2022 14:53:37 -0700
+Subject: disable freezing flags after init in node
+
+This was introduced in
+https://chromium-review.googlesource.com/c/chromium/src/+/3687671.
+
+When running node in the renderer, flags are updated after initialization, so
+freezing the flags in Blink causes node initialization to fail.
+
+If possible, it would be ideal to do this without a patch.
+https://bugs.chromium.org/p/v8/issues/detail?id=12887 suggests that there may
+at some point be an API to "unfreeze" the flags, or we may be able to refactor
+node initialization to not update flags after V8 initialization.
+
+diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
+index 7a20f5199bd6cb5d13f31ec5db3e3cc03821bc3a..22167f808cb7b27d5b2a8e517cdeee63205ab9ad 100644
+--- a/content/renderer/render_process_impl.cc
++++ b/content/renderer/render_process_impl.cc
+@@ -212,6 +212,9 @@ RenderProcessImpl::RenderProcessImpl()
+     v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag));
+   }
+ 
++  // Freezing flags after init conflicts with node in the renderer.
++  v8::V8::SetFlagsFromString("--no-freeze-flags-after-init");
++
+   if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) {
+     content::GetContentClient()->renderer()->SetUpWebAssemblyTrapHandler();
+   }

patches/chromium/disable_unload_metrics.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cheng Zhao <zcbenz@gmail.com>
+Date: Thu, 20 Sep 2018 17:45:47 -0700
+Subject: fix: disable unload metrics
+
+Chromium introduced unload metrics in:
+https://chromium-review.googlesource.com/c/chromium/src/+/2314877
+
+Which would cause some DCHECKs to assert in Electron:
+https://github.com/electron/electron/issues/27717
+
+And it would then crash and make some tests fail:
+crashReporter module should send minidump when sandboxed renderer crashes api-crash-reporter-spec.ts 643 ms
+Error message:
+ptype: expected 'browser' to equal 'renderer'
+Error stack trace:
+AssertionError: ptype: expected 'browser' to equal 'renderer'
+    at checkCrash (electron\spec\api-crash-reporter-spec.ts:39:35)
+    at Context.<anonymous> (electron\spec\api-crash-reporter-spec.ts:154:7)
+    at runMicrotasks (<anonymous>)
+    at processTicksAndRejections (internal/process/task_queues.js:93:5)
+
+This patch temporarily disables the metrics so we can have green CI, and we
+should continue seeking for a real fix.
+
+diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
+index d976c082529a62bcef7352531ced808e5970027e..31e95005359f6e8e4e18ebd75324940f4fdd11eb 100644
+--- a/content/browser/renderer_host/navigator.cc
++++ b/content/browser/renderer_host/navigator.cc
+@@ -1476,6 +1476,7 @@ void Navigator::RecordNavigationMetrics(
+             .InMilliseconds());
+   }
+ 
++#if 0
+   // If this is a same-process navigation and we have timestamps for unload
+   // durations, fill those metrics out as well.
+   if (params.unload_start && params.unload_end &&
+@@ -1525,6 +1526,7 @@ void Navigator::RecordNavigationMetrics(
+          first_before_unload_start_time)
+             .InMilliseconds());
+   }
++#endif
+ 
+   builder.Record(ukm::UkmRecorder::Get());
+   metrics_data_.reset();

patches/chromium/fix_linter_error.patch

@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Charles Kerr <charles@charleskerr.com>
+Date: Thu, 6 Mar 2025 17:06:49 -0600
+Subject: fix: linter error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fix: linter error
+
+This is showing up in an eslint build step in Electron:
+
+> /__w/electron/electron/src/out/Default/gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts
+>   77:23  error  This assertion is unnecessary since the receiver accepts the original type of the expression  @typescript-eslint/no-unnecessary-type-assertion
+>
+> ✖ 1 problem (1 error, 0 warnings)
+>   1 error and 0 warnings potentially fixable with the `--fix` option.
+
+However, removing the assertion causes a typescript build failure:
+
+> gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts:77:23 - error TS2345: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'.
+>   Type 'null' is not assignable to type 'HTMLElement'.
+>
+> 77         items.indexOf(this.querySelector<HTMLElement>(':focus'));
+>                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+So I think the two different steps may be picking up typescript definitions.
+
+This patch should be removed after the issue is tracked down
+andfixed in a followup task.
+
+diff --git a/ui/webui/resources/cr_elements/cr_menu_selector/cr_menu_selector.ts b/ui/webui/resources/cr_elements/cr_menu_selector/cr_menu_selector.ts
+index 0a83b8041b8201c95442e680c77555d4c11bc06a..abdb8e9bfbbfb1fce6fa38e226e50a35477e49a2 100644
+--- a/ui/webui/resources/cr_elements/cr_menu_selector/cr_menu_selector.ts
++++ b/ui/webui/resources/cr_elements/cr_menu_selector/cr_menu_selector.ts
+@@ -74,6 +74,7 @@ export class CrMenuSelector extends CrMenuSelectorBase {
+     const items = this.getAllFocusableItems_();
+     assert(items.length >= 1);
+     const currentFocusedIndex =
++        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+         items.indexOf(this.querySelector<HTMLElement>(':focus')!);
+ 
+     let newFocusedIndex = currentFocusedIndex;

patches/chromium/fix_remove_profiles_from_spellcheck_service.patch

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Calvin Watford <watfordcalvin@gmail.com>
+Date: Fri, 28 Apr 2023 17:06:30 -0600
+Subject: fix: remove profiles from spellcheck_service
+
+Electron doesn't support profiles.
+
+diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
+index 910534aac947890b16b176b10ac8eae9857bd2d7..1bb22b89b6ec4d620354bb7747c37cae9dd3a57e 100644
+--- a/chrome/browser/spellchecker/spellcheck_service.cc
++++ b/chrome/browser/spellchecker/spellcheck_service.cc
+@@ -20,8 +20,10 @@
+ #include "base/synchronization/waitable_event.h"
+ #include "base/values.h"
+ #include "build/build_config.h"
++#if 0
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/profiles/profiles_state.h"
++#endif
+ #include "chrome/browser/spellchecker/spellcheck_factory.h"
+ #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h"
+ #include "components/language/core/browser/pref_names.h"
+@@ -66,7 +68,10 @@ SpellcheckService::SpellCheckerBinder& GetSpellCheckerBinderOverride() {
+ // Only record spelling-configuration metrics for profiles in which the user
+ // can configure spelling.
+ bool RecordSpellingConfigurationMetrics(content::BrowserContext* context) {
++#if 0
+   return profiles::IsRegularUserProfile(Profile::FromBrowserContext(context));
++#endif
++  return true;
+ }
+ 
+ }  // namespace

patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <jeremya@chromium.org>
+Date: Tue, 15 Jun 2021 15:16:12 -0700
+Subject: hack to allow gclient sync with host_os=mac on linux in CI
+
+This is a hack to work around the fact that we run `gclient sync` for
+our macOS CI on Linux.
+
+If removing this patch causes no sync failures, it's safe to delete :+1:
+
+Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
+
+diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
+index 316567b6ea69aad254f6acfe78c07ee8c9d31627..0c0ef515ec1d2429b9325dfff16893a4171e9da4 100755
+--- a/tools/clang/scripts/update.py
++++ b/tools/clang/scripts/update.py
+@@ -307,6 +307,8 @@ def GetDefaultHostOs():
+       'win32': 'win',
+   }
+   default_host_os = _PLATFORM_HOST_OS_MAP.get(sys.platform, sys.platform)
++  if "host_os=mac" in os.environ.get('GCLIENT_EXTRA_ARGS', ''):
++    default_host_os = 'mac'
+   if default_host_os == 'mac' and platform.machine() == 'arm64':
+     default_host_os = 'mac-arm64'
+   return default_host_os

patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch

@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Marek Rusinowski <marekrusinowski@gmail.com>
+Date: Wed, 23 Mar 2022 21:09:37 +0100
+Subject: introduce OzonePlatform::electron_can_call_x11 property
+
+We expose this additonal property in the OzonePlatform to be able to easily
+determine whatever we can call X11 functions without crashing the application
+at rutime. It would be best if eventually all usages of this property were
+replaced with clean ozone native implementations.
+
+diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc
+index 4f00f630665a10a0fb85fe7c2ddc0fa67add1603..e9e8da125b518387546275bf84e0b09c3d49e254 100644
+--- a/ui/ozone/platform/x11/ozone_platform_x11.cc
++++ b/ui/ozone/platform/x11/ozone_platform_x11.cc
+@@ -194,6 +194,7 @@ class OzonePlatformX11 : public OzonePlatform,
+           base::MessagePumpType::UI;
+       properties->supports_vulkan_swap_chain = true;
+       properties->skia_can_fall_back_to_x11 = true;
++      properties->electron_can_call_x11 = true;
+       properties->platform_shows_drag_image = false;
+       properties->app_modal_dialogs_use_event_blocker = true;
+       properties->fetch_buffer_formats_for_gmb_on_gpu = true;
+diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
+index 1384e1620dc07874e2103d12cd6f31da5ca7a821..7c8639f6f57fd3b8977bbb3d811edf466b4ccc64 100644
+--- a/ui/ozone/public/ozone_platform.h
++++ b/ui/ozone/public/ozone_platform.h
+@@ -129,6 +129,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
+     // Linux only: determines if Skia can fall back to the X11 output device.
+     bool skia_can_fall_back_to_x11 = false;
+ 
++    // Linux only: determines is Electron can call selected X11 functions while
++    // it migrates to pure ozone abstractions.
++    bool electron_can_call_x11 = false;
++
+     // Wayland only: determines whether windows which are not top level ones
+     // should be given parents explicitly.
+     bool set_parent_for_non_top_level_windows = false;

patches/chromium/skip_atk_toolchain_check.patch

@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: John Kleinschmidt <jkleinsc@github.com>
+Date: Wed, 15 Jul 2020 17:52:32 -0400
+Subject: skip atk toolchain check
+
+this patch is needed to work around the following gn error on
+Linux arm/arm64:
+
+ERROR at //build/config/linux/atk/BUILD.gn:13:1: Assertion failed.
+
+assert(current_toolchain == default_toolchain)
+
+^-----
+
+See //ui/accessibility/BUILD.gn:297:20: which caused the file to be included.
+
+      configs += [ "//build/config/linux/atk" ]
+
+                   ^-------------------------
+"//build/config/linux/atk" is only needed for accessibility unit tests
+which we don't build
+
+diff --git a/build/config/linux/atk/BUILD.gn b/build/config/linux/atk/BUILD.gn
+index 239c3870a149a9c31d8458c5c6aeb543d80c2a6a..843f442a55ce866dc018de74c33d888cbffb8dd4 100644
+--- a/build/config/linux/atk/BUILD.gn
++++ b/build/config/linux/atk/BUILD.gn
+@@ -11,7 +11,7 @@ import("//build/config/ui.gni")
+ assert(!is_chromeos)
+ 
+ # These packages should _only_ be expected when building for a target.
+-assert(current_toolchain == default_toolchain)
++#assert(current_toolchain == default_toolchain)
+ 
+ if (use_atk) {
+   assert(use_glib, "use_atk=true requires that use_glib=true")
+diff --git a/build/config/linux/atspi2/BUILD.gn b/build/config/linux/atspi2/BUILD.gn
+index 30bc77f9c23fbdd4cf46f3ae022266c75f0e9ddf..2f3070c91be9bd5a7c7456004efd44d8c5f665b0 100644
+--- a/build/config/linux/atspi2/BUILD.gn
++++ b/build/config/linux/atspi2/BUILD.gn
+@@ -6,7 +6,6 @@ import("//build/config/linux/pkg_config.gni")
+ import("//build/config/ui.gni")
+ 
+ # These packages should _only_ be expected when building for a target.
+-assert(current_toolchain == default_toolchain)
+ 
+ if (use_atk) {
+   pkg_config("atspi2") {

patches/node/.patches

@@ -47,5 +47,6 @@ fix_ensure_traverseparent_bails_on_resource_path_exit.patch
 cli_move_--trace-atomics-wait_to_eol.patch
 fix_cppgc_initializing_twice.patch
 fix_task_starvation_in_inspector_context_test.patch
+zlib_fix_pointer_alignment.patch
 fix_expose_readfilesync_override_for_modules.patch
 test_force_slow_json_stringify_path_for_overflow.patch

patches/node/add_v8_taskpirority_to_foreground_task_runner_signature.patch

@@ -8,10 +8,10 @@ naturally upstream, and we will be able to remove this patch in a future
 Node.js upgrade.
 
 diff --git a/src/node_platform.cc b/src/node_platform.cc
-index b438b3774d0aa7680fdbc6c6bf39a87893d221b2..ec355061825fb861c17fa2e6cc967b4c7b8d4586 100644
+index 65a9b79ae6ac8b7589e8f8109a709acb41d12b97..743ac069ad579a208a632ef5096ae46c8a0dfd74 100644
 --- a/src/node_platform.cc
 +++ b/src/node_platform.cc
-@@ -687,8 +687,8 @@ bool NodePlatform::IdleTasksEnabled(Isolate* isolate) {
+@@ -556,8 +556,8 @@ bool NodePlatform::IdleTasksEnabled(Isolate* isolate) {
    return ForIsolate(isolate)->IdleTasksEnabled();
  }
  
@@ -23,10 +23,10 @@ index b438b3774d0aa7680fdbc6c6bf39a87893d221b2..ec355061825fb861c17fa2e6cc967b4c
  }
  
 diff --git a/src/node_platform.h b/src/node_platform.h
-index a0222b4a1b074c6708e390d58d04221717069ac1..8015ca1801573c3a7c4a5db6d0f10b4016a9267c 100644
+index dde2d1b5687a5b52a4f09183bb4ff88d7d3e4d01..0a99f5b4b5eeb221ef3a34db7a50955c32d3c163 100644
 --- a/src/node_platform.h
 +++ b/src/node_platform.h
-@@ -213,7 +213,7 @@ class NodePlatform : public MultiIsolatePlatform {
+@@ -177,7 +177,7 @@ class NodePlatform : public MultiIsolatePlatform {
                                    void (*callback)(void*), void* data) override;
  
    std::shared_ptr<v8::TaskRunner> GetForegroundTaskRunner(

patches/node/build_add_gn_build_files.patch

@@ -55,10 +55,10 @@ index a2123cc6c6d21c53fafc8934203b3720393e7b11..245a43920c7baf000ba63192a84a4c3f
  
  assert(!node_enable_inspector || node_use_openssl,
 diff --git a/src/node_builtins.cc b/src/node_builtins.cc
-index defb657a62a0316224a02b68505ac1142fd89d03..d637faac88875bfa110e2b8d1f53962061d98279 100644
+index e85860de93dd5753dd4542ecee9f0888af93898a..04eab49c368c8f86837ed2c1384bf3c63e4bde24 100644
 --- a/src/node_builtins.cc
 +++ b/src/node_builtins.cc
-@@ -785,6 +785,7 @@ void BuiltinLoader::RegisterExternalReferences(
+@@ -783,6 +783,7 @@ void BuiltinLoader::RegisterExternalReferences(
    registry->Register(GetNatives);
  
    RegisterExternalReferencesForInternalizedBuiltinCode(registry);
@@ -67,7 +67,7 @@ index defb657a62a0316224a02b68505ac1142fd89d03..d637faac88875bfa110e2b8d1f539620
  
  }  // namespace builtins
 diff --git a/src/node_builtins.h b/src/node_builtins.h
-index f9426599f2d5dc6ad061407f0c4eb2c9203a4433..302030f610965f07dd6998d282275c1bdf738009 100644
+index a73de23a1debfdac66873e0baccf882e383bfc36..7ac5291be093773ee7efd39e77e01bf5d5ce5247 100644
 --- a/src/node_builtins.h
 +++ b/src/node_builtins.h
 @@ -74,6 +74,8 @@ using BuiltinCodeCacheMap =
@@ -258,10 +258,10 @@ index 856878c33681a73d41016729dabe48b0a6a80589..91a11852d206b65485fe90fd037a0bd1
      if sys.platform == 'win32':
        files = [ x.replace('\\', '/') for x in files ]
 diff --git a/unofficial.gni b/unofficial.gni
-index 44641b92678ab2f28e6f5de75a92878f9f3d322d..e17e4f043af6e4047ab82723ffd83187f3c04c5c 100644
+index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50ae50a3d8 100644
 --- a/unofficial.gni
 +++ b/unofficial.gni
-@@ -142,32 +142,42 @@ template("node_gn_build") {
+@@ -142,32 +142,39 @@ template("node_gn_build") {
      public_configs = [
        ":node_external_config",
        "deps/googletest:googletest_config",
@@ -296,10 +296,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..e17e4f043af6e4047ab82723ffd83187
        "$node_v8_path:v8_libplatform",
      ]
  
-+    cflags_cc = [
-+      "-Wno-unguarded-availability-new",
-+      "-Wno-return-stack-address"
-+    ]
++    cflags_cc = [ "-Wno-unguarded-availability-new" ]
 +
      sources = [
 +      "src/node_snapshot_stub.cc",
@@ -307,7 +304,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..e17e4f043af6e4047ab82723ffd83187
        "$target_gen_dir/node_javascript.cc",
      ] + gypi_values.node_sources
  
-@@ -190,7 +200,7 @@ template("node_gn_build") {
+@@ -190,7 +197,7 @@ template("node_gn_build") {
      }
      if (node_use_openssl) {
        deps += [ "deps/ncrypto" ]
@@ -316,7 +313,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..e17e4f043af6e4047ab82723ffd83187
        sources += gypi_values.node_crypto_sources
      }
      if (node_enable_inspector) {
-@@ -214,6 +224,10 @@ template("node_gn_build") {
+@@ -214,6 +221,10 @@ template("node_gn_build") {
      }
    }
  
@@ -327,7 +324,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..e17e4f043af6e4047ab82723ffd83187
    executable(target_name) {
      forward_variables_from(invoker, "*")
  
-@@ -288,6 +302,7 @@ template("node_gn_build") {
+@@ -288,6 +299,7 @@ template("node_gn_build") {
    }
  
    executable("node_js2c") {
@@ -335,7 +332,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..e17e4f043af6e4047ab82723ffd83187
      deps = [
        "deps/uv",
        "$node_simdutf_path",
-@@ -298,26 +313,75 @@ template("node_gn_build") {
+@@ -298,26 +310,75 @@ template("node_gn_build") {
        "src/embedded_data.cc",
        "src/embedded_data.h",
      ]
@@ -421,7 +418,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..e17e4f043af6e4047ab82723ffd83187
      outputs = [ "$target_gen_dir/node_javascript.cc" ]
  
      # Get the path to node_js2c executable of the host toolchain.
-@@ -331,11 +395,11 @@ template("node_gn_build") {
+@@ -331,11 +392,11 @@ template("node_gn_build") {
          get_label_info(":node_js2c($host_toolchain)", "name") +
          host_executable_suffix
  

patches/node/build_allow_unbundling_of_node_js_dependencies.patch

@@ -14,7 +14,7 @@ We don't need to do this for zlib, as the existing gn workflow uses the same
 Upstreamed at https://github.com/nodejs/node/pull/55903
 
 diff --git a/unofficial.gni b/unofficial.gni
-index e17e4f043af6e4047ab82723ffd83187f3c04c5c..d591dfc99fdea4f830008502786ee44d863a31fc 100644
+index 672e97436d9220e8d5046b0c92025f50ae50a3d8..a8ce18acfe333350f91b3e5f235db5f756b2e34a 100644
 --- a/unofficial.gni
 +++ b/unofficial.gni
 @@ -155,7 +155,6 @@ template("node_gn_build") {
@@ -25,7 +25,7 @@ index e17e4f043af6e4047ab82723ffd83187f3c04c5c..d591dfc99fdea4f830008502786ee44d
        "deps/nbytes",
        "deps/nghttp2",
        "deps/postject",
-@@ -194,7 +193,17 @@ template("node_gn_build") {
+@@ -191,7 +190,17 @@ template("node_gn_build") {
        configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
        configs += [ "//build/config/gcc:symbol_visibility_default" ]
      }
@@ -44,7 +44,7 @@ index e17e4f043af6e4047ab82723ffd83187f3c04c5c..d591dfc99fdea4f830008502786ee44d
      if (v8_enable_i18n_support) {
        deps += [ "//third_party/icu" ]
      }
-@@ -222,6 +231,19 @@ template("node_gn_build") {
+@@ -219,6 +228,19 @@ template("node_gn_build") {
        sources += node_inspector.node_inspector_sources +
                   node_inspector.node_inspector_generated_sources
      }

patches/node/build_compile_with_c_20_support.patch

@@ -10,7 +10,7 @@ V8 requires C++20 support as of https://chromium-review.googlesource.com/c/v8/v8
 This can be removed when Electron upgrades to a version of Node.js containing the required V8 version.
 
 diff --git a/common.gypi b/common.gypi
-index f3476a91e4c3cda7cecf49e07bb594a167ac46ef..de73f6c18131f43e6fe3107c866599aa3398cf10 100644
+index 53016fc79c3d914982abeb61bf0a76181024e2bf..99b147482b636706b1372b89298f35b60ca2bb31 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -530,7 +530,7 @@

patches/node/build_enable_perfetto.patch

@@ -64,10 +64,10 @@ index 251f51ec454f9cba4023b8b6729241ee753aac13..1de8cac6e3953ce9cab9db03530da327
  
  module.exports = {
 diff --git a/node.gyp b/node.gyp
-index ad010a8d99cf08013b7202eddce66e5b3885652d..d735b887d05ddfadec8e56dd8eae09646890aa84 100644
+index ec1f90b73f7d119b2c0e0207a5e36f3cec7295e9..66244b6638e34536aed397f56c6a4570a73e9b90 100644
 --- a/node.gyp
 +++ b/node.gyp
-@@ -176,7 +176,6 @@
+@@ -175,7 +175,6 @@
        'src/timers.cc',
        'src/timer_wrap.cc',
        'src/tracing/agent.cc',
@@ -75,7 +75,7 @@ index ad010a8d99cf08013b7202eddce66e5b3885652d..d735b887d05ddfadec8e56dd8eae0964
        'src/tracing/node_trace_writer.cc',
        'src/tracing/trace_event.cc',
        'src/tracing/traced_value.cc',
-@@ -305,7 +304,6 @@
+@@ -303,7 +302,6 @@
        'src/tcp_wrap.h',
        'src/timers.h',
        'src/tracing/agent.h',

patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch

@@ -7,7 +7,7 @@ Subject: build: ensure native module compilation fails if not using a new
 This should not be upstreamed, it is a quality-of-life patch for downstream module builders.
 
 diff --git a/common.gypi b/common.gypi
-index d9c0b721fe0a629a30efb3c4e04905176ca0a7f5..f3476a91e4c3cda7cecf49e07bb594a167ac46ef 100644
+index f2a45f0f0bbfce93e61d3696a18425af4d022a00..53016fc79c3d914982abeb61bf0a76181024e2bf 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -88,6 +88,8 @@
@@ -40,7 +40,7 @@ index d9c0b721fe0a629a30efb3c4e04905176ca0a7f5..f3476a91e4c3cda7cecf49e07bb594a1
        # list in v8/BUILD.gn.
        ['v8_enable_v8_checks == 1', {
 diff --git a/configure.py b/configure.py
-index 932484674e5b15b765b8bfe307bdf99b49b5039f..befaa85527b9ebebad226e603586e23d04ec1e51 100755
+index 95faeeef3867cbf3ca4b1857d893aa127d550a2f..b36f63a5482074f79a20709b8c4774cb6dadec52 100755
 --- a/configure.py
 +++ b/configure.py
 @@ -1698,6 +1698,7 @@ def configure_library(lib, output, pkgname=None):
@@ -52,7 +52,7 @@ index 932484674e5b15b765b8bfe307bdf99b49b5039f..befaa85527b9ebebad226e603586e23d
    o['variables']['v8_enable_javascript_promise_hooks'] = 1
    o['variables']['v8_enable_lite_mode'] = 1 if options.v8_lite_mode else 0
 diff --git a/src/node.h b/src/node.h
-index 835c78145956de3d8c52b6cc0581bcfef600f90b..174fd4d1af4c8cd75aec09f4548a674fd5539fb2 100644
+index 8b77f7cb4d53105f42ba76d99a76a98b7a73789f..bdc77f8eb7abffa9e6c98cd254daedad3e44b981 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -22,6 +22,12 @@

patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch

@@ -34,10 +34,10 @@ index 411eab8136d5957ae8a491bc38ffbdc88e59f5da..63c93b5be09692d0d4b6bfbb214b173b
  let kResistStopPropagation;
  
 diff --git a/src/node_builtins.cc b/src/node_builtins.cc
-index d637faac88875bfa110e2b8d1f53962061d98279..e0b58c4d0ac5640a677c22d710f88f1b318378d7 100644
+index 04eab49c368c8f86837ed2c1384bf3c63e4bde24..c3d2b3c90c206dd81a3d8aa6c14fdf4678a1cddd 100644
 --- a/src/node_builtins.cc
 +++ b/src/node_builtins.cc
-@@ -35,6 +35,7 @@ using v8::Value;
+@@ -34,6 +34,7 @@ using v8::Value;
  BuiltinLoader::BuiltinLoader()
      : config_(GetConfig()), code_cache_(std::make_shared<BuiltinCodeCache>()) {
    LoadJavaScriptSource();
@@ -46,7 +46,7 @@ index d637faac88875bfa110e2b8d1f53962061d98279..e0b58c4d0ac5640a677c22d710f88f1b
    AddExternalizedBuiltin(
        "internal/deps/cjs-module-lexer/lexer",
 diff --git a/src/node_builtins.h b/src/node_builtins.h
-index 302030f610965f07dd6998d282275c1bdf738009..35cb7766eeccc62dd2f0ce9484a2f1ec7beccc05 100644
+index 7ac5291be093773ee7efd39e77e01bf5d5ce5247..c3c987d535285be84026ad0c633650bd2067d22d 100644
 --- a/src/node_builtins.h
 +++ b/src/node_builtins.h
 @@ -138,6 +138,7 @@ class NODE_EXTERN_PRIVATE BuiltinLoader {

patches/node/build_option_to_use_custom_inspector_protocol_path.patch

@@ -65,10 +65,10 @@ index 3d7aa148678b2646b88fa7c32abec91791b02b82..4810d93eb971b253f7dadff7011a632f
    gypi_values = exec_script(
        "../../tools/gypi_to_gn.py",
 diff --git a/unofficial.gni b/unofficial.gni
-index d591dfc99fdea4f830008502786ee44d863a31fc..9e26399482d6a1cdb843efb72c152d5cdd5e08ea 100644
+index a8ce18acfe333350f91b3e5f235db5f756b2e34a..6bcc40b282543fc40f80c5c6659de658209844b8 100644
 --- a/unofficial.gni
 +++ b/unofficial.gni
-@@ -214,13 +214,14 @@ template("node_gn_build") {
+@@ -211,13 +211,14 @@ template("node_gn_build") {
      }
      if (node_enable_inspector) {
        deps += [

patches/node/build_restore_clang_as_default_compiler_on_macos.patch

@@ -11,7 +11,7 @@ node-gyp will use the result of `process.config` that reflects the environment
 in which the binary got built.
 
 diff --git a/common.gypi b/common.gypi
-index de73f6c18131f43e6fe3107c866599aa3398cf10..e2171e14b9e29dfc3c629f8164545d56d5e9057e 100644
+index 99b147482b636706b1372b89298f35b60ca2bb31..5024e5fb0aee210f4986572638a523db6d26b4cc 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -127,6 +127,7 @@

patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch

@@ -8,10 +8,10 @@ they use themselves as the entry point. We should try to upstream some form
 of this.
 
 diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
-index 4e7be0594ca1e1ceaf1963debbce46783893ed77..a6df0672bf6ae6e9a74ebbb0e4debff63599cc99 100644
+index d1c05d1717cdc825c4e48885c963c9ed65bcf51c..278665921c5160ff10b3178db27d4df319fab6b3 100644
 --- a/lib/internal/process/pre_execution.js
 +++ b/lib/internal/process/pre_execution.js
-@@ -245,12 +245,14 @@ function patchProcessObject(expandArgv1) {
+@@ -243,12 +243,14 @@ function patchProcessObject(expandArgv1) {
    // the entry point.
    if (expandArgv1 && process.argv[1] && process.argv[1][0] !== '-') {
      // Expand process.argv[1] into a full path.

patches/node/ci_ensure_node_tests_set_electron_run_as_node.patch

@@ -8,18 +8,15 @@ which causes the `ELECTRON_RUN_AS_NODE` variable to be lost. This patch
 re-injects it.
 
 diff --git a/test/fixtures/test-runner/output/arbitrary-output-colored.js b/test/fixtures/test-runner/output/arbitrary-output-colored.js
-index 444531da1df2f9bbbc19bb8a43fb6eb2d1802d1a..81b3b3e37e5664dc53bec987a2ce3a83a8da105f 100644
+index af23e674cb361ed81dafa22670d5633559cd1144..1dd59990cb7cdba8aecf4f499ee6b92e7cd41b30 100644
 --- a/test/fixtures/test-runner/output/arbitrary-output-colored.js
 +++ b/test/fixtures/test-runner/output/arbitrary-output-colored.js
-@@ -7,9 +7,9 @@ const fixtures = require('../../../common/fixtures');
+@@ -7,6 +7,6 @@ const fixtures = require('../../../common/fixtures');
  (async function run() {
    const test = fixtures.path('test-runner/output/arbitrary-output-colored-1.js');
    const reset = fixtures.path('test-runner/output/reset-color-depth.js');
 -  await once(spawn(process.execPath, ['-r', reset, '--test', test], { stdio: 'inherit' }), 'exit');
+-  await once(spawn(process.execPath, ['-r', reset, '--test', '--test-reporter', 'tap', test], { stdio: 'inherit'  }), 'exit');
 +  await once(spawn(process.execPath, ['-r', reset, '--test', test], { stdio: 'inherit', env: { ELECTRON_RUN_AS_NODE: 1 }}), 'exit');
-   await once(
--    spawn(process.execPath, ['-r', reset, '--test', '--test-reporter', 'tap', test], { stdio: 'inherit' }),
-+    spawn(process.execPath, ['-r', reset, '--test', '--test-reporter', 'tap', test], { stdio: 'inherit', env: { ELECTRON_RUN_AS_NODE: 1 }}),
-     'exit',
-   );
++  await once(spawn(process.execPath, ['-r', reset, '--test', '--test-reporter', 'tap', test], { stdio: 'inherit', env: { ELECTRON_RUN_AS_NODE: 1 }  }), 'exit');
  })().then(common.mustCall());

patches/node/cli_move_--trace-atomics-wait_to_eol.patch

@@ -15,10 +15,10 @@ Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
 Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>
 
 diff --git a/doc/api/cli.md b/doc/api/cli.md
-index 121d8f2bbd2b1d93067a06a902b1e7b986bcdb49..3460ad33c6186dcc3aa3281d80b723a1cc1d50dd 100644
+index 114b7bbf6b1e105fc1696ed8a064065db73ff519..ad863e52761332c3249a86af0e3d239cd0f73b03 100644
 --- a/doc/api/cli.md
 +++ b/doc/api/cli.md
-@@ -3367,7 +3367,6 @@ one is included in the list below.
+@@ -3313,7 +3313,6 @@ one is included in the list below.
  * `--tls-min-v1.1`
  * `--tls-min-v1.2`
  * `--tls-min-v1.3`
@@ -27,10 +27,10 @@ index 121d8f2bbd2b1d93067a06a902b1e7b986bcdb49..3460ad33c6186dcc3aa3281d80b723a1
  * `--trace-env-js-stack`
  * `--trace-env-native-stack`
 diff --git a/doc/node.1 b/doc/node.1
-index 663d123ac728f097e8a76c94cf10c53d059983d7..497f5a61182beafbaa26b945181056353674cfc3 100644
+index 9f534746ef9d9c1c1ee2edd6c195573a2e228600..e01fc511a1034518c0fb9bc5fa925524aecad927 100644
 --- a/doc/node.1
 +++ b/doc/node.1
-@@ -539,11 +539,6 @@ but the option is supported for compatibility with older Node.js versions.
+@@ -533,11 +533,6 @@ but the option is supported for compatibility with older Node.js versions.
  Set default minVersion to 'TLSv1.3'. Use to disable support for TLSv1.2 in
  favour of TLSv1.3, which is more secure.
  .
@@ -43,10 +43,10 @@ index 663d123ac728f097e8a76c94cf10c53d059983d7..497f5a61182beafbaa26b94518105635
  Print stack traces for deprecations.
  .
 diff --git a/src/node.cc b/src/node.cc
-index 6f8f6386d0db8aef1e2e0126cc9064101cbe6112..bc670a6c8b5027417cdc35e1cd94a60f63fd342d 100644
+index 2f58a6fa69069dabb99b5ddb8011991b07fa5f02..9f6fa646ba6673f67f5f625e157ed850633a26da 100644
 --- a/src/node.cc
 +++ b/src/node.cc
-@@ -232,44 +232,6 @@ void Environment::WaitForInspectorFrontendByOptions() {
+@@ -226,44 +226,6 @@ void Environment::WaitForInspectorFrontendByOptions() {
  }
  #endif  // HAVE_INSPECTOR
  
@@ -91,7 +91,7 @@ index 6f8f6386d0db8aef1e2e0126cc9064101cbe6112..bc670a6c8b5027417cdc35e1cd94a60f
  void Environment::InitializeDiagnostics() {
    isolate_->GetHeapProfiler()->AddBuildEmbedderGraphCallback(
        Environment::BuildEmbedderGraph, this);
-@@ -278,17 +240,6 @@ void Environment::InitializeDiagnostics() {
+@@ -272,17 +234,6 @@ void Environment::InitializeDiagnostics() {
    }
    if (options_->trace_uncaught)
      isolate_->SetCaptureStackTraceForUncaughtExceptions(true);
@@ -110,10 +110,10 @@ index 6f8f6386d0db8aef1e2e0126cc9064101cbe6112..bc670a6c8b5027417cdc35e1cd94a60f
      isolate_->SetPromiseHook(TracePromises);
    }
 diff --git a/src/node_options.cc b/src/node_options.cc
-index a9500716f2a955fc591628a969c5fba40783a2e7..b153d2c6a771e80bcdf5ed6adbc1cd225b3bf97e 100644
+index 54b253aa54f5cdebdb04315f9c6c2506977555c0..acf390bd456c7ddfa6987e440fb45940aec6b1ff 100644
 --- a/src/node_options.cc
 +++ b/src/node_options.cc
-@@ -770,10 +770,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
+@@ -762,10 +762,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
              "throw an exception on deprecations",
              &EnvironmentOptions::throw_deprecation,
              kAllowedInEnvvar);
@@ -125,7 +125,7 @@ index a9500716f2a955fc591628a969c5fba40783a2e7..b153d2c6a771e80bcdf5ed6adbc1cd22
              "show stack traces on deprecations",
              &EnvironmentOptions::trace_deprecation,
 diff --git a/src/node_options.h b/src/node_options.h
-index 60068b008b2e2a034c3f0c58b947a8d04d55e3b2..d821bc6a9adf28ea312a9c446f8acfc8ed586ae3 100644
+index 065457acfde6ba4d04ed570cc72005cfd2798fd5..150f833bb21bd6d37f652f0785a4a98f3de5f67d 100644
 --- a/src/node_options.h
 +++ b/src/node_options.h
 @@ -203,7 +203,6 @@ class EnvironmentOptions : public Options {

patches/node/cli_remove_deprecated_v8_flag.patch

@@ -18,10 +18,10 @@ Reviewed-By: Michaël Zasso <targos@protonmail.com>
 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
 
 diff --git a/doc/api/cli.md b/doc/api/cli.md
-index 6f984926a62973ba36bd3c27cc39b01f2bcac819..121d8f2bbd2b1d93067a06a902b1e7b986bcdb49 100644
+index 1b42c5a7f4715e56fa5bc39cd6f78a76473406f2..114b7bbf6b1e105fc1696ed8a064065db73ff519 100644
 --- a/doc/api/cli.md
 +++ b/doc/api/cli.md
-@@ -3404,7 +3404,6 @@ V8 options that are allowed are:
+@@ -3350,7 +3350,6 @@ V8 options that are allowed are:
  * `--disallow-code-generation-from-strings`
  * `--enable-etw-stack-walking`
  * `--expose-gc`
@@ -30,10 +30,10 @@ index 6f984926a62973ba36bd3c27cc39b01f2bcac819..121d8f2bbd2b1d93067a06a902b1e7b9
  * `--jitless`
  * `--max-old-space-size`
 diff --git a/src/node_options.cc b/src/node_options.cc
-index bb1e80ece4158dfed1b8bab7dc6d00dd56505aac..a9500716f2a955fc591628a969c5fba40783a2e7 100644
+index b22fbb0a285f6f323779d6ebb2b027a3990b031e..54b253aa54f5cdebdb04315f9c6c2506977555c0 100644
 --- a/src/node_options.cc
 +++ b/src/node_options.cc
-@@ -992,11 +992,6 @@ PerIsolateOptionsParser::PerIsolateOptionsParser(
+@@ -984,11 +984,6 @@ PerIsolateOptionsParser::PerIsolateOptionsParser(
              "disallow eval and friends",
              V8Option{},
              kAllowedInEnvvar);

patches/node/fix_add_default_values_for_variables_in_common_gypi.patch

@@ -7,7 +7,7 @@ common.gypi is a file that's included in the node header bundle, despite
 the fact that we do not build node with gyp.
 
 diff --git a/common.gypi b/common.gypi
-index 393fe32765794fbc5e92690e968e3c18f0d749fa..d9c0b721fe0a629a30efb3c4e04905176ca0a7f5 100644
+index 372409f4b09cc3b3be9809f697816498e5c021fe..f2a45f0f0bbfce93e61d3696a18425af4d022a00 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -90,6 +90,23 @@

patches/node/fix_add_source_location_for_v8_task_runner.patch

@@ -15,10 +15,10 @@ corresponding change.
 CL: https://chromium-review.googlesource.com/c/v8/v8/+/5300826
 
 diff --git a/src/node_platform.cc b/src/node_platform.cc
-index 9c4c1e1db5fa7c0ca791e01d9be331e0957e9699..b438b3774d0aa7680fdbc6c6bf39a87893d221b2 100644
+index 00ca9757bc4d0cdeb03a3f32be3ef19077cb7969..65a9b79ae6ac8b7589e8f8109a709acb41d12b97 100644
 --- a/src/node_platform.cc
 +++ b/src/node_platform.cc
-@@ -307,11 +307,13 @@ void PerIsolatePlatformData::FlushTasks(uv_async_t* handle) {
+@@ -245,11 +245,13 @@ void PerIsolatePlatformData::FlushTasks(uv_async_t* handle) {
    platform_data->FlushForegroundTasksInternal();
  }
  
@@ -31,10 +31,10 @@ index 9c4c1e1db5fa7c0ca791e01d9be331e0957e9699..b438b3774d0aa7680fdbc6c6bf39a878
 -void PerIsolatePlatformData::PostTask(std::unique_ptr<Task> task) {
 +void PerIsolatePlatformData::PostTaskImpl(std::unique_ptr<Task> task,
 +                                          const v8::SourceLocation& location) {
-   // The task can be posted from any V8 background worker thread, even when
-   // the foreground task runner is being cleaned up by Shutdown(). In that
-   // case, make sure we wait until the shutdown is completed (which leads
-@@ -330,8 +332,10 @@ void PerIsolatePlatformData::PostTask(std::unique_ptr<Task> task) {
+   if (flush_tasks_ == nullptr) {
+     // V8 may post tasks during Isolate disposal. In that case, the only
+     // sensible path forward is to discard the task.
+@@ -259,8 +261,10 @@ void PerIsolatePlatformData::PostTask(std::unique_ptr<Task> task) {
    uv_async_send(flush_tasks_);
  }
  
@@ -44,10 +44,10 @@ index 9c4c1e1db5fa7c0ca791e01d9be331e0957e9699..b438b3774d0aa7680fdbc6c6bf39a878
 +    std::unique_ptr<Task> task,
 +    double delay_in_seconds,
 +    const v8::SourceLocation& location) {
-   if (debug_log_level_ != PlatformDebugLogLevel::kNone) {
-     fprintf(stderr,
-             "\nPerIsolatePlatformData::PostDelayedTaskImpl %p %f",
-@@ -353,13 +357,15 @@ void PerIsolatePlatformData::PostDelayedTask(
+   if (flush_tasks_ == nullptr) {
+     // V8 may post tasks during Isolate disposal. In that case, the only
+     // sensible path forward is to discard the task.
+@@ -274,13 +278,15 @@ void PerIsolatePlatformData::PostDelayedTask(
    uv_async_send(flush_tasks_);
  }
  
@@ -67,10 +67,10 @@ index 9c4c1e1db5fa7c0ca791e01d9be331e0957e9699..b438b3774d0aa7680fdbc6c6bf39a878
  }
  
 diff --git a/src/node_platform.h b/src/node_platform.h
-index af30ebeb0c8629ab86d1a55fd63610165abfbabf..a0222b4a1b074c6708e390d58d04221717069ac1 100644
+index 77cb5e6e4f891c510cdaf7fd6175a1f00d9bc420..dde2d1b5687a5b52a4f09183bb4ff88d7d3e4d01 100644
 --- a/src/node_platform.h
 +++ b/src/node_platform.h
-@@ -80,18 +80,21 @@ class PerIsolatePlatformData :
+@@ -59,18 +59,21 @@ class PerIsolatePlatformData :
    ~PerIsolatePlatformData() override;
  
    std::shared_ptr<v8::TaskRunner> GetForegroundTaskRunner() override;

patches/node/fix_assert_module_in_the_renderer_process.patch

@@ -44,10 +44,10 @@ index 59b5a16f1309a5e4055bccfdb7a529045ad30402..bfdaf6211466a01b64b7942f7b16c480
    let filename = call.getFileName();
    const line = call.getLineNumber() - 1;
 diff --git a/src/node_options.cc b/src/node_options.cc
-index 8be78889e8234eb3100f309829bf7470db544dcd..bb1e80ece4158dfed1b8bab7dc6d00dd56505aac 100644
+index 23cb558a22b4462f5ce4f74833d25c7f712f8139..b22fbb0a285f6f323779d6ebb2b027a3990b031e 100644
 --- a/src/node_options.cc
 +++ b/src/node_options.cc
-@@ -1557,14 +1557,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
+@@ -1535,14 +1535,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
    }
    Isolate* isolate = args.GetIsolate();
  

patches/node/fix_cppgc_initializing_twice.patch

@@ -12,10 +12,10 @@ This can be removed/refactored once Node.js upgrades to a version of V8
 containing the above CL.
 
 diff --git a/src/node.cc b/src/node.cc
-index bc670a6c8b5027417cdc35e1cd94a60f63fd342d..49a9670de72c222d6b4a681be001efb4a2651ea3 100644
+index 9f6fa646ba6673f67f5f625e157ed850633a26da..63a462876c00588d22abdd6ed8ee41ecf6590d03 100644
 --- a/src/node.cc
 +++ b/src/node.cc
-@@ -1209,7 +1209,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
+@@ -1173,7 +1173,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
      result->platform_ = per_process::v8_platform.Platform();
    }
  

patches/node/fix_do_not_resolve_electron_entrypoints.patch

@@ -5,6 +5,19 @@ Subject: fix: do not resolve electron entrypoints
 
 This wastes fs cycles and can result in strange behavior if this path actually exists on disk
 
+diff --git a/lib/internal/modules/esm/load.js b/lib/internal/modules/esm/load.js
+index c9d4a3536d0f60375ae623b48ca2fa7095c88d42..d818320fbbc430d06a0c2852e4723981d6e1a844 100644
+--- a/lib/internal/modules/esm/load.js
++++ b/lib/internal/modules/esm/load.js
+@@ -109,7 +109,7 @@ async function defaultLoad(url, context = kEmptyObject) {
+     source = null;
+     format ??= 'builtin';
+   } else if (format !== 'commonjs' || defaultType === 'module') {
+-    if (source == null) {
++    if (format !== 'electron' && source == null) {
+       ({ responseURL, source } = await getSource(urlInstance, context));
+       context = { __proto__: context, source };
+     }
 diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
 index 49aacb6262502ced54e817f99dd596db85b9659c..f9f065bb743275e9b2ce71375e6a9f06e00c0f36 100644
 --- a/lib/internal/modules/esm/translators.js
@@ -20,7 +33,7 @@ index 49aacb6262502ced54e817f99dd596db85b9659c..f9f065bb743275e9b2ce71375e6a9f06
    if (!loaded) {
      module = new CJSModule(filename);
 diff --git a/lib/internal/modules/run_main.js b/lib/internal/modules/run_main.js
-index 02ba43adc2c8e92a78942bbb04023a16f5870ee9..bbf1ab69b884a9325bebdd07b2c4fd354eee946b 100644
+index ab4783a7982b9feb8fa85b62e3e3b181f93309bd..34f91026451d7347ae278712d083e4fe281e50f3 100644
 --- a/lib/internal/modules/run_main.js
 +++ b/lib/internal/modules/run_main.js
 @@ -2,6 +2,7 @@

patches/node/fix_ensure_traverseparent_bails_on_resource_path_exit.patch

@@ -8,10 +8,10 @@ resource path. This commit ensures that the TraverseParent function
 bails out if the parent path is outside of the resource path.
 
 diff --git a/src/node_modules.cc b/src/node_modules.cc
-index 55d628f0c5e7f330e548878807de26d51ef025b5..c06779dea471b6f6a8dd29d4657162ef0faec043 100644
+index 210a01d24e11764dc9fc37a77b354f11383693f8..4e9f70a1c41b44d2a1863b778d4f1e37279178d9 100644
 --- a/src/node_modules.cc
 +++ b/src/node_modules.cc
-@@ -291,8 +291,41 @@ const BindingData::PackageConfig* BindingData::TraverseParent(
+@@ -290,8 +290,41 @@ const BindingData::PackageConfig* BindingData::TraverseParent(
      Realm* realm, const std::filesystem::path& check_path) {
    std::filesystem::path current_path = check_path;
    auto env = realm->env();
@@ -53,7 +53,7 @@ index 55d628f0c5e7f330e548878807de26d51ef025b5..c06779dea471b6f6a8dd29d4657162ef
    do {
      current_path = current_path.parent_path();
  
-@@ -311,6 +344,12 @@ const BindingData::PackageConfig* BindingData::TraverseParent(
+@@ -310,6 +343,12 @@ const BindingData::PackageConfig* BindingData::TraverseParent(
        return nullptr;
      }
  

patches/node/fix_expose_readfilesync_override_for_modules.patch

@@ -8,10 +8,10 @@ an API override to replace the native `ReadFileSync` in the `modules`
 binding.
 
 diff --git a/src/env_properties.h b/src/env_properties.h
-index cbb7eab2df0416087cd3e6fb80eef2079143d9c8..7e9f5e977506149d69c6015e85d031770325e1da 100644
+index ba8c80ff2842c63f16cae51cfa8084617bb35bf5..820aebd18d22bcef4992b09ffc8924e9b758fd3e 100644
 --- a/src/env_properties.h
 +++ b/src/env_properties.h
-@@ -501,6 +501,7 @@
+@@ -485,6 +485,7 @@
    V(maybe_cache_generated_source_map, v8::Function)                            \
    V(messaging_deserialize_create_object, v8::Function)                         \
    V(message_port, v8::Object)                                                  \
@@ -20,7 +20,7 @@ index cbb7eab2df0416087cd3e6fb80eef2079143d9c8..7e9f5e977506149d69c6015e85d03177
    V(performance_entry_callback, v8::Function)                                  \
    V(prepare_stack_trace_callback, v8::Function)                                \
 diff --git a/src/node_modules.cc b/src/node_modules.cc
-index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413ee5c51e47 100644
+index 4e9f70a1c41b44d2a1863b778d4f1e37279178d9..c56a32885b8debbd5b95a2c11f3838d4088e05ac 100644
 --- a/src/node_modules.cc
 +++ b/src/node_modules.cc
 @@ -21,6 +21,7 @@ namespace modules {
@@ -31,7 +31,7 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
  using v8::FunctionCallbackInfo;
  using v8::HandleScope;
  using v8::Isolate;
-@@ -89,6 +90,7 @@ Local<Array> BindingData::PackageConfig::Serialize(Realm* realm) const {
+@@ -88,6 +89,7 @@ Local<Array> BindingData::PackageConfig::Serialize(Realm* realm) const {
  
  const BindingData::PackageConfig* BindingData::GetPackageJSON(
      Realm* realm, std::string_view path, ErrorContext* error_context) {
@@ -39,7 +39,7 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
    auto binding_data = realm->GetBindingData<BindingData>();
  
    auto cache_entry = binding_data->package_configs_.find(path.data());
-@@ -98,8 +100,36 @@ const BindingData::PackageConfig* BindingData::GetPackageJSON(
+@@ -97,8 +99,36 @@ const BindingData::PackageConfig* BindingData::GetPackageJSON(
  
    PackageConfig package_config{};
    package_config.file_path = path;
@@ -77,7 +77,7 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
      return nullptr;
    }
    // In some systems, std::string is annotated to generate an
-@@ -249,6 +279,12 @@ const BindingData::PackageConfig* BindingData::GetPackageJSON(
+@@ -248,6 +278,12 @@ const BindingData::PackageConfig* BindingData::GetPackageJSON(
    return &cached.first->second;
  }
  
@@ -90,7 +90,7 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
  void BindingData::ReadPackageJSON(const FunctionCallbackInfo<Value>& args) {
    CHECK_GE(args.Length(), 1);  // path, [is_esm, base, specifier]
    CHECK(args[0]->IsString());  // path
-@@ -643,6 +679,8 @@ void InitImportMetaPathHelpers(const FunctionCallbackInfo<Value>& args) {
+@@ -556,6 +592,8 @@ void GetCompileCacheDir(const FunctionCallbackInfo<Value>& args) {
  void BindingData::CreatePerIsolateProperties(IsolateData* isolate_data,
                                               Local<ObjectTemplate> target) {
    Isolate* isolate = isolate_data->isolate();
@@ -99,7 +99,7 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
    SetMethod(isolate, target, "readPackageJSON", ReadPackageJSON);
    SetMethod(isolate,
              target,
-@@ -685,6 +723,8 @@ void BindingData::CreatePerContextProperties(Local<Object> target,
+@@ -595,6 +633,8 @@ void BindingData::CreatePerContextProperties(Local<Object> target,
  
  void BindingData::RegisterExternalReferences(
      ExternalReferenceRegistry* registry) {
@@ -109,7 +109,7 @@ index c06779dea471b6f6a8dd29d4657162ef0faec043..6204986dc97686a248d6ae483f3a413e
    registry->Register(GetNearestParentPackageJSONType);
    registry->Register(GetNearestParentPackageJSON);
 diff --git a/src/node_modules.h b/src/node_modules.h
-index eb2900d8f8385238f89a6dcc972a28e5fcb1d288..e28f38d98f4f8749048af135f0dcbe55aa69c4fe 100644
+index 17909b2270454b3275c7bf2e50d4b9b35673ecc8..3d5b0e3ac65524adfe221bfd6f85360dee1f0bee 100644
 --- a/src/node_modules.h
 +++ b/src/node_modules.h
 @@ -54,6 +54,8 @@ class BindingData : public SnapshotableObject {

patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch

@@ -18,18 +18,9 @@ index 9519f947b8dfdc69808839948c9cb8434a0acf0e..23ce72d479f638c33edffcea7c35f5da
  
  /**
 diff --git a/lib/internal/modules/esm/load.js b/lib/internal/modules/esm/load.js
-index 5ba13096b98047ff33e4d44167c2a069ccc5e69d..09a332c0999086b30fd952d9456f788925240e27 100644
+index 5ba13096b98047ff33e4d44167c2a069ccc5e69d..a00b5979e3b5deb4ba315b4635c7e5d2801c376e 100644
 --- a/lib/internal/modules/esm/load.js
 +++ b/lib/internal/modules/esm/load.js
-@@ -106,7 +106,7 @@ async function defaultLoad(url, context = kEmptyObject) {
- 
-   throwIfUnsupportedURLScheme(urlInstance);
- 
--  if (urlInstance.protocol === 'node:') {
-+  if (urlInstance.protocol === 'node:' || format === 'electron') {
-     source = null;
-     format ??= 'builtin';
-   } else if (format !== 'commonjs' || defaultType === 'module') {
 @@ -119,7 +119,7 @@ async function defaultLoad(url, context = kEmptyObject) {
        // Now that we have the source for the module, run `defaultGetFormat` to detect its format.
        format = await defaultGetFormat(urlInstance, context);
@@ -39,15 +30,6 @@ index 5ba13096b98047ff33e4d44167c2a069ccc5e69d..09a332c0999086b30fd952d9456f7889
          // For backward compatibility reasons, we need to discard the source in
          // order for the CJS loader to re-fetch it.
          source = null;
-@@ -167,7 +167,7 @@ function defaultLoadSync(url, context = kEmptyObject) {
- 
-   throwIfUnsupportedURLScheme(urlInstance, false);
- 
--  if (urlInstance.protocol === 'node:') {
-+  if (urlInstance.protocol === 'node:' || format === 'electron') {
-     source = null;
-   } else if (source == null) {
-     ({ responseURL, source } = getSourceSync(urlInstance, context));
 @@ -200,12 +200,13 @@ function throwIfUnsupportedURLScheme(parsed) {
      protocol !== 'file:' &&
      protocol !== 'data:' &&
@@ -63,19 +45,6 @@ index 5ba13096b98047ff33e4d44167c2a069ccc5e69d..09a332c0999086b30fd952d9456f7889
      throw new ERR_UNSUPPORTED_ESM_URL_SCHEME(parsed, schemes);
    }
  }
-diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
-index aff686577df3c366f06f90666e23a03fc376cf53..e8857a151428acd6f8ece74d92774a18accc1e13 100644
---- a/lib/internal/modules/esm/loader.js
-+++ b/lib/internal/modules/esm/loader.js
-@@ -492,7 +492,7 @@ class ModuleLoader {
-     }
- 
-     const cjsModule = wrap[imported_cjs_symbol];
--    if (cjsModule) {
-+    if (cjsModule && finalFormat !== 'electron') {
-       assert(finalFormat === 'commonjs-sync');
-       // Check if the ESM initiating import CJS is being required by the same CJS module.
-       if (cjsModule?.[kIsExecuting]) {
 diff --git a/lib/internal/modules/esm/resolve.js b/lib/internal/modules/esm/resolve.js
 index bfd9bd3d127404de1cbb6f30c43ab0342590759d..9e7d8ef0adef3b68a3ec186e4b218f591aa69266 100644
 --- a/lib/internal/modules/esm/resolve.js

patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch

@@ -17,10 +17,20 @@ Upstreams:
 - https://github.com/nodejs/node/pull/39136
 
 diff --git a/deps/ncrypto/ncrypto.cc b/deps/ncrypto/ncrypto.cc
-index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac4e767d90 100644
+index ce2e7b384eb1987ddb081f79884fb8cb62ade60b..bffdb0259eeed7389adb54a8ff13a1ac4e767d90 100644
 --- a/deps/ncrypto/ncrypto.cc
 +++ b/deps/ncrypto/ncrypto.cc
-@@ -786,7 +786,7 @@ bool SafeX509SubjectAltNamePrint(const BIOPointer& out, X509_EXTENSION* ext) {
+@@ -11,9 +11,6 @@
+ #if OPENSSL_VERSION_MAJOR >= 3
+ #include <openssl/provider.h>
+ #endif
+-#ifdef OPENSSL_IS_BORINGSSL
+-#include "dh-primes.h"
+-#endif  // OPENSSL_IS_BORINGSSL
+ 
+ namespace ncrypto {
+ namespace {
+@@ -789,7 +786,7 @@ bool SafeX509SubjectAltNamePrint(const BIOPointer& out, X509_EXTENSION* ext) {
  
    bool ok = true;
  
@@ -29,7 +39,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
      GENERAL_NAME* gen = sk_GENERAL_NAME_value(names, i);
  
      if (i != 0) BIO_write(out.get(), ", ", 2);
-@@ -810,7 +810,7 @@ bool SafeX509InfoAccessPrint(const BIOPointer& out, X509_EXTENSION* ext) {
+@@ -813,7 +810,7 @@ bool SafeX509InfoAccessPrint(const BIOPointer& out, X509_EXTENSION* ext) {
  
    bool ok = true;
  
@@ -38,7 +48,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
      ACCESS_DESCRIPTION* desc = sk_ACCESS_DESCRIPTION_value(descs, i);
  
      if (i != 0) BIO_write(out.get(), "\n", 1);
-@@ -952,13 +952,17 @@ BIOPointer X509View::getValidTo() const {
+@@ -955,13 +952,17 @@ BIOPointer X509View::getValidTo() const {
  
  int64_t X509View::getValidToTime() const {
    struct tm tp;
@@ -57,7 +67,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
    return PortableTimeGM(&tp);
  }
  
-@@ -1233,7 +1237,11 @@ BIOPointer BIOPointer::NewMem() {
+@@ -1236,7 +1237,11 @@ BIOPointer BIOPointer::NewMem() {
  }
  
  BIOPointer BIOPointer::NewSecMem() {
@@ -70,7 +80,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
  }
  
  BIOPointer BIOPointer::New(const BIO_METHOD* method) {
-@@ -1303,8 +1311,10 @@ BignumPointer DHPointer::FindGroup(const std::string_view name,
+@@ -1306,8 +1311,10 @@ BignumPointer DHPointer::FindGroup(const std::string_view name,
  #define V(n, p)                                                                \
    if (EqualNoCase(name, n)) return BignumPointer(p(nullptr));
    if (option != FindGroupOption::NO_SMALL_PRIMES) {
@@ -81,7 +91,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
      V("modp5", BN_get_rfc3526_prime_1536);
    }
    V("modp14", BN_get_rfc3526_prime_2048);
-@@ -1380,11 +1390,13 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
+@@ -1383,11 +1390,13 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
    int codes = 0;
    if (DH_check_pub_key(dh_.get(), pub_key.get(), &codes) != 1)
      return DHPointer::CheckPublicKeyResult::CHECK_FAILED;
@@ -96,7 +106,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
      return DHPointer::CheckPublicKeyResult::INVALID;
    }
    return CheckPublicKeyResult::NONE;
-@@ -2327,7 +2339,7 @@ const std::string_view SSLPointer::getClientHelloAlpn() const {
+@@ -2330,7 +2339,7 @@ const std::string_view SSLPointer::getClientHelloAlpn() const {
    const unsigned char* buf;
    size_t len;
    size_t rem;
@@ -105,7 +115,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
    if (!SSL_client_hello_get0_ext(
            get(),
            TLSEXT_TYPE_application_layer_protocol_negotiation,
-@@ -2340,6 +2352,8 @@ const std::string_view SSLPointer::getClientHelloAlpn() const {
+@@ -2343,6 +2352,8 @@ const std::string_view SSLPointer::getClientHelloAlpn() const {
    len = (buf[0] << 8) | buf[1];
    if (len + 2 != rem) return {};
    return reinterpret_cast<const char*>(buf + 3);
@@ -114,7 +124,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
  }
  
  const std::string_view SSLPointer::getClientHelloServerName() const {
-@@ -2347,7 +2361,7 @@ const std::string_view SSLPointer::getClientHelloServerName() const {
+@@ -2350,7 +2361,7 @@ const std::string_view SSLPointer::getClientHelloServerName() const {
    const unsigned char* buf;
    size_t len;
    size_t rem;
@@ -123,7 +133,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
    if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
        rem <= 2) {
      return {};
-@@ -2363,6 +2377,8 @@ const std::string_view SSLPointer::getClientHelloServerName() const {
+@@ -2366,6 +2377,8 @@ const std::string_view SSLPointer::getClientHelloServerName() const {
    len = (*(buf + 3) << 8) | *(buf + 4);
    if (len + 2 > rem) return {};
    return reinterpret_cast<const char*>(buf + 5);
@@ -132,7 +142,7 @@ index 6f9406eecacb7411a2e84a7b51e60b726d1961f3..bffdb0259eeed7389adb54a8ff13a1ac
  }
  
  std::optional<const std::string_view> SSLPointer::GetServerName(
-@@ -2396,8 +2412,11 @@ bool SSLPointer::isServer() const {
+@@ -2399,8 +2412,11 @@ bool SSLPointer::isServer() const {
  EVPKeyPointer SSLPointer::getPeerTempKey() const {
    if (!ssl_) return {};
    EVP_PKEY* raw_key = nullptr;
@@ -185,10 +195,10 @@ index 245a43920c7baf000ba63192a84a4c3fd219be7d..56a554175b805c1703f13d62041f8c80
    # The location of simdutf - use the one from node's deps by default.
    node_simdutf_path = "$node_path/deps/simdutf"
 diff --git a/src/crypto/crypto_cipher.cc b/src/crypto/crypto_cipher.cc
-index 2176fb6982484e2c42538478eeb4dd81c9d50ee1..c00d3616e08b00b1e0a3a29b2dbb5278e1e14fcc 100644
+index 1754d1f71b8adbcb584bfe4606e2a341836fb671..ac0f529e75c30add0708dc20470846f2f56e4b86 100644
 --- a/src/crypto/crypto_cipher.cc
 +++ b/src/crypto/crypto_cipher.cc
-@@ -1027,7 +1027,7 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) {
+@@ -1033,7 +1033,7 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) {
      if (EVP_PKEY_decrypt_init(ctx.get()) <= 0) {
        return ThrowCryptoError(env, ERR_get_error());
      }
@@ -197,7 +207,7 @@ index 2176fb6982484e2c42538478eeb4dd81c9d50ee1..c00d3616e08b00b1e0a3a29b2dbb5278
      int rsa_pkcs1_implicit_rejection =
          EVP_PKEY_CTX_ctrl_str(ctx.get(), "rsa_pkcs1_implicit_rejection", "1");
      // From the doc -2 means that the option is not supported.
-@@ -1042,6 +1042,7 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) {
+@@ -1048,6 +1048,7 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) {
            env,
            "RSA_PKCS1_PADDING is no longer supported for private decryption");
      }
@@ -555,10 +565,10 @@ index 6f8cb433ff8059c63d5cf16c8783139ae92fbf61..603ac3dde7d1a1109afbc451b69c8d09
  #if NODE_OPENSSL_HAS_QUIC
  #include <openssl/quic.h>
 diff --git a/src/node_options.cc b/src/node_options.cc
-index 3fc8194475ec0e8a9047c1f3da5d120f25d66190..8be78889e8234eb3100f309829bf7470db544dcd 100644
+index 1444acd59d42f64831cead5f153419f7c12a88bf..23cb558a22b4462f5ce4f74833d25c7f712f8139 100644
 --- a/src/node_options.cc
 +++ b/src/node_options.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
  #include "node_external_reference.h"
  #include "node_internals.h"
  #include "node_sea.h"
@@ -568,7 +578,7 @@ index 3fc8194475ec0e8a9047c1f3da5d120f25d66190..8be78889e8234eb3100f309829bf7470
  #endif
  
 diff --git a/src/node_options.h b/src/node_options.h
-index 7d14f06370d936a3866f0d988123de9fe614ce09..60068b008b2e2a034c3f0c58b947a8d04d55e3b2 100644
+index e68a41b60832c4b000e17dd15ce16c1bdaf4b54b..065457acfde6ba4d04ed570cc72005cfd2798fd5 100644
 --- a/src/node_options.h
 +++ b/src/node_options.h
 @@ -11,7 +11,7 @@