Skip to content

Infra/upgrade to rn66 try 2 #1763

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

Merged
merged 4 commits into from
Jan 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ emoji=true

exact_by_default=true

format.bracket_spacing=false

module.file_ext=.js
module.file_ext=.json
module.file_ext=.ios.js
Expand Down Expand Up @@ -60,4 +62,4 @@ untyped-import
untyped-type-import

[version]
^0.149.0
^0.158.0
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ build/
.gradle
local.properties
*.iml
*.hprof
android/gradlew.bat
expoDemo/android/gradlew.bat

Expand Down
10 changes: 10 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ def enableProguardInReleaseBuilds = false
def jscFlavor = 'org.webkit:android-jsc:+'
def enableHermes = project.ext.react.get("enableHermes", false)

/**
* Architectures to build native code for in debug.
*/
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")

android {
compileSdkVersion rootProject.ext.compileSdkVersion
ndkVersion rootProject.ext.ndkVersion
Expand Down Expand Up @@ -44,6 +49,11 @@ android {
buildTypes {
debug {
signingConfig signingConfigs.debug
if (nativeArchitectures) {
ndk {
abiFilters nativeArchitectures.split(',')
}
}
}
release {
// Caution! In production, you need to generate your own keystore file.
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
minSdkVersion = 21
compileSdkVersion = 30
targetSdkVersion = 30
ndkVersion = "20.1.5948944"
ndkVersion = "21.4.7075529"
RNNKotlinVersion = "1.6.0"
}
repositories {
Expand All @@ -16,7 +16,7 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$RNNKotlinVersion"
classpath("com.android.tools.build:gradle:4.2.1")
classpath("com.android.tools.build:gradle:4.2.2")

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ android.useAndroidX=true
android.enableJetifier=true

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.93.0
FLIPPER_VERSION=0.99.0
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ declare const _default: React.ForwardRefExoticComponent<Pick<ViewProps & {
ref?: any;
children?: React.ReactChild | React.ReactChild[] | undefined;
style?: ViewStyle | undefined;
}, "children" | keyof ViewProps | "useSafeArea" | "trackInteractive" | "scrollToFocusedInput" | "scrollBehavior" | "revealKeyboardInteractive" | "manageScrollView" | "requiresSameParentToManageScrollView" | "addBottomView" | "allowHitsOutsideBounds"> & React.RefAttributes<unknown>>;
}, keyof ViewProps | "useSafeArea" | "trackInteractive" | "scrollToFocusedInput" | "scrollBehavior" | "revealKeyboardInteractive" | "manageScrollView" | "requiresSameParentToManageScrollView" | "addBottomView" | "allowHitsOutsideBounds"> & React.RefAttributes<unknown>>;
export default _default;
2 changes: 1 addition & 1 deletion generatedTypes/lib/components/Keyboard/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ declare const _default: {
ref?: any;
children?: import("react").ReactChild | import("react").ReactChild[] | undefined;
style?: import("react-native").ViewStyle | undefined;
}, "children" | keyof import("react-native").ViewProps | "useSafeArea" | "trackInteractive" | "scrollToFocusedInput" | "scrollBehavior" | "revealKeyboardInteractive" | "manageScrollView" | "requiresSameParentToManageScrollView" | "addBottomView" | "allowHitsOutsideBounds"> & import("react").RefAttributes<unknown>>;
}, keyof import("react-native").ViewProps | "useSafeArea" | "trackInteractive" | "scrollToFocusedInput" | "scrollBehavior" | "revealKeyboardInteractive" | "manageScrollView" | "requiresSameParentToManageScrollView" | "addBottomView" | "allowHitsOutsideBounds"> & import("react").RefAttributes<unknown>>;
KeyboardAwareInsetsView: {
(props: KeyboardTrackingViewProps): JSX.Element;
displayName: string;
Expand Down
2 changes: 1 addition & 1 deletion generatedTypes/src/commons/Constants.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ declare const constants: {
top: number;
};
readonly isIphoneX: boolean;
addDimensionsEventListener: (callback: any) => void;
addDimensionsEventListener: (callback: any) => import("react-native").EmitterSubscription;
removeDimensionsEventListener: (callback: any) => void;
readonly accessibility: {
isScreenReaderEnabled: boolean;
Expand Down
12 changes: 6 additions & 6 deletions generatedTypes/src/incubator/TextField/usePreset.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
color?: import("./types").ColorType | undefined;
placeholderTextColor?: import("./types").ColorType | undefined;
formatter?: ((value?: string | undefined) => string | undefined) | undefined;
children?: import("react").ReactNode;
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
testID?: string | undefined;
removeClippedSubviews?: boolean | undefined;
Expand Down Expand Up @@ -127,7 +128,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
selectionState?: import("react-native").DocumentSelectionState | undefined;
spellCheck?: boolean | undefined;
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;
autoCompleteType?: "name" | "email" | "password" | "username" | "cc-csc" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-number" | "postal-code" | "street-address" | "tel" | "off" | undefined;
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;
importantForAutofill?: "auto" | "yes" | "no" | "noExcludeDescendants" | "yesExcludeDescendants" | undefined;
disableFullscreenUI?: boolean | undefined;
inlineImageLeft?: string | undefined;
Expand Down Expand Up @@ -168,7 +169,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
containerStyle?: import("react-native").ViewStyle | undefined;
modifiers: import("../../commons/modifiers").ExtractedStyle;
forwardedRef: any;
children?: import("react").ReactNode;
} | {
margin?: boolean | undefined;
marginL?: boolean | undefined;
Expand Down Expand Up @@ -422,6 +422,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
color?: import("./types").ColorType | undefined;
placeholderTextColor?: import("./types").ColorType | undefined;
formatter?: ((value?: string | undefined) => string | undefined) | undefined;
children?: import("react").ReactNode;
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
testID?: string | undefined;
removeClippedSubviews?: boolean | undefined;
Expand Down Expand Up @@ -529,7 +530,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
selectionState?: import("react-native").DocumentSelectionState | undefined;
spellCheck?: boolean | undefined;
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;
autoCompleteType?: "name" | "email" | "password" | "username" | "cc-csc" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-number" | "postal-code" | "street-address" | "tel" | "off" | undefined;
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;
importantForAutofill?: "auto" | "yes" | "no" | "noExcludeDescendants" | "yesExcludeDescendants" | undefined;
disableFullscreenUI?: boolean | undefined;
inlineImageLeft?: string | undefined;
Expand Down Expand Up @@ -570,7 +571,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
containerStyle?: import("react-native").ViewStyle | undefined;
modifiers: import("../../commons/modifiers").ExtractedStyle;
forwardedRef: any;
children?: import("react").ReactNode;
} | {
margin?: boolean | undefined;
marginL?: boolean | undefined;
Expand Down Expand Up @@ -824,6 +824,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
color?: import("./types").ColorType | undefined;
placeholderTextColor?: import("./types").ColorType | undefined;
formatter?: ((value?: string | undefined) => string | undefined) | undefined;
children?: import("react").ReactNode;
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>> | {
lineHeight: undefined;
height: number | undefined;
Expand Down Expand Up @@ -1043,7 +1044,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
selectionState?: import("react-native").DocumentSelectionState | undefined;
spellCheck?: boolean | undefined;
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;
autoCompleteType?: "name" | "email" | "password" | "username" | "cc-csc" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-number" | "postal-code" | "street-address" | "tel" | "off" | undefined;
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;
importantForAutofill?: "auto" | "yes" | "no" | "noExcludeDescendants" | "yesExcludeDescendants" | undefined;
disableFullscreenUI?: boolean | undefined;
inlineImageLeft?: string | undefined;
Expand Down Expand Up @@ -1208,5 +1209,4 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
containerStyle?: import("react-native").ViewStyle | undefined;
modifiers: import("../../commons/modifiers").ExtractedStyle;
forwardedRef: any;
children?: import("react").ReactNode;
};
1 change: 1 addition & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ target 'rnuilib' do

post_install do |installer|
react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end
end
8 changes: 4 additions & 4 deletions ios/rnuilib.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,8 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-rnuilib-rnuilibTests/Pods-rnuilib-rnuilibTests-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
Expand Down Expand Up @@ -444,8 +444,8 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-rnuilib/Pods-rnuilib-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"@types/hoist-non-react-statics": "^3.3.1",
"@types/lodash": "^4.0.0",
"@types/prop-types": "^15.5.3",
"@types/react-native": "0.64.1",
"@types/react-native": "0.66.4",
"@types/tinycolor2": "^1.4.2",
"@types/url-parse": "^1.4.3",
"@typescript-eslint/eslint-plugin": "4.25.0",
Expand All @@ -92,20 +92,19 @@
"gatsby": "^2.21.21",
"gh-pages": "^1.1.0",
"jest": "^26.6.3",
"metro-react-native-babel-preset": "^0.66.0",
"metro-react-native-babel-preset": "^0.66.2",
"mocha": "^5.0.0",
"prettier-eslint": "12.0.0",
"react": "17.0.2",
"react-autobind": "^1.0.6",
"react-dom": "^15.4.2",
"react-native": "0.65.1",
"react-native-codegen": "^0.0.7",
"react-native": "0.66.4",
"react-native-gesture-handler": "1.10.3",
"react-native-haptic-feedback": "^1.11.0",
"react-native-keyboard-tracking-view": "^5.6.1",
"react-native-linear-gradient": "2.5.6",
"react-native-navigation": "^7.19.1",
"react-native-reanimated": "2.2.2",
"react-native-reanimated": "2.2.4",
"react-native-shimmer-placeholder": "^2.0.6",
"react-native-svg": "^12.1.0",
"react-native-svg-transformer": "^0.14.3",
Expand Down
20 changes: 20 additions & 0 deletions src/components/button/__tests__/__snapshots__/index.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,11 @@ exports[`Button backgroundColor should return defined theme backgroundColor 1`]
exports[`Button backgroundColor should return theme disabled color if button is disabled 1`] = `
<View
accessibilityRole="button"
accessibilityState={
Object {
"disabled": true,
}
}
accessible={true}
collapsable={false}
focusable={true}
Expand Down Expand Up @@ -2057,6 +2062,11 @@ exports[`Button icon should return icon style according to different variations
exports[`Button icon should return icon style according to different variations 3`] = `
<View
accessibilityRole="button"
accessibilityState={
Object {
"disabled": true,
}
}
accessible={true}
collapsable={false}
focusable={true}
Expand Down Expand Up @@ -2913,6 +2923,11 @@ exports[`Button labelColor should return color according to color prop 1`] = `
exports[`Button labelColor should return disabled text color according to theme for link/outline button 1`] = `
<View
accessibilityRole="button"
accessibilityState={
Object {
"disabled": true,
}
}
accessible={true}
collapsable={false}
focusable={true}
Expand Down Expand Up @@ -3467,6 +3482,11 @@ exports[`Button outline should return custom borderWidth according to outlineWid
exports[`Button outline should return disabled color for outline if button is disabled 1`] = `
<View
accessibilityRole="button"
accessibilityState={
Object {
"disabled": true,
}
}
accessible={true}
collapsable={false}
focusable={true}
Expand Down
2 changes: 1 addition & 1 deletion src/components/colorPicker/ColorPickerDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ class ColorPickerDialog extends PureComponent<Props, State> {
selectionColor={textColor}
underlineColorAndroid="transparent"
autoCorrect={false}
autoCompleteType={'off'}
autoComplete={'off'}
autoCapitalize={'characters'}
// keyboardType={'numbers-and-punctuation'} // doesn't work with `autoCapitalize`
returnKeyType={'done'}
Expand Down