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

Merge up to 0.76-stable branch cut #2190

Merged
merged 963 commits into from
Oct 24, 2024
Merged

Conversation

Saadnajmi
Copy link
Collaborator

@Saadnajmi Saadnajmi commented Sep 9, 2024

Summary:

Merge up to the 0.76-stable branch cut.

Interesting commits:

  • (Not a specific commit): CSS style box shadows are supported by React Native now! I got them.. mostly working on macOS. There's some matrix flipping / coordinate transforms that need to be done to get them completely correct.
  • facebook@cdab537 (RCTTextInputView.mm)
  • facebook@84fe531 (RCTRedbox.mm)
    • Meta’s experimenting with Mac Catalyst, and is ignoring safeArea insets on there because it crashes. While macOS doesn’t have a crash using safeAreaInsets, let’s just follow the pattern and not use them in RCTRedbox too
  • facebook@7653f76
    • Border drawing code has significantly changed in RCTViewComponentView
  • facebook@8d0cbbf
    • Publish-npm and it's tested needed to be updated to account for this.
  • facebook@3572ef3
    • A fix for RCTImageView.mm that didn't look like it applied to macOS

Test Plan

Box Shadows work!

Screenshot 2024-10-20 at 9 12 42 PM

... but are different in some areas

Screenshot 2024-10-20 at 9 13 16 PM

Full merge conflict log

