Skip to content

Commit d92bfeb

Browse files
authored
Upgrade React Native from 0.84.1 to 0.85.0-rc.1 (#1918)
- Bump RN deps and devDeps (@react-native: babel/jest presets, eslint/metro/ts configs) - Bump Gradle Wrapper config from 9.0.0 to 9.3.1 - update gradlew shell script (remove CLASSPATH var), regen batch script and Java app (.jar) - Bump #1877 RN ver comments - Bump Jest snapshot test rendered RN ver - Remove gem 'nkf' workaround comment now upstream in react-native-community/template#200 - Update lockfiles (Yarn, CocoaPods) - Bump ReadMe ver - NB: react-native-community.github.io/upgrade-helper/?from=0.84.1&to=0.85.0-rc.1&package=com.myapp&name=MyApp - missing @react-native/jest-preset from package.json devDependencies - fixed upstream react-native-community/template#210 and added here - Ref: react-native-community/template#208 react/react-native#55169 Resolve: #1913
1 parent 32d19c5 commit d92bfeb

20 files changed

Lines changed: 580 additions & 629 deletions

File tree

β€Ž.eslintrc.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = {
4646
'.eslintrc.js',
4747
'webpack.config.js',
4848
'vendor', // Generated for iOS build: bundle install
49-
// TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
49+
// TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
5050
'!/.storybook',
5151
'.storybook/storybook.requires.js', // Codegen
5252
'.storybook/Storybook.tsx', // Imports generated file
@@ -130,7 +130,7 @@ module.exports = {
130130
'**/*{.,_}{test,spec}.{ts,tsx}',
131131
// Snapshot tests (Jest)
132132
'**/__tests__/**/*.{ts,tsx}', // react-test-renderer
133-
// TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
133+
// TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
134134
// Storybook config
135135
'.storybook/**/*.{ts,tsx,js}',
136136
// Stories (@storybook/react-native)

β€Ž.storybook/Storybook.tsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
2+
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
33
*/
44

55
import './doctools'

β€Ž.storybook/doctools.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
2+
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
33
*/
44

55
// vscode editor.codeActionsOnSave source.organizeImports conflicting w ESLint only with .js

β€Ž.storybook/main.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
2+
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
33
*/
44

55
/**

β€Ž.storybook/preview.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
2+
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
33
*/
44

55
/**

β€Ž.storybook_server/main.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
2+
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
33
*/
44

55
module.exports = {

β€ŽGemfileβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ gem 'bigdecimal'
1414
gem 'logger'
1515
gem 'benchmark'
1616
gem 'mutex_m'
17-
gem 'nkf' # Fix `bundle exec pod install` LoadError - cannot load such file -- kconv
17+
gem 'nkf'

β€ŽREADME.mdβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<div align="center">
1111

12-
[![NPM RN pkg ver](https://img.shields.io/badge/React%20Native-0.84.1-red.svg)](https://github.com/facebook/react-native/releases)
12+
[![NPM RN pkg ver](https://img.shields.io/badge/React%20Native-0.85.0_rc.1-red.svg)](https://github.com/facebook/react-native/releases)
1313
[![TypeScript](https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg)](#)
1414
[![Linter](https://badges.aleen42.com/src/eslint.svg)](#)
1515
[![Formatter: prettier](https://img.shields.io/badge/Formatter-Prettier-f8bc45.svg)](#)
@@ -97,7 +97,7 @@ yarn android
9797
## Storybook v6
9898

9999
> [!NOTE]
100-
> TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
100+
> TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
101101
102102
Add stories to `src/components/**/*.stories.(ts|tsx)`
103103

β€Ž__tests__/src/__snapshots__/index.test.tsx.snapβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ exports[`app matches snapshot 1`] = `
8989
}
9090
>
9191
Version:
92-
0.84.1
92+
0.85.0-rc.1
9393
</Text>
9494
<Text
9595
style={
718 Bytes
Binary file not shown.

0 commit comments

Comments
Β (0)