@expo/build-tools 1.0.23 → 1.0.25

package/dist/customBuildContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"customBuildContext.js","sourceRoot":"","sources":["../src/customBuildContext.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uDAAqE;AAErE,uCAAiF;AAIjF,MAAM,8BAA8B,GAA2C;IAC7E,CAAC,wBAAQ,CAAC,OAAO,CAAC,EAAE,4BAAoB,CAAC,KAAK;IAC9C,CAAC,wBAAQ,CAAC,GAAG,CAAC,EAAE,4BAAoB,CAAC,MAAM;CAC5C,CAAC;AAMF,MAAa,kBAAkB;IAsB7B,YAAY,QAA2B;QACrC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;QAExB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,0BAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,sBAAsB,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,wBAAwB,CAAC,CAAC;QACvF,IAAI,CAAC,sBAAsB,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,uBAAuB,GAAG,QAAQ,CAAC,8BAA8B,EAAE,CAAC;QACzE,IAAI,CAAC,UAAU,GAAG;YAChB,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC;SACnE,CAAC;IACJ,CAAC;IAED,IAAW,eAAe;QACxB,OAAO,8BAA8B,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,aAAa;QAClB,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC;IACJ,CAAC;IAEM,SAAS,CAAC,GAAQ;QACvB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;CACF;AApDD,gDAoDC","sourcesContent":["import path from 'path';\n\nimport { BuildPhase, Env, Job, Platform } from '@expo/eas-build-job';\nimport { bunyan } from '@expo/logger';\nimport { ExternalBuildContextProvider, BuildRuntimePlatform } from '@expo/steps';\n\nimport { ArtifactType, BuildContext } from './context';\n\nconst platformToBuildRuntimePlatform: Record<Platform, BuildRuntimePlatform> = {\n  [Platform.ANDROID]: BuildRuntimePlatform.LINUX,\n  [Platform.IOS]: BuildRuntimePlatform.DARWIN,\n};\n\nexport interface BuilderRuntimeApi {\n  uploadArtifacts: (type: ArtifactType, paths: string[], logger: bunyan) => Promise<void>;\n}\n\nexport class CustomBuildContext implements ExternalBuildContextProvider {\n  /*\n   * Directory that contains project sources before eas/checkout.\n   */\n  public readonly projectSourceDirectory: string;\n\n  /*\n   * Directory where build is executed. eas/checkout will copy sources here.\n   */\n  public readonly projectTargetDirectory: string;\n\n  /*\n   * Directory where all build steps will be executed unless configured otherwise.\n   */\n  public readonly defaultWorkingDirectory: string;\n\n  public readonly logger: bunyan;\n  public readonly runtimeApi: BuilderRuntimeApi;\n  public readonly job: Job;\n\n  private _env: Env;\n\n  constructor(buildCtx: BuildContext<Job>) {\n    this._env = buildCtx.env;\n    this.job = buildCtx.job;\n\n    this.logger = buildCtx.logger.child({ phase: BuildPhase.CUSTOM });\n    this.projectSourceDirectory = path.join(buildCtx.workingdir, 'temporary-custom-build');\n    this.projectTargetDirectory = path.join(buildCtx.workingdir, 'build');\n    this.defaultWorkingDirectory = buildCtx.getReactNativeProjectDirectory();\n    this.runtimeApi = {\n      uploadArtifacts: (...args) => buildCtx['uploadArtifacts'](...args),\n    };\n  }\n\n  public get runtimePlatform(): BuildRuntimePlatform {\n    return platformToBuildRuntimePlatform[this.job.platform];\n  }\n\n  public get env(): Env {\n    return this._env;\n  }\n\n  public staticContext(): any {\n    return {\n      job: this.job,\n    };\n  }\n\n  public updateEnv(env: Env): void {\n    this._env = env;\n  }\n}\n"]}

package/dist/ios/xcodeBuildLogs.d.ts

@@ -1,4 +1,8 @@
+/// <reference types="bunyan" />
 import { Ios } from '@expo/eas-build-job';
+import { bunyan } from '@expo/logger';
 import { BuildContext } from '../context';
-export declare function findAndUploadXcodeBuildLogsAsync(ctx: BuildContext<Ios.Job>): Promise<void>;
+export declare function findAndUploadXcodeBuildLogsAsync(ctx: BuildContext<Ios.Job>, { logger }: {
+    logger: bunyan;
+}): Promise<void>;
 export declare function findXcodeBuildLogsPathAsync(buildLogsDirectory: string): Promise<string | undefined>;

package/dist/ios/xcodeBuildLogs.js

