Skip to content

Commit f18824d

Browse files
M-i-k-e-lM-i-k-e-l
authored
Infra/upgrade to rn66 try 2 (#1763)
* Upgrade to RN66 * types * Update snapshots * Update snapshots
1 parent 47a7335 commit f18824d

File tree

14 files changed

+56
-23
lines changed

14 files changed

+56
-23
lines changed

‎.flowconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ emoji=true
2525

2626
exact_by_default=true
2727

28+
format.bracket_spacing=false
29+
2830
module.file_ext=.js
2931
module.file_ext=.json
3032
module.file_ext=.ios.js
@@ -60,4 +62,4 @@ untyped-import
6062
untyped-type-import
6163

6264
[version]
63-
^0.149.0
65+
^0.158.0

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ build/
2929
.gradle
3030
local.properties
3131
*.iml
32+
*.hprof
3233
android/gradlew.bat
3334
expoDemo/android/gradlew.bat
3435

‎android/app/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ def enableProguardInReleaseBuilds = false
1313
def jscFlavor = 'org.webkit:android-jsc:+'
1414
def enableHermes = project.ext.react.get("enableHermes", false)
1515

16+
/**
17+
* Architectures to build native code for in debug.
18+
*/
19+
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
20+
1621
android {
1722
compileSdkVersion rootProject.ext.compileSdkVersion
1823
ndkVersion rootProject.ext.ndkVersion
@@ -44,6 +49,11 @@ android {
4449
buildTypes {
4550
debug {
4651
signingConfig signingConfigs.debug
52+
if (nativeArchitectures) {
53+
ndk {
54+
abiFilters nativeArchitectures.split(',')
55+
}
56+
}
4757
}
4858
release {
4959
// Caution! In production, you need to generate your own keystore file.

‎android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 30
88
targetSdkVersion = 30
9-
ndkVersion = "20.1.5948944"
9+
ndkVersion = "21.4.7075529"
1010
RNNKotlinVersion = "1.6.0"
1111
}
1212
repositories {
@@ -16,7 +16,7 @@ buildscript {
1616
}
1717
dependencies {
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$RNNKotlinVersion"
19-
classpath("com.android.tools.build:gradle:4.2.1")
19+
classpath("com.android.tools.build:gradle:4.2.2")
2020

2121
// NOTE: Do not place your application dependencies here; they belong
2222
// in the individual module build.gradle files

‎android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ android.useAndroidX=true
2121
android.enableJetifier=true
2222

2323
# Version of flipper SDK to use with React Native
24-
FLIPPER_VERSION=0.93.0
24+
FLIPPER_VERSION=0.99.0

‎generatedTypes/lib/components/Keyboard/KeyboardTracking/KeyboardTrackingView/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ declare const _default: React.ForwardRefExoticComponent<Pick<ViewProps & {
5151
ref?: any;
5252
children?: React.ReactChild | React.ReactChild[] | undefined;
5353
style?: ViewStyle | undefined;
54-
}, "children" | keyof ViewProps | "useSafeArea" | "trackInteractive" | "scrollToFocusedInput" | "scrollBehavior" | "revealKeyboardInteractive" | "manageScrollView" | "requiresSameParentToManageScrollView" | "addBottomView" | "allowHitsOutsideBounds"> & React.RefAttributes<unknown>>;
54+
}, keyof ViewProps | "useSafeArea" | "trackInteractive" | "scrollToFocusedInput" | "scrollBehavior" | "revealKeyboardInteractive" | "manageScrollView" | "requiresSameParentToManageScrollView" | "addBottomView" | "allowHitsOutsideBounds"> & React.RefAttributes<unknown>>;
5555
export default _default;

‎generatedTypes/lib/components/Keyboard/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ declare const _default: {
1818
ref?: any;
1919
children?: import("react").ReactChild | import("react").ReactChild[] | undefined;
2020
style?: import("react-native").ViewStyle | undefined;
21-
}, "children" | keyof import("react-native").ViewProps | "useSafeArea" | "trackInteractive" | "scrollToFocusedInput" | "scrollBehavior" | "revealKeyboardInteractive" | "manageScrollView" | "requiresSameParentToManageScrollView" | "addBottomView" | "allowHitsOutsideBounds"> & import("react").RefAttributes<unknown>>;
21+
}, keyof import("react-native").ViewProps | "useSafeArea" | "trackInteractive" | "scrollToFocusedInput" | "scrollBehavior" | "revealKeyboardInteractive" | "manageScrollView" | "requiresSameParentToManageScrollView" | "addBottomView" | "allowHitsOutsideBounds"> & import("react").RefAttributes<unknown>>;
2222
KeyboardAwareInsetsView: {
2323
(props: KeyboardTrackingViewProps): JSX.Element;
2424
displayName: string;

‎generatedTypes/src/commons/Constants.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ declare const constants: {
2727
top: number;
2828
};
2929
readonly isIphoneX: boolean;
30-
addDimensionsEventListener: (callback: any) => void;
30+
addDimensionsEventListener: (callback: any) => import("react-native").EmitterSubscription;
3131
removeDimensionsEventListener: (callback: any) => void;
3232
readonly accessibility: {
3333
isScreenReaderEnabled: boolean;

‎generatedTypes/src/incubator/TextField/usePreset.d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
2020
color?: import("./types").ColorType | undefined;
2121
placeholderTextColor?: import("./types").ColorType | undefined;
2222
formatter?: ((value?: string | undefined) => string | undefined) | undefined;
23+
children?: import("react").ReactNode;
2324
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
2425
testID?: string | undefined;
2526
removeClippedSubviews?: boolean | undefined;
@@ -127,7 +128,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
127128
selectionState?: import("react-native").DocumentSelectionState | undefined;
128129
spellCheck?: boolean | undefined;
129130
textContentType?: "none" | "name" | "password" | "username" | "URL" | "addressCity" | "addressCityAndState" | "addressState" | "countryName" | "creditCardNumber" | "emailAddress" | "familyName" | "fullStreetAddress" | "givenName" | "jobTitle" | "location" | "middleName" | "namePrefix" | "nameSuffix" | "nickname" | "organizationName" | "postalCode" | "streetAddressLine1" | "streetAddressLine2" | "sublocality" | "telephoneNumber" | "newPassword" | "oneTimeCode" | undefined;
130-
autoCompleteType?: "name" | "email" | "password" | "username" | "cc-csc" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-number" | "postal-code" | "street-address" | "tel" | "off" | undefined;
131+
autoComplete?: "name" | "email" | "password" | "username" | "birthdate-day" | "birthdate-full" | "birthdate-month" | "birthdate-year" | "cc-csc" | "cc-exp" | "cc-exp-day" | "cc-exp-month" | "cc-exp-year" | "cc-number" | "gender" | "name-family" | "name-given" | "name-middle" | "name-middle-initial" | "name-prefix" | "name-suffix" | "password-new" | "postal-address" | "postal-address-country" | "postal-address-extended" | "postal-address-extended-postal-code" | "postal-address-locality" | "postal-address-region" | "postal-code" | "street-address" | "sms-otp" | "tel" | "tel-country-code" | "tel-national" | "tel-device" | "username-new" | "off" | undefined;
131132
importantForAutofill?: "auto" | "yes" | "no" | "noExcludeDescendants" | "yesExcludeDescendants" | undefined;
132133
disableFullscreenUI?: boolean | undefined;
133134
inlineImageLeft?: string | undefined;
@@ -168,7 +169,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
168169
containerStyle?: import("react-native").ViewStyle | undefined;
169170
modifiers: import("../../commons/modifiers").ExtractedStyle;
170171
forwardedRef: any;
171-
children?: import("react").ReactNode;
172172
} | {
173173
margin?: boolean | undefined;
174174
marginL?: boolean | undefined;
@@ -422,6 +422,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
422422
color?: import("./types").ColorType | undefined;
423423
placeholderTextColor?: import("./types").ColorType | undefined;
424424
formatter?: ((value?: string | undefined) => string | undefined) | undefined;
425+
children?: import("react").ReactNode;
425426
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
426427
testID?: string | undefined;
427428
removeClippedSubviews?: boolean | undefined;
@@ -529,7 +530,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
529530
selectionState?: import("react-native").DocumentSelectionState | undefined;
530531
spellCheck?: boolean | undefined;
531532
textContentType?: "none" | "name" | "password" | "username" | "URL" | "addressCity" | "addressCityAndState" | "addressState" | "countryName" | "creditCardNumber" | "emailAddress" | "familyName" | "fullStreetAddress" | "givenName" | "jobTitle" | "location" | "middleName" | "namePrefix" | "nameSuffix" | "nickname" | "organizationName" | "postalCode" | "streetAddressLine1" | "streetAddressLine2" | "sublocality" | "telephoneNumber" | "newPassword" | "oneTimeCode" | undefined;
532-
autoCompleteType?: "name" | "email" | "password" | "username" | "cc-csc" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-number" | "postal-code" | "street-address" | "tel" | "off" | undefined;
533+
autoComplete?: "name" | "email" | "password" | "username" | "birthdate-day" | "birthdate-full" | "birthdate-month" | "birthdate-year" | "cc-csc" | "cc-exp" | "cc-exp-day" | "cc-exp-month" | "cc-exp-year" | "cc-number" | "gender" | "name-family" | "name-given" | "name-middle" | "name-middle-initial" | "name-prefix" | "name-suffix" | "password-new" | "postal-address" | "postal-address-country" | "postal-address-extended" | "postal-address-extended-postal-code" | "postal-address-locality" | "postal-address-region" | "postal-code" | "street-address" | "sms-otp" | "tel" | "tel-country-code" | "tel-national" | "tel-device" | "username-new" | "off" | undefined;
533534
importantForAutofill?: "auto" | "yes" | "no" | "noExcludeDescendants" | "yesExcludeDescendants" | undefined;
534535
disableFullscreenUI?: boolean | undefined;
535536
inlineImageLeft?: string | undefined;
@@ -570,7 +571,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
570571
containerStyle?: import("react-native").ViewStyle | undefined;
571572
modifiers: import("../../commons/modifiers").ExtractedStyle;
572573
forwardedRef: any;
573-
children?: import("react").ReactNode;
574574
} | {
575575
margin?: boolean | undefined;
576576
marginL?: boolean | undefined;
@@ -824,6 +824,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
824824
color?: import("./types").ColorType | undefined;
825825
placeholderTextColor?: import("./types").ColorType | undefined;
826826
formatter?: ((value?: string | undefined) => string | undefined) | undefined;
827+
children?: import("react").ReactNode;
827828
style: false | import("react-native").TextStyle | import("react-native").RegisteredStyle<import("react-native").TextStyle> | import("react-native").RecursiveArray<import("react-native").TextStyle | import("react-native").Falsy | import("react-native").RegisteredStyle<import("react-native").TextStyle>> | {
828829
lineHeight: undefined;
829830
height: number | undefined;
@@ -1043,7 +1044,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
10431044
selectionState?: import("react-native").DocumentSelectionState | undefined;
10441045
spellCheck?: boolean | undefined;
10451046
textContentType?: "none" | "name" | "password" | "username" | "URL" | "addressCity" | "addressCityAndState" | "addressState" | "countryName" | "creditCardNumber" | "emailAddress" | "familyName" | "fullStreetAddress" | "givenName" | "jobTitle" | "location" | "middleName" | "namePrefix" | "nameSuffix" | "nickname" | "organizationName" | "postalCode" | "streetAddressLine1" | "streetAddressLine2" | "sublocality" | "telephoneNumber" | "newPassword" | "oneTimeCode" | undefined;
1046-
autoCompleteType?: "name" | "email" | "password" | "username" | "cc-csc" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-number" | "postal-code" | "street-address" | "tel" | "off" | undefined;
1047+
autoComplete?: "name" | "email" | "password" | "username" | "birthdate-day" | "birthdate-full" | "birthdate-month" | "birthdate-year" | "cc-csc" | "cc-exp" | "cc-exp-day" | "cc-exp-month" | "cc-exp-year" | "cc-number" | "gender" | "name-family" | "name-given" | "name-middle" | "name-middle-initial" | "name-prefix" | "name-suffix" | "password-new" | "postal-address" | "postal-address-country" | "postal-address-extended" | "postal-address-extended-postal-code" | "postal-address-locality" | "postal-address-region" | "postal-code" | "street-address" | "sms-otp" | "tel" | "tel-country-code" | "tel-national" | "tel-device" | "username-new" | "off" | undefined;
10471048
importantForAutofill?: "auto" | "yes" | "no" | "noExcludeDescendants" | "yesExcludeDescendants" | undefined;
10481049
disableFullscreenUI?: boolean | undefined;
10491050
inlineImageLeft?: string | undefined;
@@ -1208,5 +1209,4 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
12081209
containerStyle?: import("react-native").ViewStyle | undefined;
12091210
modifiers: import("../../commons/modifiers").ExtractedStyle;
12101211
forwardedRef: any;
1211-
children?: import("react").ReactNode;
12121212
};

‎ios/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ target 'rnuilib' do
2727

2828
post_install do |installer|
2929
react_native_post_install(installer)
30+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
3031
end
3132
end

‎ios/rnuilib.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@
392392
);
393393
inputPaths = (
394394
"${PODS_ROOT}/Target Support Files/Pods-rnuilib-rnuilibTests/Pods-rnuilib-rnuilibTests-frameworks.sh",
395-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
396-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
395+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
396+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
397397
);
398398
name = "[CP] Embed Pods Frameworks";
399399
outputPaths = (
@@ -444,8 +444,8 @@
444444
);
445445
inputPaths = (
446446
"${PODS_ROOT}/Target Support Files/Pods-rnuilib/Pods-rnuilib-frameworks.sh",
447-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
448-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
447+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
448+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
449449
);
450450
name = "[CP] Embed Pods Frameworks";
451451
outputPaths = (

‎package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@types/hoist-non-react-statics": "^3.3.1",
7474
"@types/lodash": "^4.0.0",
7575
"@types/prop-types": "^15.5.3",
76-
"@types/react-native": "0.64.1",
76+
"@types/react-native": "0.66.4",
7777
"@types/tinycolor2": "^1.4.2",
7878
"@types/url-parse": "^1.4.3",
7979
"@typescript-eslint/eslint-plugin": "4.25.0",
@@ -92,20 +92,19 @@
9292
"gatsby": "^2.21.21",
9393
"gh-pages": "^1.1.0",
9494
"jest": "^26.6.3",
95-
"metro-react-native-babel-preset": "^0.66.0",
95+
"metro-react-native-babel-preset": "^0.66.2",
9696
"mocha": "^5.0.0",
9797
"prettier-eslint": "12.0.0",
9898
"react": "17.0.2",
9999
"react-autobind": "^1.0.6",
100100
"react-dom": "^15.4.2",
101-
"react-native": "0.65.1",
102-
"react-native-codegen": "^0.0.7",
101+
"react-native": "0.66.4",
103102
"react-native-gesture-handler": "1.10.3",
104103
"react-native-haptic-feedback": "^1.11.0",
105104
"react-native-keyboard-tracking-view": "^5.6.1",
106105
"react-native-linear-gradient": "2.5.6",
107106
"react-native-navigation": "^7.19.1",
108-
"react-native-reanimated": "2.2.2",
107+
"react-native-reanimated": "2.2.4",
109108
"react-native-shimmer-placeholder": "^2.0.6",
110109
"react-native-svg": "^12.1.0",
111110
"react-native-svg-transformer": "^0.14.3",

‎src/components/button/__tests__/__snapshots__/index.spec.js.snap

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ exports[`Button backgroundColor should return defined theme backgroundColor 1`]
213213
exports[`Button backgroundColor should return theme disabled color if button is disabled 1`] = `
214214
<View
215215
accessibilityRole="button"
216+
accessibilityState={
217+
Object {
218+
"disabled": true,
219+
}
220+
}
216221
accessible={true}
217222
collapsable={false}
218223
focusable={true}
@@ -2057,6 +2062,11 @@ exports[`Button icon should return icon style according to different variations
20572062
exports[`Button icon should return icon style according to different variations 3`] = `
20582063
<View
20592064
accessibilityRole="button"
2065+
accessibilityState={
2066+
Object {
2067+
"disabled": true,
2068+
}
2069+
}
20602070
accessible={true}
20612071
collapsable={false}
20622072
focusable={true}
@@ -2913,6 +2923,11 @@ exports[`Button labelColor should return color according to color prop 1`] = `
29132923
exports[`Button labelColor should return disabled text color according to theme for link/outline button 1`] = `
29142924
<View
29152925
accessibilityRole="button"
2926+
accessibilityState={
2927+
Object {
2928+
"disabled": true,
2929+
}
2930+
}
29162931
accessible={true}
29172932
collapsable={false}
29182933
focusable={true}
@@ -3467,6 +3482,11 @@ exports[`Button outline should return custom borderWidth according to outlineWid
34673482
exports[`Button outline should return disabled color for outline if button is disabled 1`] = `
34683483
<View
34693484
accessibilityRole="button"
3485+
accessibilityState={
3486+
Object {
3487+
"disabled": true,
3488+
}
3489+
}
34703490
accessible={true}
34713491
collapsable={false}
34723492
focusable={true}

‎src/components/colorPicker/ColorPickerDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ class ColorPickerDialog extends PureComponent<Props, State> {
305305
selectionColor={textColor}
306306
underlineColorAndroid="transparent"
307307
autoCorrect={false}
308-
autoCompleteType={'off'}
308+
autoComplete={'off'}
309309
autoCapitalize={'characters'}
310310
// keyboardType={'numbers-and-punctuation'} // doesn't work with `autoCapitalize`
311311
returnKeyType={'done'}

0 commit comments

Comments
 (0)