get rid of chdir

Author: thymikee

packages/plugin-platform-apple/src/lib/commands/build/buildProject.ts

@@ -8,6 +8,7 @@ import spawn, { SubprocessError } from 'nano-spawn';
 
 export const buildProject = async (
   xcodeProject: XcodeProjectInfo,
+  sourceDir: string,
   platformName: ApplePlatform,
   udid: string | undefined,
   scheme: string,
@@ -66,7 +67,9 @@ export const buildProject = async (
   );
   logger.debug(`Running "xcodebuild ${xcodebuildArgs.join(' ')}.`);
   try {
-    const { output } = await spawn('xcodebuild', xcodebuildArgs);
+    const { output } = await spawn('xcodebuild', xcodebuildArgs, {
+      cwd: sourceDir,
+    });
     loader.stop(
       `Built the app with xcodebuild for ${scheme} scheme in ${mode} mode.`
     );

packages/plugin-platform-apple/src/lib/commands/build/createBuild.ts

@@ -29,13 +29,12 @@ export const createBuild = async (
   }
 
   normalizeArgs(args, xcodeProject);
-  // @todo replace chdir with running the command in the {cwd: sourceDir}
-  process.chdir(sourceDir);
 
   const { scheme, mode } = args.interactive
     ? await selectFromInteractiveMode(xcodeProject, args.scheme, args.mode)
     : await getConfiguration(
         xcodeProject,
+        sourceDir,
         args.scheme,
         args.mode,
         platformName
@@ -44,6 +43,7 @@ export const createBuild = async (
   try {
     await buildProject(
       xcodeProject,
+      sourceDir,
       platformName,
       undefined,
       scheme,

packages/plugin-platform-apple/src/lib/commands/build/getConfiguration.ts

@@ -7,11 +7,11 @@ import color from 'picocolors';
 
 export async function getConfiguration(
   xcodeProject: XcodeProjectInfo,
+  sourceDir: string,
   inputScheme: string,
   inputMode: string,
   platformName: ApplePlatform
 ) {
-  const sourceDir = process.cwd();
   const info = await getInfo(xcodeProject, sourceDir);
   checkIfConfigurationExists(info?.configurations ?? [], inputMode);
   let scheme = inputScheme;

packages/plugin-platform-apple/src/lib/commands/run/createRun.ts

@@ -38,24 +38,30 @@ export const createRun = async (
   }
 
   normalizeArgs(args, projectRoot, xcodeProject);
-  // @todo replace chdir with running the command in the {cwd: sourceDir}
-  process.chdir(sourceDir);
 
   const { scheme, mode } = args.interactive
     ? await selectFromInteractiveMode(xcodeProject, args.scheme, args.mode)
     : await getConfiguration(
         xcodeProject,
+        sourceDir,
         args.scheme,
         args.mode,
         platformName
       );
 
   if (platformName === 'macos') {
-    await runOnMac(xcodeProject, mode, scheme, args);
+    await runOnMac(xcodeProject, sourceDir, mode, scheme, args);
     outro('Success 🎉.');
     return;
   } else if (args.catalyst) {
-    await runOnMacCatalyst(platformName, mode, scheme, xcodeProject, args);
+    await runOnMacCatalyst(
+      platformName,
+      mode,
+      scheme,
+      xcodeProject,
+      sourceDir,
+      args
+    );
     outro('Success 🎉.');
     return;
   }
@@ -76,13 +82,22 @@ export const createRun = async (
       await runOnSimulator(
         device,
         xcodeProject,
+        sourceDir,
         platformName,
         mode,
         scheme,
         args
       );
     } else if (device.type === 'device') {
-      await runOnDevice(device, platformName, mode, scheme, xcodeProject, args);
+      await runOnDevice(
+        device,
+        platformName,
+        mode,
+        scheme,
+        xcodeProject,
+        sourceDir,
+        args
+      );
     }
     outro('Success 🎉.');
     return;
@@ -116,6 +131,7 @@ export const createRun = async (
       await runOnSimulator(
         simulator,
         xcodeProject,
+        sourceDir,
         platformName,
         mode,
         scheme,

packages/plugin-platform-apple/src/lib/commands/run/getBuildSettings.ts

@@ -12,23 +12,28 @@ export type BuildSettings = {
 
 export async function getBuildSettings(
   xcodeProject: XcodeProjectInfo,
+  sourceDir: string,
   mode: string,
   buildOutput: string,
   scheme: string,
   target?: string
 ): Promise<BuildSettings | null> {
-  const { stdout: buildSettings } = await spawn('xcodebuild', [
-    xcodeProject.isWorkspace ? '-workspace' : '-project',
-    xcodeProject.name,
-    '-scheme',
-    scheme,
-    '-sdk',
-    getPlatformName(buildOutput),
-    '-configuration',
-    mode,
-    '-showBuildSettings',
-    '-json',
-  ]);
+  const { stdout: buildSettings } = await spawn(
+    'xcodebuild',
+    [
+      xcodeProject.isWorkspace ? '-workspace' : '-project',
+      xcodeProject.name,
+      '-scheme',
+      scheme,
+      '-sdk',
+      getPlatformName(buildOutput),
+      '-configuration',
+      mode,
+      '-showBuildSettings',
+      '-json',
+    ],
+    { cwd: sourceDir }
+  );
 
   const settings = JSON.parse(buildSettings);
 

packages/plugin-platform-apple/src/lib/commands/run/installApp.ts

@@ -8,6 +8,7 @@ import spawn, { SubprocessError } from 'nano-spawn';
 type Options = {
   buildOutput: string;
   xcodeProject: XcodeProjectInfo;
+  sourceDir: string;
   mode: string;
   scheme: string;
   target?: string;
@@ -19,6 +20,7 @@ type Options = {
 export default async function installApp({
   buildOutput,
   xcodeProject,
+  sourceDir,
   mode,
   scheme,
   target,
@@ -30,6 +32,7 @@ export default async function installApp({
 
   const buildSettings = await getBuildSettings(
     xcodeProject,
+    sourceDir,
     mode,
     buildOutput,
     scheme,

packages/plugin-platform-apple/src/lib/commands/run/runOnDevice.ts

@@ -13,6 +13,7 @@ export async function runOnDevice(
   mode: string,
   scheme: string,
   xcodeProject: XcodeProjectInfo,
+  sourceDir: string,
   args: RunFlags
 ) {
   try {
@@ -29,6 +30,7 @@ export async function runOnDevice(
   if (!args.binaryPath) {
     buildOutput = await buildProject(
       xcodeProject,
+      sourceDir,
       platform,
       selectedDevice.udid,
       scheme,
@@ -38,6 +40,7 @@ export async function runOnDevice(
 
     const buildSettings = await getBuildSettings(
       xcodeProject,
+      sourceDir,
       mode,
       buildOutput,
       scheme

packages/plugin-platform-apple/src/lib/commands/run/runOnMac.ts

@@ -9,12 +9,14 @@ import { RunFlags } from './runOptions.js';
 
 export async function runOnMac(
   xcodeProject: XcodeProjectInfo,
+  sourceDir: string,
   mode: string,
   scheme: string,
   args: RunFlags
 ) {
   const buildOutput = await buildProject(
     xcodeProject,
+    sourceDir,
     'macos',
     undefined,
     scheme,
@@ -25,6 +27,7 @@ export async function runOnMac(
   await openApp({
     buildOutput,
     xcodeProject,
+    sourceDir,
     mode,
     scheme,
     target: args.target,
@@ -35,6 +38,7 @@ export async function runOnMac(
 type Options = {
   buildOutput: string;
   xcodeProject: XcodeProjectInfo;
+  sourceDir: string;
   mode: string;
   scheme: string;
   target?: string;
@@ -44,6 +48,7 @@ type Options = {
 async function openApp({
   buildOutput,
   xcodeProject,
+  sourceDir,
   mode,
   scheme,
   target,
@@ -53,6 +58,7 @@ async function openApp({
 
   const buildSettings = await getBuildSettings(
     xcodeProject,
+    sourceDir,
     mode,
     buildOutput,
     scheme,

packages/plugin-platform-apple/src/lib/commands/run/runOnMacCatalyst.ts

@@ -10,6 +10,7 @@ export async function runOnMacCatalyst(
   mode: string,
   scheme: string,
   xcodeProject: XcodeProjectInfo,
+  sourceDir: string,
   args: RunFlags
 ) {
   if (args.binaryPath) {
@@ -19,6 +20,7 @@ export async function runOnMacCatalyst(
   }
   const buildOutput = await buildProject(
     xcodeProject,
+    sourceDir,
     platform,
     undefined,
     scheme,
@@ -28,6 +30,7 @@ export async function runOnMacCatalyst(
 
   const buildSettings = await getBuildSettings(
     xcodeProject,
+    sourceDir,
     mode,
     buildOutput,
     scheme

packages/plugin-platform-apple/src/lib/commands/run/runOnSimulator.ts

@@ -8,6 +8,7 @@ import { spinner } from '@clack/prompts';
 export async function runOnSimulator(
   simulator: Device,
   xcodeProject: XcodeProjectInfo,
+  sourceDir: string,
   platform: ApplePlatform,
   mode: string,
   scheme: string,
@@ -46,6 +47,7 @@ export async function runOnSimulator(
   if (!binaryPath) {
     buildOutput = await buildProject(
       xcodeProject,
+      sourceDir,
       platform,
       simulator.udid,
       scheme,
@@ -58,6 +60,7 @@ export async function runOnSimulator(
   await installApp({
     buildOutput: buildOutput ?? '',
     xcodeProject,
+    sourceDir,
     mode,
     scheme,
     target,