Skip to content

Branch cut updates - #3645

Merged
Simek merged 1 commit into
react:mainfrom
fortmarek:fortmarek/branch-cut-updates
May 25, 2023
Merged

Branch cut updates#3645
Simek merged 1 commit into
react:mainfrom
fortmarek:fortmarek/branch-cut-updates

Conversation

@fortmarek

@fortmarekfortmarek commented Mar 24, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor
  • Updating the release docs after 0.72 branch cut off and RC0 release with the new steps to update and align packages on the new monorepo setup
  • Moving the wiki page that explains the new utility commands for updating packages to the website. The wiki page should link to the website documentation once this PR is merged.

@netlify

netlifyBot commented Mar 24, 2023•
edited
Loading

Copy link
Copy Markdown

✅ Deploy Preview for react-native ready!

NameLink
🔨 Latest commit9c1cfdc
🔍 Latest deploy loghttps://app.netlify.com/sites/react-native/deploys/646f0e41a8bda50008633eb4
😎 Deploy Previewhttps://deploy-preview-3645--react-native.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@fortmarek
fortmarekforce-pushed the fortmarek/branch-cut-updates branch from b9c4b29 to 6da53c0CompareMarch 24, 2023 13:42
@fortmarek
fortmarekforce-pushed the fortmarek/branch-cut-updates branch 3 times, most recently from 601402f to 7bb8dd2CompareApril 3, 2023 09:45
@fortmarek
fortmarek requested a review from hoxyqApril 3, 2023 09:45
@fortmarek
fortmarek marked this pull request as ready for review April 3, 2023 09:46
hoxyq
hoxyq reviewed Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md Outdated
The packages in the `react-native` monorepo should be always one minor version ahead of the latest or RC version. Once you're done with releasing the initial RC0, you should:

- Create a new branch in `react-native` from `main` in your own fork.
- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.

@hoxyqhoxyqApr 3, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
- Run `npm run bump-all-updated-packages -- --release-branch-cutoff` to bump the minor versions of all packages.

For npm we need to add explicit --, because node accepts arguments in a form like --<arg>

@hoxyqhoxyqApr 3, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true for yarn, though. So we can change in to yarn bump-all-updated-packages --release-branch-cutoff or provide both variants.

hoxyq
hoxyq reviewed Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md Outdated

#### How to execute

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`

@hoxyqhoxyqApr 3, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages -- --release-branch-cutoff`

@fortmarekfortmarekApr 3, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local

@hoxyqhoxyqApr 3, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local

Can you please update examples of executing this command with yarn? I don't have a strong opinion on if we should include both, seems pretty straightforward, but definitely better for it to be either yarn or npm everywhere

@fortmarekfortmarekApr 3, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, done 👍

hoxyq
hoxyq reviewed Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md Outdated

- Add and commit the extra file that got created at `sdks/hermes/.hermesversion`.

- Update packages in the monorepo by running `npm run bump-all-updated-packages`. All the package bumps should be a patch. Read more about the script and how they work [here](./release-updating-packages).

@hoxyqhoxyqApr 3, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add one more sentence on why we need to do it?

Maybe something like "We need to publish the latest available changes in our code, so they will be included in a new RC"

@fortmarek
fortmarekforce-pushed the fortmarek/branch-cut-updates branch 3 times, most recently from d8f24c7 to fe8da5eCompareApril 3, 2023 11:05
kelset
kelset reviewed Apr 6, 2023
View reviewed changes

@kelsetkelset left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff, thanks for working on this @fortmarek! I've left a few suggestions improvements and one main change that I think will make the guide more streamlined.

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md Outdated
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md Outdated
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md Outdated
- Update packages in the monorepo by running `yarn bump-all-updated-packages`. All the package bumps should be a patch. We need to publish the latest package changes, so they will be included in a new RC. Read more about the script and how they work [here](./release-updating-packages).
- Push the commit created by the previous command to the `0.x-stable` branch.

### 2. Push the branch and test the current changes

@kelsetkelsetApr 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that in this guide we only push the branch up at this step 2.

Maybe let's change this second step to be part of step 1, and separate the Hermes bump into its own step and the bump all packages into its own step too?

@fortmarekfortmarekMay 18, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created separate steps for Hermes and monorepo packages bumps.

I kept this step as a separate one that we should still run only after Hermes + packages bumps as I don't think it's necessary to push multiple times? Or do you see the workflow as:

  • Create new branch, push its current state
  • Hermes bump
  • monorepo bumps
  • push the changes again

@kelsetkelsetMay 24, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md Outdated
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md Outdated
Comment threadwebsite/contributing/release-updating-packages.md Outdated
kelset
kelset reviewed Apr 6, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md Outdated
@fortmarek
fortmarekforce-pushed the fortmarek/branch-cut-updates branch 2 times, most recently from 19c5917 to bc4a88bCompareMay 18, 2023 18:22
@fortmarek
fortmarek requested a review from kelsetMay 18, 2023 18:22
@kelset

kelset commented May 24, 2023

Copy link
Copy Markdown
Contributor

LGTM thanks @fortmarek - can you just fix the lint error?

Then @Simek this can be merged 👍

