From 5050156beb82a27fbd54884d852bccd34c19d32a Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sat, 8 Nov 2025 08:31:42 -0700 Subject: [PATCH] fix: a type, plus add the type-check to the mobile build scripts --- scripts/build-android.sh | 30 ++++++++++++++++++++++-------- scripts/build-ios.sh | 28 +++++++++++++++++++++------- src/libs/endorserServer.ts | 5 ++++- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/scripts/build-android.sh b/scripts/build-android.sh index b8c4669a..39383064 100755 --- a/scripts/build-android.sh +++ b/scripts/build-android.sh @@ -436,7 +436,21 @@ fi log_info "Cleaning dist directory..." clean_build_artifacts "dist" -# Step 4: Build Capacitor version with mode +# Step 4: Run TypeScript type checking for test and production builds +if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then + log_info "Running TypeScript type checking for $BUILD_MODE mode..." + + if ! measure_time npm run type-check; then + log_error "TypeScript type checking failed for $BUILD_MODE mode!" + exit 2 + fi + + log_success "TypeScript type checking completed for $BUILD_MODE mode" +else + log_debug "Skipping TypeScript type checking for development mode" +fi + +# Step 5: Build Capacitor version with mode if [ "$BUILD_MODE" = "development" ]; then safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3 elif [ "$BUILD_MODE" = "test" ]; then @@ -445,23 +459,23 @@ elif [ "$BUILD_MODE" = "production" ]; then safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3 fi -# Step 5: Clean Gradle build +# Step 6: Clean Gradle build safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean && cd .." || exit 4 -# Step 6: Build based on type +# Step 7: Build based on type if [ "$BUILD_TYPE" = "debug" ]; then safe_execute "Assembling debug build" "cd android && ./gradlew assembleDebug && cd .." || exit 5 elif [ "$BUILD_TYPE" = "release" ]; then safe_execute "Assembling release build" "cd android && ./gradlew assembleRelease && cd .." || exit 5 fi -# Step 7: Sync with Capacitor +# Step 8: Sync with Capacitor safe_execute "Syncing with Capacitor" "npx cap sync android" || exit 6 -# Step 8: Generate assets +# Step 9: Generate assets safe_execute "Generating assets" "npx capacitor-assets generate --android" || exit 7 -# Step 9: Build APK/AAB if requested +# Step 10: Build APK/AAB if requested if [ "$BUILD_APK" = true ]; then if [ "$BUILD_TYPE" = "debug" ]; then safe_execute "Building debug APK" "cd android && ./gradlew assembleDebug && cd .." || exit 5 @@ -474,7 +488,7 @@ if [ "$BUILD_AAB" = true ]; then safe_execute "Building AAB" "cd android && ./gradlew bundleRelease && cd .." || exit 5 fi -# Step 10: Auto-run app if requested +# Step 11: Auto-run app if requested if [ "$AUTO_RUN" = true ]; then log_step "Auto-running Android app..." safe_execute "Launching app" "npx cap run android" || { @@ -485,7 +499,7 @@ if [ "$AUTO_RUN" = true ]; then log_success "Android app launched successfully!" fi -# Step 11: Open Android Studio if requested +# Step 12: Open Android Studio if requested if [ "$OPEN_STUDIO" = true ]; then safe_execute "Opening Android Studio" "npx cap open android" || exit 8 fi diff --git a/scripts/build-ios.sh b/scripts/build-ios.sh index fd4e9a39..b327152c 100755 --- a/scripts/build-ios.sh +++ b/scripts/build-ios.sh @@ -381,7 +381,21 @@ safe_execute "Cleaning iOS build" "clean_ios_build" || exit 1 log_info "Cleaning dist directory..." clean_build_artifacts "dist" -# Step 4: Build Capacitor version with mode +# Step 4: Run TypeScript type checking for test and production builds +if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then + log_info "Running TypeScript type checking for $BUILD_MODE mode..." + + if ! measure_time npm run type-check; then + log_error "TypeScript type checking failed for $BUILD_MODE mode!" + exit 2 + fi + + log_success "TypeScript type checking completed for $BUILD_MODE mode" +else + log_debug "Skipping TypeScript type checking for development mode" +fi + +# Step 5: Build Capacitor version with mode if [ "$BUILD_MODE" = "development" ]; then safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3 elif [ "$BUILD_MODE" = "test" ]; then @@ -390,16 +404,16 @@ elif [ "$BUILD_MODE" = "production" ]; then safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3 fi -# Step 5: Sync with Capacitor +# Step 6: Sync with Capacitor safe_execute "Syncing with Capacitor" "npx cap sync ios" || exit 6 -# Step 6: Generate assets +# Step 7: Generate assets safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7 -# Step 7: Build iOS app +# Step 8: Build iOS app safe_execute "Building iOS app" "build_ios_app" || exit 5 -# Step 8: Build IPA/App if requested +# Step 9: Build IPA/App if requested if [ "$BUILD_IPA" = true ]; then log_info "Building IPA package..." cd ios/App @@ -426,12 +440,12 @@ if [ "$BUILD_APP" = true ]; then log_success "App bundle built successfully" fi -# Step 9: Auto-run app if requested +# Step 10: Auto-run app if requested if [ "$AUTO_RUN" = true ]; then safe_execute "Auto-running iOS app" "auto_run_ios_app" || exit 9 fi -# Step 10: Open Xcode if requested +# Step 11: Open Xcode if requested if [ "$OPEN_STUDIO" = true ]; then safe_execute "Opening Xcode" "npx cap open ios" || exit 8 fi diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts index 36bfa223..8eb2cd68 100644 --- a/src/libs/endorserServer.ts +++ b/src/libs/endorserServer.ts @@ -1686,7 +1686,10 @@ export async function register( "Registration thrown error:", errorMessage || JSON.stringify(err), ); - return { error: errorMessage || "Got a server error when registering." }; + return { + error: + (errorMessage as string) || "Got a server error when registering.", + }; } return { error: "Got a server error when registering." }; }