diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 64d461a225e..990ebed2e17 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -12,7 +12,7 @@ variables: - template: variables/release.yml - template: variables/vs2019.yml - name: reactNativeVersion - value: 0.62.2 + value: 0.0.0-56cf99a96 jobs: - job: Setup diff --git a/change/@office-iss-react-native-win32-2020-05-27-13-40-42-nightly-integration.json b/change/@office-iss-react-native-win32-2020-05-27-13-40-42-nightly-integration.json new file mode 100644 index 00000000000..f3fe1476a91 --- /dev/null +++ b/change/@office-iss-react-native-win32-2020-05-27-13-40-42-nightly-integration.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "Upgrade React Native to 3/22 Nightly Build", + "packageName": "@office-iss/react-native-win32", + "email": "ngerlem@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-27T20:40:04.020Z" +} diff --git a/change/react-native-platform-override-2020-06-17-05-20-16-nightly-integration.json b/change/react-native-platform-override-2020-06-17-05-20-16-nightly-integration.json new file mode 100644 index 00000000000..50aa2480dd3 --- /dev/null +++ b/change/react-native-platform-override-2020-06-17-05-20-16-nightly-integration.json @@ -0,0 +1,8 @@ +{ + "type": "patch", + "comment": "Upgrade React Native to 3/22 Nightly Build", + "packageName": "react-native-platform-override", + "email": "ngerlem@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-06-17T12:20:16.533Z" +} diff --git a/change/react-native-windows-2020-05-27-13-40-42-nightly-integration.json b/change/react-native-windows-2020-05-27-13-40-42-nightly-integration.json new file mode 100644 index 00000000000..966c20b9962 --- /dev/null +++ b/change/react-native-windows-2020-05-27-13-40-42-nightly-integration.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "Upgrade React Native to 3/22 Nightly Build", + "packageName": "react-native-windows", + "email": "ngerlem@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-27T20:40:42.294Z" +} diff --git a/change/react-native-windows-codegen-2020-05-27-13-40-42-nightly-integration.json b/change/react-native-windows-codegen-2020-05-27-13-40-42-nightly-integration.json new file mode 100644 index 00000000000..1e6b6d01780 --- /dev/null +++ b/change/react-native-windows-codegen-2020-05-27-13-40-42-nightly-integration.json @@ -0,0 +1,8 @@ +{ + "type": "patch", + "comment": "Upgrade React Native to 3/22 Nightly Build", + "packageName": "react-native-windows-codegen", + "email": "ngerlem@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-27T20:40:29.506Z" +} diff --git a/change/react-native-windows-init-2020-05-27-13-40-42-nightly-integration.json b/change/react-native-windows-init-2020-05-27-13-40-42-nightly-integration.json new file mode 100644 index 00000000000..510cf8a497f --- /dev/null +++ b/change/react-native-windows-init-2020-05-27-13-40-42-nightly-integration.json @@ -0,0 +1,8 @@ +{ + "type": "patch", + "comment": "Upgrade React Native to 3/22 Nightly Build", + "packageName": "react-native-windows-init", + "email": "ngerlem@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-27T20:40:39.226Z" +} diff --git a/docs/api/react-native-windows.datepicker.md b/docs/api/react-native-windows.datepicker.md index 82adc4af8ba..1679f95f163 100644 --- a/docs/api/react-native-windows.datepicker.md +++ b/docs/api/react-native-windows.datepicker.md @@ -9,6 +9,7 @@ ```typescript export declare class DatePicker extends React.Component ``` +Extends: React.Component<[IDatePickerProps](./react-native-windows.idatepickerprops.md)> ## Constructors diff --git a/docs/api/react-native-windows.flyout.md b/docs/api/react-native-windows.flyout.md index 9d5b22e73fd..1c069de2acc 100644 --- a/docs/api/react-native-windows.flyout.md +++ b/docs/api/react-native-windows.flyout.md @@ -15,6 +15,7 @@ This is a controlled component that requires an `onDismiss` callback that update ```typescript export declare class Flyout extends React.Component ``` +Extends: React.Component<[IFlyoutProps](./react-native-windows.iflyoutprops.md), [IFlyoutTargetState](./react-native-windows.iflyouttargetstate.md)> ## Constructors diff --git a/docs/api/react-native-windows.glyph.md b/docs/api/react-native-windows.glyph.md index fa597685124..5680e691ba2 100644 --- a/docs/api/react-native-windows.glyph.md +++ b/docs/api/react-native-windows.glyph.md @@ -13,6 +13,7 @@ This control is used to render Glyphs from a Font file, which might be used simi ```typescript export declare class Glyph extends React.PureComponent ``` +Extends: React.PureComponent<GlyphProps> ## Methods diff --git a/docs/api/react-native-windows.idatepickerprops.md b/docs/api/react-native-windows.idatepickerprops.md index 0d6f1ab2dbe..8bec399fb93 100644 --- a/docs/api/react-native-windows.idatepickerprops.md +++ b/docs/api/react-native-windows.idatepickerprops.md @@ -9,6 +9,7 @@ ```typescript export interface IDatePickerProps extends ViewProps ``` +Extends: ViewProps ## Properties diff --git a/docs/api/react-native-windows.iflyoutprops.md b/docs/api/react-native-windows.iflyoutprops.md index f6abe4b7afe..b63bffcd7b2 100644 --- a/docs/api/react-native-windows.iflyoutprops.md +++ b/docs/api/react-native-windows.iflyoutprops.md @@ -9,6 +9,7 @@ ```typescript export interface IFlyoutProps extends ViewProps ``` +Extends: ViewProps ## Properties diff --git a/docs/api/react-native-windows.ipopupprops.md b/docs/api/react-native-windows.ipopupprops.md index 22a1a3a2513..1bd5ed99239 100644 --- a/docs/api/react-native-windows.ipopupprops.md +++ b/docs/api/react-native-windows.ipopupprops.md @@ -9,6 +9,7 @@ ```typescript export interface IPopupProps extends ViewProps ``` +Extends: ViewProps ## Properties diff --git a/docs/api/react-native-windows.iviewwindowsprops.md b/docs/api/react-native-windows.iviewwindowsprops.md index d40e4e6da1e..c1198d0c7f7 100644 --- a/docs/api/react-native-windows.iviewwindowsprops.md +++ b/docs/api/react-native-windows.iviewwindowsprops.md @@ -9,6 +9,7 @@ ```typescript export interface IViewWindowsProps extends IKeyboardProps, ViewProps ``` +Extends: [IKeyboardProps](./react-native-windows.ikeyboardprops.md), ViewProps ## Remarks diff --git a/docs/api/react-native-windows.picker.md b/docs/api/react-native-windows.picker.md index 61aa95dc948..085709e107f 100644 --- a/docs/api/react-native-windows.picker.md +++ b/docs/api/react-native-windows.picker.md @@ -13,6 +13,7 @@ when using editable=true, onValueChange can be called with a selectedValue of nu ```typescript export declare class Picker extends React.Component ``` +Extends: React.Component<IPickerProps, State> ## Constructors diff --git a/docs/api/react-native-windows.popup.md b/docs/api/react-native-windows.popup.md index e9d73863ae8..4034a30d13a 100644 --- a/docs/api/react-native-windows.popup.md +++ b/docs/api/react-native-windows.popup.md @@ -15,6 +15,7 @@ This is a controlled component that requires an `onDismiss` callback that update ```typescript export declare class Popup extends React.Component ``` +Extends: React.Component<[IPopupProps](./react-native-windows.ipopupprops.md), [IPopupTargetState](./react-native-windows.ipopuptargetstate.md)> ## Constructors diff --git a/packages/E2ETest/package.json b/packages/E2ETest/package.json index fc7402e837c..a62554ddeb7 100644 --- a/packages/E2ETest/package.json +++ b/packages/E2ETest/package.json @@ -23,8 +23,8 @@ }, "dependencies": { "prompt-sync": "^4.2.0", - "react": "16.11.0", - "react-native": "0.62.2", + "react": "16.13.0", + "react-native": "0.0.0-56cf99a96", "react-native-windows": "0.0.0-canary.103" }, "devDependencies": { @@ -42,6 +42,7 @@ "@wdio/local-runner": "5.12.1", "@wdio/sync": "5.12.1", "appium": "1.14.1", + "eslint": "5.1.0", "just-scripts": "^0.36.1", "metro-react-native-babel-preset": "^0.56.0", "prettier": "^1.18.2", diff --git a/packages/microsoft-reactnative-sampleapps/package.json b/packages/microsoft-reactnative-sampleapps/package.json index 3b93c62b2d8..33af5d0780c 100644 --- a/packages/microsoft-reactnative-sampleapps/package.json +++ b/packages/microsoft-reactnative-sampleapps/package.json @@ -14,8 +14,8 @@ "windows": "react-native run-windows" }, "dependencies": { - "react": "16.11.0", - "react-native": "0.62.2", + "react": "16.13.0", + "react-native": "0.0.0-56cf99a96", "react-native-windows": "0.0.0-canary.103" }, "devDependencies": { @@ -23,6 +23,7 @@ "@babel/runtime": "^7.8.4", "@types/react": "16.9.0", "@types/react-native": "^0.62.10", + "eslint": "5.1.0", "just-scripts": "^0.36.1", "metro-react-native-babel-preset": "^0.56.0", "react-native-windows-codegen": "0.0.6", diff --git a/packages/playground/package.json b/packages/playground/package.json index 075c501f5f9..450028dbb3c 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -10,18 +10,19 @@ "windows": "react-native run-windows" }, "dependencies": { - "react": "16.11.0", - "react-native": "0.62.2", + "react": "16.13.0", + "react-native": "0.0.0-56cf99a96", "react-native-windows": "0.0.0-canary.103" }, "devDependencies": { "@babel/core": "^7.8.4", "@babel/runtime": "^7.8.4", + "@react-native-community/eslint-config": "^1.1.0", "@types/react": "16.9.0", "@types/react-native": "^0.62.10", + "eslint": "5.1.0", "just-scripts": "^0.36.1", "metro-react-native-babel-preset": "^0.56.0", - "react-test-renderer": "16.9.0", - "@react-native-community/eslint-config": "^1.0.0" + "react-test-renderer": "16.9.0" } } diff --git a/packages/react-native-platform-override/package.json b/packages/react-native-platform-override/package.json index 0ed3493811d..719daf1b456 100644 --- a/packages/react-native-platform-override/package.json +++ b/packages/react-native-platform-override/package.json @@ -47,6 +47,7 @@ "@types/yargs": "^15.0.3", "babel-jest": "^24.9.0", "diff-match-patch": "^1.0.4", + "eslint": "5.1.0", "fp-ts": "^2.5.0", "jest": "^24.9.0", "just-scripts": "^0.36.1", diff --git a/packages/react-native-win32/.flowconfig b/packages/react-native-win32/.flowconfig index 4821771703d..4799740f29b 100644 --- a/packages/react-native-win32/.flowconfig +++ b/packages/react-native-win32/.flowconfig @@ -9,53 +9,25 @@ ; Ideally we'd delete the base versions of files that had .win32 overrides as part of the ; initRNLibraries build step /Libraries/Alert/Alert.js -/Libraries/Animated/src/nodes/AnimatedInterpolation.js /Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js /Libraries/Components/Picker/Picker.js /Libraries/Components/SafeAreaView/SafeAreaView.js -/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js /Libraries/Components/TextInput/TextInput.js /Libraries/Components/TextInput/TextInputState.js -/Libraries/Components/Touchable/TouchableBounce.js -/Libraries/Components/Touchable/TouchableHighlight.js /Libraries/Components/Touchable/TouchableNativeFeedback.js -/Libraries/Components/Touchable/TouchableOpacity.js -/Libraries/Components/Touchable/TouchableWithoutFeedback.js /Libraries/Components/View/ReactNativeViewAttributes.js /Libraries/Components/View/ReactNativeViewViewConfig.js -/Libraries/Core/setUpReactDevTools.js /Libraries/Image/Image.js -/Libraries/Image/ImageViewNativeComponent.js /Libraries/Inspector/Inspector.js /Libraries/Inspector/InspectorOverlay.js /Libraries/Network/RCTNetworking.js -/Libraries/Pressability/PressabilityDebug.js -/Libraries/ReactNative/getNativeComponentAttributes.js -/Libraries/StyleSheet/normalizeColor.js -/Libraries/StyleSheet/normalizeColorObject.js -/Libraries/StyleSheet/processColor.js -/Libraries/StyleSheet/processColorArray.js /Libraries/StyleSheet/StyleSheet.js /Libraries/Utilities/DeviceInfo.js /Libraries/Utilities/Dimensions.js -/Libraries/YellowBox/UI/YellowBoxInspectorHeader.js -/Libraries/YellowBox/UI/YellowBoxInspectorSourceMapStatus.js -/Libraries/YellowBox/UI/YellowBoxList.js /RNTester/js/components/FlatListExample.js /RNTester/js/components/ListExampleShared.js /RNTester/js/components/RNTesterExampleFilter.js -; Schema files are used for turbo-module code generation, but are not bundled. -; We don't yet have the react-native-codegen package they rely on, so supress -; checks for now. -/Libraries/Components/ActivityIndicator/ActivityIndicatorSchema.js -/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutSchema.js -/Libraries/Components/RefreshControl/PullToRefreshViewSchema.js -/Libraries/Components/Slider/SliderSchema.js -/Libraries/Components/Switch/SwitchSchema.js -/Libraries/Components/UnimplementedViews/UnimplementedNativeViewSchema.js -/Libraries/Modal/ModalSchema.js - ; Ignore react-native files in node_modules since they are copied into project root .*/node_modules/react-native/.* @@ -78,8 +50,6 @@ ; require from fbjs/lib instead: require('fbjs/lib/warning') .*/node_modules/warning/.* -; Flow doesn't support platforms -.*/Libraries/Utilities/HMRLoadingView.js ; Ignore the src folder - flow files are combined with ones from react-native into the root Libraries folder .*/react-native-win32/src/.* @@ -90,10 +60,6 @@ ; Should work out how to do this properly .*/react-native-win32/Libraries/Image/resolveAssetSource.win32.js -; A couple files using dynamic colors, but cannot be ignored -/Libraries/ActionSheetIOS/ActionSheetIOS.js -/Libraries/Share/Share.js - [include] ; Need to include hoisted modules ../../node_modules/ @@ -108,15 +74,17 @@ emoji=true esproposal.optional_chaining=enable esproposal.nullish_coalescing=enable +exact_by_default=true + module.file_ext=.js module.file_ext=.json module.file_ext=.win32.js munge_underscores=true +module.name_mapper='^react-native$' -> '/index.js' +module.name_mapper='^react-native/\(.*\)$' -> '/\1' module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '/Libraries/Image/RelativeImageStub' -module.name_mapper='react-native$' -> '/index.js' -module.name_mapper='react-native/\(.*\)' -> '/\1' suppress_type=$FlowIssue suppress_type=$FlowFixMe @@ -142,10 +110,10 @@ untyped-type-import=warn nonstrict-import=warn deprecated-type=warn unsafe-getters-setters=warn -inexact-spread=warn unnecessary-invariant=warn signature-verification-failure=warn deprecated-utility=error +unsafe-addition=error [strict] deprecated-type @@ -157,4 +125,4 @@ untyped-import untyped-type-import [version] -^0.113.0 \ No newline at end of file +^0.120.0 \ No newline at end of file diff --git a/packages/react-native-win32/docs/api/react-native-win32.buttonwin32.md b/packages/react-native-win32/docs/api/react-native-win32.buttonwin32.md index 4ede6593a84..01d4c0ebeb6 100644 --- a/packages/react-native-win32/docs/api/react-native-win32.buttonwin32.md +++ b/packages/react-native-win32/docs/api/react-native-win32.buttonwin32.md @@ -11,6 +11,7 @@ React-native