From 4df598c9815f7a68d060a86fe123147bf1cfb433 Mon Sep 17 00:00:00 2001 From: Quinlan Jung Date: Fri, 14 Feb 2025 12:35:25 -0800 Subject: [PATCH 1/4] [eas-cli] lowercase urls, add more pretty prints --- packages/eas-cli/src/commands/fingerprint/compare.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/eas-cli/src/commands/fingerprint/compare.ts b/packages/eas-cli/src/commands/fingerprint/compare.ts index 0a3b1e6c9c..a96e051bb1 100644 --- a/packages/eas-cli/src/commands/fingerprint/compare.ts +++ b/packages/eas-cli/src/commands/fingerprint/compare.ts @@ -238,7 +238,7 @@ export default class FingerprintCompare extends EasCommand { const project = await AppQuery.byIdAsync(graphqlClient, projectId); const fingerprintCompareUrl = new URL( - `/accounts/${project.ownerAccount.name}/projects/${project.name}/fingerprints/compare`, + `/accounts/${project.ownerAccount.name.toLowerCase()}/projects/${project.name.toLowerCase()}/fingerprints/compare`, getExpoWebsiteBaseUrl() ); fingerprintCompareUrl.searchParams.set('a', firstFingerprintInfo.fingerprint.hash); @@ -528,7 +528,7 @@ async function getFingerprintInfoFromUpdateGroupIdOrUpdateIdAsync( const project = await AppQuery.byIdAsync(graphqlClient, projectId); const updateUrl = getExpoWebsiteBaseUrl() + - `/accounts/${project.ownerAccount.name}/projects/${project.name}/updates/${maybeUpdateGroupId}`; + `/accounts/${project.ownerAccount.name.toLowerCase()}/projects/${project.name.toLowerCase()}/updates/${maybeUpdateGroupId}`; throw new Error( `Please pass in your update ID from ${updateUrl} or use interactive mode to select the update ID.` ); @@ -739,7 +739,10 @@ const PRETTY_CONTENT_ID: Record = { 'expoAutolinkingConfig:ios': 'Expo autolinking config (iOS)', 'expoAutolinkingConfig:android': 'Expo autolinking config (Android)', 'packageJson:scripts': 'package.json scripts', - expoConfig: 'Expo config', + expoConfig: 'Expo app config', + 'package:react-native': 'React native package.json', + 'rncoreAutolinkingConfig:ios': 'React Native Community autolinking config (iOS)', + 'rncoreAutolinkingConfig:android': 'React Native Community autolinking config (Android)', }; function printContentSource({ From 5f04355f46a7d07bb1d8b54e3348b2cfb11d631b Mon Sep 17 00:00:00 2001 From: Quinlan Jung Date: Fri, 14 Feb 2025 12:38:47 -0800 Subject: [PATCH 2/4] Temporary Commit at 2/14/2025, 12:38:47 PM --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44cde5f6c2..14dc098e2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ This is the log of notable changes to EAS CLI and related packages. - Narrow amount of data queried for basic update channel operations. ([#2901](https://github.com/expo/eas-cli/pull/2901) by [@wschurman](https://github.com/wschurman)) - Fix `eas fingerprint:compare` description. ([#2908](https://github.com/expo/eas-cli/pull/2908) by [@quinlanj](https://github.com/quinlanj)) +- Fix `eas fingerprint:compare` URL generation and pretty prints. ([#2909](https://github.com/expo/eas-cli/pull/2909) by [@quinlanj](https://github.com/quinlanj)) ## [15.0.10](https://github.com/expo/eas-cli/releases/tag/v15.0.10) - 2025-02-11 From 03a2e879b4c1d5f6d67a32b86e758e2fda002146 Mon Sep 17 00:00:00 2001 From: Quinlan Jung Date: Fri, 14 Feb 2025 12:41:29 -0800 Subject: [PATCH 3/4] Temporary Commit at 2/14/2025, 12:41:29 PM --- packages/eas-cli/src/commands/fingerprint/compare.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eas-cli/src/commands/fingerprint/compare.ts b/packages/eas-cli/src/commands/fingerprint/compare.ts index a96e051bb1..9af97cbe18 100644 --- a/packages/eas-cli/src/commands/fingerprint/compare.ts +++ b/packages/eas-cli/src/commands/fingerprint/compare.ts @@ -740,7 +740,7 @@ const PRETTY_CONTENT_ID: Record = { 'expoAutolinkingConfig:android': 'Expo autolinking config (Android)', 'packageJson:scripts': 'package.json scripts', expoConfig: 'Expo app config', - 'package:react-native': 'React native package.json', + 'package:react-native': 'React Native package.json', 'rncoreAutolinkingConfig:ios': 'React Native Community autolinking config (iOS)', 'rncoreAutolinkingConfig:android': 'React Native Community autolinking config (Android)', }; From ccfa0f761de4ee9d1d0dcb6b8c959267fa2c4ed9 Mon Sep 17 00:00:00 2001 From: Quinlan Jung Date: Fri, 21 Feb 2025 12:17:24 -0800 Subject: [PATCH 4/4] Temporary Commit at 2/21/2025, 12:17:24 PM --- packages/eas-cli/src/commands/fingerprint/compare.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/eas-cli/src/commands/fingerprint/compare.ts b/packages/eas-cli/src/commands/fingerprint/compare.ts index 9af97cbe18..9a90e3c198 100644 --- a/packages/eas-cli/src/commands/fingerprint/compare.ts +++ b/packages/eas-cli/src/commands/fingerprint/compare.ts @@ -238,7 +238,7 @@ export default class FingerprintCompare extends EasCommand { const project = await AppQuery.byIdAsync(graphqlClient, projectId); const fingerprintCompareUrl = new URL( - `/accounts/${project.ownerAccount.name.toLowerCase()}/projects/${project.name.toLowerCase()}/fingerprints/compare`, + `/accounts/${project.ownerAccount.name}/projects/${project.slug}/fingerprints/compare`, getExpoWebsiteBaseUrl() ); fingerprintCompareUrl.searchParams.set('a', firstFingerprintInfo.fingerprint.hash); @@ -528,7 +528,7 @@ async function getFingerprintInfoFromUpdateGroupIdOrUpdateIdAsync( const project = await AppQuery.byIdAsync(graphqlClient, projectId); const updateUrl = getExpoWebsiteBaseUrl() + - `/accounts/${project.ownerAccount.name.toLowerCase()}/projects/${project.name.toLowerCase()}/updates/${maybeUpdateGroupId}`; + `/accounts/${project.ownerAccount.name}/projects/${project.slug}/updates/${maybeUpdateGroupId}`; throw new Error( `Please pass in your update ID from ${updateUrl} or use interactive mode to select the update ID.` );