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.

Sign up for GitHub

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

Jump to bottom

Integrate RN Nightly 6/13 #13346

Merged
merged 53 commits into from
Jul 10, 2024
Merged

Integrate RN Nightly 6/13 #13346

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
ff4f358
Integrate 6/13
Yajur-Grover Jun 14, 2024
6fdda65
Change files
Yajur-Grover Jun 14, 2024
d146f72
edit text file
Yajur-Grover Jun 18, 2024
157fefd
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jun 19, 2024
e345709
change project file
Yajur-Grover Jun 19, 2024
e393e3e
Merge branch 'yg-integrate-6-13' of https://github.com/Yajur-Grover/r…
Yajur-Grover Jun 19, 2024
70b9336
revert change
Yajur-Grover Jun 19, 2024
c9dd264
revert
Yajur-Grover Jun 19, 2024
4765807
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jun 21, 2024
fd3b8e4
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jun 24, 2024
6cb94a5
update lockfile
Yajur-Grover Jun 24, 2024
a81a6ef
edit project files
Yajur-Grover Jun 25, 2024
9b45280
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jun 25, 2024
667942d
update lockfile
Yajur-Grover Jun 25, 2024
e21d899
add overrides
Yajur-Grover Jun 26, 2024
7f2baa4
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jun 26, 2024
50a28b9
update overrides
Yajur-Grover Jun 26, 2024
624986a
Merge branch 'yg-integrate-6-13' of https://github.com/Yajur-Grover/r…
Yajur-Grover Jun 26, 2024
c5036fd
update snapshots
Yajur-Grover Jun 26, 2024
2e2afa6
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jun 27, 2024
8e6fcb2
fix linting
Yajur-Grover Jun 27, 2024
043aeff
update snapshots
Yajur-Grover Jun 28, 2024
affbced
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jun 28, 2024
365e9b0
update snapshots
Yajur-Grover Jun 28, 2024
59d6a29
Merge branch 'yg-integrate-6-13' of https://github.com/Yajur-Grover/r…
Yajur-Grover Jun 28, 2024
6a569e0
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jul 1, 2024
fd17edb
update snapshots
Yajur-Grover Jul 1, 2024
64fba1d
update snapshots again
Yajur-Grover Jul 1, 2024
713d78e
update snapshots
Yajur-Grover Jul 1, 2024
7979a02
fix
Yajur-Grover Jul 1, 2024
dbca834
fix legacytext snapshot
Yajur-Grover Jul 1, 2024
bc8cb3a
fix accessible prop on text
Yajur-Grover Jul 2, 2024
8619a1e
re-fix snapshots
Yajur-Grover Jul 3, 2024
db27210
update LegacyTextHitTestTest snapshot
Yajur-Grover Jul 3, 2024
aab16ea
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jul 3, 2024
d6c2307
update overrides
Yajur-Grover Jul 3, 2024
b427d52
update CalculateLayout fork
Yajur-Grover Jul 3, 2024
45f48c0
update node.cpp fork
Yajur-Grover Jul 3, 2024
51bcff6
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jul 3, 2024
7a1577c
change create-react-native-library version to working one
Yajur-Grover Jul 3, 2024
47163ce
Merge branch 'yg-integrate-6-13' of https://github.com/Yajur-Grover/r…
Yajur-Grover Jul 3, 2024
d460b94
add comments
Yajur-Grover Jul 4, 2024
1549cbc
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jul 8, 2024
165018e
update override
Yajur-Grover Jul 8, 2024
7f4fff5
fix text impl and revert simple.tsx changes
Yajur-Grover Jul 9, 2024
e8eaecc
re-fix accessibility props
Yajur-Grover Jul 9, 2024
bb06872
Merge branch 'main' into yg-integrate-6-13
Yajur-Grover Jul 9, 2024
b572108
update text snapshots
Yajur-Grover Jul 9, 2024
07161a5
Merge branch 'yg-integrate-6-13' of https://github.com/Yajur-Grover/r…
Yajur-Grover Jul 9, 2024
e45502b
add comment for Text.windows.js fork
Yajur-Grover Jul 9, 2024
9f5f938
add comment
Yajur-Grover Jul 9, 2024
717c8da
fix snapshots
Yajur-Grover Jul 9, 2024
0f6b332
include win32 a11y properties
Yajur-Grover Jul 9, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'main' into yg-integrate-6-13
  • Loading branch information
@Yajur-Grover
Yajur-Grover committed Jun 26, 2024
commit 7f2baa4f7e8a9067190e536a5bb5b0eef2b2b3ca
2 changes: 1 addition & 1 deletion packages/@react-native-windows/automation-channel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"prettier": "2.8.8",
"react": "18.3.1",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react-native-windows": "^0.0.0-canary.834",
"react-native-windows": "^0.0.0-canary.835",
"typescript": "5.0.4"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native-windows/tester/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@react-native-picker/picker": "2.4.10",
"react": "18.0.0",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react-native-windows": "^0.0.0-canary.834",
"react-native-windows": "^0.0.0-canary.835",
"react-native-xaml": "^0.0.78"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/e2e-test-app-fabric/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
"@typescript-eslint/parser": "^5.21.0",
"react": "18.3.1",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react-native-windows": "^0.0.0-canary.834"
"react-native-windows": "^0.0.0-canary.835"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/generator": "^7.20.0",
"@babel/preset-env": "^7.20.0",
"@babel/preset-typescript": "^7.8.3",
"@babel/runtime": "^7.20.0",
"@react-native-windows/automation": "^0.3.256",
"@react-native-windows/automation-commands": "^0.1.277",
"@react-native-windows/automation": "^0.3.257",
"@react-native-windows/automation-commands": "^0.1.278",
"@react-native/metro-config": "0.75.0-nightly-20240613-f7aea0c8e",
"@rnw-scripts/babel-node-config": "2.3.2",
"@rnw-scripts/babel-react-native-config": "0.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/e2e-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@typescript-eslint/parser": "^5.21.0",
"react": "18.3.1",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react-native-windows": "^0.0.0-canary.834",
"react-native-windows": "^0.0.0-canary.835",
"react-native-xaml": "^0.0.78"
},
"devDependencies": {
Expand All @@ -30,8 +30,8 @@
"@babel/preset-env": "^7.20.0",
"@babel/preset-typescript": "^7.8.3",
"@babel/runtime": "^7.20.0",
"@react-native-windows/automation": "^0.3.256",
"@react-native-windows/automation-commands": "^0.1.277",
"@react-native-windows/automation": "^0.3.257",
"@react-native-windows/automation-commands": "^0.1.278",
"@react-native/metro-config": "0.75.0-nightly-20240613-f7aea0c8e",
"@rnw-scripts/babel-node-config": "2.3.2",
"@rnw-scripts/babel-react-native-config": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/integration-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"chai": "^4.2.0",
"react": "18.3.1",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react-native-windows": "^0.0.0-canary.834"
"react-native-windows": "^0.0.0-canary.835"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@typescript-eslint/parser": "^5.21.0",
"react": "18.3.1",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react-native-windows": "^0.0.0-canary.834"
"react-native-windows": "^0.0.0-canary.835"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/sample-app-fabric/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@typescript-eslint/parser": "^5.21.0",
"react": "18.3.1",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react-native-windows": "^0.0.0-canary.834"
"react-native-windows": "^0.0.0-canary.835"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/sample-apps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@typescript-eslint/parser": "^5.57.1",
"react": "18.3.1",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react-native-windows": "^0.0.0-canary.834"
"react-native-windows": "^0.0.0-canary.835"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.