From a310b2fb2f952f307e31514ae1c4a7a1b4fded16 Mon Sep 17 00:00:00 2001
From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:32:39 -0400
Subject: [PATCH 1/2] fix(docs): set xcode version to 15.2 (#1947)

---
 src/cordova/apple/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cordova/apple/README.md b/src/cordova/apple/README.md
index dee5592a7a2..4bc7454adb7 100644
--- a/src/cordova/apple/README.md
+++ b/src/cordova/apple/README.md
@@ -7,7 +7,7 @@ This document describes how to develop and debug for macOS (formerly known as OS
 You will need:
 
 - An Apple Developer Account. You will need to be invited to your developer team as well.
-- XCode 13.2+ ([download](https://developer.apple.com/xcode/))
+- XCode 15.2 ([download](https://developer.apple.com/xcode/))
 - XCode command line tools: `xcode-select --install`
 
 > NOTE: Should you encounter issues with your build, there may be apple-specific dependencies that are out of date. Run `npm run reset` and try again!

From 41a97219d3440145f27544160846c77a8c75a4aa Mon Sep 17 00:00:00 2001
From: "J. Yi" <93548144+jyyi1@users.noreply.github.com>
Date: Tue, 2 Apr 2024 04:42:31 -0400
Subject: [PATCH 2/2] fix(build): fix Outline Client build in Windows (#1948)

---
 package-lock.json                        | 14 +++++++-------
 package.json                             |  2 +-
 src/infrastructure/electron/app_paths.ts |  6 +++++-
 src/tun2socks/build.action.mjs           |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0ca8655d962..6b753406846 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -111,7 +111,7 @@
         "karma-webpack": "^5.0.0",
         "minimist": "^1.2.6",
         "node-fetch": "^3.3.0",
-        "node-gyp": "^10.0.1",
+        "node-gyp": "^10.1.0",
         "outline-i18n": "Jigsaw-Code/outline-i18n#v0.0.7",
         "postcss": "^7.0.39",
         "postcss-rtl": "^1.7.3",
@@ -22480,9 +22480,9 @@
       }
     },
     "node_modules/node-gyp": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz",
-      "integrity": "sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz",
+      "integrity": "sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==",
       "dev": true,
       "dependencies": {
         "env-paths": "^2.2.0",
@@ -49444,9 +49444,9 @@
       "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
     },
     "node-gyp": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz",
-      "integrity": "sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz",
+      "integrity": "sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==",
       "dev": true,
       "requires": {
         "env-paths": "^2.2.0",
diff --git a/package.json b/package.json
index 97a245d8470..1502b23b6a1 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "karma-webpack": "^5.0.0",
     "minimist": "^1.2.6",
     "node-fetch": "^3.3.0",
-    "node-gyp": "^10.0.1",
+    "node-gyp": "^10.1.0",
     "outline-i18n": "Jigsaw-Code/outline-i18n#v0.0.7",
     "postcss": "^7.0.39",
     "postcss-rtl": "^1.7.3",
diff --git a/src/infrastructure/electron/app_paths.ts b/src/infrastructure/electron/app_paths.ts
index 0c6d9579812..99282a49ae7 100644
--- a/src/infrastructure/electron/app_paths.ts
+++ b/src/infrastructure/electron/app_paths.ts
@@ -43,5 +43,9 @@ export function getAppPath() {
 }
 
 export function pathToEmbeddedBinary(filename: string) {
-  return path.join(unpackedAppPath(), 'output', 'build', os.platform(), filename + (isWindows ? '.exe' : ''));
+  let osName = os.platform().toString(); /* should be either 'linux' or 'win32' */
+  if (osName === 'win32') {
+    osName = 'windows';
+  }
+  return path.join(unpackedAppPath(), 'output', 'build', osName, filename + (isWindows ? '.exe' : ''));
 }
diff --git a/src/tun2socks/build.action.mjs b/src/tun2socks/build.action.mjs
index c91c9889e6f..ef2d0f510be 100644
--- a/src/tun2socks/build.action.mjs
+++ b/src/tun2socks/build.action.mjs
@@ -36,7 +36,7 @@ export async function main(...parameters) {
       'go',
       'build',
       '-o',
-      `output/build/${targetPlatform}/tun2socks`,
+      `output/build/${targetPlatform}/tun2socks${targetPlatform === 'windows' ? '.exe' : ''}`,
       'github.com/Jigsaw-Code/outline-client/src/tun2socks/outline/electron'
     );
   }