Merge branch 'master' into sbruens/servers-lit

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",

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!

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' : ''));
 }

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'
     );
   }