Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(plugins/npm): exclude prelease versions when calculating monorepo project version #2035

Merged
merged 1 commit into from Jul 22, 2021
Merged

feat(plugins/npm): exclude prelease versions when calculating monorepo project version #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions plugins/npm/__tests__/npm.test.ts
View file
Open in desktop
Expand Up @@ -44,6 +44,16 @@ const monorepoPackagesResult = [
{ path: "packages/d", name: "@packages/d", package: { version: "0.1.1" } },
];

const monorepoPackagesWithPrereleaseResult = [
{ path: "packages/a", name: "@packages/a", package: { version: "0.1.1" } },
{ path: "packages/b", name: "@packages/b", package: {} },
{ path: "packages/c", name: "@packages/c", package: { version: "0.1.2" } },
{ path: "packages/d", name: "@packages/d", package: { version: "0.1.1" } },
// This can happen if a new module is published with a breaking version
{ path: "packages/e", name: "@packages/e", package: { version: "1.0.0-next.0" } },
{ path: "packages/f", name: "@packages/f", package: { version: "1.0.0-next.0" } },
];

const packageTemplate = ({
path,
name,
Expand Down Expand Up @@ -143,6 +153,11 @@ describe("getMonorepoPackage", () => {
monorepoPackages.mockReturnValueOnce(monorepoPackagesResult);
expect(getMonorepoPackage()).toStrictEqual({ version: "0.1.2" });
});

test("should ignore versions from preleases", () => {
monorepoPackages.mockReturnValueOnce(monorepoPackagesWithPrereleaseResult);
expect(getMonorepoPackage()).toStrictEqual({ version: "0.1.2" });
});
});

const prefixRelease = (str: string) => str;
Expand Down
13 changes: 11 additions & 2 deletions plugins/npm/src/index.ts
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ import {
DEFAULT_PRERELEASE_BRANCHES,
} from "@auto-it/core";
import getPackages from "get-monorepo-packages";
import { gt, gte, inc, ReleaseType } from "semver";
import { gt, gte, inc, prerelease, ReleaseType } from "semver";
import {
loadPackageJson,
getRepo,
Expand Down Expand Up @@ -146,6 +146,7 @@ export async function getChangedPackages({
return [...changed];
}


/** Get the package with the greatest version in a monorepo */
export function getMonorepoPackage() {
const packages = getPackages(process.cwd());
Expand All @@ -154,7 +155,15 @@ export function getMonorepoPackage() {
return {} as IPackageJSON;
}

const monorepoPackage = packages.reduce((greatest, subPackage) => {
// Remove pre-releases so that released package versions take precedence
let releasedPackages = packages.filter(subPackage => prerelease(subPackage.package?.version || '') === null);
// If doing this would remove all packages, this means were not any @latest releases yet
// In that case, restore the original list of packages.
if (releasedPackages.length === 0) {
releasedPackages = packages;
}

const monorepoPackage = releasedPackages.reduce((greatest, subPackage) => {
if (subPackage.package.version) {
if (!greatest.package.version) {
return subPackage;
Expand Down