Improve gh package version resoving

esm-dev · Apr 16, 2023 · 2f14427 · 2f14427
1 parent f48cdef
commit 2f14427
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/server/pkg.go b/server/pkg.go
@@ -54,7 +54,7 @@ func validatePkgPath(pathname string) (pkg Pkg, query string, err error) {
  if fromGithub {
  // strip the leading `@`
  pkg.Name = pkg.Name[1:]
- if valid.IsHexString(pkg.Version) && len(pkg.Version) >= 10 {
+ if (valid.IsHexString(pkg.Version) && len(pkg.Version) >= 10) || regexpFullVersion.MatchString(strings.TrimPrefix(pkg.Version, "v")) {
  return
  }
  var refs []GitRef
@@ -73,10 +73,7 @@ func validatePkgPath(pathname string) (pkg Pkg, query string, err error) {
  // TODO: support semver
  } else {
  for _, ref := range refs {
- if ref.Ref == "refs/tags/"+pkg.Version {
- return
- }
- if ref.Ref == "refs/heads/"+pkg.Version {
+ if ref.Ref == "refs/tags/"+pkg.Version || ref.Ref == "refs/heads/"+pkg.Version {
  pkg.Version = ref.Sha[:10]
  return
  }