Skip to content

Commit e265163

Browse files
authored
Integrate RN Nightly 10/1 (223e98cc4) (#13938)
* 0.77.0-nightly-20240925-0cb32d5ac * 0.77.0-nightly-20241001-223e98cc4 * fix validate-overrides * Change files * fix build * fix playground * fix composition * fix overrides * fix snapshot + lint * Change files * try removing babel plugin * add change back in * bump dep
1 parent c1f1304 commit e265163

File tree

81 files changed

+1293
-1092
lines changed

Some content is hidden

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

81 files changed

+1293
-1092
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 rn nightly 0.77.0-nightly-20241001-223e98cc4",
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 rn nightly 0.77.0-nightly-20241001-223e98cc4",
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": "0.77.0-nightly-20241001-223e98cc4",
4+
"packageName": "@react-native-windows/codegen",
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 rn nightly 0.77.0-nightly-20241001-223e98cc4",
4+
"packageName": "@rnw-scripts/integrate-rn",
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 rn nightly 0.77.0-nightly-20241001-223e98cc4",
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.77.0-nightly-20240921-1747f57c6",
8+
"baseVersion": "0.77.0-nightly-20241001-223e98cc4",
99
"overrides": [
1010
{
1111
"type": "patch",
@@ -42,7 +42,7 @@
4242
"type": "derived",
4343
"file": "src/js/utils/RNTesterList.win32.js",
4444
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
45-
"baseHash": "b40cdc34295381fbd40d38ade093cc0d198edd13"
45+
"baseHash": "a4a186470316624bcd693e7f8b67739f87e5729c"
4646
}
4747
]
4848
}

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.266",
2121
"react": "18.0.0",
22-
"react-native": "0.77.0-nightly-20240921-1747f57c6"
22+
"react-native": "0.77.0-nightly-20241001-223e98cc4"
2323
},
2424
"devDependencies": {
2525
"@office-iss/react-native-win32": "^0.0.0-canary.266",
@@ -30,7 +30,7 @@
3030
"@types/node": "^18.0.0",
3131
"eslint": "^8.19.0",
3232
"just-scripts": "^1.3.3",
33-
"react-native": "0.77.0-nightly-20240921-1747f57c6",
33+
"react-native": "0.77.0-nightly-20241001-223e98cc4",
3434
"react-native-platform-override": "^1.9.48",
3535
"typescript": "5.0.4"
3636
},

packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
import type {RNTesterModuleInfo} from '../types/RNTesterTypes';
13+
import type {RNTesterModuleInfo, RNTesterModule} from '../types/RNTesterTypes';
1414

1515
import ReactNativeFeatureFlags from 'react-native/Libraries/ReactNative/ReactNativeFeatureFlags';
1616

@@ -368,9 +368,16 @@ if (ReactNativeFeatureFlags.shouldEmitW3CPointerEvents()) {
368368
});
369369
}
370370

371-
const Modules: any = {};
371+
const Playgrounds: Array<RNTesterModuleInfo> = [
372+
{
373+
key: 'PlaygroundExample',
374+
module: require('../examples/Playground/PlaygroundExample'),
375+
},
376+
];
377+
378+
const Modules: {[key: string]: RNTesterModule} = {};
372379

373-
APIs.concat(Components).forEach(Example => {
380+
[...APIs, ...Components, ...Playgrounds].forEach(Example => {
374381
Modules[Example.key] = Example.module;
375382
});
376383

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,4 @@ untyped-import
160160
untyped-type-import
161161

162162
[version]
163-
^0.246.0
163+
^0.247.1

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
"**/__snapshots__/**",
88
"src-win/rntypes/**"
99
],
10-
"baseVersion": "0.77.0-nightly-20240921-1747f57c6",
10+
"baseVersion": "0.77.0-nightly-20241001-223e98cc4",
1111
"overrides": [
1212
{
1313
"type": "derived",
1414
"file": ".flowconfig",
1515
"baseFile": ".flowconfig",
16-
"baseHash": "3fbaf9dcd4027fa382894d06f330d0c68ceff9fb"
16+
"baseHash": "0ef50a705dc56608e4a8bd11d3b0d3daedfc0012"
1717
},
1818
{
1919
"type": "derived",
2020
"file": "src-win/index.win32.js",
2121
"baseFile": "packages/react-native/index.js",
22-
"baseHash": "da5d9e79c8c14c56ba00f73c8514c06e6fffe8ed"
22+
"baseHash": "70b04f859a60e3752e6937b9fc294ffee30e6366"
2323
},
2424
{
2525
"type": "platform",
@@ -74,7 +74,7 @@
7474
"type": "copy",
7575
"file": "src-win/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
7676
"baseFile": "packages/react-native/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
77-
"baseHash": "09f143fc3f2ee80463764e1c2b3f23107d501a4c",
77+
"baseHash": "b9a6866d03ca389af38734ffed24199505b05402",
7878
"issue": 4378
7979
},
8080
{
@@ -136,7 +136,7 @@
136136
"type": "patch",
137137
"file": "src-win/Libraries/Components/Touchable/Touchable.win32.js",
138138
"baseFile": "packages/react-native/Libraries/Components/Touchable/Touchable.js",
139-
"baseHash": "27e19d3bf49ff28629fdad544aad04939c2ce030",
139+
"baseHash": "b06bb9da5282d7559f283a7d535797a0417808a6",
140140
"issue": 0
141141
},
142142
{
@@ -224,12 +224,6 @@
224224
"baseHash": "453c4da8036736aefbd950bb7c90603859933f4e",
225225
"issue": 5170
226226
},
227-
{
228-
"type": "copy",
229-
"file": "src-win/Libraries/DevToolsSettings/DevToolsSettingsManager.win32.js",
230-
"baseFile": "packages/react-native/Libraries/DevToolsSettings/DevToolsSettingsManager.android.js",
231-
"baseHash": "1c9eb481e8ed077fa650e3ea34837e2a31310366"
232-
},
233227
{
234228
"type": "platform",
235229
"file": "src-win/Libraries/Image/assetPaths.js"
@@ -337,7 +331,7 @@
337331
"type": "derived",
338332
"file": "src-win/Libraries/NativeComponent/BaseViewConfig.win32.js",
339333
"baseFile": "packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js",
340-
"baseHash": "0b4642542c2865c5cd3d542a82b295a1aca21c1a"
334+
"baseHash": "af602af3c3acc6521f5535f2fe14bfe08cf1b5e9"
341335
},
342336
{
343337
"type": "copy",
@@ -529,6 +523,12 @@
529523
"file": "src-win/src/private/specs/modules/NativePlatformConstantsWin.js",
530524
"baseFile": "packages/react-native/src/private/specs/modules/NativePlatformConstantsAndroid.js",
531525
"baseHash": "fa0f34a2de33b641bd63863629087644796d8b59"
526+
},
527+
{
528+
"type": "copy",
529+
"file": "src-win/src/private/reactdevtools/ReactDevToolsSettingsManager.win32.js",
530+
"baseFile": "packages/react-native/src/private/reactdevtools/ReactDevToolsSettingsManager.android.js",
531+
"baseHash": "df41b76dc3d2df9455fae588748261d7b0a22d01"
532532
}
533533
]
534534
}

0 commit comments

Comments
 (0)