@@ -8,15 +8,15 @@ const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const context_1 = require("../context");
-async function findAndUploadXcodeBuildLogsAsync(ctx) {
+async function findAndUploadXcodeBuildLogsAsync(ctx, { logger }) {
     try {
         const xcodeBuildLogsPath = await findXcodeBuildLogsPathAsync(ctx.buildLogsDirectory);
         if (xcodeBuildLogsPath) {
-            await ctx.uploadArtifacts(context_1.ArtifactType.XCODE_BUILD_LOGS, [xcodeBuildLogsPath], ctx.logger);
+            await ctx.uploadArtifacts(context_1.ArtifactType.XCODE_BUILD_LOGS, [xcodeBuildLogsPath], logger);
         }
     }
     catch (err) {
-        ctx.logger.debug({ err }, 'Failed to upload Xcode build logs');
+        logger.debug({ err }, 'Failed to upload Xcode build logs');
     }
 }
 exports.findAndUploadXcodeBuildLogsAsync = findAndUploadXcodeBuildLogsAsync;

package/dist/ios/xcodeBuildLogs.js.map

@@ -1 +1 @@
-{"version":3,"file":"xcodeBuildLogs.js","sourceRoot":"","sources":["../../src/ios/xcodeBuildLogs.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAGxB,0DAA2B;AAE3B,wCAAwD;AAEjD,KAAK,UAAU,gCAAgC,CAAC,GAA0B;IAC/E,IAAI;QACF,MAAM,kBAAkB,GAAG,MAAM,2BAA2B,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACrF,IAAI,kBAAkB,EAAE;YACtB,MAAM,GAAG,CAAC,eAAe,CAAC,sBAAY,CAAC,gBAAgB,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;SAC5F;KACF;IAAC,OAAO,GAAQ,EAAE;QACjB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,mCAAmC,CAAC,CAAC;KAChE;AACH,CAAC;AATD,4EASC;AAEM,KAAK,UAAU,2BAA2B,CAC/C,kBAA0B;;IAE1B,MAAM,cAAc,GAAG,CAAC,MAAM,IAAA,mBAAE,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CACvF,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CACxC,CAAC;IACF,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE;QACrB,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;KAC1B;IACD,MAAM,gBAAgB,GAAG,CAAC,MAAM,IAAA,mBAAE,EAAC,wBAAwB,EAAE,EAAE,GAAG,EAAE,YAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CACtF,CAAC,YAAY,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CACxD,CAAC;IAEF,OAAO,MAAA,MAAA,cAAc,CAAC,CAAC,CAAC,mCAAI,gBAAgB,CAAC,CAAC,CAAC,mCAAI,SAAS,CAAC;AAC/D,CAAC;AAdD,kEAcC","sourcesContent":["import os from 'os';\nimport path from 'path';\n\nimport { Ios } from '@expo/eas-build-job';\nimport fg from 'fast-glob';\n\nimport { ArtifactType, BuildContext } from '../context';\n\nexport async function findAndUploadXcodeBuildLogsAsync(ctx: BuildContext<Ios.Job>): Promise<void> {\n  try {\n    const xcodeBuildLogsPath = await findXcodeBuildLogsPathAsync(ctx.buildLogsDirectory);\n    if (xcodeBuildLogsPath) {\n      await ctx.uploadArtifacts(ArtifactType.XCODE_BUILD_LOGS, [xcodeBuildLogsPath], ctx.logger);\n    }\n  } catch (err: any) {\n    ctx.logger.debug({ err }, 'Failed to upload Xcode build logs');\n  }\n}\n\nexport async function findXcodeBuildLogsPathAsync(\n  buildLogsDirectory: string\n): Promise<string | undefined> {\n  const customLogPaths = (await fg('*.log', { cwd: buildLogsDirectory })).map((filename) =>\n    path.join(buildLogsDirectory, filename)\n  );\n  if (customLogPaths[0]) {\n    return customLogPaths[0];\n  }\n  const fallbackLogPaths = (await fg('Library/Logs/gym/*.log', { cwd: os.homedir() })).map(\n    (relativePath) => path.join(os.homedir(), relativePath)\n  );\n\n  return customLogPaths[0] ?? fallbackLogPaths[0] ?? undefined;\n}\n"]}
+{"version":3,"file":"xcodeBuildLogs.js","sourceRoot":"","sources":["../../src/ios/xcodeBuildLogs.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAGxB,0DAA2B;AAG3B,wCAAwD;AAEjD,KAAK,UAAU,gCAAgC,CACpD,GAA0B,EAC1B,EAAE,MAAM,EAAsB;IAE9B,IAAI;QACF,MAAM,kBAAkB,GAAG,MAAM,2BAA2B,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACrF,IAAI,kBAAkB,EAAE;YACtB,MAAM,GAAG,CAAC,eAAe,CAAC,sBAAY,CAAC,gBAAgB,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;SACxF;KACF;IAAC,OAAO,GAAQ,EAAE;QACjB,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,mCAAmC,CAAC,CAAC;KAC5D;AACH,CAAC;AAZD,4EAYC;AAEM,KAAK,UAAU,2BAA2B,CAC/C,kBAA0B;;IAE1B,MAAM,cAAc,GAAG,CAAC,MAAM,IAAA,mBAAE,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CACvF,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CACxC,CAAC;IACF,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE;QACrB,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;KAC1B;IACD,MAAM,gBAAgB,GAAG,CAAC,MAAM,IAAA,mBAAE,EAAC,wBAAwB,EAAE,EAAE,GAAG,EAAE,YAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CACtF,CAAC,YAAY,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CACxD,CAAC;IAEF,OAAO,MAAA,MAAA,cAAc,CAAC,CAAC,CAAC,mCAAI,gBAAgB,CAAC,CAAC,CAAC,mCAAI,SAAS,CAAC;AAC/D,CAAC;AAdD,kEAcC","sourcesContent":["import os from 'os';\nimport path from 'path';\n\nimport { Ios } from '@expo/eas-build-job';\nimport fg from 'fast-glob';\nimport { bunyan } from '@expo/logger';\n\nimport { ArtifactType, BuildContext } from '../context';\n\nexport async function findAndUploadXcodeBuildLogsAsync(\n  ctx: BuildContext<Ios.Job>,\n  { logger }: { logger: bunyan }\n): Promise<void> {\n  try {\n    const xcodeBuildLogsPath = await findXcodeBuildLogsPathAsync(ctx.buildLogsDirectory);\n    if (xcodeBuildLogsPath) {\n      await ctx.uploadArtifacts(ArtifactType.XCODE_BUILD_LOGS, [xcodeBuildLogsPath], logger);\n    }\n  } catch (err: any) {\n    logger.debug({ err }, 'Failed to upload Xcode build logs');\n  }\n}\n\nexport async function findXcodeBuildLogsPathAsync(\n  buildLogsDirectory: string\n): Promise<string | undefined> {\n  const customLogPaths = (await fg('*.log', { cwd: buildLogsDirectory })).map((filename) =>\n    path.join(buildLogsDirectory, filename)\n  );\n  if (customLogPaths[0]) {\n    return customLogPaths[0];\n  }\n  const fallbackLogPaths = (await fg('Library/Logs/gym/*.log', { cwd: os.homedir() })).map(\n    (relativePath) => path.join(os.homedir(), relativePath)\n  );\n\n  return customLogPaths[0] ?? fallbackLogPaths[0] ?? undefined;\n}\n"]}

package/dist/steps/easFunctions.d.ts

@@ -1,4 +1,5 @@
 import { Job } from '@expo/eas-build-job';
 import { BuildFunction } from '@expo/steps';
 import { BuildContext } from '../context';
-export declare function getEasFunctions<T extends Job>(ctx: BuildContext<T>): BuildFunction[];
+import { CustomBuildContext } from '../customBuildContext';
+export declare function getEasFunctions(ctx: CustomBuildContext, oldCtx: BuildContext<Job>): BuildFunction[];

package/dist/steps/easFunctions.js

@@ -9,15 +9,16 @@ const runGradle_1 = require("./functions/utils/runGradle");
 const prebuild_1 = require("./functions/eas/prebuild");
 const buildReactNativeApp_1 = require("./functions/eas/buildReactNativeApp");
 const findAndUploadBuildArtifacts_1 = require("./functions/eas/findAndUploadBuildArtifacts");
-function getEasFunctions(ctx) {
+function getEasFunctions(ctx, oldCtx // TODO: remove
+) {
     return [
         (0, checkout_1.createCheckoutBuildFunction)(),
         (0, uploadArtifact_1.createUploadArtifactBuildFunction)(ctx),
         (0, setUpNpmrc_1.createSetUpNpmrcBuildFunction)(ctx),
         (0, installNodeModules_1.createInstallNodeModulesBuildFunction)(ctx),
         (0, prebuild_1.createPrebuildBuildFunction)(ctx),
-        (0, runGradle_1.createRunGradleBuildFunction)(ctx),
-        (0, buildReactNativeApp_1.createBuildReactNativeAppBuildFunction)(ctx),
+        (0, runGradle_1.createRunGradleBuildFunction)(oldCtx),
+        (0, buildReactNativeApp_1.createBuildReactNativeAppBuildFunction)(oldCtx),
         (0, findAndUploadBuildArtifacts_1.createFindAndUploadBuildArtifactsBuildFunction)(ctx),
     ];
 }

package/dist/steps/easFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"easFunctions.js","sourceRoot":"","sources":["../../src/steps/easFunctions.ts"],"names":[],"mappings":";;;AAKA,qEAAqF;AACrF,uDAAuE;AACvE,2DAA2E;AAC3E,2EAA2F;AAC3F,2DAA2E;AAC3E,uDAAuE;AACvE,6EAA6F;AAC7F,6FAA6G;AAE7G,SAAgB,eAAe,CAAgB,GAAoB;IACjE,OAAO;QACL,IAAA,sCAA2B,GAAE;QAC7B,IAAA,kDAAiC,EAAC,GAAG,CAAC;QACtC,IAAA,0CAA6B,EAAC,GAAG,CAAC;QAClC,IAAA,0DAAqC,EAAC,GAAG,CAAC;QAC1C,IAAA,sCAA2B,EAAC,GAAG,CAAC;QAChC,IAAA,wCAA4B,EAAC,GAAG,CAAC;QACjC,IAAA,4DAAsC,EAAC,GAAG,CAAC;QAC3C,IAAA,4EAA8C,EAAC,GAAG,CAAC;KACpD,CAAC;AACJ,CAAC;AAXD,0CAWC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport { BuildFunction } from '@expo/steps';\n\nimport { BuildContext } from '../context';\n\nimport { createUploadArtifactBuildFunction } from './functions/utils/uploadArtifact';\nimport { createCheckoutBuildFunction } from './functions/eas/checkout';\nimport { createSetUpNpmrcBuildFunction } from './functions/eas/setUpNpmrc';\nimport { createInstallNodeModulesBuildFunction } from './functions/eas/installNodeModules';\nimport { createRunGradleBuildFunction } from './functions/utils/runGradle';\nimport { createPrebuildBuildFunction } from './functions/eas/prebuild';\nimport { createBuildReactNativeAppBuildFunction } from './functions/eas/buildReactNativeApp';\nimport { createFindAndUploadBuildArtifactsBuildFunction } from './functions/eas/findAndUploadBuildArtifacts';\n\nexport function getEasFunctions<T extends Job>(ctx: BuildContext<T>): BuildFunction[] {\n  return [\n    createCheckoutBuildFunction(),\n    createUploadArtifactBuildFunction(ctx),\n    createSetUpNpmrcBuildFunction(ctx),\n    createInstallNodeModulesBuildFunction(ctx),\n    createPrebuildBuildFunction(ctx),\n    createRunGradleBuildFunction(ctx),\n    createBuildReactNativeAppBuildFunction(ctx),\n    createFindAndUploadBuildArtifactsBuildFunction(ctx),\n  ];\n}\n"]}
+{"version":3,"file":"easFunctions.js","sourceRoot":"","sources":["../../src/steps/easFunctions.ts"],"names":[],"mappings":";;;AAMA,qEAAqF;AACrF,uDAAuE;AACvE,2DAA2E;AAC3E,2EAA2F;AAC3F,2DAA2E;AAC3E,uDAAuE;AACvE,6EAA6F;AAC7F,6FAA6G;AAE7G,SAAgB,eAAe,CAC7B,GAAuB,EACvB,MAAyB,CAAC,eAAe;;IAEzC,OAAO;QACL,IAAA,sCAA2B,GAAE;QAC7B,IAAA,kDAAiC,EAAC,GAAG,CAAC;QACtC,IAAA,0CAA6B,EAAC,GAAG,CAAC;QAClC,IAAA,0DAAqC,EAAC,GAAG,CAAC;QAC1C,IAAA,sCAA2B,EAAC,GAAG,CAAC;QAChC,IAAA,wCAA4B,EAAC,MAAM,CAAC;QACpC,IAAA,4DAAsC,EAAC,MAAM,CAAC;QAC9C,IAAA,4EAA8C,EAAC,GAAG,CAAC;KACpD,CAAC;AACJ,CAAC;AAdD,0CAcC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport { BuildFunction } from '@expo/steps';\n\nimport { BuildContext } from '../context';\nimport { CustomBuildContext } from '../customBuildContext';\n\nimport { createUploadArtifactBuildFunction } from './functions/utils/uploadArtifact';\nimport { createCheckoutBuildFunction } from './functions/eas/checkout';\nimport { createSetUpNpmrcBuildFunction } from './functions/eas/setUpNpmrc';\nimport { createInstallNodeModulesBuildFunction } from './functions/eas/installNodeModules';\nimport { createRunGradleBuildFunction } from './functions/utils/runGradle';\nimport { createPrebuildBuildFunction } from './functions/eas/prebuild';\nimport { createBuildReactNativeAppBuildFunction } from './functions/eas/buildReactNativeApp';\nimport { createFindAndUploadBuildArtifactsBuildFunction } from './functions/eas/findAndUploadBuildArtifacts';\n\nexport function getEasFunctions(\n  ctx: CustomBuildContext,\n  oldCtx: BuildContext<Job> // TODO: remove\n): BuildFunction[] {\n  return [\n    createCheckoutBuildFunction(),\n    createUploadArtifactBuildFunction(ctx),\n    createSetUpNpmrcBuildFunction(ctx),\n    createInstallNodeModulesBuildFunction(ctx),\n    createPrebuildBuildFunction(ctx),\n    createRunGradleBuildFunction(oldCtx),\n    createBuildReactNativeAppBuildFunction(oldCtx),\n    createFindAndUploadBuildArtifactsBuildFunction(ctx),\n  ];\n}\n"]}

package/dist/steps/functions/eas/buildReactNativeApp.js

@@ -9,6 +9,8 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const steps_1 = require("@expo/steps");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const gradle_1 = require("../../../android/gradle");
+const resolve_1 = require("../../utils/ios/resolve");
+const fastlane_1 = require("../../utils/ios/fastlane");
 function createBuildReactNativeAppBuildFunction(ctx) {
     return new steps_1.BuildFunction({
         namespace: 'eas',
@@ -28,7 +30,21 @@ function createBuildReactNativeAppBuildFunction(ctx) {
                 });
             }
             else {
-                throw new steps_1.errors.BuildStepRuntimeError('iOS builds are not supported yet');
+                const iosCtx = ctx;
+                const iosDir = path_1.default.join(stepsCtx.workingDirectory, 'ios');
+                if (!(await fs_extra_1.default.exists(iosDir))) {
+                    throw new steps_1.errors.BuildStepRuntimeError(`iOS project directory (${iosDir}) does not exist. Make sure that the working directory for this step (${stepsCtx.workingDirectory}) is set to the root of your React Native project. If you are on a managed workflow, make sure that you have run "eas/prebuild" step to generate your native code.`);
+                }
+                const scheme = (0, resolve_1.resolveScheme)(iosCtx.job, { workingDir: stepsCtx.workingDirectory });
+                const buildConfiguration = (0, resolve_1.resolveBuildConfiguration)(iosCtx.job);
+                await (0, fastlane_1.runFastlaneGym)({
+                    scheme,
+                    buildConfiguration,
+                    workingDir: stepsCtx.workingDirectory,
+                    logger: stepsCtx.logger,
+                    buildLogsDirectory: ctx.buildLogsDirectory,
+                    env: ctx.env,
+                });
             }
         },
     });

