diff --git a/cli/htmgo/tasks/run/entschema.go b/cli/htmgo/tasks/run/entschema.go index d8453b4..b25c8ac 100644 --- a/cli/htmgo/tasks/run/entschema.go +++ b/cli/htmgo/tasks/run/entschema.go @@ -3,6 +3,7 @@ package run import ( "github.com/maddalax/htmgo/cli/htmgo/internal/dirutil" "github.com/maddalax/htmgo/cli/htmgo/tasks/process" + "runtime" ) func EntNewSchema(name string) { @@ -11,6 +12,10 @@ func EntNewSchema(name string) { func EntGenerate() { if dirutil.HasFileFromRoot("ent/schema") { - process.RunOrExit("GOWORK=off go generate ./ent") + if runtime.GOOS == "windows" { + process.RunOrExit("go generate ./ent") + } else { + process.RunOrExit("bash -c GOWORK=off go generate ./ent") + } } } diff --git a/examples/todo-list/__htmgo/partials-generated.go b/examples/todo-list/__htmgo/partials-generated.go index b7f8546..b7700c6 100644 --- a/examples/todo-list/__htmgo/partials-generated.go +++ b/examples/todo-list/__htmgo/partials-generated.go @@ -3,23 +3,10 @@ package __htmgo import "github.com/maddalax/htmgo/framework/h" import "github.com/labstack/echo/v4" -import "todolist/partials" import "todolist/partials/task" func GetPartialFromContext(ctx echo.Context) *h.Partial { path := ctx.Request().URL.Path - if path == "SamplePartial" || path == "/todolist/partials.SamplePartial" { - cc := ctx.(*h.RequestContext) - return partials.SamplePartial(cc) - } - if path == "NewPartial" || path == "/todolist/partials.NewPartial" { - cc := ctx.(*h.RequestContext) - return partials.NewPartial(cc) - } - if path == "NewPartial2" || path == "/todolist/partials.NewPartial2" { - cc := ctx.(*h.RequestContext) - return partials.NewPartial2(cc) - } if path == "UpdateName" || path == "/todolist/partials/task.UpdateName" { cc := ctx.(*h.RequestContext) return task.UpdateName(cc) diff --git a/examples/todo-list/go.mod b/examples/todo-list/go.mod index a2f9247..4904a9f 100644 --- a/examples/todo-list/go.mod +++ b/examples/todo-list/go.mod @@ -4,8 +4,9 @@ go 1.23.0 require ( entgo.io/ent v0.14.1 + github.com/google/uuid v1.6.0 github.com/labstack/echo/v4 v4.12.0 - github.com/maddalax/htmgo/framework v0.0.0-20240923034654-e82ed0497052 + github.com/maddalax/htmgo/framework v0.0.0-20240924182609-b2c6b5207510 github.com/mattn/go-sqlite3 v1.14.16 ) @@ -15,7 +16,6 @@ require ( github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect github.com/go-openapi/inflect v0.19.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/hcl/v2 v2.13.0 // indirect github.com/labstack/gommon v0.4.2 // indirect github.com/mattn/go-colorable v0.1.13 // indirect diff --git a/examples/todo-list/go.sum b/examples/todo-list/go.sum index e9c2d56..1786c68 100644 --- a/examples/todo-list/go.sum +++ b/examples/todo-list/go.sum @@ -35,39 +35,25 @@ github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+k github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= -github.com/maddalax/htmgo/framework v0.0.0-20240918150417-f0f979e3a293 h1:/VisQ3836jcJkZQDiZUXk9CdOUCu3AY9476/924OSTQ= -github.com/maddalax/htmgo/framework v0.0.0-20240918150417-f0f979e3a293/go.mod h1:hH6EgyyjquAj9BWFRPcTnAB+dOVfLuO125/L8C3iilA= -github.com/maddalax/htmgo/framework v0.0.0-20240923023322-a975cff0d704 h1:IFiFgtpO2kdlyopz21oYAayvbrlg/VH+097Hyfth6fA= -github.com/maddalax/htmgo/framework v0.0.0-20240923023322-a975cff0d704/go.mod h1:TA7KCaKhurpXceQrzClJOHqRsUSd5NL64ZngSg+I3oc= -github.com/maddalax/htmgo/framework v0.0.0-20240923030856-e34b8fe141b2 h1:lelp0EJzo8Vx0lQy5OQXYeSBrrnnpkx2eDQ2FK4XhQU= -github.com/maddalax/htmgo/framework v0.0.0-20240923030856-e34b8fe141b2/go.mod h1:TA7KCaKhurpXceQrzClJOHqRsUSd5NL64ZngSg+I3oc= github.com/maddalax/htmgo/framework v0.0.0-20240923034654-e82ed0497052 h1:iEtAIL0zLDI3hp56VzHAccC4c6Iuem6dMARr9/aki9I= github.com/maddalax/htmgo/framework v0.0.0-20240923034654-e82ed0497052/go.mod h1:TA7KCaKhurpXceQrzClJOHqRsUSd5NL64ZngSg+I3oc= +github.com/maddalax/htmgo/framework v0.0.0-20240924182609-b2c6b5207510 h1:Gl9QRbIr008Qgvcsnsnkn1Q7Fusw3Hn6dPEbiV8M8wk= +github.com/maddalax/htmgo/framework v0.0.0-20240924182609-b2c6b5207510/go.mod h1:TA7KCaKhurpXceQrzClJOHqRsUSd5NL64ZngSg+I3oc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= -github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= -github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= @@ -85,8 +71,6 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -98,8 +82,6 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/examples/todo-list/partials/index.go b/examples/todo-list/partials/index.go deleted file mode 100644 index 58a8105..0000000 --- a/examples/todo-list/partials/index.go +++ /dev/null @@ -1,23 +0,0 @@ -package partials - -import ( - "github.com/maddalax/htmgo/framework/h" - "time" -) - -func CurrentTimePartial(ctx *h.RequestContext) *h.Partial { - now := time.Now() - return h.NewPartial( - h.Div( - h.Pf("The current time is %s", now.Format(time.RFC3339)), - ), - ) -} - -func NewPartial(ctx *h.RequestContext) *h.Partial { - return h.NewPartial(h.Div(h.P(h.Text("This sadsl.")))) -} - -func NewPartial2(ctx *h.RequestContext) *h.Partial { - return h.NewPartial(h.Div(h.P(h.Text("This sasdsadasdwl.")))) -} diff --git a/htmgo-site/go.mod b/htmgo-site/go.mod index 469d0a0..6119a9f 100644 --- a/htmgo-site/go.mod +++ b/htmgo-site/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/labstack/echo/v4 v4.12.0 - github.com/maddalax/htmgo/framework v0.0.0-20240924173916-2b8ba6e1aa58 + github.com/maddalax/htmgo/framework v0.0.0-20240924182609-b2c6b5207510 github.com/mattn/go-sqlite3 v1.14.16 github.com/yuin/goldmark v1.7.4 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc diff --git a/htmgo-site/go.sum b/htmgo-site/go.sum index b9dcde3..e4bcd4e 100644 --- a/htmgo-site/go.sum +++ b/htmgo-site/go.sum @@ -18,6 +18,8 @@ github.com/maddalax/htmgo/framework v0.0.0-20240923170417-9e23e7cf2bea h1:TcZtFX github.com/maddalax/htmgo/framework v0.0.0-20240923170417-9e23e7cf2bea/go.mod h1:TA7KCaKhurpXceQrzClJOHqRsUSd5NL64ZngSg+I3oc= github.com/maddalax/htmgo/framework v0.0.0-20240924173916-2b8ba6e1aa58 h1:xvBCxG0r2XJHPIb5q994lbZJVPxIOxCRsxoFj5mtlO4= github.com/maddalax/htmgo/framework v0.0.0-20240924173916-2b8ba6e1aa58/go.mod h1:TA7KCaKhurpXceQrzClJOHqRsUSd5NL64ZngSg+I3oc= +github.com/maddalax/htmgo/framework v0.0.0-20240924182609-b2c6b5207510 h1:Gl9QRbIr008Qgvcsnsnkn1Q7Fusw3Hn6dPEbiV8M8wk= +github.com/maddalax/htmgo/framework v0.0.0-20240924182609-b2c6b5207510/go.mod h1:TA7KCaKhurpXceQrzClJOHqRsUSd5NL64ZngSg+I3oc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= diff --git a/templates/starter/go.mod b/templates/starter/go.mod index adb8ea3..6ce5e07 100644 --- a/templates/starter/go.mod +++ b/templates/starter/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/labstack/echo/v4 v4.12.0 - github.com/maddalax/htmgo/framework v0.0.0-20240923041212-939e80968f38 + github.com/maddalax/htmgo/framework v0.0.0-20240924182609-b2c6b5207510 github.com/mattn/go-sqlite3 v1.14.16 )