Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore: Refactor site to improve testing #2014

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 1 commit into from
Jun 3, 2022
Merged

chore: Refactor site to improve testing #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ func New(options *Options) *API {
r.Get("/state", api.workspaceBuildState)
})
})
r.NotFound(site.DefaultHandler().ServeHTTP)
r.NotFound(site.Handler(site.FS()).ServeHTTP)

return api
}
Expand Down
12 changes: 0 additions & 12 deletions site/embed_slim.go
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions site/embed.go → site/site.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
//go:build embed
// +build embed

package site

import (
"bytes"
"embed"
"fmt"
"io"
"io/fs"
Expand All @@ -21,26 +17,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

func DefaultHandler() 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 Handler(siteFS)
}

// Handler returns an HTTP handler for serving the static site.
func Handler(fileSystem fs.FS) http.Handler {
// html files are handled by a text/template. Non-html files
Expand Down
24 changes: 24 additions & 0 deletions site/site_embed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
15 changes: 15 additions & 0 deletions site/site_slim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
3 changes: 0 additions & 3 deletions site/embed_test.go → site/site_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//go:build embed
// +build embed

package site_test

import (
Expand Down