package/dist/steps/functions/eas/buildReactNativeApp.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildReactNativeApp.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/buildReactNativeApp.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uDAA6D;AAC7D,uCAAoD;AACpD,wDAA0B;AAG1B,oDAAiF;AAEjF,SAAgB,sCAAsC,CACpD,GAAoB;IAEpB,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,wBAAwB;QAC5B,IAAI,EAAE,wBAAwB;QAC9B,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACrB,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,wBAAQ,CAAC,OAAO,EAAE;gBACzC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;gBACnE,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE;oBAClC,MAAM,IAAI,cAAM,CAAC,qBAAqB,CACpC,8BAA8B,UAAU,yEAAyE,QAAQ,CAAC,gBAAgB,oKAAoK,CAC/S,CAAC;iBACH;gBACD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;gBACjD,MAAM,IAAA,yBAAgB,EAAC,GAAgC,EAAE;oBACvD,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,aAAa,EAAE,IAAA,6BAAoB,EAAC,GAAG,CAAC,GAAG,CAAC;oBAC5C,UAAU;iBACX,CAAC,CAAC;aACJ;iBAAM;gBACL,MAAM,IAAI,cAAM,CAAC,qBAAqB,CAAC,kCAAkC,CAAC,CAAC;aAC5E;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AA1BD,wFA0BC","sourcesContent":["import path from 'path';\n\nimport { Android, Job, Platform } from '@expo/eas-build-job';\nimport { BuildFunction, errors } from '@expo/steps';\nimport fs from 'fs-extra';\n\nimport { BuildContext } from '../../../context';\nimport { resolveGradleCommand, runGradleCommand } from '../../../android/gradle';\n\nexport function createBuildReactNativeAppBuildFunction<T extends Job>(\n  ctx: BuildContext<T>\n): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'build_react_native_app',\n    name: 'Build React Native app',\n    fn: async (stepsCtx) => {\n      if (ctx.job.platform === Platform.ANDROID) {\n        const androidDir = path.join(stepsCtx.workingDirectory, 'android');\n        if (!(await fs.exists(androidDir))) {\n          throw new errors.BuildStepRuntimeError(\n            `Android project directory (${androidDir}) does not exist. Make sure that the working directory for this step (${stepsCtx.workingDirectory}) is set to the root of your React Native project. If you are on a managed workflow, make sure that you have run \"eas/prebuild\" step to generate your native code.`\n          );\n        }\n        stepsCtx.logger.info('Building Android project');\n        await runGradleCommand(ctx as BuildContext<Android.Job>, {\n          logger: stepsCtx.logger,\n          gradleCommand: resolveGradleCommand(ctx.job),\n          androidDir,\n        });\n      } else {\n        throw new errors.BuildStepRuntimeError('iOS builds are not supported yet');\n      }\n    },\n  });\n}\n"]}
+{"version":3,"file":"buildReactNativeApp.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/buildReactNativeApp.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uDAAkE;AAClE,uCAAoD;AACpD,wDAA0B;AAG1B,oDAAiF;AACjF,qDAAmF;AACnF,uDAA0D;AAE1D,SAAgB,sCAAsC,CACpD,GAAoB;IAEpB,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,wBAAwB;QAC5B,IAAI,EAAE,wBAAwB;QAC9B,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACrB,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,wBAAQ,CAAC,OAAO,EAAE;gBACzC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;gBACnE,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE;oBAClC,MAAM,IAAI,cAAM,CAAC,qBAAqB,CACpC,8BAA8B,UAAU,yEAAyE,QAAQ,CAAC,gBAAgB,oKAAoK,CAC/S,CAAC;iBACH;gBACD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;gBACjD,MAAM,IAAA,yBAAgB,EAAC,GAAgC,EAAE;oBACvD,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,aAAa,EAAE,IAAA,6BAAoB,EAAC,GAAG,CAAC,GAAG,CAAC;oBAC5C,UAAU;iBACX,CAAC,CAAC;aACJ;iBAAM;gBACL,MAAM,MAAM,GAAG,GAA4B,CAAC;gBAC5C,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;gBAC3D,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE;oBAC9B,MAAM,IAAI,cAAM,CAAC,qBAAqB,CACpC,0BAA0B,MAAM,yEAAyE,QAAQ,CAAC,gBAAgB,oKAAoK,CACvS,CAAC;iBACH;gBACD,MAAM,MAAM,GAAG,IAAA,uBAAa,EAAC,MAAM,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;gBACpF,MAAM,kBAAkB,GAAG,IAAA,mCAAyB,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjE,MAAM,IAAA,yBAAc,EAAC;oBACnB,MAAM;oBACN,kBAAkB;oBAClB,UAAU,EAAE,QAAQ,CAAC,gBAAgB;oBACrC,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;oBAC1C,GAAG,EAAE,GAAG,CAAC,GAAG;iBACb,CAAC,CAAC;aACJ;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AA1CD,wFA0CC","sourcesContent":["import path from 'path';\n\nimport { Android, Ios, Job, Platform } from '@expo/eas-build-job';\nimport { BuildFunction, errors } from '@expo/steps';\nimport fs from 'fs-extra';\n\nimport { BuildContext } from '../../../context';\nimport { resolveGradleCommand, runGradleCommand } from '../../../android/gradle';\nimport { resolveBuildConfiguration, resolveScheme } from '../../utils/ios/resolve';\nimport { runFastlaneGym } from '../../utils/ios/fastlane';\n\nexport function createBuildReactNativeAppBuildFunction<T extends Job>(\n  ctx: BuildContext<T>\n): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'build_react_native_app',\n    name: 'Build React Native app',\n    fn: async (stepsCtx) => {\n      if (ctx.job.platform === Platform.ANDROID) {\n        const androidDir = path.join(stepsCtx.workingDirectory, 'android');\n        if (!(await fs.exists(androidDir))) {\n          throw new errors.BuildStepRuntimeError(\n            `Android project directory (${androidDir}) does not exist. Make sure that the working directory for this step (${stepsCtx.workingDirectory}) is set to the root of your React Native project. If you are on a managed workflow, make sure that you have run \"eas/prebuild\" step to generate your native code.`\n          );\n        }\n        stepsCtx.logger.info('Building Android project');\n        await runGradleCommand(ctx as BuildContext<Android.Job>, {\n          logger: stepsCtx.logger,\n          gradleCommand: resolveGradleCommand(ctx.job),\n          androidDir,\n        });\n      } else {\n        const iosCtx = ctx as BuildContext<Ios.Job>;\n        const iosDir = path.join(stepsCtx.workingDirectory, 'ios');\n        if (!(await fs.exists(iosDir))) {\n          throw new errors.BuildStepRuntimeError(\n            `iOS project directory (${iosDir}) does not exist. Make sure that the working directory for this step (${stepsCtx.workingDirectory}) is set to the root of your React Native project. If you are on a managed workflow, make sure that you have run \"eas/prebuild\" step to generate your native code.`\n          );\n        }\n        const scheme = resolveScheme(iosCtx.job, { workingDir: stepsCtx.workingDirectory });\n        const buildConfiguration = resolveBuildConfiguration(iosCtx.job);\n        await runFastlaneGym({\n          scheme,\n          buildConfiguration,\n          workingDir: stepsCtx.workingDirectory,\n          logger: stepsCtx.logger,\n          buildLogsDirectory: ctx.buildLogsDirectory,\n          env: ctx.env,\n        });\n      }\n    },\n  });\n}\n"]}

