fix(ios): ensure capacitor-assets output dirs exist on fresh clones
Gitignored AppIcon.appiconset and Splash.imageset are absent after clone, which made `capacitor-assets generate --ios` fail (missing paths and Contents.json). Add ensure_ios_capacitor_asset_directories in common.sh to mkdir and seed minimal Contents.json when needed; call it from build-ios.sh before asset generation and from the build:native npm script. Document the behavior in ios/.gitignore.
This commit is contained in:
3
ios/.gitignore
vendored
3
ios/.gitignore
vendored
@@ -17,6 +17,7 @@ App/App/config.xml
|
|||||||
App/App.xcodeproj/xcuserdata/*.xcuserdatad/
|
App/App.xcodeproj/xcuserdata/*.xcuserdatad/
|
||||||
App/App.xcodeproj/*.xcuserstate
|
App/App.xcodeproj/*.xcuserstate
|
||||||
|
|
||||||
# Generated Icons from capacitor-assets (also Contents.json which is confusing; see BUILDING.md)
|
# Generated by capacitor-assets at build time (not in repo). Fresh clones lack these
|
||||||
|
# folders; scripts/common.sh ensure_ios_capacitor_asset_directories creates them before generate.
|
||||||
App/App/Assets.xcassets/AppIcon.appiconset
|
App/App/Assets.xcassets/AppIcon.appiconset
|
||||||
App/App/Assets.xcassets/Splash.imageset
|
App/App/Assets.xcassets/Splash.imageset
|
||||||
|
|||||||
823
package-lock.json
generated
823
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -28,7 +28,7 @@
|
|||||||
"auto-run:electron": "./scripts/auto-run.sh --platform=electron",
|
"auto-run:electron": "./scripts/auto-run.sh --platform=electron",
|
||||||
"build:capacitor": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --mode capacitor --config vite.config.capacitor.mts",
|
"build:capacitor": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --mode capacitor --config vite.config.capacitor.mts",
|
||||||
"build:capacitor:sync": "npm run build:capacitor && npx cap sync && node scripts/restore-local-plugins.js",
|
"build:capacitor:sync": "npm run build:capacitor && npx cap sync && node scripts/restore-local-plugins.js",
|
||||||
"build:native": "vite build && npx cap sync && node scripts/restore-local-plugins.js && npx capacitor-assets generate",
|
"build:native": "vite build && npx cap sync && node scripts/restore-local-plugins.js && bash -c 'source scripts/common.sh && ensure_ios_capacitor_asset_directories' && npx capacitor-assets generate",
|
||||||
"assets:config": "npx tsx scripts/assets-config.ts",
|
"assets:config": "npx tsx scripts/assets-config.ts",
|
||||||
"assets:validate": "npx tsx scripts/assets-validator.ts",
|
"assets:validate": "npx tsx scripts/assets-validator.ts",
|
||||||
"assets:validate:android": "./scripts/build-android.sh --assets-only",
|
"assets:validate:android": "./scripts/build-android.sh --assets-only",
|
||||||
|
|||||||
@@ -413,6 +413,7 @@ fi
|
|||||||
# Handle assets-only mode
|
# Handle assets-only mode
|
||||||
if [ "$ASSETS_ONLY" = true ]; then
|
if [ "$ASSETS_ONLY" = true ]; then
|
||||||
log_info "Assets-only mode: generating assets"
|
log_info "Assets-only mode: generating assets"
|
||||||
|
ensure_ios_capacitor_asset_directories
|
||||||
safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7
|
safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7
|
||||||
log_success "Assets generation completed successfully!"
|
log_success "Assets generation completed successfully!"
|
||||||
exit 0
|
exit 0
|
||||||
@@ -562,6 +563,7 @@ safe_execute "Installing CocoaPods dependencies" "run_pod_install_with_workaroun
|
|||||||
safe_execute "Syncing with Capacitor" "run_cap_sync_with_workaround" || exit 6
|
safe_execute "Syncing with Capacitor" "run_cap_sync_with_workaround" || exit 6
|
||||||
|
|
||||||
# Step 7: Generate assets
|
# Step 7: Generate assets
|
||||||
|
ensure_ios_capacitor_asset_directories
|
||||||
safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7
|
safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7
|
||||||
|
|
||||||
# Step 8: Build iOS app
|
# Step 8: Build iOS app
|
||||||
|
|||||||
@@ -337,6 +337,27 @@ parse_args() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# iOS: capacitor-assets writes into AppIcon.appiconset and Splash.imageset under
|
||||||
|
# Assets.xcassets. Those paths are gitignored (generated). On a fresh clone the
|
||||||
|
# folders and Contents.json are missing; the tool opens Contents.json before writing
|
||||||
|
# PNGs, so we create minimal asset-catalog stubs when absent.
|
||||||
|
ensure_ios_capacitor_asset_directories() {
|
||||||
|
local base="ios/App/App/Assets.xcassets"
|
||||||
|
if [ ! -d "$base" ]; then
|
||||||
|
log_warn "Missing $base — cannot prepare iOS asset directories"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
mkdir -p "$base/AppIcon.appiconset" "$base/Splash.imageset"
|
||||||
|
local minimal_contents='{"images":[],"info":{"author":"xcode","version":1}}'
|
||||||
|
if [ ! -f "$base/AppIcon.appiconset/Contents.json" ]; then
|
||||||
|
printf '%s\n' "$minimal_contents" > "$base/AppIcon.appiconset/Contents.json"
|
||||||
|
fi
|
||||||
|
if [ ! -f "$base/Splash.imageset/Contents.json" ]; then
|
||||||
|
printf '%s\n' "$minimal_contents" > "$base/Splash.imageset/Contents.json"
|
||||||
|
fi
|
||||||
|
log_debug "Ensured iOS capacitor-assets output directories exist"
|
||||||
|
}
|
||||||
|
|
||||||
# Export functions for use in child scripts
|
# Export functions for use in child scripts
|
||||||
export -f log_info log_success log_warn log_error log_debug log_step
|
export -f log_info log_success log_warn log_error log_debug log_step
|
||||||
export -f measure_time print_header print_footer
|
export -f measure_time print_header print_footer
|
||||||
@@ -345,3 +366,4 @@ export -f safe_execute check_venv get_git_hash
|
|||||||
export -f clean_build_artifacts validate_env_vars
|
export -f clean_build_artifacts validate_env_vars
|
||||||
export -f setup_build_env setup_app_directories load_env_file print_env_vars
|
export -f setup_build_env setup_app_directories load_env_file print_env_vars
|
||||||
export -f print_usage parse_args
|
export -f print_usage parse_args
|
||||||
|
export -f ensure_ios_capacitor_asset_directories
|
||||||
Reference in New Issue
Block a user