From: early Date: Sat, 2 Nov 2024 18:39:01 +0000 (-0600) Subject: unfuck the go.mods X-Git-Url: https://git.earlybird.gay/?a=commitdiff_plain;h=e4b9ef884620e4daf2dd358f30291a757e7cbb58;p=today unfuck the go.mods --- diff --git a/README.md b/README.md index 952db96..05b634d 100644 --- a/README.md +++ b/README.md @@ -1 +1,11 @@ -# Today Web Framework \ No newline at end of file +# Today Web Framework + +Today is a web framework for making server-side rendered websites in Go. + +- Start with a static file website. +- Add dynamic content where you need it. +- Encapsulate and distribute repeated behavior. + +## Installation and Requirements + +`go get git.earlybird.gay/today@latest` diff --git a/app/app.go b/app/app.go index ccf1b75..9bcace5 100644 --- a/app/app.go +++ b/app/app.go @@ -18,8 +18,8 @@ import ( "sync" "sync/atomic" - "git.earlybird.gay/today-engine/include" - "git.earlybird.gay/today-engine/page" + "git.earlybird.gay/today/include" + "git.earlybird.gay/today/web/page" ) func init() { diff --git a/app/go.mod b/app/go.mod deleted file mode 100644 index 18c43e4..0000000 --- a/app/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module git.earlybird.gay/today-app - -go 1.22.4 - -require git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f diff --git a/app/go.sum b/app/go.sum deleted file mode 100644 index 6423552..0000000 --- a/app/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f h1:vyQTIzkDUvqO3coZArw+jiERQ0xzLVjaZx6n6lIpOxQ= -git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f/go.mod h1:9w8xpAPxs1QvT//ph/jgAuRIoWyqdi2QEifwsKWOKns= diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..41e9760 --- /dev/null +++ b/go.mod @@ -0,0 +1,10 @@ +module git.earlybird.gay/today + +go 1.22.4 + +require ( + git.earlybird.gay/today-app v0.0.0-20241023050205-d1c3413a0e12 + golang.org/x/text v0.19.0 +) + +require git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f // indirect diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..f849da5 --- /dev/null +++ b/go.sum @@ -0,0 +1,6 @@ +git.earlybird.gay/today-app v0.0.0-20241023050205-d1c3413a0e12 h1:I4PpIONymTb+ti3at+5+Rixs7uApzVWpY9YoGP10b0s= +git.earlybird.gay/today-app v0.0.0-20241023050205-d1c3413a0e12/go.mod h1:ua0E6veNXtTRAXXJPsJP4hzQohFW+0Ogy6PZoX7pHCU= +git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f h1:vyQTIzkDUvqO3coZArw+jiERQ0xzLVjaZx6n6lIpOxQ= +git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f/go.mod h1:9w8xpAPxs1QvT//ph/jgAuRIoWyqdi2QEifwsKWOKns= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= diff --git a/web/README.md b/web/README.md index df9e1df..509c1b8 100644 --- a/web/README.md +++ b/web/README.md @@ -9,7 +9,7 @@ License: MIT, BSD ## Installation -go get git.earlybird.gay/today-engine@latest +go get git.earlybird.gay/today/web@latest ## Why? diff --git a/web/cmd/standard-test/main.go b/web/cmd/standard-test/main.go index 88fad7c..776abd0 100644 --- a/web/cmd/standard-test/main.go +++ b/web/cmd/standard-test/main.go @@ -7,10 +7,10 @@ import ( "text/template" tapp "git.earlybird.gay/today-app/app" - "git.earlybird.gay/today-engine/page" - "git.earlybird.gay/today-engine/part" - "git.earlybird.gay/today-engine/render" - stdpart "git.earlybird.gay/today-engine/standard/part" + "git.earlybird.gay/today/web/page" + "git.earlybird.gay/today/web/part" + "git.earlybird.gay/today/web/render" + stdpart "git.earlybird.gay/today/web/standard/part" ) var Thing = part.New("test-thing", "test_thing.html", diff --git a/web/component/component.go b/web/component/component.go index 22370e2..3847343 100644 --- a/web/component/component.go +++ b/web/component/component.go @@ -2,8 +2,8 @@ package component import ( - "git.earlybird.gay/today-engine/include" - "git.earlybird.gay/today-engine/internal/compile" + "git.earlybird.gay/today/include" + "git.earlybird.gay/today/web/internal/compile" ) type Component struct { @@ -27,7 +27,7 @@ func New(name string, source string, optional ...func(*Component)) *Component { // Assign basic parameters p.name = name p.fileName = source - p.source = include.File(source, "git.earlybird.gay/today-engine/component") + p.source = include.File(source, "git.earlybird.gay/today/web/component") // Run optional arguments for _, of := range optional { of(p) diff --git a/web/go.mod b/web/go.mod deleted file mode 100644 index fb5c1b4..0000000 --- a/web/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module git.earlybird.gay/today-engine - -go 1.22.4 - -require ( - git.earlybird.gay/today-app v0.0.0-20240813010007-675f08ae35b1 - golang.org/x/text v0.17.0 -) diff --git a/web/go.sum b/web/go.sum deleted file mode 100644 index ca1ee0b..0000000 --- a/web/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -git.earlybird.gay/today-app v0.0.0-20240813010007-675f08ae35b1 h1:Fbz2uRIWK6CR+jcNN0KQrna4u/kYZccn2obcla7dPfQ= -git.earlybird.gay/today-app v0.0.0-20240813010007-675f08ae35b1/go.mod h1:AxsoC2ERffYriW60C1vdV34ew6JPKxllG9mHOTs128I= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= diff --git a/web/htmltree/attrs.go b/web/htmltree/attrs.go index 4d9ab2e..3f337bd 100644 --- a/web/htmltree/attrs.go +++ b/web/htmltree/attrs.go @@ -1,7 +1,7 @@ // Copyright (C) 2024 early (LGPL) package htmltree -import "git.earlybird.gay/today-engine/internal/html" +import "git.earlybird.gay/today/web/internal/html" func GetAttr(n *html.Node, name string) string { for _, attr := range n.Attr { diff --git a/web/htmltree/prettify.go b/web/htmltree/prettify.go index 33fbdd0..26df0eb 100644 --- a/web/htmltree/prettify.go +++ b/web/htmltree/prettify.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "git.earlybird.gay/today-engine/internal/html" + "git.earlybird.gay/today/web/internal/html" ) func Walk(root *html.Node, f func(*html.Node) (bool, error)) error { diff --git a/web/internal/compile/compile.go b/web/internal/compile/compile.go index 9b88807..c26afc7 100644 --- a/web/internal/compile/compile.go +++ b/web/internal/compile/compile.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "git.earlybird.gay/today-engine/htmltree" - "git.earlybird.gay/today-engine/include" - "git.earlybird.gay/today-engine/internal/html" - "git.earlybird.gay/today-engine/render" + "git.earlybird.gay/today/include" + "git.earlybird.gay/today/web/htmltree" + "git.earlybird.gay/today/web/internal/html" + "git.earlybird.gay/today/web/render" ) type Source interface { diff --git a/web/internal/compile/component.go b/web/internal/compile/component.go index 7f77949..7fd726c 100644 --- a/web/internal/compile/component.go +++ b/web/internal/compile/component.go @@ -3,9 +3,9 @@ package compile import ( "errors" - "git.earlybird.gay/today-engine/htmltree" - "git.earlybird.gay/today-engine/internal/html" - "git.earlybird.gay/today-engine/internal/html/atom" + "git.earlybird.gay/today/web/htmltree" + "git.earlybird.gay/today/web/internal/html" + "git.earlybird.gay/today/web/internal/html/atom" ) var ErrBadComponentFormat = errors.New("web components must either be a script or a template and script") diff --git a/web/internal/compile/compute.go b/web/internal/compile/compute.go index 5c5f69a..883b888 100644 --- a/web/internal/compile/compute.go +++ b/web/internal/compile/compute.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "git.earlybird.gay/today-engine/render" + "git.earlybird.gay/today/web/render" ) type computeNode struct { diff --git a/web/internal/compile/template.go b/web/internal/compile/template.go index 1fd6f5b..3692406 100644 --- a/web/internal/compile/template.go +++ b/web/internal/compile/template.go @@ -8,8 +8,8 @@ import ( "slices" "strings" - "git.earlybird.gay/today-engine/htmltree" - "git.earlybird.gay/today-engine/internal/html" + "git.earlybird.gay/today/web/htmltree" + "git.earlybird.gay/today/web/internal/html" ) const ( diff --git a/web/internal/html/atom/atom.go b/web/internal/html/atom/atom.go index cb79263..acc60e6 100644 --- a/web/internal/html/atom/atom.go +++ b/web/internal/html/atom/atom.go @@ -15,7 +15,7 @@ // whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to // be dense. The only guarantees are that e.g. looking up "div" will yield // atom.Div, calling atom.Div.String will return "div", and atom.Div != 0. -package atom // import "git.earlybird.gay/today-engine/internal/html/atom" +package atom // import "git.earlybird.gay/today/web/internal/html/atom" // Atom is an integer code for a string. The zero value maps to "". type Atom uint32 diff --git a/web/internal/html/charset/charset.go b/web/internal/html/charset/charset.go index f61c6c3..e40a865 100644 --- a/web/internal/html/charset/charset.go +++ b/web/internal/html/charset/charset.go @@ -6,7 +6,7 @@ // // The mapping from encoding labels to encodings is defined at // https://encoding.spec.whatwg.org/. -package charset // import "git.earlybird.gay/today-engine/internal/html/charset" +package charset // import "git.earlybird.gay/today/web/internal/html/charset" import ( "bytes" @@ -16,7 +16,7 @@ import ( "strings" "unicode/utf8" - "git.earlybird.gay/today-engine/internal/html" + "git.earlybird.gay/today/web/internal/html" "golang.org/x/text/encoding" "golang.org/x/text/encoding/charmap" "golang.org/x/text/encoding/htmlindex" diff --git a/web/internal/html/doc.go b/web/internal/html/doc.go index 850c47f..c54063c 100644 --- a/web/internal/html/doc.go +++ b/web/internal/html/doc.go @@ -114,7 +114,7 @@ parsed content, the input must be re-serialized (for instance by using Render or Token.String) in order for those trust decisions to hold, as the process of tokenization or parsing may alter the content. */ -package html // import "git.earlybird.gay/today-engine/internal/html" +package html // import "git.earlybird.gay/today/web/internal/html" // The tokenization algorithm implemented by this package is not a line-by-line // transliteration of the relatively verbose state-machine in the WHATWG diff --git a/web/internal/html/example_test.go b/web/internal/html/example_test.go index ebdd168..55a3d2c 100644 --- a/web/internal/html/example_test.go +++ b/web/internal/html/example_test.go @@ -10,7 +10,7 @@ import ( "log" "strings" - "git.earlybird.gay/today-engine/internal/html" + "git.earlybird.gay/today/web/internal/html" ) func ExampleParse() { diff --git a/web/internal/html/node.go b/web/internal/html/node.go index bb1624b..ef0a079 100644 --- a/web/internal/html/node.go +++ b/web/internal/html/node.go @@ -5,7 +5,7 @@ package html import ( - "git.earlybird.gay/today-engine/internal/html/atom" + "git.earlybird.gay/today/web/internal/html/atom" ) // A NodeType is the type of a Node. diff --git a/web/internal/html/parse.go b/web/internal/html/parse.go index 8c1131b..b4aac55 100644 --- a/web/internal/html/parse.go +++ b/web/internal/html/parse.go @@ -10,7 +10,7 @@ import ( "io" "strings" - a "git.earlybird.gay/today-engine/internal/html/atom" + a "git.earlybird.gay/today/web/internal/html/atom" ) // A parser implements the HTML5 parsing algorithm: diff --git a/web/internal/html/parse_test.go b/web/internal/html/parse_test.go index b2b7fdc..3b7a349 100644 --- a/web/internal/html/parse_test.go +++ b/web/internal/html/parse_test.go @@ -17,7 +17,7 @@ import ( "strings" "testing" - "git.earlybird.gay/today-engine/internal/html/atom" + "git.earlybird.gay/today/web/internal/html/atom" ) type testAttrs struct { diff --git a/web/internal/html/token.go b/web/internal/html/token.go index a4861bd..1c8251d 100644 --- a/web/internal/html/token.go +++ b/web/internal/html/token.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "git.earlybird.gay/today-engine/internal/html/atom" + "git.earlybird.gay/today/web/internal/html/atom" ) // A TokenType is the type of a Token. diff --git a/web/page/page.go b/web/page/page.go index 95879e7..be74b9e 100644 --- a/web/page/page.go +++ b/web/page/page.go @@ -7,11 +7,11 @@ import ( "path/filepath" "strings" - "git.earlybird.gay/today-engine/htmltree" - "git.earlybird.gay/today-engine/include" - "git.earlybird.gay/today-engine/internal/compile" - "git.earlybird.gay/today-engine/part" - "git.earlybird.gay/today-engine/render" + "git.earlybird.gay/today/include" + "git.earlybird.gay/today/web/htmltree" + "git.earlybird.gay/today/web/internal/compile" + "git.earlybird.gay/today/web/part" + "git.earlybird.gay/today/web/render" ) type Page struct { @@ -40,7 +40,7 @@ func Name(name string) Config { func Source(source string) Config { return func(p *Page) { - p.source = include.File(source, "git.earlybird.gay/today-engine/part") + p.source = include.File(source, "git.earlybird.gay/today/web/part") } } @@ -74,7 +74,7 @@ func New(name string, source string, optional ...func(*Page)) *Page { p := new(Page) // Assign basic parameters p.name = name - p.source = include.File(source, "git.earlybird.gay/today-engine/page") + p.source = include.File(source, "git.earlybird.gay/today/web/page") p.onLoad = func(ctx context.Context, d render.Data) error { return nil } diff --git a/web/page/serve.go b/web/page/serve.go index ad05884..75f8bca 100644 --- a/web/page/serve.go +++ b/web/page/serve.go @@ -4,7 +4,7 @@ package page import ( "net/http" - "git.earlybird.gay/today-engine/render" + "git.earlybird.gay/today/web/render" ) type RootData struct { diff --git a/web/part/part.go b/web/part/part.go index ed808cf..baa8c6c 100644 --- a/web/part/part.go +++ b/web/part/part.go @@ -5,9 +5,9 @@ import ( "context" "text/template" - "git.earlybird.gay/today-engine/include" - "git.earlybird.gay/today-engine/internal/compile" - "git.earlybird.gay/today-engine/render" + "git.earlybird.gay/today/include" + "git.earlybird.gay/today/web/internal/compile" + "git.earlybird.gay/today/web/render" ) type Part struct { @@ -30,7 +30,7 @@ func Name(name string) Config { func Source(source string) Config { return func(p *Part) { - p.source = include.File(source, "git.earlybird.gay/today-engine/part") + p.source = include.File(source, "git.earlybird.gay/today/web/part") } } @@ -68,7 +68,7 @@ func New(name string, source string, optional ...func(*Part)) *Part { p := new(Part) // Assign basic parameters p.name = name - p.source = include.File(source, "git.earlybird.gay/today-engine/part") + p.source = include.File(source, "git.earlybird.gay/today/web/part") p.onLoad = func(ctx context.Context, data render.Data) error { return nil } diff --git a/web/standard/part/contact_form.go b/web/standard/part/contact_form.go index f8aae36..901b101 100644 --- a/web/standard/part/contact_form.go +++ b/web/standard/part/contact_form.go @@ -7,8 +7,8 @@ import ( "net/http" "net/url" - "git.earlybird.gay/today-engine/part" - "git.earlybird.gay/today-engine/render" + "git.earlybird.gay/today/web/part" + "git.earlybird.gay/today/web/render" ) var (