package/dist/steps/functions/eas/checkout.js

@@ -13,7 +13,7 @@ function createCheckoutBuildFunction() {
         name: 'Checkout',
         fn: async (stepsCtx) => {
             stepsCtx.logger.info('Checking out project directory');
-            await fs_extra_1.default.move(stepsCtx.projectSourceDirectory, stepsCtx.projectTargetDirectory, {
+            await fs_extra_1.default.move(stepsCtx.global.projectSourceDirectory, stepsCtx.global.projectTargetDirectory, {
                 overwrite: true,
             });
         },

package/dist/steps/functions/eas/checkout.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkout.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/checkout.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA4C;AAC5C,wDAA0B;AAE1B,SAAgB,2BAA2B;IACzC,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,UAAU;QACd,IAAI,EAAE,UAAU;QAChB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACrB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YACvD,MAAM,kBAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE,QAAQ,CAAC,sBAAsB,EAAE;gBAC9E,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAZD,kEAYC","sourcesContent":["import { BuildFunction } from '@expo/steps';\nimport fs from 'fs-extra';\n\nexport function createCheckoutBuildFunction(): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'checkout',\n    name: 'Checkout',\n    fn: async (stepsCtx) => {\n      stepsCtx.logger.info('Checking out project directory');\n      await fs.move(stepsCtx.projectSourceDirectory, stepsCtx.projectTargetDirectory, {\n        overwrite: true,\n      });\n    },\n  });\n}\n"]}
+{"version":3,"file":"checkout.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/checkout.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA4C;AAC5C,wDAA0B;AAE1B,SAAgB,2BAA2B;IACzC,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,UAAU;QACd,IAAI,EAAE,UAAU;QAChB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACrB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YACvD,MAAM,kBAAE,CAAC,IAAI,CACX,QAAQ,CAAC,MAAM,CAAC,sBAAsB,EACtC,QAAQ,CAAC,MAAM,CAAC,sBAAsB,EACtC;gBACE,SAAS,EAAE,IAAI;aAChB,CACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAhBD,kEAgBC","sourcesContent":["import { BuildFunction } from '@expo/steps';\nimport fs from 'fs-extra';\n\nexport function createCheckoutBuildFunction(): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'checkout',\n    name: 'Checkout',\n    fn: async (stepsCtx) => {\n      stepsCtx.logger.info('Checking out project directory');\n      await fs.move(\n        stepsCtx.global.projectSourceDirectory,\n        stepsCtx.global.projectTargetDirectory,\n        {\n          overwrite: true,\n        }\n      );\n    },\n  });\n}\n"]}

package/dist/steps/functions/eas/findAndUploadBuildArtifacts.d.ts

@@ -1,4 +1,3 @@
-import { Job } from '@expo/eas-build-job';
 import { BuildFunction } from '@expo/steps';
-import { BuildContext } from '../../../context';
-export declare function createFindAndUploadBuildArtifactsBuildFunction<T extends Job>(ctx: BuildContext<T>): BuildFunction;
+import { CustomBuildContext } from '../../../customBuildContext';
+export declare function createFindAndUploadBuildArtifactsBuildFunction(ctx: CustomBuildContext): BuildFunction;

package/dist/steps/functions/eas/findAndUploadBuildArtifacts.js

@@ -1,28 +1,75 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFindAndUploadBuildArtifactsBuildFunction = void 0;
+const path_1 = __importDefault(require("path"));
 const eas_build_job_1 = require("@expo/eas-build-job");
 const steps_1 = require("@expo/steps");
+const context_1 = require("../../../context");
 const artifacts_1 = require("../../../utils/artifacts");
