Skip to content

Commit 25706ce

Browse files
authored
Upgrade react-native to 0.78 (#114)
1 parent c0d8d1a commit 25706ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4062
-2845
lines changed

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.16.1
1+
22.12.0

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ruby 2.7.4
2-
bundler 2.2.27
1+
ruby 3.2.1
2+
bundler 2.6.0

examples/vanilla/.gitignore

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23-
ios/.xcode.env.local
23+
**/.xcode.env.local
2424

2525
# Android/IntelliJ
2626
#
@@ -33,6 +33,7 @@ local.properties
3333
.cxx/
3434
*.keystore
3535
!debug.keystore
36+
.kotlin/
3637

3738
# node.js
3839
#
@@ -56,11 +57,19 @@ yarn-error.log
5657
*.jsbundle
5758

5859
# Ruby / CocoaPods
59-
/ios/Pods/
60+
**/Pods/
6061
/vendor/bundle/
6162

6263
# Temporary files created by Metro to check the health of the file watcher
6364
.metro-health-check*
6465

6566
# testing
6667
/coverage
68+
69+
# Yarn
70+
.yarn/*
71+
!.yarn/patches
72+
!.yarn/plugins
73+
!.yarn/releases
74+
!.yarn/sdks
75+
!.yarn/versions

examples/vanilla/Gemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.12'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'

examples/vanilla/Gemfile.lock

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (7.0.6)
7-
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
activesupport (7.2.2.1)
9+
base64
10+
benchmark (>= 0.3)
11+
bigdecimal
12+
concurrent-ruby (~> 1.0, >= 1.3.1)
13+
connection_pool (>= 2.2.5)
14+
drb
815
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
917
minitest (>= 5.1)
10-
tzinfo (~> 2.0)
11-
addressable (2.8.4)
12-
public_suffix (>= 2.0.2, < 6.0)
18+
securerandom (>= 0.3)
19+
tzinfo (~> 2.0, >= 2.0.5)
20+
addressable (2.8.7)
21+
public_suffix (>= 2.0.2, < 7.0)
1322
algoliasearch (1.27.5)
1423
httpclient (~> 2.8, >= 2.8.3)
1524
json (>= 1.5.1)
1625
atomos (0.1.3)
26+
base64 (0.2.0)
27+
benchmark (0.4.0)
28+
bigdecimal (3.1.9)
1729
claide (1.1.0)
18-
cocoapods (1.12.1)
30+
cocoapods (1.15.2)
1931
addressable (~> 2.8)
2032
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.12.1)
33+
cocoapods-core (= 1.15.2)
2234
cocoapods-deintegrate (>= 1.0.3, < 2.0)
23-
cocoapods-downloader (>= 1.6.0, < 2.0)
35+
cocoapods-downloader (>= 2.1, < 3.0)
2436
cocoapods-plugins (>= 1.0.0, < 2.0)
2537
cocoapods-search (>= 1.0.0, < 2.0)
2638
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -32,8 +44,8 @@ GEM
3244
molinillo (~> 0.8.0)
3345
nap (~> 1.0)
3446
ruby-macho (>= 2.3.0, < 3.0)
35-
xcodeproj (>= 1.21.0, < 2.0)
36-
cocoapods-core (1.12.1)
47+
xcodeproj (>= 1.23.0, < 2.0)
48+
cocoapods-core (1.15.2)
3749
activesupport (>= 5.0, < 8)
3850
addressable (~> 2.8)
3951
algoliasearch (~> 1.0)
@@ -44,7 +56,7 @@ GEM
4456
public_suffix (~> 4.0)
4557
typhoeus (~> 1.0)
4658
cocoapods-deintegrate (1.0.5)
47-
cocoapods-downloader (1.6.3)
59+
cocoapods-downloader (2.1)
4860
cocoapods-plugins (1.0.0)
4961
nap
5062
cocoapods-search (1.0.1)
@@ -53,46 +65,56 @@ GEM
5365
netrc (~> 0.11)
5466
cocoapods-try (1.2.0)
5567
colored2 (3.1.2)
56-
concurrent-ruby (1.2.2)
68+
concurrent-ruby (1.3.3)
69+
connection_pool (2.5.0)
70+
drb (2.2.1)
5771
escape (0.0.4)
5872
ethon (0.16.0)
5973
ffi (>= 1.15.0)
60-
ffi (1.15.5)
74+
ffi (1.17.1)
6175
fourflusher (2.3.1)
6276
fuzzy_match (2.0.4)
6377
gh_inspector (1.1.3)
64-
httpclient (2.8.3)
65-
i18n (1.14.1)
78+
httpclient (2.9.0)
79+
mutex_m
80+
i18n (1.14.7)
6681
concurrent-ruby (~> 1.0)
67-
json (2.6.3)
68-
minitest (5.18.1)
82+
json (2.10.2)
83+
logger (1.7.0)
84+
minitest (5.25.5)
6985
molinillo (0.8.0)
86+
mutex_m (0.3.0)
7087
nanaimo (0.3.0)
7188
nap (1.1.0)
7289
netrc (0.11.0)
90+
nkf (0.2.0)
7391
public_suffix (4.0.7)
74-
rexml (3.2.5)
92+
rexml (3.4.1)
7593
ruby-macho (2.5.1)
76-
typhoeus (1.4.0)
94+
securerandom (0.4.1)
95+
typhoeus (1.4.1)
7796
ethon (>= 0.9.0)
7897
tzinfo (2.0.6)
7998
concurrent-ruby (~> 1.0)
80-
xcodeproj (1.22.0)
99+
xcodeproj (1.25.1)
81100
CFPropertyList (>= 2.3.3, < 4.0)
82101
atomos (~> 0.1.3)
83102
claide (>= 1.0.2, < 2.0)
84103
colored2 (~> 3.1)
85104
nanaimo (~> 0.3.0)
86-
rexml (~> 3.2.4)
105+
rexml (>= 3.3.6, < 4.0)
87106

88107
PLATFORMS
89108
ruby
90109

91110
DEPENDENCIES
92-
cocoapods (~> 1.12)
111+
activesupport (>= 6.1.7.5, != 7.1.0)
112+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
113+
concurrent-ruby (< 1.3.4)
114+
xcodeproj (< 1.26.0)
93115

94116
RUBY VERSION
95-
ruby 3.0.3p157
117+
ruby 3.2.1p31
96118

97119
BUNDLED WITH
98-
2.2.32
120+
2.6.0

examples/vanilla/README.md

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,76 @@ This is a new [**React Native**](https://reactnative.dev) project, bootstrapped
22

33
# Getting Started
44

5-
> **Note**: Make sure you have completed the [React Native - Environment Setup](https://reactnative.dev/docs/environment-setup) instructions till "Creating a new application" step, before proceeding.
5+
> **Note**: Make sure you have completed the [Set Up Your Environment](https://reactnative.dev/docs/set-up-your-environment) guide before proceeding.
66
7-
## Step 1: Start the Metro Server
7+
## Step 1: Start Metro
88

9-
First, you will need to start **Metro**, the JavaScript _bundler_ that ships _with_ React Native.
9+
First, you will need to run **Metro**, the JavaScript build tool for React Native.
1010

11-
To start Metro, run the following command from the _root_ of your React Native project:
11+
To start the Metro dev server, run the following command from the root of your React Native project:
1212

13-
```bash
14-
# using npm
13+
```sh
14+
# Using npm
1515
npm start
1616

1717
# OR using Yarn
1818
yarn start
1919
```
2020

21-
## Step 2: Start your Application
21+
## Step 2: Build and run your app
2222

23-
Let Metro Bundler run in its _own_ terminal. Open a _new_ terminal from the _root_ of your React Native project. Run the following command to start your _Android_ or _iOS_ app:
23+
With Metro running, open a new terminal window/pane from the root of your React Native project, and use one of the following commands to build and run your Android or iOS app:
2424

25-
### For Android
25+
### Android
2626

27-
```bash
28-
# using npm
27+
```sh
28+
# Using npm
2929
npm run android
3030

3131
# OR using Yarn
3232
yarn android
3333
```
3434

35-
### For iOS
35+
### iOS
3636

37-
```bash
38-
# using npm
37+
For iOS, remember to install CocoaPods dependencies (this only needs to be run on first clone or after updating native deps).
38+
39+
The first time you create a new project, run the Ruby bundler to install CocoaPods itself:
40+
41+
```sh
42+
bundle install
43+
```
44+
45+
Then, and every time you update your native dependencies, run:
46+
47+
```sh
48+
bundle exec pod install
49+
```
50+
51+
For more information, please visit [CocoaPods Getting Started guide](https://guides.cocoapods.org/using/getting-started.html).
52+
53+
```sh
54+
# Using npm
3955
npm run ios
4056

4157
# OR using Yarn
4258
yarn ios
4359
```
4460

45-
If everything is set up _correctly_, you should see your new app running in your _Android Emulator_ or _iOS Simulator_ shortly provided you have set up your emulator/simulator correctly.
61+
If everything is set up correctly, you should see your new app running in the Android Emulator, iOS Simulator, or your connected device.
62+
63+
This is one way to run your app — you can also build it directly from Android Studio or Xcode.
4664

47-
This is one way to run your app — you can also run it directly from within Android Studio and Xcode respectively.
65+
## Step 3: Modify your app
4866

49-
## Step 3: Modifying your App
67+
Now that you have successfully run the app, let's make changes!
5068

51-
Now that you have successfully run the app, let's modify it.
69+
Open `App.tsx` in your text editor of choice and make some changes. When you save, your app will automatically update and reflect these changes — this is powered by [Fast Refresh](https://reactnative.dev/docs/fast-refresh).
5270

53-
1. Open `App.tsx` in your text editor of choice and edit some lines.
54-
2. For **Android**: Press the <kbd>R</kbd> key twice or select **"Reload"** from the **Developer Menu** (<kbd>Ctrl</kbd> + <kbd>M</kbd> (on Window and Linux) or <kbd>Cmd ⌘</kbd> + <kbd>M</kbd> (on macOS)) to see your changes!
71+
When you want to forcefully reload, for example to reset the state of your app, you can perform a full reload:
5572

56-
For **iOS**: Hit <kbd>Cmd ⌘</kbd> + <kbd>R</kbd> in your iOS Simulator to reload the app and see your changes!
73+
- **Android**: Press the <kbd>R</kbd> key twice or select **"Reload"** from the **Dev Menu**, accessed via <kbd>Ctrl</kbd> + <kbd>M</kbd> (Windows/Linux) or <kbd>Cmd ⌘</kbd> + <kbd>M</kbd> (macOS).
74+
- **iOS**: Press <kbd>R</kbd> in iOS Simulator.
5775

5876
## Congratulations! :tada:
5977

@@ -62,11 +80,11 @@ You've successfully run and modified your React Native App. :partying_face:
6280
### Now what?
6381

6482
- If you want to add this new React Native code to an existing application, check out the [Integration guide](https://reactnative.dev/docs/integration-with-existing-apps).
65-
- If you're curious to learn more about React Native, check out the [Introduction to React Native](https://reactnative.dev/docs/getting-started).
83+
- If you're curious to learn more about React Native, check out the [docs](https://reactnative.dev/docs/getting-started).
6684

6785
# Troubleshooting
6886

69-
If you can't get this to work, see the [Troubleshooting](https://reactnative.dev/docs/troubleshooting) page.
87+
If you're having issues getting the above steps to work, see the [Troubleshooting](https://reactnative.dev/docs/troubleshooting) page.
7088

7189
# Learn More
7290

examples/vanilla/__tests__/App.test.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
* @format
33
*/
44

5-
import 'react-native';
65
import React from 'react';
6+
import ReactTestRenderer from 'react-test-renderer';
77
import App from '../App';
88

9-
// Note: import explicitly to use the types shiped with jest.
10-
import { it } from '@jest/globals';
11-
12-
// Note: test renderer must be required after react-native.
13-
import renderer from 'react-test-renderer';
14-
15-
it('renders correctly', () => {
16-
renderer.create(<App />);
9+
test('renders correctly', async () => {
10+
await ReactTestRenderer.act(() => {
11+
ReactTestRenderer.create(<App />);
12+
});
1713
});

0 commit comments

Comments
 (0)