fix: bump node-gyp dependency to v9.4.0

build/azure-pipelines/win32/product-build-win32.yml

@@ -94,9 +94,12 @@ steps:
       $ErrorActionPreference = "Stop"
       # TODO: Should be replaced with upstream URL once https://github.com/nodejs/node-gyp/pull/2825
       # gets merged.
-      exec { git clone https://github.com/rzhao271/node-gyp.git . } "Cloning rzhao271/node-gyp failed"
-      exec { git checkout 102b347da0c92c29f9c67df22e864e70249cf086 } "Checking out 102b347 failed"
-      exec { npm install } "Building rzhao271/node-gyp failed"
+      exec { git config --global user.email "vscode@microsoft.com" } "git config user.email failed"
+      exec { git config --global user.name "VSCode" } "git config user.name failed"
+      exec { git clone https://github.com/nodejs/node-gyp.git . } "Cloning nodejs/node-gyp failed"
+      exec { git checkout v9.4.0 } "Checking out v9.4.0 failed"
+      exec { git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch } "Apply spectre patch failed"
+      exec { npm install } "Building node-gyp failed"
     displayName: Install custom node-gyp
     workingDirectory: .build/node-gyp
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

build/filters.js

@@ -80,6 +80,7 @@ module.exports.indentationFilter = [
 	'!test/unit/assert.js',
 	'!resources/linux/snap/electron-launch',
 	'!build/ext.js',
+	'!build/npm/gyp/patches/gyp_spectre_mitigation_support.patch',
 
 	// except specific folders
 	'!test/automation/out/**',

build/npm/gyp/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "license": "MIT",
   "devDependencies": {
-    "node-gyp": "^8.4.1"
+    "node-gyp": "^9.4.0"
   },
   "scripts": {}
 }

build/npm/gyp/patches/gyp_spectre_mitigation_support.patch

@@ -0,0 +1,51 @@
+From 853e4643b6737224a5aa0720a4108461a0230991 Mon Sep 17 00:00:00 2001
+From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
+Date: Thu, 30 Mar 2023 05:23:36 -0700
+Subject: [PATCH] feat(msvs): add SpectreMitigation attribute (#190)
+
+Backports https://github.com/nodejs/gyp-next/commit/853e4643b6737224a5aa0720a4108461a0230991
+
+diff --git a/gyp/pylib/gyp/easy_xml_test.py b/gyp/pylib/gyp/easy_xml_test.py
+index 342f693..c5808b8 100755
+--- a/gyp/pylib/gyp/easy_xml_test.py
++++ b/gyp/pylib/gyp/easy_xml_test.py
+@@ -76,6 +76,7 @@ def test_EasyXml_complex(self):
+             '\'Debug|Win32\'" Label="Configuration">'
+             "<ConfigurationType>Application</ConfigurationType>"
+             "<CharacterSet>Unicode</CharacterSet>"
++            "<SpectreMitigation>SpectreLoadCF</SpectreMitigation>"
+             "</PropertyGroup>"
+             "</Project>"
+         )
+@@ -99,6 +100,7 @@ def test_EasyXml_complex(self):
+                     },
+                     ["ConfigurationType", "Application"],
+                     ["CharacterSet", "Unicode"],
++                    ["SpectreMitigation", "SpectreLoadCF"]
+                 ],
+             ]
+         )
+diff --git a/gyp/pylib/gyp/generator/msvs.py b/gyp/pylib/gyp/generator/msvs.py
+index 72269bd..85c354f 100644
+--- a/gyp/pylib/gyp/generator/msvs.py
++++ b/gyp/pylib/gyp/generator/msvs.py
+@@ -3006,6 +3006,10 @@ def _GetMSBuildConfigurationDetails(spec, build_file):
+         character_set = msbuild_attributes.get("CharacterSet")
+         config_type = msbuild_attributes.get("ConfigurationType")
+         _AddConditionalProperty(properties, condition, "ConfigurationType", config_type)
++        spectre_mitigation = msbuild_attributes.get('SpectreMitigation')
++        if spectre_mitigation:
++            _AddConditionalProperty(properties, condition, "SpectreMitigation",
++                                    spectre_mitigation)
+         if config_type == "Driver":
+             _AddConditionalProperty(properties, condition, "DriverType", "WDM")
+             _AddConditionalProperty(
+@@ -3094,6 +3098,8 @@ def _ConvertMSVSBuildAttributes(spec, config, build_file):
+             msbuild_attributes[a] = _ConvertMSVSCharacterSet(msvs_attributes[a])
+         elif a == "ConfigurationType":
+             msbuild_attributes[a] = _ConvertMSVSConfigurationType(msvs_attributes[a])
++        elif a == "SpectreMitigation":
++            msbuild_attributes[a] = msvs_attributes[a]
+         else:
+             print("Warning: Do not know how to convert MSVS attribute " + a)
+     return msbuild_attributes