[react-native-macos] git merge 143f1ad29874c1e8e9561abae263cb08f4859407                                                                                         0.76-merge 
Auto-merging .github/workflows/autorebase.yml
CONFLICT (content): Merge conflict in .github/workflows/autorebase.yml
Auto-merging .gitignore
Auto-merging Gemfile.lock
Auto-merging jest.config.js
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging packages/babel-plugin-codegen/package.json
CONFLICT (content): Merge conflict in packages/babel-plugin-codegen/package.json
Auto-merging packages/community-cli-plugin/package.json
Auto-merging packages/core-cli-utils/package.json
CONFLICT (content): Merge conflict in packages/core-cli-utils/package.json
Auto-merging packages/helloworld/package.json
Auto-merging packages/react-native-babel-preset/package.json
CONFLICT (content): Merge conflict in packages/react-native-babel-preset/package.json
Auto-merging packages/react-native-bots/package.json
CONFLICT (content): Merge conflict in packages/react-native-bots/package.json
Auto-merging packages/react-native-codegen-typescript-test/package.json
CONFLICT (content): Merge conflict in packages/react-native-codegen-typescript-test/package.json
Auto-merging packages/react-native-codegen/package.json
CONFLICT (content): Merge conflict in packages/react-native-codegen/package.json
Auto-merging packages/react-native-test-library/package.json
CONFLICT (content): Merge conflict in packages/react-native-test-library/package.json
Auto-merging packages/react-native-test-renderer/package.json
Auto-merging packages/react-native/Libraries/Alert/Alert.js
CONFLICT (modify/delete): packages/react-native/Libraries/Animated/NativeAnimatedHelper.js deleted in 143f1ad29874c1e8e9561abae263cb08f4859407 and modified in HEAD.  Version HEAD of packages/react-native/Libraries/Animated/NativeAnimatedHelper.js left in tree.
Auto-merging packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h
Auto-merging packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
Auto-merging packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm
Auto-merging packages/react-native/Libraries/Components/ScrollView/ScrollView.js
Auto-merging packages/react-native/Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap
Auto-merging packages/react-native/Libraries/Components/StatusBar/StatusBar.js
Auto-merging packages/react-native/Libraries/Components/TextInput/TextInput.d.ts
Auto-merging packages/react-native/Libraries/Components/TextInput/TextInput.js
Auto-merging packages/react-native/Libraries/Components/View/ReactNativeViewAttributes.js
Auto-merging packages/react-native/Libraries/Components/View/ViewPropTypes.js
Auto-merging packages/react-native/Libraries/Image/Image.ios.js
Auto-merging packages/react-native/Libraries/Image/RCTImageLoader.mm
CONFLICT (content): Merge conflict in packages/react-native/Libraries/Image/RCTImageLoader.mm
Auto-merging packages/react-native/Libraries/Image/RCTImageView.mm
CONFLICT (content): Merge conflict in packages/react-native/Libraries/Image/RCTImageView.mm
Auto-merging packages/react-native/Libraries/Image/RCTResizeMode.h
Auto-merging packages/react-native/Libraries/Image/React-RCTImage.podspec
CONFLICT (content): Merge conflict in packages/react-native/Libraries/Image/React-RCTImage.podspec
Auto-merging packages/react-native/Libraries/Image/__tests__/__snapshots__/Image-test.js.snap
Auto-merging packages/react-native/Libraries/Inspector/NetworkOverlay.js
Auto-merging packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec
Auto-merging packages/react-native/Libraries/Lists/FlatList.js
Auto-merging packages/react-native/Libraries/Lists/SectionList.js
Auto-merging packages/react-native/Libraries/Lists/SectionListModern.js
CONFLICT (content): Merge conflict in packages/react-native/Libraries/Lists/SectionListModern.js
Auto-merging packages/react-native/Libraries/LogBox/UI/LogBoxInspectorHeader.js
Auto-merging packages/react-native/Libraries/Modal/Modal.js
Auto-merging packages/react-native/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
Auto-merging packages/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
Auto-merging packages/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.mm
Auto-merging packages/react-native/Libraries/Network/React-RCTNetwork.podspec
Auto-merging packages/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts
Auto-merging packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js
Auto-merging packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm
Auto-merging packages/react-native/Libraries/Text/RCTTextAttributes.h
Auto-merging packages/react-native/Libraries/Text/RCTTextAttributes.mm
Auto-merging packages/react-native/Libraries/Text/React-RCTText.podspec
CONFLICT (content): Merge conflict in packages/react-native/Libraries/Text/React-RCTText.podspec
Auto-merging packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm
Auto-merging packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
Auto-merging packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
CONFLICT (content): Merge conflict in packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
Auto-merging packages/react-native/Libraries/Text/TextNativeComponent.js
Auto-merging packages/react-native/Libraries/Utilities/Appearance.js
CONFLICT (content): Merge conflict in packages/react-native/Libraries/Utilities/Appearance.js
Auto-merging packages/react-native/Libraries/Utilities/HMRClient.js
Auto-merging packages/react-native/Libraries/Utilities/ReactNativeTestTools.js
Auto-merging packages/react-native/Libraries/WebSocket/WebSocket.js
Auto-merging packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap
CONFLICT (content): Merge conflict in packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap
Auto-merging packages/react-native/React/Base/RCTBridge.mm
Auto-merging packages/react-native/React/Base/RCTConvert.h
CONFLICT (content): Merge conflict in packages/react-native/React/Base/RCTConvert.h
Auto-merging packages/react-native/React/Base/RCTConvert.mm
CONFLICT (content): Merge conflict in packages/react-native/React/Base/RCTConvert.mm
Auto-merging packages/react-native/React/Base/RCTKeyCommands.m
CONFLICT (content): Merge conflict in packages/react-native/React/Base/RCTKeyCommands.m
Auto-merging packages/react-native/React/CoreModules/RCTAppearance.mm
Auto-merging packages/react-native/React/CoreModules/RCTDevLoadingView.mm
Auto-merging packages/react-native/React/CoreModules/RCTDevMenu.mm
Auto-merging packages/react-native/React/CoreModules/RCTDeviceInfo.mm
CONFLICT (content): Merge conflict in packages/react-native/React/CoreModules/RCTDeviceInfo.mm
Auto-merging packages/react-native/React/CoreModules/RCTPerfMonitor.mm
CONFLICT (content): Merge conflict in packages/react-native/React/CoreModules/RCTPerfMonitor.mm
Auto-merging packages/react-native/React/CoreModules/RCTPlatform.mm
Auto-merging packages/react-native/React/CoreModules/RCTRedBox.mm
CONFLICT (content): Merge conflict in packages/react-native/React/CoreModules/RCTRedBox.mm
Auto-merging packages/react-native/React/CoreModules/RCTStatusBarManager.mm
Auto-merging packages/react-native/React/CoreModules/React-CoreModules.podspec
Auto-merging packages/react-native/React/CxxBridge/RCTCxxBridge.mm
Auto-merging packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm
CONFLICT (content): Merge conflict in packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm
Auto-merging packages/react-native/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
Auto-merging packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
CONFLICT (content): Merge conflict in packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
Auto-merging packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
Auto-merging packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h
Auto-merging packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
CONFLICT (content): Merge conflict in packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
Auto-merging packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
CONFLICT (content): Merge conflict in packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
Auto-merging packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
Auto-merging packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm
Auto-merging packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
CONFLICT (content): Merge conflict in packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
Auto-merging packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm
Auto-merging packages/react-native/React/Fabric/RCTSurfacePresenter.mm
Auto-merging packages/react-native/React/Modules/RCTRedBoxExtraDataViewController.m
Auto-merging packages/react-native/React/React-RCTFabric.podspec
Auto-merging packages/react-native/React/Views/RCTBorderDrawing.h
Auto-merging packages/react-native/React/Views/RCTBorderDrawing.m
Auto-merging packages/react-native/React/Views/RCTComponentData.m
Auto-merging packages/react-native/React/Views/RCTModalHostView.m
Auto-merging packages/react-native/React/Views/RCTModalHostViewController.m
CONFLICT (content): Merge conflict in packages/react-native/React/Views/RCTModalHostViewController.m
Auto-merging packages/react-native/React/Views/RCTModalHostViewManager.m
Auto-merging packages/react-native/React/Views/RCTView.m
CONFLICT (content): Merge conflict in packages/react-native/React/Views/RCTView.m
Auto-merging packages/react-native/React/Views/RCTViewManager.h
Auto-merging packages/react-native/React/Views/RCTViewManager.m
Auto-merging packages/react-native/React/Views/RefreshControl/RCTRefreshControl.m
Auto-merging packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
Auto-merging packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm
Auto-merging packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm
CONFLICT (content): Merge conflict in packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm
Auto-merging packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.h
Auto-merging packages/react-native/ReactCommon/react/renderer/components/view/conversions.h
Auto-merging packages/react-native/ReactCommon/react/renderer/components/view/primitives.h
Auto-merging packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec
Auto-merging packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm
Auto-merging packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImagePrimitivesConversions.h
Auto-merging packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h
Auto-merging packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm
Auto-merging packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm
Auto-merging packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
Auto-merging packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h
Auto-merging packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHermesInstance.h
Auto-merging packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.h
Auto-merging packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm
Auto-merging packages/react-native/index.js
Auto-merging packages/react-native/package.json
CONFLICT (content): Merge conflict in packages/react-native/package.json
Auto-merging packages/react-native/react-native.config.js
CONFLICT (content): Merge conflict in packages/react-native/react-native.config.js
Auto-merging packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb
Auto-merging packages/react-native/scripts/cocoapods/helpers.rb
Auto-merging packages/react-native/scripts/cocoapods/utils.rb
Auto-merging packages/react-native/scripts/react-native-xcode.sh
Auto-merging packages/react-native/scripts/react_native_pods.rb
Auto-merging packages/react-native/sdks/hermes-engine/hermes-engine.podspec
CONFLICT (modify/delete): packages/react-native/template/package.json deleted in 143f1ad29874c1e8e9561abae263cb08f4859407 and modified in HEAD.  Version HEAD of packages/react-native/template/package.json left in tree.
Auto-merging packages/rn-tester/Podfile.lock
CONFLICT (content): Merge conflict in packages/rn-tester/Podfile.lock
Auto-merging packages/rn-tester/RNTester/AppDelegate.mm
Auto-merging packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
Auto-merging packages/rn-tester/RNTesterUnitTests/RCTAllocationTests.m
Auto-merging packages/rn-tester/js/components/RNTPressableRow.js
CONFLICT (content): Merge conflict in packages/rn-tester/js/components/RNTPressableRow.js
Auto-merging packages/rn-tester/js/components/RNTesterModuleContainer.js
Auto-merging packages/rn-tester/js/components/RNTesterModuleList.js
CONFLICT (content): Merge conflict in packages/rn-tester/js/components/RNTesterModuleList.js
Auto-merging packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js
Auto-merging packages/rn-tester/js/examples/Border/BorderExample.js
Auto-merging packages/rn-tester/js/examples/Image/ImageExample.js
Auto-merging packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
Auto-merging packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
CONFLICT (content): Merge conflict in packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
Auto-merging packages/rn-tester/js/examples/Pressable/PressableExample.js
Auto-merging packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
Auto-merging packages/rn-tester/js/examples/Snapshot/SnapshotExample.js
Auto-merging packages/rn-tester/js/examples/Text/TextExample.ios.js
Auto-merging packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
Auto-merging packages/rn-tester/js/examples/Touchable/TouchableExample.js
Auto-merging packages/rn-tester/js/types/RNTesterTypes.js
Auto-merging packages/rn-tester/js/utils/RNTesterList.ios.js
Auto-merging packages/rn-tester/package.json
CONFLICT (content): Merge conflict in packages/rn-tester/package.json
Auto-merging packages/virtualized-lists/Lists/VirtualizedList.js
Auto-merging packages/virtualized-lists/Lists/VirtualizedListCellRenderer.js
Auto-merging packages/virtualized-lists/Lists/VirtualizedListProps.js
Auto-merging packages/virtualized-lists/package.json
CONFLICT (content): Merge conflict in packages/virtualized-lists/package.json
Auto-merging scripts/releases-ci/__tests__/publish-npm-test.js
CONFLICT (content): Merge conflict in scripts/releases-ci/__tests__/publish-npm-test.js
Auto-merging scripts/releases-ci/publish-npm.js
CONFLICT (content): Merge conflict in scripts/releases-ci/publish-npm.js
Auto-merging scripts/releases/utils/release-utils.js
CONFLICT (content): Merge conflict in scripts/releases/utils/release-utils.js
Auto-merging yarn.lock
CONFLICT (content): Merge conflict in yarn.lock
Automatic merge failed; fix conflicts and then commit the result.

