Bump v19.0.0-beta.1

This reverts commit e69ca30e61.

.circleci/config.yml

@@ -14,7 +14,7 @@ parameters:
     type: boolean
     default: false
   
-  upload-to-storage:
+  upload-to-s3:
     type: string
     default: '1'
 

.circleci/config/base.yml

@@ -5,7 +5,7 @@ parameters:
     type: boolean
     default: false
   
-  upload-to-storage:
+  upload-to-s3:
     type: string
     default: '1'
 
@@ -41,8 +41,9 @@ executors:
     parameters:
       size:
         description: "Docker executor size"
+        default: 2xlarge+
         type: enum
-        enum: ["medium", "xlarge", "2xlarge"]
+        enum: ["medium", "xlarge", "2xlarge+"]
     docker:
       - image: ghcr.io/electron/build:e6bebd08a51a0d78ec23e5b3fd7e7c0846412328
     resource_class: << parameters.size >>
@@ -51,11 +52,12 @@ executors:
     parameters:
       size:
         description: "macOS executor size"
+        default: macos.x86.medium.gen2
         type: enum
         enum: ["macos.x86.medium.gen2", "large"]
       xcode:
         description: "xcode version"
-        default: 13.3.0
+        default: "12.4.0"
         type: enum
         enum: ["12.4.0", "13.3.0"]
 
@@ -337,19 +339,6 @@ step-setup-goma-for-build: &step-setup-goma-for-build
       echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
       echo 'export GOMA_FALLBACK_ON_AUTH_FAILURE=true' >> $BASH_ENV
       cd ..
-      touch "${TMPDIR:=/tmp}"/.goma-ready
-    background: true
-
-step-wait-for-goma: &step-wait-for-goma
-  run:
-    name: Wait for Goma
-    command: |
-      until [ -f "${TMPDIR:=/tmp}"/.goma-ready ]
-      do
-          sleep 5
-      done
-      echo "Goma ready"
-    no_output_timeout: 2m
 
 step-restore-brew-cache: &step-restore-brew-cache
   restore_cache:
@@ -585,6 +574,14 @@ step-electron-build: &step-electron-build
       cp out/Default/.ninja_log out/electron_ninja_log
       node electron/script/check-symlinks.js
 
+step-native-unittests-build: &step-native-unittests-build
+  run:
+    name: Build native test targets
+    no_output_timeout: 30m
+    command: |
+      cd src
+      ninja -C out/Default shell_browser_ui_unittests -j $NUMBER_OF_NINJA_PROCESSES
+
 step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
   run:
     name: Strip electron binaries
@@ -601,6 +598,38 @@ step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
         electron/script/add-debug-link.py --target-cpu="$target_cpu" --debug-dir=out/Default/debug
       fi
 
+step-electron-dist-build: &step-electron-dist-build
+  run:
+    name: Build dist.zip
+    command: |
+      cd src
+      if [ "$SKIP_DIST_ZIP" != "1" ]; then
+        ninja -C out/Default electron:electron_dist_zip
+        if [ "$CHECK_DIST_MANIFEST" == "1" ]; then
+          if [ "`uname`" == "Darwin" ]; then
+            target_os=mac
+            target_cpu=x64
+            if [ x"$MAS_BUILD" == x"true" ]; then
+              target_os=mac_mas
+            fi
+            if [ "$TARGET_ARCH" == "arm64" ]; then
+              target_cpu=arm64
+            fi
+          elif [ "`uname`" == "Linux" ]; then
+            target_os=linux
+            if [ x"$TARGET_ARCH" == x ]; then
+              target_cpu=x64
+            else
+              target_cpu="$TARGET_ARCH"
+            fi
+          else
+            echo "Unknown system: `uname`"
+            exit 1
+          fi
+          electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.$target_os.$target_cpu.manifest
+        fi
+      fi
+
 step-electron-chromedriver-build: &step-electron-chromedriver-build
   run:
     name: Build chromedriver.zip
@@ -637,9 +666,9 @@ step-electron-publish: &step-electron-publish
       fi
 
       cd src/electron
-      if [ "$UPLOAD_TO_STORAGE" == "1" ]; then
-        echo 'Uploading Electron release distribution to Azure'
-        script/release/uploaders/upload.py --verbose --UPLOAD_TO_STORAGE
+      if [ "$UPLOAD_TO_S3" == "1" ]; then
+        echo 'Uploading Electron release distribution to S3'
+        script/release/uploaders/upload.py --verbose --upload_to_s3
       else
         echo 'Uploading Electron release distribution to Github releases'
         script/release/uploaders/upload.py --verbose
@@ -653,8 +682,8 @@ step-persist-data-for-tests: &step-persist-data-for-tests
       - src/out/Default/dist.zip
       - src/out/Default/mksnapshot.zip
       - src/out/Default/chromedriver.zip
+      - src/out/Default/shell_browser_ui_unittests
       - src/out/Default/gen/node_headers
-      - src/out/Default/overlapped-checker
       - src/out/ffmpeg/ffmpeg.zip
       - src/electron
       - src/third_party/electron_node
@@ -681,6 +710,13 @@ step-electron-dist-unzip: &step-electron-dist-unzip
       #    passed.
       unzip -:o dist.zip
 
+step-ffmpeg-unzip: &step-ffmpeg-unzip
+  run:
+    name: Unzip ffmpeg.zip
+    command: |
+      cd src/out/ffmpeg
+      unzip -:o ffmpeg.zip
+
 step-mksnapshot-unzip: &step-mksnapshot-unzip
   run:
     name: Unzip mksnapshot.zip
@@ -709,6 +745,13 @@ step-ffmpeg-build: &step-ffmpeg-build
       cd src
       ninja -C out/ffmpeg electron:electron_ffmpeg_zip -j $NUMBER_OF_NINJA_PROCESSES
 
+step-verify-ffmpeg: &step-verify-ffmpeg
+  run:
+    name: Verify ffmpeg
+    command: |
+      cd src
+      python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
+
 step-verify-mksnapshot: &step-verify-mksnapshot
   run:
     name: Verify mksnapshot
@@ -750,7 +793,6 @@ step-show-goma-stats: &step-show-goma-stats
       $LOCAL_GOMA_DIR/diagnose_goma_log.py
       true
     when: always
-    background: true
 
 step-mksnapshot-build: &step-mksnapshot-build
   run:
@@ -994,16 +1036,12 @@ step-ts-compile: &step-ts-compile
 # List of all steps.
 steps-electron-gn-check: &steps-electron-gn-check
   steps:
-    - *step-checkout-electron
-    - *step-depot-tools-get
+    - attach_workspace:
+        at: .
     - *step-depot-tools-add-to-path
     - *step-install-python2-on-mac
     - *step-setup-env-for-build
     - *step-setup-goma-for-build
-    - *step-generate-deps-hash
-    - *step-touch-sync-done
-    - maybe-restore-portaled-src-cache
-    - *step-wait-for-goma
     - *step-gn-gen-default
     - *step-gn-check
 
@@ -1017,7 +1055,6 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
     - *step-install-gnutar-on-mac
     - *step-install-python2-on-mac
     - *step-get-more-space-on-mac
-    - *step-setup-goma-for-build
     - *step-generate-deps-hash
     - *step-touch-sync-done
     - maybe-restore-portaled-src-cache
@@ -1037,7 +1074,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
 
     - *step-depot-tools-add-to-path
     - *step-setup-env-for-build
-    - *step-wait-for-goma
+    - *step-setup-goma-for-build
     - *step-get-more-space-on-mac
     - *step-install-npm-deps-on-mac
     - *step-fix-sync
@@ -1046,6 +1083,52 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
     #Compile ts/js to verify doc change didn't break anything
     - *step-ts-compile
 
+steps-native-tests: &steps-native-tests
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-install-python2-on-mac
+    - *step-setup-env-for-build
+    - *step-setup-goma-for-build
+    - *step-gn-gen-default
+
+    - run:
+        name: Build tests
+        command: |
+          cd src
+          ninja -C out/Default $BUILD_TARGET
+    - *step-show-goma-stats
+
+    - *step-setup-linux-for-headless-testing
+    - run:
+        name: Run tests
+        command: |
+          mkdir test_results
+          python src/electron/script/native-tests.py run \
+            --config $TESTS_CONFIG \
+            --tests-dir src/out/Default \
+            --output-dir test_results  \
+            $TESTS_ARGS
+
+    - store_artifacts:
+        path: test_results
+        destination: test_results  # Put it in the root folder.
+    - store_test_results:
+        path: test_results
+
+steps-verify-ffmpeg: &steps-verify-ffmpeg
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-electron-dist-unzip
+    - *step-ffmpeg-unzip
+    - *step-setup-linux-for-headless-testing
+
+    - *step-verify-ffmpeg
+    - *step-maybe-notify-slack-failure
+
 steps-tests: &steps-tests
   steps:
     - attach_workspace:
@@ -1193,6 +1276,7 @@ commands:
               fi
             }
             mv_if_exist src/out/Default/dist.zip
+            mv_if_exist src/out/Default/shell_browser_ui_unittests
             mv_if_exist src/out/Default/gen/node_headers.tar.gz
             mv_if_exist src/out/Default/symbols.zip
             mv_if_exist src/out/Default/mksnapshot.zip
@@ -1230,44 +1314,6 @@ commands:
       - *step-checkout-electron
       - *step-run-electron-only-hooks
       - *step-generate-deps-hash-cleanly
-
-  step-electron-dist-build:
-    parameters:
-      additional-targets:
-        type: string
-        default: ''
-    steps:
-      - run:
-          name: Build dist.zip
-          command: |
-            cd src
-            if [ "$SKIP_DIST_ZIP" != "1" ]; then
-              ninja -C out/Default electron:electron_dist_zip << parameters.additional-targets >>
-              if [ "$CHECK_DIST_MANIFEST" == "1" ]; then
-                if [ "`uname`" == "Darwin" ]; then
-                  target_os=mac
-                  target_cpu=x64
-                  if [ x"$MAS_BUILD" == x"true" ]; then
-                    target_os=mac_mas
-                  fi
-                  if [ "$TARGET_ARCH" == "arm64" ]; then
-                    target_cpu=arm64
-                  fi
-                elif [ "`uname`" == "Linux" ]; then
-                  target_os=linux
-                  if [ x"$TARGET_ARCH" == x ]; then
-                    target_cpu=x64
-                  else
-                    target_cpu="$TARGET_ARCH"
-                  fi
-                else
-                  echo "Unknown system: `uname`"
-                  exit 1
-                fi
-                electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.$target_os.$target_cpu.manifest
-              fi
-            fi
-
   electron-build:
     parameters:
       attach:
@@ -1314,10 +1360,6 @@ commands:
       - *step-install-gnutar-on-mac
       - *step-install-python2-on-mac
       - *step-save-brew-cache
-      - when:
-          condition: << parameters.build >>
-          steps:
-            - *step-setup-goma-for-build
       - when:
           condition: << parameters.checkout-and-assume-cache >>
           steps:
@@ -1413,7 +1455,7 @@ commands:
           steps:
             - *step-depot-tools-add-to-path
             - *step-setup-env-for-build
-            - *step-wait-for-goma
+            - *step-setup-goma-for-build
             - *step-get-more-space-on-mac
             - *step-fix-sync
             - *step-delete-git-directories
@@ -1426,8 +1468,13 @@ commands:
             - *step-gn-gen-default
             - *step-electron-build
             - *step-maybe-electron-dist-strip
-            - step-electron-dist-build:
-                additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip
+            - *step-electron-dist-build
+
+            # Native test targets
+            - *step-native-unittests-build
+
+            # Node.js headers
+            - *step-nodejs-headers-build
 
             - *step-show-goma-stats
 
@@ -1445,14 +1492,13 @@ commands:
                   - *step-ffmpeg-gn-gen
                   - *step-ffmpeg-build
 
+            # hunspell
+            - *step-hunspell-build
+
       # Save all data needed for a further tests run.
       - when:
           condition: << parameters.persist >>
           steps:
-            - *step-minimize-workspace-size-from-checkout
-            - run: |
-                rm -rf src/third_party/electron_node/deps/openssl
-                rm -rf src/third_party/electron_node/deps/v8
             - *step-persist-data-for-tests
 
       - when:
@@ -1519,7 +1565,6 @@ commands:
       - *step-fix-sync
       - *step-setup-env-for-build
       - *step-setup-goma-for-build
-      - *step-wait-for-goma
       - *step-gn-gen-default
 
       # Electron app
@@ -1527,7 +1572,7 @@ commands:
       - *step-show-goma-stats
       - *step-maybe-generate-breakpad-symbols
       - *step-maybe-electron-dist-strip
-      - step-electron-dist-build
+      - *step-electron-dist-build
       - *step-maybe-zip-symbols
 
       # mksnapshot
@@ -1560,9 +1605,7 @@ commands:
 jobs:
   # Layer 0: Docs. Standalone.
   ts-compile-doc-change:
-    executor:
-      name: linux-docker
-      size: medium
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1570,10 +1613,20 @@ jobs:
     <<: *steps-electron-ts-compile-for-doc-change
 
   # Layer 1: Checkout.
+  linux-checkout-for-workspace:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          persist-checkout: true
+
   linux-make-src-cache:
-    executor:
-      name: linux-docker
-      size: xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1585,10 +1638,32 @@ jobs:
           save-git-cache: true
           checkout-to-create-src-cache: true
 
+  linux-checkout-for-native-tests:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          persist-checkout: true
+
+  linux-checkout-for-native-tests-with-no-patches:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge
+      GCLIENT_EXTRA_ARGS: '--custom-var=apply_patches=False --custom-var=checkout_pyyaml=True'
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          persist-checkout: true
+
   mac-checkout:
-    executor:
-      name: linux-docker
-      size: xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1602,10 +1677,22 @@ jobs:
           persist-checkout: true
           restore-src-cache: false
 
+  mac-checkout-for-workspace:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-testing-build
+      <<: *env-macos-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          persist-checkout: true
+
   mac-make-src-cache:
-    executor:
-      name: linux-docker
-      size: xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1621,9 +1708,7 @@ jobs:
 
   # Layer 2: Builds.
   linux-x64-testing:
-    executor:
-      name: linux-docker
-      size: xlarge
+    executor: linux-docker
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1632,14 +1717,11 @@ jobs:
     steps:
       - electron-build:
           persist: true
-          checkout: false
-          checkout-and-assume-cache: true
+          checkout: true
           use-out-cache: false
 
   linux-x64-testing-asan:
-    executor:
-      name: linux-docker
-      size: 2xlarge
+    executor: linux-docker
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1655,9 +1737,7 @@ jobs:
           build-nonproprietary-ffmpeg: false
 
   linux-x64-testing-no-run-as-node:
-    executor:
-      name: linux-docker
-      size: xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1677,17 +1757,27 @@ jobs:
     environment:
       <<: *env-linux-medium
       <<: *env-testing-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-electron-gn-check
 
-  linux-x64-publish:
-    executor:
-      name: linux-docker
-      size: 2xlarge
+  linux-x64-release:
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      <<: *env-send-slack-notifications
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    steps:
+      - electron-build:
+          persist: true
+          checkout: true
+
+  linux-x64-publish:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge-release
+      <<: *env-release-build
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1703,9 +1793,7 @@ jobs:
 
 
   linux-arm-testing:
-    executor:
-      name: linux-docker
-      size: 2xlarge
+    executor: linux-docker
     environment:
       <<: *env-global
       <<: *env-arm
@@ -1717,21 +1805,32 @@ jobs:
     steps:
       - electron-build:
           persist: true
-          checkout: false
-          checkout-and-assume-cache: true
+          checkout: true
           use-out-cache: false
 
+  linux-arm-release:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge-release
+      <<: *env-arm
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    steps:
+      - electron-build:
+          persist: false
+          checkout: true
+
   linux-arm-publish:
-    executor:
-      name: linux-docker
-      size: 2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
       <<: *env-release-build
       <<: *env-32bit-release
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True'
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1746,9 +1845,7 @@ jobs:
                 checkout: true
 
   linux-arm64-testing:
-    executor:
-      name: linux-docker
-      size: 2xlarge
+    executor: linux-docker
     environment:
       <<: *env-global
       <<: *env-arm64
@@ -1760,8 +1857,7 @@ jobs:
     steps:
       - electron-build:
           persist: true
-          checkout: false
-          checkout-and-assume-cache: true
+          checkout: true
           use-out-cache: false
 
   linux-arm64-testing-gn-check:
@@ -1772,19 +1868,30 @@ jobs:
       <<: *env-linux-medium
       <<: *env-arm64
       <<: *env-testing-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-electron-gn-check
 
+  linux-arm64-release:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge-release
+      <<: *env-arm64
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    steps:
+      - electron-build:
+          persist: false
+          checkout: true
+
   linux-arm64-publish:
-    executor:
-      name: linux-docker
-      size: 2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
       <<: *env-release-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True'
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1801,7 +1908,7 @@ jobs:
   osx-testing-x64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1818,21 +1925,20 @@ jobs:
   osx-testing-x64-gn-check:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-machine-mac
       <<: *env-testing-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     <<: *steps-electron-gn-check
 
-  osx-publish-x64:
+  osx-publish-x64-skip-checkout:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1846,15 +1952,15 @@ jobs:
                 attach: true
                 checkout: false
 
-  osx-publish-arm64:
+  osx-publish-arm64-skip-checkout:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
       <<: *env-apple-silicon
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1871,7 +1977,7 @@ jobs:
   osx-testing-arm64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1890,7 +1996,7 @@ jobs:
   mas-testing-x64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large
       <<: *env-mas
@@ -1908,23 +2014,22 @@ jobs:
   mas-testing-x64-gn-check:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-machine-mac
       <<: *env-mas
       <<: *env-testing-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     <<: *steps-electron-gn-check
 
-  mas-publish-x64:
+  mas-publish-x64-skip-checkout:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large-release
       <<: *env-mas
       <<: *env-release-build
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     steps:
       - run: echo running
       - when:
@@ -1937,15 +2042,15 @@ jobs:
                 attach: true
                 checkout: false
 
-  mas-publish-arm64:
+  mas-publish-arm64-skip-checkout:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
       <<: *env-release-build
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1962,7 +2067,7 @@ jobs:
   mas-testing-arm64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1979,6 +2084,41 @@ jobs:
           attach: true
 
   # Layer 3: Tests.
+  linux-x64-unittests:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-unittests
+      <<: *env-headless-testing
+    <<: *steps-native-tests
+
+  linux-x64-disabled-unittests:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-unittests
+      <<: *env-headless-testing
+      TESTS_ARGS: '--only-disabled-tests'
+    <<: *steps-native-tests
+
+  linux-x64-chromium-unittests:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-unittests
+      <<: *env-headless-testing
+      TESTS_ARGS: '--include-disabled-tests'
+    <<: *steps-native-tests
+
+  linux-x64-browsertests:
+    executor: linux-docker
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-browsertests
+      <<: *env-testing-build
+      <<: *env-headless-testing
+    <<: *steps-native-tests
+
   linux-x64-testing-tests:
     executor:
       name: linux-docker
@@ -2014,15 +2154,33 @@ jobs:
     <<: *steps-test-nan
 
   linux-x64-testing-node:
-    executor:
-      name: linux-docker
-      size: xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
       <<: *env-stack-dumping
     <<: *steps-test-node
 
+  linux-x64-release-tests:
+    executor:
+      name: linux-docker
+      size: medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-headless-testing
+      <<: *env-send-slack-notifications
+    <<: *steps-tests
+
+  linux-x64-verify-ffmpeg:
+    executor:
+      name: linux-docker
+      size: medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-headless-testing
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-ffmpeg
+
   linux-arm-testing-tests:
     executor: linux-arm
     environment:
@@ -2042,10 +2200,7 @@ jobs:
     <<: *steps-tests
 
   osx-testing-x64-tests:
-    executor:
-      name: macos
-      xcode: 12.4.0
-      size: macos.x86.medium.gen2
+    executor: macos      
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2061,10 +2216,7 @@ jobs:
     <<: *steps-tests
 
   mas-testing-x64-tests:
-    executor:
-      name: macos
-      xcode: 12.4.0
-      size: macos.x86.medium.gen2
+    executor: macos
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2079,6 +2231,17 @@ jobs:
       <<: *env-apple-silicon
     <<: *steps-tests
 
+  # Layer 4: Summary.
+  linux-release-summary:
+    executor:
+      name: linux-docker
+      size: medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-send-slack-notifications
+    steps:
+      - *step-maybe-notify-slack-success
+
 # List all workflows
 workflows:
   docs-only:
@@ -2104,19 +2267,19 @@ workflows:
     when: << pipeline.parameters.run-macos-publish >>
     jobs:
     - mac-checkout
-    - osx-publish-x64:
+    - osx-publish-x64-skip-checkout:
         requires:
           - mac-checkout
         context: release-env
-    - mas-publish-x64:
+    - mas-publish-x64-skip-checkout:
         requires:
           - mac-checkout
         context: release-env
-    - osx-publish-arm64:
+    - osx-publish-arm64-skip-checkout:
         requires:
           - mac-checkout
         context: release-env
-    - mas-publish-arm64:
+    - mas-publish-arm64-skip-checkout:
         requires:
           - mac-checkout
         context: release-env
@@ -2128,19 +2291,14 @@ workflows:
         - equal: [false, << pipeline.parameters.run-linux-publish >>]
         - equal: [true, << pipeline.parameters.run-build-linux >>]
     jobs:
+      - linux-checkout-for-workspace
       - linux-make-src-cache
-      - linux-x64-testing:
-          requires:
-            - linux-make-src-cache
-      - linux-x64-testing-asan:
-          requires:
-            - linux-make-src-cache
-      - linux-x64-testing-no-run-as-node:
-          requires:
-            - linux-make-src-cache
+      - linux-x64-testing
+      - linux-x64-testing-asan
+      - linux-x64-testing-no-run-as-node
       - linux-x64-testing-gn-check:
           requires:
-            - linux-make-src-cache
+            - linux-checkout-for-workspace
       - linux-x64-testing-tests:
           requires:
             - linux-x64-testing
@@ -2153,9 +2311,7 @@ workflows:
       - linux-x64-testing-node:
           requires:
             - linux-x64-testing
-      - linux-arm-testing:
-          requires:
-            - linux-make-src-cache
+      - linux-arm-testing
       - linux-arm-testing-tests:
           filters:
             branches:
@@ -2163,9 +2319,7 @@ workflows:
               ignore: /pull\/[0-9]+/        
           requires:
             - linux-arm-testing      
-      - linux-arm64-testing:
-          requires:
-            - linux-make-src-cache
+      - linux-arm64-testing
       - linux-arm64-testing-tests:
           filters:
             branches:
@@ -2175,7 +2329,7 @@ workflows:
             - linux-arm64-testing
       - linux-arm64-testing-gn-check:
           requires:
-            - linux-make-src-cache
+            - linux-checkout-for-workspace
 
   build-mac:
     when:
@@ -2184,13 +2338,14 @@ workflows:
         - equal: [false, << pipeline.parameters.run-linux-publish >>]
         - equal: [true, << pipeline.parameters.run-build-mac >>]
     jobs:
+      - mac-checkout-for-workspace
       - mac-make-src-cache
       - osx-testing-x64:
           requires:
             - mac-make-src-cache
       - osx-testing-x64-gn-check:
           requires:
-            - mac-make-src-cache
+            - mac-checkout-for-workspace
       - osx-testing-x64-tests:
           requires:
             - osx-testing-x64
