Skip to content

Commit

Permalink
Integrate RN Nightly 6/18 (#13432)
Browse files Browse the repository at this point in the history
* integrate 6/14

* Change files

* fix linting and snapshots

* fix snapshot

* fix snapshots again

* add comments

* fix comment

* remove comment from codegen file

* revert packages.lock.json

* Update TextProps.windows.js

* Update Text.windows.js

* update Text.windows.js and TextProps.js

* update text.windows.js

* fix snapshots

* integrate 0.75.0-nightly-20240618-5df5ed1a8

* Change files

* fix CI and validate-overrides

* use @react-native-community/template@next

* add comments

* update script temporarily

* remove AppRegistry, AppContainer and renderApplication overrides

* fix text snapshots

* fix httprequest snapshot

* comment out failing fabric tests

* fix bad change

* fix snapshot

---------

Co-authored-by: Marlene Cota <[email protected]>
Co-authored-by: TatianaKapos <[email protected]>
  • Loading branch information
3 people authored Jul 22, 2024
1 parent ed69918 commit 7b187af
Show file tree
Hide file tree
Showing 86 changed files with 35,624 additions and 54,099 deletions.
8 changes: 6 additions & 2 deletions .ado/templates/react-native-init-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,21 @@ steps:

- ${{ if endsWith(parameters.template, '-app') }}:
- script: |
npx --yes react-native@$(reactNativeDevDependency) init testcli --template react-native@$(reactNativeDevDependency)
# Change version of @react-native-community/template from 'next' to 'reactNativeDevDependency' - Windows #13446
npx --yes react-native@$(reactNativeDevDependency) init testcli --template @react-native-community/template@next
displayName: Init new app project with react-native init
workingDirectory: $(Agent.BuildDirectory)
- ${{ if endsWith(parameters.template, '-lib') }}:
- script: |
npx --yes create-react-native-library@latest --slug testcli --description testcli --author-name "React-Native-Windows Bot" --author-email [email protected] --author-url http://example.com --repo-url http://example.com --languages java-objc --type module-new --react-native-version $(reactNativeDevDependency) --example vanilla testcli
# Change version of react-native from 'next' to 'reactNativeDevDependency' - Windows #13446
npx --yes create-react-native-library@latest --slug testcli --description testcli --author-name "React-Native-Windows Bot" --author-email [email protected] --author-url http://example.com --repo-url http://example.com --languages java-objc --type module-new --react-native-version next --example vanilla testcli
displayName: Init new lib project with create-react-native-library
workingDirectory: $(Agent.BuildDirectory)
- script: |
# Once version of react-native is reverted from 'next' to 'reactNativeDevDependency', remove 'yarn upgrade' command - Windows #13446
call yarn upgrade react-native@$(reactNativeDevDependency)
call yarn install
displayName: pre-windows yarn install
workingDirectory: $(Agent.BuildDirectory)\testcli
Expand Down
3 changes: 2 additions & 1 deletion .ado/templates/react-native-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ steps:

- ${{ if eq(parameters.projectType, 'app') }}:
- script: |
npx --yes react-native@$(reactNativeDevDependency) init testcli --template react-native@$(reactNativeDevDependency)
# Change version of @react-native-community/template from next to reactNativeDevDependency - Windows #13446
npx --yes react-native@$(reactNativeDevDependency) init testcli --template @react-native-community/template@next
displayName: Init new app project
workingDirectory: $(Agent.BuildDirectory)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 6/14",
"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 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@react-native-windows/automation",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 6/14",
"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": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@react-native-windows/automation-commands",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@react-native-windows/cli",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"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": "prerelease",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@react-native-windows/find-repo-root",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@react-native-windows/fs",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@react-native-windows/package-utils",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@react-native-windows/telemetry",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@rnw-scripts/create-github-releases",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@rnw-scripts/doxysaurus",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 6/14",
"packageName": "@rnw-scripts/eslint-config",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@rnw-scripts/format-files",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"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": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@rnw-scripts/jest-out-of-tree-resolver",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@rnw-scripts/jest-out-of-tree-snapshot-resolver",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@rnw-scripts/just-task",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@rnw-scripts/promote-release",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "@rnw-scripts/take-screenshot",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "react-native-platform-override",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 6/14",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.75.0-nightly-20240618-5df5ed1a8",
"packageName": "react-native-windows-init",
"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.75.0-nightly-20240613-f7aea0c8e",
"baseVersion": "0.75.0-nightly-20240618-5df5ed1a8",
"overrides": [
{
"type": "patch",
Expand Down
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.256",
"react": "18.0.0",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e"
"react-native": "0.75.0-nightly-20240618-5df5ed1a8"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.256",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react-native": "0.75.0-nightly-20240618-5df5ed1a8",
"react-native-platform-override": "^1.9.43",
"typescript": "5.0.4"
},
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 @@ -159,4 +159,4 @@ untyped-import
untyped-type-import

[version]
^0.237.2
^0.238.0
10 changes: 5 additions & 5 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.75.0-nightly-20240613-f7aea0c8e",
"baseVersion": "0.75.0-nightly-20240618-5df5ed1a8",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "0a0c16d79748a5e84407a57c772c3508160134ae"
"baseHash": "75582b181be0cd6790f7c021bfafb761dfc42381"
},
{
"type": "derived",
Expand Down Expand Up @@ -317,7 +317,7 @@
"type": "patch",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorHeader.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorHeader.js",
"baseHash": "1a12281b1cfab7352fcfeb5984f0ed3c83c04660",
"baseHash": "e85290422895e30d58e2d804f11e73407a743282",
"issue": 7952
},
{
Expand Down Expand Up @@ -439,13 +439,13 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "24376d16dfc834512d72348e2a434731440146d4"
"baseHash": "71c24366f3f0baa9a48ba34c08b255483bf77553"
},
{
"type": "derived",
"file": "src-win/Libraries/Text/TextNativeComponent.win32.js",
"baseFile": "packages/react-native/Libraries/Text/TextNativeComponent.js",
"baseHash": "9f7ea4e5225a06e1ec3bb46a2f4bc9f72bf46873",
"baseHash": "1b2e6301edc13f3a91e47b9befe8a47a12e6ad39",
"issue": 7074
},
{
Expand Down
28 changes: 14 additions & 14 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": "14.0.0-alpha.2",
"@react-native-community/cli-platform-ios": "14.0.0-alpha.2",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.75.0-nightly-20240613-f7aea0c8e",
"@react-native/codegen": "0.75.0-nightly-20240613-f7aea0c8e",
"@react-native/community-cli-plugin": "0.75.0-nightly-20240613-f7aea0c8e",
"@react-native/gradle-plugin": "0.75.0-nightly-20240613-f7aea0c8e",
"@react-native/js-polyfills": "0.75.0-nightly-20240613-f7aea0c8e",
"@react-native/normalize-colors": "0.75.0-nightly-20240613-f7aea0c8e",
"@react-native/virtualized-lists": "0.75.0-nightly-20240613-f7aea0c8e",
"@react-native/assets-registry": "0.75.0-nightly-20240618-5df5ed1a8",
"@react-native/codegen": "0.75.0-nightly-20240618-5df5ed1a8",
"@react-native/community-cli-plugin": "0.75.0-nightly-20240618-5df5ed1a8",
"@react-native/gradle-plugin": "0.75.0-nightly-20240618-5df5ed1a8",
"@react-native/js-polyfills": "0.75.0-nightly-20240618-5df5ed1a8",
"@react-native/normalize-colors": "0.75.0-nightly-20240618-5df5ed1a8",
"@react-native/virtualized-lists": "0.75.0-nightly-20240618-5df5ed1a8",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand All @@ -61,7 +61,7 @@
"react-refresh": "^0.14.0",
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
"scheduler": "0.24.0-canary-efb381bbf-20230505",
"scheduler": "0.25.0-rc-fb9a90fa48-20240614",
"semver": "^7.1.3",
"stacktrace-parser": "^0.1.10",
"whatwg-fetch": "^3.0.0",
Expand All @@ -71,13 +71,13 @@
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/eslint-parser": "^7.20.0",
"@react-native/metro-config": "0.75.0-nightly-20240613-f7aea0c8e",
"@react-native/metro-config": "0.75.0-nightly-20240614-8b53d41a8",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.24",
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.28",
"@rnw-scripts/just-task": "2.3.41",
"@rnw-scripts/metro-dev-config": "0.0.0",
"@rnx-kit/jest-preset": "^0.1.0",
"@rnx-kit/jest-preset": "^0.1.17",
"@types/node": "^18.0.0",
"@types/prop-types": "15.7.1",
"@types/react": "^18.2.6",
Expand All @@ -86,15 +86,15 @@
"jscodeshift": "^0.14.0",
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "18.3.1",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.75.0-nightly-20240618-5df5ed1a8",
"react-native-platform-override": "^1.9.43",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "^18.2.0",
"react-native": "0.75.0-nightly-20240613-f7aea0c8e"
"react": "^19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.75.0-nightly-20240618-5df5ed1a8"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Loading

0 comments on commit 7b187af

Please sign in to comment.