IGAPP-1061: Upgrade react and react native #843

sarahsporck · 2023-01-17T17:13:51Z

This pull request belongs to an issue on our bugtracker.
You can find it there by looking for an issue with the key which is mentioned in the title of this pull request.
It starts with the keyword IGAPP.

What was updated?

react
react-native
jest

Why are there patches?
Check out this issue facebook/react-native#33557.
The removed types will temporarily be readded in react-native 0.71 (which our mapbox version currently does not support). See facebook/react-native@b966d29

Also most of the new arch stuff will be removed in later versions.

What has changed in jest?

mostly enforced typings
transform seems to have changed for ts-jest

The iOS update is still missing. @LeandraH or @f1sh1918 ? :) https://react-native-community.github.io/upgrade-helper/?from=0.67.5&to=0.70.6 (maybe in a separate branch for a better overview?)

LeandraH · 2023-01-18T12:01:01Z

Will do

native/src/assets/licenses.json

native/src/components/List.tsx

native/src/components/__tests__/SnackbarContainer.spec.tsx

steffenkleinle

Tested on android and firefox

sarahsporck · 2023-01-26T09:44:45Z

native/.gitignore

-assets/licenses.json
+src/assets/licenses.json


Had to be moved. Maybe react resolves path now relative to src 🤷🏼‍♀️ (you'll need to remove your license.json in assets/licenses.json after this merge.

sarahsporck · 2023-01-26T09:48:16Z

native/android/gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh


auto generated by ./gradlew wrapper

sarahsporck · 2023-01-26T09:49:11Z

native/android/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem

-@if "%DEBUG%" == "" @echo off


also auto generated by ./gradlew wrapper

sarahsporck · 2023-01-26T09:49:49Z

native/android/app/src/main/jni/CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.13)


all the /jni/ files are basicly copy/pasted

sarahsporck · 2023-01-26T09:51:46Z

native/package.json

@@ -54,18 +54,16 @@
    "@react-native-async-storage/async-storage": "^1.16.3",
    "@react-native-clipboard/clipboard": "^1.10.0",
    "@react-native-community/geolocation": "^2.1.0",
-    "@react-native-community/masked-view": "^0.1.11",


afaik not used

sarahsporck · 2023-01-26T09:52:05Z

native/package.json

    "@react-native-community/progress-view": "1.3.1",
    "@react-native-firebase/app": "13.0.1",
    "@react-native-firebase/messaging": "13.0.1",
    "@react-native-mapbox-gl/maps": "^8.5.0",
    "@react-navigation/elements": "^1.3.4",
    "@react-navigation/native": "^6.0.11",
    "@react-navigation/stack": "^6.2.2",
-    "@sentry/react-native": "^4.1.2",
-    "@sentry/types": "^7.5.0",
+    "@sentry/react-native": "^5.0.0-alpha.10",


compatibility upgrade

sarahsporck · 2023-01-26T13:55:52Z

