Skip to content

Commit aa4f802

Browse files
gabrieldonadelfacebook-github-bot
authored andcommitted
Restore CLI_PATH variable in react-native-xcode script (#45560)
Summary: When changing the `react-native-xcode.sh` logic to use the helloworld cli on #44721, the `CLI_PATH` env var was removed along with `BUNDLE_COMMAND`. Both of these values were used by Expo to override the default CLI and use our custom bundling command. https://github.com/expo/expo/blob/10e302ee13add0e24a08c7ee792c2da50ace95a6/templates/expo-template-bare-minimum/ios/HelloWorld.xcodeproj/project.pbxproj#L215C4-L215C15 This restores the `CLI_PATH` variable and set the default value as `"$REACT_NATIVE_DIR/scripts/bundle.js"`, along with the `BUNDLE_COMMAND` variable. With this Expo and other frameworks can keep the ability to easily replace the internal CLI ## Changelog: [INTERNAL] [CHANGED] - Restore CLI_PATH variable in react-native-xcode script Pull Request resolved: #45560 Test Plan: Project compiles correctly on iOS Reviewed By: robhogan Differential Revision: D60035338 Pulled By: blakef fbshipit-source-id: 26583d11d9f573f7cfa405b68e0cc3304c3601df
1 parent 9af6395 commit aa4f802

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

packages/react-native/scripts/react-native-xcode.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ fi
9090

9191
[ -z "$NODE_ARGS" ] && export NODE_ARGS=""
9292

93-
[ -z "$BUNDLE_COMMAND" ] && BUNDLE_COMMAND="bundle"
93+
[ -z "$CLI_PATH" ] && CLI_PATH="$REACT_NATIVE_DIR/scripts/bundle.js"
9494

9595
[ -z "$COMPOSE_SOURCEMAP_PATH" ] && COMPOSE_SOURCEMAP_PATH="$REACT_NATIVE_DIR/scripts/compose-source-maps.js"
9696

@@ -147,7 +147,7 @@ else
147147
fi
148148

149149
# shellcheck disable=SC2086
150-
"$NODE_BINARY" $NODE_ARGS "$REACT_NATIVE_DIR/scripts/bundle.js" \
150+
"$NODE_BINARY" $NODE_ARGS "$CLI_PATH" $BUNDLE_COMMAND \
151151
$CONFIG_ARG \
152152
--config-cmd "$CONFIG" \
153153
--entry-file "$ENTRY_FILE" \

0 commit comments

Comments
 (0)