Merge pull request #1640 from cogentcore/go25

Update to go v1.25.6 as standard version, and go mod updates

Author: rcoreilly

.github/workflows/core.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.4'
+          go-version: '1.25.6'
 
       - name: Install Core
         run: go install

.github/workflows/go.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.23.4'
+        go-version: '1.25.6'
 
     - name: Set up Core
       run: go install && core setup

base/reflectx/values_test.go

@@ -143,7 +143,7 @@ func TestPointerSetRobust(t *testing.T) {
 	bptr := &b
 	err := SetRobust(&aptr, bptr)
 	if err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	}
 	assert.Equal(t, aptr, bptr)
 

base/websocket/websocket_generatehtml.go

@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !js && !generatehtml
+//go:build !js
 
 package websocket
 
 import (
 	"cogentcore.org/core/base/errors"
+	"cogentcore.org/core/system"
 	"github.com/gorilla/websocket"
 )
 
@@ -24,6 +25,9 @@ type Client struct {
 
 // Connect connects to a WebSocket server and returns a [Client].
 func Connect(url string) (*Client, error) {
+	if system.GenerateHTMLArg() {
+		return &Client{}, nil
+	}
 	conn, _, err := websocket.DefaultDialer.Dial(url, nil)
 	if err != nil {
 		return nil, err
@@ -34,6 +38,9 @@ func Connect(url string) (*Client, error) {
 // OnMessage sets a callback function to be called when a message is received.
 // This function can only be called once.
 func (c *Client) OnMessage(f func(typ MessageTypes, msg []byte)) {
+	if system.GenerateHTMLArg() {
+		return
+	}
 	go func() {
 		for {
 			typ, msg, err := c.conn.ReadMessage()
@@ -48,19 +55,28 @@ func (c *Client) OnMessage(f func(typ MessageTypes, msg []byte)) {
 
 // Send sends a message to the WebSocket server with the given type and message.
 func (c *Client) Send(typ MessageTypes, msg []byte) error {
+	if system.GenerateHTMLArg() {
+		return nil
+	}
 	return c.conn.WriteMessage(int(typ), msg)
 }
 
 // Close cleanly closes the WebSocket connection.
 // It does not directly trigger [Client.OnClose], but once the connection
 // is closed, [Client.OnMessage] will trigger it.
 func (c *Client) Close() error {
+	if system.GenerateHTMLArg() {
+		return nil
+	}
 	return c.conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
 }
 
 // OnClose sets a callback function to be called when the connection is closed.
 // This function can only be called once.
 func (c *Client) OnClose(f func()) {
+	if system.GenerateHTMLArg() {
+		return
+	}
 	go func() {
 		<-c.done
 		f()

base/websocket/websocket_notjs.go

@@ -302,7 +302,7 @@ func TestOpen(t *testing.T) {
 	cfg := &TestConfig{}
 	err := openWithIncludes(opts, cfg, "testcfg.toml")
 	if err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	}
 
 	// fmt.Println("includes:", cfg.Includes)

cli/cli_test.go

@@ -16,6 +16,7 @@ import (
 )
 
 func TestSignPKCS7(t *testing.T) {
+	t.Skip("requires keytool app")
 	// Setup RSA key.
 	block, _ := pem.Decode([]byte(testKey))
 	if block == nil {

cmd/mobile/cert_test.go

@@ -109,7 +109,7 @@ func makeFiles(c *config.Config) error {
 
 	preRenderHTML := ""
 	if c.Web.GenerateHTML {
-		preRenderHTML, err = exec.Output("go", "run", "-tags", "offscreen,generatehtml", ".")
+		preRenderHTML, err = exec.Output("go", "run", ".", "-generatehtml", "-nogui")
 		if err != nil {
 			return err
 		}

cmd/web/build.go

@@ -11,6 +11,7 @@ import (
 	"cogentcore.org/core/core"
 	"cogentcore.org/core/htmlcore"
 	_ "cogentcore.org/core/text/tex"
+	"cogentcore.org/core/tree"
 	_ "cogentcore.org/core/yaegicore"
 )
 
@@ -24,7 +25,10 @@ func main() {
 	ct := content.NewContent(b).SetContent(econtent)
 	ct.Context.AddWikilinkHandler(htmlcore.GoDocWikilink("doc", "cogentcore.org/core"))
 	b.AddTopBar(func(bar *core.Frame) {
-		core.NewToolbar(bar).Maker(ct.MakeToolbar)
+		core.NewToolbar(bar).Maker(func(p *tree.Plan) {
+			ct.MakeToolbar(p)
+			ct.MakeToolbarPDF(p)
+		})
 	})
 	b.RunMainWindow()
 }

content/examples/basic/basic.go

@@ -2,13 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build generatehtml
-
 package content
 
 import (
-	"fmt"
-	"os"
 	"strings"
 
 	"cogentcore.org/core/base/errors"
@@ -18,51 +14,50 @@ import (
 	"cogentcore.org/core/tree"
 )
 
-// This file is activated by the core tool to pre-render Cogent Core apps
-// as HTML that can be used as a preview and for SEO purposes.
-
 func init() {
-	// We override the OnChildAdded set in core/generatehtml.go
-	core.ExternalParent.AsWidget().SetOnChildAdded(func(n tree.Node) {
-		var ct *Content
-		n.AsTree().WalkDown(func(n tree.Node) bool {
-			if ct != nil {
+	core.GenerateHTML = generateHTML
+}
+
+// GenerateHTML is called by the core tool to pre-render Cogent Core apps
+// as HTML that can be used as a preview and for SEO purposes.
+func generateHTML(w core.Widget) string {
+	var ct *Content
+	w.AsTree().WalkDown(func(n tree.Node) bool {
+		if ct != nil {
+			return tree.Break
+		}
+		if c, ok := n.(*Content); ok {
+			ct = c
+			return tree.Break
+		}
+		return tree.Continue
+	})
+	if ct == nil {
+		return core.GenerateHTMLCore(w) // basic fallback
+	}
+	prps := []*bcontent.PreRenderPage{}
+	ct.UpdateTree() // need initial update first
+	for _, pg := range ct.pages {
+		ct.Open(pg.URL)
+		prp := &bcontent.PreRenderPage{
+			Page: *pg,
+			HTML: core.GenerateHTMLCore(ct),
+		}
+		// The first non-emphasized paragraph is used as the description
+		// (<em> typically indicates a note or caption, not an introduction).
+		ct.WalkDown(func(n tree.Node) bool {
+			if prp.Description != "" {
 				return tree.Break
 			}
-			if c, ok := n.(*Content); ok {
-				ct = c
-				return tree.Break
+			if tx, ok := n.(*core.Text); ok {
+				if tx.Property("tag") == "p" && !strings.HasPrefix(tx.Text, "<em>") {
+					prp.Description = tx.Text
+					return tree.Break
+				}
 			}
 			return tree.Continue
 		})
-		if ct == nil {
-			fmt.Println(core.GenerateHTML(n.(core.Widget))) // basic fallback
-			os.Exit(0)
-		}
-		prps := []*bcontent.PreRenderPage{}
-		ct.UpdateTree() // need initial update first
-		for _, pg := range ct.pages {
-			ct.Open(pg.URL)
-			prp := &bcontent.PreRenderPage{
-				Page: *pg,
-				HTML: core.GenerateHTML(ct),
-			}
-			// The first non-emphasized paragraph is used as the description
-			// (<em> typically indicates a note or caption, not an introduction).
-			ct.WalkDown(func(n tree.Node) bool {
-				if prp.Description != "" {
-					return tree.Break
-				}
-				if tx, ok := n.(*core.Text); ok {
-					if tx.Property("tag") == "p" && !strings.HasPrefix(tx.Text, "<em>") {
-						prp.Description = tx.Text
-						return tree.Break
-					}
-				}
-				return tree.Continue
-			})
-			prps = append(prps, prp)
-		}
-		fmt.Println(string(errors.Log1(jsonx.WriteBytes(prps))))
-	})
+		prps = append(prps, prp)
+	}
+	return string(errors.Log1(jsonx.WriteBytes(prps)))
 }