Skip to content

Commit

Permalink
[0.71] Bring in changes from core for 0.71.6 -> 0.71.12 (#11840)
Browse files Browse the repository at this point in the history
* Update core 0.71.6 -> 0.71.12

* Change files

* Exclude files from policheck
  • Loading branch information
acoates-ms committed Jul 6, 2023
1 parent afe2b73 commit de9a38d
Show file tree
Hide file tree
Showing 29 changed files with 691 additions and 603 deletions.
2 changes: 1 addition & 1 deletion .ado/config/PoliCheckExclusions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ NOTE: Use ALL CAPS for excluded terms below else it will silently ignore them. A
</Exclusion>
<!-- The specified file names will be skipped during the scan regardless which folder they are in -->
<Exclusion Type="FileName">
POLICHECKEXCLUSIONS.XML
POLICHECKEXCLUSIONS.XML|TEXTINPUT.D.TS|TEXTINPUT.FLOW.JS|TEXTINPUT.JS|TEXTINPUT.WINDOWS.JS|TEXTINPUT.WIN32.JS
</Exclusion>
</PoliCheckExclusions>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update core 0.71.6 -> 0.71.12",
"packageName": "@office-iss/react-native-win32",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update core 0.71.6 -> 0.71.12",
"packageName": "@react-native-windows/cli",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update core 0.71.6 -> 0.71.12",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
18 changes: 9 additions & 9 deletions packages/@office-iss/react-native-win32-tester/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.71.6",
"baseVersion": "0.71.12",
"overrides": [
{
"type": "patch",
Expand All @@ -26,6 +26,14 @@
"baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js",
"baseHash": "e48c4c9538d7eeb1bb244184c4e7a6e80a1ed4f6"
},
{
"type": "platform",
"file": "src/js/components/TextWin32Test.tsx"
},
{
"type": "platform",
"file": "src/js/components/ViewWin32Test.tsx"
},
{
"type": "platform",
"file": "src/js/examples/PlatformColor/PlatformColorExample.win32.js"
Expand All @@ -49,14 +57,6 @@
"baseFile": "packages/rn-tester/js/utils/testerStateUtils.js",
"baseHash": "fafcb01f5f717d16fd558668a58ed12dcdf4454c",
"issue": 6316
},
{
"type": "platform",
"file": "src/js/components/TextWin32Test.tsx"
},
{
"type": "platform",
"file": "src/js/components/ViewWin32Test.tsx"
}
]
}
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 @@ -29,11 +29,11 @@
"@types/node": "^14.14.22",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.71.6",
"react-native": "0.71.12",
"react-native-platform-override": "^1.8.3",
"typescript": "^4.9.5"
},
"engines": {
"node": ">= 14"
}
}
}
14 changes: 7 additions & 7 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"**/__snapshots__/**",
"src/rntypes/**"
],
"baseVersion": "0.71.6",
"baseVersion": "0.71.12",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -113,18 +113,18 @@
"type": "derived",
"file": "src/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "Libraries/Components/TextInput/TextInput.js",
"baseHash": "b59411676fb68eb715dc9b33991accf7f5ec4bbe"
},
{
"type": "platform",
"file": "src/Libraries/Components/TextInput/Win32TextInputNativeComponent.js"
"baseHash": "e5845da364f14fff72c9580123c41279eb493db4"
},
{
"type": "patch",
"file": "src/Libraries/Components/TextInput/TextInputState.win32.js",
"baseFile": "Libraries/Components/TextInput/TextInputState.js",
"baseHash": "60655baaca427e1c7c1b8884833b848335c4033b"
},
{
"type": "platform",
"file": "src/Libraries/Components/TextInput/Win32TextInputNativeComponent.js"
},
{
"type": "copy",
"file": "src/Libraries/Components/ToastAndroid/ToastAndroid.win32.js",
Expand Down Expand Up @@ -177,7 +177,7 @@
"type": "patch",
"file": "src/Libraries/Components/View/View.win32.js",
"baseFile": "Libraries/Components/View/View.js",
"baseHash": "91864d8f5518fa50da710f545ecdf5727248c45a"
"baseHash": "7945214eb22374ea322b95d12cf8d68a4cf321e4"
},
{
"type": "derived",
Expand Down
14 changes: 7 additions & 7 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"dependencies": {
"@babel/runtime": "^7.0.0",
"@jest/create-cache-key-function": "^29.2.1",
"@react-native-community/cli": "10.2.2",
"@react-native-community/cli": "10.2.4",
"@react-native-community/cli-platform-android": "10.2.0",
"@react-native-community/cli-platform-ios": "10.2.1",
"@react-native-community/cli-platform-ios": "10.2.4",
"@react-native/assets": "1.0.0",
"@react-native/normalize-color": "2.1.0",
"@react-native/polyfills": "2.0.0",
Expand All @@ -36,9 +36,9 @@
"invariant": "^2.2.4",
"jest-environment-node": "^29.2.1",
"memoize-one": "^5.0.0",
"metro-react-native-babel-transformer": "0.73.9",
"metro-runtime": "0.73.9",
"metro-source-map": "0.73.9",
"metro-react-native-babel-transformer": "0.73.10",
"metro-runtime": "0.73.10",
"metro-source-map": "0.73.10",
"mkdirp": "^0.5.1",
"nullthrows": "^1.1.1",
"pretty-format": "^26.5.2",
Expand Down Expand Up @@ -73,7 +73,7 @@
"just-scripts": "^1.3.3",
"prettier": "^2.4.1",
"react": "18.2.0",
"react-native": "0.71.6",
"react-native": "0.71.12",
"react-native-platform-override": "^1.8.3",
"typescript": "^4.9.5"
},
Expand All @@ -93,4 +93,4 @@
"engines": {
"node": ">= 14"
}
}
}

0 comments on commit de9a38d

Please sign in to comment.