framework/app: fix conflicing package names

framework/app/loader.go

@@ -38,24 +38,25 @@ type loader struct {
 func (l *loader) Load() (state *State, err error) {
 	defer l.Recover2(&err, "app: unable to load state")
 	state = new(State)
-	state.Provider = l.loadProvider()
-	state.Flag = l.flag
 	l.imports.AddStd("os", "context", "errors")
 	l.imports.AddNamed("commander", "github.com/livebud/bud/package/commander")
 	l.imports.AddNamed("budclient", "github.com/livebud/bud/package/budclient")
 	l.imports.AddNamed("console", "github.com/livebud/bud/package/log/console")
 	l.imports.AddNamed("log", "github.com/livebud/bud/package/log")
 	l.imports.AddNamed("filter", "github.com/livebud/bud/package/log/filter")
 	l.imports.Add(l.module.Import("bud/internal/app/web"))
+	state.Provider = l.loadProvider()
+	state.Flag = l.flag
 	state.Imports = l.imports.List()
 	return state, nil
 }
 
 func (l *loader) loadProvider() *di.Provider {
 	jsVM := di.ToType("github.com/livebud/bud/package/js", "VM")
 	fn := &di.Function{
-		Name:   "loadWeb",
-		Target: l.module.Import("bud", "program"),
+		Name:    "loadWeb",
+		Imports: l.imports,
+		Target:  l.module.Import("bud", "program"),
 		Params: []di.Dependency{
 			di.ToType("github.com/livebud/bud/package/log", "Interface"),
 			di.ToType("github.com/livebud/bud/package/gomod", "*Module"),
@@ -81,9 +82,5 @@ func (l *loader) loadProvider() *di.Provider {
 		// easily
 		l.Bail(fmt.Errorf("app: unable to wire. %s", err))
 	}
-	// Add imports
-	for _, im := range provider.Imports {
-		l.imports.AddNamed(im.Name, im.Path)
-	}
 	return provider
 }

framework/controller/controller_test.go

@@ -2269,23 +2269,23 @@ func TestRedirectBack(t *testing.T) {
 func TestSession(t *testing.T) {
 	is := is.New(t)
 	ctx := context.Background()
-	dir := t.TempDir()
+	dir := "_tmp"
 	td := testdir.New(dir)
-	td.Files["logz/logz.go"] = `
-		package logz
+	td.Files["log/log.go"] = `
+		package log
 		func New() *Logger { return &Logger{} }
 		type Logger struct {}
 		func (l *Logger) Info(msg string) {}
 	`
 	td.Files["session/session.go"] = `
 		package session
 		import "net/http"
-		import "app.com/logz"
-		func New(log *logz.Logger, w http.ResponseWriter, r *http.Request) *Session {
+		import "app.com/log"
+		func New(log *log.Logger, w http.ResponseWriter, r *http.Request) *Session {
 			return &Session{log, w, r}
 		}
 		type Session struct {
-			log *logz.Logger
+			log *log.Logger
 			w http.ResponseWriter
 			r *http.Request
 		}