feat: improve cleanup

ldez · Mar 8, 2024 · 3737668 · 3737668
1 parent 64985b9
commit 3737668
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/fixtures_test.go b/fixtures_test.go
@@ -37,8 +37,6 @@ go 1.15
 
 // test
 require (
-	// test
-	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/google/go-github/v20 v20.0.0
 )

diff --git a/motoko_test.go b/motoko_test.go
@@ -92,6 +92,7 @@ func Test_updateCmd(t *testing.T) {
 			}
 
 			if string(mod) != test.expected.mod {
+				t.Log(string(mod))
 				t.Errorf("got diffs:\n%s", quickDiff(string(mod), test.expected.mod))
 			}
 		})

diff --git a/upgrader.go b/upgrader.go
@@ -122,11 +122,24 @@ func updateModFile(dir, lib, full, major string) error {
 		return err
 	}
 
+	for _, require := range file.Require {
+		if !strings.HasPrefix(require.Mod.Path, lib) || require.Indirect {
+			continue
+		}
+
+		err = file.DropRequire(require.Mod.Path)
+		if err != nil {
+			return err
+		}
+	}
+
 	err = file.AddRequire(path.Join(lib, major), full)
 	if err != nil {
 		return err
 	}
 
+	file.Cleanup()
+
 	data, err := file.Format()
 	if err != nil {
 		return err