Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade React Native 0.71.11 - iOS changes #5881

Merged
merged 20 commits into from
Jul 4, 2023
Merged

Upgrade React Native 0.71.11 - iOS changes #5881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cfe592e
Update Gutenberg reference
Jun 21, 2023
e7bf780
Update script for generating React-Codegen
Jun 22, 2023
17e4705
Update third-party podspecs to target 0.71.11
Jun 22, 2023
2aca7ac
Update FBReactNativeSpec.podspec.json with hash
Jun 22, 2023
165d681
Apply bundle changes
Jun 22, 2023
9707305
Manually add React-bridging.podspec.json
Jun 22, 2023
30b052f
Revert "Manually add React-bridging.podspec.json"
Jun 23, 2023
c89ef2a
Update list of dependencies in Podfile for iOS
Jun 25, 2023
819d005
Add tag to Hermes podspec to workaround error
Jun 25, 2023
64bf6d7
Update dependency versions in Podfile.lock
Jun 25, 2023
21a4fbe
[Temporary] Add React Native as a dependency
Jun 26, 2023
6d1a1a3
Revert "[Temporary] Add React Native as a dependency"
Jun 26, 2023
76fde7c
Update Gutenberg ref
fluiddot Jun 30, 2023
edf1e8c
Merge branch 'upgrade/react-native-0.71.8' into upgrade/react-native-…
fluiddot Jun 30, 2023
3b9f2cf
Update Gutenberg ref
fluiddot Jun 30, 2023
a9ed5c9
Merge branch 'upgrade/react-native-0.71.8' into upgrade/react-native-…
fluiddot Jul 3, 2023
a9c8076
Update Gutenberg ref
fluiddot Jul 3, 2023
5e9d00a
Disable hermes when generating codegen podspec
fluiddot Jul 3, 2023
bf226d9
Generate third-party podspecs
fluiddot Jul 3, 2023
d3622b2
Update FBReactNativeSpec podspec
fluiddot Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions bin/generate-podspecs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,10 @@ RN_DIR="./"
SCRIPTS_PATH="./scripts/"
CODEGEN_REPO_PATH="../packages/react-native-codegen"
CODEGEN_NPM_PATH="../react-native-codegen"
PACKAGE_JSON_PATH="./package.json"
SRCS_DIR=${SRCS_DIR:-$(cd "./Libraries" && pwd)}
RN_VERSION=$(cat ./package.json | grep -m 1 version | sed 's/[^0-9.]//g')
HERMES_ENABLED="false"

RN_PODSPECS=$(find * -type f -name "*.podspec" -not -name "React-rncore.podspec" -not -path "third-party-podspecs/*" -not -path "*Fabric*" -print)
TMP_DEST=$(mktemp -d)
Expand Down Expand Up @@ -161,23 +163,30 @@ do
fi

# Generate React-Codegen
# A copy of react_native_pods is done to modify the content within get_react_codegen_spec
# A copy of codegen_utils.rb is done to modify the content within get_react_codegen_spec
# this enables getting the schema for React-Codegen in runtime by printing the content.
echo "Generating React-Codegen"
REACT_NATIVE_PODS_PATH="$SCRIPTS_PATH/react_native_pods.rb"
REACT_NATIVE_PODS_MODIFIED_PATH="$SCRIPTS_PATH/react_native_pods_modified.rb"
# Making a temp copy of react_native_pods.rb
cp $REACT_NATIVE_PODS_PATH $REACT_NATIVE_PODS_MODIFIED_PATH
REACT_NATIVE_CODEGEN_UTILS_PATH="$SCRIPTS_PATH/cocoapods/codegen_utils.rb"
REACT_NATIVE_CODEGEN_UTILS_MODIFIED_PATH="$SCRIPTS_PATH/cocoapods/codegen_utils_modified.rb"
# Making a temp copy of codegen_utils.rb
cp $REACT_NATIVE_CODEGEN_UTILS_PATH $REACT_NATIVE_CODEGEN_UTILS_MODIFIED_PATH
# Manually add the min_ios_version_supported variable to the CodegenUtils class
# The modified script won't be able to detect min_ios_version_supported otherwise
echo "
def min_ios_version_supported
'12.4'
Copy link
Contributor

@fluiddot fluiddot Jul 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually, we should fetch this value dynamically from React Native configuration instead of setting it fixed (reference).

end
" >> "$REACT_NATIVE_CODEGEN_UTILS_MODIFIED_PATH"
# Modify the get_react_codegen_spec method to return the result using print and JSON.pretty
sed -i '' -e "s/:git => ''/:git => 'https:\/\/github.com\/facebook\/react-native.git', :tag => 'v$RN_VERSION'/" "$REACT_NATIVE_PODS_MODIFIED_PATH"
sed -i '' -e 's/return spec/print JSON.pretty_generate(spec)/' "$REACT_NATIVE_PODS_MODIFIED_PATH"
sed -i '' -e "s/:git => ''/:git => 'https:\/\/github.com\/facebook\/react-native.git', :tag => 'v$RN_VERSION'/" "$REACT_NATIVE_CODEGEN_UTILS_MODIFIED_PATH"
sed -i '' -e 's/return spec/print JSON.pretty_generate(spec)/' "$REACT_NATIVE_CODEGEN_UTILS_MODIFIED_PATH"
# Run get_react_codegen_spec and generate React-Codegen.podspec.json
ruby -r "./scripts/react_native_pods_modified.rb" -e "get_react_codegen_spec" > "$DEST/React-Codegen.podspec.json"
ruby -r "./scripts/cocoapods/codegen_utils_modified.rb" -e "CodegenUtils.new.get_react_codegen_spec('$PACKAGE_JSON_PATH', hermes_enabled:$HERMES_ENABLED)" > "$DEST/React-Codegen.podspec.json"
TMP_ReactCodeGenSpec=$(mktemp)
jq '.source_files = "third-party-podspecs/FBReactNativeSpec/**/*.{c,h,m,mm,cpp}"' "$DEST/React-Codegen.podspec.json" > "$TMP_ReactCodeGenSpec"
mv "$TMP_ReactCodeGenSpec" "$DEST/React-Codegen.podspec.json"
# Remove temp copy of react_native_pods.rb
rm $REACT_NATIVE_PODS_MODIFIED_PATH
# Remove temp copy of codegen_utils.rb
rm $REACT_NATIVE_CODEGEN_UTILS_MODIFIED_PATH

echo "Generating schema from Flow types"
"$NODE_BINARY" "$CODEGEN_PATH/lib/cli/combine/combine-js-to-schema-cli.js" "$SCHEMA_FILE" "$SRCS_DIR"
Expand Down
7,980 changes: 4,022 additions & 3,958 deletions bundle/ios/App.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gutenberg
Open in desktop
Submodule gutenberg updated 2 files
+53 −13 packages/react-native-editor/__device-tests__/helpers/utils.js
+1 −1 packages/react-native-editor/__device-tests__/pages/editor-page.js
3 changes: 2 additions & 1 deletion ios-xcframework/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ DEPENDENCIES = %w[
RNCClipboard
RNFastImage
React-Codegen
React-bridging
React-jsc
React-hermes
].freeze

def gutenberg_dependencies
Expand Down
Loading