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.

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

Make RNM work with use_frameworks #2

Draft
wants to merge 2,801 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2801 commits
Select commit Hold shift + click to select a range
d308b5a
Merge pull request #1704 from microsoft/Saadnajmi-patch-1
microsoft-github-policy-service[bot] Jan 31, 2023
f568143
Merge branch 'main' into 71merge
Saadnajmi Feb 3, 2023
817a824
Fix JS Errors
Saadnajmi Feb 3, 2023
e394460
Fix compilation issues
Saadnajmi Feb 9, 2023
972de47
Respect system proxy settings for WebSocket (#1725)
amgleitman Feb 9, 2023
b2b61ac
Respect system proxy settings for WebSocket, take 2 (#1726)
amgleitman Feb 9, 2023
1a95fde
Don't passthru key events that override Pressibilty api's (#1731)
shwanton Feb 13, 2023
56c4b49
Fix CI issues
Saadnajmi Feb 13, 2023
f5c6275
Remove React-Core.podspec diffs
Saadnajmi Feb 19, 2023
fc92d42
Remove Stale RCTTest folder
Saadnajmi Feb 16, 2023
f7d48a1
Update yarn.lock to resolve @sideway/formula vulnerability (#1729)
amgleitman Feb 21, 2023
8f3f020
Recreate macOS targets
Saadnajmi Feb 22, 2023
351c134
Update CI to build Hermes
Saadnajmi Feb 22, 2023
e7a6501
Fix various other issues
Saadnajmi Feb 22, 2023
6a8a3b5
Merge main into 71merge
Saadnajmi Feb 22, 2023
5bd91f1
Disable macOS test targets
Saadnajmi Feb 24, 2023
154d98c
Revert "Add apple_fontSmoothing style and global default setting (#329)"
Saadnajmi Feb 27, 2023
c4c8b88
Remove onClick/onDoubleClick from macOS ViewConfig
Saadnajmi Feb 27, 2023
17ab19e
Re-order PR jobs
Saadnajmi Feb 28, 2023
5c45697
Fix macOS View config
Saadnajmi Mar 1, 2023
9e33b06
Enable macOS Unit and Integration tests
Saadnajmi Mar 2, 2023
9b0bce6
Fabric fixes for 0.71 upgrade
shwanton Mar 3, 2023
c5919f4
Fix Xcode tests
Saadnajmi Mar 4, 2023
7a2c684
Disable failing jobs
Saadnajmi Mar 4, 2023
c2ef1c2
Re-enable sanitizers and static analysis
Saadnajmi Mar 8, 2023
9198d98
[RNTester] Enable Address and Undefined Behavior Sanitizers
Saadnajmi Mar 10, 2023
cea0b84
Fix react-native-macos-init
Saadnajmi Mar 15, 2023
9dbcfa4
Fix CodeQL issues
Saadnajmi Mar 16, 2023
76b3a76
Fix Integration CI
Saadnajmi Mar 16, 2023
238d199
Fix CircleCI tests
Saadnajmi Mar 16, 2023
d221b72
Bump minimist from 1.2.5 to 1.2.8 in /bots (#1741)
dependabot[bot] Mar 17, 2023
e44bad3
Bump activesupport from 6.1.7.1 to 6.1.7.3 (#1750)
dependabot[bot] Mar 17, 2023
f18e1fc
Bump activesupport from 6.1.7.1 to 6.1.7.3 in /template (#1749)
dependabot[bot] Mar 17, 2023
5584c3c
Remove dependency on NPM package `request` (#1754)
Saadnajmi Mar 17, 2023
2c2e2fb
Bump webpack in /ReactCommon/hermes/inspector/tools/msggen (#1742)
dependabot[bot] Mar 17, 2023
90bf99c
Use SocketRocket for web socket library (#36471) (#1746)
amgleitman Mar 18, 2023
f376611
Merge branch 'main' of github.com:microsoft/react-native-macos into 7…
Saadnajmi Mar 18, 2023
3e24c19
Remove more diffs between React Native and React Native macOS
Saadnajmi Mar 18, 2023
e87426f
Enable ScreenshotManager for macOS
Saadnajmi Mar 21, 2023
48f12bc
More new architecture and macOS fixes
Saadnajmi Mar 21, 2023
21db9af
Merge pull request #1661 from Saadnajmi/71merge
Saadnajmi Mar 21, 2023
b50758f
Temporarily stop publishing stable branches (#1762)
Saadnajmi Mar 21, 2023
202c045
Bump decode-uri-component from 0.2.0 to 0.2.2 (#1761)
dependabot[bot] Mar 21, 2023
f5d30e8
Revert to RN Core's `set-rn-version.js`
Saadnajmi Mar 29, 2023
bee4806
Merge commit 'f238f153175f67e09e2d42381f8a818e4b4c503d' into fix-publish
Saadnajmi Mar 29, 2023
2bf55b6
Fix `testColorInterpolation` on macOS
Saadnajmi Mar 29, 2023
fa52bba
Use iOS DevToolsSettingsManager for macOS
Saadnajmi Mar 29, 2023
0589bc1
Remove references to Slider
Saadnajmi Mar 29, 2023
9a2785e
Fix macOS compile issue
Saadnajmi Mar 29, 2023
ee15840
Disable failing parseLogBoxLog test suite
Saadnajmi Mar 29, 2023
77531b0
Remove DatePickerMacOS
Saadnajmi Mar 29, 2023
e6476f1
Fix macOS flow errors
Saadnajmi Mar 29, 2023
ecbaf56
Fix failing Integration tests
Saadnajmi Mar 29, 2023
bb7a4ea
Remove TurbomoduleCxx-RNW/WinRT port (#1765)
Saadnajmi Mar 31, 2023
be6e2d0
Merge remote-tracking branch 'upstream/main' into latest-set-rn-version
Saadnajmi Mar 31, 2023
53abf91
Add NPM Publish Dry Run Job + Refactor publish.yml
Saadnajmi Mar 31, 2023
bce905f
Merge pull request #1767 from Saadnajmi/latest-set-rn-version
Saadnajmi Mar 31, 2023
40ca506
Bump http-cache-semantics from 4.1.0 to 4.1.1 (#1769)
dependabot[bot] Mar 31, 2023
372139b
Fix publish.yml (#1771)
Saadnajmi Apr 3, 2023
d02bce5
Refactor Publish pipeline (take 2) (#1773)
Saadnajmi Apr 4, 2023
551e640
Fix Publish pipeline (take 3) (#1774)
Saadnajmi Apr 4, 2023
07933a3
Refactor Publish Pipeline (Take 4) (#1777)
Saadnajmi Apr 7, 2023
fc59df5
Fix RCT_NEW_ARCH_ENABLED for rn-macOS (#1779) (#1781)
Saadnajmi Apr 8, 2023
3dd054e
[Fabric] Use RCT_NEW_ARCH_ENABLED flag for enabling new arch (#1782)
shwanton Apr 11, 2023
535dd99
Don't publish the SBOM (#1785)
Saadnajmi Apr 11, 2023
3e66909
Add cursorColor support to TextInput (#1787)
dlitsman Apr 13, 2023
3ea16bd
Remove TextInput cursor color changes with selectionColor prop change…
lenaic Apr 13, 2023
553d46e
Fix back ports getting tagged as `latest` on NPM + react-native-macos…
Saadnajmi Apr 24, 2023
efb69d4
Document releases flow (#1789)
Saadnajmi Apr 24, 2023
48e9455
Fix typo in publish.yml (#1799)
Saadnajmi Apr 24, 2023
f6eb1d8
Add back macOS tintColor implementation (#1801)
Saadnajmi Apr 26, 2023
de81e7f
Remove apple specific steps from `react-native-macos-init` publish pi…
Saadnajmi Apr 26, 2023
3589639
Remove dead code Libraries/Components/DatePickerAndroid (#1803)
rozele Apr 28, 2023
4ef83e5
Remove Picker and DeprecatedPropTypes from macOS (#1807)
rozele May 1, 2023
b58fa44
Resolve from `react` instead of `React` (#1808)
rozele May 1, 2023
375c579
Handle edge case for setContentOffset with animation (#1810)
chiuam May 3, 2023
3de0462
Fix TextInput to submit value to onChange & onSubmitEditing (#1811)
shwanton May 4, 2023
a72d3e5
[Fabric] Return active touch identifiers in surface touch handler on …
lenaic May 4, 2023
fcfeef7
[Fabric] Add mandatory color space conversion for macOS. (#1813)
lenaic May 4, 2023
1f75d5b
[Fabric] Clean up hit testing now that RCTUIView extends RCTPlatformV…
lenaic May 4, 2023
7da548a
[Fabric] Use the layout metrics to get the scale factor in component …
lenaic May 5, 2023
006cc09
Fix RNTester content not resizing with window. (#1818)
lenaic May 8, 2023
4b8a987
Fix wrong text offset when a line height is set. (#1819)
lenaic May 8, 2023
cf399b4
[Fabric] Fix scroll views hiding content underneath them in Fabric. (…
lenaic May 8, 2023
97ad878
[macOS] Add back the right click dev menu (#1822)
Saadnajmi May 10, 2023
50d7b04
Fix multiline text input cursor position not being reset (#1826)
shwanton May 13, 2023
f80d1c0
Fix callbacks not being fired on macOS ActionSheetIOS (#1830)
Saadnajmi May 25, 2023
80105ff
Fix contents link in Readme.md (#1829)
thomaswinckell May 25, 2023
538d6a0
[Fabric] Add support for image content mode and tint features (#1828)
lenaic May 26, 2023
29d3981
Add a couple of mac specific exports to the TS exports (#1825)
acoates-ms May 31, 2023
f469e72
Update RCTUITextView to use the systemFontSize for macOS (#1836)
lyzhan7 May 31, 2023
74bd8b4
Use viewDidChangeBackingProperties to remove the use of notifications…
lenaic Jun 1, 2023
f1510a5
Scrollview - fix initial text centering with centerContent (#1839)
shwanton Jun 1, 2023
b45a40a
ScrollView - only send the onScroll event if the document view has ac…
shwanton Jun 1, 2023
6659de8
[Fabric] Fix text input rendering crashing by using layout metrics pi…
lenaic Jun 7, 2023
54940e4
Update normalizeColorObject (#1845)
chiuam Jun 8, 2023
04bf38c
-[RCTAccessibilityManager announceForAccessibility:] calls into AppKi…
nakambo Jun 16, 2023
a5f44ca
Update macOS init template to enable New Architecture (#1854)
shwanton Jun 16, 2023
06dc77f
Onboarding to GitOps.ResourceManagement (#1850)
microsoft-github-policy-service[bot] Jun 20, 2023
11d573f
[Pressable] Mouse drags inside Pressable don't move the window (#1857)
Saadnajmi Jun 21, 2023
914e8b0
Bump semver from 7.3.8 to 7.5.2 (#1860)
dependabot[bot] Jun 24, 2023
0daf75a
[RCTTouchHandler] Invert Y coordinate when sending to JS (#1862)
Saadnajmi Jun 28, 2023
f10195f
[Xcode 15] Silence warning with mismatched NSView.clipsToBounds prope…
anandrajeswaran Jul 5, 2023
4938b10
Bump @grpc/grpc-js from 1.7.0 to 1.8.17 (#1870)
dependabot[bot] Jul 6, 2023
e76df51
[Fabric] Tint images using CIFilter fixing wrong tinted image size (#…
lenaic Jul 6, 2023
28dd130
[Switch] make sure `wasOn` is set properly (#1871)
Saadnajmi Jul 6, 2023
f90e387
[Key handling] pass through all keys; allow specifying modifiers for …
nakambo Jul 7, 2023
8b2bc73
[RNTester] Add macOS dock icon (#1875)
Saadnajmi Jul 11, 2023
049610a
Resolve tough-cookie to ^4.1.3 (#1876)
amgleitman Jul 13, 2023
910e8f8
Fix duplicate onScroll events breaking flatlist. (#1873)
lenaic Jul 13, 2023
7b5c55d
Resolve @grpc/proto-loader to ^0.7.8 (#1879)
amgleitman Jul 14, 2023
7c34fe3
Merge commit '7f2dd1d49cc3c0bf5e24fdb37f6457151c1f06c4' into 0.72-merge
Jul 17, 2023
e2dbf40
Fixing release-only crash for when specifying validKeys[Down|Up] (#1883)
nakambo Jul 17, 2023
5a95b46
Merge commit '62fa6d9dac185add0b8998fe1a443beaef3a49bc' into 0.72-merge
Jul 18, 2023
c62a350
The renames from 2e3dbe9, done separately to make sure any other chan…
Jul 18, 2023
e1f55ed
cp the files from 2e3dbe9 that registered as adds but may be "soft" r…
Jul 18, 2023
869de44
Merge commit '2e3dbe9c2fbff52448e2d5a7c1e4c96b1016cf25' into 0.72-mer…
Jul 18, 2023
b13cbae
Update .flowconfig.macos
Jul 18, 2023
4feee27
Merge commit 'e42dd1593d7ec678f91deb0ab31013f9d72544a9' into 0.72-mer…
Jul 18, 2023
1727583
Bump word-wrap from 1.2.3 to 1.2.4
dependabot[bot] Jul 19, 2023
e0d1be0
Merge commit '14ab76ac30fe830b5445b57a5dc26bc4df6c6303' into 0.72-merge
Jul 19, 2023
9e09241
Merge commit 'c18566ffdb44103a3e24cd8017d0ae6a69c68e40' into 0.72-merge
Jul 20, 2023
cfab5c5
Upgrade SocketRocket to 0.7.0
Jul 21, 2023
2416fe6
Update Podfile.lock
Jul 21, 2023
7ca6479
[DynamicColorMacOS] Downgrade to warning if appearance is nil (#1885)
Saadnajmi Jul 21, 2023
7f3eb5b
Add macOS tags
Jul 21, 2023
676716e
Merge pull request #1884 from microsoft/dependabot/npm_and_yarn/word-…
amgleitman Jul 21, 2023
31df2be
Merge branch 'main' into socketrocket-0.7
Jul 21, 2023
ed995fb
Merge pull request #1887 from amgleitman/socketrocket-0.7
amgleitman Jul 24, 2023
f6c9d13
Merge commit 'e26092aec34ed3ff3f4b9598b36486f7c584510e' into 0.72-merge
Jul 25, 2023
88c93ee
Merge commit '320e51f4c41104f8fd612eb46a9c2ad26b3382c2' into 0.72-merge
Jul 26, 2023
b82a575
Merge commit '21d530208f57feda87dce9f93f471bbf57635477' into 0.72-merge
Jul 26, 2023
13fe3ef
Add macOS versions to new podspecs
Jul 26, 2023
4d89c5d
Fix loading NODE_BINARY inside Generate Legacy Components Interop (#3…
Jul 26, 2023
35bc1bf
Merge commit 'b2fda3eca756b0dee3bac807091a767abb7742bf' into 0.72-merge
Jul 26, 2023
f078922
Use RCTUIKit
Jul 26, 2023
9d2e623
Merge commit '1c1dfab5bc6ba04e80afe0047b8983318395c766' into 0.72-merge
Jul 28, 2023
289fb99
Use RCTUIKit in RCTSurfacePointerHandler
Jul 28, 2023
bb3e19d
nit: spacing fixes
Jul 28, 2023
efb5105
Update project.pbxproj to unset RN_FABRIC_ENABLED
Jul 28, 2023
8773dd0
Only apply isHighlighted native prop on iOS (#38642) (#1892)
Saadnajmi Jul 28, 2023
3d859ca
Add keyboard modifiers back into RCTSurfaceTouchHandler
Jul 28, 2023
7b9073c
Merge branch 'main' into 0.72-merge-before-monorepo
Jul 28, 2023
b9e71d5
ADO: use Node 18
Jul 28, 2023
c5ec7c6
yarn lint fixes
Jul 31, 2023
5549630
Validate flowconfig
Jul 31, 2023
b90e958
Fix snapshots
Jul 31, 2023
e8f3246
Make our virtualized-lists package specific to react-native-macos
Jul 31, 2023
31a9468
Add macOS tags to typescript type tweaks
Jul 31, 2023
a7d8495
Add beachball scripts
Aug 1, 2023
1528889
Temporary package name change
Aug 1, 2023
88a0ac7
Change files
Aug 1, 2023
64b677b
react-native-macos/virtualized-lists -> react-native-mac/virtualized-…
Aug 1, 2023
d249126
Add nil check to RCTBaseInputTextView (#1895)
lyzhan7 Aug 2, 2023
ebf1273
[iOS/macOS] [TextInput] Implement ghost text (#1897)
nakambo Aug 2, 2023
bea7417
Merge branch 'main' into 0.72-merge-before-monorepo
Aug 7, 2023
b8d2bba
Fix flow issue in GhostTextExample
Aug 7, 2023
663773c
chore: ignore workflow errors on issue comments (#1899)
tido64 Aug 9, 2023
fdab6df
Consolidate macOS tags
Aug 9, 2023
db882e9
Add new macOS View prop `allowsVibrancy` (#1889)
Saadnajmi Aug 9, 2023
ca610b4
Merge pull request #1894 from amgleitman/0.72-merge-before-monorepo
amgleitman Aug 9, 2023
608a346
Refactor Verdaccio steps into their own YML files
Aug 9, 2023
a2f109d
applying package updates ***NO_CI***
rnbot Aug 9, 2023
4503b74
Merge branch 'main' into 0.72-merge-ado-fixes
Aug 9, 2023
45cc237
Merge branch 'main' into 0.72-merge-ado-fixes
Aug 9, 2023
3c8c5b6
Update virtualized-lists to 0.1.0 (why didn't this autoupdate?)
Aug 9, 2023
9ca3c3a
Use Verdaccio in integration pipeline
Aug 9, 2023
3fa8887
Bump fast-xml-parser from 4.1.2 to 4.2.7 (#1901)
dependabot[bot] Aug 10, 2023
9926513
Merge pull request #1905 from amgleitman/0.72-merge-ado-fixes
amgleitman Aug 11, 2023
ff70cd9
Bulk rename of relevant files based on 714b502b0c7
Aug 12, 2023
f1160c0
[RCTTouchHandler] Add a small optimization to coordinate conversion (…
Saadnajmi Aug 14, 2023
828b941
Merge commit '714b502' into 0.72-merge-monorepo
Aug 17, 2023
d16b508
Fixes to get RNTester working
Aug 17, 2023
a6cbee6
Merge branch 'main' into 0.72-merge-monorepo
Aug 17, 2023
919a0cc
Remove !scratchwork folder
Aug 17, 2023
a8dffb2
Fix path to launchPackager.command in ADO CI
Aug 17, 2023
ccedd49
Publish to Verdaccio from packages folder
Aug 18, 2023
c778e72
Re-enable iOS integration tests (#37571)
Aug 18, 2023
3734682
Fix ado-test-setup after IntegrationTests move
Aug 18, 2023
f19cef8
Fix folder name
Aug 18, 2023
c051679
Specify project root when launching packager in ADO
Aug 21, 2023
5181a02
Rename reference snapshots folder
Aug 21, 2023
c799144
Fix RNTester release bundling
Aug 22, 2023
06194dc
Set valid platforms in RNTester metro.config.js
Aug 22, 2023
1a556a8
Add macOS tags
Aug 22, 2023
e294975
Merge pull request #1908 from amgleitman/0.72-merge-monorepo
amgleitman Aug 22, 2023
4e27e46
Merge commit '221aacd72d110f576c03773eeaef52b8e2bd5aeb' into 0.72-mer…
Aug 22, 2023
d19f061
Update .flowconfig.macos for 0.202.0
Aug 22, 2023
34533ac
Remove touch bar for multiline text input (#1907)
lyzhan7 Aug 23, 2023
9b2161e
Merge pull request #1909 from amgleitman/0.72-merge-to-cut
amgleitman Aug 23, 2023
71054ea
Run packager from correct folder (cherry-pick of 40f816d)
Aug 23, 2023
289e5c6
Merge pull request #1912 from amgleitman/rn-tester-cherry-pick-40f816d
amgleitman Aug 23, 2023
2c51b62
Pack react-native-macos properly for integration test
Aug 24, 2023
dfadf03
Disable 0.72-stable publishing for now
Aug 24, 2023
1f257c4
Add RNTester sourcemaps to .gitignore
Aug 24, 2023
c01effe
Manually bump virtualized-lists to 0.72.0
Aug 24, 2023
69c3cd3
Use a release candidate for virtualized-lists
Aug 24, 2023
aaaaeb7
Change files
Aug 24, 2023
6604375
Use verdaccio for RNTester CI jobs
Aug 25, 2023
13de993
Add Verdaccio to JS CI job
Aug 25, 2023
be4f614
Add Verdaccio to dry run publish CI
Aug 25, 2023
26664f5
Don't publish react-native-macos to Verdaccio twice
Aug 25, 2023
73aadc7
Use verdaccio earlier in react-native-macos-init test
Aug 25, 2023
b10aa7b
No need to set the version, react-native-macos-init pulls the latest …
Aug 25, 2023
7af56d9
[RNTester] remove redundant release schemes (#1915)
Saadnajmi Aug 26, 2023
8ce3873
For our jest tests, ignore packages that we also publish to verdaccio
Aug 28, 2023
84f53c6
Bump activesupport from 6.1.7.4 to 6.1.7.5 (#1913)
dependabot[bot] Aug 29, 2023
b26a8e9
Fix versions so we don't need Verdaccio as much
Aug 29, 2023
a449d8f
Re-enable direct debugging with JSC on latest OS versions (#1848)
Saadnajmi Aug 29, 2023
e7c6155
Merge pull request #1914 from amgleitman/monorepo-pipeline-fixes
amgleitman Aug 29, 2023
e5559ea
Remove change files and apply virtualized-lists version bumps manually
Aug 30, 2023
847315f
Point publish.yml's publish task to new react-native-macos location
Aug 30, 2023
eb9b8e1
Merge pull request #1919 from amgleitman/more-monorepo-pipeline-fixes
amgleitman Aug 30, 2023
604d523
Fix scope and path names for publish pipeline
Aug 31, 2023
c2195d9
Merge pull request #1920 from amgleitman/even-more-pipeline-fixes
amgleitman Aug 31, 2023
275bce2
Bring in 0.72-stable changes to virtualized-lists
Sep 6, 2023
fea8f9a
Change files
Sep 6, 2023
17ed9a9
Update snapshots
Sep 6, 2023
1ceb645
Merge pull request #1928 from amgleitman/virtualized-lists-0.72.1
amgleitman Sep 6, 2023
a5e7588
applying package updates ***NO_CI***
rnbot Sep 6, 2023
a3283dc
Start publishing 0.72-stable
Sep 5, 2023
b3b056b
Fix apple-integration's RN version fetching
Sep 5, 2023
68b84b2
Copy macos config info into RNTester
Sep 7, 2023
9ea5583
Use correct package.json file
Sep 7, 2023
a4ac549
Add special "ready" prerelease option
Sep 7, 2023
00c01e1
Fix one more package.json path
Sep 7, 2023
e84f315
Add macOS tags to RNTester config
Sep 8, 2023
242adbd
Merge pull request #1933 from amgleitman/pipeline-fixes-from-0.72
amgleitman Sep 8, 2023
0fae3ab
Accomodate 0.72 release (#1934)
matthargett Sep 13, 2023
cec6410
Merge remote-tracking branch 'facebook/main' into tip
Saadnajmi Sep 21, 2023
42f73b1
Refactor RCTActivityIndicator
Saadnajmi Sep 23, 2023
6f701d2
Refactor RCTDeviceInfo
Saadnajmi Sep 24, 2023
75f07d4
Remove Debug ifdefs around description
Saadnajmi Sep 24, 2023
287cb73
Fix assorted merge errors
Saadnajmi Sep 24, 2023
93c84cc
Remove diffs between React Native macOS and React Native
Saadnajmi Sep 24, 2023
88a3ec1
Bring back launchPackager.command
Saadnajmi Sep 25, 2023
434fc60
Update CI to macOS 13 / Xcode 15
Saadnajmi Sep 25, 2023
fa5e831
Remove ruby requirement in CI
Saadnajmi Oct 2, 2023
e34a7a0
Disable snapshot tests
Saadnajmi Sep 29, 2023
4ae2d95
Disable Xcode tests on Fabric
Saadnajmi Sep 30, 2023
ba359ff
Update publish-npm and tests
Saadnajmi Oct 2, 2023
d94f6d8
Move RCTTransformOrigin out of ifdef
Saadnajmi Oct 2, 2023
dbbfafc
Merge pull request #1944 from Saadnajmi/tip
Saadnajmi Oct 2, 2023
3db670c
Merge commit '8c779cd630830149c4d33d386ccd3a9a84517d37' into 73-cut
Saadnajmi Oct 2, 2023
1ae3fb6
Refactor RCTAppearance
Saadnajmi Oct 2, 2023
cff4db1
Export processColorObject on macOS
Saadnajmi Oct 3, 2023
6ecbce1
[CI] Update apple-job publish invocation of `publish-npm.js`
Saadnajmi Oct 4, 2023
34b8bc0
Merge pull request #1945 from Saadnajmi/73-cut
Saadnajmi Oct 4, 2023
52c075e
Make RNM work with use_frameworks
cipolleschi Nov 2, 2023
71d44e4
Make MacOS build with the new Architecture
cipolleschi Nov 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .ado/Brewfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
brew "watchman"
brew "xcbeautify"
# macOS 12 doesn't have `realpath` but macOS 13 does. Remove this line when Azure Pipelines supports macOS 13 images.
brew "coreutils"
106 changes: 106 additions & 0 deletions .ado/Brewfile.lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
{
"entries": {
"brew": {
"watchman": {
"version": "2023.03.13.00",
"bottle": {
"rebuild": 0,
"root_url": "https://ghcr.io/v2/homebrew/core",
"files": {
"arm64_ventura": {
"cellar": ":any",
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:404c15d4d191fb04a2d756762e23f75281b6380dfa11e5ec6d03fc79f10df15b",
"sha256": "404c15d4d191fb04a2d756762e23f75281b6380dfa11e5ec6d03fc79f10df15b"
},
"arm64_monterey": {
"cellar": ":any",
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:4d9d73b0533628c3f4c36fb68f9de2e30c544bf97b4a31b128309f68a5368278",
"sha256": "4d9d73b0533628c3f4c36fb68f9de2e30c544bf97b4a31b128309f68a5368278"
},
"arm64_big_sur": {
"cellar": ":any",
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:d36a0916b1d93362c1f2de36cd9992fbd9af16b09ccb6d459fb9ddb10fceb9cd",
"sha256": "d36a0916b1d93362c1f2de36cd9992fbd9af16b09ccb6d459fb9ddb10fceb9cd"
},
"ventura": {
"cellar": ":any",
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:a6e4d1d0092e568d2b4d05942d934aec9feb73f4220156ed663a017831864556",
"sha256": "a6e4d1d0092e568d2b4d05942d934aec9feb73f4220156ed663a017831864556"
},
"monterey": {
"cellar": ":any",
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:6db809971a23f8de57ac377527afcb2acee533ff89946d564c52baccda1732b2",
"sha256": "6db809971a23f8de57ac377527afcb2acee533ff89946d564c52baccda1732b2"
},
"big_sur": {
"cellar": ":any",
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:127ab847fded291097dee223b29987f3fb925c3e9c859530f3f8d41488230de9",
"sha256": "127ab847fded291097dee223b29987f3fb925c3e9c859530f3f8d41488230de9"
},
"x86_64_linux": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:b0a6fd449d6078c8ff9cbc81247a6253e5c21f955986ee7667c3da5f3ef713e8",
"sha256": "b0a6fd449d6078c8ff9cbc81247a6253e5c21f955986ee7667c3da5f3ef713e8"
}
}
}
},
"xcbeautify": {
"version": "0.18.0",
"bottle": {
"rebuild": 0,
"root_url": "https://ghcr.io/v2/homebrew/core",
"files": {
"arm64_ventura": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:099fcf0dee67ef581cea24fdd71373de2df7afc242777e6b708ecaa76bee3943",
"sha256": "099fcf0dee67ef581cea24fdd71373de2df7afc242777e6b708ecaa76bee3943"
},
"arm64_monterey": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:14111fef39cdb6e9fd0b78694ce0bbdba058b506f49b1f946a12693b0314a540",
"sha256": "14111fef39cdb6e9fd0b78694ce0bbdba058b506f49b1f946a12693b0314a540"
},
"arm64_big_sur": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:fae7f5b74af43fcfc199a0c35551b0a6f5a73f5cffeac3b1312cc05ab9ee2ec3",
"sha256": "fae7f5b74af43fcfc199a0c35551b0a6f5a73f5cffeac3b1312cc05ab9ee2ec3"
},
"ventura": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:e703db7316c728405ffcb575e06ab12207c6f0e8d3f89df8f5ea7d889bbea52e",
"sha256": "e703db7316c728405ffcb575e06ab12207c6f0e8d3f89df8f5ea7d889bbea52e"
},
"monterey": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:087766fc80f24f4f7be279797c6f6488616965cf69ea0969ef1d407d462fa053",
"sha256": "087766fc80f24f4f7be279797c6f6488616965cf69ea0969ef1d407d462fa053"
},
"big_sur": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:76c5506e47ef58a1706c8e5b5e9eb75e05cf57c4868c497faa3e86e3403dc004",
"sha256": "76c5506e47ef58a1706c8e5b5e9eb75e05cf57c4868c497faa3e86e3403dc004"
},
"x86_64_linux": {
"cellar": "/home/linuxbrew/.linuxbrew/Cellar",
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:b89fe34cbad59b1dfb8d70a1baf31e153302cd4c3e730c871d368d4068082c7b",
"sha256": "b89fe34cbad59b1dfb8d70a1baf31e153302cd4c3e730c871d368d4068082c7b"
}
}
}
}
}
},
"system": {
"macos": {
"ventura": {
"HOMEBREW_VERSION": "4.0.6",
"HOMEBREW_PREFIX": "/opt/homebrew",
"Homebrew/homebrew-core": "api",
"CLT": "",
"Xcode": "14.1",
"macOS": "13.2.1"
}
}
}
}
38 changes: 38 additions & 0 deletions .ado/ado-test-cleanup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/bash
set -ex

# Script used by the Azure DevOps build agent to cleanup the packager and web socket server
# after the Xcode test step has completed

# kill whatever is occupying port 8081 (packager)
lsof -i tcp:8081 | awk 'NR!=1 {print $2}' | xargs kill
# kill whatever is occupying port 5555 (web socket server)
lsof -i tcp:5555 | awk 'NR!=1 {print $2}' | xargs kill

# AppleScript can't be invoked from Azure DevOps Mojave agents until the following ticket is resolved: https://dev.azure.com/mseng/AzureDevOps/_workitems/edit/1513729
# osascript <<'EOF'
# tell application "Terminal"
# set winlist to windows where name contains "React Packager" or name contains "Metro Bundler" or name contains "Web Socket Test Server"
# repeat with win in winlist
# tell application "Terminal" to close win
# end repeat
# end tell
# EOF

# clear packager cache
rm -fr "$TMPDIR/react-*"

# clear watchman state
rm -rf /usr/local/var/run/watchman/*
watchman watch-del-all

# dump the log files created by launchPackager.command and launchWebSocketServer.command
THIS_DIR=$(dirname "$0")
PACKAGER_LOG="${THIS_DIR}/launchPackager.log"
WEBSOCKET_LOG="${THIS_DIR}/../IntegrationTests/launchWebSocketServer.log"
if [ -f "$PACKAGER_LOG" ]; then
cat "$PACKAGER_LOG"
fi
if [ -f "$WEBSOCKET_LOG" ]; then
cat "$WEBSOCKET_LOG"
fi
63 changes: 63 additions & 0 deletions .ado/ado-test-setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#!/bin/bash
set -ex

# Script used by the Azure DevOps build agent to start the packager and web socket server

# Wait for the package to start
waitForPackager() {
local -i max_attempts=60
local -i attempt_num=1

until curl -s http://localhost:8081/status | grep "packager-status:running" -q; do
if (( attempt_num == max_attempts )); then
echo "Packager did not respond in time. No more attempts left."
exit 1
else
(( attempt_num++ ))
echo "Packager did not respond. Retrying for attempt number $attempt_num..."
sleep 1
fi
done

echo "Packager is ready!"
}

waitForWebSocketServer() {
local -i max_attempts=60
local -i attempt_num=1

until curl -s http://localhost:5555 | grep "Upgrade Required" -q; do
if (( attempt_num == max_attempts )); then
echo "WebSocket Server did not respond in time. No more attempts left."
exit 1
else
(( attempt_num++ ))
echo "WebSocket Server did not respond. Retrying for attempt number $attempt_num..."
sleep 1
fi
done

echo "WebSocket Server is ready!"
}

THIS_DIR=$PWD

# AppleScript can't be invoked from Azure DevOps Mojave agents until the following ticket is resolved: https://dev.azure.com/mseng/AzureDevOps/_workitems/edit/1513729

# Start the packager
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./scripts/launchPackager.command"

# Start the WebSocket test server
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command\""

COMMAND="$TMPDIR/launchPackager.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; PROJECT_ROOT=packages/rn-tester ./packages/react-native/scripts/launchPackager.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForPackager

COMMAND="$TMPDIR/launchWebSocketServer.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./packages/rn-tester/IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForWebSocketServer
116 changes: 116 additions & 0 deletions .ado/apple-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
name: Integrate $(Date:yyyyMMdd).$(Rev:.r)
variables:
- template: variables/vars.yml
trigger:
branches:
include:
- main
- '*-stable'
paths:
exclude:
- '*.md'
pr:
branches:
include:
- main
- '*-stable'
paths:
exclude:
- '*.md'
jobs:
- job: react_native_test_app
displayName: react-native-test-app
pool:
vmImage: $(VmImageApple)
demands: ['npm', 'sh', 'xcode']
workspace:
clean: all
timeoutInMinutes: 60
cancelTimeoutInMinutes: 5
steps:
- template: templates/apple-tools-setup.yml
- template: templates/apple-xcode-select.yml
parameters:
slice_name: $(slice_name)
xcode_version: $(xcode_version)
- bash: |
echo "##vso[task.setvariable variable=package_version]$(cat package.json | jq .version | awk '{ print substr($0, 2, length($0) - 2) }')"
echo "##vso[task.setvariable variable=react_version]$(cat package.json | jq .peerDependencies.react)"
echo "##vso[task.setvariable variable=rncli_version]$(cat package.json | jq '.dependencies."@react-native-community/cli"')"
echo "##vso[task.setvariable variable=rncli_android_version]$(cat package.json | jq '.dependencies."@react-native-community/cli-platform-android"')"
echo "##vso[task.setvariable variable=rncli_ios_version]$(cat package.json | jq '.dependencies."@react-native-community/cli-platform-ios"')"
displayName: 'Determine react-native-macos version'
workingDirectory: packages/react-native
- bash: |
npm pack ./packages/react-native
displayName: 'Pack react-native-macos'
- bash: |
git clone --progress https://github.com/microsoft/react-native-test-app.git
displayName: Checkout react-native-test-app
- bash: |
set -eo pipefail
cat package.json |
jq '.devDependencies["react"] = $(react_version)' |
jq '.devDependencies["react-native"] = "^0.71"' |
jq '.devDependencies["react-native-macos"] = "../react-native-macos-$(package_version).tgz"' |
jq 'del(.devDependencies["@react-native-community/cli"])' |
jq 'del(.devDependencies["@react-native-community/cli-platform-android"])' |
jq 'del(.devDependencies["@react-native-community/cli-platform-ios"])' |
jq 'del(.devDependencies["react-native-windows"])' > .package.json
mv .package.json package.json
cat package.json | jq .devDependencies
displayName: Modify react-native-test-app dependencies
workingDirectory: react-native-test-app
- bash: |
set -eo pipefail
cat package.json |
jq '.devDependencies["@react-native-community/cli"] = $(rncli_version)' |
jq '.devDependencies["@react-native-community/cli-platform-android"] = $(rncli_android_version)' |
jq '.devDependencies["@react-native-community/cli-platform-ios"] = $(rncli_ios_version)' |
jq '.devDependencies["react"] = $(react_version)' |
jq '.devDependencies["react-native"] = "^0.71"' |
jq '.devDependencies["react-native-macos"] = "../../react-native-macos-$(package_version).tgz"' |
jq 'del(.devDependencies["react-native-windows"])' > .package.json
mv .package.json package.json
cat package.json | jq .devDependencies
displayName: Modify example app dependencies
workingDirectory: react-native-test-app/example
- template: templates/verdaccio-init.yml
- bash: |
npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
displayName: Publish beachball packages to verdaccio
- bash: |
cat .yarnrc.yml | sed 's_^npmRegistryServer: ".*"$_npmRegistryServer: "http://localhost:4873"_' > .yarnrc.yml.copy
rm .yarnrc.yml
mv .yarnrc.yml.copy .yarnrc.yml
echo -e '\nunsafeHttpWhitelist: ["localhost"]' >> .yarnrc.yml
displayName: Point react-native-test-app registry to verdaccio server
workingDirectory: react-native-test-app
- bash: |
yarn --no-immutable
displayName: Install npm dependencies
workingDirectory: react-native-test-app
- bash: |
yarn build:macos || yarn build:macos
displayName: Bundle JavaScript
workingDirectory: react-native-test-app/example
- bash: |
rm macos/Podfile.lock
pod install --project-directory=macos
displayName: Install Pods
workingDirectory: react-native-test-app/example
- bash: |
set -eo pipefail
../scripts/xcodebuild.sh macos/Example.xcworkspace build | xcbeautify
displayName: Build Intel
workingDirectory: react-native-test-app/example
env:
CCACHE_DISABLE: 1
- bash: |
set -eo pipefail
../scripts/xcodebuild.sh macos/Example.xcworkspace clean
../scripts/xcodebuild.sh macos/Example.xcworkspace build ARCHS=arm64 | xcbeautify
displayName: Build ARM
workingDirectory: react-native-test-app/example
env:
CCACHE_DISABLE: 1
Loading