From af445668fed92239abcdb76e2bcc716ad1b943f9 Mon Sep 17 00:00:00 2001 From: rikur Date: Sun, 28 Apr 2024 15:06:38 +0100 Subject: [PATCH] fix: use bunx or npx --- build/continuous-deploy-fingerprint/index.js | 7 +++++-- build/preview-build/index.js | 4 +++- build/preview/index.js | 4 +++- bun.lockb | Bin 393116 -> 392804 bytes src/actions/continuous-deploy-fingerprint.ts | 3 ++- src/project.ts | 4 +++- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/build/continuous-deploy-fingerprint/index.js b/build/continuous-deploy-fingerprint/index.js index 92a03de41..31ccf05d2 100644 --- a/build/continuous-deploy-fingerprint/index.js +++ b/build/continuous-deploy-fingerprint/index.js @@ -42390,6 +42390,7 @@ exports.getPullRequestFromGitCommitShaAsync = getPullRequestFromGitCommitShaAsyn Object.defineProperty(exports, "__esModule", ({ value: true })); exports.loadProjectConfig = void 0; const exec_1 = __nccwpck_require__(1514); +const io_1 = __nccwpck_require__(7436); /** * Load the Expo app project config in the given directory. * This runs `expo config` command instead of using `@expo/config` directly, @@ -42398,7 +42399,8 @@ const exec_1 = __nccwpck_require__(1514); async function loadProjectConfig(cwd) { let stdout = ''; try { - ({ stdout } = await (0, exec_1.getExecOutput)('npx', ['expo', 'config', '--json', '--type', 'public'], { + const cmd = await Promise.any([(0, io_1.which)('bunx'), (0, io_1.which)('npx')]); + ({ stdout } = await (0, exec_1.getExecOutput)(cmd, ['expo', 'config', '--json', '--type', 'public'], { cwd, silent: true, })); @@ -44610,7 +44612,8 @@ exports.continuousDeployFingerprintAction = continuousDeployFingerprintAction; async function getFingerprintHashForPlatformAsync({ cwd, platform, }) { try { const extraArgs = (0, core_1.isDebug)() ? ['--debug'] : []; - const { stdout } = await (0, exec_1.getExecOutput)('npx', ['expo-updates', 'fingerprint:generate', '--platform', platform, ...extraArgs], { + const cmd = await Promise.any([(0, io_1.which)('bunx'), (0, io_1.which)('npx')]); + const { stdout } = await (0, exec_1.getExecOutput)(cmd, ['expo-updates', 'fingerprint:generate', '--platform', platform, ...extraArgs], { cwd, silent: !(0, core_1.isDebug)(), }); diff --git a/build/preview-build/index.js b/build/preview-build/index.js index 155c0f10e..3c9c9a691 100644 --- a/build/preview-build/index.js +++ b/build/preview-build/index.js @@ -90057,6 +90057,7 @@ exports.installPackage = installPackage; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.loadProjectConfig = void 0; const exec_1 = __nccwpck_require__(1514); +const io_1 = __nccwpck_require__(7436); /** * Load the Expo app project config in the given directory. * This runs `expo config` command instead of using `@expo/config` directly, @@ -90065,7 +90066,8 @@ const exec_1 = __nccwpck_require__(1514); async function loadProjectConfig(cwd) { let stdout = ''; try { - ({ stdout } = await (0, exec_1.getExecOutput)('npx', ['expo', 'config', '--json', '--type', 'public'], { + const cmd = await Promise.any([(0, io_1.which)('bunx'), (0, io_1.which)('npx')]); + ({ stdout } = await (0, exec_1.getExecOutput)(cmd, ['expo', 'config', '--json', '--type', 'public'], { cwd, silent: true, })); diff --git a/build/preview/index.js b/build/preview/index.js index eeeb74560..5a6bce1a7 100644 --- a/build/preview/index.js +++ b/build/preview/index.js @@ -42598,6 +42598,7 @@ exports.getPullRequestFromGitCommitShaAsync = getPullRequestFromGitCommitShaAsyn Object.defineProperty(exports, "__esModule", ({ value: true })); exports.loadProjectConfig = void 0; const exec_1 = __nccwpck_require__(1514); +const io_1 = __nccwpck_require__(7436); /** * Load the Expo app project config in the given directory. * This runs `expo config` command instead of using `@expo/config` directly, @@ -42606,7 +42607,8 @@ const exec_1 = __nccwpck_require__(1514); async function loadProjectConfig(cwd) { let stdout = ''; try { - ({ stdout } = await (0, exec_1.getExecOutput)('npx', ['expo', 'config', '--json', '--type', 'public'], { + const cmd = await Promise.any([(0, io_1.which)('bunx'), (0, io_1.which)('npx')]); + ({ stdout } = await (0, exec_1.getExecOutput)(cmd, ['expo', 'config', '--json', '--type', 'public'], { cwd, silent: true, })); diff --git a/bun.lockb b/bun.lockb index 71221f0ce337cb872f026154b37d5a643c23d96c..a09eb4f3763009941d53109525fb8684f6fbc89a 100755 GIT binary patch delta 10791 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 MT5n{2&{9d`w`~H1$bKv~eNk0GgDmVYQ%2lb+ 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 { try { const extraArgs = isDebug() ? ['--debug'] : []; + const cmd = await Promise.any([which('bunx'), which('npx')]); const { stdout } = await getExecOutput( - 'npx', + cmd, ['expo-updates', 'fingerprint:generate', '--platform', platform, ...extraArgs], { cwd, diff --git a/src/project.ts b/src/project.ts index 24f722873..26dbb93c3 100644 --- a/src/project.ts +++ b/src/project.ts @@ -1,4 +1,5 @@ import { getExecOutput } from '@actions/exec'; +import { which } from '@actions/io'; import { ExpoConfig } from '@expo/config'; /** @@ -10,7 +11,8 @@ export async function loadProjectConfig(cwd: string): Promise { let stdout = ''; try { - ({ stdout } = await getExecOutput('npx', ['expo', 'config', '--json', '--type', 'public'], { + const cmd = await Promise.any([which('bunx'), which('npx')]); + ({ stdout } = await getExecOutput(cmd, ['expo', 'config', '--json', '--type', 'public'], { cwd, silent: true, }));