Skip to content
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

Integrate RN Nightly 10/1 (223e98cc4) #13938

Merged
merged 22 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate rn nightly 0.77.0-nightly-20241001-223e98cc4",
"packageName": "@office-iss/react-native-win32",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate rn nightly 0.77.0-nightly-20241001-223e98cc4",
"packageName": "@react-native-windows/automation-channel",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "0.77.0-nightly-20241001-223e98cc4",
"packageName": "@react-native-windows/codegen",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate rn nightly 0.77.0-nightly-20241001-223e98cc4",
"packageName": "@rnw-scripts/integrate-rn",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate rn nightly 0.77.0-nightly-20241001-223e98cc4",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.77.0-nightly-20240921-1747f57c6",
"baseVersion": "0.77.0-nightly-20241001-223e98cc4",
"overrides": [
{
"type": "patch",
Expand Down Expand Up @@ -42,7 +42,7 @@
"type": "derived",
"file": "src/js/utils/RNTesterList.win32.js",
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
"baseHash": "b40cdc34295381fbd40d38ade093cc0d198edd13"
"baseHash": "a4a186470316624bcd693e7f8b67739f87e5729c"
}
]
}
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.266",
"react": "18.0.0",
"react-native": "0.77.0-nightly-20240921-1747f57c6"
"react-native": "0.77.0-nightly-20241001-223e98cc4"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.266",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.77.0-nightly-20240921-1747f57c6",
"react-native": "0.77.0-nightly-20241001-223e98cc4",
"react-native-platform-override": "^1.9.48",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'use strict';

import type {RNTesterModuleInfo} from '../types/RNTesterTypes';
import type {RNTesterModuleInfo, RNTesterModule} from '../types/RNTesterTypes';

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

Expand Down Expand Up @@ -368,9 +368,16 @@ if (ReactNativeFeatureFlags.shouldEmitW3CPointerEvents()) {
});
}

const Modules: any = {};
const Playgrounds: Array<RNTesterModuleInfo> = [
{
key: 'PlaygroundExample',
module: require('../examples/Playground/PlaygroundExample'),
},
];

const Modules: {[key: string]: RNTesterModule} = {};

APIs.concat(Components).forEach(Example => {
[...APIs, ...Components, ...Playgrounds].forEach(Example => {
Modules[Example.key] = Example.module;
});

Expand Down
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,4 @@ untyped-import
untyped-type-import

[version]
^0.246.0
^0.247.1
24 changes: 12 additions & 12 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.77.0-nightly-20240921-1747f57c6",
"baseVersion": "0.77.0-nightly-20241001-223e98cc4",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "3fbaf9dcd4027fa382894d06f330d0c68ceff9fb"
"baseHash": "0ef50a705dc56608e4a8bd11d3b0d3daedfc0012"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "da5d9e79c8c14c56ba00f73c8514c06e6fffe8ed"
"baseHash": "70b04f859a60e3752e6937b9fc294ffee30e6366"
},
{
"type": "platform",
Expand Down Expand Up @@ -74,7 +74,7 @@
"type": "copy",
"file": "src-win/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
"baseFile": "packages/react-native/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
"baseHash": "09f143fc3f2ee80463764e1c2b3f23107d501a4c",
"baseHash": "b9a6866d03ca389af38734ffed24199505b05402",
"issue": 4378
},
{
Expand Down Expand Up @@ -136,7 +136,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/Touchable/Touchable.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Touchable/Touchable.js",
"baseHash": "27e19d3bf49ff28629fdad544aad04939c2ce030",
"baseHash": "b06bb9da5282d7559f283a7d535797a0417808a6",
"issue": 0
},
{
Expand Down Expand Up @@ -224,12 +224,6 @@
"baseHash": "453c4da8036736aefbd950bb7c90603859933f4e",
"issue": 5170
},
{
"type": "copy",
"file": "src-win/Libraries/DevToolsSettings/DevToolsSettingsManager.win32.js",
"baseFile": "packages/react-native/Libraries/DevToolsSettings/DevToolsSettingsManager.android.js",
"baseHash": "1c9eb481e8ed077fa650e3ea34837e2a31310366"
},
{
"type": "platform",
"file": "src-win/Libraries/Image/assetPaths.js"
Expand Down Expand Up @@ -337,7 +331,7 @@
"type": "derived",
"file": "src-win/Libraries/NativeComponent/BaseViewConfig.win32.js",
"baseFile": "packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js",
"baseHash": "0b4642542c2865c5cd3d542a82b295a1aca21c1a"
"baseHash": "af602af3c3acc6521f5535f2fe14bfe08cf1b5e9"
},
{
"type": "copy",
Expand Down Expand Up @@ -529,6 +523,12 @@
"file": "src-win/src/private/specs/modules/NativePlatformConstantsWin.js",
"baseFile": "packages/react-native/src/private/specs/modules/NativePlatformConstantsAndroid.js",
"baseHash": "fa0f34a2de33b641bd63863629087644796d8b59"
},
{
"type": "copy",
"file": "src-win/src/private/reactdevtools/ReactDevToolsSettingsManager.win32.js",
"baseFile": "packages/react-native/src/private/reactdevtools/ReactDevToolsSettingsManager.android.js",
"baseHash": "df41b76dc3d2df9455fae588748261d7b0a22d01"
}
]
}
20 changes: 10 additions & 10 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"@react-native-community/cli-platform-android": "15.0.0-alpha.2",
"@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.77.0-nightly-20240921-1747f57c6",
"@react-native/codegen": "0.77.0-nightly-20240921-1747f57c6",
"@react-native/community-cli-plugin": "0.77.0-nightly-20240921-1747f57c6",
"@react-native/gradle-plugin": "0.77.0-nightly-20240921-1747f57c6",
"@react-native/js-polyfills": "0.77.0-nightly-20240921-1747f57c6",
"@react-native/normalize-colors": "0.77.0-nightly-20240921-1747f57c6",
"@react-native/virtualized-lists": "0.77.0-nightly-20240921-1747f57c6",
"@react-native/assets-registry": "0.77.0-nightly-20241001-223e98cc4",
"@react-native/codegen": "0.77.0-nightly-20241001-223e98cc4",
"@react-native/community-cli-plugin": "0.77.0-nightly-20241001-223e98cc4",
"@react-native/gradle-plugin": "0.77.0-nightly-20241001-223e98cc4",
"@react-native/js-polyfills": "0.77.0-nightly-20241001-223e98cc4",
"@react-native/normalize-colors": "0.77.0-nightly-20241001-223e98cc4",
"@react-native/virtualized-lists": "0.77.0-nightly-20241001-223e98cc4",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand All @@ -60,7 +60,7 @@
"pretty-format": "^29.7.0",
"promise": "^8.3.0",
"react-clone-referenced-element": "^1.0.1",
"react-devtools-core": "^5.3.1",
"react-devtools-core": "^6.0.0",
"react-refresh": "^0.14.0",
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
Expand Down Expand Up @@ -90,14 +90,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20240921-1747f57c6",
"react-native": "0.77.0-nightly-20241001-223e98cc4",
"react-native-platform-override": "^1.9.48",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "^19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20240921-1747f57c6"
"react-native": "0.77.0-nightly-20241001-223e98cc4"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
* LICENSE file in the root directory of this source tree.
*
* @format
* @flow strict-local
*/

