Merge branch 'develop' into renovate/definitelytyped

package.json

@@ -81,6 +81,7 @@
         "@babel/preset-typescript": "^7.18.6",
         "@electron/asar": "^3.2.3",
         "@electron/fuses": "^1.7.0",
+        "@mapbox/node-pre-gyp": "^1.0.11",
         "@playwright/test": "1.43.1",
         "@types/auto-launch": "^5.0.1",
         "@types/counterpart": "^0.18.1",
@@ -111,11 +112,10 @@
         "knip": "^5.0.0",
         "matrix-web-i18n": "^3.2.1",
         "mkdirp": "^3.0.0",
-        "node-pre-gyp": "^0.17.0",
         "pacote": "^18.0.0",
         "prettier": "^3.0.0",
         "rimraf": "^5.0.0",
-        "tar": "^6.1.2",
+        "tar": "^6.2.1",
         "ts-node": "^10.9.1",
         "typescript": "5.4.5"
     },

scripts/@types/node-pre-gyp.d.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-declare module "node-pre-gyp/lib/util/versioning" {
+declare module "@mapbox/node-pre-gyp/lib/util/versioning" {
     // eslint-disable-next-line @typescript-eslint/naming-convention
     export function get_runtime_abi(runtime: string, version: string): string;
 }

scripts/hak/hakEnv.ts

@@ -16,7 +16,7 @@ limitations under the License.
 
 import path from "path";
 import os from "os";
-import nodePreGypVersioning from "node-pre-gyp/lib/util/versioning";
+import nodePreGypVersioning from "@mapbox/node-pre-gyp/lib/util/versioning";
 import { getElectronVersionFromInstalled } from "app-builder-lib/out/electron/electronVersion";
 
 import { Arch, Target, TARGETS, getHost, isHostId, TargetId } from "./target";