Skip to content

Commit bb63c95

Browse files
authored
Merge branch 'main' into wdio-upgrade
2 parents bd48640 + 24b9aba commit bb63c95

253 files changed

Lines changed: 6391 additions & 3920 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.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/Libraries/Text/Text.d.ts b/Libraries/Text/Text.d.ts
2+
index db7aea477d51e1105cc5795dd5547a4ab3e052c2..ca69c7d49712449891cbe80f37c4c1ef7763668a 100644
3+
--- a/Libraries/Text/Text.d.ts
4+
+++ b/Libraries/Text/Text.d.ts
5+
@@ -16,6 +16,7 @@ import {TextStyle} from '../StyleSheet/StyleSheetTypes';
6+
import {
7+
GestureResponderEvent,
8+
LayoutChangeEvent,
9+
+ MouseEvent,
10+
NativeSyntheticEvent,
11+
TextLayoutEventData,
12+
} from '../Types/CoreEventTypes';

apps/E2E/CHANGELOG.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@fluentui-react-native/e2e-testing",
33
"entries": [
4+
{
5+
"date": "Wed, 11 Jun 2025 19:34:58 GMT",
6+
"version": "1.40.8",
7+
"tag": "@fluentui-react-native/e2e-testing_v1.40.8",
8+
"comments": {
9+
"none": [
10+
{
11+
"author": "4123478+tido64@users.noreply.github.com",
12+
"package": "@fluentui-react-native/e2e-testing",
13+
"commit": "ff2088a94a1b13d0d8dddea54537f7da3dc96e58",
14+
"comment": "Added missing `@types/node`"
15+
}
16+
]
17+
}
18+
},
419
{
520
"date": "Mon, 10 Mar 2025 20:26:46 GMT",
621
"version": "1.40.8",

apps/E2E/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
],
2424
"dependencies": {
2525
"react": "18.2.0",
26-
"react-native": "^0.73.0",
27-
"react-native-macos": "^0.73.0",
28-
"react-native-windows": "^0.73.0"
26+
"react-native": "^0.74.0",
27+
"react-native-macos": "^0.74.0",
28+
"react-native-windows": "^0.74.0"
2929
},
3030
"devDependencies": {
3131
"@babel/core": "^7.8.0",
3232
"@babel/runtime": "^7.8.0",
3333
"@fluentui-react-native/eslint-config-rules": "workspace:*",
3434
"@fluentui-react-native/focus-zone": "workspace:*",
3535
"@fluentui-react-native/scripts": "workspace:*",
36-
"@react-native/babel-preset": "^0.73.0",
37-
"@react-native/metro-babel-transformer": "^0.73.0",
38-
"@react-native/metro-config": "^0.73.0",
36+
"@react-native/babel-preset": "^0.74.0",
37+
"@react-native/metro-babel-transformer": "^0.74.0",
38+
"@react-native/metro-config": "^0.74.0",
3939
"@rnx-kit/metro-config": "^2.0.0",
4040
"@types/jasmine": "5.1.4",
4141
"@types/node": "^22.2.0",
@@ -52,7 +52,7 @@
5252
"appium-uiautomator2-driver": "^3.0.5",
5353
"appium-windows-driver": "^2.12.18",
5454
"appium-xcuitest-driver": "^7.9.1",
55-
"metro-config": "^0.80.0",
55+
"metro-config": "^0.80.3",
5656
"rimraf": "^5.0.1",
5757
"ts-node": "^10.7.0",
5858
"typescript": "4.9.4",
@@ -68,7 +68,7 @@
6868
"microsoft/react-native"
6969
],
7070
"requirements": [
71-
"react-native@0.73"
71+
"react-native@0.74"
7272
],
7373
"capabilities": [
7474
"core",

apps/fluent-tester/CHANGELOG.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@fluentui-react-native/tester",
33
"entries": [
4+
{
5+
"date": "Wed, 11 Jun 2025 19:34:50 GMT",
6+
"version": "0.170.26",
7+
"tag": "@fluentui-react-native/tester_v0.170.26",
8+
"comments": {
9+
"none": [
10+
{
11+
"author": "4123478+tido64@users.noreply.github.com",
12+
"package": "@fluentui-react-native/tester",
13+
"commit": "2342b87a20e5a584bd2073c8c5a266f0aa48c8bb",
14+
"comment": "Added missing dev dependencies"
15+
}
16+
]
17+
}
18+
},
419
{
520
"date": "Mon, 10 Mar 2025 20:26:46 GMT",
621
"version": "0.170.26",

0 commit comments

Comments
 (0)