From 4b84c20f14eb9d9f01e6e83d1dc678cbcc888f51 Mon Sep 17 00:00:00 2001 From: Rui Ying Date: Fri, 11 Jun 2021 01:09:43 -0700 Subject: [PATCH] Fix cli bundle platform for Mac Catalyst in `react-native-xcode.sh` (#31062) Summary: A recent commit https://github.com/facebook/react-native/commit/941bc0ec195716e6a505a3c3a67f97a87ea9bcdc#diff-0eeea47fa4bace26fa6c492a03fa0ea3923a2d8d54b7894f7760cb9131ab65eb on Hermes macOS brings a regression for Mac Catalyst target. Once hardcoded cli bundle platform `ios` can now be either `ios` or `macos`. However, Mac Catalyst is identified as `macos` rather than `ios`. This PR should fix it and close https://github.com/facebook/react-native/issues/31061. ## Changelog [iOS] [Fixed] - Fix cli bundle platform for Mac Catalyst in `react-native-xcode.sh` Pull Request resolved: https://github.com/facebook/react-native/pull/31062 Test Plan: 1. Build fails on a new RN 0.64-rc.3 project. 2. Apply the fix. 3. Build passes. Reviewed By: TheSavior Differential Revision: D29038793 Pulled By: appden fbshipit-source-id: 29761f887ec7a9cc26f088953c3888c6d19bed71 --- scripts/react-native-xcode.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/react-native-xcode.sh b/scripts/react-native-xcode.sh index 09b6c40e6ae5d2..a6aef2444e4669 100755 --- a/scripts/react-native-xcode.sh +++ b/scripts/react-native-xcode.sh @@ -127,6 +127,10 @@ case "$PLATFORM_NAME" in ;; esac +if [ "${IS_MACCATALYST}" = "YES" ]; then + BUNDLE_PLATFORM="ios" +fi + EMIT_SOURCEMAP= if [[ ! -z "$SOURCEMAP_FILE" ]]; then EMIT_SOURCEMAP=true