withastro · bluwy · Sep 25, 2024 · Sep 25, 2024
diff --git a/.changeset/poor-seals-clap.md b/.changeset/poor-seals-clap.md
@@ -0,0 +1,7 @@
+---
+'@astrojs/studio': patch
+'astro': patch
+'@astrojs/db': patch
+---
+
+Replaces `ora` with `yocto-spinner`
diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -162,7 +162,6 @@
     "micromatch": "^4.0.8",
     "mrmime": "^2.0.0",
     "neotraverse": "^0.6.18",
-    "ora": "^8.1.0",
     "p-limit": "^6.1.0",
     "p-queue": "^8.0.1",
     "preferred-pm": "^4.0.0",
@@ -181,6 +180,7 @@
     "which-pm": "^3.0.0",
     "xxhash-wasm": "^1.0.2",
     "yargs-parser": "^21.1.1",
+    "yocto-spinner": "^0.1.0",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.2",
     "zod-to-ts": "^1.2.0"

diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts
@@ -6,7 +6,7 @@ import { diffWords } from 'diff';
 import { bold, cyan, dim, green, magenta, red, yellow } from 'kleur/colors';
 import { type ASTNode, type ProxifiedModule, builders, generateCode, loadFile } from 'magicast';
 import { getDefaultExportOptions } from 'magicast/helpers';
-import ora from 'ora';
+import yoctoSpinner from 'yocto-spinner';
 import preferredPM from 'preferred-pm';
 import prompts from 'prompts';
 import maxSatisfying from 'semver/ranges/max-satisfying.js';
