Skip to content

[pull] main from expo:main#760

Merged
pull[bot] merged 7 commits intocode:mainfrom
expo:main
Apr 9, 2026
Merged

[pull] main from expo:main#760
pull[bot] merged 7 commits intocode:mainfrom
expo:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Apr 9, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

zoontek and others added 7 commits April 9, 2026 17:53
# Why

This file is unused, as Expo go targets SDK 24+

# How

- Merge both `styles.xml`files

# Test Plan

<!--
Please describe how you tested this change and how a reviewer could
reproduce your test, especially if this PR does not include automated
tests! If possible, please also provide terminal output and/or
screenshots demonstrating your test/reproduction.
-->

# Checklist

<!--
Please check the appropriate items below if they apply to your diff.
-->

- [ ] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [ ] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
# Why

Part 3 of the SwiftUI state control implementation. See #44214 for full
description and diagram.
<!--
Please describe the motivation for this PR, and link to relevant GitHub
issues, forums posts, or feature requests.
-->

# How

See #44214 
<!--
How did you build this feature or fix this bug and why?
-->

# Test Plan

See #44214 
<!--
Please describe how you tested this change and how a reviewer could
reproduce your test, especially if this PR does not include automated
tests! If possible, please also provide terminal output and/or
screenshots demonstrating your test/reproduction.
-->

# Checklist

<!--
Please check the appropriate items below if they apply to your diff.
-->

- [x] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [x] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [x] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
# Why

<!--
Please describe the motivation for this PR, and link to relevant GitHub
issues, forums posts, or feature requests.
-->

Fix ENG-20544 ENG-20543

# How

- Update screenshots in all Billing docs.

**`docs/pages/billing/manage.mdx`**

- Update the navigation instructions in ~~both Organization and Personal
account tabs~~ to reference **Subscription** instead of **Organization
settings** / **Account settings** and generalize the information since
both account type now have same settings path.

**`docs/pages/billing/invoices-and-receipts.mdx`**

- Update the Receipts navigation instruction to reference
**Subscription** instead of **Account settings** or **Organization
settings**.

**`docs/pages/billing/faq.mdx`**

- Rewrite the "wrong account" step to reference the account switcher at
the top of the EAS dashboard sidebar, since there is no longer an
**Account** section in the navigation menu.
- Update "click **Manage billing information**" to "in the right
sidebar, click **Manage billing**" in two places, to match the new
control location and shorter label.

**`docs/pages/billing/usage-based-pricing.mdx`**

- Remove the stale "under your account's settings:" qualifier from the
Email notifications instruction.
# Test Plan

See Billing docs in preview.

# Checklist

<!--
Please check the appropriate items below if they apply to your diff.
-->

- [ ] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [ ] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [x] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
…ilds (#44645)

# Why

When using `expo-updates` inside a brownfield xcframework build,
expo-updates is silently disabled at runtime. This happens because:

1. `Expo.plist` lookup fails because
`UpdatesConfig.configDictionaryWithExpoPlist` reads the updates
configuration exclusively from `Bundle.main` and in a brownfield
xcframework, `Bundle.main` is the host app's bundle

2. `Expo.plist` is not included in the framework, the brownfield config
plugin creates the framework target, but never adds `Expo.plist` to its
resource

# How

Added a framework bundle fallback in `configDictionaryWithExpoPlist`
that tries `Bundle.main` first (, then falls back to `Bundle(for:
UpdatesConfig.self)` which resolves to the framework bundle in
brownfield builds. This follows the same pattern already used by
`EmbeddedAppLoader` and `getRuntimeVersion`

On the Brownfield side, added a `PBXResourcesBuildPhase` to the
brownfield framework target that includes `Expo.plist` from the main
target's Supporting directory.

# Test Plan

`npx expo-brownfield -p ios`

# Checklist

<!--
Please check the appropriate items below if they apply to your diff.
-->

- [ ] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [ ] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
# Why

The example YAML snippet in the "Automate workflows with GitHub events"
section had `jobs` indented under `on`, making it an invalid workflow.

<img width="564" height="67" alt="Screenshot 2026-04-09 at 12 17 48 PM"
src="https://github.com/user-attachments/assets/33c908c2-1b60-4155-b92b-ee0fa1b65b7b"
/>

# How
Remove indentation from `jobs` and its children so it's a top-level key
alongside `name` and `on`.

# Test Plan
Verified the YAML in the code block is now valid by confirming `name`,
`on`, and `jobs` are all at the root indentation level.

# Checklist

<!--
Please check the appropriate items below if they apply to your diff.
-->

- [ ] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [ ] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
…type property (#44651)

# Why

Related #44542
Related #44569
Related #44576

The update removes the previously deprecated `jsEngine` property.

# How

Removes `jsEngine` type references, since this has been removed from
`@expo/config-types`.

Not adding a changelog entry, since none of these changes are
user-facing.

# Test Plan

CI

# Checklist

- [ ] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [x] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
@pull pull bot locked and limited conversation to collaborators Apr 9, 2026
@pull pull bot added the ⤵️ pull label Apr 9, 2026
@pull pull bot merged commit 27adc92 into code:main Apr 9, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants