Skip to content

Commit

Permalink
Fixes #2001.
Browse files Browse the repository at this point in the history
  • Loading branch information
zachleat committed Oct 7, 2021
1 parent d885ca5 commit 24a0f2f
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/UserConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ class UserConfig {
}

versionCheck(expected) {
if (!semver.satisfies(pkg.version, expected)) {
if (
!semver.satisfies(pkg.version, expected, {
includePrerelease: true,
})
) {
throw new UserConfigError(
`This project requires the Eleventy version to match '${expected}' but found ${pkg.version}. Use \`npm update @11ty/eleventy -g\` to upgrade the eleventy global or \`npm update @11ty/eleventy --save\` to upgrade your local project version.`
);
Expand Down
49 changes: 49 additions & 0 deletions test/SemverCheckTest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
const test = require("ava");
const semver = require("semver");

test("Satisfies sanity checks with beta/canary", (t) => {
t.true(
semver.satisfies("1.0.0-beta.1", ">= 0.7.0", {
includePrerelease: true,
}),
"1.0 Beta is valid for 0.x"
);

t.true(
semver.satisfies("1.0.0-canary.1", ">= 0.7.0", {
includePrerelease: true,
}),
"1.0 Canary is valid for 0.x"
);

t.true(
semver.satisfies("1.0.0-beta.1", ">= 0.7.0", {
includePrerelease: true,
}),
"1.0 Beta is valid for 0.x"
);

t.true(
semver.satisfies("1.0.0", ">= 0.7.0", {
includePrerelease: true,
}),
"1.0 is valid for 0.x"
);

// keep canary around, it won’t have the `includePrerelease` option in `UserConfig->versionCheck`
t.true(
semver.satisfies("1.0.0", ">=0.7 || >=1.0.0-canary", {
includePrerelease: true,
})
);
t.true(
semver.satisfies("1.0.0-beta.1", ">=0.7 || >=1.0.0-canary", {
includePrerelease: true,
})
);
t.true(
semver.satisfies("1.0.0-canary.1", ">=0.7 || >=1.0.0-canary", {
includePrerelease: true,
})
);
});

0 comments on commit 24a0f2f

Please sign in to comment.