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.

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

Merge from upstream 0.64-stable to v0.64.0 #863

Merged
Merged
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
2313d45
chore: ignore broken Hermes job
grabbou Nov 4, 2020
06fedcd
Upgrade metro to 0.64.0
Nov 6, 2020
fb2991e
Build rn-codegen in a temporary directory (#30292)
janicduplessis Nov 12, 2020
0f5fb5e
Android OSS: fixed unbound variable error for codegen build script
fkgozali Nov 12, 2020
68110d4
Use codegen from source in default iOS template apps
fkgozali Nov 13, 2020
9f49f8a
Fix :ReactAndroid:androidJavadoc task (#30417)
NickGerleman Nov 18, 2020
e79ecb5
fix android npm (#30452)
dulmandakh Nov 21, 2020
727d755
fix: pin hermes-engine to 0.7.x
grabbou Nov 19, 2020
65003d7
Use react-native-codegen@0.0.6 in new app template
hramos Nov 21, 2020
f7d0b83
chore: updated url of deprecated modules (#30422)
Naturalclar Nov 20, 2020
017dc45
Add possibility to disable buttons in action sheet ios (#28979)
lukewalczak Nov 19, 2020
0117077
[0.64.0-rc.0] Bump version numbers
grabbou Nov 23, 2020
9f0f8a5
chore: revert changes to test-manual-e2e.sh
grabbou Nov 24, 2020
e2be26a
fix: android artifacts in publish-npm.js
grabbou Nov 25, 2020
cda29d2
chore: Bump CLI to ^5.0.1-alpha.0 (#30420)
thymikee Nov 19, 2020
d197e95
[0.64.0-rc.1] Bump version numbers
grabbou Nov 25, 2020
a99676e
Fix cannot working Modal's onDismiss. (#29882)
kkoudev Nov 14, 2020
d8a0a9b
Integrate Native Module codegen into Xcode build pipeline (#30449)
hramos Dec 2, 2020
d823aef
Fix Circle CI iOS Tests: Make FBReactNativeSpec dir as needed
hramos Dec 3, 2020
15f2413
Fix path to react-native-codegen
hramos Dec 3, 2020
fffa4d1
Update template devDependencies (#30489)
Bardiamist Dec 8, 2020
eb85d1d
Add instructions to template/ios/Podfile for enabling hermes (#30461)
SConaway Dec 4, 2020
52129b2
Bump Hermes to 0.7.2
Huxpro Dec 10, 2020
2ba3ef5
fix: default template on iOS (#30571)
grabbou Dec 15, 2020
5c09b3f
fix: building in release mode for simulator (#30543)
grabbou Dec 14, 2020
ed237b4
Exclude `i386` from valid architectures when building with Hermes on …
grabbou Dec 15, 2020
4481d09
Fix infinite loop in KeyboardAvoidingView
sammy-SC Dec 15, 2020
1eb7d4a
[0.64.0-rc.2] Bump version numbers
grabbou Dec 18, 2020
70ba9ac
Expose the testID to black-box testing frameworks on Android (#29610)
jdeff Jan 6, 2021
052447c
Remove dependency on Folly in TurboModuleUtils.h (#30672)
vmoroz Jan 4, 2021
7ec38b9
Avoid eating clicks/taps into ScrollView when using physical keyboard…
NickGerleman Nov 19, 2020
224c85a
Update iOS Fabric-related files to compile on OSS (#29810)
empyrical Dec 22, 2020
0636c45
Use Fabric builds in iOS tests (#30639)
hramos Dec 24, 2020
e5888de
Add use_react_native_codegen!
hramos Dec 30, 2020
937ced3
Optionally override codegen script defaults via envvars
hramos Jan 4, 2021
5ada078
Make codegen more reliable on iOS (#30792)
janicduplessis Feb 1, 2021
7004cac
Invoke `node` directly in generate-specs.sh (#30781)
ivanmoskalev Feb 2, 2021
c023a40
chore: bump codegen script
grabbou Feb 5, 2021
e846740
[0.64.0-rc.3] Bump version numbers
grabbou Feb 5, 2021
7159bcb
Update flipper in RNTester and template (#31010)
janicduplessis Feb 24, 2021
4b68734
Generalize node search logic
grabbou Mar 1, 2021
14db556
fix: React Native CodeGen integration for 0.64-stable (#31027)
grabbou Mar 1, 2021
e7e4b00
fix: disable fabric
grabbou Mar 1, 2021
48a97d7
chore: fix conflict in Podfile.lock
grabbou Mar 1, 2021
1aa4f47
[0.64.0-rc.4] Bump version numbers
grabbou Mar 1, 2021
7f3f80f
Fix RefreshControl layout when removed from window (#31024)
janicduplessis Feb 23, 2021
138fdbc
fix: restore refresh control fix
grabbou Mar 11, 2021
8a6ac1f
chore: Update React.podspec to require cocoapods >= 1.10.1
grabbou Mar 11, 2021
728d55a
Fixing the git attrs for all the people and all the files and all fut…
grabbou Mar 11, 2021
ace025d
[0.64.0] Bump version numbers
grabbou Mar 12, 2021
e3c07de
Merge commit '06fedcd32d645c4685a6fa8398901c73183fd3bd' into amgleitm…
amgleitman Oct 21, 2021
a03619c
Merge commit 'e79ecb51222a39e661171ed31aef163a8f6fb236' into amgleitm…
amgleitman Oct 21, 2021
733f94e
Merge commit '017dc45c62ecb7cf872e4935544a269a5b51ca43' into amgleitm…
amgleitman Oct 21, 2021
a538390
Upgrade react-hooks rules
amgleitman Oct 21, 2021
8960e85
Some more changes for bringing up RN64 in devmain Android (#861)
mganandraj Oct 22, 2021
8b8bb85
Merge commit '0117077b9572f5b674578e19073e31e4693e9d41' into amgleitm…
amgleitman Oct 22, 2021
74aa912
Merge commit 'e2be26a68ff26bac6a48b6fdce12761d7a11c3e6' into amgleitm…
amgleitman Oct 22, 2021
264e9e4
Merge commit 'cda29d212487493c469d72b7f11c01116389f360' into amgleitm…
amgleitman Oct 22, 2021
762592a
Add explicit dependency on fbjs to RNTester
amgleitman Oct 22, 2021
a11f320
Merge commit '52129b235aa96e2a89f601ca800f55bfe9db2a7b' into amgleitm…
amgleitman Oct 22, 2021
855ac68
Merge commit '4481d09865c728f08017687f9f2bbb0399d48e45' into amgleitm…
amgleitman Oct 23, 2021
38e0fa6
Merge commit '1eb7d4aef78ddfd8e975bfd6d279398366f37edf' into amgleitm…
amgleitman Oct 23, 2021
7726590
Merge commit '1aa4f47e2f119c447b4de42808653df080d95fe9' into amgleitm…
amgleitman Oct 23, 2021
3266212
Merge commit 'ace025d2cbcc06ef076cbf460be445b18baddcc7' into amgleitm…
amgleitman Oct 23, 2021
f9f7f8d
Fix for submit button disappearing bug in comments (#862)
msgharpu Oct 25, 2021
b544204
Update Android patches
amgleitman Oct 25, 2021
358a3a2
Merge branch 'master' into amgleitman/0.64-merge-0.64.0
amgleitman Oct 25, 2021
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
Prev Previous commit
Next Next commit
Use codegen from source in default iOS template apps
Summary:
Add the `react-native-codegen` source to the `react-native` npm package.
Instead of using `react-native-codegen` from npm, the iOS app template will now build the package from source. Doing so removes the need to carefully time `react-native-codegen` npm releases to oss `react-native` releases, as the codegen and the oss release will be cut at the same time.

Changelog: [Internal] - Removed react-native-codegen dependency from iOS app template

Reviewed By: TheSavior

Differential Revision: D24904655

fbshipit-source-id: a07932bc748e2afb9359de584181bcb9dd0810ea
fkgozali authored and alloy committed Nov 18, 2020
commit 68110d4ab33a14fc861c32fd204919de6f1aa475
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
"Libraries",
"LICENSE",
"local-cli",
"packages/react-native-codegen",
"React-Core.podspec",
"react-native.config.js",
"react.gradle",
4 changes: 1 addition & 3 deletions packages/rn-tester/Podfile
Original file line number Diff line number Diff line change
@@ -64,9 +64,7 @@ pre_install do |installer|
frameworks_pre_install(installer) if ENV['USE_FRAMEWORKS'] == '1'
if ENV['USE_CODEGEN'] != '0'
prefix_path = "../.."
codegen_path = "../../packages/react-native-codegen"
system("(cd #{codegen_path} && yarn install && yarn run build)")
codegen_pre_install(installer, {path:prefix_path, codegen_path:codegen_path})
codegen_pre_install(installer, {path:prefix_path})
end
end

2 changes: 1 addition & 1 deletion packages/rn-tester/Podfile.lock
Original file line number Diff line number Diff line change
@@ -528,6 +528,6 @@ SPEC CHECKSUMS:
Yoga: 69ef0b2bba5387523f793957a9f80dbd61e89631
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 497dba59a3312b3cb22d518b96672409db90460d
PODFILE CHECKSUM: 961e081223f82b7e9208869de4d73534d949ae9e

COCOAPODS: 1.10.0
2 changes: 1 addition & 1 deletion scripts/generate-native-modules-specs.sh
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ RN_DIR=$(cd "$THIS_DIR/.." && pwd)
CODEGEN_DIR=$(cd "$RN_DIR/packages/react-native-codegen" && pwd)
OUTPUT_DIR="${1:-$RN_DIR/Libraries/FBReactNativeSpec/FBReactNativeSpec}"
SCHEMA_FILE="$RN_DIR/schema-native-modules.json"
YARN_BINARY="${YARN_BINARY:-yarn}"
YARN_BINARY="${YARN_BINARY:-$(command -v yarn)}"

describe () {
printf "\\n\\n>>>>> %s\\n\\n\\n" "$1"
4 changes: 2 additions & 2 deletions scripts/react_native_pods.rb
Original file line number Diff line number Diff line change
@@ -112,13 +112,13 @@ def flipper_post_install(installer)
# Pre Install processing for Native Modules
def codegen_pre_install(installer, options={})
prefix = options[:path] ||= "../node_modules/react-native"
codegen_path = options[:codegen_path] ||= "../node_modules/react-native-codegen"
system("./#{prefix}/packages/react-native-codegen/scripts/oss/build.sh")

Dir.mktmpdir do |dir|
native_module_spec_name = "FBReactNativeSpec"
schema_file = dir + "/schema-#{native_module_spec_name}.json"
srcs_dir = "#{prefix}/Libraries"
schema_generated = system("node #{codegen_path}/lib/cli/combine/combine-js-to-schema-cli.js #{schema_file} #{srcs_dir}")
schema_generated = system("node #{prefix}/packages/react-native-codegen/lib/cli/combine/combine-js-to-schema-cli.js #{schema_file} #{srcs_dir}")
specs_generated = system("node #{prefix}/scripts/generate-native-modules-specs-cli.js ios #{schema_file} #{srcs_dir}/#{native_module_spec_name}/#{native_module_spec_name}")
end
end
3 changes: 1 addition & 2 deletions template/package.json
Original file line number Diff line number Diff line change
@@ -21,8 +21,7 @@
"eslint": "^6.5.1",
"jest": "^25.1.0",
"metro-react-native-babel-preset": "^0.64.0",
"react-test-renderer": "17.0.1",
"react-native-codegen": "0.0.4"
"react-test-renderer": "17.0.1"
},
"jest": {
"preset": "react-native"