eoas 2.3.13-alpha.4 → 2.3.14

package/dist/commands/publish.d.ts

@@ -10,6 +10,7 @@ export default class Publish extends Command {
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         nonInteractive: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         outputDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        packageRunner: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     private sanitizeFlags;
     run(): Promise<void>;

package/dist/commands/publish.js

@@ -15,6 +15,7 @@ const fetch_1 = require("../lib/fetch");
 const log_1 = tslib_1.__importDefault(require("../lib/log"));
 const ora_1 = require("../lib/ora");
 const package_1 = require("../lib/package");
+const packageRunner_1 = require("../lib/packageRunner");
 const prompts_1 = require("../lib/prompts");
 const repo_1 = require("../lib/repo");
 const runtimeVersion_1 = require("../lib/runtimeVersion");
@@ -55,6 +56,10 @@ class Publish extends core_1.Command {
             description: "Where to write build output. You can override the default dist output directory if it's being used by something else",
             default: 'dist',
         }),
+        packageRunner: core_1.Flags.string({
+            description: 'Package runner to use for spawning Expo CLI commands (e.g. npx, bunx, pnpx). Can also be set via EOAS_PACKAGE_RUNNER env var. Defaults to npx.',
+            required: false,
+        }),
     };
     sanitizeFlags(flags) {
         return {
@@ -63,6 +68,7 @@ class Publish extends core_1.Command {
             branch: flags.branch,
             nonInteractive: flags.nonInteractive,
             outputDir: flags.outputDir,
+            packageRunner: (0, packageRunner_1.resolvePackageRunner)(flags.packageRunner, process.cwd()),
             providedDeprecatedChannel: flags.channel,
         };
     }
@@ -73,7 +79,7 @@ class Publish extends core_1.Command {
             process.exit(1);
         }
         const { flags } = await this.parse(Publish);
-        const { platform, nonInteractive, branch, outputDir, providedDeprecatedChannel, disableRepositoryCheck, } = this.sanitizeFlags(flags);
+        const { platform, nonInteractive, branch, outputDir, packageRunner, providedDeprecatedChannel, disableRepositoryCheck, } = this.sanitizeFlags(flags);
         if (!branch) {
             log_1.default.error('Branch name is required');
             process.exit(1);
@@ -93,6 +99,7 @@ class Publish extends core_1.Command {
                 ...process.env,
                 ...(providedDeprecatedChannel ? { RELEASE_CHANNEL: providedDeprecatedChannel } : {}),
             },
+            packageRunner,
         });
         const serverUrl = await (0, expoConfig_1.resolveServerUrl)(config).catch(e => {
             log_1.default.error(e.message);
@@ -170,7 +177,7 @@ class Publish extends core_1.Command {
         const exportSpinner = (0, ora_1.ora)('📦 Exporting project files...').start();
         try {
             const specifiedPlatform = platform === expoConfig_1.RequestedPlatform.All ? [] : ['--platform', platform];
-            const { stdout } = await (0, spawn_async_1.default)('npx', ['expo', 'export', '--output-dir', outputDir, ...specifiedPlatform], {
+            const { stdout } = await (0, spawn_async_1.default)(packageRunner, ['expo', 'export', '--output-dir', outputDir, ...specifiedPlatform], {
                 cwd: projectDir,
                 env: {
                     ...process.env,
@@ -186,6 +193,7 @@ class Publish extends core_1.Command {
         }
         const publicConfig = await (0, expoConfig_1.getPublicExpoConfigAsync)(projectDir, {
             skipSDKVersionRequirement: true,
+            packageRunner,
         });
         if (!publicConfig) {
             log_1.default.error('Could not find Expo config in this project. Please make sure you have an Expo config.');

package/dist/lib/expoConfig.d.ts

@@ -14,6 +14,7 @@ export interface ExpoConfigOptions {
     env?: Env;
     skipSDKVersionRequirement?: boolean;
     skipPlugins?: boolean;
+    packageRunner?: string;
 }
 export declare function getPrivateExpoConfigAsync(projectDir: string, opts?: ExpoConfigOptions): Promise<ExpoConfig>;
 export declare function ensureExpoConfigExists(projectDir: string): void;

package/dist/lib/expoConfig.js

@@ -11,6 +11,7 @@ const jscodeshift_1 = tslib_1.__importDefault(require("jscodeshift"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const log_1 = tslib_1.__importDefault(require("./log"));
 const package_1 = require("./package");
+const packageRunner_1 = require("./packageRunner");
 var RequestedPlatform;
 (function (RequestedPlatform) {
     RequestedPlatform["Android"] = "android";
@@ -27,8 +28,9 @@ async function getExpoConfigInternalAsync(projectDir, opts = {}) {
         };
         let exp;
         if ((0, package_1.isExpoInstalled)(projectDir)) {
+            const runner = (0, packageRunner_1.resolvePackageRunner)(opts.packageRunner, projectDir);
             try {
-                const { stdout } = await (0, spawn_async_1.default)('npx', ['expo', 'config', '--json', ...(opts.isPublicConfig ? ['--type', 'public'] : [])], {
+                const { stdout } = await (0, spawn_async_1.default)(runner, ['expo', 'config', '--json', ...(opts.isPublicConfig ? ['--type', 'public'] : [])], {
                     cwd: projectDir,
                     env: {
                         ...process.env,
@@ -40,7 +42,7 @@ async function getExpoConfigInternalAsync(projectDir, opts = {}) {
             }
             catch (err) {
                 if (!wasExpoConfigWarnPrinted) {
-                    log_1.default.warn(`Failed to read the app config from the project using "npx expo config" command: ${err.message}.`);
+                    log_1.default.warn(`Failed to read the app config from the project using "${runner} expo config" command: ${err.message}.`);
                     log_1.default.warn('Falling back to the version of "@expo/config" shipped with the EAS CLI.');
                     wasExpoConfigWarnPrinted = true;
                 }

package/dist/lib/packageRunner.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Resolves the package runner command to use for spawning Expo CLI commands.
+ *
+ * Priority:
+ * 1. Explicit value passed as argument (e.g. from --packageRunner CLI flag)
+ * 2. EOAS_PACKAGE_RUNNER environment variable
+ * 3. Inferred from packageManager field in package.json
+ * 4. Falls back to 'npx'
+ *
+ * Supported values: npx, bunx, pnpx, or any other package runner binary.
+ */
+export declare function resolvePackageRunner(explicit?: string, projectDir?: string): string;

package/dist/lib/packageRunner.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePackageRunner = void 0;
+const tslib_1 = require("tslib");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const DEFAULT_PACKAGE_RUNNER = 'npx';
+const VALID_RUNNER_RE = /^[a-zA-Z0-9._-]+$/;
+function assertValidRunner(value, source) {
+    if (!VALID_RUNNER_RE.test(value)) {
+        throw new Error(`Invalid package runner "${value}" (from ${source}). Expected a simple binary name like npx, bunx or pnpx.`);
+    }
+}
+const PACKAGE_MANAGER_RUNNERS = {
+    bun: 'bunx',
+    pnpm: 'pnpx',
+    yarn: 'npx',
+    npm: 'npx',
+};
+/**
+ * Resolves the package runner command to use for spawning Expo CLI commands.
+ *
+ * Priority:
+ * 1. Explicit value passed as argument (e.g. from --packageRunner CLI flag)
+ * 2. EOAS_PACKAGE_RUNNER environment variable
+ * 3. Inferred from packageManager field in package.json
+ * 4. Falls back to 'npx'
+ *
+ * Supported values: npx, bunx, pnpx, or any other package runner binary.
+ */
+function resolvePackageRunner(explicit, projectDir) {
+    if (explicit) {
+        assertValidRunner(explicit, '--packageRunner flag');
+        return explicit;
+    }
+    if (process.env.EOAS_PACKAGE_RUNNER) {
+        assertValidRunner(process.env.EOAS_PACKAGE_RUNNER, 'EOAS_PACKAGE_RUNNER environment variable');
+        return process.env.EOAS_PACKAGE_RUNNER;
+    }
+    if (projectDir) {
+        const detected = detectRunnerFromPackageJson(projectDir);
+        if (detected)
+            return detected;
+    }
+    return DEFAULT_PACKAGE_RUNNER;
+}
+exports.resolvePackageRunner = resolvePackageRunner;
+/**
+ * Walks up from projectDir to find a package.json with a packageManager field
+ * and maps it to the corresponding package runner binary.
+ */
+function detectRunnerFromPackageJson(startDir) {
+    let dir = path_1.default.resolve(startDir);
+    const root = path_1.default.parse(dir).root;
+    while (dir !== root) {
+        const pkgPath = path_1.default.join(dir, 'package.json');
+        try {
+            if (fs_extra_1.default.existsSync(pkgPath)) {
+                const pkg = fs_extra_1.default.readJsonSync(pkgPath);
+                if (pkg.packageManager) {
+                    const name = pkg.packageManager.split('@')[0];
+                    return PACKAGE_MANAGER_RUNNERS[name];
+                }
+            }
+        }
+        catch {
+            // Ignore read errors, keep walking up
+        }
+        dir = path_1.default.dirname(dir);
+    }
+    return undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoas",
-  "version": "2.3.13-alpha.4",
+  "version": "2.3.14",
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",