Normalize the repo branches and versions

[UlisesGascon]

So far seems like we need to organize a bit the branches, before we start with #1310 to prevent having more mess

GitHub

• rename lts branch to v2 (@UlisesGascon )
• Bring changes from master to v2: master -> v2 #1317
• Rename explore-new-api to v3 (@UlisesGascon )
• Rename v2 to main (@UlisesGascon )
• Make main the default branch (@UlisesGascon )
• Update pipelines to use main branch a not master
• Remove master branch (@UlisesGascon )

npm

• deprecate 1.4.4-lts.1, 1.4.5-lts.1 and 1.4.5-lts.2. Now that 2.0.0 is available and the migration is easy (@UlisesGascon ).
• deprecate 2.0.0-rc* and 2.0.0-alpha* as they are missleading now that 2.0.0 is different and we plan to incorporate all the changes in 3.0.0 (@UlisesGascon )

WDYT? @expressjs/express-tc @bjohansebas

[LinusU]

Regarding:

create a new branch v3 from v2 and cherry-pick [...]

I think that it might be easier to rename explore-new-api to v3. I think that many changes that has since happened on master (or lts, v2, etc.) isn't relevant to explore-new-api, since I basically rewrote the package from scratch (42a9e3b).

---

Regarding the plan as whole, I'm not sure what's been discussed in the meetings since I haven't had time to be actively involved lately, sorry about that 😞

But it sounds good 👍

The only thing to keep in mind is that if I remember correctly, npm will consider 2.0.0 compatible with e.g. 2.0.0-rc.4. So this might be confusing/breaking for people that are currently using the release candidates for 2.0.0, that will now get a completely different package as 2.0.0 😅

[ctcpip]

I would prefer to keep modes of working (such as branching strategy) consistent, wherever possible. As such, it seems like we should keep master (probably rename it to main), then that becomes the tip/head dev branch (default), like we do with express.

v2 branch would remain v2. explore-new-api would become the main branch, if that is going to be the v3 release

[LinusU]

v2 branch would remain v2. explore-new-api would become the main branch, if that is going to be the v3 release

I think that this sounds like a good plan 👍

[bjohansebas]

I think we should continue as we're doing in the other packages (https://github.com/expressjs/discussions/blob/master/docs/contributing/release-process.md#branch-terminology), I don’t see a reason why we should handle the branches differently than how it’s already done in the other repos, although i’m not opposed if they want to make v2 the default branch.

deprecate 2.0.0-rc* and 2.0.0-alpha* as they are missleading now that 2.0.0 is different and we plan to incorporate all the changes in 3.0.0

I think we should publish an RC with version 3, so there's no confusion.

[ctcpip]

npm will consider 2.0.0 compatible with e.g. 2.0.0-rc.4

this is not true. because they are prerelease, they will fail comparison to regular versions. ref

so people on the last rc version will be pinned there. they need to manually update to get v2.0.0

[ctcpip]

I think we should publish an RC with version 3, so there's no confusion.

We've discussed this in the past at length (cc @wesleytodd), but we should generally try very hard to avoid publishing prerelease versions. In any case, let's leave releases to a separate discussion.

[ctcpip]

I think we should continue as we're doing in the other packages, I don’t see a reason why we should handle the branches differently than how it’s already done in the other repos

sounds like you and I are in agreement then

[LinusU]

npm will consider 2.0.0 compatible with e.g. 2.0.0-rc.4

this is not true. because they are prerelease, they will fail comparison to regular versions. ref

so people on the last rc version will be pinned there. they need to manually update to get v2.0.0

Are you sure about this?

Here are two examples to the contrary:

[UlisesGascon]

v2 branch would remain v2. explore-new-api would become the main branch, if that is going to be the v3 release

I will do this change and make main the default branch.

[UlisesGascon]

Branches now are clear, also I changes the target branch for all the existing PRs and tagged them too. Next step is to create a 3.0.0-alpha.1? and deprecate all the 2.0.0-* releases with the message asking to use 3.0.0-alpha.1.

I think that way we "normalized" the situation and avoid the situation described by Linus (ref)

Packages that will be deprecated