-const resolve_1 = require("../../../ios/resolve");
+const xcodeBuildLogs_1 = require("../../../ios/xcodeBuildLogs");
 function createFindAndUploadBuildArtifactsBuildFunction(ctx) {
     return new steps_1.BuildFunction({
         namespace: 'eas',
         id: 'find_and_upload_build_artifacts',
         name: 'Find and upload build artifacts',
-        fn: async (stepsCtx) => {
-            var _a;
+        fn: async (stepCtx) => {
+            var _a, _b;
+            const { logger } = stepCtx;
             const applicationArchivePatternOrPath = ctx.job.platform === eas_build_job_1.Platform.ANDROID
                 ? (_a = ctx.job.applicationArchivePath) !== null && _a !== void 0 ? _a : 'android/app/build/outputs/**/*.{apk,aab}'
-                : (0, resolve_1.resolveArtifactPath)(ctx);
-            await (0, artifacts_1.uploadApplicationArchive)(ctx, {
-                logger: stepsCtx.logger,
-                rootDir: stepsCtx.workingDirectory,
-                patternOrPath: applicationArchivePatternOrPath,
-            });
-            await (0, artifacts_1.maybeFindAndUploadBuildArtifacts)(ctx, stepsCtx.logger);
+                : resolveIosArtifactPath(ctx.job);
+            const applicationArchives = await (0, artifacts_1.findArtifacts)(stepCtx.workingDirectory, applicationArchivePatternOrPath, logger);
+            logger.info(`Application archive${applicationArchives.length > 1 ? 's' : ''}: ${applicationArchives.join(', ')}`);
+            const buildArtifacts = (await Promise.all(((_b = ctx.job.buildArtifactPaths) !== null && _b !== void 0 ? _b : []).map((path) => (0, artifacts_1.findArtifacts)(ctx.projectTargetDirectory, path, logger)))).flat();
+            if (buildArtifacts.length > 0) {
+                logger.info(`Found additional build artifacts: ${buildArtifacts.join(', ')}`);
+            }
+            logger.info('Uploading...');
+            const [archiveUpload, artifactsUpload, xcodeBuildLogsUpload] = await Promise.allSettled([
+                ctx.runtimeApi.uploadArtifacts(context_1.ArtifactType.APPLICATION_ARCHIVE, applicationArchives, logger),
+                (async () => {
+                    if (buildArtifacts.length > 0) {
+                        await ctx.runtimeApi.uploadArtifacts(context_1.ArtifactType.BUILD_ARTIFACTS, buildArtifacts, logger);
+                    }
+                })(),
+                (async () => {
+                    if (ctx.job.platform !== eas_build_job_1.Platform.IOS) {
+                        return;
+                    }
+                    const xcodeBuildLogsPath = await (0, xcodeBuildLogs_1.findXcodeBuildLogsPathAsync)(path_1.default.resolve(ctx.projectTargetDirectory, '../logs'));
+                    if (xcodeBuildLogsPath) {
+                        await ctx.runtimeApi.uploadArtifacts(context_1.ArtifactType.XCODE_BUILD_LOGS, [xcodeBuildLogsPath], logger);
+                    }
+                })(),
+            ]);
+            if (archiveUpload.status === 'rejected') {
+                logger.error('Failed to upload application archive.');
+                throw archiveUpload.reason;
+            }
+            if (artifactsUpload.status === 'rejected') {
+                logger.error('Failed to upload build artifacts.');
+                throw artifactsUpload.reason;
+            }
+            if (xcodeBuildLogsUpload.status === 'rejected') {
+                logger.error(`Failed to upload Xcode build logs. ${xcodeBuildLogsUpload.reason}`);
+            }
+            logger.info('Upload finished');
         },
     });
 }
 exports.createFindAndUploadBuildArtifactsBuildFunction = createFindAndUploadBuildArtifactsBuildFunction;
+function resolveIosArtifactPath(job) {
+    if (job.applicationArchivePath) {
+        return job.applicationArchivePath;
+    }
+    else if (job.simulator) {
+        return 'ios/build/Build/Products/*simulator/*.app';
+    }
+    else {
+        return 'ios/build/*.ipa';
+    }
+}
 //# sourceMappingURL=findAndUploadBuildArtifacts.js.map

package/dist/steps/functions/eas/findAndUploadBuildArtifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"findAndUploadBuildArtifacts.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/findAndUploadBuildArtifacts.ts"],"names":[],"mappings":";;;AAAA,uDAAyD;AACzD,uCAA4C;AAG5C,wDAGkC;AAClC,kDAA2D;AAE3D,SAAgB,8CAA8C,CAC5D,GAAoB;IAEpB,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,iCAAiC;QACrC,IAAI,EAAE,iCAAiC;QACvC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;;YACrB,MAAM,+BAA+B,GACnC,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,wBAAQ,CAAC,OAAO;gBACnC,CAAC,CAAC,MAAA,GAAG,CAAC,GAAG,CAAC,sBAAsB,mCAAI,0CAA0C;gBAC9E,CAAC,CAAC,IAAA,6BAAmB,EAAC,GAA4B,CAAC,CAAC;YACxD,MAAM,IAAA,oCAAwB,EAAC,GAAG,EAAE;gBAClC,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,OAAO,EAAE,QAAQ,CAAC,gBAAgB;gBAClC,aAAa,EAAE,+BAA+B;aAC/C,CAAC,CAAC;YACH,MAAM,IAAA,4CAAgC,EAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/D,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AApBD,wGAoBC","sourcesContent":["import { Ios, Job, Platform } from '@expo/eas-build-job';\nimport { BuildFunction } from '@expo/steps';\n\nimport { BuildContext } from '../../../context';\nimport {\n  maybeFindAndUploadBuildArtifacts,\n  uploadApplicationArchive,\n} from '../../../utils/artifacts';\nimport { resolveArtifactPath } from '../../../ios/resolve';\n\nexport function createFindAndUploadBuildArtifactsBuildFunction<T extends Job>(\n  ctx: BuildContext<T>\n): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'find_and_upload_build_artifacts',\n    name: 'Find and upload build artifacts',\n    fn: async (stepsCtx) => {\n      const applicationArchivePatternOrPath =\n        ctx.job.platform === Platform.ANDROID\n          ? ctx.job.applicationArchivePath ?? 'android/app/build/outputs/**/*.{apk,aab}'\n          : resolveArtifactPath(ctx as BuildContext<Ios.Job>);\n      await uploadApplicationArchive(ctx, {\n        logger: stepsCtx.logger,\n        rootDir: stepsCtx.workingDirectory,\n        patternOrPath: applicationArchivePatternOrPath,\n      });\n      await maybeFindAndUploadBuildArtifacts(ctx, stepsCtx.logger);\n    },\n  });\n}\n"]}
+{"version":3,"file":"findAndUploadBuildArtifacts.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/findAndUploadBuildArtifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\n\nimport { Ios, Platform } from '@expo/eas-build-job';\nimport { BuildFunction } from '@expo/steps';\n\nimport { ArtifactType } from '../../../context';\nimport { findArtifacts } from '../../../utils/artifacts';\nimport { findXcodeBuildLogsPathAsync } from '../../../ios/xcodeBuildLogs';\nimport { CustomBuildContext } from '../../../customBuildContext';\n\nexport function createFindAndUploadBuildArtifactsBuildFunction(\n  ctx: CustomBuildContext\n): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'find_and_upload_build_artifacts',\n    name: 'Find and upload build artifacts',\n    fn: async (stepCtx) => {\n      const { logger } = stepCtx;\n      const applicationArchivePatternOrPath =\n        ctx.job.platform === Platform.ANDROID\n          ? ctx.job.applicationArchivePath ?? 'android/app/build/outputs/**/*.{apk,aab}'\n          : resolveIosArtifactPath(ctx.job);\n      const applicationArchives = await findArtifacts(\n        stepCtx.workingDirectory,\n        applicationArchivePatternOrPath,\n        logger\n      );\n      logger.info(\n        `Application archive${\n          applicationArchives.length > 1 ? 's' : ''\n        }: ${applicationArchives.join(', ')}`\n      );\n      const buildArtifacts = (\n        await Promise.all(\n          (ctx.job.buildArtifactPaths ?? []).map((path) =>\n            findArtifacts(ctx.projectTargetDirectory, path, logger)\n          )\n        )\n      ).flat();\n      if (buildArtifacts.length > 0) {\n        logger.info(`Found additional build artifacts: ${buildArtifacts.join(', ')}`);\n      }\n\n      logger.info('Uploading...');\n      const [archiveUpload, artifactsUpload, xcodeBuildLogsUpload] = await Promise.allSettled([\n        ctx.runtimeApi.uploadArtifacts(\n          ArtifactType.APPLICATION_ARCHIVE,\n          applicationArchives,\n          logger\n        ),\n        (async () => {\n          if (buildArtifacts.length > 0) {\n            await ctx.runtimeApi.uploadArtifacts(\n              ArtifactType.BUILD_ARTIFACTS,\n              buildArtifacts,\n              logger\n            );\n          }\n        })(),\n        (async () => {\n          if (ctx.job.platform !== Platform.IOS) {\n            return;\n          }\n          const xcodeBuildLogsPath = await findXcodeBuildLogsPathAsync(\n            path.resolve(ctx.projectTargetDirectory, '../logs')\n          );\n          if (xcodeBuildLogsPath) {\n            await ctx.runtimeApi.uploadArtifacts(\n              ArtifactType.XCODE_BUILD_LOGS,\n              [xcodeBuildLogsPath],\n              logger\n            );\n          }\n        })(),\n      ]);\n      if (archiveUpload.status === 'rejected') {\n        logger.error('Failed to upload application archive.');\n        throw archiveUpload.reason;\n      }\n      if (artifactsUpload.status === 'rejected') {\n        logger.error('Failed to upload build artifacts.');\n        throw artifactsUpload.reason;\n      }\n      if (xcodeBuildLogsUpload.status === 'rejected') {\n        logger.error(`Failed to upload Xcode build logs. ${xcodeBuildLogsUpload.reason}`);\n      }\n      logger.info('Upload finished');\n    },\n  });\n}\n\nfunction resolveIosArtifactPath(job: Ios.Job): string {\n  if (job.applicationArchivePath) {\n    return job.applicationArchivePath;\n  } else if (job.simulator) {\n    return 'ios/build/Build/Products/*simulator/*.app';\n  } else {\n    return 'ios/build/*.ipa';\n  }\n}\n"]}

package/dist/steps/functions/eas/installNodeModules.d.ts

@@ -1,4 +1,5 @@
-import { Job } from '@expo/eas-build-job';
-import { BuildFunction } from '@expo/steps';
-import { BuildContext } from '../../../context';
-export declare function createInstallNodeModulesBuildFunction<T extends Job>(ctx: BuildContext<T>): BuildFunction;
+import { BuildFunction, BuildStepEnv } from '@expo/steps';
+import { BuildStepContext } from '@expo/steps/dist_esm/BuildStepContext';
+import { CustomBuildContext } from '../../../customBuildContext';
+export declare function createInstallNodeModulesBuildFunction(ctx: CustomBuildContext): BuildFunction;
+export declare function installNodeModules(stepCtx: BuildStepContext, ctx: CustomBuildContext, env: BuildStepEnv): Promise<void>;

package/dist/steps/functions/eas/installNodeModules.js

@@ -1,20 +1,44 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createInstallNodeModulesBuildFunction = void 0;
+exports.installNodeModules = exports.createInstallNodeModulesBuildFunction = void 0;
 const steps_1 = require("@expo/steps");