@@ -665,7 +665,7 @@ async function tryToInstallIntegrations({
 		);
 
 		if (await askToContinue({ flags })) {
-			const spinner = ora('Installing dependencies...').start();
+			const spinner = yoctoSpinner({ text: 'Installing dependencies...' }).start();
 			try {
 				await exec(
 					installCommand.pm,
@@ -683,10 +683,10 @@ async function tryToInstallIntegrations({
 						},
 					},
 				);
-				spinner.succeed();
+				spinner.success();
 				return UpdateResult.updated;
 			} catch (err: any) {
-				spinner.fail();
+				spinner.error();
 				logger.debug('add', 'Error installing dependencies', err);
 				// NOTE: `err.stdout` can be an empty string, so log the full error instead for a more helpful log
 				// eslint-disable-next-line no-console
@@ -700,7 +700,7 @@ async function tryToInstallIntegrations({
 }
 
 async function validateIntegrations(integrations: string[]): Promise<IntegrationInfo[]> {
-	const spinner = ora('Resolving packages...').start();
+	const spinner = yoctoSpinner({ text: 'Resolving packages...' }).start();
 	try {
 		const integrationEntries = await Promise.all(
 			integrations.map(async (integration): Promise<IntegrationInfo> => {
@@ -718,9 +718,9 @@ async function validateIntegrations(integrations: string[]): Promise<Integration
 					const firstPartyPkgCheck = await fetchPackageJson('@astrojs', name, tag);
 					if (firstPartyPkgCheck instanceof Error) {
 						if (firstPartyPkgCheck.message) {
-							spinner.warn(yellow(firstPartyPkgCheck.message));
+							spinner.warning(yellow(firstPartyPkgCheck.message));
 						}
-						spinner.warn(yellow(`${bold(integration)} is not an official Astro package.`));
+						spinner.warning(yellow(`${bold(integration)} is not an official Astro package.`));
 						const response = await prompts({
 							type: 'confirm',
 							name: 'askToContinue',
@@ -745,7 +745,7 @@ async function validateIntegrations(integrations: string[]): Promise<Integration
 					const thirdPartyPkgCheck = await fetchPackageJson(scope, name, tag);
 					if (thirdPartyPkgCheck instanceof Error) {
 						if (thirdPartyPkgCheck.message) {
-							spinner.warn(yellow(thirdPartyPkgCheck.message));
+							spinner.warning(yellow(thirdPartyPkgCheck.message));
 						}
 						throw new Error(`Unable to fetch ${bold(integration)}. Does the package exist?`);
 					} else {
@@ -790,11 +790,11 @@ async function validateIntegrations(integrations: string[]): Promise<Integration
 				return { id: integration, packageName, dependencies, type: integrationType };
 			}),
 		);
-		spinner.succeed();
+		spinner.success();
 		return integrationEntries;
 	} catch (e) {
 		if (e instanceof Error) {
-			spinner.fail(e.message);
+			spinner.error(e.message);
 			process.exit(1);
 		} else {
 			throw e;

diff --git a/packages/astro/src/cli/install-package.ts b/packages/astro/src/cli/install-package.ts
@@ -2,7 +2,7 @@ import { createRequire } from 'node:module';
 import boxen from 'boxen';
 import ci from 'ci-info';
 import { bold, cyan, dim, magenta } from 'kleur/colors';
-import ora from 'ora';
+import yoctoSpinner from 'yocto-spinner';
 import preferredPM from 'preferred-pm';
 import prompts from 'prompts';
 import { exec } from 'tinyexec';
@@ -139,19 +139,19 @@ async function installPackage(
 	}
 
 	if (Boolean(response)) {
-		const spinner = ora('Installing dependencies...').start();
+		const spinner = yoctoSpinner({ text: 'Installing dependencies...' }).start();
 		try {
 			await exec(
 				installCommand.pm,
 				[installCommand.command, ...installCommand.flags, ...installCommand.dependencies],
 				{ nodeOptions: { cwd: cwd } },
 			);
-			spinner.succeed();
+			spinner.success();
 
 			return true;
 		} catch (err) {
 			logger.debug('add', 'Error installing dependencies', err);
-			spinner.fail();
+			spinner.error();
 
 			return false;
 		}

diff --git a/packages/db/package.json b/packages/db/package.json
@@ -78,10 +78,10 @@
     "kleur": "^4.1.5",
     "nanoid": "^5.0.7",
     "open": "^10.1.0",
-    "ora": "^8.1.0",
     "prompts": "^2.4.2",
     "strip-ansi": "^7.1.0",
     "yargs-parser": "^21.1.1",
+    "yocto-spinner": "^0.1.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {

diff --git a/packages/db/src/core/cli/commands/link/index.ts b/packages/db/src/core/cli/commands/link/index.ts
@@ -9,7 +9,7 @@ import {
 } from '@astrojs/studio';
 import { slug } from 'github-slugger';
 import { bgRed, cyan } from 'kleur/colors';
-import ora from 'ora';
+import yoctoSpinner from 'yocto-spinner';
 import prompts from 'prompts';
 import { safeFetch } from '../../../../runtime/utils.js';
 import type { Result } from '../../../utils.js';
@@ -33,7 +33,7 @@ export async function cmd() {
 		const workspaceId = await promptWorkspace(sessionToken);
 		const newProjectName = await promptNewProjectName();
 		const newProjectRegion = await promptNewProjectRegion();
-		const spinner = ora('Creating new project...').start();
+		const spinner = yoctoSpinner({text:'Creating new project...'}).start();
 		const newProjectData = await createNewProject({
 			workspaceId,
 			name: newProjectName,
@@ -42,7 +42,7 @@ export async function cmd() {
 		// TODO(fks): Actually listen for project creation before continuing
 		// This is just a dumb spinner that roughly matches database creation time.
 		await new Promise((r) => setTimeout(r, 4000));
-		spinner.succeed('Project created!');
+		spinner.success('Project created!');
 		return await linkProject(newProjectData.id);
 	}
 }

diff --git a/packages/db/src/core/cli/commands/login/index.ts b/packages/db/src/core/cli/commands/login/index.ts
@@ -5,7 +5,7 @@ import type { AstroConfig } from 'astro';
 import { listen } from 'async-listen';
 import { cyan } from 'kleur/colors';
 import open from 'open';
-import ora from 'ora';
+import yoctoSpinner from 'yocto-spinner';
 import prompt from 'prompts';
 import type { Arguments } from 'yargs-parser';
 import type { DBConfig } from '../../../types.js';
@@ -48,9 +48,9 @@ export async function cmd({
 		console.log(cyan(loginUrl.href));
 		console.log(`If something goes wrong, copy-and-paste the URL into your browser.`);
 		open(loginUrl.href);
-		const spinner = ora('Waiting for confirmation...');
+		const spinner = yoctoSpinner({ text: 'Waiting for confirmation...' });
 		session = await promise;
-		spinner.succeed('Successfully logged in');
+		spinner.success('Successfully logged in');
 	}
 
 	await mkdir(new URL('.', SESSION_LOGIN_FILE), { recursive: true });

diff --git a/packages/studio/package.json b/packages/studio/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "ci-info": "^4.0.0",
     "kleur": "^4.1.5",
-    "ora": "^8.1.0"
+    "yocto-spinner": "^0.1.0"
   },
   "devDependencies": {
     "astro": "workspace:*",

diff --git a/packages/studio/src/core/tokens.ts b/packages/studio/src/core/tokens.ts
@@ -4,7 +4,7 @@ import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import ci from 'ci-info';
 import { green } from 'kleur/colors';
-import ora from 'ora';
+import yoctoSpinner from 'yocto-spinner';
 import {
 	MISSING_PROJECT_ID_ERROR,
 	MISSING_SESSION_ID_CI_ERROR,
@@ -52,7 +52,7 @@ class ManagedRemoteAppToken implements ManagedAppToken {
 		sessionToken: string,
 		projectId: string,
 	): Promise<{ token: string; ttl: number }> {
-		const spinner = ora('Connecting to remote database...').start();
+		const spinner = yoctoSpinner({ text: 'Connecting to remote database...' }).start();
 		const response = await safeFetch(
 			new URL(`${getAstroStudioUrl()}/auth/cli/token-create`),
 			{
@@ -66,7 +66,7 @@ class ManagedRemoteAppToken implements ManagedAppToken {
 				throw new Error(`Failed to create token: ${res.status} ${res.statusText}`);
 			},
 		);
-		spinner.succeed(green('Connected to remote database.'));
+		spinner.success(green('Connected to remote database.'));
 
 		const { token, ttl } = await response.json();
 		return { token, ttl };