sbuggay and others added 30 commits August 12, 2024 22:36
Summary:
`RCTSharedApplication().delegate.window.safeAreaInsets.bottom;` causes a crash in Mac Catalyst.

There is already precedent of a `#if TARGET_OS_MACCATALYST` in the same file. This just defaults it to 0 in that case, which looks fine.

## Changelog:

[iOS] [Fixed] - Mac Catalyst crash in RCTRedBox

Reviewed By: shwanton

Differential Revision: D61160503

fbshipit-source-id: 5771ebff88242d9dd4b892d8823e15d1f2307728
Summary:
Pull Request resolved: facebook#45974

This change fixes the E2E tests on the template on main.

There were two issues:
1. we were forcing the project on the 0.75 branch. We now use the current branch name
2. we were replacing all the versions for the dependencies that starts with `react-native` to the monorepo version. The problem is that also `react-native-community` packages starts with `react-native`. We now changes the versions if the dependency name starts with `react-native/`.

## Changelog:
[Internal] - Fix E2E tests on main

Reviewed By: cortinico

Differential Revision: D61122154

fbshipit-source-id: 07210fc9f63e99eac46894f13c7ca5359e186e6c
Summary:
Android fails to build in a pnpm monorepo setup because `yargs` cannot be found:

```
% yarn android
info Installing the app...

> Configure project :app
WARNING: The option setting 'android.jetifier.ignorelist=hermes-android' is experimental.
Signing config for 'release' build type not found; reusing debug config

> Task :react-native-webapis_web-storage:generateCodegenSchemaFromJavaScript FAILED
28 actionable tasks: 6 executed, 22 up-to-date

node:internal/modules/cjs/loader:1148
  throw err;
  ^

Error: Cannot find module 'yargs'
Require stack:
- /~/node_modules/.store/react-native-codegen-virtual-39ff8dcc54/package/lib/cli/combine/combine-js-to-schema-cli.js
    at Module._resolveFilename (node:internal/modules/cjs/loader:1145:15)
    at Module._load (node:internal/modules/cjs/loader:986:27)
    at Module.require (node:internal/modules/cjs/loader:1233:19)
    at require (node:internal/modules/helpers:179:18)
```

