cleanup

maddalax · Nov 9, 2024 · cd180a6 · cd180a6
1 parent 94a7e36
commit cd180a6
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 11 deletions.
diff --git a/examples/ws-example/main.go b/examples/ws-example/main.go
@@ -3,9 +3,9 @@ package main
 import (
 	"github.com/maddalax/htmgo/extensions/websocket"
 	ws2 "github.com/maddalax/htmgo/extensions/websocket/opts"
+	"github.com/maddalax/htmgo/extensions/websocket/session"
 	"github.com/maddalax/htmgo/framework/h"
 	"github.com/maddalax/htmgo/framework/service"
-	"github.com/maddalax/htmgo/framework/session"
 	"io/fs"
 	"net/http"
 	"ws-example/__htmgo"

diff --git a/examples/ws-example/pages/index.go b/examples/ws-example/pages/index.go
@@ -2,9 +2,9 @@ package pages
 
 import (
 	"fmt"
+	"github.com/maddalax/htmgo/extensions/websocket/session"
 	"github.com/maddalax/htmgo/extensions/websocket/ws"
 	"github.com/maddalax/htmgo/framework/h"
-	"github.com/maddalax/htmgo/framework/session"
 	"ws-example/partials"
 )
 

diff --git a/examples/ws-example/pages/root.go b/examples/ws-example/pages/root.go
@@ -6,7 +6,12 @@ import (
 
 func RootPage(ctx *h.RequestContext, children ...h.Ren) h.Ren {
 	return h.Html(
-		h.HxExtension(h.BaseExtensions()),
+		h.JoinExtensions(
+			h.HxExtension(
+				h.BaseExtensions(),
+			),
+			h.HxExtension("ws"),
+		),
 		h.Head(
 			h.Link("/public/main.css", "stylesheet"),
 			h.Script("/public/htmgo.js"),

diff --git a/examples/ws-example/pages/ws/metrics.go b/examples/ws-example/pages/ws/metrics.go
@@ -2,9 +2,9 @@ package ws
 
 import (
 	"fmt"
+	"github.com/maddalax/htmgo/extensions/websocket/session"
 	"github.com/maddalax/htmgo/extensions/websocket/ws"
 	"github.com/maddalax/htmgo/framework/h"
-	"github.com/maddalax/htmgo/framework/session"
 	"runtime"
 	"time"
 	"ws-example/pages"

diff --git a/examples/ws-example/partials/index.go b/examples/ws-example/partials/index.go
@@ -1,9 +1,9 @@
 package partials
 
 import (
+	"github.com/maddalax/htmgo/extensions/websocket/session"
 	"github.com/maddalax/htmgo/extensions/websocket/ws"
 	"github.com/maddalax/htmgo/framework/h"
-	"github.com/maddalax/htmgo/framework/session"
 )
 
 type Counter struct {

diff --git a/framework/session/state.go → extensions/websocket/session/session.go b/framework/session/state.go → extensions/websocket/session/session.go
diff --git a/extensions/websocket/ws/dispatch.go b/extensions/websocket/ws/dispatch.go
@@ -2,9 +2,9 @@ package ws
 
 import (
 	"github.com/maddalax/htmgo/extensions/websocket/internal/wsutil"
+	"github.com/maddalax/htmgo/extensions/websocket/session"
 	"github.com/maddalax/htmgo/framework/h"
 	"github.com/maddalax/htmgo/framework/service"
-	"github.com/maddalax/htmgo/framework/session"
 )
 
 // PushServerSideEvent sends a server side event this specific session

diff --git a/extensions/websocket/ws/every.go b/extensions/websocket/ws/every.go
@@ -2,9 +2,9 @@ package ws
 
 import (
 	"github.com/maddalax/htmgo/extensions/websocket/internal/wsutil"
+	"github.com/maddalax/htmgo/extensions/websocket/session"
 	"github.com/maddalax/htmgo/framework/h"
 	"github.com/maddalax/htmgo/framework/service"
-	"github.com/maddalax/htmgo/framework/session"
 	"time"
 )
 

diff --git a/extensions/websocket/ws/handler.go b/extensions/websocket/ws/handler.go
@@ -3,7 +3,7 @@ package ws
 import (
 	"fmt"
 	"github.com/maddalax/htmgo/extensions/websocket/internal/wsutil"
-	"github.com/maddalax/htmgo/framework/session"
+	"github.com/maddalax/htmgo/extensions/websocket/session"
 	"sync"
 )
 

diff --git a/extensions/websocket/ws/listener.go b/extensions/websocket/ws/listener.go
@@ -2,8 +2,8 @@ package ws
 
 import (
 	"github.com/maddalax/htmgo/extensions/websocket/internal/wsutil"
+	"github.com/maddalax/htmgo/extensions/websocket/session"
 	"github.com/maddalax/htmgo/framework/service"
-	"github.com/maddalax/htmgo/framework/session"
 )
 
 func StartListener(locator *service.Locator) {

diff --git a/extensions/websocket/ws/register.go b/extensions/websocket/ws/register.go
@@ -2,8 +2,8 @@ package ws
 
 import (
 	"github.com/maddalax/htmgo/extensions/websocket/internal/wsutil"
+	"github.com/maddalax/htmgo/extensions/websocket/session"
 	"github.com/maddalax/htmgo/framework/h"
-	"github.com/maddalax/htmgo/framework/session"
 	"github.com/puzpuzpuz/xsync/v3"
 	"sync"
 	"sync/atomic"

diff --git a/framework/h/extensions.go b/framework/h/extensions.go
@@ -3,7 +3,7 @@ package h
 import "strings"
 
 func BaseExtensions() string {
-	extensions := []string{"path-deps", "response-targets", "mutation-error", "htmgo", "sse", "ws"}
+	extensions := []string{"path-deps", "response-targets", "mutation-error", "htmgo", "sse"}
 	if IsDevelopment() {
 		extensions = append(extensions, "livereload")
 	}