Skip to content

Commit

Permalink
Allow -beta or -alpha suffixes in SemVer strings
Browse files Browse the repository at this point in the history
  • Loading branch information
lexisother committed Sep 26, 2023
1 parent 22c6d6f commit b400d78
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
8 changes: 6 additions & 2 deletions src/mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ export class Mod implements ModPublic {

if (this.manifest.version != null) {
try {
this.version = new semver.SemVer(this.manifest.version);
this.version = new semver.SemVer(this.manifest.version, {
includePrerelease: true,
});
} catch (err) {
if (utils.errorHasMessage(err)) {
// TODO: put a link to semver docs here
Expand All @@ -49,7 +51,9 @@ export class Mod implements ModPublic {

let depVersionRange: semver.Range;
try {
depVersionRange = new semver.Range(dep.version);
depVersionRange = new semver.Range(dep.version, {
includePrerelease: true,
});
} catch (err) {
if (utils.errorHasMessage(err)) {
err.message = `dependency version constraint '${dep.version}' for mod '${depId}' is not a valid semver range: ${err.message}`;
Expand Down
6 changes: 5 additions & 1 deletion src/modloader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,11 @@ async function loadModloaderMetadata(): Promise<{ version: semver.SemVer }> {
let filePath = utils.cwdFilePathFromURL(new URL('../metadata.json', import.meta.url));
let jsonText = await files.loadText(filePath);
let data = JSON.parse(jsonText) as { version: string };
return { version: new semver.SemVer(data.version) };
return {
version: new semver.SemVer(data.version, {
includePrerelease: true,
}),
};
}

async function loadAllModMetadata(config: configM.Config, installedMods: ModsMap): Promise<void> {
Expand Down

0 comments on commit b400d78

Please sign in to comment.