'use strict';

module.exports = require('../UnimplementedViews/UnimplementedView');
module.exports =
require('../UnimplementedViews/UnimplementedView') as $FlowFixMe;
Original file line number Diff line number Diff line change
Expand Up @@ -718,13 +718,17 @@ const TouchableMixin = {
return;
}
this.state.touchable.positionOnActivate &&
// $FlowFixMe[prop-missing]
Position.release(this.state.touchable.positionOnActivate);
this.state.touchable.dimensionsOnActivate &&
// $FlowFixMe[prop-missing]
BoundingDimensions.release(this.state.touchable.dimensionsOnActivate);
// $FlowFixMe[prop-missing]
this.state.touchable.positionOnActivate = Position.getPooled(
globalX,
globalY,
);
// $FlowFixMe[prop-missing]
this.state.touchable.dimensionsOnActivate = BoundingDimensions.getPooled(
w,
h,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ const validAttributesForNonEventProps = {
boxShadow: {
process: require('../StyleSheet/processBoxShadow').default,
},
experimental_mixBlendMode: true,
mixBlendMode: true,
isolation: true,

borderTopWidth: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ import typeof UTFSequence from './Libraries/UTFSequence';
import typeof * as Appearance from './Libraries/Utilities/Appearance';
import typeof BackHandler from './Libraries/Utilities/BackHandler';
import typeof DeviceInfo from './Libraries/Utilities/DeviceInfo';
import typeof DevMenu from './src/private/devmenu/DevMenu';
import typeof DevSettings from './Libraries/Utilities/DevSettings';
import typeof Dimensions from './Libraries/Utilities/Dimensions';
import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
Expand Down Expand Up @@ -240,6 +241,9 @@ module.exports = {
get DeviceInfo(): DeviceInfo {
return require('./Libraries/Utilities/DeviceInfo');
},
get DevMenu(): DevMenu {
return require('./src/private/devmenu/DevMenu');
},
get DevSettings(): DevSettings {
return require('./Libraries/Utilities/DevSettings');
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow strict-local
* @format
*/

import NativeReactDevToolsSettingsManager from '../specs/modules/NativeReactDevToolsSettingsManager';

module.exports = {
setGlobalHookSettings(settings: string) {
NativeReactDevToolsSettingsManager?.setGlobalHookSettings(settings);
},
getGlobalHookSettings(): ?string {
return NativeReactDevToolsSettingsManager?.getGlobalHookSettings();
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"just-scripts": "^1.3.2",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20240921-1747f57c6",
"react-native": "0.77.0-nightly-20241001-223e98cc4",
"react-native-windows": "^0.0.0-canary.876",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ function getPossibleMethodSignatures(
): string[] {
const args = translateArgs(funcType.params, aliases, baseAliasName, options);
if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (funcType.returnTypeAnnotation.elementType) {
args.push(
`::React::ReactPromise<${translateImplReturnType(
Expand Down Expand Up @@ -120,6 +121,7 @@ function renderProperties(
);

if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (funcType.returnTypeAnnotation.elementType) {
traversedArgs.push(
`Promise<${translateSpecReturnType(
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native-windows/tester/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win/**"
],
"baseVersion": "0.77.0-nightly-20240921-1747f57c6",
"baseVersion": "0.77.0-nightly-20241001-223e98cc4",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -91,7 +91,7 @@
"type": "derived",
"file": "src/js/utils/RNTesterList.windows.js",
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
"baseHash": "b40cdc34295381fbd40d38ade093cc0d198edd13"
"baseHash": "a4a186470316624bcd693e7f8b67739f87e5729c"
}
]
}
Loading
Loading