-const installDependencies_1 = require("../../../common/installDependencies");
+const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
+const packageManager_1 = require("../../../utils/packageManager");
+const project_1 = require("../../../utils/project");
 function createInstallNodeModulesBuildFunction(ctx) {
     return new steps_1.BuildFunction({
         namespace: 'eas',
         id: 'install_node_modules',
         name: 'Install node modules',
-        fn: async (stepsCtx) => {
-            await (0, installDependencies_1.installDependenciesAsync)(ctx, {
-                logger: stepsCtx.logger,
-                workingDir: stepsCtx.workingDirectory,
-            });
+        fn: async (stepCtx, { env }) => {
+            await installNodeModules(stepCtx, ctx, env);
         },
     });
 }
 exports.createInstallNodeModulesBuildFunction = createInstallNodeModulesBuildFunction;
+async function installNodeModules(stepCtx, ctx, env) {
+    const { logger } = stepCtx;
+    const packageManager = (0, packageManager_1.resolvePackageManager)(ctx.projectTargetDirectory);
+    const packagerRunDir = (0, packageManager_1.findPackagerRootDir)(stepCtx.workingDirectory);
+    let args = ['install'];
+    if (packageManager === packageManager_1.PackageManager.PNPM) {
+        args = ['install', '--no-frozen-lockfile'];
+    }
+    else if (packageManager === packageManager_1.PackageManager.YARN) {
+        const isYarn2 = await (0, project_1.isUsingYarn2)(stepCtx.workingDirectory);
+        if (isYarn2) {
+            args = ['install', '--no-immutable'];
+        }
+    }
+    logger.info(`Running "${packageManager} ${args.join(' ')}" in ${packagerRunDir} directory`);
+    await (0, turtle_spawn_1.default)(packageManager, args, {
+        cwd: packagerRunDir,
+        logger: stepCtx.logger,
+        env,
+    });
+}
+exports.installNodeModules = installNodeModules;
 //# sourceMappingURL=installNodeModules.js.map

package/dist/steps/functions/eas/installNodeModules.js.map

@@ -1 +1 @@
-{"version":3,"file":"installNodeModules.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/installNodeModules.ts"],"names":[],"mappings":";;;AACA,uCAA4C;AAG5C,6EAA+E;AAE/E,SAAgB,qCAAqC,CACnD,GAAoB;IAEpB,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,sBAAsB;QAC1B,IAAI,EAAE,sBAAsB;QAC5B,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACrB,MAAM,IAAA,8CAAwB,EAAC,GAAG,EAAE;gBAClC,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,UAAU,EAAE,QAAQ,CAAC,gBAAgB;aACtC,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAdD,sFAcC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport { BuildFunction } from '@expo/steps';\n\nimport { BuildContext } from '../../../context';\nimport { installDependenciesAsync } from '../../../common/installDependencies';\n\nexport function createInstallNodeModulesBuildFunction<T extends Job>(\n  ctx: BuildContext<T>\n): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'install_node_modules',\n    name: 'Install node modules',\n    fn: async (stepsCtx) => {\n      await installDependenciesAsync(ctx, {\n        logger: stepsCtx.logger,\n        workingDir: stepsCtx.workingDirectory,\n      });\n    },\n  });\n}\n"]}
+{"version":3,"file":"installNodeModules.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/installNodeModules.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA0D;AAE1D,sEAAuC;AAGvC,kEAIuC;AACvC,oDAAsD;AAEtD,SAAgB,qCAAqC,CAAC,GAAuB;IAC3E,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,sBAAsB;QAC1B,IAAI,EAAE,sBAAsB;QAC5B,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;YAC7B,MAAM,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AATD,sFASC;AAEM,KAAK,UAAU,kBAAkB,CACtC,OAAyB,EACzB,GAAuB,EACvB,GAAiB;IAEjB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,cAAc,GAAG,IAAA,sCAAqB,EAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,IAAA,oCAAmB,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACrE,IAAI,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,IAAI,cAAc,KAAK,+BAAc,CAAC,IAAI,EAAE;QAC1C,IAAI,GAAG,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;KAC5C;SAAM,IAAI,cAAc,KAAK,+BAAc,CAAC,IAAI,EAAE;QACjD,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAY,EAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC7D,IAAI,OAAO,EAAE;YACX,IAAI,GAAG,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;SACtC;KACF;IACD,MAAM,CAAC,IAAI,CAAC,YAAY,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,cAAc,YAAY,CAAC,CAAC;IAC5F,MAAM,IAAA,sBAAK,EAAC,cAAc,EAAE,IAAI,EAAE;QAChC,GAAG,EAAE,cAAc;QACnB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;AAvBD,gDAuBC","sourcesContent":["import { BuildFunction, BuildStepEnv } from '@expo/steps';\nimport { BuildStepContext } from '@expo/steps/dist_esm/BuildStepContext';\nimport spawn from '@expo/turtle-spawn';\n\nimport { CustomBuildContext } from '../../../customBuildContext';\nimport {\n  findPackagerRootDir,\n  PackageManager,\n  resolvePackageManager,\n} from '../../../utils/packageManager';\nimport { isUsingYarn2 } from '../../../utils/project';\n\nexport function createInstallNodeModulesBuildFunction(ctx: CustomBuildContext): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'install_node_modules',\n    name: 'Install node modules',\n    fn: async (stepCtx, { env }) => {\n      await installNodeModules(stepCtx, ctx, env);\n    },\n  });\n}\n\nexport async function installNodeModules(\n  stepCtx: BuildStepContext,\n  ctx: CustomBuildContext,\n  env: BuildStepEnv\n): Promise<void> {\n  const { logger } = stepCtx;\n  const packageManager = resolvePackageManager(ctx.projectTargetDirectory);\n  const packagerRunDir = findPackagerRootDir(stepCtx.workingDirectory);\n  let args = ['install'];\n  if (packageManager === PackageManager.PNPM) {\n    args = ['install', '--no-frozen-lockfile'];\n  } else if (packageManager === PackageManager.YARN) {\n    const isYarn2 = await isUsingYarn2(stepCtx.workingDirectory);\n    if (isYarn2) {\n      args = ['install', '--no-immutable'];\n    }\n  }\n  logger.info(`Running \"${packageManager} ${args.join(' ')}\" in ${packagerRunDir} directory`);\n  await spawn(packageManager, args, {\n    cwd: packagerRunDir,\n    logger: stepCtx.logger,\n    env,\n  });\n}\n"]}

package/dist/steps/functions/eas/prebuild.d.ts

@@ -1,4 +1,3 @@
-import { Job } from '@expo/eas-build-job';
 import { BuildFunction } from '@expo/steps';
-import { BuildContext } from '../../../context';
-export declare function createPrebuildBuildFunction<T extends Job>(ctx: BuildContext<T>): BuildFunction;
+import { CustomBuildContext } from '../../../customBuildContext';
+export declare function createPrebuildBuildFunction(ctx: CustomBuildContext): BuildFunction;

package/dist/steps/functions/eas/prebuild.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPrebuildBuildFunction = void 0;
 const steps_1 = require("@expo/steps");