native/metro.config.js

    },
  },
  watchFolders: [path.resolve(__dirname, '../')],
  transformer: {
    assetPlugins: ['react-native-svg-asset-plugin'],
    getTransformOptions: async () => ({
      transform: {
-        experimentalImportSupport: false,


option does not exist

sarahsporck · 2023-01-26T13:59:15Z

web/src/components/__tests__/I18nProvider.spec.tsx

@@ -1,4 +1,4 @@
-import { act, render, screen, waitFor } from '@testing-library/react'


half the tests in this file were failing after the upgrade. Therefore, many changes here.

sarahsporck · 2023-01-26T14:01:01Z

web/src/index.tsx

-ReactDOM.render(<App />, container)
+const root = createRoot(container)
+root.render(<App />)


Enables concurrent renderer in web

sarahsporck · 2023-02-01T09:25:19Z

api-client/src/endpoints/__tests__/createFeedbackEndpoint.spec.ts

-/**
- * only needed as FormData is a web-specific type
- * @jest-environment jsdom
- */


jest-environment jsdom has been removed from jest. So to avoid adding another dependency I mocked FormData instead.

-upgrade-react-and-react-native-ios

LeandraH

Tested it pretty thoroughly on a real iPhone :)

native/ios/Integreat.xcodeproj/project.pbxproj

f1sh1918

@LeandraH looks like some stuff was messed up in project.pbxproj
At least the provisioning has to be reverted. I just roughly went through
Each change in this file should be tested if its needed. It was my bad not to check properly in your pr before

sarahsporck · 2023-02-09T15:09:37Z

Finally the build finishes! Thank you @LeandraH and @f1sh1918 for your help with iOS <3

f1sh1918

Tested on ios real device. works fine.

Maybe we could merge it monday, since martin is not working next week? Just an idea

ztefanie · 2023-02-13T07:43:32Z

Please squash the commits and undo changes in version.json.

sarahsporck requested review from steffenkleinle, ztefanie, f1sh1918 and LeandraH as code owners January 17, 2023 17:13

steffenkleinle reviewed Jan 24, 2023

View reviewed changes

native/src/assets/licenses.json Outdated Show resolved Hide resolved

native/src/components/List.tsx Outdated Show resolved Hide resolved

native/src/components/__tests__/SnackbarContainer.spec.tsx Outdated Show resolved Hide resolved

sarahsporck changed the title ~~IGAPP-1061: Upgrade react and react native~~ WIP: IGAPP-1061: Upgrade react and react native Jan 25, 2023

steffenkleinle approved these changes Jan 25, 2023

View reviewed changes

sarahsporck commented Jan 26, 2023

View reviewed changes

sarahsporck force-pushed the IGAPP-1061-upgrade-react-and-react-native branch 2 times, most recently from acdc849 to 7704e60 Compare January 31, 2023 13:13

sarahsporck added 2 commits February 1, 2023 09:16

IGAPP-1061: Upgrade react and jest

7dffacb

IGAPP-1061: upgrade react

85e0147

sarahsporck force-pushed the IGAPP-1061-upgrade-react-and-react-native branch from b79840f to f80c1a9 Compare February 1, 2023 08:16

IGAPP-1061: upgrade react-native

0c5f2f3

sarahsporck force-pushed the IGAPP-1061-upgrade-react-and-react-native branch from f80c1a9 to 0c5f2f3 Compare February 1, 2023 08:38

IGAPP-1061: add form data mock

2e12bff

sarahsporck commented Feb 1, 2023

View reviewed changes

sarahsporck and others added 12 commits February 1, 2023 10:36

IGAPP-1061: update snapshots due to jest 29

a647078

IGAPP-1061: Upgrade react and jest

8b08f6c

IGAPP-1061: fix type errors and tests

80485a5

IGAPP-1061: update native app apdroid

f088b01

IGAPP-1061: update tests

b4b876a

IGAPP-1061: create licenses in correct assets folder and remove list fix

d2b8b4c

IGAPP-1061: untrack license.json

6cf4b56

IGAPP-1061: Fix merge

f37eff2

IGAPP-1061: Upgrade RN to 0.70 on iOS

a6dc6b9

IGAPP-1061: remove unused dependencies

14a9d44

Merge branch 'IGAPP-1061-upgrade-react-and-react-native' into IGAPP-1061

05f4458

-upgrade-react-and-react-native-ios

Update from main

2c4f3aa

LeandraH approved these changes Feb 3, 2023

View reviewed changes

sarahsporck force-pushed the IGAPP-1061-upgrade-react-and-react-native branch from 903ed77 to 4ebe9aa Compare February 6, 2023 08:08

sarahsporck and others added 2 commits February 6, 2023 09:20

Merge branch 'main' into IGAPP-1061-upgrade-react-and-react-native

4e5c91c

IGAPP-1061: Add file for XCode version

ac7c2b4

sarahsporck changed the title ~~WIP: IGAPP-1061: Upgrade react and react native~~ IGAPP-1061: Upgrade react and react native Feb 6, 2023

LeandraH and others added 7 commits February 6, 2023 14:48

IGAPP-1061: Remove file for XCode version

d0eb7a4

Merge branch 'main' into IGAPP-1061-upgrade-react-and-react-native

dea4493

IGAPP-1061: Install gem for XCode versioning

705eeff

IGAPP-1061: Remove XCode in Fastfiles

9116999

IGAPP-1061: Downgrade XCode

9c5373b

IGAPP-1061: Delete package.resolved

3817974

IGAPP-1061: Add previous package.resolved

1e6fefb

f1sh1918 reviewed Feb 8, 2023

View reviewed changes

native/ios/Integreat.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved

f1sh1918 reviewed Feb 8, 2023

View reviewed changes

native/ios/Integreat.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved

f1sh1918 reviewed Feb 8, 2023

View reviewed changes

native/ios/Integreat.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved

f1sh1918 reviewed Feb 8, 2023

View reviewed changes

native/ios/Integreat.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved

f1sh1918 requested changes Feb 8, 2023

View reviewed changes

LeandraH added 2 commits February 9, 2023 12:59

IGAPP-1061: Revert changes in project.pbxproj

3e84831

IGAPP-1061: Revert changes in package.resolved

bdadc98

sarahsporck requested a review from f1sh1918 February 9, 2023 15:08

LeandraH and others added 2 commits February 10, 2023 11:19

IGAPP-1061: Fix warning about scroll throttling

bddafdd

IGAPP-1061: add project.pbxproj changes for pods

73fdb6b

f1sh1918 approved these changes Feb 10, 2023

View reviewed changes

LeandraH and others added 2 commits February 13, 2023 14:12

Merge branch 'main' into IGAPP-1061-upgrade-react-and-react-native

2552611

Merge branch 'main' into IGAPP-1061-upgrade-react-and-react-native

854447e

f1sh1918 enabled auto-merge February 13, 2023 18:49

f1sh1918 merged commit fffb708 into main Feb 13, 2023

f1sh1918 deleted the IGAPP-1061-upgrade-react-and-react-native branch February 13, 2023 19:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

IGAPP-1061: Upgrade react and react native #843

IGAPP-1061: Upgrade react and react native #843

sarahsporck commented Jan 17, 2023

LeandraH commented Jan 18, 2023

steffenkleinle left a comment

sarahsporck Jan 26, 2023

sarahsporck Jan 26, 2023

sarahsporck Jan 26, 2023

sarahsporck Jan 26, 2023

sarahsporck Jan 26, 2023

sarahsporck Jan 26, 2023

sarahsporck Jan 26, 2023

sarahsporck Jan 26, 2023

sarahsporck Jan 26, 2023

sarahsporck Feb 1, 2023

LeandraH left a comment

f1sh1918 left a comment •

edited

Loading

sarahsporck commented Feb 9, 2023

f1sh1918 left a comment

ztefanie commented Feb 13, 2023

		@@ -1,4 +1,4 @@
		import { act, render, screen, waitFor } from '@testing-library/react'

		assets/licenses.json
		src/assets/licenses.json

IGAPP-1061: Upgrade react and react native #843

IGAPP-1061: Upgrade react and react native #843

Conversation

sarahsporck commented Jan 17, 2023

LeandraH commented Jan 18, 2023

steffenkleinle left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LeandraH left a comment

Choose a reason for hiding this comment

f1sh1918 left a comment • edited Loading

Choose a reason for hiding this comment

sarahsporck commented Feb 9, 2023

f1sh1918 left a comment

Choose a reason for hiding this comment

ztefanie commented Feb 13, 2023

f1sh1918 left a comment •

edited

Loading