@@ -2209,7 +2364,7 @@ workflows:
             - mac-make-src-cache
       - mas-testing-x64-gn-check:
           requires:
-            - mac-make-src-cache
+            - mac-checkout-for-workspace
       - mas-testing-x64-tests:
           requires:
             - mas-testing-x64

BUILD.gn

@@ -79,13 +79,6 @@ if (is_linux) {
     ]
   }
 
-  # Generates electron_gtk_stubs.h header which contains
-  # stubs for extracting function ptrs from the gtk library.
-  # Function signatures for which stubs are required should be
-  # declared in electron_gtk.sigs, currently this file contains
-  # signatures for the functions used with native file chooser
-  # implementation. In future, this file can be extended to contain
-  # gtk4 stubs to switch gtk version in runtime.
   generate_stubs("electron_gtk_stubs") {
     sigs = [ "shell/browser/ui/electron_gtk.sigs" ]
     extra_header = "shell/browser/ui/electron_gtk.fragment"
@@ -366,7 +359,6 @@ source_set("electron_lib") {
     "shell/common/api:mojo",
     "//base:base_static",
     "//base/allocator:buildflags",
-    "//chrome:strings",
     "//chrome/app:command_ids",
     "//chrome/app/resources:platform_locale_settings",
     "//components/autofill/core/common:features",
@@ -911,10 +903,7 @@ if (is_mac) {
       assert(defined(invoker.helper_name_suffix))
 
       output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [
-        ":electron_framework+link",
-        "//base/allocator:early_zone_registration_mac",
-      ]
+      deps = [ ":electron_framework+link" ]
       if (!is_mas_build) {
         deps += [ "//sandbox/mac:seatbelt" ]
       }
@@ -1074,7 +1063,6 @@ if (is_mac) {
       ":electron_app_plist",
       ":electron_app_resources",
       ":electron_fuses",
-      "//base/allocator:early_zone_registration_mac",
       "//electron/buildflags",
     ]
     if (is_mas_build) {
@@ -1281,10 +1269,6 @@ if (is_mac) {
       if (!is_component_build && is_component_ffmpeg) {
         configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
       }
-
-      if (is_linux) {
-        deps += [ "//sandbox/linux:chrome_sandbox" ]
-      }
     }
   }
 

DEPS

@@ -4,7 +4,7 @@ vars = {
   'chromium_version':
     '102.0.4999.0',
   'node_version':
-    'v16.15.0',
+    'v16.14.2',
   'nan_version':
     # The following commit hash of NAN is v2.14.2 with *only* changes to the
     # test suite. This should be updated to a specific tag when one becomes

ELECTRON_VERSION

@@ -1 +1 @@
-20.0.0-nightly.20220516
+19.0.0-beta.1

appveyor.yml

@@ -11,7 +11,7 @@
 #  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
 #      Is used in some publishing scripts, but does NOT affect the Electron binary.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
-#  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
+#  - "UPLOAD_TO_S3" Set it to '1' upload a release to the S3 bucket.
 #      Otherwise the release will be uploaded to the Github Releases.
 #      (The value is only checked if "ELECTRON_RELEASE" is defined.)
 #
@@ -23,6 +23,10 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
+# Uncomment these lines to enable RDP
+#on_finish:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
 version: 1.0.{build}
 build_cloud: electron-16-core
 image: vs2019bt-16.16.11
@@ -179,21 +183,34 @@ build_script:
   - ninja -C out/Default third_party/electron_node:headers
   - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
   - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
+  - appveyor PushArtifact out/Default/windows_toolchain_profile.json
+  - appveyor PushArtifact out/Default/dist.zip
+  - appveyor PushArtifact out/Default/shell_browser_ui_unittests.exe
+  - appveyor PushArtifact out/Default/chromedriver.zip
+  - appveyor PushArtifact out/ffmpeg/ffmpeg.zip
   - 7z a node_headers.zip out\Default\gen\node_headers
+  - appveyor PushArtifact node_headers.zip
+  - appveyor PushArtifact out/Default/mksnapshot.zip
+  - appveyor PushArtifact out/Default/hunspell_dictionaries.zip
+  - appveyor PushArtifact out/Default/electron.lib
+  # Temporarily disable symbol generation on 32-bit Windows due to failures  
   - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
+      if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') {
         # Needed for msdia140.dll on 64-bit windows
         $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
         ninja -C out/Default electron:electron_symbols
       }
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
-        python electron\script\zip-symbols.py
-        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        if ($env:TARGET_ARCH -ne 'ia32') {
+          python electron\script\zip-symbols.py
+          appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        }
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
         7z a pdb.zip out\Default\*.pdb
+        appveyor-retry appveyor PushArtifact pdb.zip
       }
   - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
 test_script:
@@ -222,13 +239,14 @@ test_script:
   - echo "Done verifying mksnapshot"
   - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
   - echo "Done verifying chromedriver"
+  - if exist %cd%\electron.log ( appveyor-retry appveyor PushArtifact %cd%\electron.log )
 deploy_script:
   - cd electron
   - ps: >-
       if (Test-Path Env:\ELECTRON_RELEASE) {
-        if (Test-Path Env:\UPLOAD_TO_STORAGE) {
-          Write-Output "Uploading Electron release distribution to azure"
-          & python script\release\uploaders\upload.py --verbose --upload_to_storage
+        if (Test-Path Env:\UPLOAD_TO_S3) {
+          Write-Output "Uploading Electron release distribution to s3"
+          & python script\release\uploaders\upload.py --verbose --upload_to_s3
         } else {
           Write-Output "Uploading Electron release distribution to github releases"
           & python script\release\uploaders\upload.py --verbose
@@ -237,21 +255,4 @@ deploy_script:
         node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
 on_finish:
-  # Uncomment this lines to enable RDP
-  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-  - cd ..
-  - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
-  - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
-  - if exist out\Default\shell_browser_ui_unittests.exe (appveyor-retry appveyor PushArtifact out\Default\shell_browser_ui_unittests.exe)
-  - if exist out\Default\chromedriver.zip (appveyor-retry appveyor PushArtifact out\Default\chromedriver.zip)
-  - if exist out\ffmpeg\ffmpeg.zip (appveyor-retry appveyor PushArtifact out\ffmpeg\ffmpeg.zip)
-  - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
-  - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
-  - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
-  - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
-  - ps: >-
-      if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
-        appveyor-retry appveyor PushArtifact pdb.zip
-      }
-
-  - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
+  - if exist src\electron\electron.log ( appveyor-retry appveyor PushArtifact src\electron\electron.log )

build/args/all.gn

@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 107
+node_module_version = 106
 
 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
@@ -29,16 +29,9 @@ dawn_enable_vulkan_validation_layers = false
 # See https://chromium-review.googlesource.com/c/chromium/src/+/2774898.
 enable_pseudolocales = false
 
+is_cfi = false
+
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true
 
-# CET shadow stack is incompatible with v8, until v8 is CET compliant
-# enabling this flag causes main process crashes where CET is enabled
-# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=357
 enable_cet_shadow_stack = false
-
-# For similar reasons, disable CFI, which is not well supported in V8.
-# Chromium doesn't have any problems with this because they do not run
-# V8 in the browser process.
-# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
-is_cfi = false

docs/api/app.md

@@ -606,10 +606,6 @@ You should seek to use the `steal` option as sparingly as possible.
 
 Hides all application windows without minimizing them.
 
-### `app.isHidden()` _macOS_
-
-Returns `boolean` - `true` if the application—including all of its windows—is hidden (e.g. with `Command-H`), `false` otherwise.
-
 ### `app.show()` _macOS_
 
 Shows application windows after they were hidden. Does not automatically focus
@@ -635,18 +631,9 @@ Returns `string` - The current application directory.
     * `%APPDATA%` on Windows
     * `$XDG_CONFIG_HOME` or `~/.config` on Linux
     * `~/Library/Application Support` on macOS
-  * `userData` The directory for storing your app's configuration files, which
-    by default is the `appData` directory appended with your app's name. By
-    convention files storing user data should be written to this directory, and
-    it is not recommended to write large files here because some environments
-    may backup this directory to cloud storage.
-  * `sessionData` The directory for storing data generated by `Session`, such
-    as localStorage, cookies, disk cache, downloaded dictionaries, network
-    state, devtools files. By default this points to `userData`. Chromium may
-    write very large disk cache here, so if your app does not rely on browser
-    storage like localStorage or cookies to save user data, it is recommended
-    to set this directory to other locations to avoid polluting the `userData`
-    directory.
+  * `userData` The directory for storing your app's configuration files, which by
+    default it is the `appData` directory appended with your app's name.
+  * `cache`
   * `temp` Temporary directory.
   * `exe` The current executable file.
   * `module` The `libchromiumcontent` library.
@@ -696,9 +683,9 @@ In that case, the directory should be created with `fs.mkdirSync` or similar.
 
 You can only override paths of a `name` defined in `app.getPath`.
 
-By default, web pages' cookies and caches will be stored under the `sessionData`
+By default, web pages' cookies and caches will be stored under the `userData`
 directory. If you want to change this location, you have to override the
-`sessionData` path before the `ready` event of the `app` module is emitted.
+`userData` path before the `ready` event of the `app` module is emitted.
 
 ### `app.getVersion()`
 
@@ -874,8 +861,6 @@ Returns `Object`:
 
 * `categories` [JumpListCategory[]](structures/jump-list-category.md) | `null` - Array of `JumpListCategory` objects.
 
-Returns `string`
-
 Sets or removes a custom Jump List for the application, and returns one of the
 following strings:
 
@@ -1011,7 +996,7 @@ const gotTheLock = app.requestSingleInstanceLock(additionalData)
 if (!gotTheLock) {
   app.quit()
 } else {
-  app.on('second-instance', (event, commandLine, workingDirectory, additionalData, ackCallback) => {
+  app.on('second-instance', (event, commandLine, workingDirectory, additionalData) => {
     // We must call preventDefault if we're sending back data.
     event.preventDefault()
     // Print out data received from the second instance.

docs/api/browser-view.md

@@ -11,9 +11,6 @@ relative to its owning window. It is meant to be an alternative to the
 
 Process: [Main](../glossary.md#main-process)
 
-This module cannot be used until the `ready` event of the `app`
-module is emitted.
-
 ### Example
 
 ```javascript

docs/api/browser-window.md

@@ -4,9 +4,6 @@
 
 Process: [Main](../glossary.md#main-process)
 
-This module cannot be used until the `ready` event of the `app`
-module is emitted.
-
 ```javascript
 // In the main process.
 const { BrowserWindow } = require('electron')

docs/api/context-bridge.md

@@ -35,7 +35,7 @@ page you load in your renderer executes code in this world.
 
 When `contextIsolation` is enabled in your `webPreferences` (this is the default behavior since Electron 12.0.0), your `preload` scripts run in an
 "Isolated World".  You can read more about context isolation and what it affects in the
-[security](../tutorial/security.md#3-enable-context-isolation) docs.
+[security](../tutorial/security.md#3-enable-context-isolation-for-remote-content) docs.
 
 ## Methods
 

docs/api/safe-storage.md

@@ -18,8 +18,8 @@ The `safeStorage` module has the following methods:
 
 Returns `boolean` - Whether encryption is available.
 
-On Linux, returns true if the app has emitted the `ready` event and the secret key is available.
-On MacOS, returns true if Keychain is available.
+On Linux, returns true if the secret key is
+available. On MacOS, returns true if Keychain is available.
 On Windows, returns true once the app has emitted the `ready` event.
 
 ### `safeStorage.encryptString(plainText)`

docs/api/session.md

@@ -253,11 +253,9 @@ Returns:
   * `device` [HIDDevice[]](structures/hid-device.md)
   * `frame` [WebFrameMain](web-frame-main.md)
 
-Emitted after `navigator.hid.requestDevice` has been called and
-`select-hid-device` has fired if a new device becomes available before
-the callback from `select-hid-device` is called.  This event is intended for
-use when using a UI to ask users to pick a device so that the UI can be updated
-with the newly added device.
+Emitted when a new HID device becomes available. For example, when a new USB device is plugged in.
+
+This event will only be emitted after `navigator.hid.requestDevice` has been called and `select-hid-device` has fired.
 
 #### Event: 'hid-device-removed'
 
@@ -268,11 +266,9 @@ Returns:
   * `device` [HIDDevice[]](structures/hid-device.md)
   * `frame` [WebFrameMain](web-frame-main.md)
 
-Emitted after `navigator.hid.requestDevice` has been called and
-`select-hid-device` has fired if a device has been removed before the callback
-from `select-hid-device` is called.  This event is intended for use when using
-a UI to ask users to pick a device so that the UI can be updated to remove the
-specified device.
+Emitted when a HID device has been removed.  For example, this event will fire when a USB device is unplugged.
+
+This event will only be emitted after `navigator.hid.requestDevice` has been called and `select-hid-device` has fired.
 
 #### Event: 'select-serial-port'
 
@@ -352,11 +348,7 @@ Returns:
 * `port` [SerialPort](structures/serial-port.md)
 * `webContents` [WebContents](web-contents.md)
 
-Emitted after `navigator.serial.requestPort` has been called and
-`select-serial-port` has fired if a new serial port becomes available before
-the callback from `select-serial-port` is called.  This event is intended for
-use when using a UI to ask users to pick a port so that the UI can be updated
-with the newly added port.
+Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a new serial port becomes available.  For example, this event will fire when a new USB device is plugged in.
 
 #### Event: 'serial-port-removed'
 
@@ -366,11 +358,7 @@ Returns:
 * `port` [SerialPort](structures/serial-port.md)
 * `webContents` [WebContents](web-contents.md)
 
-Emitted after `navigator.serial.requestPort` has been called and
-`select-serial-port` has fired if a serial port has been removed before the
-callback from `select-serial-port` is called.  This event is intended for use
-when using a UI to ask users to pick a port so that the UI can be updated
-to remove the specified port.
+Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a serial port has been removed.  For example, this event will fire when a USB device is unplugged.
 
 ### Instance Methods
 

docs/api/system-preferences.md

@@ -84,7 +84,7 @@ that contains the user information dictionary sent along with the notification.
 
 ### `systemPreferences.subscribeNotification(event, callback)` _macOS_
 
-* `event` string | null
+* `event` string
 * `callback` Function
   * `event` string
   * `userInfo` Record<string, unknown>
@@ -109,11 +109,9 @@ example values of `event` are:
 * `AppleColorPreferencesChangedNotification`
 * `AppleShowScrollBarsSettingChanged`
 
-If `event` is null, the `NSDistributedNotificationCenter` doesn’t use it as criteria for delivery to the observer. See [docs](https://developer.apple.com/documentation/foundation/nsnotificationcenter/1411723-addobserverforname?language=objc)  for more information.
-
 ### `systemPreferences.subscribeLocalNotification(event, callback)` _macOS_
 
-* `event` string | null
+* `event` string
 * `callback` Function
   * `event` string
   * `userInfo` Record<string, unknown>
@@ -124,11 +122,9 @@ Returns `number` - The ID of this subscription
 Same as `subscribeNotification`, but uses `NSNotificationCenter` for local defaults.
 This is necessary for events such as `NSUserDefaultsDidChangeNotification`.
 
-If `event` is null, the `NSNotificationCenter` doesn’t use it as criteria for delivery to the observer. See [docs](https://developer.apple.com/documentation/foundation/nsnotificationcenter/1411723-addobserverforname?language=objc) for more information.
-
 ### `systemPreferences.subscribeWorkspaceNotification(event, callback)` _macOS_
 
-* `event` string | null
+* `event` string
 * `callback` Function
   * `event` string
   * `userInfo` Record<string, unknown>
@@ -139,8 +135,6 @@ Returns `number` - The ID of this subscription
 Same as `subscribeNotification`, but uses `NSWorkspace.sharedWorkspace.notificationCenter`.
 This is necessary for events such as `NSWorkspaceDidActivateApplicationNotification`.
 
-If `event` is null, the `NSWorkspaceNotificationCenter` doesn’t use it as criteria for delivery to the observer. See [docs](https://developer.apple.com/documentation/foundation/nsnotificationcenter/1411723-addobserverforname?language=objc) for more information.
-
 ### `systemPreferences.unsubscribeNotification(id)` _macOS_
 
 * `id` Integer

docs/breaking-changes.md

@@ -372,7 +372,7 @@ value.
 In Electron 12, `contextIsolation` will be enabled by default.  To restore
 the previous behavior, `contextIsolation: false` must be specified in WebPreferences.
 
-We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation) for the security of your application.
+We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation-for-remote-content) for the security of your application.
 
 Another implication is that `require()` cannot be used in the renderer process unless
 `nodeIntegration` is `true` and `contextIsolation` is `false`.

docs/fiddles/features/web-hid/main.js

@@ -8,24 +8,20 @@ function createWindow () {
   })
   
   mainWindow.webContents.session.on('select-hid-device', (event, details, callback) => {
-    //Add events to handle devices being added or removed before the callback on
-    //`select-hid-device` is called.
-    mainWindow.webContents.session.on('hid-device-added', (event, device) => {    
-      console.log('hid-device-added FIRED WITH', device)
-      //Optionally update details.deviceList
-    })
-  
-    mainWindow.webContents.session.on('hid-device-removed', (event, device) => {    
-      console.log('hid-device-removed FIRED WITH', device)
-      //Optionally update details.deviceList
-    })
-
     event.preventDefault()
     if (details.deviceList && details.deviceList.length > 0) {
       callback(details.deviceList[0].deviceId)
     }
   })
 
+  mainWindow.webContents.session.on('hid-device-added', (event, device) => {    
+    console.log('hid-device-added FIRED WITH', device)
+  })
+
+  mainWindow.webContents.session.on('hid-device-removed', (event, device) => {    
+    console.log('hid-device-removed FIRED WITH', device)
+  })
+
   mainWindow.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
     if (permission === 'hid' && details.securityOrigin === 'file:///') {
       return true

docs/fiddles/features/web-serial/main.js

@@ -8,19 +8,6 @@ function createWindow () {
   })
   
   mainWindow.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {
-
-    //Add listeners to handle ports being added or removed before the callback for `select-serial-port`
-    //is called.
-    mainWindow.webContents.session.on('serial-port-added', (event, port) => {
-      console.log('serial-port-added FIRED WITH', port)
-      //Optionally update portList to add the new port
-    })
-  
-    mainWindow.webContents.session.on('serial-port-removed', (event, port) => {
-      console.log('serial-port-removed FIRED WITH', port)
-      //Optionally update portList to remove the port
-    })
-
     event.preventDefault()
     if (portList && portList.length > 0) {
       callback(portList[0].portId)
@@ -29,6 +16,14 @@ function createWindow () {
     }
   })
 
+  mainWindow.webContents.session.on('serial-port-added', (event, port) => {
+    console.log('serial-port-added FIRED WITH', port)
+  })
+
+  mainWindow.webContents.session.on('serial-port-removed', (event, port) => {
+    console.log('serial-port-removed FIRED WITH', port)
+  })
+
   mainWindow.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
     if (permission === 'serial' && details.securityOrigin === 'file:///') {
       return true

docs/tutorial/devices.md

@@ -36,10 +36,8 @@ the WebHID API:
   can be used to select a HID device when a call to
   `navigator.hid.requestDevice` is made.  Additionally the [`hid-device-added`](../api/session.md#event-hid-device-added)
   and [`hid-device-removed`](../api/session.md#event-hid-device-removed) events
-  on the Session can be used to handle devices being plugged in or unplugged
-  when handling the `select-hid-device` event.
-  **Note:** These events only fire until the callback from `select-hid-device`
-  is called.  They are not intended to be used as a generic hid device listener.
+  on the Session can be used to handle devices being plugged in or unplugged during the
+  `navigator.hid.requestDevice` process.
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
   can be used to provide default permissioning to devices without first calling
   for permission to devices via `navigator.hid.requestDevice`.  Additionally,
@@ -84,11 +82,8 @@ There are several additional APIs for working with the Web Serial API:
 
 * The [`serial-port-added`](../api/session.md#event-serial-port-added)
   and [`serial-port-removed`](../api/session.md#event-serial-port-removed) events
-  on the Session can be used to handle devices being plugged in or unplugged
-  when handling the `select-serial-port` event.
-  **Note:** These events only fire until the callback from `select-serial-port`
-  is called.  They are not intended to be used as a generic serial port
-  listener.
+  on the Session can be used to handle devices being plugged in or unplugged during the
+  `navigator.serial.requestPort` process.
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
   can be used to provide default permissioning to devices without first calling
   for permission to devices via `navigator.serial.requestPort`.  Additionally,

docs/tutorial/in-app-purchases.md

@@ -116,7 +116,7 @@ inAppPurchase.getProducts(PRODUCT_IDS).then(products => {
     console.log(`The price of ${product.localizedTitle} is ${product.formattedPrice}.`)
   })
 
-  // Ask the user which product they want to purchase.
+  // Ask the user which product he/she wants to purchase.
   const selectedProduct = products[0]
   const selectedQuantity = 1
 

docs/tutorial/quick-start.md

@@ -404,7 +404,7 @@ app.on('window-all-closed', () => {
 ```js
 // preload.js
 
-// All the Node.js APIs are available in the preload process.
+// All of the Node.js APIs are available in the preload process.
 // It has the same sandbox as a Chrome extension.
 window.addEventListener('DOMContentLoaded', () => {
   const replaceText = (selector, text) => {

docs/tutorial/security.md

@@ -99,7 +99,7 @@ You should at least follow these steps to improve the security of your applicati
 
 1. [Only load secure content](#1-only-load-secure-content)
 2. [Disable the Node.js integration in all renderers that display remote content](#2-do-not-enable-nodejs-integration-for-remote-content)
-3. [Enable context isolation in all renderers](#3-enable-context-isolation)
+3. [Enable context isolation in all renderers that display remote content](#3-enable-context-isolation-for-remote-content)
 4. [Enable process sandboxing](#4-enable-process-sandboxing)
 5. [Use `ses.setPermissionRequestHandler()` in all sessions that load remote content](#5-handle-session-permission-requests-from-remote-content)
 6. [Do not disable `webSecurity`](#6-do-not-disable-websecurity)
@@ -225,7 +225,7 @@ do consume Node.js modules or features. Preload scripts continue to have access
 to `require` and other Node.js features, allowing developers to expose a custom
 API to remotely loaded content via the [contextBridge API](../api/context-bridge.md).
 
-### 3. Enable Context Isolation
+### 3. Enable Context Isolation for remote content
 
 :::info
 This recommendation is the default behavior in Electron since 12.0.0.

electron_paks.gni

@@ -54,8 +54,6 @@ template("electron_extra_paks") {
                            ])
     output = "${invoker.output_dir}/resources.pak"
     sources = [
-      "$root_gen_dir/chrome/browser_resources.pak",
-      "$root_gen_dir/chrome/common_resources.pak",
       "$root_gen_dir/chrome/dev_ui_browser_resources.pak",
       "$root_gen_dir/components/components_resources.pak",
       "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
@@ -72,8 +70,6 @@ template("electron_extra_paks") {
     ]
     deps = [
       "//chrome/browser:dev_ui_browser_resources",
-      "//chrome/browser:resources",
-      "//chrome/common:resources",
       "//components/resources",
       "//content:content_resources",
       "//content:dev_ui_content_resources",
@@ -177,28 +173,20 @@ template("electron_paks") {
     }
 
     source_patterns = [
-      "${root_gen_dir}/chrome/locale_settings_",
       "${root_gen_dir}/chrome/platform_locale_settings_",
-      "${root_gen_dir}/chrome/generated_resources_",
-      "${root_gen_dir}/components/strings/components_locale_settings_",
       "${root_gen_dir}/components/strings/components_strings_",
-      "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
-      "${root_gen_dir}/extensions/strings/extensions_strings_",
-      "${root_gen_dir}/services/strings/services_strings_",
       "${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
       "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
+      "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
+      "${root_gen_dir}/services/strings/services_strings_",
       "${root_gen_dir}/ui/strings/app_locale_settings_",
       "${root_gen_dir}/ui/strings/ax_strings_",
       "${root_gen_dir}/ui/strings/ui_strings_",
     ]
     deps = [
-      "//chrome/app:generated_resources",
-      "//chrome/app/resources:locale_settings",
       "//chrome/app/resources:platform_locale_settings",
-      "//components/strings:components_locale_settings",
       "//components/strings:components_strings",
       "//device/bluetooth/strings",
-      "//extensions/strings",
       "//services/strings",
       "//third_party/blink/public/strings",
       "//third_party/blink/public/strings:accessibility_strings",

electron_resources.grd

@@ -11,8 +11,15 @@
     <output filename="electron_resources.pak" type="data_package" />
   </outputs>
   <release seq="1" allow_pseudo="false">
+    <messages fallback_to_english="true">
+      <!-- TODO(deepak1556): Add translations,
+           check https://www.chromium.org/developers/design-documents/ui-localization -->
+      <part file="electron_strings.grdp" />
+    </messages>
     <includes>
       <include name="IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE" file="${target_gen_dir}/shell_devtools_discovery_page.html" use_base_dir="false" type="BINDATA" />
+      <include name="IDR_PDF_MANIFEST" file="../chrome/browser/resources/pdf/manifest.json" type="BINDATA" />
+      <include name="IDR_CRYPTOTOKEN_MANIFEST" file="../chrome/browser/resources/cryptotoken/manifest.json" type="BINDATA" />
     </includes>
   </release>
 </grit>

electron_strings.grdp

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+  <!-- Windows Caption Buttons -->
+  <message name="IDS_APP_ACCNAME_CLOSE" desc="The accessible name for the Close button.">
+    Close
+  </message>
+  <message name="IDS_APP_ACCNAME_MINIMIZE" desc="The accessible name for the Minimize button.">
+    Minimize
+  </message>
+  <message name="IDS_APP_ACCNAME_MAXIMIZE" desc="The accessible name for the Maximize button.">
+    Maximize
+  </message>
+  <message name="IDS_APP_ACCNAME_RESTORE" desc="The accessible name for the Restore button.">
+    Restore
+  </message>
+
+  <!-- Printing Service -->
+  <message name="IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME" desc="The name of the utility process used for printing conversions.">
+    Printing Service
+  </message>
+  <message name="IDS_PRINT_INVALID_PRINTER_SETTINGS" desc="Message to display when selected printer is not reachable or its settings are invalid.">
+    The selected printer is not available or not installed correctly. <ph name="BR">&lt;br&gt;</ph> Check your printer or try selecting another printer.
+  </message>
+  <message name="IDS_DEFAULT_PRINT_DOCUMENT_TITLE" desc="Default title for a print document">
+    Untitled Document
+  </message>
+
+  <!-- Desktop Capturer API -->
+  <message name="IDS_DESKTOP_MEDIA_PICKER_SINGLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there is only one monitor.">
+    Entire Screen
+  </message>
+  <message name="IDS_DESKTOP_MEDIA_PICKER_MULTIPLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there are multiple monitors.">
+    {SCREEN_INDEX, plural, =1{Screen #} other{Screen #}}
+  </message>
+
+  <!-- File Select Helper-->
+  <message name="IDS_IMAGE_FILES" desc="The description of the image file extensions in the select file dialog.">
+    Image Files
+  </message>
+  <message name="IDS_AUDIO_FILES" desc="The description of the audio file extensions in the select file dialog.">
+    Audio Files
+  </message>
+  <message name="IDS_VIDEO_FILES" desc="The description of the video file extensions in the select file dialog.">
+    Video Files
+  </message>
+  <message name="IDS_CUSTOM_FILES" desc="The description of the custom file extensions in the select file dialog.">
+    Custom Files
+  </message>
+  <message name="IDS_DEFAULT_DOWNLOAD_FILENAME" desc="Default name for downloaded files when we have no idea what they could be.">
+    download
+  </message>
+
+  <!-- Picture-in-Picture -->
+  <if expr="is_macosx">
+    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
+      Picture in Picture
+    </message>
+  </if>
+  <if expr="not is_macosx">
+    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
+      Picture in picture
+    </message>
+  </if>
+  <message name="IDS_PICTURE_IN_PICTURE_PAUSE_CONTROL_TEXT" desc="Text label of the pause control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently playing.">
+    Pause
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_PLAY_CONTROL_TEXT" desc="Text label of the play control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently paused.">
+    Play
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_REPLAY_CONTROL_TEXT" desc="Text label of the replay control button. The button appears when the user hovers over the Picture-in-Picture window and the video is ended.">
+    Play from the beginning
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_BACK_TO_TAB_CONTROL_TEXT" desc="Text label of the back to tab control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Back to video player
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently unmuted.">
+    Mute
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently muted.">
+    Unmute
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_SKIP_AD_CONTROL_TEXT" desc="Text label of the skip ad control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Skip Ad
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_MUTE_MICROPHONE_TEXT" desc="Text label of the mute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Mute microphone
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_MICROPHONE_TEXT" desc="Text label of the unmute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Unmute microphone
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_TURN_ON_CAMERA_TEXT" desc="Text label of the turn on camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Turn on camera
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_TURN_OFF_CAMERA_TEXT" desc="Text label of the turn off camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Turn off camera
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_HANG_UP_TEXT" desc="Text label of the hang up control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Hang up
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_CLOSE_CONTROL_TEXT" desc="Text label of the close control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Close
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_RESIZE_HANDLE_TEXT" desc="Text label of the resize handle. The button appears when the user hovers over the Picture-in-Picture window.">
+    Resize
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_PLAY_PAUSE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles between play and pause controls.">
+    Toggle video to play or pause
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles mute state.">
+    Toggle mute
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_NEXT_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes next track action.">
+    Next track
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_PREVIOUS_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes previous track action.">
+    Previous track
+  </message>
+  <message name="IDS_SPELLCHECK_DICTIONARY" use_name_for_id="true">
+    en-US
+  </message>
+  <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
+    en-US,en
+  </message>
+  <if expr="is_win">
+    <message name="IDS_UTILITY_PROCESS_UTILITY_WIN_NAME" desc="The name of the utility process used to handle Windows utility operations.">
+      Windows Utilities
+    </message>
+  </if>
+  <message name="IDS_DOWNLOAD_MORE_ACTIONS"
+          desc="Tooltip of a button on the downloads page that shows a menu with actions like 'Open downloads folder' or 'Clear all'">
+    More actions
+  </message>
+  <!-- Badging -->
+  <message name="IDS_SATURATED_BADGE_CONTENT" desc="The content to display when the application's badge is too large to display to indicate that the badge is more than a given maximum. This string should be as short as possible, preferably only one character beyond the content">
+    <ph name="MAXIMUM_VALUE">$1<ex>99</ex></ph>+
+  </message>
+  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_SATURATED" desc="The accessibility text which will be read by a screen reader when the notification count is too large to display (e.g. greater than 99).">
+    {MAX_UNREAD_NOTIFICATIONS, plural, =1 {More than 1 unread notification} other {More than # unread notifications}}
+  </message>
+  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_UNSPECIFIED" desc="The accessibility text which will be read by a screen reader when there are some unspecified number of notifications, or user attention is required">
+    Unread Notifications
+  </message>
+  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS" desc="The accessibility text which will be read by a screen reader when there are notifcatications">
+    {UNREAD_NOTIFICATIONS, plural, =1 {1 Unread Notification} other {# Unread Notifications}}
+  </message>
+  <message name="IDS_HID_CHOOSER_ITEM_WITHOUT_NAME" desc="User option displaying the device IDs for a Human Interface Device (HID) without a device name.">
+        Unknown Device (<ph name="DEVICE_ID">$1<ex>1234:abcd</ex></ph>) </message>
+  <if expr="is_win">
+    <then>
+      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for a graphic (image) on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
+        Unlabeled graphic
+      </message>
+    </then>
+    <else>
+      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for an image on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
+        Unlabeled image
+      </message>
+    </else>
+  </if>
+</grit-part>

lib/browser/api/net.ts

@@ -36,14 +36,17 @@ const discardableDuplicateHeaders = new Set([
 ]);
 
 class IncomingMessage extends Readable {
-  _shouldPush: boolean = false;
-  _data: (Buffer | null)[] = [];
+  _shouldPush: boolean;
+  _data: (Buffer | null)[];
   _responseHead: NodeJS.ResponseHead;
-  _resume: (() => void) | null = null;
+  _resume: (() => void) | null;
 
   constructor (responseHead: NodeJS.ResponseHead) {
     super();
+    this._shouldPush = false;
+    this._data = [];
     this._responseHead = responseHead;
+    this._resume = null;
   }
 
   get statusCode () {

lib/browser/guest-window-manager.ts

@@ -78,19 +78,6 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
     ...browserWindowOptions
   });
 
-  if (!guest) {
-    // When we open a new window from a link (via OpenURLFromTab),
-    // the browser process is responsible for initiating navigation
-    // in the new window.
-    window.loadURL(url, {
-      httpReferrer: referrer,
-      ...(postData && {
-        postData,
-        extraHeaders: formatPostDataHeaders(postData as Electron.UploadRawData[])
-      })
-    });
-  }
-
   handleWindowLifecycleEvents({ embedder, frameName, guest: window, outlivesOpener });
 
   embedder.emit('did-create-window', window, { url, frameName, options: browserWindowOptions, disposition, referrer, postData });
@@ -256,15 +243,6 @@ export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {
   };
 }
 
-function formatPostDataHeaders (postData: PostData) {
-  if (!postData) return;
-
-  const { contentType, boundary } = parseContentTypeFormat(postData);
-  if (boundary != null) { return `content-type: ${contentType}; boundary=${boundary}`; }
-
-  return `content-type: ${contentType}`;
-}
-
 const MULTIPART_CONTENT_TYPE = 'multipart/form-data';
 const URL_ENCODED_CONTENT_TYPE = 'application/x-www-form-urlencoded';
 

npm/install.js

@@ -70,8 +70,17 @@ function isInstalled () {
 
 // unzips and makes path.txt point at the correct executable
 function extractFile (zipPath) {
-  return extract(zipPath, { dir: path.join(__dirname, 'dist') })
-    .then(() => fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath));
+  return new Promise((resolve, reject) => {
+    extract(zipPath, { dir: path.join(__dirname, 'dist') }, err => {
+      if (err) return reject(err);
+
+      fs.writeFile(path.join(__dirname, 'path.txt'), platformPath, err => {
+        if (err) return reject(err);
+
+        resolve();
+      });
+    });
+  });
 }
 
 function getPlatformPath () {

npm/package.json

@@ -10,9 +10,9 @@
   "dependencies": {
     "@electron/get": "^1.14.1",
     "@types/node": "^16.11.26",
-    "extract-zip": "^2.0.1"
+    "extract-zip": "^1.0.3"
   },
   "engines": {
-    "node": ">= 10.17.0"
+    "node": ">= 8.6"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220516",
+  "version": "19.0.0-beta.1",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {

patches/chromium/.patches

@@ -21,11 +21,15 @@ resource_file_conflict.patch
 scroll_bounce_flag.patch
 mas_blink_no_private_api.patch
 mas_no_private_api.patch
+mas-cfisobjc.patch
 mas-cgdisplayusesforcetogray.patch
+mas-audiodeviceduck.patch
 mas_disable_remote_layer.patch
 mas_disable_remote_accessibility.patch
 mas_disable_custom_window_frame.patch
-mas_avoid_usage_of_private_macos_apis.patch
+mas_avoid_usage_of_abort_report_np.patch
+mas_avoid_usage_of_pthread_fchdir_np.patch
+mas_avoid_usage_of_setapplicationisdaemon_and.patch
 mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch
 chrome_key_systems.patch
 add_didinstallconditionalfeatures.patch
@@ -54,6 +58,7 @@ feat_add_set_theme_source_to_allow_apps_to.patch
 add_webmessageportconverter_entangleandinjectmessageportchannel.patch
 ignore_rc_check.patch
 remove_usage_of_incognito_apis_in_the_spellchecker.patch
+chore_use_electron_resources_not_chrome_for_spellchecker.patch
 allow_disabling_blink_scheduler_throttling_per_renderview.patch
 hack_plugin_response_interceptor_to_point_to_electron.patch
 feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
@@ -75,6 +80,7 @@ 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
+fix_use_electron_generated_resources.patch
 chore_expose_v8_initialization_isolate_callbacks.patch
 export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
 fix_export_zlib_symbols.patch
@@ -96,6 +102,7 @@ chore_do_not_use_chrome_windows_in_cryptotoken_webrequestsender.patch
 process_singleton.patch
 fix_expose_decrementcapturercount_in_web_contents_impl.patch
 add_ui_scopedcliboardwriter_writeunsaferawdata.patch
+mas_gate_private_enterprise_APIs.patch
 load_v8_snapshot_in_browser_process.patch
 fix_patch_out_permissions_checks_in_exclusive_access.patch
 fix_aspect_ratio_with_max_size.patch

patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -33,7 +33,7 @@ index 3c40d999a9545051e91a9f0ad3bf7ca2a95d80c4..b5a20be5e22238e7e1969bdaf52c0b05
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 02e4b0e27f4a0d3409327ba929f78b129dc06385..dce624825dc8e9e545c15a0cb0427aa33877aa3e 100644
+index bd16a798301785507629f24726c1cec636956fe2..86ab85c51a0a6192f1ea040007966464439465ab 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -4552,7 +4552,7 @@ static_library("browser") {

patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch

@@ -0,0 +1,58 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@slack-corp.com>
+Date: Wed, 23 Oct 2019 14:17:18 -0700
+Subject: chore: use electron resources not chrome for spellchecker
+
+spellchecker uses a few IDS_ resources.  We need to load these from
+Electrons grit header instead of Chromes
+
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+index 02e4b0e27f4a0d3409327ba929f78b129dc06385..bd16a798301785507629f24726c1cec636956fe2 100644
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -7164,6 +7164,7 @@ static_library("browser") {
+     deps += [
+       "//components/spellcheck/browser",
+       "//components/spellcheck/common",
++      "//electron:resources",
+     ]
+ 
+     if (!is_android) {
+diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc
+index 7c3b6a69acb16186add5d467dbc22360d90d46d4..703e2ce60f4f35f9c71e8b503ffd62f9ea8f365a 100644
+--- a/chrome/browser/spellchecker/spellcheck_factory.cc
++++ b/chrome/browser/spellchecker/spellcheck_factory.cc
+@@ -7,7 +7,7 @@
+ #include "build/build_config.h"
+ #include "chrome/browser/profiles/incognito_helpers.h"
+ #include "chrome/browser/spellchecker/spellcheck_service.h"
+-#include "chrome/grit/locale_settings.h"
++#include "electron/grit/electron_resources.h"
+ #include "components/keyed_service/content/browser_context_dependency_manager.h"
+ #include "components/pref_registry/pref_registry_syncable.h"
+ #include "components/prefs/pref_service.h"
+diff --git a/components/language/core/browser/BUILD.gn b/components/language/core/browser/BUILD.gn
+index fdba4ca90882656d6ba369dae48d5dfc13991cb8..fb3b759362275aafd4ed01a7865a4dd0dfaad727 100644
+--- a/components/language/core/browser/BUILD.gn
++++ b/components/language/core/browser/BUILD.gn
+@@ -30,6 +30,7 @@ static_library("browser") {
+     "//components/pref_registry",
+     "//components/prefs",
+     "//components/strings",
++    "//electron:resources",
+     "//ui/base",
+   ]
+ }
+diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc
+index 26f86d67c32b2a022698ae5ea5509912d2ccfacb..d48844d49308d67ee7bfa823335c7443173badbe 100644
+--- a/components/language/core/browser/language_prefs.cc
++++ b/components/language/core/browser/language_prefs.cc
+@@ -22,7 +22,7 @@
+ #include "components/pref_registry/pref_registry_syncable.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/prefs/scoped_user_pref_update.h"
+-#include "components/strings/grit/components_locale_settings.h"
++#include "electron/grit/electron_resources.h"
+ #include "ui/base/l10n/l10n_util.h"
+ 
+ namespace language {

patches/chromium/desktop_media_list.patch

@@ -82,9 +82,18 @@ index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b8
    const Source& GetSource(int index) const override;
    DesktopMediaList::Type GetMediaListType() const override;
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..d5092cb0245a4b8dc26073741f0bc6657b943bdd 100644
+index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..2026b926eee56f6b235963b23ab86b2743eaed90 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
+@@ -18,7 +18,7 @@
+ #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
+ #include "chrome/browser/media/webrtc/desktop_media_list.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "content/public/browser/browser_task_traits.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/common/content_features.h"
 @@ -127,8 +127,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
  #endif  // BUILDFLAG(IS_WIN)
  

patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch

@@ -282,20 +282,10 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
      return PROCESS_NOTIFIED;
    }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dca04470f1 100644
+index ec725b44296266bea1a51aea889463a0bba8449c..a3d4dd1efc950033855a1f2783f941384b249a5d 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
-@@ -13,14 +13,17 @@
- #include "base/command_line.h"
- #include "base/debug/activity_tracker.h"
- #include "base/files/file_path.h"
-+#include "base/files/file_util.h"
- #include "base/logging.h"
- #include "base/metrics/histogram_functions.h"
- #include "base/metrics/histogram_macros.h"
- #include "base/process/process.h"
- #include "base/process/process_info.h"
-+#include "base/rand_util.h"
+@@ -21,6 +21,7 @@
  #include "base/strings/string_number_conversions.h"
  #include "base/strings/utf_string_conversions.h"
  #include "base/time/time.h"
@@ -303,10 +293,11 @@ index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dc
  #include "base/trace_event/base_tracing.h"
  #include "base/win/registry.h"
  #include "base/win/scoped_handle.h"
-@@ -45,6 +48,13 @@
+@@ -45,6 +46,14 @@
  namespace {
  
  const char kLockfile[] = "lockfile";
++const LPCWSTR kPipeName = L"\\\\.\\pipe\\electronAckPipe";
 +const DWORD kPipeTimeout = 10000;
 +const DWORD kMaxMessageLength = 32 * 1024;
 +
@@ -317,7 +308,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dc
  
  // A helper class that acquires the given |mutex| while the AutoLockMutex is in
  // scope.
-@@ -80,10 +90,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
+@@ -80,10 +89,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
  
  bool ParseCommandLine(const COPYDATASTRUCT* cds,
                        base::CommandLine* parsed_command_line,
@@ -332,7 +323,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dc
    static const int min_message_size = 7;
    if (cds->cbData < min_message_size * sizeof(wchar_t) ||
        cds->cbData % sizeof(wchar_t) != 0) {
-@@ -133,11 +145,82 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
+@@ -133,11 +144,82 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
      const std::wstring cmd_line =
          msg.substr(second_null + 1, third_null - second_null);
      *parsed_command_line = base::CommandLine::FromString(cmd_line);
@@ -415,7 +406,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dc
  bool ProcessLaunchNotification(
      const ProcessSingleton::NotificationCallback& notification_callback,
      UINT message,
-@@ -151,16 +234,35 @@ bool ProcessLaunchNotification(
+@@ -151,16 +233,23 @@ bool ProcessLaunchNotification(
  
    // Handle the WM_COPYDATA message from another process.
    const COPYDATASTRUCT* cds = reinterpret_cast<COPYDATASTRUCT*>(lparam);
@@ -432,30 +423,18 @@ index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dc
  
 -  *result = notification_callback.Run(parsed_command_line, current_directory) ?
 -      TRUE : FALSE;
-+  // notification_callback.Run waits for StoreAck to
-+  // run to completion before moving onwards.
-+  // Therefore, we cannot directly send the SendBackAck
-+  // callback instead, as it would hang the program
-+  // during the ConnectNamedPipe call.
 +  g_write_ack_callback_called = false;
 +  *result = notification_callback.Run(parsed_command_line, current_directory,
 +                                      std::move(additional_data),
 +                                      base::BindRepeating(&StoreAck))
 +                ? TRUE
 +                : FALSE;
-+  if (*result) {
-+    // If *result is TRUE, we return NOTIFY_SUCCESS.
-+    // Only for that case does the second process read
-+    // the acknowledgement. Therefore, only send back
-+    // the acknowledgement if *result is TRUE,
-+    // otherwise the program hangs during the ConnectNamedPipe call.
-+    g_ack_timer.Start(FROM_HERE, base::Seconds(0),
-+                      base::BindOnce(&SendBackAck));
-+  }
++  g_ack_timer.Start(FROM_HERE, base::Seconds(0),
++                    base::BindOnce(&SendBackAck));
    return true;
  }
  
-@@ -261,9 +363,13 @@ bool ProcessSingleton::EscapeVirtualization(
+@@ -261,9 +350,13 @@ bool ProcessSingleton::EscapeVirtualization(
  ProcessSingleton::ProcessSingleton(
      const std::string& program_name,
      const base::FilePath& user_data_dir,
@@ -470,26 +449,16 @@ index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dc
        program_name_(program_name),
        is_app_sandboxed_(is_app_sandboxed),
        is_virtualized_(false),
-@@ -278,6 +384,47 @@ ProcessSingleton::~ProcessSingleton() {
+@@ -278,6 +371,37 @@ ProcessSingleton::~ProcessSingleton() {
      ::CloseHandle(lock_file_);
  }
  
-+void ReadAck(const ProcessSingleton::NotificationAckCallback& ack_callback,
-+             const std::string program_name,
-+             base::FilePath& user_data_dir) {
++void ReadAck(const ProcessSingleton::NotificationAckCallback& ack_callback) {
 +  // We are reading the ack from the first instance.
 +  // First, wait for the pipe.
-+  HWND remote_window = chrome::FindRunningChromeWindow(user_data_dir);
-+  DWORD process_id;
-+  DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id);
-+  std::string identifier = base::NumberToString(process_id) +
-+      base::NumberToString(thread_id);
-+  std::wstring pipe_name = base::UTF8ToWide("\\\\.\\pipe\\" + identifier +
-+        program_name);
-+  const LPCWSTR w_pipe_name = pipe_name.c_str();
-+  ::WaitNamedPipe(w_pipe_name, NMPWAIT_USE_DEFAULT_WAIT);
++  ::WaitNamedPipe(kPipeName, NMPWAIT_USE_DEFAULT_WAIT);
 +
-+  HANDLE read_ack_pipe = ::CreateFile(w_pipe_name,
++  HANDLE read_ack_pipe = ::CreateFile(kPipeName,
 +    GENERIC_READ,
 +    FILE_SHARE_READ,
 +    NULL,
@@ -518,31 +487,23 @@ index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dc
  // Code roughly based on Mozilla.
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
    TRACE_EVENT0("startup", "ProcessSingleton::NotifyOtherProcess");
-@@ -290,8 +437,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
+@@ -290,8 +414,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
      return PROCESS_NONE;
    }
  
 -  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
 +  switch (chrome::AttemptToNotifyRunningChrome(remote_window_, additional_data_)) {
      case chrome::NOTIFY_SUCCESS:
-+      ReadAck(notification_ack_callback_, program_name_, user_data_dir_);
++      ReadAck(notification_ack_callback_);
        return PROCESS_NOTIFIED;
      case chrome::NOTIFY_FAILED:
        remote_window_ = NULL;
-@@ -429,6 +577,26 @@ bool ProcessSingleton::Create() {
+@@ -429,6 +554,18 @@ bool ProcessSingleton::Create() {
            << "Lock file can not be created! Error code: " << error;
  
        if (lock_file_ != INVALID_HANDLE_VALUE) {
 +        // We are the first instance. Create a pipe to send out ack data.
-+        // Create a per-process pipename using a combination of the
-+        // username, process id, thread id, and program name. Pipe names max
-+        // at 256 characters, can include any character other than a backslash
-+        std::string identifier = base::NumberToString(::GetCurrentProcessId()) +
-+              base::NumberToString(::GetCurrentThreadId());
-+        std::wstring pipe_name = base::UTF8ToWide("\\\\.\\pipe\\" + identifier +
-+              program_name_);
-+        const LPCWSTR w_pipe_name = pipe_name.c_str();
-+        ack_pipe_ = ::CreateNamedPipe(w_pipe_name,
++        ack_pipe_ = ::CreateNamedPipe(kPipeName,
 +          PIPE_ACCESS_OUTBOUND,
 +          PIPE_TYPE_BYTE | PIPE_REJECT_REMOTE_CLIENTS,
 +          PIPE_UNLIMITED_INSTANCES,
@@ -556,7 +517,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dc
          // Set the window's title to the path of our user data directory so
          // other Chrome instances can decide if they should forward to us.
          TRACE_EVENT0("startup", "ProcessSingleton::Create:CreateWindow");
-@@ -456,6 +624,7 @@ bool ProcessSingleton::Create() {
+@@ -456,6 +593,7 @@ bool ProcessSingleton::Create() {
  }
  
  void ProcessSingleton::Cleanup() {

patches/chromium/fix_use_electron_generated_resources.patch

@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Thu, 24 Sep 2020 11:10:41 -0700
+Subject: fix: use electron generated resources
+
+This patch fixes a few instances where we need to use Electron generated
+resources for IDS strings, or the IDs will be wrong and cause DCHECKS
+as they will loaded as empty strings.
+
+* IDS_UTILITY_PROCESS_UTILITY_WIN_NAME on Windows
+* IDR_PDF_MANIFEST on Linux
+* IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME on Windows
+
+diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
+index 441c28828328b72b625db10c5dca85f1f2349482..17973b511994cf32da051d144fc893a87fbb1d0c 100644
+--- a/chrome/browser/pdf/pdf_extension_util.cc
++++ b/chrome/browser/pdf/pdf_extension_util.cc
+@@ -11,8 +11,7 @@
+ #include "build/chromeos_buildflags.h"
+ #include "chrome/browser/browser_process.h"
+ #include "chrome/common/chrome_content_client.h"
+-#include "chrome/grit/browser_resources.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "components/strings/grit/components_strings.h"
+ #include "components/zoom/page_zoom_constants.h"
+ #include "ui/base/l10n/l10n_util.h"
+diff --git a/chrome/browser/printing/printing_service.cc b/chrome/browser/printing/printing_service.cc
+index 6d18517898c11c6a628cec2eade57fe845827b3d..a21f52e8a3c6f80d69b27faae4b77700fdd09e35 100644
+--- a/chrome/browser/printing/printing_service.cc
++++ b/chrome/browser/printing/printing_service.cc
+@@ -5,7 +5,7 @@
+ #include "chrome/browser/printing/printing_service.h"
+ 
+ #include "base/no_destructor.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "chrome/services/printing/public/mojom/printing_service.mojom.h"
+ #include "content/public/browser/service_process_host.h"
+ 
+diff --git a/chrome/browser/win/icon_reader_service.cc b/chrome/browser/win/icon_reader_service.cc
+index d5497a7e26cdb66c7c074bc509e2bfec7d7875cd..62d2f555253eef903bd04ff1a0ad37d1470309e0 100644
+--- a/chrome/browser/win/icon_reader_service.cc
++++ b/chrome/browser/win/icon_reader_service.cc
+@@ -4,7 +4,7 @@
+ 
+ #include "chrome/browser/win/icon_reader_service.h"
+ 
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h"
+ #include "content/public/browser/service_process_host.h"
+ 

patches/chromium/mas-audiodeviceduck.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Apthorp <nornagon@nornagon.net>
+Date: Thu, 20 Sep 2018 17:49:31 -0700
+Subject: mas: avoid usage of AudioDeviceDuck
+
+Removes usage of the AudioDeviceDuck private API.
+
+diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
+index 0e842caf7b6487d94978c7b68fb5b222e330581f..5eafcd163ee1a05203a5eb76592a449f5a84e71f 100644
+--- a/media/audio/mac/audio_low_latency_input_mac.cc
++++ b/media/audio/mac/audio_low_latency_input_mac.cc
+@@ -34,19 +34,23 @@
+ 
+ namespace {
+ extern "C" {
++#ifndef MAS_BUILD
+ // See:
+ // https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h?rev=228264
+ OSStatus AudioDeviceDuck(AudioDeviceID inDevice,
+                          Float32 inDuckedLevel,
+                          const AudioTimeStamp* __nullable inStartTime,
+                          Float32 inRampDuration) __attribute__((weak_import));
++#endif
+ }
+ 
+ void UndoDucking(AudioDeviceID output_device_id) {
++#ifndef MAS_BUILD
+   if (AudioDeviceDuck != nullptr) {
+     // Ramp the volume back up over half a second.
+     AudioDeviceDuck(output_device_id, 1.0, nullptr, 0.5);
+   }
++#endif
+ }
+ 
+ }  // namespace

patches/chromium/mas-cfisobjc.patch

@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Apthorp <nornagon@nornagon.net>
+Date: Thu, 20 Sep 2018 17:49:20 -0700
+Subject: mas: avoid usage of _CFIsObjC
+
+Removes usage of the _CFIsObjC private API.
+
+diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
+index 61641e1ad8a47a4910918ff61523a23854745b81..d4a3e2282256f5a43235b40b4c9f46caa725c507 100644
+--- a/base/mac/foundation_util.mm
++++ b/base/mac/foundation_util.mm
+@@ -30,12 +30,6 @@
+ #if !BUILDFLAG(IS_IOS)
+ CFTypeID SecACLGetTypeID();
+ CFTypeID SecTrustedApplicationGetTypeID();
+-// The NSFont/CTFont toll-free bridging is broken before 10.15.
+-// http://www.openradar.me/15341349 rdar://15341349
+-//
+-// TODO(https://crbug.com/1076527): This is fixed in 10.15. When 10.15 is the
+-// minimum OS for Chromium, remove this SPI declaration.
+-Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);
+ #endif
+ }  // extern "C"
+ 
+@@ -316,8 +310,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
+       const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
+   DCHECK(!cf_val ||
+          CTFontGetTypeID() == CFGetTypeID(cf_val) ||
+-         (_CFIsObjC(CTFontGetTypeID(), cf_val) &&
+-          [ns_val isKindOfClass:[NSFont class]]));
++         ([ns_val isKindOfClass:[NSFont class]]));
+   return ns_val;
+ }
+ 
+@@ -388,9 +381,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
+     return (CTFontRef)(cf_val);
+   }
+ 
+-  if (!_CFIsObjC(CTFontGetTypeID(), cf_val))
+-    return NULL;
+-
+   id<NSObject> ns_val = reinterpret_cast<id>(const_cast<void*>(cf_val));
+   if ([ns_val isKindOfClass:[NSFont class]]) {
+     return (CTFontRef)(cf_val);

patches/chromium/mas_avoid_usage_of_abort_report_np.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@slack-corp.com>
+Date: Mon, 4 Mar 2019 14:43:36 -0800
+Subject: mas: avoid usage of abort_report_np
+
+Disable usage of the private API abort_report_np in MAS builds.
+
+diff --git a/sandbox/mac/sandbox_logging.cc b/sandbox/mac/sandbox_logging.cc
+index 702224dce1871c07b07f6882e46d14fe532d6ed2..797cb6646171486797a5e5fbbb1b187e3a9f81d4 100644
+--- a/sandbox/mac/sandbox_logging.cc
++++ b/sandbox/mac/sandbox_logging.cc
+@@ -32,9 +32,11 @@
+   }
+ #endif
+ 
++#if !defined(MAS_BUILD)
+ extern "C" {
+ void abort_report_np(const char*, ...);
+ }
++#endif
+ 
+ namespace sandbox {
+ 
+@@ -104,9 +106,11 @@ void SendAslLog(Level level, const char* message) {
+   asl_set(asl_message.get(), ASL_KEY_MSG, message);
+   asl_send(asl_client.get(), asl_message.get());
+ 
++#if !defined(MAS_BUILD)
+   if (level == Level::FATAL) {
+     abort_report_np(message);
+   }
++#endif
+ }
+ 
+ // |error| is strerror(errno) when a P* logging function is called. Pass

patches/chromium/mas_avoid_usage_of_private_macos_apis.patch

@@ -1,233 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@slack-corp.com>
-Date: Mon, 4 Mar 2019 14:43:36 -0800
-Subject: mas: avoid usage of private macOS APIs
-
-Disable usage of the following private APIs in MAS builds:
-* abort_report_np
-* pthread_fchdir_np
-* pthread_chdir_np
-* SetApplicationIsDaemon
-* _LSSetApplicationLaunchServicesServerConnectionStatus
-* AreDeviceAndUserJoinedToDomain
-* _CFIsObjC
-* AudioDeviceDuck
-
-diff --git a/base/enterprise_util_mac.mm b/base/enterprise_util_mac.mm
-index bbb851e1cafb37ebaa67e4577598fab25c90fde6..6ab12e5505b5ba545e7e0cc8c93d3ba9a6d0bacc 100644
---- a/base/enterprise_util_mac.mm
-+++ b/base/enterprise_util_mac.mm
-@@ -168,6 +168,13 @@ MacDeviceManagementStateNew IsDeviceRegisteredWithManagementNew() {
- DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
-   static DeviceUserDomainJoinState state = [] {
-     DeviceUserDomainJoinState state{false, false};
-+#if defined(MAS_BUILD)
-+    return state;
-+  }();
-+
-+  return state;
-+}
-+#else
- 
-     @autoreleasepool {
-       ODSession* session = [ODSession defaultSession];
-@@ -274,5 +281,6 @@ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
- 
-   return state;
- }
-+#endif
- 
- }  // namespace base
-diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-index 61641e1ad8a47a4910918ff61523a23854745b81..d4a3e2282256f5a43235b40b4c9f46caa725c507 100644
---- a/base/mac/foundation_util.mm
-+++ b/base/mac/foundation_util.mm
-@@ -30,12 +30,6 @@
- #if !BUILDFLAG(IS_IOS)
- CFTypeID SecACLGetTypeID();
- CFTypeID SecTrustedApplicationGetTypeID();
--// The NSFont/CTFont toll-free bridging is broken before 10.15.
--// http://www.openradar.me/15341349 rdar://15341349
--//
--// TODO(https://crbug.com/1076527): This is fixed in 10.15. When 10.15 is the
--// minimum OS for Chromium, remove this SPI declaration.
--Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);
- #endif
- }  // extern "C"
- 
-@@ -316,8 +310,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
-       const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
-   DCHECK(!cf_val ||
-          CTFontGetTypeID() == CFGetTypeID(cf_val) ||
--         (_CFIsObjC(CTFontGetTypeID(), cf_val) &&
--          [ns_val isKindOfClass:[NSFont class]]));
-+         ([ns_val isKindOfClass:[NSFont class]]));
-   return ns_val;
- }
- 
-@@ -388,9 +381,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
-     return (CTFontRef)(cf_val);
-   }
- 
--  if (!_CFIsObjC(CTFontGetTypeID(), cf_val))
--    return NULL;
--
-   id<NSObject> ns_val = reinterpret_cast<id>(const_cast<void*>(cf_val));
-   if ([ns_val isKindOfClass:[NSFont class]]) {
-     return (CTFontRef)(cf_val);
-diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
-index 184cfa25dbc6cfa2a32be3f8d964ea359254f807..c9bfc4d8ca1408206244305d7634dcd51e99377c 100644
---- a/base/process/launch_mac.cc
-+++ b/base/process/launch_mac.cc
-@@ -26,8 +26,10 @@ extern "C" {
- // descriptor. libpthread only exposes a syscall wrapper starting in
- // macOS 10.12, but the system call dates back to macOS 10.5. On older OSes,
- // the syscall is issued directly.
-+#if !defined(MAS_BUILD)
- int pthread_chdir_np(const char* dir) API_AVAILABLE(macosx(10.12));
- int pthread_fchdir_np(int fd) API_AVAILABLE(macosx(10.12));
-+#endif
- 
- int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
-     API_AVAILABLE(macosx(10.14));
-@@ -96,21 +98,29 @@ class PosixSpawnFileActions {
- };
- 
- int ChangeCurrentThreadDirectory(const char* path) {
-+  #if defined(MAS_BUILD)
-+  return syscall(SYS___pthread_chdir, path);
-+  #else
-   if (__builtin_available(macOS 10.12, *)) {
-     return pthread_chdir_np(path);
-   } else {
-     return syscall(SYS___pthread_chdir, path);
-   }
-+  #endif
- }
- 
- // The recommended way to unset a per-thread cwd is to set a new value to an
- // invalid file descriptor, per libpthread-218.1.3/private/private.h.
- int ResetCurrentThreadDirectory() {
-+  #if defined(MAS_BUILD)
-+  return syscall(SYS___pthread_fchdir, -1);
-+  #else
-   if (__builtin_available(macOS 10.12, *)) {
-     return pthread_fchdir_np(-1);
-   } else {
-     return syscall(SYS___pthread_fchdir, -1);
-   }
-+  #endif
- }
- 
- struct GetAppOutputOptions {
-@@ -230,11 +240,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
-     file_actions.Inherit(STDERR_FILENO);
-   }
- 
-+#if 0
-   if (options.disclaim_responsibility) {
-     if (__builtin_available(macOS 10.14, *)) {
-       DPSXCHECK(responsibility_spawnattrs_setdisclaim(attr.get(), 1));
-     }
-   }
-+#endif
- 
-   std::vector<char*> argv_cstr;
-   argv_cstr.reserve(argv.size() + 1);
-diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
-index 0e842caf7b6487d94978c7b68fb5b222e330581f..5eafcd163ee1a05203a5eb76592a449f5a84e71f 100644
---- a/media/audio/mac/audio_low_latency_input_mac.cc
-+++ b/media/audio/mac/audio_low_latency_input_mac.cc
-@@ -34,19 +34,23 @@
- 
- namespace {
- extern "C" {
-+#ifndef MAS_BUILD
- // See:
- // https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h?rev=228264
- OSStatus AudioDeviceDuck(AudioDeviceID inDevice,
-                          Float32 inDuckedLevel,
-                          const AudioTimeStamp* __nullable inStartTime,
-                          Float32 inRampDuration) __attribute__((weak_import));
-+#endif
- }
- 
- void UndoDucking(AudioDeviceID output_device_id) {
-+#ifndef MAS_BUILD
-   if (AudioDeviceDuck != nullptr) {
-     // Ramp the volume back up over half a second.
-     AudioDeviceDuck(output_device_id, 1.0, nullptr, 0.5);
-   }
-+#endif
- }
- 
- }  // namespace
-diff --git a/sandbox/mac/sandbox_logging.cc b/sandbox/mac/sandbox_logging.cc
-index 702224dce1871c07b07f6882e46d14fe532d6ed2..797cb6646171486797a5e5fbbb1b187e3a9f81d4 100644
---- a/sandbox/mac/sandbox_logging.cc
-+++ b/sandbox/mac/sandbox_logging.cc
-@@ -32,9 +32,11 @@
-   }
- #endif
- 
-+#if !defined(MAS_BUILD)
- extern "C" {
- void abort_report_np(const char*, ...);
- }
-+#endif
- 
- namespace sandbox {
- 
-@@ -104,9 +106,11 @@ void SendAslLog(Level level, const char* message) {
-   asl_set(asl_message.get(), ASL_KEY_MSG, message);
-   asl_send(asl_client.get(), asl_message.get());
- 
-+#if !defined(MAS_BUILD)
-   if (level == Level::FATAL) {
-     abort_report_np(message);
-   }
-+#endif
- }
- 
- // |error| is strerror(errno) when a P* logging function is called. Pass
-diff --git a/sandbox/mac/system_services.cc b/sandbox/mac/system_services.cc
-index 9f5261425162791668c2d15b7ffba091f831d652..c37f3dc05cb8372c7a6c4caef7a280b6f2f48e98 100644
---- a/sandbox/mac/system_services.cc
-+++ b/sandbox/mac/system_services.cc
-@@ -9,6 +9,7 @@
- 
- #include "base/mac/mac_logging.h"
- 
-+#if !defined(MAS_BUILD)
- extern "C" {
- OSStatus SetApplicationIsDaemon(Boolean isDaemon);
- void _LSSetApplicationLaunchServicesServerConnectionStatus(
-@@ -19,10 +20,12 @@ void _LSSetApplicationLaunchServicesServerConnectionStatus(
- // https://github.com/WebKit/webkit/commit/8da694b0b3febcc262653d01a45e946ce91845ed.
- void _CSCheckFixDisable() API_AVAILABLE(macosx(10.15));
- }  // extern "C"
-+#endif
- 
- namespace sandbox {
- 
- void DisableLaunchServices() {
-+  #if !defined(MAS_BUILD)
-   // Allow the process to continue without a LaunchServices ASN. The
-   // INIT_Process function in HIServices will abort if it cannot connect to
-   // launchservicesd to get an ASN. By setting this flag, HIServices skips
-@@ -36,12 +39,15 @@ void DisableLaunchServices() {
-       0, ^bool(CFDictionaryRef options) {
-         return false;
-       });
-+  #endif
- }
- 
- void DisableCoreServicesCheckFix() {
-+#if !defined(MAS_BUILD)
-   if (__builtin_available(macOS 10.15, *)) {
-     _CSCheckFixDisable();
-   }
-+#endif
- }
- 
- }  // namespace sandbox

patches/chromium/mas_avoid_usage_of_pthread_fchdir_np.patch

@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@slack-corp.com>
+Date: Mon, 4 Mar 2019 14:46:48 -0800
+Subject: mas: avoid usage of pthread_fchdir_np
+
+Disable usage of pthread_fchdir_np and pthread_chdir_np in MAS builds.
+
+diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
+index 184cfa25dbc6cfa2a32be3f8d964ea359254f807..c9bfc4d8ca1408206244305d7634dcd51e99377c 100644
+--- a/base/process/launch_mac.cc
++++ b/base/process/launch_mac.cc
+@@ -26,8 +26,10 @@ extern "C" {
+ // descriptor. libpthread only exposes a syscall wrapper starting in
+ // macOS 10.12, but the system call dates back to macOS 10.5. On older OSes,
+ // the syscall is issued directly.
++#if !defined(MAS_BUILD)
+ int pthread_chdir_np(const char* dir) API_AVAILABLE(macosx(10.12));
+ int pthread_fchdir_np(int fd) API_AVAILABLE(macosx(10.12));
++#endif
+ 
+ int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
+     API_AVAILABLE(macosx(10.14));
+@@ -96,21 +98,29 @@ class PosixSpawnFileActions {
+ };
+ 
+ int ChangeCurrentThreadDirectory(const char* path) {
++  #if defined(MAS_BUILD)
++  return syscall(SYS___pthread_chdir, path);
++  #else
+   if (__builtin_available(macOS 10.12, *)) {
+     return pthread_chdir_np(path);
+   } else {
+     return syscall(SYS___pthread_chdir, path);
+   }
++  #endif
+ }
+ 
+ // The recommended way to unset a per-thread cwd is to set a new value to an
+ // invalid file descriptor, per libpthread-218.1.3/private/private.h.
+ int ResetCurrentThreadDirectory() {
++  #if defined(MAS_BUILD)
++  return syscall(SYS___pthread_fchdir, -1);
++  #else
+   if (__builtin_available(macOS 10.12, *)) {
+     return pthread_fchdir_np(-1);
+   } else {
+     return syscall(SYS___pthread_fchdir, -1);
+   }
++  #endif
+ }
+ 
+ struct GetAppOutputOptions {
+@@ -230,11 +240,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
+     file_actions.Inherit(STDERR_FILENO);
+   }
+ 
++#if 0
+   if (options.disclaim_responsibility) {
+     if (__builtin_available(macOS 10.14, *)) {
+       DPSXCHECK(responsibility_spawnattrs_setdisclaim(attr.get(), 1));
+     }
+   }
++#endif
+ 
+   std::vector<char*> argv_cstr;
+   argv_cstr.reserve(argv.size() + 1);

patches/chromium/mas_avoid_usage_of_setapplicationisdaemon_and.patch

@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@slack-corp.com>
+Date: Mon, 4 Mar 2019 14:51:45 -0800
+Subject: mas: avoid usage of SetApplicationIsDaemon and
+ _LSSetApplicationLaunchServicesServerConnectionStatus
+
+Disable usage of SetApplicationIsDaemon and
+_LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds
+
+diff --git a/sandbox/mac/system_services.cc b/sandbox/mac/system_services.cc
+index 9f5261425162791668c2d15b7ffba091f831d652..c37f3dc05cb8372c7a6c4caef7a280b6f2f48e98 100644
+--- a/sandbox/mac/system_services.cc
++++ b/sandbox/mac/system_services.cc
+@@ -9,6 +9,7 @@
+ 
+ #include "base/mac/mac_logging.h"
+ 
++#if !defined(MAS_BUILD)
+ extern "C" {
+ OSStatus SetApplicationIsDaemon(Boolean isDaemon);
+ void _LSSetApplicationLaunchServicesServerConnectionStatus(
+@@ -19,10 +20,12 @@ void _LSSetApplicationLaunchServicesServerConnectionStatus(
+ // https://github.com/WebKit/webkit/commit/8da694b0b3febcc262653d01a45e946ce91845ed.
+ void _CSCheckFixDisable() API_AVAILABLE(macosx(10.15));
+ }  // extern "C"
++#endif
+ 
+ namespace sandbox {
+ 
+ void DisableLaunchServices() {
++  #if !defined(MAS_BUILD)
+   // Allow the process to continue without a LaunchServices ASN. The
+   // INIT_Process function in HIServices will abort if it cannot connect to
+   // launchservicesd to get an ASN. By setting this flag, HIServices skips
+@@ -36,12 +39,15 @@ void DisableLaunchServices() {
+       0, ^bool(CFDictionaryRef options) {
+         return false;
+       });
++  #endif
+ }
+ 
+ void DisableCoreServicesCheckFix() {
++#if !defined(MAS_BUILD)
+   if (__builtin_available(macOS 10.15, *)) {
+     _CSCheckFixDisable();
+   }
++#endif
+ }
+ 
+ }  // namespace sandbox

patches/chromium/mas_gate_private_enterprise_APIs.patch

@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: VerteDinde <khammond@slack-corp.com>
+Date: Tue, 19 Oct 2021 16:56:25 -0700
+Subject: fix: mas gate private enterprise APIs
+
+Beginning in Electron 15.2.0, Chromium moved several formerly public
+APIs into the AreDeviceAndUserJoinedToDomain method. Using these APIs
+in a MAS build will result in rejection from the Apple Store. This
+patch gates those APIs to non-MAS builds to comply with Apple
+Store requirements, and returns the default state for MAS builds.
+
+diff --git a/base/enterprise_util_mac.mm b/base/enterprise_util_mac.mm
+index bbb851e1cafb37ebaa67e4577598fab25c90fde6..6ab12e5505b5ba545e7e0cc8c93d3ba9a6d0bacc 100644
+--- a/base/enterprise_util_mac.mm
++++ b/base/enterprise_util_mac.mm
+@@ -168,6 +168,13 @@ MacDeviceManagementStateNew IsDeviceRegisteredWithManagementNew() {
+ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
+   static DeviceUserDomainJoinState state = [] {
+     DeviceUserDomainJoinState state{false, false};
++#if defined(MAS_BUILD)
++    return state;
++  }();
++
++  return state;
++}
++#else
+ 
+     @autoreleasepool {
+       ODSession* session = [ODSession defaultSession];
+@@ -274,5 +281,6 @@ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
+ 
+   return state;
+ }
++#endif
+ 
+ }  // namespace base

patches/chromium/picture-in-picture.patch

@@ -8,11 +8,50 @@ chrome's generated resources for our own. This updates the #include so that we
 don't get errors for Chrome's generated resources, which are non-existent
 because we don't generate them in our build.
 
+diff --git a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
+index 7bc8d118f87b91baf1c3bd1d34374996ab1d3638..2d2c1c86f311b07f0c2b09d5a4c082cc5599600c 100644
+--- a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
++++ b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
+@@ -5,7 +5,7 @@
+ #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
+ 
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
+ #include "ui/base/models/image_model.h"
+diff --git a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
+index d566dbf99ea1164c6a8407026a9839218a6ba1fb..239cd53d70c547c79214988a82efdc8c472d553c 100644
+--- a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
++++ b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
+@@ -5,7 +5,7 @@
+ #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
+ 
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/base/cursor/cursor.h"
+ #include "ui/base/l10n/l10n_util.h"
+diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
+index a3d9c0f03c8ade2553bad5721d4e15e6fd658074..b3b043cbf9144013bf7903121575b31b348ea87e 100644
+--- a/chrome/browser/ui/views/overlay/close_image_button.cc
++++ b/chrome/browser/ui/views/overlay/close_image_button.cc
+@@ -6,7 +6,7 @@
+ 
+ #include "build/chromeos_buildflags.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
+ #include "ui/base/models/image_model.h"
 diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-index 3309906bcae27ba89d73ce4fba49843a10cd31f6..987917a440480130d35f34f85c27ff7c27632fd9 100644
+index 3309906bcae27ba89d73ce4fba49843a10cd31f6..9f828f70606238186b35b5e1ca8751134eaf3c33 100644
 --- a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-@@ -15,15 +15,19 @@
+@@ -15,24 +15,28 @@
  #include "base/timer/timer.h"
  #include "build/build_config.h"
  #include "chrome/app/vector_icons/vector_icons.h"
@@ -32,6 +71,16 @@ index 3309906bcae27ba89d73ce4fba49843a10cd31f6..987917a440480130d35f34f85c27ff7c
  #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
  #include "chrome/browser/ui/views/overlay/close_image_button.h"
  #include "chrome/browser/ui/views/overlay/resize_handle_button.h"
+-#include "chrome/grit/generated_resources.h"
+ #include "components/omnibox/browser/location_bar_model_impl.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "content/public/browser/document_picture_in_picture_window_controller.h"
+ #include "content/public/browser/picture_in_picture_window_controller.h"
+ #include "content/public/browser/web_contents.h"
++#include "electron/grit/electron_resources.h"
+ #include "content/public/common/content_constants.h"
+ #include "media/base/media_switches.h"
+ #include "media/base/video_util.h"
 @@ -57,7 +61,7 @@
  #include "ui/aura/window.h"
  #endif
@@ -112,11 +161,24 @@ index b2b178ccadce82f8d4ec8e5a6dafe1c67bcecd74..603d82a461c4c443ac26c85a46fbd866
  
    // OverlayWindowViews
    bool ControlsHitTestContainsPoint(const gfx::Point& point) override;
+diff --git a/chrome/browser/ui/views/overlay/hang_up_button.cc b/chrome/browser/ui/views/overlay/hang_up_button.cc
+index 75bfe0f7a4d759f677cad5c365fa7f98121d54de..cb251381f1c77ad01d4906132f3d68865aaace10 100644
+--- a/chrome/browser/ui/views/overlay/hang_up_button.cc
++++ b/chrome/browser/ui/views/overlay/hang_up_button.cc
+@@ -6,7 +6,7 @@
+ 
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+ #include "chrome/browser/ui/views/overlay/constants.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-index 850b34e3b40f7ff1848c66158976db079e0853bd..74178fd4752e9c469d50ccafda61157acd9edd56 100644
+index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c36ad14705 100644
 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-@@ -14,9 +14,11 @@
+@@ -14,13 +14,15 @@
  #include "base/time/time.h"
  #include "base/timer/timer.h"
  #include "build/build_config.h"
@@ -124,10 +186,15 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..74178fd4752e9c469d50ccafda61157a
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
+-#include "chrome/grit/generated_resources.h"
 +#endif
- #include "chrome/grit/generated_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "content/public/browser/picture_in_picture_window_controller.h"
+ #include "content/public/browser/web_contents.h"
++#include "electron/grit/electron_resources.h"
+ #include "ui/base/hit_test.h"
+ #include "ui/display/display.h"
+ #include "ui/display/screen.h"
 @@ -36,7 +38,7 @@
  #include "ui/aura/window.h"
  #endif
@@ -137,8 +204,86 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..74178fd4752e9c469d50ccafda61157a
  #include "chrome/browser/shell_integration_win.h"
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
+diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
+index cb1621a9deefcec601d7537e2cc2fbd24e5f7f64..2d74ab12e1eaf77a6f9dde13e894172d6835e061 100644
+--- a/chrome/browser/ui/views/overlay/playback_image_button.cc
++++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
+@@ -7,7 +7,7 @@
+ #include "chrome/app/vector_icons/vector_icons.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+ #include "chrome/browser/ui/views/overlay/constants.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
+diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc
+index 8bf217b9b0c2bd22d6940c24c58eccb9865c5286..91f061a1243135db475371dda00c2fe054f4e8e3 100644
+--- a/chrome/browser/ui/views/overlay/resize_handle_button.cc
++++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
+@@ -6,7 +6,7 @@
+ 
+ #include "chrome/app/vector_icons/vector_icons.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "ui/base/hit_test.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
+diff --git a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
+index 51c7db1bfbd3c03b9cb2786c8c7482b33e3aca0b..2890f7420d2fd258f84019963eab6c9606e228db 100644
+--- a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
++++ b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
+@@ -5,7 +5,7 @@
+ #include "chrome/browser/ui/views/overlay/skip_ad_label_button.h"
+ 
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
+ #include "ui/gfx/color_palette.h"
+diff --git a/chrome/browser/ui/views/overlay/toggle_camera_button.cc b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
+index 20b82ff4dcf7fef3315b2b47bb480446509c6541..244a50e57b6c12680405c92f0ecbdbdb8bcfcb4f 100644
+--- a/chrome/browser/ui/views/overlay/toggle_camera_button.cc
++++ b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
+@@ -6,7 +6,7 @@
+ 
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+ #include "chrome/browser/ui/views/overlay/constants.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
+diff --git a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
+index 1a1edb6321490fdbf5cd347cb3d2cb9a6a5b1080..1e959cf1c8fe356ab4427e4bf4f8da1028f4575f 100644
+--- a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
++++ b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
+@@ -6,7 +6,7 @@
+ 
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+ #include "chrome/browser/ui/views/overlay/constants.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
+diff --git a/chrome/browser/ui/views/overlay/track_image_button.cc b/chrome/browser/ui/views/overlay/track_image_button.cc
+index 5e136488b37887e9523ac04a9ff4ccdfaf96c104..24899f4c2b6fe66b96a6728bf747f1aad66f20a9 100644
+--- a/chrome/browser/ui/views/overlay/track_image_button.cc
++++ b/chrome/browser/ui/views/overlay/track_image_button.cc
+@@ -6,7 +6,7 @@
+ 
+ #include "chrome/app/vector_icons/vector_icons.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
+-#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index c24fdd1360e582293a8b21b2f29dc6bc02b564c9..b9b2b4aa7d168cd7a83c36edbe4f7dc30565c921 100644
+index c24fdd1360e582293a8b21b2f29dc6bc02b564c9..24bb07ae2efaad2e7f5957a73585885168349109 100644
 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 @@ -15,9 +15,11 @@
@@ -153,6 +298,18 @@ index c24fdd1360e582293a8b21b2f29dc6bc02b564c9..b9b2b4aa7d168cd7a83c36edbe4f7dc3
  #include "chrome/browser/ui/color/chrome_color_id.h"
  #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
  #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
+@@ -29,10 +31,10 @@
+ #include "chrome/browser/ui/views/overlay/toggle_camera_button.h"
+ #include "chrome/browser/ui/views/overlay/toggle_microphone_button.h"
+ #include "chrome/browser/ui/views/overlay/track_image_button.h"
+-#include "chrome/grit/generated_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "content/public/browser/video_picture_in_picture_window_controller.h"
+ #include "content/public/browser/web_contents.h"
++#include "electron/grit/electron_resources.h"
+ #include "media/base/media_switches.h"
+ #include "media/base/video_util.h"
+ #include "third_party/skia/include/core/SkColor.h"
 @@ -56,7 +58,7 @@
  #include "ui/aura/window.h"
  #endif

patches/chromium/printing.patch

@@ -69,7 +69,7 @@ index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471
      NEW_DOC,
  
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index f989f040cb9ff6df001225057202fb1653ade9fc..8a7dd2a4c4e9f5c778a8a35658cb55883ea5fae5 100644
+index f989f040cb9ff6df001225057202fb1653ade9fc..9430feb1d90667bbdbbb2c9f419936c9fb679dca 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -84,7 +84,7 @@ index f989f040cb9ff6df001225057202fb1653ade9fc..8a7dd2a4c4e9f5c778a8a35658cb5588
  #include "content/public/browser/global_routing_id.h"
  #include "content/public/browser/render_frame_host.h"
  #include "content/public/browser/web_contents.h"
-+#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
@@ -127,7 +127,7 @@ index 02dfcad0c6b208f7df4d2b10112739554f6ab75c..0774aa95ee1521b0e76fe72d8d9e8de4
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b1071921e7cabb4 100644
+index 3a3f733c45e08e461a74d2458172c38ec0e572bf..2c04243257e72825a7fa6d8956045cb4a81d835e 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,10 +30,10 @@
@@ -147,7 +147,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
  #include "content/public/browser/render_process_host.h"
  #include "content/public/browser/render_view_host.h"
  #include "content/public/browser/web_contents.h"
-+#include "chrome/grit/generated_resources.h"
++#include "electron/grit/electron_resources.h"
  #include "mojo/public/cpp/system/buffer.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/metafile_skia.h"

patches/node/.patches

@@ -10,7 +10,10 @@ refactor_allow_embedder_overriding_of_internal_fs_calls.patch
 chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
 chore_add_context_to_context_aware_module_prevention.patch
 chore_read_nobrowserglobals_from_global_not_process.patch
+enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
 fix_handle_boringssl_and_openssl_incompatibilities.patch
+fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
+fix_allow_preventing_initializeinspector_in_env.patch
 src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
 fix_crypto_tests_to_run_with_bssl.patch
 fix_account_for_debugger_agent_race_condition.patch
@@ -19,6 +22,7 @@ fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch
 chore_fix_-wimplicit-fallthrough.patch
 fix_crash_caused_by_gethostnamew_on_windows_7.patch
 fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
+fix_don_t_create_console_window_when_creating_process.patch
 fix_serdes_test.patch
 darwin_remove_eprototype_error_workaround_3405.patch
 darwin_translate_eprototype_to_econnreset_3413.patch
@@ -40,4 +44,3 @@ process_fix_hang_after_note_exit_3521.patch
 feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
 fix_preserve_proper_method_names_as-is_in_error_stack.patch
 macos_avoid_posix_spawnp_cwd_bug_3597.patch
-fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch

patches/node/build_add_gn_build_files.patch

@@ -7,10 +7,10 @@ This adds GN build files for Node, so we don't have to build with GYP.
 
 diff --git a/BUILD.gn b/BUILD.gn
 new file mode 100644
-index 0000000000000000000000000000000000000000..4afca42d22ee702af50da92aa08c1de897891424
+index 0000000000000000000000000000000000000000..bd5788caa61305fd9af8f9d7f8f1937a224fda83
 --- /dev/null
 +++ b/BUILD.gn
-@@ -0,0 +1,403 @@
+@@ -0,0 +1,394 @@
 +import("//electron/build/asar.gni")
 +import("//v8/gni/v8.gni")
 +
@@ -192,15 +192,6 @@ index 0000000000000000000000000000000000000000..4afca42d22ee702af50da92aa08c1de8
 +  }
 +}
 +
-+executable("overlapped-checker") {
-+  sources = []
-+  if (is_win) {
-+    sources += [ "test/overlapped-checker/main_win.c" ]
-+  } else {
-+    sources += [ "test/overlapped-checker/main_unix.c" ]
-+  }
-+}
-+
 +component("node_lib") {
 +  deps = [
 +    ":node_js2c",
@@ -973,10 +964,10 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
 +}
 diff --git a/filenames.json b/filenames.json
 new file mode 100644
-index 0000000000000000000000000000000000000000..a2cfdffcd7308b73c5c302ebc4b946c6de1bd518
+index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424afb63ca5
 --- /dev/null
 +++ b/filenames.json
-@@ -0,0 +1,616 @@
+@@ -0,0 +1,612 @@
 +// This file is automatically generated by generate_gn_filenames_json.py
 +// DO NOT EDIT
 +{
@@ -1233,7 +1224,6 @@ index 0000000000000000000000000000000000000000..a2cfdffcd7308b73c5c302ebc4b946c6
 +    "lib/internal/cluster/primary.js",
 +    "lib/internal/cluster/utils.js",
 +    "lib/internal/cluster/child.js",
-+    "lib/internal/webstreams/compression.js",
 +    "lib/internal/webstreams/util.js",
 +    "lib/internal/webstreams/writablestream.js",
 +    "lib/internal/webstreams/readablestream.js",
@@ -1315,7 +1305,6 @@ index 0000000000000000000000000000000000000000..a2cfdffcd7308b73c5c302ebc4b946c6
 +    "lib/internal/modules/package_json_reader.js",
 +    "lib/internal/modules/esm/module_job.js",
 +    "lib/internal/modules/esm/assert.js",
-+    "lib/internal/modules/esm/fetch_module.js",
 +    "lib/internal/modules/esm/get_source.js",
 +    "lib/internal/modules/esm/translators.js",
 +    "lib/internal/modules/esm/resolve.js",
@@ -1325,7 +1314,6 @@ index 0000000000000000000000000000000000000000..a2cfdffcd7308b73c5c302ebc4b946c6
 +    "lib/internal/modules/esm/initialize_import_meta.js",
 +    "lib/internal/modules/esm/module_map.js",
 +    "lib/internal/modules/esm/get_format.js",
-+    "lib/internal/modules/esm/formats.js",
 +    "lib/internal/modules/esm/loader.js",
 +    "lib/internal/modules/cjs/helpers.js",
 +    "lib/internal/modules/cjs/loader.js",
@@ -1384,8 +1372,7 @@ index 0000000000000000000000000000000000000000..a2cfdffcd7308b73c5c302ebc4b946c6
 +    "deps/acorn/acorn/dist/acorn.js",
 +    "deps/acorn/acorn-walk/dist/walk.js",
 +    "deps/cjs-module-lexer/lexer.js",
-+    "deps/cjs-module-lexer/dist/lexer.js",
-+    "deps/undici/undici.js"
++    "deps/cjs-module-lexer/dist/lexer.js"
 +  ],
 +  "node_sources": [
 +    "src/api/async_resource.cc",
@@ -1799,7 +1786,7 @@ index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb30483
 +  args = rebase_path(inputs + outputs, root_build_dir)
 +}
 diff --git a/src/node_version.h b/src/node_version.h
-index 29c9be6366d63be7b340b35cea141e4d7e7f71cc..587735f2ddc0e5d93edd8644d121c6fb31fc4378 100644
+index 41081f82714169f3bf388c3a8c2d9aa78e21a3f4..48c0d2655789a0528dfea0a60f756aacb48a6f60 100644
 --- a/src/node_version.h
 +++ b/src/node_version.h
 @@ -89,7 +89,10 @@

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/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index b184a0d9ae3434af746be269495e9e4c80c58091..899d5a906683e8967746e10a6de452e99e236903 100644
+index 3c5e6fe40070f52d8b3f4e9757485845c1d6dbed..2af6b11c97ecdca3c40792ab35c69b07b9db76a0 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -103,11 +103,13 @@ function patchProcessObject(expandArgv1) {
+@@ -95,11 +95,13 @@ function patchProcessObject(expandArgv1) {
    if (expandArgv1 && process.argv[1] &&
        !StringPrototypeStartsWith(process.argv[1], '-')) {
      // Expand process.argv[1] into a full path.
@@ -31,10 +31,10 @@ index b184a0d9ae3434af746be269495e9e4c80c58091..899d5a906683e8967746e10a6de452e9
    }
  
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index 5195ff2da0496f2bfb9112d336c38040f662087b..5c62e367f2dd7d112096551f1c34ee67ce1a5c3a 100644
+index caca939942cb721a3efde7005b0a987a19237a8b..2d30a56a87ff8657cddb3d9e6af5bd9f81deffdb 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -1079,6 +1079,13 @@ Module.prototype._compile = function(content, filename) {
+@@ -1077,6 +1077,13 @@ Module.prototype._compile = function(content, filename) {
    if (getOptionValue('--inspect-brk') && process._eval == null) {
      if (!resolvedArgv) {
        // We enter the repl if we're not given a filename argument.

patches/node/chore_fix_-wimplicit-fallthrough.patch

@@ -18,10 +18,10 @@ index 8bfecba74d4d90e9fbf0e2cd301118e4adc6cba8..63e1149f0c4a39cb944114e5824d6074
      "-Wno-unreachable-code-return",
      "-Wno-unused-but-set-variable",
 diff --git a/deps/nghttp2/lib/nghttp2_hd.c b/deps/nghttp2/lib/nghttp2_hd.c
-index 30ee9b88920c0a0bb8f8b714e3deabe0207cac40..010edf48f614c23e971df0f37716275cc1656469 100644
+index 5e8693152599215261e47b152d565bbd9a0083e7..6d54e91dea6d77ad8925ad0452fd2a0a36f35f73 100644
 --- a/deps/nghttp2/lib/nghttp2_hd.c
 +++ b/deps/nghttp2/lib/nghttp2_hd.c
-@@ -1892,7 +1892,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
+@@ -1891,7 +1891,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
          rv = NGHTTP2_ERR_HEADER_COMP;
          goto fail;
        }
@@ -30,7 +30,7 @@ index 30ee9b88920c0a0bb8f8b714e3deabe0207cac40..010edf48f614c23e971df0f37716275c
      case NGHTTP2_HD_STATE_INFLATE_START:
      case NGHTTP2_HD_STATE_OPCODE:
        if ((*in & 0xe0u) == 0x20u) {
-@@ -2002,7 +2002,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
+@@ -2001,7 +2001,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
        inflater->left = 0;
        inflater->shift = 0;
        DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
@@ -39,7 +39,7 @@ index 30ee9b88920c0a0bb8f8b714e3deabe0207cac40..010edf48f614c23e971df0f37716275c
      case NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN:
        rfin = 0;
        rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
-@@ -2086,7 +2086,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
+@@ -2085,7 +2085,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
        inflater->left = 0;
        inflater->shift = 0;
        DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
@@ -49,7 +49,7 @@ index 30ee9b88920c0a0bb8f8b714e3deabe0207cac40..010edf48f614c23e971df0f37716275c
        rfin = 0;
        rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
 diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
-index 380a47c1b1e82b015c271e2818aed0baf982aa2d..2f3997709cd07f6f8294f985f60b2e1e4b85a2cf 100644
+index 36f1179f72a22595dda0b98927d87e2098cad4df..f007dbf410b1bdc5d1f603aa85c3a4f0704e9741 100644
 --- a/deps/nghttp2/lib/nghttp2_session.c
 +++ b/deps/nghttp2/lib/nghttp2_session.c
 @@ -2644,10 +2644,10 @@ static int session_after_frame_sent1(nghttp2_session *session) {

patches/node/chore_read_nobrowserglobals_from_global_not_process.patch

@@ -7,7 +7,7 @@ This is used so that we can modify the flag at runtime where
 config can only be set at compile time.
 
 diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
-index 8c31d0202b70ec9784b4289a175a62fd9fd85f8c..2b4c7a933d7f87050f7342e6c3ae2070e3dde030 100644
+index 085dd7e09d31fb1800b3596cc068637e1956ba52..9e0f811b2a37f45a9d8162dff7c9d5c935b856d6 100644
 --- a/lib/internal/bootstrap/node.js
 +++ b/lib/internal/bootstrap/node.js
 @@ -209,7 +209,7 @@ const {

patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Apthorp <nornagon@nornagon.net>
+Date: Tue, 10 Dec 2019 15:02:21 -0800
+Subject: enable 31 bit smis on 64bit arch and ptr compression
+
+This aligns with the defaults set on the Chromium build. Without this, native
+node modules will have different (wrong) ideas about how v8 structs are laid
+out in memory on 64-bit machines, and will summarily fail to work.
+
+diff --git a/common.gypi b/common.gypi
+index b86c3f3bbeddfa57c223ff066451fd3e1ce1315d..59e6a857060a35ca52cff2b44bc412a3f5e8eece 100644
+--- a/common.gypi
++++ b/common.gypi
+@@ -64,7 +64,7 @@
+     # options but default values are required here as this file is also used by
+     # node-gyp to build addons.
+     'v8_enable_pointer_compression%': 0,
+-    'v8_enable_31bit_smis_on_64bit_arch%': 0,
++    'v8_enable_31bit_smis_on_64bit_arch%': 1,
+ 
+     # Disable V8 untrusted code mitigations.
+     # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
+@@ -130,6 +130,9 @@
+         'v8_enable_pointer_compression': 0,
+         'v8_enable_31bit_smis_on_64bit_arch': 0,
+       }],
++      ['target_arch == "arm64" or target_arch == "x64"', {
++        'v8_enable_pointer_compression': 1,
++      }],
+       ['target_arch in "ppc64 s390x"', {
+         'v8_enable_backtrace': 1,
+       }],

patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch

@@ -7,11 +7,11 @@ Subject: feat: add kNoStartDebugSignalHandler to Environment to prevent
 This patch should be upstreamed, it allows embedders to prevent the call to StartDebugSignalHandler which handles SIGUSR1 and starts the inspector agent.  Apps that have --inspect disabled also don't want SIGUSR1 to have this affect.
 
 diff --git a/src/env-inl.h b/src/env-inl.h
-index 4a34393cad7e071bf27947418be6b3d9bdd42f98..b9834a797c89f707d1e4978587af66ebf11591d4 100644
+index 2da8174fe9e4209f4705af0a1cf8bca5928f088c..954602f3fc7c3344509bb57530840bb1dfeacab3 100644
 --- a/src/env-inl.h
 +++ b/src/env-inl.h
-@@ -886,6 +886,10 @@ inline bool Environment::no_global_search_paths() const {
-          !options_->global_search_paths;
+@@ -886,6 +886,10 @@ inline bool Environment::should_initialize_inspector() const {
+   return (flags_ & EnvironmentFlags::kNoInitializeInspector) == 0;
  }
  
 +inline bool Environment::should_start_debug_signal_handler() const {
@@ -22,22 +22,22 @@ index 4a34393cad7e071bf27947418be6b3d9bdd42f98..b9834a797c89f707d1e4978587af66eb
    return emit_filehandle_warning_;
  }
 diff --git a/src/env.h b/src/env.h
-index cda7a52fa1ffc66d7ba42de3a275f49093f8557d..86f3c718ada13ee71e5af87e1b3772f39274cf43 100644
+index 2554c530f2ca7078ed0cca03968b31f56027231b..1fbf965788f9c68d2999f38b40d39579f746d768 100644
 --- a/src/env.h
 +++ b/src/env.h
 @@ -1216,6 +1216,7 @@ class Environment : public MemoryRetainer {
-   inline bool tracks_unmanaged_fds() const;
    inline bool hide_console_windows() const;
    inline bool no_global_search_paths() const;
+   inline bool should_initialize_inspector() const;
 +  inline bool should_start_debug_signal_handler() const;
    inline uint64_t thread_id() const;
    inline worker::Worker* worker_context() const;
    Environment* worker_parent_env() const;
 diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
-index 5fc533741d7c8d7a8471b3c3c6a334c0e9e43501..2c36a0b132cf1b21595ac39619b99d316ad81d9e 100644
+index fd9f514b9b6a7b7b1c1a6f5fe834f51266156596..14565f6885b3f88194b3b8efb340a4099ca1966c 100644
 --- a/src/inspector_agent.cc
 +++ b/src/inspector_agent.cc
-@@ -690,8 +690,10 @@ bool Agent::Start(const std::string& path,
+@@ -680,8 +680,10 @@ bool Agent::Start(const std::string& path,
                                StartIoThreadAsyncCallback));
      uv_unref(reinterpret_cast<uv_handle_t*>(&start_io_thread_async));
      start_io_thread_async.data = this;
@@ -51,19 +51,19 @@ index 5fc533741d7c8d7a8471b3c3c6a334c0e9e43501..2c36a0b132cf1b21595ac39619b99d31
      parent_env_->AddCleanupHook([](void* data) {
        Environment* env = static_cast<Environment*>(data);
 diff --git a/src/node.h b/src/node.h
-index 0a9f5139276eb2e102b41a586adf61fa563b47d6..0b807cb25f9eb52b2100f0e2a7c25344790967cf 100644
+index b2b766f242e02593631be087fceaf63f71d74284..535df2d8dfb48ddc4d01e94565fdc527aed15ef7 100644
 --- a/src/node.h
 +++ b/src/node.h
-@@ -445,7 +445,11 @@ enum Flags : uint64_t {
+@@ -444,7 +444,11 @@ enum Flags : uint64_t {
+   // Controls whether or not the Environment should call InitializeInspector.
    // This control is needed by embedders who may not want to initialize the V8
-   // inspector in situations where one has already been created,
-   // e.g. Blink's in Chromium.
--  kNoCreateInspector = 1 << 9
-+  kNoCreateInspector = 1 << 9,
+   // inspector in situations where it already exists.
+-  kNoInitializeInspector = 1 << 8
++  kNoInitializeInspector = 1 << 8,
 +  // Controls where or not the InspectorAgent for this Environment should
 +  // call StartDebugSignalHandler.  This control is needed by embedders who may
 +  // not want to allow other processes to start the V8 inspector.
-+  kNoStartDebugSignalHandler = 1 << 10
++  kNoStartDebugSignalHandler = 1 << 9
  };
  }  // namespace EnvironmentFlags
  

patches/node/feat_initialize_asar_support.patch

@@ -6,10 +6,10 @@ Subject: feat: initialize asar support
 This patch initializes asar support in Node.js.
 
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index 8de57a5666131ff0c9f7ad844498e1bd3c357a70..b184a0d9ae3434af746be269495e9e4c80c58091 100644
+index f21ba048b4863863e6c7b740f410775776a7649a..3c5e6fe40070f52d8b3f4e9757485845c1d6dbed 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -84,6 +84,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
+@@ -76,6 +76,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
    assert(!CJSLoader.hasLoadedAnyUserCJSModule);
    loadPreloadModules();
    initializeFrozenIntrinsics();
@@ -17,7 +17,7 @@ index 8de57a5666131ff0c9f7ad844498e1bd3c357a70..b184a0d9ae3434af746be269495e9e4c
  }
  
  function patchProcessObject(expandArgv1) {
-@@ -540,6 +541,10 @@ function loadPreloadModules() {
+@@ -477,6 +478,10 @@ function loadPreloadModules() {
    }
  }
  

patches/node/fix_add_default_values_for_variables_in_common_gypi.patch

@@ -7,10 +7,10 @@ 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 bdc2c105abeddc4c8e434ead05ebc0d7d82cfae8..3fd1d4ddddc109dfd87f4ba6115948f1c31b1261 100644
+index be30169cf58d9759320f1763ede7e0ce89be3aa2..b86c3f3bbeddfa57c223ff066451fd3e1ce1315d 100644
 --- a/common.gypi
 +++ b/common.gypi
-@@ -84,6 +84,23 @@
+@@ -81,6 +81,23 @@
  
      ##### end V8 defaults #####
  

patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch

@@ -6,14 +6,21 @@ Subject: fix: add v8_enable_reverse_jsargs defines in common.gypi
 This can be removed once node upgrades V8 and inevitably has to do this exact same thing.  Also hi node people if you are looking at this.
 
 diff --git a/common.gypi b/common.gypi
-index 3fd1d4ddddc109dfd87f4ba6115948f1c31b1261..fd4e0b38eb6ecf81b23186ec663499d1e685fdf8 100644
+index 59e6a857060a35ca52cff2b44bc412a3f5e8eece..7741f97758282d1c601eecf263cb4ce1510be284 100644
 --- a/common.gypi
 +++ b/common.gypi
-@@ -82,6 +82,8 @@
+@@ -65,6 +65,7 @@
+     # node-gyp to build addons.
+     'v8_enable_pointer_compression%': 0,
+     'v8_enable_31bit_smis_on_64bit_arch%': 1,
++    'v8_enable_reverse_jsargs%': 1,
+ 
+     # Disable V8 untrusted code mitigations.
+     # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
+@@ -79,6 +80,7 @@
      # TODO(refack): make v8-perfetto happen
      'v8_use_perfetto': 0,
  
-+    'v8_enable_reverse_jsargs%': 1,
 +
      ##### end V8 defaults #####
  

patches/node/fix_allow_preventing_initializeinspector_in_env.patch

@@ -0,0 +1,81 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Tue, 22 Sep 2020 19:44:30 -0700
+Subject: fix: allow preventing InitializeInspector in env
+
+https://github.com/nodejs/node/commit/8c5ad1392f30cfe6b107e9bd85f4cb918ba04aab
+made it such that env->InitializeInspector was called in CreateEnvironment
+no matter what, which creates an issue for Electron, as the V8 inspector
+already exists in the renderer process and therefore we only want to
+initialize it in the browser process. This adds a new
+EnvironmentFlags option which allows preventing that invocation.
+
+diff --git a/src/api/environment.cc b/src/api/environment.cc
+index 523d252e08974a10f9a53fb46d3345669cec3380..5bf19a0dda42849159d954181058897c45d280fd 100644
+--- a/src/api/environment.cc
++++ b/src/api/environment.cc
+@@ -344,12 +344,14 @@ Environment* CreateEnvironment(
+   Environment* env = new Environment(
+       isolate_data, context, args, exec_args, nullptr, flags, thread_id);
+ #if HAVE_INSPECTOR
+-  if (inspector_parent_handle) {
+-    env->InitializeInspector(
+-        std::move(static_cast<InspectorParentHandleImpl*>(
+-            inspector_parent_handle.get())->impl));
+-  } else {
+-    env->InitializeInspector({});
++  if (env->should_initialize_inspector()) {
++    if (inspector_parent_handle) {
++      env->InitializeInspector(
++          std::move(static_cast<InspectorParentHandleImpl*>(
++              inspector_parent_handle.get())->impl));
++    } else {
++      env->InitializeInspector({});
++    }
+   }
+ #endif
+ 
+diff --git a/src/env-inl.h b/src/env-inl.h
+index e679780900abc9f6b6d1d6baa52576df278be8c7..2da8174fe9e4209f4705af0a1cf8bca5928f088c 100644
+--- a/src/env-inl.h
++++ b/src/env-inl.h
+@@ -882,6 +882,10 @@ inline bool Environment::no_global_search_paths() const {
+          !options_->global_search_paths;
+ }
+ 
++inline bool Environment::should_initialize_inspector() const {
++  return (flags_ & EnvironmentFlags::kNoInitializeInspector) == 0;
++}
++
+ bool Environment::filehandle_close_warning() const {
+   return emit_filehandle_warning_;
+ }
+diff --git a/src/env.h b/src/env.h
+index 7aa5822abf11f1858d1ef8551cfc7a8c3d931f1e..2554c530f2ca7078ed0cca03968b31f56027231b 100644
+--- a/src/env.h
++++ b/src/env.h
+@@ -1215,6 +1215,7 @@ class Environment : public MemoryRetainer {
+   inline bool tracks_unmanaged_fds() const;
+   inline bool hide_console_windows() const;
+   inline bool no_global_search_paths() const;
++  inline bool should_initialize_inspector() const;
+   inline uint64_t thread_id() const;
+   inline worker::Worker* worker_context() const;
+   Environment* worker_parent_env() const;
+diff --git a/src/node.h b/src/node.h
+index 70518ba49b3bcbfaf2e46ba8ddc3f04236bc27b8..7ca7502e086190c87ae6a61dca2192253894e906 100644
+--- a/src/node.h
++++ b/src/node.h
+@@ -439,7 +439,11 @@ enum Flags : uint64_t {
+   // $HOME/.node_modules and $NODE_PATH. This is used by standalone apps that
+   // do not expect to have their behaviors changed because of globally
+   // installed modules.
+-  kNoGlobalSearchPaths = 1 << 7
++  kNoGlobalSearchPaths = 1 << 7,
++  // Controls whether or not the Environment should call InitializeInspector.
++  // This control is needed by embedders who may not want to initialize the V8
++  // inspector in situations where it already exists.
++  kNoInitializeInspector = 1 << 8
+ };
+ }  // namespace EnvironmentFlags
+ 

patches/node/fix_crypto_tests_to_run_with_bssl.patch

@@ -31,7 +31,7 @@ index 4e3c32fdcd23fbe3e74bd5e624b739d224689f33..19d65aae7fa8ec9f9b907733ead17a20
  // Test Parallel Execution w/ KeyObject is threadsafe in openssl3
  {
 diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js
-index 3749895769ffc9947143aee9aeb126628262bc84..f769fc37dbd81d5a0219236921e0bcb0de416463 100644
+index 21c5af6cfe3e5eef64fc2d4dcc63c55b1d79ad51..b21eb4b97ad778304b3a4e8d549e109614350dfb 100644
 --- a/test/parallel/test-crypto-authenticated.js
 +++ b/test/parallel/test-crypto-authenticated.js
 @@ -50,7 +50,9 @@ const errMessages = {
@@ -739,7 +739,7 @@ index d1782359277dc52d7a60830a6dd958544d610e6b..4c781f062bc505b860b821773070551f
 +  assert.match(legacyObject.serialNumber, legacyObjectCheck.serialNumberPattern);
  }
 diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js
-index a8ceb169de2b3de73f062083c42292babc673e73..a3bb574d0e5dc85b4ba3fb0b3bd8782fbb8c8700 100644
+index 58441be4d093f06cac3d47e2fa752f2354a49f8a..36a91946c8ad23250a47c433c1216ec9cb14f0e1 100644
 --- a/test/parallel/test-crypto.js
 +++ b/test/parallel/test-crypto.js
 @@ -67,7 +67,7 @@ assert.throws(() => {
@@ -769,16 +769,16 @@ index a8ceb169de2b3de73f062083c42292babc673e73..a3bb574d0e5dc85b4ba3fb0b3bd8782f
           !('opensslErrorStack' in err);
  });
  
-@@ -150,8 +150,6 @@ assert(crypto.getHashes().includes('sha1'));
+@@ -137,8 +137,6 @@ assert(crypto.getHashes().includes('sha1'));
  assert(crypto.getHashes().includes('sha256'));
  assert(!crypto.getHashes().includes('SHA1'));
  assert(!crypto.getHashes().includes('SHA256'));
 -assert(crypto.getHashes().includes('RSA-SHA1'));
 -assert(!crypto.getHashes().includes('rsa-sha1'));
  validateList(crypto.getHashes());
- // Make sure all of the hashes are supported by OpenSSL
- for (const algo of crypto.getHashes())
-@@ -188,7 +186,7 @@ const encodingError = {
+ 
+ // Assume that we have at least secp384r1.
+@@ -172,7 +170,7 @@ const encodingError = {
  // hex input that's not a power of two should throw, not assert in C++ land.
  ['createCipher', 'createDecipher'].forEach((funcName) => {
    assert.throws(
@@ -787,7 +787,7 @@ index a8ceb169de2b3de73f062083c42292babc673e73..a3bb574d0e5dc85b4ba3fb0b3bd8782f
      (error) => {
        assert.ok(!('opensslErrorStack' in error));
        if (common.hasFipsCrypto) {
-@@ -240,15 +238,15 @@ assert.throws(() => {
+@@ -224,15 +222,15 @@ assert.throws(() => {
      library: 'rsa routines',
    } : {
      name: 'Error',
@@ -808,7 +808,7 @@ index a8ceb169de2b3de73f062083c42292babc673e73..a3bb574d0e5dc85b4ba3fb0b3bd8782f
  if (!common.hasOpenSSL3) {
    assert.throws(() => {
      // The correct header inside `rsa_private_pkcs8_bad.pem` should have been
-@@ -276,7 +274,7 @@ if (!common.hasOpenSSL3) {
+@@ -260,7 +258,7 @@ if (!common.hasOpenSSL3) {
      return true;
    });
  }
@@ -1010,36 +1010,3 @@ index 1094845c73e14313860ad476fb7baba2a11b5af4..51972b4b34b191ac59145889dbf2da5c
  };
  
  function generateWrappingKeys() {
-diff --git a/test/parallel/test-x509-escaping.js b/test/parallel/test-x509-escaping.js
-index 99418e4c0bf21c26d5ba0ad9d617419abc625593..fc129b26ea13895353d6ede26bb2d91695c94ba4 100644
---- a/test/parallel/test-x509-escaping.js
-+++ b/test/parallel/test-x509-escaping.js
-@@ -425,11 +425,11 @@ const { hasOpenSSL3 } = common;
-   assert.strictEqual(certX509.subjectAltName, 'DNS:evil.example.com');
- 
-   // The newer X509Certificate API allows customizing this behavior:
--  assert.strictEqual(certX509.checkHost(servername), servername);
-+  assert.strictEqual(certX509.checkHost(servername), undefined);
-   assert.strictEqual(certX509.checkHost(servername, { subject: 'default' }),
-                      undefined);
-   assert.strictEqual(certX509.checkHost(servername, { subject: 'always' }),
--                     servername);
-+                     undefined);
-   assert.strictEqual(certX509.checkHost(servername, { subject: 'never' }),
-                      undefined);
- 
-@@ -464,11 +464,11 @@ const { hasOpenSSL3 } = common;
-   assert.strictEqual(certX509.subjectAltName, 'IP Address:1.2.3.4');
- 
-   // The newer X509Certificate API allows customizing this behavior:
--  assert.strictEqual(certX509.checkHost(servername), servername);
-+  assert.strictEqual(certX509.checkHost(servername), undefined);
-   assert.strictEqual(certX509.checkHost(servername, { subject: 'default' }),
--                     servername);
-+                     undefined);
-   assert.strictEqual(certX509.checkHost(servername, { subject: 'always' }),
--                     servername);
-+                     undefined);
-   assert.strictEqual(certX509.checkHost(servername, { subject: 'never' }),
-                      undefined);
- 

patches/node/fix_don_t_create_console_window_when_creating_process.patch

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Raymond Zhao <raymondzhao@microsoft.com>
+Date: Tue, 4 Jan 2022 16:11:41 -0800
+Subject: fix: Don't create console window when creating process
+
+This patch prevents console windows from being created during
+execSync calls, or spawnSync calls where shell is true. Otherwise,
+Windows users will see command prompts pop up for those calls.
+
+The patch has been upstreamed at https://github.com/nodejs/node/pull/41412.
+
+diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc
+index 1141aceae984fba6ed07cd272a79d4007b9b03fe..afd08519d7f8974adff4060513f6160519a0b6b3 100644
+--- a/src/spawn_sync.cc
++++ b/src/spawn_sync.cc
+@@ -810,6 +810,9 @@ Maybe<int> SyncProcessRunner::ParseOptions(Local<Value> js_value) {
+   if (js_win_hide->BooleanValue(isolate))
+     uv_process_options_.flags |= UV_PROCESS_WINDOWS_HIDE;
+ 
++  if (env()->hide_console_windows())
++    uv_process_options_.flags |= UV_PROCESS_WINDOWS_HIDE_CONSOLE;
++
+   Local<Value> js_wva =
+       js_options->Get(context, env()->windows_verbatim_arguments_string())
+           .ToLocalChecked();

patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch

@@ -7,10 +7,10 @@ Subject: fix: expose tracing::Agent and use tracing::TracingController instead
 This API is used by Electron to create Node's tracing controller.
 
 diff --git a/src/api/environment.cc b/src/api/environment.cc
-index 55b895c235f51eb7bcbd8cd4065b42a05208026a..1add2976e7c48e6704400b9ea0795b934ab0bfc2 100644
+index 0fb750c5abbe00740f2095ec397c823e26666199..523d252e08974a10f9a53fb46d3345669cec3380 100644
 --- a/src/api/environment.cc
 +++ b/src/api/environment.cc
-@@ -461,6 +461,10 @@ MultiIsolatePlatform* GetMultiIsolatePlatform(IsolateData* env) {
+@@ -459,6 +459,10 @@ MultiIsolatePlatform* GetMultiIsolatePlatform(IsolateData* env) {
    return env->platform();
  }
  
@@ -22,7 +22,7 @@ index 55b895c235f51eb7bcbd8cd4065b42a05208026a..1add2976e7c48e6704400b9ea0795b93
      int thread_pool_size,
      node::tracing::TracingController* tracing_controller) {
 diff --git a/src/node.h b/src/node.h
-index 966edcd041be1bded2c3a86e5734d2849019c372..9b9ff1c86ceeaeca828328065e2ad5573ea17fc5 100644
+index 5b1404ff8e290a505a1143b582494e9a3319a183..70518ba49b3bcbfaf2e46ba8ddc3f04236bc27b8 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -118,6 +118,7 @@ namespace node {
@@ -33,7 +33,7 @@ index 966edcd041be1bded2c3a86e5734d2849019c372..9b9ff1c86ceeaeca828328065e2ad557
  class TracingController;
  
  }
-@@ -523,6 +524,8 @@ NODE_EXTERN v8::MaybeLocal<v8::Value> PrepareStackTraceCallback(
+@@ -518,6 +519,8 @@ NODE_EXTERN v8::MaybeLocal<v8::Value> PrepareStackTraceCallback(
  NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(Environment* env);
  NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(IsolateData* env);
  

patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch

@@ -17,10 +17,10 @@ Upstreams:
 - https://github.com/nodejs/node/pull/39136
 
 diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
-index a5aa39c23c1708ac27564a1a77a9f05fc07791e2..630a3400e74f20b1dbee17027c7dbe8688fed4b2 100644
+index f830da2cfba18ae2f7ad02fa862122780c956c80..51b26af969d5c84c741563297fda45426038d199 100644
 --- a/src/crypto/crypto_common.cc
 +++ b/src/crypto/crypto_common.cc
-@@ -162,7 +162,7 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
+@@ -176,7 +176,7 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
    const unsigned char* buf;
    size_t len;
    size_t rem;
@@ -29,7 +29,7 @@ index a5aa39c23c1708ac27564a1a77a9f05fc07791e2..630a3400e74f20b1dbee17027c7dbe86
    if (!SSL_client_hello_get0_ext(
            ssl.get(),
            TLSEXT_TYPE_application_layer_protocol_negotiation,
-@@ -175,13 +175,15 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
+@@ -189,13 +189,15 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
    len = (buf[0] << 8) | buf[1];
    if (len + 2 != rem) return nullptr;
    return reinterpret_cast<const char*>(buf + 3);
@@ -46,7 +46,7 @@ index a5aa39c23c1708ac27564a1a77a9f05fc07791e2..630a3400e74f20b1dbee17027c7dbe86
    if (!SSL_client_hello_get0_ext(
            ssl.get(),
            TLSEXT_TYPE_server_name,
-@@ -203,6 +205,8 @@ const char* GetClientHelloServerName(const SSLPointer& ssl) {
+@@ -217,6 +219,8 @@ const char* GetClientHelloServerName(const SSLPointer& ssl) {
    if (len + 2 > rem)
      return nullptr;
    return reinterpret_cast<const char*>(buf + 5);
@@ -55,7 +55,7 @@ index a5aa39c23c1708ac27564a1a77a9f05fc07791e2..630a3400e74f20b1dbee17027c7dbe86
  }
  
  const char* GetServerName(SSL* ssl) {
-@@ -210,7 +214,10 @@ const char* GetServerName(SSL* ssl) {
+@@ -224,7 +228,10 @@ const char* GetServerName(SSL* ssl) {
  }
  
  bool SetGroups(SecureContext* sc, const char* groups) {
@@ -66,7 +66,7 @@ index a5aa39c23c1708ac27564a1a77a9f05fc07791e2..630a3400e74f20b1dbee17027c7dbe86
  }
  
  const char* X509ErrorCode(long err) {  // NOLINT(runtime/int)
-@@ -1101,14 +1108,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
+@@ -1126,14 +1133,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
      Environment* env,
      const SSLPointer& ssl) {
    EscapableHandleScope scope(env->isolate());
@@ -304,7 +304,7 @@ index e1ef170a9f17634d218492a2ce888c3a4365e097..8dffad89c80e0906780d1b26ba9a65ba
  }  // namespace
  
 diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h
-index c431159e6f77f8c86844bcadb86012b056d03372..0ce3a8f219a2952f660ff72a6ce36ee109add649 100644
+index 5060fc3f2fbd67d8b33975f2512cbd7cf7fedf1a..4f86810f8366b490ca2293cd1a811e69a199f708 100644
 --- a/src/crypto/crypto_util.h
 +++ b/src/crypto/crypto_util.h
 @@ -16,7 +16,9 @@

patches/node/pass_all_globals_through_require.patch

@@ -6,7 +6,7 @@ Subject: Pass all globals through "require"
 (cherry picked from commit 7d015419cb7a0ecfe6728431a4ed2056cd411d62)
 
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index b4902850c7fec5bb67c9566f40ca1cdd2ba17b55..200c352cfd7321c47f37776589cfca397cad5d25 100644
+index cfe2982bf22c245d3249a743e341c9948d98c18b..2c188ae0b5cb86493a7fd701c343b36370369f20 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
 @@ -127,6 +127,13 @@ const {
@@ -23,7 +23,7 @@ index b4902850c7fec5bb67c9566f40ca1cdd2ba17b55..200c352cfd7321c47f37776589cfca39
  const {
    isProxy
  } = require('internal/util/types');
-@@ -1100,10 +1107,12 @@ Module.prototype._compile = function(content, filename) {
+@@ -1098,10 +1105,12 @@ Module.prototype._compile = function(content, filename) {
    if (requireDepth === 0) statCache = new SafeMap();
    if (inspectorWrapper) {
      result = inspectorWrapper(compiledWrapper, thisValue, exports,

patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch

@@ -7,7 +7,7 @@ We use this to allow node's 'fs' module to read from ASAR files as if they were
 a real filesystem.
 
 diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
-index dfae7675e16a6a81e40c69d85004fc841cadf738..8c31d0202b70ec9784b4289a175a62fd9fd85f8c 100644
+index 1393cc20f45db69c9e133e25ac9428fcb6d81100..085dd7e09d31fb1800b3596cc068637e1956ba52 100644
 --- a/lib/internal/bootstrap/node.js
 +++ b/lib/internal/bootstrap/node.js
 @@ -66,6 +66,10 @@ setupBuffer();
@@ -22,7 +22,7 @@ index dfae7675e16a6a81e40c69d85004fc841cadf738..8c31d0202b70ec9784b4289a175a62fd
  const nativeModule = internalBinding('native_module');
  
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index 200c352cfd7321c47f37776589cfca397cad5d25..5195ff2da0496f2bfb9112d336c38040f662087b 100644
+index 2c188ae0b5cb86493a7fd701c343b36370369f20..caca939942cb721a3efde7005b0a987a19237a8b 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
 @@ -86,7 +86,7 @@ const fs = require('fs');

patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch

@@ -7,7 +7,7 @@ Subject: refactor: alter child_process.fork to use execute script with
 When forking a child script, we setup a special environment to make the Electron binary run like the upstream node. On Mac, we use the helper app as node binary.
 
 diff --git a/lib/child_process.js b/lib/child_process.js
-index 415010241cdabac42ea79601c464bae4a2081c78..5c202237ecdf32afe89b5a5b4dfc2cf648fb9d23 100644
+index a7ef8ba1e4af1aaabf88ea424b0a101397f7eb16..9cd99a7440ee4d2273fe94a0d51b4bf4051f612d 100644
 --- a/lib/child_process.js
 +++ b/lib/child_process.js
 @@ -160,6 +160,15 @@ function fork(modulePath, args = [], options) {

patches/node/repl_fix_crash_when_sharedarraybuffer_disabled.patch

@@ -25,7 +25,7 @@ index a771b1813731edf4f0dd60f3505799e389f1d876..b9461677e2d7d1df192e752496e62cca
    bench.start();
    for (let i = 0; i < n; i++)
 diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
-index a8167b86ca2e5a11b2628e20063849e85a200a8c..110a3ed1637b642b1d83fb36549cced151b9c5cd 100644
+index 65827ecd593ffb050484152fc6d31411fd3e4dcc..2e5d6b01d86e34549c1c7a3d3128350cad2b0c47 100644
 --- a/lib/internal/main/worker_thread.js
 +++ b/lib/internal/main/worker_thread.js
 @@ -9,7 +9,7 @@ const {
@@ -37,7 +37,7 @@ index a8167b86ca2e5a11b2628e20063849e85a200a8c..110a3ed1637b642b1d83fb36549cced1
  } = primordials;
  
  const {
-@@ -146,6 +146,9 @@ port.on('message', (message) => {
+@@ -142,6 +142,9 @@ port.on('message', (message) => {
      const originalCwd = process.cwd;
  
      process.cwd = function() {

patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch

@@ -12,7 +12,7 @@ allocator that does handle these cases.
 Upstreamed in https://github.com/nodejs/node/pull/38362.
 
 diff --git a/src/api/environment.cc b/src/api/environment.cc
-index 1add2976e7c48e6704400b9ea0795b934ab0bfc2..2abf5994405e8da2a04d1b23b75ccd3658398474 100644
+index 5bf19a0dda42849159d954181058897c45d280fd..03078ff3869fcd17101f1cdaf77f725dbbfa43e8 100644
 --- a/src/api/environment.cc
 +++ b/src/api/environment.cc
 @@ -475,8 +475,9 @@ MultiIsolatePlatform* CreatePlatform(
@@ -40,7 +40,7 @@ index 1add2976e7c48e6704400b9ea0795b934ab0bfc2..2abf5994405e8da2a04d1b23b75ccd36
  
  MaybeLocal<Object> GetPerContextExports(Local<Context> context) {
 diff --git a/src/node.h b/src/node.h
-index 9b9ff1c86ceeaeca828328065e2ad5573ea17fc5..0a9f5139276eb2e102b41a586adf61fa563b47d6 100644
+index 7ca7502e086190c87ae6a61dca2192253894e906..b2b766f242e02593631be087fceaf63f71d74284 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -332,7 +332,8 @@ class NODE_EXTERN MultiIsolatePlatform : public v8::Platform {
@@ -53,7 +53,7 @@ index 9b9ff1c86ceeaeca828328065e2ad5573ea17fc5..0a9f5139276eb2e102b41a586adf61fa
  };
  
  enum IsolateSettingsFlags {
-@@ -529,7 +530,8 @@ NODE_EXTERN node::tracing::Agent* CreateAgent();
+@@ -528,7 +529,8 @@ NODE_EXTERN node::tracing::Agent* CreateAgent();
  NODE_DEPRECATED("Use MultiIsolatePlatform::Create() instead",
      NODE_EXTERN MultiIsolatePlatform* CreatePlatform(
          int thread_pool_size,

patches/node/worker_thread_add_asar_support.patch

@@ -7,10 +7,10 @@ This patch initializes asar support in workers threads in
 Node.js.
 
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index 899d5a906683e8967746e10a6de452e99e236903..4c459b58b5a048d9d8a4f15f4011e7cce68089f4 100644
+index 2af6b11c97ecdca3c40792ab35c69b07b9db76a0..e79ce2b79a5f88a315ac013b6e12534ba1531d6b 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -563,6 +563,7 @@ module.exports = {
+@@ -498,6 +498,7 @@ module.exports = {
    loadPreloadModules,
    setupTraceCategoryState,
    setupInspectorHooks,
@@ -19,10 +19,10 @@ index 899d5a906683e8967746e10a6de452e99e236903..4c459b58b5a048d9d8a4f15f4011e7cc
    initializeCJSLoader,
    initializeWASI
 diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
-index 110a3ed1637b642b1d83fb36549cced151b9c5cd..50da62d11bf87c333322264f26e5b427efc7d46b 100644
+index 2e5d6b01d86e34549c1c7a3d3128350cad2b0c47..74ab84ca39a01269925ca0e326e4aa8894fce8a1 100644
 --- a/lib/internal/main/worker_thread.js
 +++ b/lib/internal/main/worker_thread.js
-@@ -29,6 +29,7 @@ const {
+@@ -27,6 +27,7 @@ const {
    initializeReport,
    initializeSourceMapsHandlers,
    loadPreloadModules,
@@ -30,7 +30,7 @@ index 110a3ed1637b642b1d83fb36549cced151b9c5cd..50da62d11bf87c333322264f26e5b427
    setupTraceCategoryState
  } = require('internal/bootstrap/pre_execution');
  
-@@ -158,6 +159,8 @@ port.on('message', (message) => {
+@@ -154,6 +155,8 @@ port.on('message', (message) => {
      };
      workerIo.sharedCwdCounter = cwdCounter;
  

patches/squirrel.mac/.patches

@@ -2,4 +2,3 @@ build_add_gn_config.patch
 fix_ensure_that_self_is_retained_until_the_racsignal_is_complete.patch
 fix_use_kseccschecknestedcode_kseccsstrictvalidate_in_the_sec.patch
 feat_add_new_squirrel_mac_bundle_installation_method_behind_flag.patch
-refactor_use_posix_spawn_instead_of_nstask_so_we_can_disclaim_the.patch

patches/squirrel.mac/refactor_use_posix_spawn_instead_of_nstask_so_we_can_disclaim_the.patch

@@ -1,101 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <samuel.r.attard@gmail.com>
-Date: Mon, 28 Mar 2022 02:36:39 -0700
-Subject: refactor: use posix_spawn instead of NSTask so we can disclaim the
- spawned ShipIt executable
-
-This ensures that if the ShipIt executable is hotswapped it doesn't inherit TCC permissions
-
-diff --git a/Squirrel/ShipIt-main.m b/Squirrel/ShipIt-main.m
-index db246534e176f9c3ea2dd8b1c8659378fdc2435d..2c515ffdd67052a08ee8155c0e46b57e9721a0e5 100644
---- a/Squirrel/ShipIt-main.m
-+++ b/Squirrel/ShipIt-main.m
-@@ -13,6 +13,9 @@
- #import <ReactiveObjC/RACSignal+Operations.h>
- #import <ReactiveObjC/RACScheduler.h>
- 
-+#include <spawn.h>
-+#include <sys/wait.h>
-+
- #import "NSError+SQRLVerbosityExtensions.h"
- #import "RACSignal+SQRLTransactionExtensions.h"
- #import "SQRLInstaller.h"
-@@ -20,6 +23,20 @@
- #import "SQRLTerminationListener.h"
- #import "SQRLShipItRequest.h"
- 
-+extern char **environ;
-+
-+int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
-+__attribute__((availability(macos,introduced=10.14),weak_import));
-+
-+#define CHECK_ERR(expr) \
-+	{ \
-+		int err = (expr); \
-+    if (err) { \
-+        fprintf(stderr, "%s: %s", #expr, strerror(err)); \
-+        exit(err); \
-+    } \
-+	}
-+
- // The maximum number of times ShipIt should run the same installation state, in
- // an attempt to update.
- //
-@@ -136,11 +153,37 @@ static void installRequest(RACSignal *readRequestSignal, NSString *applicationId
- 							NSString *exe = NSProcessInfo.processInfo.arguments[0];
- 							NSLog(@"Launching new ShipIt at %@ with instructions to launch %@", exe, bundleURL);
- 
--							NSTask *task = [[NSTask alloc] init];
--							[task setLaunchPath: exe];
--							[task setArguments: @[launchSignal, bundleURL.path]];
--							[task launch];
--							[task waitUntilExit];
-+							posix_spawnattr_t attr;
-+							CHECK_ERR(posix_spawnattr_init(&attr));
-+
-+							if (@available(macOS 10.14, *)) {
-+									// Disclaim TCC responsibilities
-+									if (responsibility_spawnattrs_setdisclaim)
-+											CHECK_ERR(responsibility_spawnattrs_setdisclaim(&attr, 1));
-+							}
-+
-+							pid_t pid = 0;
-+
-+							const char* launchPath = [exe fileSystemRepresentation];
-+							const char* signal = [launchSignal fileSystemRepresentation];
-+							const char* path = [bundleURL.path fileSystemRepresentation];
-+							const char* args[] = { launchPath, signal, path, 0 };
-+							int status = posix_spawn(&pid, [exe UTF8String], NULL, &attr, (char *const*)args, environ);
-+							if (status == 0) {
-+								NSLog(@"New ShipIt pid: %i", pid);
-+								do {
-+									if (waitpid(pid, &status, 0) != -1) {
-+										NSLog(@"ShipIt status %d", WEXITSTATUS(status));
-+									} else {
-+										perror("waitpid");
-+										exit(1);
-+									}
-+								} while (!WIFEXITED(status) && !WIFSIGNALED(status));
-+							} else {
-+								NSLog(@"posix_spawn: %s", strerror(status));
-+							}
-+
-+							posix_spawnattr_destroy(&attr);
- 
- 							NSLog(@"New ShipIt exited");
- 						} else {
-@@ -172,7 +215,13 @@ int main(int argc, const char * argv[]) {
- 		});
- 
- 		if (argc < 3) {
--			NSLog(@"Missing launchd job label or state path for ShipIt");
-+			NSLog(@"Missing launchd job label or state path for ShipIt (%d)", argc);
-+			if (argc >= 1) {
-+				NSLog(@"Arg 1: {%s}", argv[0]);
-+			}
-+			if (argc >= 2) {
-+				NSLog(@"Arg 2: {%s}", argv[1]);
-+			}
- 			return EXIT_FAILURE;
- 		}
- 

patches/v8/.patches

@@ -4,6 +4,6 @@ dcheck.patch
 export_symbols_needed_for_windows_build.patch
 workaround_an_undefined_symbol_error.patch
 do_not_export_private_v8_symbols_on_windows.patch
-fix_build_deprecated_attribute_for_older_msvc_versions.patch
+fix_build_deprecated_attirbute_for_older_msvc_versions.patch
 fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
 revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch

patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch

@@ -1,12 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Deepak Mohan <hop2deep@gmail.com>
 Date: Tue, 28 Jan 2020 15:48:03 -0800
-Subject: fix: usage of c++ [[deprecated]] attribute for older msvc versions
+Subject: fix: usage of c++ [[deprecated]] attirbute for older msvc versions
 
-This attribute can only be used in all contexts in Visual Studio 2019
+VS 2015 update 3 has a bug where [[deprecated]] attribute cannot
+be applied to constructor declarations, this is fixed in 2017 and
+higher versions, but native module compiling with this version
+will have an issue.
 
 diff --git a/include/v8config.h b/include/v8config.h
-index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..d203053d41c702733f5f3b950aa31cef74c2ab57 100644
+index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..010b3633546601ba70a55aeb8e8fc503ef79e2f5 100644
 --- a/include/v8config.h
 +++ b/include/v8config.h
 @@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line
@@ -17,7 +20,7 @@ index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..d203053d41c702733f5f3b950aa31cef
  // A macro (V8_DEPRECATED) to mark classes or functions as deprecated.
  #if defined(V8_DEPRECATION_WARNINGS)
 -# define V8_DEPRECATED(message) [[deprecated(message)]]
-+# if !defined(__clang__) && defined(_MSC_VER) && _MSC_VER < 1920
++# if defined(_MSC_VER) && _MSC_VER <= 1900
 +#   define V8_DEPRECATED(message) __declspec(deprecated(message))
 +# else
 +#   define V8_DEPRECATED(message) [[deprecated(message)]]
@@ -30,7 +33,7 @@ index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..d203053d41c702733f5f3b950aa31cef
  // A macro (V8_DEPRECATE_SOON) to make it easier to see what will be deprecated.
  #if defined(V8_IMMINENT_DEPRECATION_WARNINGS)
 -# define V8_DEPRECATE_SOON(message) [[deprecated(message)]]
-+# if !defined(__clang__) && defined(_MSC_VER) && _MSC_VER < 1920
++# if defined(_MSC_VER) && _MSC_VER <= 1900
 +#   define V8_DEPRECATE_SOON(message) __declspec(deprecated(message))
 +# else
 +#   define V8_DEPRECATE_SOON(message) [[deprecated(message)]]

script/lib/azput.js

@@ -20,7 +20,12 @@ let anErrorOccurred = false;
 function next (done) {
   const file = files.shift();
   if (!file) return done();
-  const key = filenameToKey(file);
+  let key = filenameToKey(file);
+  // TODO: When we drop s3put, migrate the key to not include atom-shell in the callsites
+  key = key.replace('atom-shell/dist/', 'headers/dist/');
+  key = key.replace('atom-shell/symbols/', 'symbols/');
+  key = key.replace('atom-shell/tmp/', 'checksums-scratchpad/');
+  key = key.replace('electron-artifacts/', 'release-builds/');
 
   const [containerName, ...keyPath] = key.split('/');
   const blobKey = keyPath.join('/');

script/lib/config.py

@@ -53,6 +53,17 @@ def get_env_var(name):
   return value
 
 
+def s3_config():
+  config = (get_env_var('S3_BUCKET'),
+            get_env_var('S3_ACCESS_KEY'),
+            get_env_var('S3_SECRET_KEY'))
+  message = ('Error: Please set the $ELECTRON_S3_BUCKET, '
+             '$ELECTRON_S3_ACCESS_KEY, and '
+             '$ELECTRON_S3_SECRET_KEY environment variables')
+  assert all(len(c) for c in config), message
+  return config
+
+
 def enable_verbose_mode():
   print('Running in verbose mode')
   global verbose_mode

script/lib/s3put.js

@@ -0,0 +1,40 @@
+/* eslint-disable camelcase */
+const AWS = require('aws-sdk');
+const fs = require('fs');
+const path = require('path');
+AWS.config.update({ region: 'us-west-2' });
+const s3 = new AWS.S3({ apiVersion: '2006-03-01' });
+
+const args = require('minimist')(process.argv.slice(2));
+
+let { bucket, prefix = '/', key_prefix = '', grant, _: files } = args;
+if (prefix && !prefix.endsWith(path.sep)) prefix = path.resolve(prefix) + path.sep;
+
+function filenameToKey (file) {
+  file = path.resolve(file);
+  if (file.startsWith(prefix)) file = file.substr(prefix.length - 1);
+  return key_prefix + (path.sep === '\\' ? file.replace(/\\/g, '/') : file);
+}
+
+let anErrorOccurred = false;
+function next (done) {
+  const file = files.shift();
+  if (!file) return done();
+  const key = filenameToKey(file);
+  console.log(`Uploading '${file}' to bucket '${bucket}' with key '${key}'...`);
+  s3.upload({
+    Bucket: bucket,
+    Key: key,
+    Body: fs.createReadStream(file),
+    ACL: grant
+  }, (err, data) => {
+    if (err) {
+      console.error(err);
+      anErrorOccurred = true;
+    }
+    next(done);
+  });
+}
+next(() => {
+  process.exit(anErrorOccurred ? 1 : 0);
+});

script/lib/util.py

@@ -15,7 +15,7 @@ except ImportError:
   from urllib2 import urlopen
 import zipfile
 
-from lib.config import is_verbose_mode
+from lib.config import is_verbose_mode, s3_config
 
 ELECTRON_DIR = os.path.abspath(
   os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
@@ -156,9 +156,26 @@ def get_electron_version():
     return 'v' + f.read().strip()
 
 def store_artifact(prefix, key_prefix, files):
-  # Azure Storage
+  # Legacy S3 Bucket
+  s3put(prefix, key_prefix, files)
+  # New AZ Storage
   azput(prefix, key_prefix, files)
 
+def s3put(prefix, key_prefix, files):
+  bucket, access_key, secret_key = s3_config()
+  env = os.environ.copy()
+  env['AWS_ACCESS_KEY_ID'] = access_key
+  env['AWS_SECRET_ACCESS_KEY'] = secret_key
+  output = execute([
+    'node',
+    os.path.join(os.path.dirname(__file__), 's3put.js'),
+    '--bucket', bucket,
+    '--prefix', prefix,
+    '--key_prefix', key_prefix,
+    '--grant', 'public-read',
+  ] + files, env)
+  print(output)
+
 def azput(prefix, key_prefix, files):
   env = os.environ.copy()
   output = execute([

script/node-disabled-tests.json

@@ -4,6 +4,7 @@
   "async-hooks/test-crypto-randomBytes",
   "parallel/test-bootstrap-modules",
   "parallel/test-child-process-fork-exec-path",
+  "parallel/test-child-process-stdio-overlapped",
   "parallel/test-cli-node-print-help",
   "parallel/test-cluster-bind-privileged-port",
   "parallel/test-cluster-shared-handle-bind-privileged-port",
@@ -26,7 +27,6 @@
   "parallel/test-http2-clean-output",
   "parallel/test-https-agent-session-reuse",
   "parallel/test-https-options-boolean-check",
-  "parallel/test-icu-minimum-version",
   "parallel/test-inspector-multisession-ws",
   "parallel/test-inspector-port-zero-cluster",
   "parallel/test-inspector-tracing-domain",

script/node-spec-runner.js

@@ -55,7 +55,7 @@ const getCustomOptions = () => {
 async function main () {
   const options = args.default ? defaultOptions : getCustomOptions();
 
-  const testChild = cp.spawn('python3', options, {
+  const testChild = cp.spawn('python', options, {
     env: {
       ...process.env,
       ELECTRON_RUN_AS_NODE: 'true',

script/release/ci-release-build.js

@@ -62,9 +62,9 @@ async function circleCIcall (targetBranch, workflowName, options) {
     parameters: {}
   };
   if (options.ghRelease) {
-    buildRequest.parameters['upload-to-storage'] = '0';
+    buildRequest.parameters['upload-to-s3'] = '0';
   } else {
-    buildRequest.parameters['upload-to-storage'] = '1';
+    buildRequest.parameters['upload-to-s3'] = '1';
   }
   buildRequest.parameters[`run-${workflowName}`] = true;
   if (options.arch) {
@@ -205,7 +205,7 @@ async function callAppVeyor (targetBranch, job, options) {
   };
 
   if (!options.ghRelease) {
-    environmentVariables.UPLOAD_TO_STORAGE = 1;
+    environmentVariables.UPLOAD_TO_S3 = 1;
   }
 
   const requestOpts = {

script/release/get-url-hash.js

@@ -1,25 +1,34 @@
-const got = require('got');
-const url = require('url');
+const AWS = require('aws-sdk');
+
+const lambda = new AWS.Lambda({
+  credentials: {
+    accessKeyId: process.env.AWS_LAMBDA_EXECUTE_KEY,
+    secretAccessKey: process.env.AWS_LAMBDA_EXECUTE_SECRET
+  },
+  region: 'us-east-1'
+});
 
 module.exports = async function getUrlHash (targetUrl, algorithm = 'sha256', attempts = 3) {
-  const options = {
-    code: process.env.ELECTRON_ARTIFACT_HASHER_FUNCTION_KEY,
-    targetUrl,
-    algorithm
-  };
-  const search = new url.URLSearchParams(options);
-  const functionUrl = url.format({
-    protocol: 'https:',
-    hostname: 'electron-artifact-hasher.azurewebsites.net',
-    pathname: '/api/HashArtifact',
-    search: search.toString()
-  });
   try {
-    const resp = await got(functionUrl);
-    if (resp.statusCode !== 200) throw new Error('non-200 status code received from hasher function');
-    if (!resp.body) throw new Error('Successful lambda call but failed to get valid hash');
-
-    return resp.body.trim();
+    return new Promise((resolve, reject) => {
+      lambda.invoke({
+        FunctionName: 'hasher',
+        Payload: JSON.stringify({
+          targetUrl,
+          algorithm
+        })
+      }, (err, data) => {
+        if (err) return reject(err);
+        try {
+          const response = JSON.parse(data.Payload);
+          if (response.statusCode !== 200) return reject(new Error('non-200 status code received from hasher function'));
+          if (!response.hash) return reject(new Error('Successful lambda call but failed to get valid hash'));
+          resolve(response.hash);
+        } catch (err) {
+          return reject(err);
+        }
+      });
+    });
   } catch (err) {
     if (attempts > 1) {
       console.error('Failed to get URL hash for', targetUrl, 'we will retry', err);

script/release/release.js

@@ -78,6 +78,8 @@ async function validateReleaseAssets (release, validatingRelease) {
           console.log(`${fail} error verifyingShasums`, err);
         });
     }
+    const s3RemoteFiles = s3RemoteFilesForVersion(release.tag_name);
+    await verifyShasumsForRemoteFiles(s3RemoteFiles, true);
     const azRemoteFiles = azRemoteFilesForVersion(release.tag_name);
     await verifyShasumsForRemoteFiles(azRemoteFiles, true);
   }
@@ -128,8 +130,9 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
-    `electron-${version}-win32-ia32-pdb.zip`,
-    `electron-${version}-win32-ia32-symbols.zip`,
+    // TODO(jkleinsc) Symbol generation on 32-bit Windows is temporarily disabled due to failures
+    // `electron-${version}-win32-ia32-pdb.zip`,
+    // `electron-${version}-win32-ia32-symbols.zip`,
     `electron-${version}-win32-ia32.zip`,
     `electron-${version}-win32-x64-pdb.zip`,
     `electron-${version}-win32-x64-symbols.zip`,
@@ -192,6 +195,15 @@ const cloudStoreFilePaths = (version) => [
   'SHASUMS256.txt'
 ];
 
+function s3RemoteFilesForVersion (version) {
+  const bucket = 'https://gh-contractor-zcbenz.s3.amazonaws.com/';
+  const versionPrefix = `${bucket}atom-shell/dist/${version}/`;
+  return cloudStoreFilePaths(version).map((filePath) => ({
+    file: filePath,
+    url: `${versionPrefix}${filePath}`
+  }));
+}
+
 function azRemoteFilesForVersion (version) {
   const azCDN = 'https://artifacts.electronjs.org/headers/';
   const versionPrefix = `${azCDN}dist/${version}/`;

script/release/uploaders/upload-index-json.py

@@ -59,7 +59,7 @@ def main():
     with open(index_json, "wb") as f:
       f.write(new_content)
 
-    store_artifact(OUT_DIR, 'headers/dist', [index_json])
+    store_artifact(OUT_DIR, 'atom-shell/dist', [index_json])
 
 
 if __name__ == '__main__':

script/release/uploaders/upload-node-checksums.py

@@ -29,7 +29,7 @@ def main():
   ]
 
   if args.target_dir is None:
-    store_artifact(directory, 'headers/dist/{0}'.format(args.version),
+    store_artifact(directory, 'atom-shell/dist/{0}'.format(args.version),
                    checksums)
   else:
     copy_files(checksums, args.target_dir)

script/release/uploaders/upload-node-headers.py

@@ -45,9 +45,9 @@ def upload_node(version):
       versioned_header_tar = header_tar.format(version)
       shutil.copy2(generated_tar, os.path.join(GEN_DIR, versioned_header_tar))
 
-    store_artifact(GEN_DIR, 'headers/dist/{0}'.format(version),
+    store_artifact(GEN_DIR, 'atom-shell/dist/{0}'.format(version),
                    glob.glob('node-*.tar.gz'))
-    store_artifact(GEN_DIR, 'headers/dist/{0}'.format(version),
+    store_artifact(GEN_DIR, 'atom-shell/dist/{0}'.format(version),
                    glob.glob('iojs-*.tar.gz'))
 
   if PLATFORM == 'win32':
@@ -73,13 +73,13 @@ def upload_node(version):
     shutil.copy2(electron_lib, v4_node_lib)
 
     # Upload the node.lib.
-    store_artifact(DIST_DIR, 'headers/dist/{0}'.format(version), [node_lib])
+    store_artifact(DIST_DIR, 'atom-shell/dist/{0}'.format(version), [node_lib])
 
     # Upload the iojs.lib.
-    store_artifact(DIST_DIR, 'headers/dist/{0}'.format(version), [iojs_lib])
+    store_artifact(DIST_DIR, 'atom-shell/dist/{0}'.format(version), [iojs_lib])
 
     # Upload the v4 node.lib.
-    store_artifact(DIST_DIR, 'headers/dist/{0}'.format(version),
+    store_artifact(DIST_DIR, 'atom-shell/dist/{0}'.format(version),
                    [v4_node_lib])
 
 

script/release/uploaders/upload-symbols.py

@@ -56,7 +56,7 @@ def main():
 
   files += glob.glob(SYMBOLS_DIR + '/*/*/*.src.zip')
 
-  # The file upload needs to be symbols/:symbol_name/:hash/:symbol
+  # The file upload needs to be atom-shell/symbols/:symbol_name/:hash/:symbol
   os.chdir(SYMBOLS_DIR)
   files = [os.path.relpath(f, os.getcwd()) for f in files]
 
@@ -84,7 +84,7 @@ def run_symstore(pdb, dest, product):
 
 
 def upload_symbols(files):
-  store_artifact(SYMBOLS_DIR, 'symbols',
+  store_artifact(SYMBOLS_DIR, 'atom-shell/symbols',
         files)
 
 

script/release/uploaders/upload.py

@@ -47,7 +47,7 @@ def main():
   args = parse_args()
   if args.verbose:
     enable_verbose_mode()
-  if args.upload_to_storage:
+  if args.upload_to_s3:
     utcnow = datetime.datetime.utcnow()
     args.upload_timestamp = utcnow.strftime('%Y%m%d')
 
@@ -64,7 +64,7 @@ def main():
   if not release['draft']:
     tag_exists = True
 
-  if not args.upload_to_storage:
+  if not args.upload_to_s3:
     assert release['exists'], \
           'Release does not exist; cannot upload to GitHub!'
     assert tag_exists == args.overwrite, \
@@ -76,9 +76,10 @@ def main():
   shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip)
   upload_electron(release, electron_zip, args)
   if get_target_arch() != 'mips64el':
-    symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
-    shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
-    upload_electron(release, symbols_zip, args)
+    if get_target_arch() != 'ia32' or PLATFORM != 'win32':
+      symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
+      shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
+      upload_electron(release, symbols_zip, args)
   if PLATFORM == 'darwin':
     if get_platform_key() == 'darwin' and get_target_arch() == 'x64':
       api_path = os.path.join(ELECTRON_DIR, 'electron-api.json')
@@ -95,9 +96,10 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip)
     upload_electron(release, dsym_snaphot_zip, args)    
   elif PLATFORM == 'win32':
-    pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
-    shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
-    upload_electron(release, pdb_zip, args)
+    if get_target_arch() != 'ia32':
+      pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
+      shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
+      upload_electron(release, pdb_zip, args)
   elif PLATFORM == 'linux':
     debug_zip = os.path.join(OUT_DIR, DEBUG_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)
@@ -146,7 +148,7 @@ def main():
       OUT_DIR, 'hunspell_dictionaries.zip')
     upload_electron(release, hunspell_dictionaries_zip, args)
 
-  if not tag_exists and not args.upload_to_storage:
+  if not tag_exists and not args.upload_to_s3:
     # Upload symbols to symbol server.
     run_python_upload_script('upload-symbols.py')
     if PLATFORM == 'win32':
@@ -172,9 +174,9 @@ def parse_args():
   parser.add_argument('-p', '--publish-release',
                       help='Publish the release',
                       action='store_true')
-  parser.add_argument('-s', '--upload_to_storage',
-                      help='Upload assets to azure bucket',
-                      dest='upload_to_storage',
+  parser.add_argument('-s', '--upload_to_s3',
+                      help='Upload assets to s3 bucket',
+                      dest='upload_to_s3',
                       action='store_true',
                       default=False,
                       required=False)
@@ -228,7 +230,7 @@ def _zero_zip_date_time(zip_):
     ZIP64_EXTRA_HEADER = 0x0001
     zip64_extra_struct = Struct("<HHQQ")
     # ZIP64.
-    # When a ZIP64 extra field is present this 8byte length
+    # When a ZIP64 extra field is present his 8byte length
     # will override the 4byte length defined in canonical zips.
     # This is in the form:
     # - 0x0001 (header_id)
@@ -340,10 +342,9 @@ def upload_electron(release, file_path, args):
   except NonZipFileError:
     pass
 
-  # if upload_to_storage is set, skip github upload.
-  # todo (vertedinde): migrate this variable to upload_to_storage
-  if args.upload_to_storage:
-    key_prefix = 'release-builds/{0}_{1}'.format(args.version,
+  # if upload_to_s3 is set, skip github upload.
+  if args.upload_to_s3:
+    key_prefix = 'electron-artifacts/{0}_{1}'.format(args.version,
                                                      args.upload_timestamp)
     store_artifact(os.path.dirname(file_path), key_prefix, [file_path])
     upload_sha256_checksum(args.version, file_path, key_prefix)
@@ -368,7 +369,7 @@ def upload_io_to_github(release, filename, filepath, version):
 def upload_sha256_checksum(version, file_path, key_prefix=None):
   checksum_path = '{}.sha256sum'.format(file_path)
   if key_prefix is None:
-    key_prefix = 'checksums-scratchpad/{0}'.format(version)
+    key_prefix = 'atom-shell/tmp/{0}'.format(version)
   sha256 = hashlib.sha256()
   with open(file_path, 'rb') as f:
     sha256.update(f.read())

script/run-clang-format.py

@@ -55,7 +55,8 @@ def list_files(files, recursive=False, extensions=None, exclude=None):
                         x for x in fpaths if not fnmatch.fnmatch(x, pattern)
                     ]
                 for fp in fpaths:
-                    ext = os.path.splitext(fp)[1][1:]
+                    ext = os.path.splitext(f)[1][1:]
+                    print(ext)
                     if ext in extensions:
                         out.append(fp)
         else:

script/spec-runner.js

@@ -41,8 +41,8 @@ const runners = new Map([
 const specHashPath = path.resolve(__dirname, '../spec/.hash');
 
 let runnersToRun = null;
-if (args.runners !== undefined) {
-  runnersToRun = args.runners.split(',').filter(value => value);
+if (args.runners) {
+  runnersToRun = args.runners.split(',');
   if (!runnersToRun.every(r => [...runners.keys()].includes(r))) {
     console.log(`${fail} ${runnersToRun} must be a subset of [${[...runners.keys()].join(' | ')}]`);
     process.exit(1);

script/start.js

@@ -14,4 +14,3 @@ const handleTerminationSignal = (signal) =>
 
 handleTerminationSignal('SIGINT');
 handleTerminationSignal('SIGTERM');
-handleTerminationSignal('SIGUSR2');

shell/app/electron_main_delegate.cc

@@ -134,14 +134,11 @@ bool ElectronPathProvider(int key, base::FilePath* result) {
       break;
     case chrome::DIR_APP_DICTIONARIES:
       // TODO(nornagon): can we just default to using Chrome's logic here?
-      if (!base::PathService::Get(DIR_SESSION_DATA, &cur))
+      if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
       cur = cur.Append(base::FilePath::FromUTF8Unsafe("Dictionaries"));
       create_dir = true;
       break;
-    case DIR_SESSION_DATA:
-      // By default and for backward, equivalent to DIR_USER_DATA.
-      return base::PathService::Get(chrome::DIR_USER_DATA, result);
     case DIR_USER_CACHE: {
 #if BUILDFLAG(IS_POSIX)
       int parent_key = base::DIR_CACHE;

shell/app/electron_main_mac.cc

@@ -5,7 +5,6 @@
 #include <cstdlib>
 #include <memory>
 
-#include "base/allocator/early_zone_registration_mac.h"
 #include "electron/buildflags/buildflags.h"
 #include "electron/fuses.h"
 #include "shell/app/electron_library_main.h"
@@ -28,7 +27,6 @@ namespace {
 }  // namespace
 
 int main(int argc, char* argv[]) {
-  partition_alloc::EarlyMallocZoneRegistration();
   FixStdioStreams();
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)

shell/browser/api/electron_api_app.cc

@@ -473,8 +473,6 @@ IconLoader::IconSize GetIconSizeByString(const std::string& size) {
 int GetPathConstant(const std::string& name) {
   if (name == "appData")
     return DIR_APP_DATA;
-  else if (name == "sessionData")
-    return DIR_SESSION_DATA;
   else if (name == "userData")
     return chrome::DIR_USER_DATA;
   else if (name == "cache")
@@ -804,6 +802,7 @@ bool App::CanCreateWindow(
     bool opener_suppressed,
     bool* no_javascript_access) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(opener);
@@ -829,6 +828,7 @@ void App::AllowCertificateError(
     base::OnceCallback<void(content::CertificateRequestResultType)> callback) {
   auto adapted_callback = base::AdaptCallbackForRepeating(std::move(callback));
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   bool prevent_default = Emit(
       "certificate-error", WebContents::FromOrCreate(isolate, web_contents),
@@ -1086,6 +1086,7 @@ std::string App::GetLocaleCountryCode() {
 void App::OnFirstInstanceAck(
     const base::span<const uint8_t>* first_instance_data) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   base::Value data_to_send;
   if (first_instance_data) {
@@ -1119,6 +1120,7 @@ void App::OnSecondInstance(
     const std::vector<uint8_t> additional_data,
     const ProcessSingleton::NotificationAckCallback& ack_callback) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Value> data_value =
       DeserializeV8Value(isolate, std::move(additional_data));
@@ -1768,7 +1770,6 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
                  base::BindRepeating(&Browser::IsEmojiPanelSupported, browser))
 #if BUILDFLAG(IS_MAC)
       .SetMethod("hide", base::BindRepeating(&Browser::Hide, browser))
-      .SetMethod("isHidden", base::BindRepeating(&Browser::IsHidden, browser))
       .SetMethod("show", base::BindRepeating(&Browser::Show, browser))
       .SetMethod("setUserActivity",
                  base::BindRepeating(&Browser::SetUserActivity, browser))

shell/browser/api/electron_api_auto_updater.cc

@@ -32,6 +32,7 @@ AutoUpdater::~AutoUpdater() {
 
 void AutoUpdater::OnError(const std::string& message) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Object> wrapper;
   if (GetWrapper(isolate).ToLocal(&wrapper)) {
@@ -48,6 +49,7 @@ void AutoUpdater::OnError(const std::string& message,
                           const int code,
                           const std::string& domain) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Object> wrapper;
   if (GetWrapper(isolate).ToLocal(&wrapper)) {

shell/browser/api/electron_api_base_window.cc

@@ -209,6 +209,7 @@ void BaseWindow::OnWindowWillResize(const gfx::Rect& new_bounds,
                                     const gfx::ResizeEdge& edge,
                                     bool* prevent_default) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   gin_helper::Dictionary info = gin::Dictionary::CreateEmpty(isolate);
   info.Set("edge", edge);
@@ -308,6 +309,7 @@ void BaseWindow::OnSystemContextMenu(int x, int y, bool* prevent_default) {
 void BaseWindow::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
   if (IsWindowMessageHooked(message)) {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+    v8::Locker locker(isolate);
     v8::HandleScope scope(isolate);
     messages_callback_map_[message].Run(
         ToBuffer(isolate, static_cast<void*>(&w_param), sizeof(WPARAM)),

shell/browser/api/electron_api_browser_window.cc

@@ -349,6 +349,7 @@ void BrowserWindow::UpdateWindowControlsOverlay(
 
 void BrowserWindow::CloseImmediately() {
   // Close all child windows before closing current window.
+  v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   for (v8::Local<v8::Value> value : child_windows_.Values(isolate())) {
     gin::Handle<BrowserWindow> child;

shell/browser/api/electron_api_data_pipe_holder.cc

@@ -107,6 +107,7 @@ class DataPipeReader {
     //
     // Note that the lifetime of the native buffer belongs to us, and we will
     // free memory when JS buffer gets garbage collected.
+    v8::Locker locker(promise_.isolate());
     v8::HandleScope handle_scope(promise_.isolate());
     v8::Local<v8::Value> buffer =
         node::Buffer::New(promise_.isolate(), &buffer_.front(), buffer_.size(),

shell/browser/api/electron_api_debugger.cc

@@ -43,6 +43,8 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
   DCHECK(agent_host == agent_host_);
 
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+
+  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
 
   base::StringPiece message_str(reinterpret_cast<const char*>(message.data()),

shell/browser/api/electron_api_desktop_capturer.cc

@@ -155,6 +155,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
       if (!webrtc::DxgiDuplicatorController::Instance()->GetDeviceNames(
               &device_names)) {
         v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+        v8::Locker locker(isolate);
         v8::HandleScope scope(isolate);
         gin_helper::CallMethod(this, "_onerror", "Failed to get sources.");
 
@@ -190,6 +191,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
 
   if (!capture_window_ && !capture_screen_) {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+    v8::Locker locker(isolate);
     v8::HandleScope scope(isolate);
     gin_helper::CallMethod(this, "_onfinished", captured_sources_);
 

shell/browser/api/electron_api_menu.cc

@@ -146,6 +146,7 @@ void Menu::OnMenuWillShow(ui::SimpleMenuModel* source) {
 base::OnceClosure Menu::BindSelfToClosure(base::OnceClosure callback) {
   // return ((callback, ref) => { callback() }).bind(null, callback, this)
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+  v8::Locker locker(isolate);
   v8::HandleScope scope(isolate);
   v8::Local<v8::Object> self;
   if (GetWrapper(isolate).ToLocal(&self)) {

shell/browser/api/electron_api_safe_storage.cc

@@ -31,24 +31,12 @@ void SetElectronCryptoReady(bool ready) {
 #endif
 
 bool IsEncryptionAvailable() {
-#if BUILDFLAG(IS_LINUX)
-  // Calling IsEncryptionAvailable() before the app is ready results in a crash
-  // on Linux.
-  // Refs: https://github.com/electron/electron/issues/32206.
-  if (!Browser::Get()->is_ready())
-    return false;
-#endif
   return OSCrypt::IsEncryptionAvailable();
 }
 
 v8::Local<v8::Value> EncryptString(v8::Isolate* isolate,
                                    const std::string& plaintext) {
-  if (!IsEncryptionAvailable()) {
-    if (!Browser::Get()->is_ready()) {
-      gin_helper::ErrorThrower(isolate).ThrowError(
-          "safeStorage cannot be used before app is ready");
-      return v8::Local<v8::Value>();
-    }
+  if (!OSCrypt::IsEncryptionAvailable()) {
     gin_helper::ErrorThrower(isolate).ThrowError(
         "Error while decrypting the ciphertext provided to "
         "safeStorage.decryptString. "
@@ -71,12 +59,7 @@ v8::Local<v8::Value> EncryptString(v8::Isolate* isolate,
 }
 
 std::string DecryptString(v8::Isolate* isolate, v8::Local<v8::Value> buffer) {
-  if (!IsEncryptionAvailable()) {
-    if (!Browser::Get()->is_ready()) {
-      gin_helper::ErrorThrower(isolate).ThrowError(
-          "safeStorage cannot be used before app is ready");
-      return "";
-    }
+  if (!OSCrypt::IsEncryptionAvailable()) {
     gin_helper::ErrorThrower(isolate).ThrowError(
         "Error while decrypting the ciphertext provided to "
         "safeStorage.decryptString. "

shell/browser/api/electron_api_session.cc

@@ -372,6 +372,7 @@ void Session::OnDownloadCreated(content::DownloadManager* manager,
   if (item->IsSavePackageDownload())
     return;
 
+  v8::Locker locker(isolate_);
   v8::HandleScope handle_scope(isolate_);
   auto handle = DownloadItem::FromOrCreate(isolate_, item);
   if (item->GetState() == download::DownloadItem::INTERRUPTED)

shell/browser/api/electron_api_system_preferences.h

@@ -76,17 +76,17 @@ class SystemPreferences
   void PostNotification(const std::string& name,
                         base::DictionaryValue user_info,
                         gin::Arguments* args);
-  int SubscribeNotification(v8::Local<v8::Value> maybe_name,
+  int SubscribeNotification(const std::string& name,
                             const NotificationCallback& callback);
   void UnsubscribeNotification(int id);
   void PostLocalNotification(const std::string& name,
                              base::DictionaryValue user_info);
-  int SubscribeLocalNotification(v8::Local<v8::Value> maybe_name,
+  int SubscribeLocalNotification(const std::string& name,
                                  const NotificationCallback& callback);
   void UnsubscribeLocalNotification(int request_id);
   void PostWorkspaceNotification(const std::string& name,
                                  base::DictionaryValue user_info);
-  int SubscribeWorkspaceNotification(v8::Local<v8::Value> maybe_name,
+  int SubscribeWorkspaceNotification(const std::string& name,
                                      const NotificationCallback& callback);
   void UnsubscribeWorkspaceNotification(int request_id);
   v8::Local<v8::Value> GetUserDefault(v8::Isolate* isolate,
@@ -130,7 +130,7 @@ class SystemPreferences
   ~SystemPreferences() override;
 
 #if BUILDFLAG(IS_MAC)
-  int DoSubscribeNotification(v8::Local<v8::Value> maybe_name,
+  int DoSubscribeNotification(const std::string& name,
                               const NotificationCallback& callback,
                               NotificationCenterKind kind);
   void DoUnsubscribeNotification(int request_id, NotificationCenterKind kind);

shell/browser/api/electron_api_system_preferences_mac.mm

@@ -154,11 +154,10 @@ void SystemPreferences::PostNotification(const std::string& name,
 }
 
 int SystemPreferences::SubscribeNotification(
-    v8::Local<v8::Value> maybe_name,
+    const std::string& name,
     const NotificationCallback& callback) {
   return DoSubscribeNotification(
-      maybe_name, callback,
-      NotificationCenterKind::kNSDistributedNotificationCenter);
+      name, callback, NotificationCenterKind::kNSDistributedNotificationCenter);
 }
 
 void SystemPreferences::UnsubscribeNotification(int request_id) {
@@ -175,9 +174,9 @@ void SystemPreferences::PostLocalNotification(const std::string& name,
 }
 
 int SystemPreferences::SubscribeLocalNotification(
-    v8::Local<v8::Value> maybe_name,
+    const std::string& name,
     const NotificationCallback& callback) {
-  return DoSubscribeNotification(maybe_name, callback,
+  return DoSubscribeNotification(name, callback,
                                  NotificationCenterKind::kNSNotificationCenter);
 }
 
@@ -197,11 +196,10 @@ void SystemPreferences::PostWorkspaceNotification(
 }
 
 int SystemPreferences::SubscribeWorkspaceNotification(
-    v8::Local<v8::Value> maybe_name,
+    const std::string& name,
     const NotificationCallback& callback) {
   return DoSubscribeNotification(
-      maybe_name, callback,
-      NotificationCenterKind::kNSWorkspaceNotificationCenter);
+      name, callback, NotificationCenterKind::kNSWorkspaceNotificationCenter);
 }
 
 void SystemPreferences::UnsubscribeWorkspaceNotification(int request_id) {
@@ -210,25 +208,14 @@ void SystemPreferences::UnsubscribeWorkspaceNotification(int request_id) {
 }
 
 int SystemPreferences::DoSubscribeNotification(
-    v8::Local<v8::Value> maybe_name,
+    const std::string& name,
     const NotificationCallback& callback,
     NotificationCenterKind kind) {
   int request_id = g_next_id++;
   __block NotificationCallback copied_callback = callback;
 
-  v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  std::string name_str;
-  if (!(maybe_name->IsNull() ||
-        gin::ConvertFromV8(isolate, maybe_name, &name_str))) {
-    isolate->ThrowException(v8::Exception::Error(
-        gin::StringToV8(isolate, "Must pass null or a string")));
-    return -1;
-  }
-
-  auto* name = maybe_name->IsNull() ? nil : base::SysUTF8ToNSString(name_str);
-
   g_id_map[request_id] = [GetNotificationCenter(kind)
-      addObserverForName:name
+      addObserverForName:base::SysUTF8ToNSString(name)
                   object:nil
                    queue:nil
               usingBlock:^(NSNotification* notification) {