coder · kylecarbs · Jun 4, 2022 · May 6, 2022 · May 15, 2022 · May 24, 2022
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -78,7 +78,7 @@ func New(options *Options) *API {
 	api := &API{
 		Options:     options,
 		Handler:     r,
-		siteHandler: site.Handler(),
+		siteHandler: site.Handler(site.FS()),
 	}
 	api.workspaceAgentCache = wsconncache.New(api.dialWorkspaceAgent, 0)
 

diff --git a/go.mod b/go.mod
@@ -126,8 +126,6 @@ require (
 	storj.io/drpc v0.0.30
 )
 
-require github.com/go-chi/cors v1.2.1
-
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect

diff --git a/go.sum b/go.sum
@@ -570,8 +570,6 @@ github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs=
 github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg=
 github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
 github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
-github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-chi/httprate v0.5.3 h1:5HPWb0N6ymIiuotMtCfOGpQKiKeqXVzMexHh1W1yXPc=
 github.com/go-chi/httprate v0.5.3/go.mod h1:kYR4lorHX3It9tTh4eTdHhcF2bzrYnCrRNlv5+IBm2M=
 github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=

diff --git a/site/embed_slim.go b/site/embed_slim.go
@@ -1,12 +1,9 @@
-//go:build embed
-// +build embed
-
 package site
 
 import (
 	"bytes"
 	"context"
-	"embed"
+
 	"fmt"
 	"io"
 	"io/fs"
@@ -22,13 +19,6 @@ import (
 	"golang.org/x/xerrors"
 )
 
-// The `embed` package ignores recursively including directories
-// that prefix with `_`. Wildcarding nested is janky, but seems to
-// work quite well for edge-cases.
-//go:embed out
-//go:embed out/bin/*
-var site embed.FS
-
 type apiResponseContextKey struct{}
 
 // WithAPIResponse returns a context with the APIResponse value attached.
@@ -38,21 +28,8 @@ func WithAPIResponse(ctx context.Context, apiResponse APIResponse) context.Conte
 	return context.WithValue(ctx, apiResponseContextKey{}, apiResponse)
 }
 
-func Handler() http.Handler {
-	// the out directory is where webpack builds are created. It is in the same
-	// directory as this file (package site).
-	siteFS, err := fs.Sub(site, "out")
-
-	if err != nil {
-		// This can't happen... Go would throw a compilation error.
-		panic(err)
-	}
-
-	return HandlerWithFS(siteFS)
-}
-
 // Handler returns an HTTP handler for serving the static site.
-func HandlerWithFS(fileSystem fs.FS) http.Handler {
+func Handler(fileSystem fs.FS) http.Handler {
 	// html files are handled by a text/template. Non-html files
 	// are served by the default file server.
 	//

diff --git a/site/site_embed.go b/site/site_embed.go
@@ -0,0 +1,24 @@
+//go:build embed
+// +build embed
+
+package site
+
+import (
+	"embed"
+	"io/fs"
+)
+
+//go:embed out
+//go:embed out/bin/*
+var site embed.FS
+
+func FS() fs.FS {
+	// the out directory is where webpack builds are created. It is in the same
+	// directory as this file (package site).
+	out, err := fs.Sub(site, "out")
+	if err != nil {
+		// This can't happen... Go would throw a compilation error.
+		panic(err)
+	}
+	return out
+}
diff --git a/site/site_slim.go b/site/site_slim.go
@@ -0,0 +1,15 @@
+//go:build !embed
+// +build !embed
+
+package site
+
+import (
+	"embed"
+	"io/fs"
+)
+
+var slim embed.FS
+
+func FS() fs.FS {
+	return slim
+}
@@ -1,6 +1,3 @@
-//go:build embed
-// +build embed
-
 package site_test
 
 import (
@@ -40,7 +37,7 @@ func TestCaching(t *testing.T) {
 		},
 	}
 
-	srv := httptest.NewServer(site.HandlerWithFS(rootFS))
+	srv := httptest.NewServer(site.Handler(rootFS))
 	defer srv.Close()
 
 	// Create a context
@@ -99,7 +96,7 @@ func TestServingFiles(t *testing.T) {
 		},
 	}
 
-	srv := httptest.NewServer(site.HandlerWithFS(rootFS))
+	srv := httptest.NewServer(site.Handler(rootFS))
 	defer srv.Close()
 
 	// Create a context
@@ -190,7 +187,7 @@ func TestServeAPIResponse(t *testing.T) {
 	}
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		r = r.WithContext(site.WithAPIResponse(r.Context(), apiResponse))
-		site.HandlerWithFS(rootFS).ServeHTTP(w, r)
+		site.Handler(rootFS).ServeHTTP(w, r)
 	}))
 	defer srv.Close()