Skip to content

Updating scaffolding to create default.css #254

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

Open
ralfiannor wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Updating scaffolding to create default.css #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5cdb9da
Merge pull request #1 from livebud/main
ralfiannor Aug 27, 2022
17d64f0
Merge pull request #2 from livebud/main
ralfiannor Aug 29, 2022
2378cbf
Merge pull request #3 from livebud/main
ralfiannor Sep 18, 2022
7803102
delete default css
ralfiannor Aug 20, 2022
481da95
add default css in render default layout
ralfiannor Aug 27, 2022
5b8253f
add normalize.css to embedded file
ralfiannor Aug 27, 2022
be8ad19
update scaffolding to add public/default.css
ralfiannor Aug 27, 2022
6091965
Change func name for clearly in embedded
ralfiannor Aug 31, 2022
61afb45
add test case for default.css scaffolding
ralfiannor Sep 1, 2022
d35f4e1
remove emptyCss
ralfiannor Sep 18, 2022
f721555
linked default css to svelte runtime when added
ralfiannor Sep 18, 2022
ec8fa79
reverted cuz default css is not implemented to public.go
ralfiannor Sep 21, 2022
d16a93d
remove css parameter
ralfiannor Sep 21, 2022
f3067ee
remove chunked header in unit test
ralfiannor Sep 25, 2022
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
17 changes: 0 additions & 17 deletions framework/controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,6 @@ func TestViewUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Comment thread
matthewmueller marked this conversation as resolved.
Content-Type: text/html
`))
el, err := res.Query("#bud_target")
Expand All @@ -1308,7 +1307,6 @@ func TestViewUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err = res.Query("#bud_target")
Expand All @@ -1330,7 +1328,6 @@ func TestViewUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err = res.Query("#bud_target")
Expand All @@ -1352,7 +1349,6 @@ func TestViewUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err = res.Query("#bud_target")
Expand Down Expand Up @@ -1435,7 +1431,6 @@ func TestViewNestedUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err := res.Query("#bud_target")
Expand All @@ -1457,7 +1452,6 @@ func TestViewNestedUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err = res.Query("#bud_target")
Expand All @@ -1479,7 +1473,6 @@ func TestViewNestedUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err = res.Query("#bud_target")
Expand All @@ -1501,7 +1494,6 @@ func TestViewNestedUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err = res.Query("#bud_target")
Expand Down Expand Up @@ -1587,7 +1579,6 @@ func TestViewDeepUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err := res.Query("#bud_target")
Expand All @@ -1609,7 +1600,6 @@ func TestViewDeepUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err = res.Query("#bud_target")
Expand All @@ -1631,7 +1621,6 @@ func TestViewDeepUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err = res.Query("#bud_target")
Expand All @@ -1653,7 +1642,6 @@ func TestViewDeepUnnamed(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
el, err = res.Query("#bud_target")
Expand Down Expand Up @@ -1774,7 +1762,6 @@ func TestEmptyActionWithView(t *testing.T) {
// HTML response
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
is.In(res.Body().String(), `<h1>hello</h1>`)
Expand Down Expand Up @@ -2834,7 +2821,6 @@ func TestCreateRouteAndControllerAndView(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
sel, err := res.Query("#bud_target")
Expand Down Expand Up @@ -2875,7 +2861,6 @@ func TestCreateRouteAndControllerAndView(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
sel, err = res.Query("#bud_target")
Expand Down Expand Up @@ -2918,7 +2903,6 @@ func TestDeleteRouteAndControllerAndView(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
sel, err := res.Query("#bud_target")
Expand All @@ -2931,7 +2915,6 @@ func TestDeleteRouteAndControllerAndView(t *testing.T) {
is.NoErr(err)
is.NoErr(res.DiffHeaders(`
HTTP/1.1 200 OK
Transfer-Encoding: chunked
Content-Type: text/html
`))
sel, err = res.Query("#bud_target")
Expand Down
6 changes: 6 additions & 0 deletions framework/view/ssr/ssr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/livebud/bud/internal/gotemplate"
"github.com/livebud/bud/package/budfs"
"github.com/livebud/bud/package/gomod"
"github.com/livebud/bud/package/vfs"
)

// Response from evaluating SSR files
Expand Down Expand Up @@ -49,6 +50,11 @@ type Compiler struct {

func (c *Compiler) Compile(ctx context.Context, fsys budfs.FS) ([]byte, error) {
dir := c.module.Directory()

if existCss := vfs.Exist(fsys, "public/default.css"); nil == existCss {
svelteRuntime = strings.Replace(svelteRuntime, `<!-- default css -->`, `<link rel="stylesheet" href="default.css">`, 1)
}

result := esbuild.Build(esbuild.BuildOptions{
EntryPointsAdvanced: []esbuild.EntryPoint{
{
Expand Down
75 changes: 75 additions & 0 deletions framework/view/ssr/ssr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,81 @@ func TestSvelteHello(t *testing.T) {
is.True(strings.Contains(res.Body, `<h1>hi world</h1>`))
}

func TestSvelteRemoveDefaultCss(t *testing.T) {
is := is.New(t)
log := testlog.New()
ctx := context.Background()
dir := t.TempDir()
td := testdir.New(dir)
td.Files["view/index.svelte"] = `<h1>hi world</h1>`
td.NodeModules["svelte"] = versions.Svelte
is.NoErr(td.Write(ctx))
vm, err := v8.Load()
is.NoErr(err)
svelteCompiler, err := svelte.Load(vm)
is.NoErr(err)
transformer := transformrt.MustLoad(svelte.NewTransformable(svelteCompiler))
module, err := gomod.Find(dir)
is.NoErr(err)
bfs := budfs.New(module, log)
is.NoErr(err)
bfs.FileGenerator("bud/view/_ssr.js", ssr.New(module, transformer.SSR))
// Read the wrapped version of index.svelte with node_modules rewritten
code, err := fs.ReadFile(bfs, "bud/view/_ssr.js")
is.NoErr(err)
is.True(strings.Contains(string(code), `create_ssr_component(`))
is.True(strings.Contains(string(code), `<h1>hi world</h1>`))
is.True(strings.Contains(string(code), `views["/"] = `))
result, err := vm.Eval("render.js", string(code)+`; bud.render("/", {})`)
is.NoErr(err)
var res ssr.Response
err = json.Unmarshal([]byte(result), &res)
is.NoErr(err)
is.Equal(res.Status, 200)
is.Equal(len(res.Headers), 1)
is.Equal(res.Headers["Content-Type"], "text/html")
// svelte must not linked to default.css when removed
is.True(!strings.Contains(res.Body, `<link rel="stylesheet" href="default.css">`))
is.True(strings.Contains(res.Body, `<!-- default css -->`))
}

func TestSvelteDefaultCss(t *testing.T) {
is := is.New(t)
log := testlog.New()
ctx := context.Background()
dir := t.TempDir()
td := testdir.New(dir)
td.Files["view/index.svelte"] = `<h1>hi world</h1>`
td.Files["public/default.css"] = `.body{}`
td.NodeModules["svelte"] = versions.Svelte
is.NoErr(td.Write(ctx))
vm, err := v8.Load()
is.NoErr(err)
svelteCompiler, err := svelte.Load(vm)
is.NoErr(err)
transformer := transformrt.MustLoad(svelte.NewTransformable(svelteCompiler))
module, err := gomod.Find(dir)
is.NoErr(err)
bfs := budfs.New(module, log)
is.NoErr(err)
bfs.FileGenerator("bud/view/_ssr.js", ssr.New(module, transformer.SSR))
// Read the wrapped version of index.svelte with node_modules rewritten
code, err := fs.ReadFile(bfs, "bud/view/_ssr.js")
is.NoErr(err)
is.True(strings.Contains(string(code), `create_ssr_component(`))
is.True(strings.Contains(string(code), `<h1>hi world</h1>`))
is.True(strings.Contains(string(code), `views["/"] = `))
result, err := vm.Eval("render.js", string(code)+`; bud.render("/", {})`)
is.NoErr(err)
var res ssr.Response
err = json.Unmarshal([]byte(result), &res)
is.NoErr(err)
is.Equal(res.Status, 200)
is.Equal(len(res.Headers), 1)
is.Equal(res.Headers["Content-Type"], "text/html")
is.True(strings.Contains(res.Body, `<link rel="stylesheet" href="default.css">`))
}

func TestSvelteAwait(t *testing.T) {
is := is.New(t)
log := testlog.New()
Expand Down
Loading