Skip to content

Commit 8cf7376

Browse files
Integrate 2/21 (#12880)
* initial 2/21 integrate * Change files * add new files to shared.vcxitems * revert warnings.props change * re-add warning to warning.props * fix node tests and linting * Change files * update cli package * update lockfile * revert win32 playground change * add scrollviewprops override * add details to overrides.json * fix overrides --------- Co-authored-by: Jon Thysell <[email protected]>
1 parent 168b1c1 commit 8cf7376

Some content is hidden

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

44 files changed

+942
-447
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "initial 2/21 integrate",
4+
"packageName": "@office-iss/react-native-win32",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "initial 2/21 integrate",
4+
"packageName": "@react-native-windows/automation-channel",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "fix node tests and linting",
4+
"packageName": "@react-native-windows/cli",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "initial 2/21 integrate",
4+
"packageName": "@rnw-scripts/eslint-config",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "initial 2/21 integrate",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"excludePatterns": [
66
"src/js/examples-win32/**"
77
],
8-
"baseVersion": "0.74.0-nightly-20240214-b8ad91732",
8+
"baseVersion": "0.75.0-nightly-20240221-a1171f79f",
99
"overrides": [
1010
{
1111
"type": "patch",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"peerDependencies": {
2020
"@office-iss/react-native-win32": "^0.0.0-canary.238",
2121
"react": "18.0.0",
22-
"react-native": "0.74.0-nightly-20240214-b8ad91732"
22+
"react-native": "0.75.0-nightly-20240221-a1171f79f"
2323
},
2424
"devDependencies": {
2525
"@office-iss/react-native-win32": "^0.0.0-canary.238",
@@ -30,7 +30,7 @@
3030
"@types/node": "^18.0.0",
3131
"eslint": "^8.19.0",
3232
"just-scripts": "^1.3.3",
33-
"react-native": "0.74.0-nightly-20240214-b8ad91732",
33+
"react-native": "0.75.0-nightly-20240221-a1171f79f",
3434
"react-native-platform-override": "^1.9.25",
3535
"typescript": "5.0.4"
3636
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@ untyped-import
154154
untyped-type-import
155155

156156
[version]
157-
^0.228.0
157+
^0.229.0

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
"**/__snapshots__/**",
88
"src-win/rntypes/**"
99
],
10-
"baseVersion": "0.74.0-nightly-20240214-b8ad91732",
10+
"baseVersion": "0.75.0-nightly-20240221-a1171f79f",
1111
"overrides": [
1212
{
1313
"type": "derived",
1414
"file": ".flowconfig",
1515
"baseFile": ".flowconfig",
16-
"baseHash": "088893394c0e76f20bdc2f745a6dacba2285e579"
16+
"baseHash": "c86109b8683d5b05c15f365efe90f9da2b0f8f38"
1717
},
1818
{
1919
"type": "derived",
2020
"file": "src-win/index.win32.js",
2121
"baseFile": "packages/react-native/index.js",
22-
"baseHash": "0c6707a752c0a7bd2b86225e0276c04a0f1c3b70"
22+
"baseHash": "7e8cd1a3073bf2ee25706f1828d255c602c1207d"
2323
},
2424
{
2525
"type": "platform",
@@ -149,7 +149,7 @@
149149
"type": "patch",
150150
"file": "src-win/Libraries/Components/Touchable/Touchable.win32.js",
151151
"baseFile": "packages/react-native/Libraries/Components/Touchable/Touchable.js",
152-
"baseHash": "ddfc674fe37ab886bd73a263786a4049b3cc73ff",
152+
"baseHash": "965bd1e103f7bd92340917acf231516659aba36c",
153153
"issue": 0
154154
},
155155
{

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
"dependencies": {
2727
"@babel/runtime": "^7.0.0",
2828
"@jest/create-cache-key-function": "^29.6.3",
29-
"@react-native-community/cli": "13.5.1",
30-
"@react-native-community/cli-platform-android": "13.5.1",
31-
"@react-native-community/cli-platform-ios": "13.5.1",
29+
"@react-native-community/cli": "13.6.0",
30+
"@react-native-community/cli-platform-android": "13.6.0",
31+
"@react-native-community/cli-platform-ios": "13.6.0",
3232
"@react-native/assets": "1.0.0",
33-
"@react-native/assets-registry": "0.74.0-nightly-20240214-b8ad91732",
34-
"@react-native/codegen": "0.74.0-nightly-20240214-b8ad91732",
35-
"@react-native/community-cli-plugin": "0.74.0-nightly-20240214-b8ad91732",
36-
"@react-native/gradle-plugin": "0.74.0-nightly-20240214-b8ad91732",
37-
"@react-native/js-polyfills": "0.74.0-nightly-20240214-b8ad91732",
38-
"@react-native/normalize-colors": "0.74.0-nightly-20240214-b8ad91732",
39-
"@react-native/virtualized-lists": "0.74.0-nightly-20240214-b8ad91732",
33+
"@react-native/assets-registry": "0.75.0-nightly-20240221-a1171f79f",
34+
"@react-native/codegen": "0.75.0-nightly-20240221-a1171f79f",
35+
"@react-native/community-cli-plugin": "0.75.0-nightly-20240221-a1171f79f",
36+
"@react-native/gradle-plugin": "0.75.0-nightly-20240221-a1171f79f",
37+
"@react-native/js-polyfills": "0.75.0-nightly-20240221-a1171f79f",
38+
"@react-native/normalize-colors": "0.75.0-nightly-20240221-a1171f79f",
39+
"@react-native/virtualized-lists": "0.75.0-nightly-20240221-a1171f79f",
4040
"abort-controller": "^3.0.0",
4141
"anser": "^1.4.9",
4242
"ansi-regex": "^5.0.0",
@@ -69,7 +69,7 @@
6969
"devDependencies": {
7070
"@babel/core": "^7.20.0",
7171
"@babel/eslint-parser": "^7.20.0",
72-
"@react-native/metro-config": "0.74.0-nightly-20240214-b8ad91732",
72+
"@react-native/metro-config": "0.75.0-nightly-20240221-a1171f79f",
7373
"@rnw-scripts/babel-react-native-config": "0.0.0",
7474
"@rnw-scripts/eslint-config": "1.2.9",
7575
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.13",
@@ -85,13 +85,13 @@
8585
"just-scripts": "^1.3.3",
8686
"prettier": "2.8.8",
8787
"react": "18.2.0",
88-
"react-native": "0.74.0-nightly-20240214-b8ad91732",
88+
"react-native": "0.75.0-nightly-20240221-a1171f79f",
8989
"react-native-platform-override": "^1.9.25",
9090
"typescript": "5.0.4"
9191
},
9292
"peerDependencies": {
9393
"react": "18.2.0",
94-
"react-native": "0.74.0-nightly-20240214-b8ad91732"
94+
"react-native": "0.75.0-nightly-20240221-a1171f79f"
9595
},
9696
"beachball": {
9797
"defaultNpmTag": "canary",

0 commit comments

Comments
 (0)