fix(version): Prioritize --preid over existing prerelease ID

[moe971]

in order to switch a prerelease id from alpha version to rc I needed to change condition to prioritize preid insteed of an existing preid

Description

I juste change order of OR statement to take first preid
const resolvePrereleaseId = existingPreid => preid || (isPrerelease && existingPreid) || "alpha";

Motivation and Context

On my continuous integration workflow version my app on alpha prerelease, then on it goes to release candidate, so I try tu use lerna version prerelease --preid rc but because my previous tag was dam/library-client@0.1.1-alpha.10 lerna 3.0.4 used my existing preid.
The solution was to change order on the test statement.

How Has This Been Tested?

It has been test on my project, it works 👍

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

[evocateur]

This change looks reasonable, but it needs a test. Copy this test, and pass "--preid", "rc" after the "prerelease" argument to lernaVersion(), then validate that the changes are as expected.

[moe971]

Thanks for the review, I add the test as you asked me.
I ran npm test -- -u to update snapshots, everything is ok on my side but fail on CI..

[evocateur]

None of the snapshots need updating, as you're not even adding a new snapshot. The lockfile should also not be changed (you're not adding or removing dependencies)

[evocateur]

The lockfile should not have changed (npm ci should be sufficient). Please revert this file

[evocateur]

I'm not sure why these snapshots needed to be updated. Are you using a non-English localization of git?

[moe971]

I'm on an english localization of git, just my OSX is in French. I revert my package-lock, ran npm ci the only diff is the new test. I have the same problems with snapshots on my computer, but it pass on CI 👍

[evocateur]

Okay, well, I can assure you the snapshots do not need updating, and the CI build should pass once you revert the snapshot updates. We probably have to pass some flags to git or something, I don't know why it is trying to change the diff prefixes, it's completely unrelated to your change.

…

On Aug 14, 2018, at 21:38, Moïse FISCAL ***@***.***> wrote: @moe971 commented on this pull request. In commands/diff/__tests__/__snapshots__/diff-command.test.js.snap: > index SHA..SHA 100644 ---- a/packages/package-1/package.json -+++ b/packages/package-1/package.json +--- c/packages/package-1/package.json ++++ w/packages/package-1/package.json I'm on an english localization of git, just my OSX is in French. I revert my package-lock, ran npm ci the only diff is the new test. I have the same problems with snapshots. — You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread.

[moe971]

As you said after revert everything is green on CI, thanks for your help.

[evocateur]

Looks great, thanks!

[evocateur]

I don't think this solves #1214, as it's actually a separate code path (but certainly accesses similar properties).

[evocateur]

I think passing an explicit --src-prefix=a/ and --dst-prefix=b/ will solve your local snapshot problems. Can you pull from master and execute npm run ci to verify for me? (no rush, just not certain how to reproduce on my own machine)

[moe971]

I sync my repo,
My current commit match with 3.0.6 tag, I run npm i && npm run ci I've got 526 lint error for import/unresolved, did I miss something ?

[evocateur]

Unless you're making changes to dependencies, I would run `npm ci` instead of `npm i`. All the lint errors are due to a bad node_modules state.

…

On Aug 15, 2018, at 23:27, Moïse FISCAL ***@***.***> wrote: I sync my repo, My current commit match with 3.0.6 tag, I run npm i && npm run ci I've got 526 lint error for import/unresolved, did I miss something ? — You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub, or mute the thread.

[lock]

This thread has been automatically locked because there has not been any recent activity after it was closed. Please open a new issue for related bugs.