Skip to content

Commit 25d51e6

Browse files
authored
Integrate RN Nightly Build 3/21/23 (#11423)
* Integrate 3/22/23 * Change files * fix override files to match new file paths * try to fix repo-config * fix bad flowconfig merge * fix path to logo.png * lint
1 parent c356f6d commit 25d51e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+683
-572
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate 3/22/23",
4+
"packageName": "@office-iss/react-native-win32",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Integrate 3/22/23",
4+
"packageName": "@react-native-windows/automation-channel",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate 3/22/23",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/@office-iss/react-native-win32-tester/overrides.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"excludePatterns": [
66
"src/js/examples-win32/**"
77
],
8-
"baseVersion": "0.0.0-20230308-2111-d41e95fb1",
8+
"baseVersion": "0.0.0-20230321-2153-7b86e3aae",
99
"overrides": [
1010
{
1111
"type": "patch",
@@ -24,7 +24,7 @@
2424
"type": "patch",
2525
"file": "src/js/components/RNTesterExampleFilter.win32.js",
2626
"baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js",
27-
"baseHash": "91b349ecb666e3c44c14fecc5d8ac2a5fdba4ae6"
27+
"baseHash": "76f3d045c6f4cdbd1538735c7c923da66de6974c"
2828
},
2929
{
3030
"type": "platform",

packages/@office-iss/react-native-win32-tester/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"peerDependencies": {
2020
"@office-iss/react-native-win32": "^0.0.0-canary.188",
2121
"react": "18.0.0",
22-
"react-native": "0.0.0-20230308-2111-d41e95fb1"
22+
"react-native": "0.0.0-20230321-2153-7b86e3aae"
2323
},
2424
"devDependencies": {
2525
"@office-iss/react-native-win32": "^0.0.0-canary.188",
@@ -30,7 +30,7 @@
3030
"@types/node": "^14.14.22",
3131
"eslint": "^8.19.0",
3232
"just-scripts": "^1.3.3",
33-
"react-native": "0.0.0-20230308-2111-d41e95fb1",
33+
"react-native": "0.0.0-20230321-2153-7b86e3aae",
3434
"react-native-platform-override": "^1.9.4",
3535
"typescript": "^4.9.5"
3636
},

packages/@office-iss/react-native-win32-tester/src/js/components/RNTesterExampleFilter.win32.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ class RNTesterExampleFilter<T> extends React.Component<Props<T>, State> {
9292
keyboardShouldPersistTaps="handled"
9393
keyboardDismissMode="interactive">
9494
{this.props.render({filteredSections})}
95-
{/**
96-
* This is a fake list item. It is needed to provide the ScrollView some bottom padding.
97-
* The height of this item is basically ScreenHeight - the height of (Header + bottom navbar)
98-
* */}
99-
<View style={{height: 350}} />
10095
</ScrollView>
10196
);
10297
} else {

packages/@office-iss/react-native-win32/.flowconfig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@
6161
; Ignore "BUCK" generated dirs
6262
<PROJECT_ROOT>/\.buckd/
6363

64+
; Flow doesn't support platforms
65+
.*/packages/react-native/Libraries/Utilities/LoadingView.js
6466
; Ignore the src folder - flow files are combined with ones from react-native into the root Libraries folder
6567
.*/react-native-win32/src/.*
6668

@@ -81,6 +83,7 @@
8183
[libs]
8284
interface.js
8385
flow/
86+
flow-typed/
8487

8588
[options]
8689
enums=true
@@ -100,7 +103,7 @@ munge_underscores=true
100103
module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/index.win32.js'
101104
module.name_mapper='^@office-iss/react-native-win32$' -> '<PROJECT_ROOT>/index.win32.js'
102105
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/\1'
103-
module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '<PROJECT_ROOT>/\1'
106+
module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '<PROJECT_ROOT>\/1'
104107
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'
105108

106109
suppress_type=$FlowIssue
@@ -109,8 +112,6 @@ suppress_type=$FlowFixMeProps
109112
suppress_type=$FlowFixMeState
110113
suppress_type=$FlowFixMeEmpty
111114

112-
experimental.array_literal_providers=true
113-
inference_mode=experimental.lti
114115

115116
sharedmemory.hash_table_pow=21
116117

@@ -134,4 +135,4 @@ untyped-import
134135
untyped-type-import
135136

136137
[version]
137-
^0.201.0
138+
^0.202.0

0 commit comments

Comments
 (0)