Use tinyexec (#11845)

.changeset/four-beans-remember.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Replaces `execa` with `tinyexec` internally

benchmark/bench/cli-startup.js

@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'node:url';
-import { execaCommand } from 'execa';
+import { exec } from 'tinyexec';
 import { markdownTable } from 'markdown-table';
 import { astroBin, calculateStat } from './_util.js';
 
@@ -14,11 +14,11 @@ export async function run(projectDir, outputFile) {
  const root = fileURLToPath(projectDir);
 
  console.log('Benchmarking `astro --help`...');
- const helpStat = await benchmarkCommand(`node ${astroBin} --help`, root);
+ const helpStat = await benchmarkCommand('node', [astroBin, '--help'], root);
  console.log('Done');
 
- console.log('Benchmarking `astro info`...');
- const infoStat = await benchmarkCommand(`node ${astroBin} info`, root);
+ console.log('Benchmarking `astro preferences list`...');
+ const infoStat = await benchmarkCommand('node', [astroBin, 'preferences', 'list'], root);
  console.log('Done');
 
  console.log('Result preview:');
@@ -35,16 +35,17 @@ export async function run(projectDir, outputFile) {
 
 /**
  * @param {string} command
+ * @param {string[]} args
  * @param {string} root
  * @returns {Promise<import('./_util.js').Stat>}
  */
-async function benchmarkCommand(command, root) {
+async function benchmarkCommand(command, args, root) {
  /** @type {number[]} */
  const durations = [];
 
  for (let i = 0; i < 10; i++) {
  const start = performance.now();
- await execaCommand(command, { cwd: root });
+ await exec(command, args, { nodeOptions: { cwd: root } });
  durations.push(performance.now() - start);
  }
 

benchmark/bench/memory.js

@@ -1,4 +1,4 @@
-import { execaCommand } from 'execa';
+import { exec } from 'tinyexec';
 import { markdownTable } from 'markdown-table';
 import fs from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
@@ -18,11 +18,13 @@ export async function run(projectDir, outputFile) {
  const outputFilePath = fileURLToPath(outputFile);
 
  console.log('Building and benchmarking...');
- await execaCommand(`node --expose-gc --max_old_space_size=10000 ${astroBin} build --silent`, {
- cwd: root,
- stdio: 'inherit',
- env: {
- ASTRO_TIMER_PATH: outputFilePath,
+ await exec('node', ['--expose-gc', '--max_old_space_size=10000', astroBin, 'build'], {
+ nodeOptions: {
+ cwd: root,
+ stdio: 'inherit',
+ env: {
+ ASTRO_TIMER_PATH: outputFilePath,
+ },
  },
  });
 

benchmark/bench/render.js

@@ -1,4 +1,4 @@
-import { execaCommand } from 'execa';
+import { exec } from 'tinyexec';
 import { markdownTable } from 'markdown-table';
 import fs from 'node:fs/promises';
 import http from 'node:http';
@@ -20,15 +20,19 @@ export async function run(projectDir, outputFile) {
  const root = fileURLToPath(projectDir);
 
  console.log('Building...');
- await execaCommand(`${astroBin} build`, {
- cwd: root,
- stdio: 'inherit',
+ await exec(astroBin, ['build'], {
+ nodeOptions: {
+ cwd: root,
+ stdio: 'inherit',
+ },
  });
 
  console.log('Previewing...');
- const previewProcess = execaCommand(`${astroBin} preview --port ${port}`, {
- cwd: root,
- stdio: 'inherit',
+ const previewProcess = exec(astroBin, ['preview', '--port', port], {
+ nodeOptions: {
+ cwd: root,
+ stdio: 'inherit',
+ },
  });
 
  console.log('Waiting for server ready...');

benchmark/bench/server-stress.js

@@ -1,5 +1,5 @@
 import autocannon from 'autocannon';
-import { execaCommand } from 'execa';
+import { exec } from 'tinyexec';
 import { markdownTable } from 'markdown-table';
 import fs from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
@@ -19,9 +19,11 @@ export async function run(projectDir, outputFile) {
  const root = fileURLToPath(projectDir);
 
  console.log('Building...');
- await execaCommand(`${astroBin} build`, {
- cwd: root,
- stdio: 'inherit',
+ await exec(astroBin, ['build'], {
+ nodeOptions: {
+ cwd: root,
+ stdio: 'inherit',
+ },
  });
 
  console.log('Previewing...');

benchmark/package.json

@@ -12,11 +12,11 @@
  "@benchmark/timer": "workspace:*",
  "astro": "workspace:*",
  "autocannon": "^7.15.0",
- "execa": "^8.0.1",
  "markdown-table": "^3.0.3",
  "mri": "^1.2.0",
  "port-authority": "^2.0.1",
  "pretty-bytes": "^6.1.1",
- "sharp": "^0.33.3"
+ "sharp": "^0.33.3",
+ "tinyexec": "^0.3.0"
  }
 }

packages/astro/package.json

@@ -151,7 +151,6 @@
  "es-module-lexer": "^1.5.4",
  "esbuild": "^0.21.5",
  "estree-walker": "^3.0.3",
- "execa": "^8.0.1",
  "fast-glob": "^3.3.2",
  "flattie": "^1.1.1",
  "github-slugger": "^2.0.0",
@@ -176,6 +175,7 @@
  "shiki": "^1.14.1",
  "string-width": "^7.2.0",
  "strip-ansi": "^7.1.0",
+ "tinyexec": "^0.3.0",
  "tsconfck": "^3.1.1",
  "unist-util-visit": "^5.0.0",
  "vfile": "^6.0.3",
@@ -214,6 +214,7 @@
  "astro-scripts": "workspace:*",
  "cheerio": "1.0.0",
  "eol": "^0.9.1",
+ "execa": "^8.0.1",
  "expect-type": "^0.20.0",
  "mdast-util-mdx": "^3.0.0",
  "mdast-util-mdx-jsx": "^3.1.3",

packages/astro/src/cli/add/index.ts

@@ -3,12 +3,12 @@ import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import boxen from 'boxen';
 import { diffWords } from 'diff';
-import { execa } from 'execa';
 import { bold, cyan, dim, green, magenta, red, yellow } from 'kleur/colors';
 import ora from 'ora';
 import preferredPM from 'preferred-pm';
 import prompts from 'prompts';
 import maxSatisfying from 'semver/ranges/max-satisfying.js';
+import { exec } from 'tinyexec';
 import {
  loadTSConfig,
  resolveConfig,
@@ -659,7 +659,7 @@ async function tryToInstallIntegrations({
  if (await askToContinue({ flags })) {
  const spinner = ora('Installing dependencies...').start();
  try {
- await execa(
+ await exec(
  installCommand.pm,
  [
  installCommand.command,
@@ -668,10 +668,12 @@ async function tryToInstallIntegrations({
  ...installCommand.dependencies,
  ],
  {
- cwd,
- // reset NODE_ENV to ensure install command run in dev mode
- env: { NODE_ENV: undefined },
- },
+ nodeOptions: {
+ cwd,
+ // reset NODE_ENV to ensure install command run in dev mode
+ env: { NODE_ENV: undefined },
+ },
+ }
  );
  spinner.succeed();
  return UpdateResult.updated;

packages/astro/src/cli/docs/open.ts

@@ -1,5 +1,4 @@
-import type { ExecaChildProcess } from 'execa';
-import { execa } from 'execa';
+import { type Result, exec } from 'tinyexec';
 
 /**
  * Credit: Azhar22
@@ -26,7 +25,7 @@ const getPlatformSpecificCommand = (): [string] | [string, string[]] => {
  }
 };
 
-export async function openInBrowser(url: string): Promise<ExecaChildProcess> {
+export async function openInBrowser(url: string): Promise<Result> {
  const [command, args = []] = getPlatformSpecificCommand();
- return execa(command, [...args, encodeURI(url)]);
+ return exec(command, [...args, encodeURI(url)]);
 }

packages/astro/src/cli/install-package.ts

@@ -1,11 +1,11 @@
 import { createRequire } from 'node:module';
 import boxen from 'boxen';
 import ci from 'ci-info';
-import { execa } from 'execa';
 import { bold, cyan, dim, magenta } from 'kleur/colors';
 import ora from 'ora';
 import preferredPM from 'preferred-pm';
 import prompts from 'prompts';
+import { exec } from 'tinyexec';
 import whichPm from 'which-pm';
 import type { Logger } from '../core/logger/core.js';
 
@@ -141,10 +141,10 @@ async function installPackage(
  if (Boolean(response)) {
  const spinner = ora('Installing dependencies...').start();
  try {
- await execa(
+ await exec(
  installCommand.pm,
  [installCommand.command, ...installCommand.flags, ...installCommand.dependencies],
- { cwd: cwd },
+ { nodeOptions: { cwd: cwd } }
  );
  spinner.succeed();
 
@@ -203,8 +203,8 @@ async function getRegistry(): Promise<string> {
  const fallback = 'https://registry.npmjs.org';
  const packageManager = (await preferredPM(process.cwd()))?.name || 'npm';
  try {
- const { stdout } = await execa(packageManager, ['config', 'get', 'registry']);
- _registry = stdout?.trim()?.replace(/\/$/, '') || fallback;
+ const { stdout } = await exec(packageManager, ['config', 'get', 'registry']);
+ _registry = stdout.trim()?.replace(/\/$/, '') || fallback;
  // Detect cases where the shell command returned a non-URL (e.g. a warning)
  if (!new URL(_registry).host) _registry = fallback;
  } catch {

scripts/package.json

@@ -10,10 +10,10 @@
  "dependencies": {
  "esbuild": "^0.21.5",
  "esbuild-plugin-copy": "^2.1.1",
- "execa": "^8.0.1",
  "fast-glob": "^3.3.2",
  "kleur": "^4.1.5",
  "p-limit": "^6.1.0",
+ "tinyexec": "^0.3.0",
  "tsconfck": "^3.1.1"
  }
 }

scripts/smoke/cleanup.js

@@ -2,7 +2,7 @@
 
 // @ts-check
 
-import { execa } from 'execa';
+import { exec } from 'tinyexec';
 import { promises as fs } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 
@@ -36,7 +36,9 @@ async function run() {
 
  console.log('🤖', 'Resetting', 'pnpm');
 
- await execa('pnpm', ['install'], { cwd: fileURLToPath(rootDir), stdout: 'inherit', stderr: 'inherit' });
+ await exec('pnpm', ['install'], {
+ nodeOptions: { cwd: fileURLToPath(rootDir), stdio: ['pipe', 'inherit', 'inherit'] },
+ });
 }
 
 /* Functionality