diff --git a/docsite/docs/contributing/versioning.md b/docsite/docs/contributing/versioning.md index ccb792f581e3..208f0a722228 100644 --- a/docsite/docs/contributing/versioning.md +++ b/docsite/docs/contributing/versioning.md @@ -5,12 +5,12 @@ sidebar_position: 3 # Versioning -React Native macOS uses [NX Release](https://nx.dev/features/manage-releases) to control its versioning. Our minor releases are synced to upstream releases of React Native, but our patch versions may differ. For instance, `react-native-macos@0.78.5` corresponds to `react-native@0.78.2`. You can find out how we sync our releases by looking at our packages' [react-native peer dependency](https://github.com/microsoft/react-native-macos/blob/8f8fd013d2a36cf2635dbcef76970119f7672b51/packages/react-native/package.json#L105). +React Native macOS uses [Changesets](https://github.com/changesets/changesets) to control its versioning. Our minor releases are synced to upstream releases of React Native, but our patch versions may differ. For instance, `react-native-macos@0.78.5` corresponds to `react-native@0.78.2`. You can find out how we sync our releases by looking at our packages' [react-native peer dependency](https://github.com/microsoft/react-native-macos/blob/8f8fd013d2a36cf2635dbcef76970119f7672b51/packages/react-native/package.json#L105). ## How to push a new patch release -If you have a PR you'd like to be included in a new release, you can add a [version plan](https://nx.dev/recipes/nx-release/file-based-versioning-version-plans#file-based-versioning-version-plans) to it. +If you have a PR you'd like to be included in a new release, you can add a [Changeset](https://github.com/changesets/changesets/blob/main/docs/adding-a-changeset.md) to it. ```shell -yarn nx release plan --message 'fix some bug' --only-touched=false patch +yarn change ``` \ No newline at end of file diff --git a/docsite/docs/releases/patch-release.md b/docsite/docs/releases/patch-release.md index 292c1508cfac..b449028d911a 100644 --- a/docsite/docs/releases/patch-release.md +++ b/docsite/docs/releases/patch-release.md @@ -3,20 +3,20 @@ sidebar_label: 'Sync to a new patch release' sidebar_position: 2 --- -# Sync to a new upstream React Native patch release +# Sync to a new upstream React Native patch release -Let's assume that we are trying to release a new patch release of `0.76.x`. Let's also assume that the latest commit in React Native's `0.76-stable` branch is the release commit we want to sync to. If not, `git merge` to an earlier commit. +Let's assume that we are trying to release a new patch release of `0.76.x`. Let's also assume that the latest commit in React Native's `0.76-stable` branch is the release commit we want to sync to. If not, `git merge` to an earlier commit. Roughly, run the following commands to: - Sync to the latest commit in React Native's 0.76-stable branch. - Merge that branch into yours -- Add a version plan +- Add a Changeset ```shell git switch -c 0.76/release upstream/0.76-stable git merge facebook/0.76-stable -yarn nx release plan --message 'Sync to upstream React Native 0.76.x release' --only-touched=false patch +yarn change ``` Remember to update the peer dependency in `packages/react-native` for React Native macOS to the version you have merged to.