eas-cli-local-build-plugin 0.0.67 → 0.0.68

package/dist/android.js

@@ -30,16 +30,16 @@ exports.buildAndroidAsync = void 0;
 const eas_build_job_1 = require("@expo/eas-build-job");
 const build_tools_1 = require("@expo/build-tools");
 const omit_1 = __importDefault(require("lodash/omit"));
-const eject_1 = require("./eject");
 const logger_1 = __importStar(require("./logger"));
 const buildArtifact_1 = require("./buildArtifact");
 const config_1 = __importDefault(require("./config"));
+const expoCli_1 = require("./expoCli");
 async function buildAndroidAsync(job, { workingdir, env }) {
     const ctx = new build_tools_1.BuildContext(job, {
         workingdir,
         logger: logger_1.default,
         logBuffer: logger_1.logBuffer,
-        ejectProvider: new eject_1.LocalExpoCliEjectProvider(),
+        runExpoCliCommand: expoCli_1.runExpoCliCommandAsync,
         env,
         skipNativeBuild: config_1.default.skipNativeBuild,
     });

package/dist/android.js.map

@@ -1 +1 @@
-{"version":3,"file":"android.js","sourceRoot":"","sources":["../src/android.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA0D;AAC1D,mDAA2D;AAC3D,uDAA+B;AAE/B,mCAAoD;AACpD,mDAA6C;AAE7C,mDAAuD;AACvD,sDAA8B;AAEvB,KAAK,UAAU,iBAAiB,CACrC,GAAgB,EAChB,EAAE,UAAU,EAAE,GAAG,EAAe;IAEhC,MAAM,GAAG,GAAG,IAAI,0BAAY,CAAc,GAAG,EAAE;QAC7C,UAAU;QACV,MAAM,EAAN,gBAAM;QACN,SAAS,EAAT,kBAAS;QACT,aAAa,EAAE,IAAI,iCAAyB,EAAE;QAC9C,GAAG;QACH,eAAe,EAAE,gBAAM,CAAC,eAAe;KACxC,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QACzD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAA,cAAI,EAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,sBAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAEzD,OAAO,MAAM,IAAA,oCAAoB,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACxD,CAAC;AApBD,8CAoBC","sourcesContent":["import { Android, BuildPhase } from '@expo/eas-build-job';\nimport { Builders, BuildContext } from '@expo/build-tools';\nimport omit from 'lodash/omit';\n\nimport { LocalExpoCliEjectProvider } from './eject';\nimport logger, { logBuffer } from './logger';\nimport { BuildParams } from './types';\nimport { prepareBuildArtifact } from './buildArtifact';\nimport config from './config';\n\nexport async function buildAndroidAsync(\n  job: Android.Job,\n  { workingdir, env }: BuildParams\n): Promise<string | undefined> {\n  const ctx = new BuildContext<Android.Job>(job, {\n    workingdir,\n    logger,\n    logBuffer,\n    ejectProvider: new LocalExpoCliEjectProvider(),\n    env,\n    skipNativeBuild: config.skipNativeBuild,\n  });\n\n  await ctx.runBuildPhase(BuildPhase.START_BUILD, async () => {\n    ctx.logger.info({ job: omit(ctx.job, 'secrets') }, 'Starting build');\n  });\n\n  const artifactPaths = await Builders.androidBuilder(ctx);\n\n  return await prepareBuildArtifact(ctx, artifactPaths);\n}\n"]}
+{"version":3,"file":"android.js","sourceRoot":"","sources":["../src/android.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA0D;AAC1D,mDAA2D;AAC3D,uDAA+B;AAE/B,mDAA6C;AAE7C,mDAAuD;AACvD,sDAA8B;AAC9B,uCAAmD;AAE5C,KAAK,UAAU,iBAAiB,CACrC,GAAgB,EAChB,EAAE,UAAU,EAAE,GAAG,EAAe;IAEhC,MAAM,GAAG,GAAG,IAAI,0BAAY,CAAc,GAAG,EAAE;QAC7C,UAAU;QACV,MAAM,EAAN,gBAAM;QACN,SAAS,EAAT,kBAAS;QACT,iBAAiB,EAAE,gCAAsB;QACzC,GAAG;QACH,eAAe,EAAE,gBAAM,CAAC,eAAe;KACxC,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QACzD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAA,cAAI,EAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,sBAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAEzD,OAAO,MAAM,IAAA,oCAAoB,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACxD,CAAC;AApBD,8CAoBC","sourcesContent":["import { Android, BuildPhase } from '@expo/eas-build-job';\nimport { Builders, BuildContext } from '@expo/build-tools';\nimport omit from 'lodash/omit';\n\nimport logger, { logBuffer } from './logger';\nimport { BuildParams } from './types';\nimport { prepareBuildArtifact } from './buildArtifact';\nimport config from './config';\nimport { runExpoCliCommandAsync } from './expoCli';\n\nexport async function buildAndroidAsync(\n  job: Android.Job,\n  { workingdir, env }: BuildParams\n): Promise<string | undefined> {\n  const ctx = new BuildContext<Android.Job>(job, {\n    workingdir,\n    logger,\n    logBuffer,\n    runExpoCliCommand: runExpoCliCommandAsync,\n    env,\n    skipNativeBuild: config.skipNativeBuild,\n  });\n\n  await ctx.runBuildPhase(BuildPhase.START_BUILD, async () => {\n    ctx.logger.info({ job: omit(ctx.job, 'secrets') }, 'Starting build');\n  });\n\n  const artifactPaths = await Builders.androidBuilder(ctx);\n\n  return await prepareBuildArtifact(ctx, artifactPaths);\n}\n"]}

package/dist/expoCli.d.ts

@@ -0,0 +1,2 @@
+import { SpawnOptions } from '@expo/turtle-spawn';
+export declare function runExpoCliCommandAsync(command: string, options: SpawnOptions): Promise<void>;

package/dist/expoCli.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runExpoCliCommandAsync = void 0;
+const path_1 = __importDefault(require("path"));
+const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
+const expoCliPackage = require.resolve('expo-cli');
+async function runExpoCliCommandAsync(command, options) {
+    var _a, _b;
+    const expoCliBinPath = (_a = process.env.EXPO_CLI_PATH) !== null && _a !== void 0 ? _a : path_1.default.resolve(path_1.default.dirname(expoCliPackage), '../bin/expo.js');
+    (_b = options === null || options === void 0 ? void 0 : options.logger) === null || _b === void 0 ? void 0 : _b.debug(`${expoCliBinPath} ${command}`);
+    await (0, turtle_spawn_1.default)('bash', ['-c', `${expoCliBinPath} ${command}`], options);
+}
+exports.runExpoCliCommandAsync = runExpoCliCommandAsync;
+//# sourceMappingURL=expoCli.js.map

package/dist/expoCli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expoCli.js","sourceRoot":"","sources":["../src/expoCli.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,sEAA8D;AAE9D,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAE5C,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,OAAqB;;IAErB,MAAM,cAAc,GAClB,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,mCAAI,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC5F,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,KAAK,CAAC,GAAG,cAAc,IAAI,OAAO,EAAE,CAAC,CAAC;IACvD,MAAM,IAAA,sBAAU,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,cAAc,IAAI,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;AAC5E,CAAC;AARD,wDAQC","sourcesContent":["import path from 'path';\n\nimport spawnAsync, { SpawnOptions } from '@expo/turtle-spawn';\n\nconst expoCliPackage = require.resolve('expo-cli');\n\nexport async function runExpoCliCommandAsync(\n  command: string,\n  options: SpawnOptions\n): Promise<void> {\n  const expoCliBinPath =\n    process.env.EXPO_CLI_PATH ?? path.resolve(path.dirname(expoCliPackage), '../bin/expo.js');\n  options?.logger?.debug(`${expoCliBinPath} ${command}`);\n  await spawnAsync('bash', ['-c', `${expoCliBinPath} ${command}`], options);\n}\n"]}

package/dist/ios.js

@@ -30,7 +30,7 @@ exports.buildIosAsync = void 0;
 const eas_build_job_1 = require("@expo/eas-build-job");
 const build_tools_1 = require("@expo/build-tools");
 const omit_1 = __importDefault(require("lodash/omit"));
-const eject_1 = require("./eject");
+const expoCli_1 = require("./expoCli");
 const logger_1 = __importStar(require("./logger"));
 const buildArtifact_1 = require("./buildArtifact");
 const config_1 = __importDefault(require("./config"));
@@ -39,7 +39,7 @@ async function buildIosAsync(job, { workingdir, env }) {
         workingdir,
         logger: logger_1.default,
         logBuffer: logger_1.logBuffer,
-        ejectProvider: new eject_1.LocalExpoCliEjectProvider(),
+        runExpoCliCommand: expoCli_1.runExpoCliCommandAsync,
         env,
         skipNativeBuild: config_1.default.skipNativeBuild,
     });

package/dist/ios.js.map

@@ -1 +1 @@
-{"version":3,"file":"ios.js","sourceRoot":"","sources":["../src/ios.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAsD;AACtD,mDAA2D;AAC3D,uDAA+B;AAE/B,mCAAoD;AACpD,mDAA6C;AAE7C,mDAAuD;AACvD,sDAA8B;AAEvB,KAAK,UAAU,aAAa,CACjC,GAAY,EACZ,EAAE,UAAU,EAAE,GAAG,EAAe;IAEhC,MAAM,GAAG,GAAG,IAAI,0BAAY,CAAU,GAAG,EAAE;QACzC,UAAU;QACV,MAAM,EAAN,gBAAM;QACN,SAAS,EAAT,kBAAS;QACT,aAAa,EAAE,IAAI,iCAAyB,EAAE;QAC9C,GAAG;QACH,eAAe,EAAE,gBAAM,CAAC,eAAe;KACxC,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QACzD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAA,cAAI,EAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,sBAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAErD,OAAO,MAAM,IAAA,oCAAoB,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACxD,CAAC;AApBD,sCAoBC","sourcesContent":["import { Ios, BuildPhase } from '@expo/eas-build-job';\nimport { Builders, BuildContext } from '@expo/build-tools';\nimport omit from 'lodash/omit';\n\nimport { LocalExpoCliEjectProvider } from './eject';\nimport logger, { logBuffer } from './logger';\nimport { BuildParams } from './types';\nimport { prepareBuildArtifact } from './buildArtifact';\nimport config from './config';\n\nexport async function buildIosAsync(\n  job: Ios.Job,\n  { workingdir, env }: BuildParams\n): Promise<string | undefined> {\n  const ctx = new BuildContext<Ios.Job>(job, {\n    workingdir,\n    logger,\n    logBuffer,\n    ejectProvider: new LocalExpoCliEjectProvider(),\n    env,\n    skipNativeBuild: config.skipNativeBuild,\n  });\n\n  await ctx.runBuildPhase(BuildPhase.START_BUILD, async () => {\n    ctx.logger.info({ job: omit(ctx.job, 'secrets') }, 'Starting build');\n  });\n\n  const artifactPaths = await Builders.iosBuilder(ctx);\n\n  return await prepareBuildArtifact(ctx, artifactPaths);\n}\n"]}
+{"version":3,"file":"ios.js","sourceRoot":"","sources":["../src/ios.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAsD;AACtD,mDAA2D;AAC3D,uDAA+B;AAE/B,uCAAmD;AACnD,mDAA6C;AAE7C,mDAAuD;AACvD,sDAA8B;AAEvB,KAAK,UAAU,aAAa,CACjC,GAAY,EACZ,EAAE,UAAU,EAAE,GAAG,EAAe;IAEhC,MAAM,GAAG,GAAG,IAAI,0BAAY,CAAU,GAAG,EAAE;QACzC,UAAU;QACV,MAAM,EAAN,gBAAM;QACN,SAAS,EAAT,kBAAS;QACT,iBAAiB,EAAE,gCAAsB;QACzC,GAAG;QACH,eAAe,EAAE,gBAAM,CAAC,eAAe;KACxC,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QACzD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAA,cAAI,EAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,sBAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAErD,OAAO,MAAM,IAAA,oCAAoB,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACxD,CAAC;AApBD,sCAoBC","sourcesContent":["import { Ios, BuildPhase } from '@expo/eas-build-job';\nimport { Builders, BuildContext } from '@expo/build-tools';\nimport omit from 'lodash/omit';\n\nimport { runExpoCliCommandAsync } from './expoCli';\nimport logger, { logBuffer } from './logger';\nimport { BuildParams } from './types';\nimport { prepareBuildArtifact } from './buildArtifact';\nimport config from './config';\n\nexport async function buildIosAsync(\n  job: Ios.Job,\n  { workingdir, env }: BuildParams\n): Promise<string | undefined> {\n  const ctx = new BuildContext<Ios.Job>(job, {\n    workingdir,\n    logger,\n    logBuffer,\n    runExpoCliCommand: runExpoCliCommandAsync,\n    env,\n    skipNativeBuild: config.skipNativeBuild,\n  });\n\n  await ctx.runBuildPhase(BuildPhase.START_BUILD, async () => {\n    ctx.logger.info({ job: omit(ctx.job, 'secrets') }, 'Starting build');\n  });\n\n  const artifactPaths = await Builders.iosBuilder(ctx);\n\n  return await prepareBuildArtifact(ctx, artifactPaths);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eas-cli-local-build-plugin",
-  "version": "0.0.67",
+  "version": "0.0.68",
   "description": "Tool for running EAS compatible builds on a local machine.",
   "main": "dist/main.js",
   "bin": {
@@ -19,9 +19,9 @@
   "bugs": "https://github.com/expo/eas-build/issues",
   "license": "BUSL-1.1",
   "dependencies": {
-    "@expo/build-tools": "0.1.111",
+    "@expo/build-tools": "0.1.112",
     "@expo/bunyan": "^4.0.0",
-    "@expo/eas-build-job": "0.2.67",
+    "@expo/eas-build-job": "0.2.68",
     "@expo/spawn-async": "^1.5.0",
     "@expo/turtle-spawn": "0.0.22",
     "chalk": "^4.1.0",

package/src/android.ts

@@ -2,11 +2,11 @@ import { Android, BuildPhase } from '@expo/eas-build-job';
 import { Builders, BuildContext } from '@expo/build-tools';
 import omit from 'lodash/omit';
 
-import { LocalExpoCliEjectProvider } from './eject';
 import logger, { logBuffer } from './logger';
 import { BuildParams } from './types';
 import { prepareBuildArtifact } from './buildArtifact';
 import config from './config';
+import { runExpoCliCommandAsync } from './expoCli';
 
 export async function buildAndroidAsync(
   job: Android.Job,
@@ -16,7 +16,7 @@ export async function buildAndroidAsync(
     workingdir,
     logger,
     logBuffer,
-    ejectProvider: new LocalExpoCliEjectProvider(),
+    runExpoCliCommand: runExpoCliCommandAsync,
     env,
     skipNativeBuild: config.skipNativeBuild,
   });

package/src/expoCli.ts

@@ -0,0 +1,15 @@
+import path from 'path';
+
+import spawnAsync, { SpawnOptions } from '@expo/turtle-spawn';
+
+const expoCliPackage = require.resolve('expo-cli');
+
+export async function runExpoCliCommandAsync(
+  command: string,
+  options: SpawnOptions
+): Promise<void> {
+  const expoCliBinPath =
+    process.env.EXPO_CLI_PATH ?? path.resolve(path.dirname(expoCliPackage), '../bin/expo.js');
+  options?.logger?.debug(`${expoCliBinPath} ${command}`);
+  await spawnAsync('bash', ['-c', `${expoCliBinPath} ${command}`], options);
+}

package/src/ios.ts

@@ -2,7 +2,7 @@ import { Ios, BuildPhase } from '@expo/eas-build-job';
 import { Builders, BuildContext } from '@expo/build-tools';
 import omit from 'lodash/omit';
 
-import { LocalExpoCliEjectProvider } from './eject';
+import { runExpoCliCommandAsync } from './expoCli';
 import logger, { logBuffer } from './logger';
 import { BuildParams } from './types';
 import { prepareBuildArtifact } from './buildArtifact';
@@ -16,7 +16,7 @@ export async function buildIosAsync(
     workingdir,
     logger,
     logBuffer,
-    ejectProvider: new LocalExpoCliEjectProvider(),
+    runExpoCliCommand: runExpoCliCommandAsync,
     env,
     skipNativeBuild: config.skipNativeBuild,
   });

package/dist/eject.d.ts

@@ -1,6 +0,0 @@
-import { Job } from '@expo/eas-build-job';
-import { BuildContext, EjectProvider, EjectOptions } from '@expo/build-tools';
-export declare class LocalExpoCliEjectProvider implements EjectProvider<Job> {
-    runEject(ctx: BuildContext<Job>, options?: EjectOptions): Promise<void>;
-    private getPrebuildCommand;
-}

package/dist/eject.js

@@ -1,50 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalExpoCliEjectProvider = void 0;
-const path_1 = __importDefault(require("path"));
-const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
-const expoCliPackage = require.resolve('expo-cli');
-class LocalExpoCliEjectProvider {
-    async runEject(ctx, options) {
-        var _a;
-        const { logger, job } = ctx;
-        const spawnOptions = {
-            cwd: ctx.buildDirectory,
-            logger: ctx.logger,
-            env: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.extraEnvs), ctx.env),
-        };
-        const expoCliBinPath = (_a = process.env.EXPO_CLI_PATH) !== null && _a !== void 0 ? _a : path_1.default.resolve(path_1.default.dirname(expoCliPackage), '../bin/expo.js');
-        const prebuildCommand = this.getPrebuildCommand(job);
-        logger.debug(`${expoCliBinPath} ${prebuildCommand}`);
-        await (0, turtle_spawn_1.default)('bash', ['-c', `${expoCliBinPath} ${prebuildCommand}`], Object.assign(Object.assign({}, spawnOptions), { cwd: ctx.reactNativeProjectDirectory }));
-        await (0, turtle_spawn_1.default)(ctx.packageManager, ['install'], Object.assign(Object.assign({}, spawnOptions), { cwd: ctx.reactNativeProjectDirectory }));
-    }
-    getPrebuildCommand(job) {
-        var _a, _b;
-        let prebuildCommand = (_b = (_a = job.experimental) === null || _a === void 0 ? void 0 : _a.prebuildCommand) !== null && _b !== void 0 ? _b : `prebuild --non-interactive --platform ${job.platform}`;
-        if (!prebuildCommand.match(/(?:--platform| -p)/)) {
-            prebuildCommand = `${prebuildCommand} --platform ${job.platform}`;
-        }
-        if (!prebuildCommand.match(/--non-interactive/)) {
-            prebuildCommand = `${prebuildCommand} --non-interactive`;
-        }
-        const npxCommandPrefix = 'npx ';
-        const expoCommandPrefix = 'expo ';
-        const expoCliCommandPrefix = 'expo-cli ';
-        if (prebuildCommand.startsWith(npxCommandPrefix)) {
-            prebuildCommand = prebuildCommand.substr(npxCommandPrefix.length).trim();
-        }
-        if (prebuildCommand.startsWith(expoCommandPrefix)) {
-            prebuildCommand = prebuildCommand.substr(expoCommandPrefix.length).trim();
-        }
-        if (prebuildCommand.startsWith(expoCliCommandPrefix)) {
-            prebuildCommand = prebuildCommand.substr(expoCliCommandPrefix.length).trim();
-        }
-        return prebuildCommand;
-    }
-}
-exports.LocalExpoCliEjectProvider = LocalExpoCliEjectProvider;
-//# sourceMappingURL=eject.js.map

package/dist/eject.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"eject.js","sourceRoot":"","sources":["../src/eject.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAIxB,sEAA4C;AAE5C,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAEnD,MAAa,yBAAyB;IACpC,KAAK,CAAC,QAAQ,CAAC,GAAsB,EAAE,OAAsB;;QAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;QAE5B,MAAM,YAAY,GAAG;YACnB,GAAG,EAAE,GAAG,CAAC,cAAc;YACvB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,GAAG,kCACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,GAClB,GAAG,CAAC,GAAG,CACX;SACF,CAAC;QAEF,MAAM,cAAc,GAClB,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,mCAAI,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC5F,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,CAAC,KAAK,CAAC,GAAG,cAAc,IAAI,eAAe,EAAE,CAAC,CAAC;QACrD,MAAM,IAAA,sBAAU,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,cAAc,IAAI,eAAe,EAAE,CAAC,kCAClE,YAAY,KACf,GAAG,EAAE,GAAG,CAAC,2BAA2B,IACpC,CAAC;QAEH,MAAM,IAAA,sBAAU,EAAC,GAAG,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,kCAC3C,YAAY,KACf,GAAG,EAAE,GAAG,CAAC,2BAA2B,IACpC,CAAC;IACL,CAAC;IAEO,kBAAkB,CAAC,GAAQ;;QACjC,IAAI,eAAe,GACjB,MAAA,MAAA,GAAG,CAAC,YAAY,0CAAE,eAAe,mCAAI,yCAAyC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC/F,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;YAChD,eAAe,GAAG,GAAG,eAAe,eAAe,GAAG,CAAC,QAAQ,EAAE,CAAC;SACnE;QACD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE;YAC/C,eAAe,GAAG,GAAG,eAAe,oBAAoB,CAAC;SAC1D;QACD,MAAM,gBAAgB,GAAG,MAAM,CAAC;QAChC,MAAM,iBAAiB,GAAG,OAAO,CAAC;QAClC,MAAM,oBAAoB,GAAG,WAAW,CAAC;QACzC,IAAI,eAAe,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YAChD,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;SAC1E;QACD,IAAI,eAAe,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YACjD,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;SAC3E;QACD,IAAI,eAAe,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;YACpD,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;SAC9E;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;CACF;AAnDD,8DAmDC","sourcesContent":["import path from 'path';\n\nimport { Job } from '@expo/eas-build-job';\nimport { BuildContext, EjectProvider, EjectOptions } from '@expo/build-tools';\nimport spawnAsync from '@expo/turtle-spawn';\n\nconst expoCliPackage = require.resolve('expo-cli');\n\nexport class LocalExpoCliEjectProvider implements EjectProvider<Job> {\n  async runEject(ctx: BuildContext<Job>, options?: EjectOptions): Promise<void> {\n    const { logger, job } = ctx;\n\n    const spawnOptions = {\n      cwd: ctx.buildDirectory,\n      logger: ctx.logger,\n      env: {\n        ...options?.extraEnvs,\n        ...ctx.env,\n      },\n    };\n\n    const expoCliBinPath =\n      process.env.EXPO_CLI_PATH ?? path.resolve(path.dirname(expoCliPackage), '../bin/expo.js');\n    const prebuildCommand = this.getPrebuildCommand(job);\n    logger.debug(`${expoCliBinPath} ${prebuildCommand}`);\n    await spawnAsync('bash', ['-c', `${expoCliBinPath} ${prebuildCommand}`], {\n      ...spawnOptions,\n      cwd: ctx.reactNativeProjectDirectory,\n    });\n\n    await spawnAsync(ctx.packageManager, ['install'], {\n      ...spawnOptions,\n      cwd: ctx.reactNativeProjectDirectory,\n    });\n  }\n\n  private getPrebuildCommand(job: Job): string {\n    let prebuildCommand =\n      job.experimental?.prebuildCommand ?? `prebuild --non-interactive --platform ${job.platform}`;\n    if (!prebuildCommand.match(/(?:--platform| -p)/)) {\n      prebuildCommand = `${prebuildCommand} --platform ${job.platform}`;\n    }\n    if (!prebuildCommand.match(/--non-interactive/)) {\n      prebuildCommand = `${prebuildCommand} --non-interactive`;\n    }\n    const npxCommandPrefix = 'npx ';\n    const expoCommandPrefix = 'expo ';\n    const expoCliCommandPrefix = 'expo-cli ';\n    if (prebuildCommand.startsWith(npxCommandPrefix)) {\n      prebuildCommand = prebuildCommand.substr(npxCommandPrefix.length).trim();\n    }\n    if (prebuildCommand.startsWith(expoCommandPrefix)) {\n      prebuildCommand = prebuildCommand.substr(expoCommandPrefix.length).trim();\n    }\n    if (prebuildCommand.startsWith(expoCliCommandPrefix)) {\n      prebuildCommand = prebuildCommand.substr(expoCliCommandPrefix.length).trim();\n    }\n    return prebuildCommand;\n  }\n}\n"]}

package/src/eject.ts

@@ -1,60 +0,0 @@
-import path from 'path';
-
-import { Job } from '@expo/eas-build-job';
-import { BuildContext, EjectProvider, EjectOptions } from '@expo/build-tools';
-import spawnAsync from '@expo/turtle-spawn';
-
-const expoCliPackage = require.resolve('expo-cli');
-
-export class LocalExpoCliEjectProvider implements EjectProvider<Job> {
-  async runEject(ctx: BuildContext<Job>, options?: EjectOptions): Promise<void> {
-    const { logger, job } = ctx;
-
-    const spawnOptions = {
-      cwd: ctx.buildDirectory,
-      logger: ctx.logger,
-      env: {
-        ...options?.extraEnvs,
-        ...ctx.env,
-      },
-    };
-
-    const expoCliBinPath =
-      process.env.EXPO_CLI_PATH ?? path.resolve(path.dirname(expoCliPackage), '../bin/expo.js');
-    const prebuildCommand = this.getPrebuildCommand(job);
-    logger.debug(`${expoCliBinPath} ${prebuildCommand}`);
-    await spawnAsync('bash', ['-c', `${expoCliBinPath} ${prebuildCommand}`], {
-      ...spawnOptions,
-      cwd: ctx.reactNativeProjectDirectory,
-    });
-
-    await spawnAsync(ctx.packageManager, ['install'], {
-      ...spawnOptions,
-      cwd: ctx.reactNativeProjectDirectory,
-    });
-  }
-
-  private getPrebuildCommand(job: Job): string {
-    let prebuildCommand =
-      job.experimental?.prebuildCommand ?? `prebuild --non-interactive --platform ${job.platform}`;
-    if (!prebuildCommand.match(/(?:--platform| -p)/)) {
-      prebuildCommand = `${prebuildCommand} --platform ${job.platform}`;
-    }
-    if (!prebuildCommand.match(/--non-interactive/)) {
-      prebuildCommand = `${prebuildCommand} --non-interactive`;
-    }
-    const npxCommandPrefix = 'npx ';
-    const expoCommandPrefix = 'expo ';
-    const expoCliCommandPrefix = 'expo-cli ';
-    if (prebuildCommand.startsWith(npxCommandPrefix)) {
-      prebuildCommand = prebuildCommand.substr(npxCommandPrefix.length).trim();
-    }
-    if (prebuildCommand.startsWith(expoCommandPrefix)) {
-      prebuildCommand = prebuildCommand.substr(expoCommandPrefix.length).trim();
-    }
-    if (prebuildCommand.startsWith(expoCliCommandPrefix)) {
-      prebuildCommand = prebuildCommand.substr(expoCliCommandPrefix.length).trim();
-    }
-    return prebuildCommand;
-  }
-}