-const prebuild_1 = require("../../../common/prebuild");
+const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
+const packageManager_1 = require("../../../utils/packageManager");
+const installNodeModules_1 = require("./installNodeModules");
 function createPrebuildBuildFunction(ctx) {
     return new steps_1.BuildFunction({
         namespace: 'eas',
@@ -11,36 +16,90 @@ function createPrebuildBuildFunction(ctx) {
         inputProviders: [
             steps_1.BuildStepInput.createProvider({
                 id: 'skip_dependency_update',
-                defaultValue: false,
-                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.BOOLEAN,
+                required: false,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
             }),
             steps_1.BuildStepInput.createProvider({
                 id: 'clean',
                 defaultValue: false,
                 allowedValueTypeName: steps_1.BuildStepInputValueTypeName.BOOLEAN,
             }),
-            steps_1.BuildStepInput.createProvider({
-                id: 'apple_team_id',
-                required: false,
-            }),
         ],
-        fn: async (stepsCtx, { inputs }) => {
-            var _a;
+        fn: async (stepCtx, { inputs, env }) => {
+            const { logger } = stepCtx;
             // TODO: make sure we can pass Apple Team ID to prebuild when adding credentials for custom builds
-            const extraEnvs = inputs.apple_team_id.value
-                ? { APPLE_TEAM_ID: inputs.apple_team_id.value.toString() }
-                : {};
-            await (0, prebuild_1.prebuildAsync)(ctx, {
-                logger: stepsCtx.logger,
-                workingDir: stepsCtx.workingDirectory,
-                options: {
-                    extraEnvs,
-                    clean: !!inputs.clean.value,
-                    skipDependencyUpdate: (_a = inputs.skip_dependency_update.value) === null || _a === void 0 ? void 0 : _a.toString(),
-                },
+            const packageManager = (0, packageManager_1.resolvePackageManager)(ctx.projectTargetDirectory);
+            const prebuildCommandArgs = getPrebuildCommandArgs(ctx.job, {
+                clean: inputs.clean.value,
+                skipDependencyUpdate: inputs.skip_dependency_update.value,
             });
+            const argsWithExpo = ['expo', ...prebuildCommandArgs];
+            const options = {
+                cwd: stepCtx.workingDirectory,
+                logger,
+                env: {
+                    EXPO_IMAGE_UTILS_NO_SHARP: '1',
+                    ...env,
+                },
+            };
+            if (packageManager === packageManager_1.PackageManager.NPM) {
+                await (0, turtle_spawn_1.default)('npx', argsWithExpo, options);
+            }
+            else if (packageManager === packageManager_1.PackageManager.YARN) {
+                await (0, turtle_spawn_1.default)('yarn', argsWithExpo, options);
+            }
+            else if (packageManager === packageManager_1.PackageManager.PNPM) {
+                await (0, turtle_spawn_1.default)('pnpm', argsWithExpo, options);
+            }
+            else {
+                throw new Error(`Unsupported package manager: ${packageManager}`);
+            }
+            await (0, installNodeModules_1.installNodeModules)(stepCtx, ctx, env);
         },
     });
 }
 exports.createPrebuildBuildFunction = createPrebuildBuildFunction;
+function getPrebuildCommandArgs(job, { clean, skipDependencyUpdate }) {
+    var _a;
+    if ((_a = job.experimental) === null || _a === void 0 ? void 0 : _a.prebuildCommand) {
+        return sanitizeUserDefinedPrebuildCommand(job.experimental.prebuildCommand, job.platform, {
+            clean,
+            skipDependencyUpdate,
+        });
+    }
+    return [
+        'prebuild',
+        '--no-install',
+        '--platform',
+        job.platform,
+        ...(skipDependencyUpdate ? ['--skip-dependency-update', skipDependencyUpdate] : []),
+        ...(clean ? ['--clean'] : []),
+    ];
+}
+// TODO: deprecate prebuildCommand in eas.json
+function sanitizeUserDefinedPrebuildCommand(userDefinedPrebuildCommand, platform, { clean, skipDependencyUpdate }) {
+    let prebuildCommand = userDefinedPrebuildCommand;
+    if (!prebuildCommand.match(/(?:--platform| -p)/)) {
+        prebuildCommand = `${prebuildCommand} --platform ${platform}`;
+    }
+    if (skipDependencyUpdate) {
+        prebuildCommand = `${prebuildCommand} --skip-dependency-update ${skipDependencyUpdate}`;
+    }
+    if (clean) {
+        prebuildCommand = `${prebuildCommand} --clean`;
+    }
+    const npxCommandPrefix = 'npx ';
+    const expoCommandPrefix = 'expo ';
+    const expoCliCommandPrefix = 'expo-cli ';
+    if (prebuildCommand.startsWith(npxCommandPrefix)) {
+        prebuildCommand = prebuildCommand.substring(npxCommandPrefix.length).trim();
+    }
+    if (prebuildCommand.startsWith(expoCommandPrefix)) {
+        prebuildCommand = prebuildCommand.substring(expoCommandPrefix.length).trim();
+    }
+    if (prebuildCommand.startsWith(expoCliCommandPrefix)) {
+        prebuildCommand = prebuildCommand.substring(expoCliCommandPrefix.length).trim();
+    }
+    return prebuildCommand.split(' ');
+}
 //# sourceMappingURL=prebuild.js.map

package/dist/steps/functions/eas/prebuild.js.map

@@ -1 +1 @@
-{"version":3,"file":"prebuild.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/prebuild.ts"],"names":[],"mappings":";;;AACA,uCAAyF;AAGzF,uDAAyD;AAEzD,SAAgB,2BAA2B,CAAgB,GAAoB;IAC7E,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,UAAU;QACd,IAAI,EAAE,UAAU;QAChB,cAAc,EAAE;YACd,sBAAc,CAAC,cAAc,CAAC;gBAC5B,EAAE,EAAE,wBAAwB;gBAC5B,YAAY,EAAE,KAAK;gBACnB,oBAAoB,EAAE,mCAA2B,CAAC,OAAO;aAC1D,CAAC;YACF,sBAAc,CAAC,cAAc,CAAC;gBAC5B,EAAE,EAAE,OAAO;gBACX,YAAY,EAAE,KAAK;gBACnB,oBAAoB,EAAE,mCAA2B,CAAC,OAAO;aAC1D,CAAC;YACF,sBAAc,CAAC,cAAc,CAAC;gBAC5B,EAAE,EAAE,eAAe;gBACnB,QAAQ,EAAE,KAAK;aAChB,CAAC;SACH;QACD,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;;YACjC,kGAAkG;YAClG,MAAM,SAAS,GAA2B,MAAM,CAAC,aAAa,CAAC,KAAK;gBAClE,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE;gBAC1D,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,IAAA,wBAAa,EAAC,GAAG,EAAE;gBACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,UAAU,EAAE,QAAQ,CAAC,gBAAgB;gBACrC,OAAO,EAAE;oBACP,SAAS;oBACT,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK;oBAC3B,oBAAoB,EAAE,MAAA,MAAM,CAAC,sBAAsB,CAAC,KAAK,0CAAE,QAAQ,EAAE;iBACtE;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AArCD,kEAqCC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';\n\nimport { BuildContext } from '../../../context';\nimport { prebuildAsync } from '../../../common/prebuild';\n\nexport function createPrebuildBuildFunction<T extends Job>(ctx: BuildContext<T>): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'prebuild',\n    name: 'Prebuild',\n    inputProviders: [\n      BuildStepInput.createProvider({\n        id: 'skip_dependency_update',\n        defaultValue: false,\n        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,\n      }),\n      BuildStepInput.createProvider({\n        id: 'clean',\n        defaultValue: false,\n        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,\n      }),\n      BuildStepInput.createProvider({\n        id: 'apple_team_id',\n        required: false,\n      }),\n    ],\n    fn: async (stepsCtx, { inputs }) => {\n      // TODO: make sure we can pass Apple Team ID to prebuild when adding credentials for custom builds\n      const extraEnvs: Record<string, string> = inputs.apple_team_id.value\n        ? { APPLE_TEAM_ID: inputs.apple_team_id.value.toString() }\n        : {};\n      await prebuildAsync(ctx, {\n        logger: stepsCtx.logger,\n        workingDir: stepsCtx.workingDirectory,\n        options: {\n          extraEnvs,\n          clean: !!inputs.clean.value,\n          skipDependencyUpdate: inputs.skip_dependency_update.value?.toString(),\n        },\n      });\n    },\n  });\n}\n"]}
+{"version":3,"file":"prebuild.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/prebuild.ts"],"names":[],"mappings":"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","sourcesContent":["import { Platform } from '@expo/config';\nimport { Job } from '@expo/eas-build-job';\nimport { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';\nimport spawn from '@expo/turtle-spawn';\n\nimport { CustomBuildContext } from '../../../customBuildContext';\nimport { PackageManager, resolvePackageManager } from '../../../utils/packageManager';\n\nimport { installNodeModules } from './installNodeModules';\n\ntype PrebuildOptions = {\n  clean?: boolean;\n  skipDependencyUpdate?: string;\n};\n\nexport function createPrebuildBuildFunction(ctx: CustomBuildContext): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'prebuild',\n    name: 'Prebuild',\n    inputProviders: [\n      BuildStepInput.createProvider({\n        id: 'skip_dependency_update',\n        required: false,\n        allowedValueTypeName: BuildStepInputValueTypeName.STRING,\n      }),\n      BuildStepInput.createProvider({\n        id: 'clean',\n        defaultValue: false,\n        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,\n      }),\n    ],\n    fn: async (stepCtx, { inputs, env }) => {\n      const { logger } = stepCtx;\n      // TODO: make sure we can pass Apple Team ID to prebuild when adding credentials for custom builds\n      const packageManager = resolvePackageManager(ctx.projectTargetDirectory);\n      const prebuildCommandArgs = getPrebuildCommandArgs(ctx.job, {\n        clean: inputs.clean.value as boolean,\n        skipDependencyUpdate: inputs.skip_dependency_update.value as string,\n      });\n      const argsWithExpo = ['expo', ...prebuildCommandArgs];\n      const options = {\n        cwd: stepCtx.workingDirectory,\n        logger,\n        env: {\n          EXPO_IMAGE_UTILS_NO_SHARP: '1',\n          ...env,\n        },\n      };\n      if (packageManager === PackageManager.NPM) {\n        await spawn('npx', argsWithExpo, options);\n      } else if (packageManager === PackageManager.YARN) {\n        await spawn('yarn', argsWithExpo, options);\n      } else if (packageManager === PackageManager.PNPM) {\n        await spawn('pnpm', argsWithExpo, options);\n      } else {\n        throw new Error(`Unsupported package manager: ${packageManager}`);\n      }\n      await installNodeModules(stepCtx, ctx, env);\n    },\n  });\n}\n\nfunction getPrebuildCommandArgs(\n  job: Job,\n  { clean, skipDependencyUpdate }: PrebuildOptions\n): string[] {\n  if (job.experimental?.prebuildCommand) {\n    return sanitizeUserDefinedPrebuildCommand(job.experimental.prebuildCommand, job.platform, {\n      clean,\n      skipDependencyUpdate,\n    });\n  }\n  return [\n    'prebuild',\n    '--no-install',\n    '--platform',\n    job.platform,\n    ...(skipDependencyUpdate ? ['--skip-dependency-update', skipDependencyUpdate] : []),\n    ...(clean ? ['--clean'] : []),\n  ];\n}\n\n// TODO: deprecate prebuildCommand in eas.json\nfunction sanitizeUserDefinedPrebuildCommand(\n  userDefinedPrebuildCommand: string,\n  platform: Platform,\n  { clean, skipDependencyUpdate }: PrebuildOptions\n): string[] {\n  let prebuildCommand = userDefinedPrebuildCommand;\n  if (!prebuildCommand.match(/(?:--platform| -p)/)) {\n    prebuildCommand = `${prebuildCommand} --platform ${platform}`;\n  }\n  if (skipDependencyUpdate) {\n    prebuildCommand = `${prebuildCommand} --skip-dependency-update ${skipDependencyUpdate}`;\n  }\n  if (clean) {\n    prebuildCommand = `${prebuildCommand} --clean`;\n  }\n  const npxCommandPrefix = 'npx ';\n  const expoCommandPrefix = 'expo ';\n  const expoCliCommandPrefix = 'expo-cli ';\n  if (prebuildCommand.startsWith(npxCommandPrefix)) {\n    prebuildCommand = prebuildCommand.substring(npxCommandPrefix.length).trim();\n  }\n  if (prebuildCommand.startsWith(expoCommandPrefix)) {\n    prebuildCommand = prebuildCommand.substring(expoCommandPrefix.length).trim();\n  }\n  if (prebuildCommand.startsWith(expoCliCommandPrefix)) {\n    prebuildCommand = prebuildCommand.substring(expoCliCommandPrefix.length).trim();\n  }\n  return prebuildCommand.split(' ');\n}\n"]}

package/dist/steps/functions/eas/setUpNpmrc.d.ts

@@ -1,4 +1,3 @@
-import { Job } from '@expo/eas-build-job';
 import { BuildFunction } from '@expo/steps';
-import { BuildContext } from '../../../context';
-export declare function createSetUpNpmrcBuildFunction<T extends Job>(ctx: BuildContext<T>): BuildFunction;
+import { CustomBuildContext } from '../../../customBuildContext';
+export declare function createSetUpNpmrcBuildFunction(ctx: CustomBuildContext): BuildFunction;

package/dist/steps/functions/eas/setUpNpmrc.js

@@ -1,15 +1,40 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSetUpNpmrcBuildFunction = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const steps_1 = require("@expo/steps");
-const npmrc_1 = require("../../../utils/npmrc");
+const packageManager_1 = require("../../../utils/packageManager");
+const NPMRC_TEMPLATE_PATH = path_1.default.join(__dirname, '../../templates/npmrc');
 function createSetUpNpmrcBuildFunction(ctx) {
     return new steps_1.BuildFunction({
         namespace: 'eas',
         id: 'use_npm_token',
         name: 'Use NPM_TOKEN',
-        fn: async (stepsCtx) => {
-            await (0, npmrc_1.setUpNpmrcAsync)(ctx, stepsCtx.logger);
+        fn: async (stepCtx, { env }) => {
+            const { logger } = stepCtx;
+            if (env.NPM_TOKEN) {
+                logger.info('We detected that you set the NPM_TOKEN environment variable');
+                const projectNpmrcPath = path_1.default.join(ctx.projectTargetDirectory, '.npmrc');
+                if (await fs_extra_1.default.pathExists(projectNpmrcPath)) {
+                    logger.info('.npmrc already exists in your project directory, skipping generation');
+                }
+                else {
+                    const npmrcContents = await fs_extra_1.default.readFile(NPMRC_TEMPLATE_PATH, 'utf8');
+                    logger.info('Creating .npmrc in your project directory with the following contents:');
+                    logger.info(npmrcContents);
+                    await fs_extra_1.default.copy(NPMRC_TEMPLATE_PATH, projectNpmrcPath);
+                }
+            }
+            else {
+                const projectNpmrcPath = path_1.default.join((0, packageManager_1.findPackagerRootDir)(stepCtx.workingDirectory), '.npmrc');
+                if (await fs_extra_1.default.pathExists(projectNpmrcPath)) {
+                    logger.info(`.npmrc found at ${path_1.default.relative(ctx.projectTargetDirectory, projectNpmrcPath)}`);
+                }
+            }
         },
     });
 }

package/dist/steps/functions/eas/setUpNpmrc.js.map

@@ -1 +1 @@
-{"version":3,"file":"setUpNpmrc.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/setUpNpmrc.ts"],"names":[],"mappings":";;;AACA,uCAA4C;AAG5C,gDAAuD;AAEvD,SAAgB,6BAA6B,CAAgB,GAAoB;IAC/E,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,eAAe;QACnB,IAAI,EAAE,eAAe;QACrB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACrB,MAAM,IAAA,uBAAe,EAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AATD,sEASC","sourcesContent":["import { Job } from '@expo/eas-build-job';\nimport { BuildFunction } from '@expo/steps';\n\nimport { BuildContext } from '../../../context';\nimport { setUpNpmrcAsync } from '../../../utils/npmrc';\n\nexport function createSetUpNpmrcBuildFunction<T extends Job>(ctx: BuildContext<T>): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'use_npm_token',\n    name: 'Use NPM_TOKEN',\n    fn: async (stepsCtx) => {\n      await setUpNpmrcAsync(ctx, stepsCtx.logger);\n    },\n  });\n}\n"]}
+{"version":3,"file":"setUpNpmrc.js","sourceRoot":"","sources":["../../../../src/steps/functions/eas/setUpNpmrc.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,wDAA0B;AAC1B,uCAA4C;AAG5C,kEAAoE;AAEpE,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;AAE1E,SAAgB,6BAA6B,CAAC,GAAuB;IACnE,OAAO,IAAI,qBAAa,CAAC;QACvB,SAAS,EAAE,KAAK;QAChB,EAAE,EAAE,eAAe;QACnB,IAAI,EAAE,eAAe;QACrB,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAC3B,IAAI,GAAG,CAAC,SAAS,EAAE;gBACjB,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;gBAC3E,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;gBACzE,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;oBACzC,MAAM,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;iBACrF;qBAAM;oBACL,MAAM,aAAa,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;oBACrE,MAAM,CAAC,IAAI,CAAC,wEAAwE,CAAC,CAAC;oBACtF,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBAC3B,MAAM,kBAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC;iBACtD;aACF;iBAAM;gBACL,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,IAAA,oCAAmB,EAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAC;gBAC5F,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;oBACzC,MAAM,CAAC,IAAI,CACT,mBAAmB,cAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,EAAE,CACjF,CAAC;iBACH;aACF;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AA5BD,sEA4BC","sourcesContent":["import path from 'path';\n\nimport fs from 'fs-extra';\nimport { BuildFunction } from '@expo/steps';\n\nimport { CustomBuildContext } from '../../../customBuildContext';\nimport { findPackagerRootDir } from '../../../utils/packageManager';\n\nconst NPMRC_TEMPLATE_PATH = path.join(__dirname, '../../templates/npmrc');\n\nexport function createSetUpNpmrcBuildFunction(ctx: CustomBuildContext): BuildFunction {\n  return new BuildFunction({\n    namespace: 'eas',\n    id: 'use_npm_token',\n    name: 'Use NPM_TOKEN',\n    fn: async (stepCtx, { env }) => {\n      const { logger } = stepCtx;\n      if (env.NPM_TOKEN) {\n        logger.info('We detected that you set the NPM_TOKEN environment variable');\n        const projectNpmrcPath = path.join(ctx.projectTargetDirectory, '.npmrc');\n        if (await fs.pathExists(projectNpmrcPath)) {\n          logger.info('.npmrc already exists in your project directory, skipping generation');\n        } else {\n          const npmrcContents = await fs.readFile(NPMRC_TEMPLATE_PATH, 'utf8');\n          logger.info('Creating .npmrc in your project directory with the following contents:');\n          logger.info(npmrcContents);\n          await fs.copy(NPMRC_TEMPLATE_PATH, projectNpmrcPath);\n        }\n      } else {\n        const projectNpmrcPath = path.join(findPackagerRootDir(stepCtx.workingDirectory), '.npmrc');\n        if (await fs.pathExists(projectNpmrcPath)) {\n          logger.info(\n            `.npmrc found at ${path.relative(ctx.projectTargetDirectory, projectNpmrcPath)}`\n          );\n        }\n      }\n    },\n  });\n}\n"]}