-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Upgrade to 0.62 #4587
Upgrade to 0.62 #4587
Changes from 2 commits
cf171aa
a41d7d1
9526717
b956a13
bb3ed48
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"type": "prerelease", | ||
"comment": "Upgrade to React Native 0.62", | ||
"packageName": "@office-iss/react-native-win32", | ||
"email": "ngerlem@microsoft.com", | ||
"dependentChangeType": "patch", | ||
"date": "2020-04-14T12:18:41.888Z" | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"type": "prerelease", | ||
"comment": "Upgrade to React Native 0.62", | ||
"packageName": "react-native-windows", | ||
"email": "ngerlem@microsoft.com", | ||
"dependentChangeType": "patch", | ||
"date": "2020-04-14T12:18:46.280Z" | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,5 +7,5 @@ | |
<b>Signature:</b> | ||
|
||
```typescript | ||
AppTheme: AppThemeModule | ||
AppTheme: AppThemeModule | MissingNativeAppThemeShim | ||
``` |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -188,8 +188,6 @@ async function addOverride(overridePath: string) { | |
* Remove an override from the manifest | ||
*/ | ||
async function removeOverride(overridePath: string) { | ||
await checkFileExists('override', overridePath); | ||
|
||
const manifestPath = await FileSearch.findManifest(overridePath); | ||
const manifestDir = path.dirname(manifestPath); | ||
|
||
|
@@ -330,31 +328,31 @@ function printValidationErrors(errors: Array<ValidationError>) { | |
|
||
if (filesMissing.length > 0) { | ||
const errorMessage = | ||
"Found override files that aren't listed in the manifest. Overrides can be added to the manifest by using 'yarn override add <override>':"; | ||
"Found override files that aren't listed in the manifest. Overrides can be added to the manifest by using 'yarn override add <override>' (where override is package relative):"; | ||
console.error(chalk.red(errorMessage)); | ||
filesMissing.forEach(err => console.error(` - ${err.file}`)); | ||
console.error(); | ||
} | ||
|
||
if (overridesMissing.length > 0) { | ||
const errorMessage = | ||
"Found overrides in the manifest that don't exist on disk. Remove existing overrides using 'yarn override remove <override>':"; | ||
"Found overrides in the manifest that don't exist on disk. Remove existing overrides using 'yarn override remove <override>' (where override is package relative):"; | ||
console.error(chalk.red(errorMessage)); | ||
overridesMissing.forEach(err => console.error(` - ${err.file}`)); | ||
console.error(); | ||
} | ||
|
||
if (baseFilesNotFound.length > 0) { | ||
const errorMessage = | ||
"Found overrides whose original files do not exist. Remove existing overrides using 'yarn override remove <override>':"; | ||
"Found overrides whose original files do not exist. Remove existing overrides using 'yarn override remove <override>' (where override is package relative):"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
So, this is kind of annoying. |
||
console.error(chalk.red(errorMessage)); | ||
baseFilesNotFound.forEach(err => console.error(` - ${err.file}`)); | ||
console.error(); | ||
} | ||
|
||
if (outOfDateFiles.length > 0) { | ||
const errorMessage = | ||
"Found overrides whose original files have changed. Upgrade overrides using 'yarn override auto-upgrade <override>' and 'yarn override manual-upgrade <override>':"; | ||
"Found overrides whose original files have changed. Upgrade overrides using 'yarn override auto-upgrade <manifest>' and 'yarn override manual-upgrade <manifest>' (where manifest is package relative):"; | ||
console.error(chalk.red(errorMessage)); | ||
outOfDateFiles.forEach(err => console.error(` - ${err.file}`)); | ||
console.error(); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -81,7 +81,7 @@ export default class Manifest { | |
const baseFile = override.baseFile; | ||
const baseContent = await this.reactRepo.getFileContents(baseFile); | ||
if (baseContent === null) { | ||
errors.push({type: 'baseFileNotFound', file: override.baseFile}); | ||
errors.push({type: 'baseFileNotFound', file: override.file}); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Small change for consistency |
||
return; | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,23 +10,30 @@ | |
; initRNLibraries build step | ||
<PROJECT_ROOT>/Libraries/Alert/Alert.js | ||
<PROJECT_ROOT>/Libraries/Animated/src/nodes/AnimatedInterpolation.js | ||
<PROJECT_ROOT>/Libraries/Color/normalizeColor.js | ||
<PROJECT_ROOT>/Libraries/Color/normalizeColorObject.js | ||
<PROJECT_ROOT>/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js | ||
<PROJECT_ROOT>/Libraries/Components/Picker/Picker.js | ||
<PROJECT_ROOT>/Libraries/Components/SafeAreaView/SafeAreaView.js | ||
<PROJECT_ROOT>/Libraries/Components/StatusBar/StatusBar.js | ||
<PROJECT_ROOT>/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js | ||
<PROJECT_ROOT>/Libraries/Components/TextInput/TextInput.js | ||
<PROJECT_ROOT>/Libraries/Components/TextInput/TextInputState.js | ||
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableBounce.js | ||
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableHighlight.js | ||
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableNativeFeedback.js | ||
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableOpacity.js | ||
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableWithoutFeedback.js | ||
<PROJECT_ROOT>/Libraries/Components/View/ReactNativeViewAttributes.js | ||
<PROJECT_ROOT>/Libraries/Components/View/ReactNativeViewViewConfig.js | ||
<PROJECT_ROOT>/Libraries/Core/setUpDeveloperTools.js | ||
<PROJECT_ROOT>/Libraries/Core/setUpReactDevTools.js | ||
<PROJECT_ROOT>/Libraries/Image/Image.js | ||
<PROJECT_ROOT>/Libraries/Image/ImageViewNativeComponent.js | ||
<PROJECT_ROOT>/Libraries/Inspector/Inspector.js | ||
<PROJECT_ROOT>/Libraries/Inspector/InspectorOverlay.js | ||
<PROJECT_ROOT>/Libraries/Network/RCTNetworking.js | ||
<PROJECT_ROOT>/Libraries/Pressability/PressabilityDebug.js | ||
<PROJECT_ROOT>/Libraries/ReactNative/getNativeComponentAttributes.js | ||
<PROJECT_ROOT>/Libraries/StyleSheet/normalizeColor.js | ||
<PROJECT_ROOT>/Libraries/StyleSheet/normalizeColorObject.js | ||
<PROJECT_ROOT>/Libraries/StyleSheet/processColor.js | ||
<PROJECT_ROOT>/Libraries/StyleSheet/processColorArray.js | ||
<PROJECT_ROOT>/Libraries/StyleSheet/StyleSheet.js | ||
|
@@ -39,10 +46,6 @@ | |
<PROJECT_ROOT>/RNTester/js/components/ListExampleShared.js | ||
<PROJECT_ROOT>/RNTester/js/components/RNTesterExampleFilter.js | ||
|
||
; These examples currently uses mac dynamic colors | ||
<PROJECT_ROOT>/RNTester/js/ActivityIndicatorExample.js | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. DarkModeExample doesn't exist in the repo and the top doesn't seem to have issues? Removed the suppression. |
||
<PROJECT_ROOT>/RNTester/js/DarkModeExample.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. | ||
|
@@ -72,11 +75,6 @@ | |
; Ignore unexpected extra "@providesModule" | ||
.*/node_modules/.*/node_modules/fbjs/.* | ||
|
||
; Ignore duplicate module providers | ||
; For RN Apps installed via npm, "Libraries" folder is inside | ||
; "node_modules/react-native" but in the source repo it is in the root | ||
.*/Libraries/react-native/React.js | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
the react-native dir got nuked, but React.js didn't exist in there anyway? Cleaned this up |
||
|
||
; These should not be required directly | ||
; require from fbjs/lib instead: require('fbjs/lib/warning') | ||
.*/node_modules/warning/.* | ||
|
@@ -102,7 +100,7 @@ | |
../../node_modules/ | ||
|
||
[libs] | ||
Libraries/react-native/react-native-interface.js | ||
interface.js | ||
flow/ | ||
|
||
[options] | ||
|
@@ -115,34 +113,10 @@ module.file_ext=.js | |
module.file_ext=.json | ||
module.file_ext=.win32.js | ||
|
||
module.system=haste | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
We should have gotten rid of this in the 61 timeframe, since we no longer use Haste and this can lead to flow following the wrong requires |
||
module.system.haste.use_name_reducers=true | ||
# keep the following in sync with server/haste/hasteImpl.js | ||
# get basename | ||
module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1' | ||
# strip .js or .js.flow suffix | ||
module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1' | ||
# strip .ios suffix | ||
module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1' | ||
module.system.haste.name_reducers='^\(.*\)\.macos$' -> '\1' | ||
module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1' | ||
module.system.haste.name_reducers='^\(.*\)\.win32$' -> '\1' | ||
module.system.haste.name_reducers='^\(.*\)\.windesktop$' -> '\1' | ||
module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1' | ||
module.system.haste.paths.blacklist=<PROJECT_ROOT>/src/.* | ||
module.system.haste.paths.blacklist=.*/__tests__/.* | ||
module.system.haste.paths.blacklist=.*/__mocks__/.* | ||
module.system.haste.paths.whitelist=<PROJECT_ROOT>/Libraries/.* | ||
module.system.haste.paths.whitelist=<PROJECT_ROOT>/RNTester/.* | ||
module.system.haste.paths.whitelist=<PROJECT_ROOT>/IntegrationTests/.* | ||
module.system.haste.paths.blacklist=<PROJECT_ROOT>/Libraries/react-native/react-native-implementation.js | ||
module.system.haste.paths.blacklist=<PROJECT_ROOT>/Libraries/Animated/src/polyfills/.* | ||
module.system.haste.paths.blacklist=<PROJECT_ROOT>/Libraries/Image/resolveAssetSource.js | ||
|
||
munge_underscores=true | ||
|
||
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\)$' -> 'RelativeImageStub' | ||
module.name_mapper='react-native$' -> '<PROJECT_ROOT>/Libraries/react-native/react-native-implementation.js' | ||
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\)$' -> '<PROJECT_ROOT>/Libraries/Image/RelativeImageStub' | ||
module.name_mapper='react-native$' -> '<PROJECT_ROOT>/index.js' | ||
module.name_mapper='react-native/\(.*\)' -> '<PROJECT_ROOT>/\1' | ||
|
||
suppress_type=$FlowIssue | ||
|
@@ -153,8 +127,14 @@ suppress_type=$FlowFixMeEmpty | |
|
||
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\) | ||
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+ | ||
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_android\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
We derive from both Android and iOS files, so I added the Android specific flow suppressions in addition to the existing iOS ones. |
||
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_android\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+ | ||
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError | ||
|
||
experimental.well_formed_exports=true | ||
experimental.types_first=true | ||
experimental.abstract_locations=true | ||
|
||
[lints] | ||
sketchy-null-number=warn | ||
sketchy-null-mixed=warn | ||
|
@@ -178,4 +158,4 @@ untyped-import | |
untyped-type-import | ||
|
||
[version] | ||
^0.105.0 | ||
^0.113.0 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
/dist | ||
/flow | ||
/flow-typed | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
We haven't copied this in a while, since it's not part of the published RN package |
||
/index.* | ||
/interface.* | ||
/IntegrationTests | ||
/jest | ||
/lib | ||
/Libraries | ||
/RNTester | ||
/RNTester.* | ||
/temp | ||
/WorkingHeaders | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
This has been gone long enough that I should be able to clean it up now without annoying everyone |
||
/typings-index.* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed this so that we can delete overrides from the manifest easily if the actual file goes away