Skip to content

Commit a8fc4c2

Browse files
authored
Merge branch 'main' into user/anuverma/automate_releasenotes
2 parents 65752c1 + 832e999 commit a8fc4c2

322 files changed

Lines changed: 9203 additions & 4153 deletions

File tree

Some content is hidden

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

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@
102102
"xtree": "cpp",
103103
"xutility": "cpp",
104104
"xstddef": "cpp",
105-
"cfenv": "cpp"
105+
"cfenv": "cpp",
106+
"cfloat": "cpp"
106107
},
107108
"search.exclude": {
108109
"**/dist/**/*.js": true,

packages/@office-iss/react-native-win32-tester/NativeComponentExample/js/MyNativeViewNativeComponent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
1212
import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
13-
import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
13+
import type {HostComponent} from 'react-native';
1414
import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
1515
import type {Float} from 'react-native/Libraries/Types/CodegenTypes';
1616
import * as React from 'react';

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.79.0-nightly-20250206-fb8a6a5bb",
8+
"baseVersion": "0.79.0-nightly-20250303-cee63397b",
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": "d007fb16f30b2630ba84a5fa61e4190c6d9a18b1"
45+
"baseHash": "3cf41a5b5fe9269145523937f8cc190ad154e615"
4646
}
4747
]
4848
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
"flow-enums-runtime": "^0.0.6"
1818
},
1919
"peerDependencies": {
20-
"@office-iss/react-native-win32": "^0.0.0-canary.285",
20+
"@office-iss/react-native-win32": "^0.0.0-canary.288",
2121
"react": "19.0.0",
22-
"react-native": "0.79.0-nightly-20250206-fb8a6a5bb"
22+
"react-native": "0.79.0-nightly-20250303-cee63397b"
2323
},
2424
"devDependencies": {
25-
"@office-iss/react-native-win32": "^0.0.0-canary.285",
25+
"@office-iss/react-native-win32": "^0.0.0-canary.288",
2626
"@rnw-scripts/babel-react-native-config": "0.0.0",
27-
"@rnw-scripts/eslint-config": "1.2.35",
28-
"@rnw-scripts/just-task": "2.3.52",
27+
"@rnw-scripts/eslint-config": "1.2.36",
28+
"@rnw-scripts/just-task": "2.3.53",
2929
"@rnw-scripts/ts-config": "2.0.5",
3030
"@types/node": "^18.0.0",
3131
"eslint": "^8.19.0",
3232
"just-scripts": "^1.3.3",
33-
"react-native": "0.79.0-nightly-20250206-fb8a6a5bb",
34-
"react-native-platform-override": "^1.9.54",
33+
"react-native": "0.79.0-nightly-20250303-cee63397b",
34+
"react-native-platform-override": "^1.9.55",
3535
"typescript": "5.0.4"
3636
},
3737
"engines": {

packages/@office-iss/react-native-win32-tester/src/js/examples/PlatformColor/PlatformColorExample.win32.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
const React = require('react');
1414
const ReactNative = require('react-native');
1515
import Platform from 'react-native/Libraries/Utilities/Platform'; // #6210
16-
const {DynamicColorIOS, PlatformColor, StyleSheet, Text, View} = ReactNative;
16+
const {PlatformColor, StyleSheet, Text, View} = ReactNative;
1717

1818
function PlatformColorsExample() {
1919
function createTable() {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ const APIs: Array<RNTesterModuleInfo> = ([
223223
.default,
224224
},
225225
// Only show the link for the example if the API is available.
226+
// $FlowExpectedError[cannot-resolve-name]
226227
typeof IntersectionObserver === 'function'
227228
? {
228229
key: 'IntersectionObserver',
@@ -254,6 +255,7 @@ const APIs: Array<RNTesterModuleInfo> = ([
254255
category: 'UI',
255256
module: require('../examples/Layout/LayoutExample'),
256257
},
258+
// $FlowExpectedError[cannot-resolve-name]
257259
typeof MutationObserver === 'function'
258260
? {
259261
key: 'MutationObserver',

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<PROJECT_ROOT>/Libraries/Pressability/Pressability.js
3030
<PROJECT_ROOT>/Libraries/Pressability/HoverState.js
3131
<PROJECT_ROOT>/Libraries/StyleSheet/StyleSheet.js
32+
<PROJECT_ROOT>/Libraries/StyleSheet/PlatformColorValueTypes.js
3233
<PROJECT_ROOT>/Libraries/Text/TextProps.js
3334
<PROJECT_ROOT>/Libraries/Types/CoreEventTypes.js
3435
<PROJECT_ROOT>/Libraries/Utilities/DeviceInfo.js
@@ -104,6 +105,8 @@
104105
interface.js
105106
flow/
106107
../../../node_modules/.flow/flow-typed/
108+
../../../node_modules/react-native/src/types
109+
src/types/
107110

108111
[options]
109112
enums=true
@@ -164,4 +167,4 @@ untyped-import
164167
untyped-type-import
165168

166169
[version]
167-
^0.259.1
170+
^0.262.0

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

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,77 @@
11
{
22
"name": "@office-iss/react-native-win32",
33
"entries": [
4+
{
5+
"date": "Fri, 30 May 2025 05:24:59 GMT",
6+
"version": "0.0.0-canary.288",
7+
"tag": "@office-iss/react-native-win32_v0.0.0-canary.288",
8+
"comments": {
9+
"none": [
10+
{
11+
"author": "74712637+iamAbhi-916@users.noreply.github.com",
12+
"package": "@office-iss/react-native-win32",
13+
"commit": "02e7363a430b16c3e7437462be2e9c1558ab3ca6",
14+
"comment": "integration nightly 0.79.0-nightly-20250303-cee63397b , overrides solved"
15+
}
16+
],
17+
"prerelease": [
18+
{
19+
"author": "beachball",
20+
"package": "@office-iss/react-native-win32",
21+
"comment": "Bump @rnw-scripts/eslint-config to v1.2.36",
22+
"commit": "not available"
23+
},
24+
{
25+
"author": "beachball",
26+
"package": "@office-iss/react-native-win32",
27+
"comment": "Bump @rnw-scripts/jest-out-of-tree-snapshot-resolver to v1.1.40",
28+
"commit": "not available"
29+
},
30+
{
31+
"author": "beachball",
32+
"package": "@office-iss/react-native-win32",
33+
"comment": "Bump @rnw-scripts/just-task to v2.3.53",
34+
"commit": "not available"
35+
},
36+
{
37+
"author": "beachball",
38+
"package": "@office-iss/react-native-win32",
39+
"comment": "Bump react-native-platform-override to v1.9.55",
40+
"commit": "not available"
41+
}
42+
]
43+
}
44+
},
45+
{
46+
"date": "Wed, 28 May 2025 05:24:00 GMT",
47+
"version": "0.0.0-canary.287",
48+
"tag": "@office-iss/react-native-win32_v0.0.0-canary.287",
49+
"comments": {
50+
"prerelease": [
51+
{
52+
"author": "4123478+tido64@users.noreply.github.com",
53+
"package": "@office-iss/react-native-win32",
54+
"commit": "a5ce4300e5a32b010d7c471818922242d5bee52f",
55+
"comment": "Removed unused `react-shallow-renderer` dependency"
56+
}
57+
]
58+
}
59+
},
60+
{
61+
"date": "Thu, 22 May 2025 05:24:49 GMT",
62+
"version": "0.0.0-canary.286",
63+
"tag": "@office-iss/react-native-win32_v0.0.0-canary.286",
64+
"comments": {
65+
"prerelease": [
66+
{
67+
"author": "54227869+anupriya13@users.noreply.github.com",
68+
"package": "@office-iss/react-native-win32",
69+
"commit": "d31d0a6d69d9db9a81e7b4423d09baa381b98367",
70+
"comment": "Integrate RN 0.79.0-nightly-20250220-41b597c73"
71+
}
72+
]
73+
}
74+
},
475
{
576
"date": "Tue, 13 May 2025 21:05:06 GMT",
677
"version": "0.0.0-canary.285",

packages/@office-iss/react-native-win32/CHANGELOG.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,36 @@
11
# Change Log - @office-iss/react-native-win32
22

3-
<!-- This log was last generated on Tue, 13 May 2025 21:05:06 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Fri, 30 May 2025 05:24:59 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 0.0.0-canary.288
8+
9+
Fri, 30 May 2025 05:24:59 GMT
10+
11+
### Changes
12+
13+
- Bump @rnw-scripts/eslint-config to v1.2.36
14+
- Bump @rnw-scripts/jest-out-of-tree-snapshot-resolver to v1.1.40
15+
- Bump @rnw-scripts/just-task to v2.3.53
16+
- Bump react-native-platform-override to v1.9.55
17+
18+
## 0.0.0-canary.287
19+
20+
Wed, 28 May 2025 05:24:00 GMT
21+
22+
### Changes
23+
24+
- Removed unused `react-shallow-renderer` dependency (4123478+tido64@users.noreply.github.com)
25+
26+
## 0.0.0-canary.286
27+
28+
Thu, 22 May 2025 05:24:49 GMT
29+
30+
### Changes
31+
32+
- Integrate RN 0.79.0-nightly-20250220-41b597c73 (54227869+anupriya13@users.noreply.github.com)
33+
734
## 0.0.0-canary.285
835

936
Tue, 13 May 2025 21:05:06 GMT

0 commit comments

Comments
 (0)