@fortmarek
fortmarekforce-pushed the fortmarek/branch-cut-updates branch from bc4a88b to 9c1cfdcCompareMay 25, 2023 07:29
Simek
Simek reviewed May 25, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md
Comment on lines +6 to +7
This page contains relevant information about how to update packages in the `react-native` [monorepo](https://github.com/react-native-community/discussions-and-proposals/pull/480).

@SimekSimekMay 25, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if linking RFC add anything useful for the page context.

Simek
Simek approved these changes May 25, 2023
View reviewed changes

@SimekSimek left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit about RFC link, other than that LGTM! 👍

Let's cross-check with someone form Meta before landing this tho.

Simek

This comment was marked as duplicate.

Sign in to view

@Simek
Simek requested review from cortinico and removed request for kelsetMay 25, 2023 08:20
@kelset

kelset commented May 25, 2023

Copy link
Copy Markdown
Contributor

@Simek for the Meta approval, @hoxyq is from Meta and he wrote the original doc that we're importing, so we can already go ahead without needing Nicola ;)

@Simek
Simek merged commit 5897bef into react:mainMay 25, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SimekSimekSimek approved these changes
@cortinicocortinicoAwaiting requested review from cortinico
+2 more reviewers
@kelsetkelsetkelset left review comments
@hoxyqhoxyqhoxyq approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

CLA Signedp: shopifyPartner

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@fortmarek@kelset@Simek@hoxyq@facebook-github-bot
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Branch cut updates by fortmarek · Pull Request #3645 · react/react-native-website · GitHub
Skip to content
Branch cut updates - #3645
Merged
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
May 25, 2023
Merged
Branch cut updates#3645
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
Conversation
@fortmarek
@fortmarekfortmarek
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
  • Updating the release docs after 0.72 branch cut off and RC0 release with the new steps to update and align packages on the new monorepo setup
  • Moving the wiki page that explains the new utility commands for updating packages to the website. The wiki page should link to the website documentation once this PR is merged.
@netlify
netlifyBot
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

✅ Deploy Preview for react-native ready!
NameLink
🔨 Latest commit9c1cfdc
🔍 Latest deploy loghttps://app.netlify.com/sites/react-native/deploys/646f0e41a8bda50008633eb4
😎 Deploy Previewhttps://deploy-preview-3645--react-native.netlify.app
📱 Preview on mobile
 Toggle QR Code... 

QR Code

Use your smartphone camera to open QR code link.
To edit notification comments on pull requests, go to your Netlify site settings.
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
b9c4b29 to
6da53c0CompareMarch 24, 2023 13:42
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
601402f to
7bb8dd2CompareApril 3, 2023 09:45
@fortmarek
fortmarek
requested a review
from hoxyqApril 3, 2023 09:45
@fortmarek
fortmarek
marked this pull request as ready for review
April 3, 2023 09:46
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

The packages in the `react-native` monorepo should be always one minor version ahead of the latest or RC version. Once you're done with releasing the initial RC0, you should:

- Create a new branch in `react-native` from `main` in your own fork.
- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
@hoxyqhoxyqApr 3, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
- Run `npm run bump-all-updated-packages -- --release-branch-cutoff` to bump the minor versions of all packages.
For npm we need to add explicit --, because node accepts arguments in a form like --<arg>
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true for yarn, though. So we can change in to yarn bump-all-updated-packages --release-branch-cutoff or provide both variants.
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md
Outdated


#### How to execute

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages -- --release-branch-cutoff`
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
Can you please update examples of executing this command with yarn? I don't have a strong opinion on if we should include both, seems pretty straightforward, but definitely better for it to be either yarn or npm everywhere
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, done 👍
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated


- Add and commit the extra file that got created at `sdks/hermes/.hermesversion`.

- Update packages in the monorepo by running `npm run bump-all-updated-packages`. All the package bumps should be a patch. Read more about the script and how they work [here](./release-updating-packages).
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add one more sentence on why we need to do it?
Maybe something like "We need to publish the latest available changes in our code, so they will be included in a new RC"
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
d8f24c7 to
fe8da5eCompareApril 3, 2023 11:05
kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
@kelsetkelset
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff, thanks for working on this @fortmarek! I've left a few suggestions improvements and one main change that I think will make the guide more streamlined.
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

- Update packages in the monorepo by running `yarn bump-all-updated-packages`. All the package bumps should be a patch. We need to publish the latest package changes, so they will be included in a new RC. Read more about the script and how they work [here](./release-updating-packages).
- Push the commit created by the previous command to the `0.x-stable` branch.

### 2. Push the branch and test the current changes
@kelsetkelsetApr 6, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that in this guide we only push the branch up at this step 2.
Maybe let's change this second step to be part of step 1, and separate the Hermes bump into its own step and the bump all packages into its own step too?
@fortmarekfortmarekMay 18, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created separate steps for Hermes and monorepo packages bumps.
I kept this step as a separate one that we should still run only after Hermes + packages bumps as I don't think it's necessary to push multiple times? Or do you see the workflow as:
  • Create new branch, push its current state
  • Hermes bump
  • monorepo bumps
  • push the changes again
@kelsetkelsetMay 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-updating-packages.md
Outdated

kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
2 times, most recently
from
19c5917 to
bc4a88bCompareMay 18, 2023 18:22
@fortmarek
fortmarek
requested a review
from kelsetMay 18, 2023 18:22
@kelset
kelset
commented
May 24, 2023

Copy link


Copy Markdown

Contributor
LGTM thanks @fortmarek - can you just fix the lint error?
Then @Simek this can be merged 👍
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
bc4a88b to
9c1cfdcCompareMay 25, 2023 07:29
Simek
Simek
reviewed
May 25, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md

Comment on lines

+6
 to 
+7

This page contains relevant information about how to update packages in the `react-native` [monorepo](https://github.com/react-native-community/discussions-and-proposals/pull/480).

@SimekSimekMay 25, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if linking RFC add anything useful for the page context.
Simek
Simek
approved these changes
May 25, 2023
View reviewed changes
@SimekSimek
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit about RFC link, other than that LGTM! 👍
Let's cross-check with someone form Meta before landing this tho.
Simek

This comment was marked as duplicate.

Sign in to view
@Simek
Simek
requested review from
cortinico
and removed request for
kelsetMay 25, 2023 08:20
@kelset
kelset
commented
May 25, 2023

Copy link


Copy Markdown

Contributor
@Simek for the Meta approval, @hoxyq is from Meta and he wrote the original doc that we're importing, so we can already go ahead without needing Nicola ;)
@Simek
Simek
merged commit 5897bef
into
react:mainMay 25, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SimekSimekSimek approved these changes
@cortinicocortinicoAwaiting requested review from cortinico

+2 more reviewers

@kelsetkelsetkelset left review comments
@hoxyqhoxyqhoxyq approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

CLA Signedp: shopifyPartner

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@fortmarek@kelset@Simek@hoxyq@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Branch cut updates by fortmarek · Pull Request #3645 · react/react-native-website · GitHub
Skip to content
Branch cut updates - #3645
Merged
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
May 25, 2023
Merged
Branch cut updates#3645
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
Conversation
@fortmarek
@fortmarekfortmarek
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
  • Updating the release docs after 0.72 branch cut off and RC0 release with the new steps to update and align packages on the new monorepo setup
  • Moving the wiki page that explains the new utility commands for updating packages to the website. The wiki page should link to the website documentation once this PR is merged.
@netlify
netlifyBot
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

✅ Deploy Preview for react-native ready!
NameLink
🔨 Latest commit9c1cfdc
🔍 Latest deploy loghttps://app.netlify.com/sites/react-native/deploys/646f0e41a8bda50008633eb4
😎 Deploy Previewhttps://deploy-preview-3645--react-native.netlify.app
📱 Preview on mobile
 Toggle QR Code... 

QR Code

Use your smartphone camera to open QR code link.
To edit notification comments on pull requests, go to your Netlify site settings.
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
b9c4b29 to
6da53c0CompareMarch 24, 2023 13:42
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
601402f to
7bb8dd2CompareApril 3, 2023 09:45
@fortmarek
fortmarek
requested a review
from hoxyqApril 3, 2023 09:45
@fortmarek
fortmarek
marked this pull request as ready for review
April 3, 2023 09:46
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

The packages in the `react-native` monorepo should be always one minor version ahead of the latest or RC version. Once you're done with releasing the initial RC0, you should:

- Create a new branch in `react-native` from `main` in your own fork.
- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
@hoxyqhoxyqApr 3, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
- Run `npm run bump-all-updated-packages -- --release-branch-cutoff` to bump the minor versions of all packages.
For npm we need to add explicit --, because node accepts arguments in a form like --<arg>
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true for yarn, though. So we can change in to yarn bump-all-updated-packages --release-branch-cutoff or provide both variants.
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md
Outdated


#### How to execute

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages -- --release-branch-cutoff`
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
Can you please update examples of executing this command with yarn? I don't have a strong opinion on if we should include both, seems pretty straightforward, but definitely better for it to be either yarn or npm everywhere
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, done 👍
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated


- Add and commit the extra file that got created at `sdks/hermes/.hermesversion`.

- Update packages in the monorepo by running `npm run bump-all-updated-packages`. All the package bumps should be a patch. Read more about the script and how they work [here](./release-updating-packages).
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add one more sentence on why we need to do it?
Maybe something like "We need to publish the latest available changes in our code, so they will be included in a new RC"
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
d8f24c7 to
fe8da5eCompareApril 3, 2023 11:05
kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
@kelsetkelset
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff, thanks for working on this @fortmarek! I've left a few suggestions improvements and one main change that I think will make the guide more streamlined.
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

- Update packages in the monorepo by running `yarn bump-all-updated-packages`. All the package bumps should be a patch. We need to publish the latest package changes, so they will be included in a new RC. Read more about the script and how they work [here](./release-updating-packages).
- Push the commit created by the previous command to the `0.x-stable` branch.

### 2. Push the branch and test the current changes
@kelsetkelsetApr 6, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that in this guide we only push the branch up at this step 2.
Maybe let's change this second step to be part of step 1, and separate the Hermes bump into its own step and the bump all packages into its own step too?
@fortmarekfortmarekMay 18, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created separate steps for Hermes and monorepo packages bumps.
I kept this step as a separate one that we should still run only after Hermes + packages bumps as I don't think it's necessary to push multiple times? Or do you see the workflow as:
  • Create new branch, push its current state
  • Hermes bump
  • monorepo bumps
  • push the changes again
@kelsetkelsetMay 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-updating-packages.md
Outdated

kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
2 times, most recently
from
19c5917 to
bc4a88bCompareMay 18, 2023 18:22
@fortmarek
fortmarek
requested a review
from kelsetMay 18, 2023 18:22
@kelset
kelset
commented
May 24, 2023

Copy link


Copy Markdown

Contributor
LGTM thanks @fortmarek - can you just fix the lint error?
Then @Simek this can be merged 👍
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
bc4a88b to
9c1cfdcCompareMay 25, 2023 07:29
Simek
Simek
reviewed
May 25, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md

Comment on lines

+6
 to 
+7

This page contains relevant information about how to update packages in the `react-native` [monorepo](https://github.com/react-native-community/discussions-and-proposals/pull/480).

@SimekSimekMay 25, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if linking RFC add anything useful for the page context.
Simek
Simek
approved these changes
May 25, 2023
View reviewed changes
@SimekSimek
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit about RFC link, other than that LGTM! 👍
Let's cross-check with someone form Meta before landing this tho.
Simek

This comment was marked as duplicate.

Sign in to view
@Simek
Simek
requested review from
cortinico
and removed request for
kelsetMay 25, 2023 08:20
@kelset
kelset
commented
May 25, 2023

Copy link


Copy Markdown

Contributor
@Simek for the Meta approval, @hoxyq is from Meta and he wrote the original doc that we're importing, so we can already go ahead without needing Nicola ;)
@Simek
Simek
merged commit 5897bef
into
react:mainMay 25, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SimekSimekSimek approved these changes
@cortinicocortinicoAwaiting requested review from cortinico

+2 more reviewers

@kelsetkelsetkelset left review comments
@hoxyqhoxyqhoxyq approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

CLA Signedp: shopifyPartner

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@fortmarek@kelset@Simek@hoxyq@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Branch cut updates by fortmarek · Pull Request #3645 · react/react-native-website · GitHub
Skip to content
Branch cut updates - #3645
Merged
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
May 25, 2023
Merged
Branch cut updates#3645
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
Conversation
@fortmarek
@fortmarekfortmarek
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
  • Updating the release docs after 0.72 branch cut off and RC0 release with the new steps to update and align packages on the new monorepo setup
  • Moving the wiki page that explains the new utility commands for updating packages to the website. The wiki page should link to the website documentation once this PR is merged.
@netlify
netlifyBot
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

✅ Deploy Preview for react-native ready!
NameLink
🔨 Latest commit9c1cfdc
🔍 Latest deploy loghttps://app.netlify.com/sites/react-native/deploys/646f0e41a8bda50008633eb4
😎 Deploy Previewhttps://deploy-preview-3645--react-native.netlify.app
📱 Preview on mobile
 Toggle QR Code... 

QR Code

Use your smartphone camera to open QR code link.
To edit notification comments on pull requests, go to your Netlify site settings.
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
b9c4b29 to
6da53c0CompareMarch 24, 2023 13:42
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
601402f to
7bb8dd2CompareApril 3, 2023 09:45
@fortmarek
fortmarek
requested a review
from hoxyqApril 3, 2023 09:45
@fortmarek
fortmarek
marked this pull request as ready for review
April 3, 2023 09:46
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

The packages in the `react-native` monorepo should be always one minor version ahead of the latest or RC version. Once you're done with releasing the initial RC0, you should:

- Create a new branch in `react-native` from `main` in your own fork.
- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
@hoxyqhoxyqApr 3, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
- Run `npm run bump-all-updated-packages -- --release-branch-cutoff` to bump the minor versions of all packages.
For npm we need to add explicit --, because node accepts arguments in a form like --<arg>
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true for yarn, though. So we can change in to yarn bump-all-updated-packages --release-branch-cutoff or provide both variants.
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md
Outdated


#### How to execute

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages -- --release-branch-cutoff`
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
Can you please update examples of executing this command with yarn? I don't have a strong opinion on if we should include both, seems pretty straightforward, but definitely better for it to be either yarn or npm everywhere
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, done 👍
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated


- Add and commit the extra file that got created at `sdks/hermes/.hermesversion`.

- Update packages in the monorepo by running `npm run bump-all-updated-packages`. All the package bumps should be a patch. Read more about the script and how they work [here](./release-updating-packages).
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add one more sentence on why we need to do it?
Maybe something like "We need to publish the latest available changes in our code, so they will be included in a new RC"
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
d8f24c7 to
fe8da5eCompareApril 3, 2023 11:05
kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
@kelsetkelset
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff, thanks for working on this @fortmarek! I've left a few suggestions improvements and one main change that I think will make the guide more streamlined.
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

- Update packages in the monorepo by running `yarn bump-all-updated-packages`. All the package bumps should be a patch. We need to publish the latest package changes, so they will be included in a new RC. Read more about the script and how they work [here](./release-updating-packages).
- Push the commit created by the previous command to the `0.x-stable` branch.

### 2. Push the branch and test the current changes
@kelsetkelsetApr 6, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that in this guide we only push the branch up at this step 2.
Maybe let's change this second step to be part of step 1, and separate the Hermes bump into its own step and the bump all packages into its own step too?
@fortmarekfortmarekMay 18, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created separate steps for Hermes and monorepo packages bumps.
I kept this step as a separate one that we should still run only after Hermes + packages bumps as I don't think it's necessary to push multiple times? Or do you see the workflow as:
  • Create new branch, push its current state
  • Hermes bump
  • monorepo bumps
  • push the changes again
@kelsetkelsetMay 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-updating-packages.md
Outdated

kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
2 times, most recently
from
19c5917 to
bc4a88bCompareMay 18, 2023 18:22
@fortmarek
fortmarek
requested a review
from kelsetMay 18, 2023 18:22
@kelset
kelset
commented
May 24, 2023

Copy link


Copy Markdown

Contributor
LGTM thanks @fortmarek - can you just fix the lint error?
Then @Simek this can be merged 👍
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
bc4a88b to
9c1cfdcCompareMay 25, 2023 07:29
Simek
Simek
reviewed
May 25, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md

Comment on lines

+6
 to 
+7

This page contains relevant information about how to update packages in the `react-native` [monorepo](https://github.com/react-native-community/discussions-and-proposals/pull/480).

@SimekSimekMay 25, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if linking RFC add anything useful for the page context.
Simek
Simek
approved these changes
May 25, 2023
View reviewed changes
@SimekSimek
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit about RFC link, other than that LGTM! 👍
Let's cross-check with someone form Meta before landing this tho.
Simek

This comment was marked as duplicate.

Sign in to view
@Simek
Simek
requested review from
cortinico
and removed request for
kelsetMay 25, 2023 08:20
@kelset
kelset
commented
May 25, 2023

Copy link


Copy Markdown

Contributor
@Simek for the Meta approval, @hoxyq is from Meta and he wrote the original doc that we're importing, so we can already go ahead without needing Nicola ;)
@Simek
Simek
merged commit 5897bef
into
react:mainMay 25, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SimekSimekSimek approved these changes
@cortinicocortinicoAwaiting requested review from cortinico

+2 more reviewers

@kelsetkelsetkelset left review comments
@hoxyqhoxyqhoxyq approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

CLA Signedp: shopifyPartner

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@fortmarek@kelset@Simek@hoxyq@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Branch cut updates by fortmarek · Pull Request #3645 · react/react-native-website · GitHub
Skip to content
Branch cut updates - #3645
Merged
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
May 25, 2023
Merged
Branch cut updates#3645
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
Conversation
@fortmarek
@fortmarekfortmarek
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
  • Updating the release docs after 0.72 branch cut off and RC0 release with the new steps to update and align packages on the new monorepo setup
  • Moving the wiki page that explains the new utility commands for updating packages to the website. The wiki page should link to the website documentation once this PR is merged.
@netlify
netlifyBot
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

✅ Deploy Preview for react-native ready!
NameLink
🔨 Latest commit9c1cfdc
🔍 Latest deploy loghttps://app.netlify.com/sites/react-native/deploys/646f0e41a8bda50008633eb4
😎 Deploy Previewhttps://deploy-preview-3645--react-native.netlify.app
📱 Preview on mobile
 Toggle QR Code... 

QR Code

Use your smartphone camera to open QR code link.
To edit notification comments on pull requests, go to your Netlify site settings.
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
b9c4b29 to
6da53c0CompareMarch 24, 2023 13:42
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
601402f to
7bb8dd2CompareApril 3, 2023 09:45
@fortmarek
fortmarek
requested a review
from hoxyqApril 3, 2023 09:45
@fortmarek
fortmarek
marked this pull request as ready for review
April 3, 2023 09:46
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

The packages in the `react-native` monorepo should be always one minor version ahead of the latest or RC version. Once you're done with releasing the initial RC0, you should:

- Create a new branch in `react-native` from `main` in your own fork.
- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
@hoxyqhoxyqApr 3, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
- Run `npm run bump-all-updated-packages -- --release-branch-cutoff` to bump the minor versions of all packages.
For npm we need to add explicit --, because node accepts arguments in a form like --<arg>
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true for yarn, though. So we can change in to yarn bump-all-updated-packages --release-branch-cutoff or provide both variants.
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md
Outdated


#### How to execute

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages -- --release-branch-cutoff`
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
Can you please update examples of executing this command with yarn? I don't have a strong opinion on if we should include both, seems pretty straightforward, but definitely better for it to be either yarn or npm everywhere
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, done 👍
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated


- Add and commit the extra file that got created at `sdks/hermes/.hermesversion`.

- Update packages in the monorepo by running `npm run bump-all-updated-packages`. All the package bumps should be a patch. Read more about the script and how they work [here](./release-updating-packages).
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add one more sentence on why we need to do it?
Maybe something like "We need to publish the latest available changes in our code, so they will be included in a new RC"
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
d8f24c7 to
fe8da5eCompareApril 3, 2023 11:05
kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
@kelsetkelset
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff, thanks for working on this @fortmarek! I've left a few suggestions improvements and one main change that I think will make the guide more streamlined.
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

- Update packages in the monorepo by running `yarn bump-all-updated-packages`. All the package bumps should be a patch. We need to publish the latest package changes, so they will be included in a new RC. Read more about the script and how they work [here](./release-updating-packages).
- Push the commit created by the previous command to the `0.x-stable` branch.

### 2. Push the branch and test the current changes
@kelsetkelsetApr 6, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that in this guide we only push the branch up at this step 2.
Maybe let's change this second step to be part of step 1, and separate the Hermes bump into its own step and the bump all packages into its own step too?
@fortmarekfortmarekMay 18, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created separate steps for Hermes and monorepo packages bumps.
I kept this step as a separate one that we should still run only after Hermes + packages bumps as I don't think it's necessary to push multiple times? Or do you see the workflow as:
  • Create new branch, push its current state
  • Hermes bump
  • monorepo bumps
  • push the changes again
@kelsetkelsetMay 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-updating-packages.md
Outdated

kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
2 times, most recently
from
19c5917 to
bc4a88bCompareMay 18, 2023 18:22
@fortmarek
fortmarek
requested a review
from kelsetMay 18, 2023 18:22
@kelset
kelset
commented
May 24, 2023

Copy link


Copy Markdown

Contributor
LGTM thanks @fortmarek - can you just fix the lint error?
Then @Simek this can be merged 👍
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
bc4a88b to
9c1cfdcCompareMay 25, 2023 07:29
Simek
Simek
reviewed
May 25, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md

Comment on lines

+6
 to 
+7

This page contains relevant information about how to update packages in the `react-native` [monorepo](https://github.com/react-native-community/discussions-and-proposals/pull/480).

@SimekSimekMay 25, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if linking RFC add anything useful for the page context.
Simek
Simek
approved these changes
May 25, 2023
View reviewed changes
@SimekSimek
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit about RFC link, other than that LGTM! 👍
Let's cross-check with someone form Meta before landing this tho.
Simek

This comment was marked as duplicate.

Sign in to view
@Simek
Simek
requested review from
cortinico
and removed request for
kelsetMay 25, 2023 08:20
@kelset
kelset
commented
May 25, 2023

Copy link


Copy Markdown

Contributor
@Simek for the Meta approval, @hoxyq is from Meta and he wrote the original doc that we're importing, so we can already go ahead without needing Nicola ;)
@Simek
Simek
merged commit 5897bef
into
react:mainMay 25, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SimekSimekSimek approved these changes
@cortinicocortinicoAwaiting requested review from cortinico

+2 more reviewers

@kelsetkelsetkelset left review comments
@hoxyqhoxyqhoxyq approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

CLA Signedp: shopifyPartner

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@fortmarek@kelset@Simek@hoxyq@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Branch cut updates by fortmarek · Pull Request #3645 · react/react-native-website · GitHub
Skip to content
Branch cut updates - #3645
Merged
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
May 25, 2023
Merged
Branch cut updates#3645
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
Conversation
@fortmarek
@fortmarekfortmarek
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
  • Updating the release docs after 0.72 branch cut off and RC0 release with the new steps to update and align packages on the new monorepo setup
  • Moving the wiki page that explains the new utility commands for updating packages to the website. The wiki page should link to the website documentation once this PR is merged.
@netlify
netlifyBot
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

✅ Deploy Preview for react-native ready!
NameLink
🔨 Latest commit9c1cfdc
🔍 Latest deploy loghttps://app.netlify.com/sites/react-native/deploys/646f0e41a8bda50008633eb4
😎 Deploy Previewhttps://deploy-preview-3645--react-native.netlify.app
📱 Preview on mobile
 Toggle QR Code... 

QR Code

Use your smartphone camera to open QR code link.
To edit notification comments on pull requests, go to your Netlify site settings.
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
b9c4b29 to
6da53c0CompareMarch 24, 2023 13:42
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
601402f to
7bb8dd2CompareApril 3, 2023 09:45
@fortmarek
fortmarek
requested a review
from hoxyqApril 3, 2023 09:45
@fortmarek
fortmarek
marked this pull request as ready for review
April 3, 2023 09:46
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

The packages in the `react-native` monorepo should be always one minor version ahead of the latest or RC version. Once you're done with releasing the initial RC0, you should:

- Create a new branch in `react-native` from `main` in your own fork.
- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
@hoxyqhoxyqApr 3, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
- Run `npm run bump-all-updated-packages -- --release-branch-cutoff` to bump the minor versions of all packages.
For npm we need to add explicit --, because node accepts arguments in a form like --<arg>
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true for yarn, though. So we can change in to yarn bump-all-updated-packages --release-branch-cutoff or provide both variants.
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md
Outdated


#### How to execute

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages -- --release-branch-cutoff`
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
Can you please update examples of executing this command with yarn? I don't have a strong opinion on if we should include both, seems pretty straightforward, but definitely better for it to be either yarn or npm everywhere
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, done 👍
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated


- Add and commit the extra file that got created at `sdks/hermes/.hermesversion`.

- Update packages in the monorepo by running `npm run bump-all-updated-packages`. All the package bumps should be a patch. Read more about the script and how they work [here](./release-updating-packages).
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add one more sentence on why we need to do it?
Maybe something like "We need to publish the latest available changes in our code, so they will be included in a new RC"
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
d8f24c7 to
fe8da5eCompareApril 3, 2023 11:05
kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
@kelsetkelset
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff, thanks for working on this @fortmarek! I've left a few suggestions improvements and one main change that I think will make the guide more streamlined.
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

- Update packages in the monorepo by running `yarn bump-all-updated-packages`. All the package bumps should be a patch. We need to publish the latest package changes, so they will be included in a new RC. Read more about the script and how they work [here](./release-updating-packages).
- Push the commit created by the previous command to the `0.x-stable` branch.

### 2. Push the branch and test the current changes
@kelsetkelsetApr 6, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that in this guide we only push the branch up at this step 2.
Maybe let's change this second step to be part of step 1, and separate the Hermes bump into its own step and the bump all packages into its own step too?
@fortmarekfortmarekMay 18, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created separate steps for Hermes and monorepo packages bumps.
I kept this step as a separate one that we should still run only after Hermes + packages bumps as I don't think it's necessary to push multiple times? Or do you see the workflow as:
  • Create new branch, push its current state
  • Hermes bump
  • monorepo bumps
  • push the changes again
@kelsetkelsetMay 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-updating-packages.md
Outdated

kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
2 times, most recently
from
19c5917 to
bc4a88bCompareMay 18, 2023 18:22
@fortmarek
fortmarek
requested a review
from kelsetMay 18, 2023 18:22
@kelset
kelset
commented
May 24, 2023

Copy link


Copy Markdown

Contributor
LGTM thanks @fortmarek - can you just fix the lint error?
Then @Simek this can be merged 👍
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
bc4a88b to
9c1cfdcCompareMay 25, 2023 07:29
Simek
Simek
reviewed
May 25, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md

Comment on lines

+6
 to 
+7

This page contains relevant information about how to update packages in the `react-native` [monorepo](https://github.com/react-native-community/discussions-and-proposals/pull/480).

@SimekSimekMay 25, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if linking RFC add anything useful for the page context.
Simek
Simek
approved these changes
May 25, 2023
View reviewed changes
@SimekSimek
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit about RFC link, other than that LGTM! 👍
Let's cross-check with someone form Meta before landing this tho.
Simek

This comment was marked as duplicate.

Sign in to view
@Simek
Simek
requested review from
cortinico
and removed request for
kelsetMay 25, 2023 08:20
@kelset
kelset
commented
May 25, 2023

Copy link


Copy Markdown

Contributor
@Simek for the Meta approval, @hoxyq is from Meta and he wrote the original doc that we're importing, so we can already go ahead without needing Nicola ;)
@Simek
Simek
merged commit 5897bef
into
react:mainMay 25, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SimekSimekSimek approved these changes
@cortinicocortinicoAwaiting requested review from cortinico

+2 more reviewers

@kelsetkelsetkelset left review comments
@hoxyqhoxyqhoxyq approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

CLA Signedp: shopifyPartner

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@fortmarek@kelset@Simek@hoxyq@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Branch cut updates by fortmarek · Pull Request #3645 · react/react-native-website · GitHub
Skip to content
Branch cut updates - #3645
Merged
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
May 25, 2023
Merged
Branch cut updates#3645
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
Conversation
@fortmarek
@fortmarekfortmarek
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
  • Updating the release docs after 0.72 branch cut off and RC0 release with the new steps to update and align packages on the new monorepo setup
  • Moving the wiki page that explains the new utility commands for updating packages to the website. The wiki page should link to the website documentation once this PR is merged.
@netlify
netlifyBot
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

✅ Deploy Preview for react-native ready!
NameLink
🔨 Latest commit9c1cfdc
🔍 Latest deploy loghttps://app.netlify.com/sites/react-native/deploys/646f0e41a8bda50008633eb4
😎 Deploy Previewhttps://deploy-preview-3645--react-native.netlify.app
📱 Preview on mobile
 Toggle QR Code... 

QR Code

Use your smartphone camera to open QR code link.
To edit notification comments on pull requests, go to your Netlify site settings.
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
b9c4b29 to
6da53c0CompareMarch 24, 2023 13:42
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
601402f to
7bb8dd2CompareApril 3, 2023 09:45
@fortmarek
fortmarek
requested a review
from hoxyqApril 3, 2023 09:45
@fortmarek
fortmarek
marked this pull request as ready for review
April 3, 2023 09:46
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

The packages in the `react-native` monorepo should be always one minor version ahead of the latest or RC version. Once you're done with releasing the initial RC0, you should:

- Create a new branch in `react-native` from `main` in your own fork.
- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
@hoxyqhoxyqApr 3, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
- Run `npm run bump-all-updated-packages -- --release-branch-cutoff` to bump the minor versions of all packages.
For npm we need to add explicit --, because node accepts arguments in a form like --<arg>
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true for yarn, though. So we can change in to yarn bump-all-updated-packages --release-branch-cutoff or provide both variants.
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md
Outdated


#### How to execute

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages -- --release-branch-cutoff`
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
Can you please update examples of executing this command with yarn? I don't have a strong opinion on if we should include both, seems pretty straightforward, but definitely better for it to be either yarn or npm everywhere
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, done 👍
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated


- Add and commit the extra file that got created at `sdks/hermes/.hermesversion`.

- Update packages in the monorepo by running `npm run bump-all-updated-packages`. All the package bumps should be a patch. Read more about the script and how they work [here](./release-updating-packages).
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add one more sentence on why we need to do it?
Maybe something like "We need to publish the latest available changes in our code, so they will be included in a new RC"
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
d8f24c7 to
fe8da5eCompareApril 3, 2023 11:05
kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
@kelsetkelset
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff, thanks for working on this @fortmarek! I've left a few suggestions improvements and one main change that I think will make the guide more streamlined.
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

- Update packages in the monorepo by running `yarn bump-all-updated-packages`. All the package bumps should be a patch. We need to publish the latest package changes, so they will be included in a new RC. Read more about the script and how they work [here](./release-updating-packages).
- Push the commit created by the previous command to the `0.x-stable` branch.

### 2. Push the branch and test the current changes
@kelsetkelsetApr 6, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that in this guide we only push the branch up at this step 2.
Maybe let's change this second step to be part of step 1, and separate the Hermes bump into its own step and the bump all packages into its own step too?
@fortmarekfortmarekMay 18, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created separate steps for Hermes and monorepo packages bumps.
I kept this step as a separate one that we should still run only after Hermes + packages bumps as I don't think it's necessary to push multiple times? Or do you see the workflow as:
  • Create new branch, push its current state
  • Hermes bump
  • monorepo bumps
  • push the changes again
@kelsetkelsetMay 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-updating-packages.md
Outdated

kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
2 times, most recently
from
19c5917 to
bc4a88bCompareMay 18, 2023 18:22
@fortmarek
fortmarek
requested a review
from kelsetMay 18, 2023 18:22
@kelset
kelset
commented
May 24, 2023

Copy link


Copy Markdown

Contributor
LGTM thanks @fortmarek - can you just fix the lint error?
Then @Simek this can be merged 👍
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
bc4a88b to
9c1cfdcCompareMay 25, 2023 07:29
Simek
Simek
reviewed
May 25, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md

Comment on lines

+6
 to 
+7

This page contains relevant information about how to update packages in the `react-native` [monorepo](https://github.com/react-native-community/discussions-and-proposals/pull/480).

@SimekSimekMay 25, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if linking RFC add anything useful for the page context.
Simek
Simek
approved these changes
May 25, 2023
View reviewed changes
@SimekSimek
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit about RFC link, other than that LGTM! 👍
Let's cross-check with someone form Meta before landing this tho.
Simek

This comment was marked as duplicate.

Sign in to view
@Simek
Simek
requested review from
cortinico
and removed request for
kelsetMay 25, 2023 08:20
@kelset
kelset
commented
May 25, 2023

Copy link


Copy Markdown

Contributor
@Simek for the Meta approval, @hoxyq is from Meta and he wrote the original doc that we're importing, so we can already go ahead without needing Nicola ;)
@Simek
Simek
merged commit 5897bef
into
react:mainMay 25, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SimekSimekSimek approved these changes
@cortinicocortinicoAwaiting requested review from cortinico

+2 more reviewers

@kelsetkelsetkelset left review comments
@hoxyqhoxyqhoxyq approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

CLA Signedp: shopifyPartner

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@fortmarek@kelset@Simek@hoxyq@facebook-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Branch cut updates by fortmarek · Pull Request #3645 · react/react-native-website · GitHub
Skip to content
Branch cut updates - #3645
Merged
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
May 25, 2023
Merged
Branch cut updates#3645
Simek merged 1 commit into
react:mainfrom 
fortmarek:fortmarek/branch-cut-updates
Conversation
@fortmarek
@fortmarekfortmarek
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
  • Updating the release docs after 0.72 branch cut off and RC0 release with the new steps to update and align packages on the new monorepo setup
  • Moving the wiki page that explains the new utility commands for updating packages to the website. The wiki page should link to the website documentation once this PR is merged.
@netlify
netlifyBot
commented
Mar 24, 2023•

edited

Loading

Copy link


Copy Markdown

✅ Deploy Preview for react-native ready!
NameLink
🔨 Latest commit9c1cfdc
🔍 Latest deploy loghttps://app.netlify.com/sites/react-native/deploys/646f0e41a8bda50008633eb4
😎 Deploy Previewhttps://deploy-preview-3645--react-native.netlify.app
📱 Preview on mobile
 Toggle QR Code... 

QR Code

Use your smartphone camera to open QR code link.
To edit notification comments on pull requests, go to your Netlify site settings.
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
b9c4b29 to
6da53c0CompareMarch 24, 2023 13:42
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
601402f to
7bb8dd2CompareApril 3, 2023 09:45
@fortmarek
fortmarek
requested a review
from hoxyqApril 3, 2023 09:45
@fortmarek
fortmarek
marked this pull request as ready for review
April 3, 2023 09:46
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

The packages in the `react-native` monorepo should be always one minor version ahead of the latest or RC version. Once you're done with releasing the initial RC0, you should:

- Create a new branch in `react-native` from `main` in your own fork.
- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
@hoxyqhoxyqApr 3, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

- Run `npm run bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
- Run `npm run bump-all-updated-packages -- --release-branch-cutoff` to bump the minor versions of all packages.
For npm we need to add explicit --, because node accepts arguments in a form like --<arg>
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true for yarn, though. So we can change in to yarn bump-all-updated-packages --release-branch-cutoff or provide both variants.
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md
Outdated


#### How to execute

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages --release-branch-cutoff`
`npm run bump-all-updated-packages` or `npm run bump-all-updated-packages -- --release-branch-cutoff`
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used yarn instead since that's the tool of choice for other commands such as running test-e2e-local
Can you please update examples of executing this command with yarn? I don't have a strong opinion on if we should include both, seems pretty straightforward, but definitely better for it to be either yarn or npm everywhere
@fortmarekfortmarekApr 3, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, done 👍
hoxyq
hoxyq
reviewed
Apr 3, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated


- Add and commit the extra file that got created at `sdks/hermes/.hermesversion`.

- Update packages in the monorepo by running `npm run bump-all-updated-packages`. All the package bumps should be a patch. Read more about the script and how they work [here](./release-updating-packages).
@hoxyqhoxyqApr 3, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add one more sentence on why we need to do it?
Maybe something like "We need to publish the latest available changes in our code, so they will be included in a new RC"
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
3 times, most recently
from
d8f24c7 to
fe8da5eCompareApril 3, 2023 11:05
kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
@kelsetkelset
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff, thanks for working on this @fortmarek! I've left a few suggestions improvements and one main change that I think will make the guide more streamlined.
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

- Update packages in the monorepo by running `yarn bump-all-updated-packages`. All the package bumps should be a patch. We need to publish the latest package changes, so they will be included in a new RC. Read more about the script and how they work [here](./release-updating-packages).
- Push the commit created by the previous command to the `0.x-stable` branch.

### 2. Push the branch and test the current changes
@kelsetkelsetApr 6, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that in this guide we only push the branch up at this step 2.
Maybe let's change this second step to be part of step 1, and separate the Hermes bump into its own step and the bump all packages into its own step too?
@fortmarekfortmarekMay 18, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created separate steps for Hermes and monorepo packages bumps.
I kept this step as a separate one that we should still run only after Hermes + packages bumps as I don't think it's necessary to push multiple times? Or do you see the workflow as:
  • Create new branch, push its current state
  • Hermes bump
  • monorepo bumps
  • push the changes again
@kelsetkelsetMay 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

Comment threadwebsite/contributing/release-updating-packages.md
Outdated

kelset
kelset
reviewed
Apr 6, 2023
View reviewed changes
Comment threadwebsite/contributing/release-branch-cut-and-rc0.md
Outdated

@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
2 times, most recently
from
19c5917 to
bc4a88bCompareMay 18, 2023 18:22
@fortmarek
fortmarek
requested a review
from kelsetMay 18, 2023 18:22
@kelset
kelset
commented
May 24, 2023

Copy link


Copy Markdown

Contributor
LGTM thanks @fortmarek - can you just fix the lint error?
Then @Simek this can be merged 👍
@fortmarek
fortmarekforce-pushed
the
fortmarek/branch-cut-updates
branch
from
bc4a88b to
9c1cfdcCompareMay 25, 2023 07:29
Simek
Simek
reviewed
May 25, 2023
View reviewed changes
Comment threadwebsite/contributing/release-updating-packages.md

Comment on lines

+6
 to 
+7

This page contains relevant information about how to update packages in the `react-native` [monorepo](https://github.com/react-native-community/discussions-and-proposals/pull/480).

@SimekSimekMay 25, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if linking RFC add anything useful for the page context.
Simek
Simek
approved these changes
May 25, 2023
View reviewed changes
@SimekSimek
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit about RFC link, other than that LGTM! 👍
Let's cross-check with someone form Meta before landing this tho.
Simek

This comment was marked as duplicate.

Sign in to view
@Simek
Simek
requested review from
cortinico
and removed request for
kelsetMay 25, 2023 08:20
@kelset
kelset
commented
May 25, 2023

Copy link


Copy Markdown

Contributor
@Simek for the Meta approval, @hoxyq is from Meta and he wrote the original doc that we're importing, so we can already go ahead without needing Nicola ;)
@Simek
Simek
merged commit 5897bef
into
react:mainMay 25, 2023
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SimekSimekSimek approved these changes
@cortinicocortinicoAwaiting requested review from cortinico

+2 more reviewers

@kelsetkelsetkelset left review comments
@hoxyqhoxyqhoxyq approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

CLA Signedp: shopifyPartner

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@fortmarek@kelset@Simek@hoxyq@facebook-github-bot