@expo/build-tools 0.1.150 → 0.1.151

package/dist/context.d.ts

@@ -67,6 +67,7 @@ export declare class BuildContext<TJob extends Job> {
     constructor(job: TJob, options: BuildContextOptions);
     get buildDirectory(): string;
     get buildLogsDirectory(): string;
+    get environmentSecrectsDirectory(): string;
     get reactNativeProjectDirectory(): string;
     get packageManager(): PackageManager;
     get appConfig(): ExpoConfig;
@@ -80,4 +81,5 @@ export declare class BuildContext<TJob extends Job> {
     private handleBuildPhaseError;
     private setBuildPhase;
     private endCurrentBuildPhase;
+    private getEnvironmentSecrets;
 }

package/dist/context.js

@@ -9,6 +9,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const packageManager_1 = require("./utils/packageManager");
 const detectError_1 = require("./buildErrors/detectError");
 const appConfig_1 = require("./utils/appConfig");
+const environmentSecrets_1 = require("./utils/environmentSecrets");
 var ArtifactType;
 (function (ArtifactType) {
     ArtifactType["APPLICATION_ARCHIVE"] = "APPLICATION_ARCHIVE";
@@ -23,7 +24,7 @@ class SkipNativeBuildError extends Error {
 exports.SkipNativeBuildError = SkipNativeBuildError;
 class BuildContext {
     constructor(job, options) {
-        var _a, _b;
+        var _a;
         this.job = job;
         this.artifacts = {};
         this.buildPhaseSkipped = false;
@@ -38,7 +39,8 @@ class BuildContext {
         this.reportError = options.reportError;
         this.metadata = options.metadata;
         this.skipNativeBuild = options.skipNativeBuild;
-        this.env = Object.assign(Object.assign(Object.assign({}, options.env), (_a = job === null || job === void 0 ? void 0 : job.builderEnvironment) === null || _a === void 0 ? void 0 : _a.env), (_b = job === null || job === void 0 ? void 0 : job.secrets) === null || _b === void 0 ? void 0 : _b.environmentSecrets);
+        const environmentSecrets = this.getEnvironmentSecrets(job);
+        this.env = Object.assign(Object.assign(Object.assign({}, options.env), (_a = job === null || job === void 0 ? void 0 : job.builderEnvironment) === null || _a === void 0 ? void 0 : _a.env), environmentSecrets);
     }
     get buildDirectory() {
         return path_1.default.join(this.workingdir, 'build');
@@ -46,6 +48,9 @@ class BuildContext {
     get buildLogsDirectory() {
         return path_1.default.join(this.workingdir, 'logs');
     }
+    get environmentSecrectsDirectory() {
+        return path_1.default.join(this.workingdir, 'environment-secrets');
+    }
     get reactNativeProjectDirectory() {
         return path_1.default.join(this.buildDirectory, this.job.projectRootDirectory);
     }
@@ -131,6 +136,27 @@ class BuildContext {
         this.buildPhaseSkipped = false;
         this.buildPhaseHasWarnings = false;
     }
+    getEnvironmentSecrets(job) {
+        var _a, _b;
+        if (Array.isArray((_a = job === null || job === void 0 ? void 0 : job.secrets) === null || _a === void 0 ? void 0 : _a.environmentSecrets)) {
+            const environmentSecrets = {};
+            for (const { name, type, value } of job.secrets.environmentSecrets) {
+                if (type === eas_build_job_1.EnvironmentSecretType.STRING) {
+                    environmentSecrets[name] = value;
+                }
+                else {
+                    environmentSecrets[name] = (0, environmentSecrets_1.createTemporaryEnvironmentSecretFile)(this.environmentSecrectsDirectory, value);
+                }
+            }
+            return environmentSecrets;
+        }
+        else if ((_b = job === null || job === void 0 ? void 0 : job.secrets) === null || _b === void 0 ? void 0 : _b.environmentSecrets) {
+            return Object.assign({}, job.secrets.environmentSecrets);
+        }
+        else {
+            return {};
+        }
+    }
 }
 exports.BuildContext = BuildContext;
 //# sourceMappingURL=context.js.map

package/dist/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\n\nimport {\n  BuildPhase,\n  BuildPhaseResult,\n  Job,\n  LogMarker,\n  Env,\n  errors,\n  Metadata,\n} from '@expo/eas-build-job';\nimport { ExpoConfig } from '@expo/config';\nimport { bunyan } from '@expo/logger';\nimport { SpawnPromise, SpawnOptions, SpawnResult } from '@expo/turtle-spawn';\n\nimport { PackageManager, resolvePackageManager } from './utils/packageManager';\nimport { resolveBuildPhaseError } from './buildErrors/detectError';\nimport { readAppConfig } from './utils/appConfig';\n\nexport enum ArtifactType {\n  APPLICATION_ARCHIVE = 'APPLICATION_ARCHIVE',\n  BUILD_ARTIFACTS = 'BUILD_ARTIFACTS',\n  /**\n   * @deprecated\n   */\n  XCODE_BUILD_LOGS = 'XCODE_BUILD_LOGS',\n}\n\nexport type Artifacts = Partial<Record<ArtifactType, string>>;\n\nexport interface CacheManager {\n  saveCache(ctx: BuildContext<Job>): Promise<void>;\n  restoreCache(ctx: BuildContext<Job>): Promise<void>;\n}\n\nexport interface LogBuffer {\n  getLogs(): string[];\n  getPhaseLogs(buildPhase: string): string[];\n}\n\nexport interface BuildContextOptions {\n  workingdir: string;\n  logger: bunyan;\n  logBuffer: LogBuffer;\n  env: Env;\n  cacheManager?: CacheManager;\n  /**\n   * @deprecated\n   */\n  runGlobalExpoCliCommand: (args: string, options: SpawnOptions) => SpawnPromise<SpawnResult>;\n  uploadArtifacts: (type: ArtifactType, paths: string[], logger?: bunyan) => Promise<string | null>;\n  reportError?: (\n    msg: string,\n    err?: Error,\n    options?: { tags?: Record<string, string>; extras?: Record<string, string> }\n  ) => void;\n  skipNativeBuild?: boolean;\n  metadata?: Metadata;\n}\n\nexport class SkipNativeBuildError extends Error {}\n\nexport class BuildContext<TJob extends Job> {\n  public readonly workingdir: string;\n  public logger: bunyan;\n  public readonly logBuffer: LogBuffer;\n  public readonly env: Env;\n  public readonly cacheManager?: CacheManager;\n  /**\n   * @deprecated\n   */\n  public readonly runGlobalExpoCliCommand: (\n    args: string,\n    options: SpawnOptions\n  ) => SpawnPromise<SpawnResult>;\n  public readonly reportError?: (\n    msg: string,\n    err?: Error,\n    options?: { tags?: Record<string, string>; extras?: Record<string, string> }\n  ) => void;\n  public readonly metadata?: Metadata;\n  public readonly skipNativeBuild?: boolean;\n  public artifacts: Artifacts = {};\n\n  private readonly defaultLogger: bunyan;\n  private readonly _uploadArtifacts: (\n    type: ArtifactType,\n    paths: string[],\n    logger?: bunyan\n  ) => Promise<string | null>;\n  private buildPhase?: BuildPhase;\n  private buildPhaseSkipped = false;\n  private buildPhaseHasWarnings = false;\n  private _appConfig?: ExpoConfig;\n\n  constructor(public readonly job: TJob, options: BuildContextOptions) {\n    this.workingdir = options.workingdir;\n    this.defaultLogger = options.logger;\n    this.logger = this.defaultLogger;\n    this.logBuffer = options.logBuffer;\n    this.cacheManager = options.cacheManager;\n    this.runGlobalExpoCliCommand = options.runGlobalExpoCliCommand;\n    this._uploadArtifacts = options.uploadArtifacts;\n    this.reportError = options.reportError;\n    this.metadata = options.metadata;\n    this.skipNativeBuild = options.skipNativeBuild;\n    this.env = {\n      ...options.env,\n      ...job?.builderEnvironment?.env,\n      ...job?.secrets?.environmentSecrets,\n    };\n  }\n\n  public get buildDirectory(): string {\n    return path.join(this.workingdir, 'build');\n  }\n  public get buildLogsDirectory(): string {\n    return path.join(this.workingdir, 'logs');\n  }\n  public get reactNativeProjectDirectory(): string {\n    return path.join(this.buildDirectory, this.job.projectRootDirectory);\n  }\n  public get packageManager(): PackageManager {\n    return resolvePackageManager(this.reactNativeProjectDirectory);\n  }\n  public get appConfig(): ExpoConfig {\n    if (!this._appConfig) {\n      this._appConfig = readAppConfig(this.reactNativeProjectDirectory, this.env, this.logger).exp;\n    }\n    return this._appConfig;\n  }\n\n  public async runBuildPhase<T>(\n    buildPhase: BuildPhase,\n    phase: () => Promise<T>,\n    {\n      doNotMarkStart = false,\n      doNotMarkEnd = false,\n    }: {\n      doNotMarkStart?: boolean;\n      doNotMarkEnd?: boolean;\n    } = {}\n  ): Promise<T> {\n    try {\n      this.setBuildPhase(buildPhase, { doNotMarkStart });\n      const result = await phase();\n      const buildPhaseResult: BuildPhaseResult = this.buildPhaseSkipped\n        ? BuildPhaseResult.SKIPPED\n        : this.buildPhaseHasWarnings\n        ? BuildPhaseResult.WARNING\n        : BuildPhaseResult.SUCCESS;\n      this.endCurrentBuildPhase({ result: buildPhaseResult, doNotMarkEnd });\n      return result;\n    } catch (err: any) {\n      const resolvedError = this.handleBuildPhaseError(err, buildPhase);\n      this.endCurrentBuildPhase({ result: BuildPhaseResult.FAIL });\n      throw resolvedError;\n    }\n  }\n\n  public markBuildPhaseSkipped(): void {\n    this.buildPhaseSkipped = true;\n  }\n\n  public markBuildPhaseHasWarnings(): void {\n    this.buildPhaseHasWarnings = true;\n  }\n\n  public async uploadArtifacts(\n    type: ArtifactType,\n    paths: string[],\n    logger?: bunyan\n  ): Promise<void> {\n    const url = await this._uploadArtifacts(type, paths, logger);\n    if (url) {\n      this.artifacts[type] = url;\n    }\n  }\n\n  private handleBuildPhaseError(err: any, buildPhase: BuildPhase): errors.BuildError {\n    const buildError = resolveBuildPhaseError(err, this.logBuffer.getPhaseLogs(buildPhase), {\n      job: this.job,\n      phase: buildPhase,\n      env: this.env,\n    });\n    if (buildError.errorCode === errors.ErrorCode.UNKNOWN_ERROR) {\n      // leaving message empty, website will display err.stack which already includes err.message\n      this.logger.error({ err }, '');\n    } else {\n      this.logger.error(`Error: ${buildError.userFacingMessage}`);\n    }\n    return buildError;\n  }\n\n  private setBuildPhase(buildPhase: BuildPhase, { doNotMarkStart = false } = {}): void {\n    if (this.buildPhase) {\n      if (this.buildPhase === buildPhase) {\n        return;\n      } else {\n        this.logger.info(\n          { marker: LogMarker.END_PHASE, result: BuildPhaseResult.UNKNOWN },\n          `End phase: ${this.buildPhase}`\n        );\n        this.logger = this.defaultLogger;\n      }\n    }\n    this.buildPhase = buildPhase;\n    this.logger = this.defaultLogger.child({ phase: buildPhase });\n    if (!doNotMarkStart) {\n      this.logger.info({ marker: LogMarker.START_PHASE }, `Start phase: ${this.buildPhase}`);\n    }\n  }\n\n  private endCurrentBuildPhase({\n    result,\n    doNotMarkEnd = false,\n  }: {\n    result: BuildPhaseResult;\n    doNotMarkEnd?: boolean;\n  }): void {\n    if (!this.buildPhase) {\n      return;\n    }\n    if (!doNotMarkEnd) {\n      this.logger.info({ marker: LogMarker.END_PHASE, result }, `End phase: ${this.buildPhase}`);\n    }\n    this.logger = this.defaultLogger;\n    this.buildPhase = undefined;\n    this.buildPhaseSkipped = false;\n    this.buildPhaseHasWarnings = false;\n  }\n}\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\n\nimport {\n  BuildPhase,\n  BuildPhaseResult,\n  Job,\n  LogMarker,\n  Env,\n  errors,\n  Metadata,\n  EnvironmentSecretType,\n} from '@expo/eas-build-job';\nimport { ExpoConfig } from '@expo/config';\nimport { bunyan } from '@expo/logger';\nimport { SpawnPromise, SpawnOptions, SpawnResult } from '@expo/turtle-spawn';\n\nimport { PackageManager, resolvePackageManager } from './utils/packageManager';\nimport { resolveBuildPhaseError } from './buildErrors/detectError';\nimport { readAppConfig } from './utils/appConfig';\nimport { createTemporaryEnvironmentSecretFile } from './utils/environmentSecrets';\n\nexport enum ArtifactType {\n  APPLICATION_ARCHIVE = 'APPLICATION_ARCHIVE',\n  BUILD_ARTIFACTS = 'BUILD_ARTIFACTS',\n  /**\n   * @deprecated\n   */\n  XCODE_BUILD_LOGS = 'XCODE_BUILD_LOGS',\n}\n\nexport type Artifacts = Partial<Record<ArtifactType, string>>;\n\nexport interface CacheManager {\n  saveCache(ctx: BuildContext<Job>): Promise<void>;\n  restoreCache(ctx: BuildContext<Job>): Promise<void>;\n}\n\nexport interface LogBuffer {\n  getLogs(): string[];\n  getPhaseLogs(buildPhase: string): string[];\n}\n\nexport interface BuildContextOptions {\n  workingdir: string;\n  logger: bunyan;\n  logBuffer: LogBuffer;\n  env: Env;\n  cacheManager?: CacheManager;\n  /**\n   * @deprecated\n   */\n  runGlobalExpoCliCommand: (args: string, options: SpawnOptions) => SpawnPromise<SpawnResult>;\n  uploadArtifacts: (type: ArtifactType, paths: string[], logger?: bunyan) => Promise<string | null>;\n  reportError?: (\n    msg: string,\n    err?: Error,\n    options?: { tags?: Record<string, string>; extras?: Record<string, string> }\n  ) => void;\n  skipNativeBuild?: boolean;\n  metadata?: Metadata;\n}\n\nexport class SkipNativeBuildError extends Error {}\n\nexport class BuildContext<TJob extends Job> {\n  public readonly workingdir: string;\n  public logger: bunyan;\n  public readonly logBuffer: LogBuffer;\n  public readonly env: Env;\n  public readonly cacheManager?: CacheManager;\n  /**\n   * @deprecated\n   */\n  public readonly runGlobalExpoCliCommand: (\n    args: string,\n    options: SpawnOptions\n  ) => SpawnPromise<SpawnResult>;\n  public readonly reportError?: (\n    msg: string,\n    err?: Error,\n    options?: { tags?: Record<string, string>; extras?: Record<string, string> }\n  ) => void;\n  public readonly metadata?: Metadata;\n  public readonly skipNativeBuild?: boolean;\n  public artifacts: Artifacts = {};\n\n  private readonly defaultLogger: bunyan;\n  private readonly _uploadArtifacts: (\n    type: ArtifactType,\n    paths: string[],\n    logger?: bunyan\n  ) => Promise<string | null>;\n  private buildPhase?: BuildPhase;\n  private buildPhaseSkipped = false;\n  private buildPhaseHasWarnings = false;\n  private _appConfig?: ExpoConfig;\n\n  constructor(public readonly job: TJob, options: BuildContextOptions) {\n    this.workingdir = options.workingdir;\n    this.defaultLogger = options.logger;\n    this.logger = this.defaultLogger;\n    this.logBuffer = options.logBuffer;\n    this.cacheManager = options.cacheManager;\n    this.runGlobalExpoCliCommand = options.runGlobalExpoCliCommand;\n    this._uploadArtifacts = options.uploadArtifacts;\n    this.reportError = options.reportError;\n    this.metadata = options.metadata;\n    this.skipNativeBuild = options.skipNativeBuild;\n\n    const environmentSecrets = this.getEnvironmentSecrets(job);\n    this.env = {\n      ...options.env,\n      ...job?.builderEnvironment?.env,\n      ...environmentSecrets,\n    };\n  }\n\n  public get buildDirectory(): string {\n    return path.join(this.workingdir, 'build');\n  }\n  public get buildLogsDirectory(): string {\n    return path.join(this.workingdir, 'logs');\n  }\n  public get environmentSecrectsDirectory(): string {\n    return path.join(this.workingdir, 'environment-secrets');\n  }\n  public get reactNativeProjectDirectory(): string {\n    return path.join(this.buildDirectory, this.job.projectRootDirectory);\n  }\n  public get packageManager(): PackageManager {\n    return resolvePackageManager(this.reactNativeProjectDirectory);\n  }\n  public get appConfig(): ExpoConfig {\n    if (!this._appConfig) {\n      this._appConfig = readAppConfig(this.reactNativeProjectDirectory, this.env, this.logger).exp;\n    }\n    return this._appConfig;\n  }\n\n  public async runBuildPhase<T>(\n    buildPhase: BuildPhase,\n    phase: () => Promise<T>,\n    {\n      doNotMarkStart = false,\n      doNotMarkEnd = false,\n    }: {\n      doNotMarkStart?: boolean;\n      doNotMarkEnd?: boolean;\n    } = {}\n  ): Promise<T> {\n    try {\n      this.setBuildPhase(buildPhase, { doNotMarkStart });\n      const result = await phase();\n      const buildPhaseResult: BuildPhaseResult = this.buildPhaseSkipped\n        ? BuildPhaseResult.SKIPPED\n        : this.buildPhaseHasWarnings\n        ? BuildPhaseResult.WARNING\n        : BuildPhaseResult.SUCCESS;\n      this.endCurrentBuildPhase({ result: buildPhaseResult, doNotMarkEnd });\n      return result;\n    } catch (err: any) {\n      const resolvedError = this.handleBuildPhaseError(err, buildPhase);\n      this.endCurrentBuildPhase({ result: BuildPhaseResult.FAIL });\n      throw resolvedError;\n    }\n  }\n\n  public markBuildPhaseSkipped(): void {\n    this.buildPhaseSkipped = true;\n  }\n\n  public markBuildPhaseHasWarnings(): void {\n    this.buildPhaseHasWarnings = true;\n  }\n\n  public async uploadArtifacts(\n    type: ArtifactType,\n    paths: string[],\n    logger?: bunyan\n  ): Promise<void> {\n    const url = await this._uploadArtifacts(type, paths, logger);\n    if (url) {\n      this.artifacts[type] = url;\n    }\n  }\n\n  private handleBuildPhaseError(err: any, buildPhase: BuildPhase): errors.BuildError {\n    const buildError = resolveBuildPhaseError(err, this.logBuffer.getPhaseLogs(buildPhase), {\n      job: this.job,\n      phase: buildPhase,\n      env: this.env,\n    });\n    if (buildError.errorCode === errors.ErrorCode.UNKNOWN_ERROR) {\n      // leaving message empty, website will display err.stack which already includes err.message\n      this.logger.error({ err }, '');\n    } else {\n      this.logger.error(`Error: ${buildError.userFacingMessage}`);\n    }\n    return buildError;\n  }\n\n  private setBuildPhase(buildPhase: BuildPhase, { doNotMarkStart = false } = {}): void {\n    if (this.buildPhase) {\n      if (this.buildPhase === buildPhase) {\n        return;\n      } else {\n        this.logger.info(\n          { marker: LogMarker.END_PHASE, result: BuildPhaseResult.UNKNOWN },\n          `End phase: ${this.buildPhase}`\n        );\n        this.logger = this.defaultLogger;\n      }\n    }\n    this.buildPhase = buildPhase;\n    this.logger = this.defaultLogger.child({ phase: buildPhase });\n    if (!doNotMarkStart) {\n      this.logger.info({ marker: LogMarker.START_PHASE }, `Start phase: ${this.buildPhase}`);\n    }\n  }\n\n  private endCurrentBuildPhase({\n    result,\n    doNotMarkEnd = false,\n  }: {\n    result: BuildPhaseResult;\n    doNotMarkEnd?: boolean;\n  }): void {\n    if (!this.buildPhase) {\n      return;\n    }\n    if (!doNotMarkEnd) {\n      this.logger.info({ marker: LogMarker.END_PHASE, result }, `End phase: ${this.buildPhase}`);\n    }\n    this.logger = this.defaultLogger;\n    this.buildPhase = undefined;\n    this.buildPhaseSkipped = false;\n    this.buildPhaseHasWarnings = false;\n  }\n\n  private getEnvironmentSecrets(job: TJob): Record<string, string> {\n    if (Array.isArray(job?.secrets?.environmentSecrets)) {\n      const environmentSecrets: Record<string, string> = {};\n      for (const { name, type, value } of job.secrets.environmentSecrets) {\n        if (type === EnvironmentSecretType.STRING) {\n          environmentSecrets[name] = value;\n        } else {\n          environmentSecrets[name] = createTemporaryEnvironmentSecretFile(\n            this.environmentSecrectsDirectory,\n            value\n          );\n        }\n      }\n      return environmentSecrets;\n    } else if (job?.secrets?.environmentSecrets) {\n      return { ...job.secrets.environmentSecrets };\n    } else {\n      return {};\n    }\n  }\n}\n"]}

package/dist/utils/environmentSecrets.d.ts

@@ -0,0 +1 @@
+export declare function createTemporaryEnvironmentSecretFile(secretsDir: string, value: string): string;

package/dist/utils/environmentSecrets.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTemporaryEnvironmentSecretFile = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const uuid_1 = require("uuid");
+function createTemporaryEnvironmentSecretFile(secretsDir, value) {
+    const randomFilePath = path_1.default.join(secretsDir, (0, uuid_1.v4)());
+    fs_1.default.writeFileSync(randomFilePath, Buffer.from(value, 'base64'));
+    return randomFilePath;
+}
+exports.createTemporaryEnvironmentSecretFile = createTemporaryEnvironmentSecretFile;
+//# sourceMappingURL=environmentSecrets.js.map

package/dist/utils/environmentSecrets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"environmentSecrets.js","sourceRoot":"","sources":["../../src/utils/environmentSecrets.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAExB,+BAAkC;AAElC,SAAgB,oCAAoC,CAAC,UAAkB,EAAE,KAAa;IACpF,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAA,SAAI,GAAE,CAAC,CAAC;IACrD,YAAE,CAAC,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC/D,OAAO,cAAc,CAAC;AACxB,CAAC;AAJD,oFAIC","sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport { v4 as uuid } from 'uuid';\n\nexport function createTemporaryEnvironmentSecretFile(secretsDir: string, value: string): string {\n  const randomFilePath = path.join(secretsDir, uuid());\n  fs.writeFileSync(randomFilePath, Buffer.from(value, 'base64'));\n  return randomFilePath;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "0.1.150",
+  "version": "0.1.151",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -22,7 +22,7 @@
     "@expo/config": "7.0.1",
     "@expo/config-plugins": "5.0.1",
     "@expo/downloader": "0.0.21",
-    "@expo/eas-build-job": "0.2.91",
+    "@expo/eas-build-job": "0.2.92",
     "@expo/logger": "0.0.24",
     "@expo/package-manager": "0.0.54",
     "@expo/plist": "^0.0.11",