Skip to content

Fix CLI downgrade check #1380

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

Merged
merged 3 commits into from
Oct 5, 2024
+54 −69
Merged

Fix CLI downgrade check #1380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14a5c4e
fix downgrade detection
nicktrn Oct 5, 2024
0034618
remove unused semver package from webapp
nicktrn Oct 5, 2024
7f4d7dd
add changeset
nicktrn Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fuzzy-files-hunt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"trigger.dev": patch
---

Fix downgrade check by correctly comparing semvers
2 changes: 0 additions & 2 deletions apps/webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@
"remix-typedjson": "0.3.1",
"remix-utils": "^7.1.0",
"seedrandom": "^3.0.5",
"semver": "^7.5.0",
"simple-oauth2": "^5.0.0",
"simplur": "^3.0.1",
"slug": "^6.0.0",
Expand Down Expand Up @@ -210,7 +209,6 @@
"@types/react-dom": "18.2.7",
"@types/regression": "^2.0.6",
"@types/seedrandom": "^3.0.8",
"@types/semver": "^7.3.13",
"@types/simple-oauth2": "^5.0.4",
"@types/slug": "^5.0.3",
"@types/tar": "^6.1.4",
Expand Down
3 changes: 2 additions & 1 deletion packages/cli-v3/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@types/react": "^18.2.48",
"@types/resolve": "^1.20.6",
"@types/rimraf": "^4.0.5",
"@types/semver": "^7.3.13",
"@types/semver": "^7.5.0",
"@types/source-map-support": "0.5.10",
"@types/ws": "^8.5.3",
"cpy-cli": "^5.0.0",
Expand Down Expand Up @@ -112,6 +112,7 @@
"partysocket": "^1.0.2",
"pkg-types": "^1.1.3",
"resolve": "^1.22.8",
"semver": "^7.5.0",
"signal-exit": "^4.1.0",
"source-map-support": "0.5.21",
"std-env": "^3.7.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/cli-v3/src/commands/update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { spinner } from "../utilities/windows.js";
import { VERSION } from "../version.js";
import { hasTTY } from "std-env";
import nodeResolve from "resolve";
import * as semver from "semver";

export const UpdateCommandOptions = CommonCommandOptions.pick({
logLevel: true,
Expand Down Expand Up @@ -112,7 +113,7 @@ export async function updateTriggerPackages(
}

const isDowngrade = mismatches.some((dep) => {
return dep.version > targetVersion;
return semver.gt(dep.version, targetVersion);
});

return {
Expand Down
Loading