## Changelog:

[GENERAL] [FIXED] - Fix codegen failing in a pnpm monorepo because of missing `yargs`

Pull Request resolved: facebook#45994

Test Plan: Tested in microsoft/rnx-kit#3290

Reviewed By: dmytrorykun

Differential Revision: D61201420

Pulled By: cortinico

fbshipit-source-id: aac3704ae7f200db827b14c8362f83a5e66ad08e
Summary:
Pull Request resolved: facebook#45637

This breaks when `setAndroidLayoutDirection` is enabled.

Changelog: [Internal]

Reviewed By: NickGerleman

Differential Revision: D60143747

fbshipit-source-id: 6f1a9ea1cf95f9be0451460201e49b4ce80ce204
…lement_DEPRECATED (facebook#45998)

Summary:
Pull Request resolved: facebook#45998

The exact `React.Element` type is deprecated and will be removed in a future version of Flow.

Changelog: [Internal]

Reviewed By: gkz

Differential Revision: D61205640

fbshipit-source-id: a029a3a46c7d8d9f94b0b931b991b2ce461151b2
Summary:
Pull Request resolved: facebook#45984

A few methods were not synchronized, exposing members like `mTagsToViews` to potential out-of-sync access.
Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D61151447

fbshipit-source-id: 696dbec559968cdfc7c6d2e662f4c8f3471039e1
Summary:
Pull Request resolved: facebook#46000

Changelog: [Internal] - Update `react-native/debugger-frontend` from 7b143e5...c98a122

Resyncs `react-native/debugger-frontend` from GitHub - see `rn-chrome-devtools-frontend` [changelog](facebookexperimental/rn-chrome-devtools-frontend@7b143e5...c98a122).

Reviewed By: robhogan

Differential Revision: D61208000

fbshipit-source-id: 8884d7946f4f62bbfe48e3fddc6c873f952d826c
Summary:
Pull Request resolved: facebook#46005

The RCTDevLoadingView is clipped in Mac Catalyst, hiding half of it under the toolbar. This change maintains the behavior on iOS of extending past the dynamic island.

{F1803665273}

Changelog: [Internal]

Reviewed By: shwanton

Differential Revision: D61209780

fbshipit-source-id: 6c9c572a9e47a8caf191c40fb53c4a7d43b64281
Summary:
Pull Request resolved: facebook#46011

Backing out D58561775 in the meantime while we are trying to do proper fix in Hermes engine D61058869

Changelog: [Internal]
Temporarily revert this diff facebook#44900 while we wait for facebook#45966 to land

Reviewed By: makovkastar

Differential Revision: D61246120

fbshipit-source-id: 8c205efe9d29cd34f24676c4a48d55f0493d73ab
…positories (facebook#45566)

Summary:
At OEBB we currently facing an issue we're not able to use our mirrored git repositories for third-party podspecs. This is due to the fact podspecs contain hardcoded git repository urls. With this change we could specify urls to our mirrored git repositories.

## Changelog:

[IOS] [ADDED] Enable third-party podspec sources to be fetched from mirrored git repositories

Pull Request resolved: facebook#45566

Test Plan:
```bash
# Define env vars for git mirrors

export FMT_GIT_URL="https://my-git-host.com/my-mirrored-repo.git"
export GLOG_GIT_URL="https://my-git-host.com/my-mirrored-repo.git"
export FOLLY_GIT_URL="https://my-git-host.com/my-mirrored-repo.git"
export DOUBLE_CONVERSION_GIT_URL="https://my-git-host.com/my-mirrored-repo.git"
export BOOST_GIT_URL="https://my-git-host.com/my-mirrored-repo.git"

# Pod install command run from ios app folder
pod install
```

Reviewed By: cortinico

Differential Revision: D61209204

Pulled By: cipolleschi

fbshipit-source-id: b19f7b8262c860b5c4d553732da50c9bd0373397
Summary:
Pull Request resolved: facebook#45873

I'm removing the Gradle dependency on OSS SoLoader and stubbing it with our own implementation.
This will allow us to implement merging of further .so libraries and

As Fresco also depends on SoLoader, I had to stub the `NativeLoader` dependency as well.

Changelog:
[Android] [Breaking] - Do not depend on OSS SoLoader anymore and do not expose Fresco `api` dependency.

Reviewed By: mdvacca

Differential Revision: D60652007

fbshipit-source-id: 6e70a5c37ba9337fbe8772e192b886ba4693c7f1
…6004)

Summary:
Pull Request resolved: facebook#46004

This is the first library I'm moving over inside libreactnative.so

Changelog:
[Android] [Changed] - Move libreact_newarchdefaults.so inside libreactnative.so

Reviewed By: cipolleschi

Differential Revision: D61211104

fbshipit-source-id: 2526395a246df9ebf6387ca434e07b4ed4484f1e
Summary:
Pull Request resolved: facebook#46003

Another library going inside libreactnative.so

Changelog:
[Android] [Changed] - Move libmapbufferjni.so inside libreactnative.so

Reviewed By: cipolleschi

Differential Revision: D61211105

fbshipit-source-id: 38fce9ff9025fc6d2cd9eff3ee57303babed8852
Summary:
Pull Request resolved: facebook#46016

Wrapping the JavaScriptException with a RuntimException means we lose JS specific metadata on the top-level exceptions, and can break categorization in crash-reporting tools.

We could also use the same logic as [DefaultJSExceptionHandler](https://github.com/facebook/react-native/blob/main/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultJSExceptionHandler.java) but that doesn't seem to be required for Kotlin.

Changelog: [Internal]

Reviewed By: cortinico

Differential Revision: D61261515

fbshipit-source-id: fa85c8818834905759cbc984ea3c45403eb87e8c
…5982)

Summary:
Pull Request resolved: facebook#45982

Changelog: [Internal]

Recently `src/private/renderer/errorhandling/ErrorHandlers.js` started showing up in some error stack traces, making LogBox less readable. This diff ensures we collapse these extra stack frames by default (as well as hide them in Fusebox, etc).

Reviewed By: hoxyq

Differential Revision: D61128294

fbshipit-source-id: 2ebcb47265aaf3281b669ed022c29978167f3e81
Summary:
Changelog for 0.75.0

## Changelog:

[Internal] - Changelog for 0.75.0

Pull Request resolved: facebook#45814

Test Plan: N/A

Reviewed By: cortinico

Differential Revision: D60446949

Pulled By: cipolleschi

fbshipit-source-id: e26e3486e3c9d224678f3df913368fa280c2e431
Differential Revision:
D60143747

Original commit changeset: 6f1a9ea1cf95

Original Phabricator Diff: D60143747

fbshipit-source-id: c07088c4591ca344dbdc31c9f86b1a44a575c0ae
Summary:
Pull Request resolved: facebook#45927

This was attempted earlier in the year, and was unsuccessful because HelloWorld had a hidden dependency on this.

Changelog: [General][Breaking] Projects that intend to use the community CLI will now have to declare that dependency instead of transitively having the react-native package handle this.

Reviewed By: GijsWeterings

Differential Revision: D60898346

fbshipit-source-id: 1d62615f718e06caf684f48ecfaf610bf1f51f8e
Summary:
This PR solves [issue](facebook#45958) with displaying irregular borders on Fabric. The same issue appears on the old architecture, but I am having a problems there, so I am pushing this fix for now.

The problem is solved by decoupling `backgroundColor` from `borderLayer` and setting `zPosition` on `borderLayer` to `1024.0f`, so that the border is always in front of the layer. The `zPosition` is compared within a layer, so it shouldn't impact outside components. I would love to hear your opinion if there is a case in which this could break.

## Changelog:

[IOS] [FIXED] - changed border display

Pull Request resolved: facebook#45973

Test Plan:
I've checked that on RNTester Images.

![border-issues-screen](https://github.com/user-attachments/assets/e12add82-8016-4c42-833d-f396307e9423)

Reviewed By: joevilches

Differential Revision: D61119409

Pulled By: cipolleschi

fbshipit-source-id: a88912061c7a8d72eec4f4092adb076dd6ae511e
Summary:
Pull Request resolved: facebook#46023

Minimizing and restoring a Mac Catalyst app causes an `interfaceOrientationDidChange` which causes a downstream crash on `application.delegate.window`.

There doesn't seem to be a clean way to get if an app is fullscreen in Mac Catalyst, so just no-oping for now.

Changelog: [Internal]

Reviewed By: shwanton

Differential Revision: D61253706

fbshipit-source-id: 73d260366adcc74e88f43f256cc5aff8a6e3ef71
Summary:
Pull Request resolved: facebook#46025

Changelog:
[General][Fixed] - Change RawPropsParser logs from ERROR level to WARNING

Reviewed By: christophpurrer

Differential Revision: D61304854

fbshipit-source-id: bc16df4916a54cb7c1fa57f359eab3d9eed4e2f4
Summary:
## History
1. Originally landed in D60138415
2. Reverted in D60232011 (it broke ios oss builds)

## Motivation
In bridgeless, we want to configure the error handling of runtime scheduler. So that we can route those errors to the C++ error handling pipeline, when necessary.

Changelog: [Internal]

Reviewed By: rubennorte

Differential Revision: D60477342

fbshipit-source-id: f14e20d7aff39e0fee42918567ccc6e685674134
Summary:
If any fatal js error is caught in c++, just route it through js error handler.

Then, make js error handler call into the right pipeline:
1. After the js pipeline is ready: Route the errors through the js pipeline
2. Otherwise: Route errors through the c++ pipeline.

Changelog: [Internal]

Reviewed By: javache

Differential Revision: D60138417

fbshipit-source-id: 24c466ffadbd14a9e9a5571548f3d34d2f406a8d
Summary:
If a fatal error is caught in js, and the js pipeline isn't ready, route it through the c++ pipeline.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D60138414

fbshipit-source-id: 333e38e2b904d6434a88469816e39bf1b9d0bc3f
Summary:
Pull Request resolved: facebook#45617

This isn't necessary.

RuntimeScheduler will catch and report via js error handler.

Changelog: [Internal]

Reviewed By: alanleedev

Differential Revision: D60139055

fbshipit-source-id: 511f384ede71d88b81ef5c031fa67b1fb03f7631
Summary:
Fixes build error like https://github.com/facebook/react-native/actions/runs/10398775597/job/28797041872. cc RSNara

## Changelog:

[IOS] [FIXED] - Add missing pod dependency of jserrorhandler

Pull Request resolved: facebook#46030

Test Plan: CI green.

Reviewed By: cortinico

Differential Revision: D61329173

Pulled By: cipolleschi

fbshipit-source-id: c7dc6d7af3b57f748ae3464d9f4231ff4fb36e63
Summary:
Pull Request resolved: facebook#46034

The create release workflow was not working properly for 0.75:

* the latest tag was not pushed because we were using the wrong input
* the latest tag was not deleted because we were not fetching all the tags
* the create release job 'dry-run' defaults to false, which is a bit dangerous

This change is a backport from 0.75 to main of these changes.

## Changelog
[Internal] - Make sure that the Latest tag is properly pushed to github while releasing

Reviewed By: cortinico

Differential Revision: D61331247

fbshipit-source-id: 89bf0698c45ec6c766e25b11599dbe926d8a6297
Summary:
Add changelog for 0.75.1

## Changelog:
[Internal] - Add changelog

Pull Request resolved: facebook#46038

Test Plan: N/A

Reviewed By: cortinico

Differential Revision: D61333096

Pulled By: cipolleschi

fbshipit-source-id: 19ba0bce60056be12d1b0427939c5896c22e215b
Summary:
Pull Request resolved: facebook#46040

The URL to dispatch the workflow was not correct, see [0].

## Changelog: [Internal]

[0] https://docs.github.com/en/rest/actions/workflows?apiVersion=2022-11-28#create-a-workflow-dispatch-event

## Internal:

For S441191, see the job launched:
- https://github.com/react-native-community/template/actions/runs/10404141179/job/28811993693

 {F1806960111}

Reviewed By: cipolleschi

Differential Revision: D61333084

fbshipit-source-id: 62b20d792b9c667b3ee80d6d446423a6d24a67c2
Summary:
Removed UIReturnKeyDefault as it caused bug when there wasn't any type.

## Changelog:

[IOS] [REMOVED]: UIReturnKeyDefault

<!-- Help reviewers and the release process by writing your own changelog entry.

Pick one each for the category and type tags:

[ANDROID|GENERAL|IOS|INTERNAL] [BREAKING|ADDED|CHANGED|DEPRECATED|REMOVED|FIXED|SECURITY] - Message

For more details, see:
https://reactnative.dev/contributing/changelogs-in-pull-requests

Pull Request resolved: facebook#46020

Reviewed By: christophpurrer

Differential Revision: D61277058

Pulled By: cipolleschi

fbshipit-source-id: 18349c49b05d492a2c2ed5713af3ceb6d3728e70
@Saadnajmi
Copy link
Collaborator Author

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Saadnajmi Saadnajmi force-pushed the 0.76-merge branch 2 times, most recently from c59cc05 to 5fd3b09 Compare October 19, 2024 19:23
@Saadnajmi Saadnajmi marked this pull request as ready for review October 20, 2024 17:21
@Saadnajmi Saadnajmi requested a review from a team as a code owner October 20, 2024 17:21
@Saadnajmi Saadnajmi changed the title [Draft] Merge up to 0.76-stable branch cut Merge up to 0.76-stable branch cut Oct 21, 2024
@Saadnajmi Saadnajmi force-pushed the 0.76-merge branch 2 times, most recently from 5a06df8 to d57428f Compare October 21, 2024 04:23
@Saadnajmi Saadnajmi enabled auto-merge October 24, 2024 22:27
@Saadnajmi Saadnajmi disabled auto-merge October 24, 2024 22:27
@Saadnajmi Saadnajmi enabled auto-merge October 24, 2024 22:27
@Saadnajmi Saadnajmi merged commit 42a1387 into microsoft:main Oct 24, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.