Upgrade to Go 1.20

.github/workflows/cd.yml

@@ -8,7 +8,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build
       run: docker build -t hackpad .
     - name: Publish

.github/workflows/ci.yml

@@ -9,19 +9,19 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.20.x
     - name: Lint
       run: make lint
 
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.20.x
     - name: Test
       run: make test

Makefile

@@ -1,11 +1,11 @@
 SHELL := /usr/bin/env bash
-GO_VERSION = 1.16.6
+GO_VERSION = 1.20
 GOROOT =
 PATH := ${PWD}/cache/go/bin:${PWD}/cache/go/misc/wasm:${PATH}
 GOOS = js
 GOARCH = wasm
 export
-LINT_VERSION=1.27.0
+LINT_VERSION=1.52.2
 
 .PHONY: serve
 serve:
@@ -71,7 +71,7 @@ cache/go${GO_VERSION}: cache
 		git clone \
 			--depth 1 \
 			--single-branch \
-			--branch hackpad-go${GO_VERSION} \
+			--branch hackpad/release-branch.go${GO_VERSION} \
 			https://github.com/hack-pad/go.git \
 			"$$TMP"; \
 		pushd "$$TMP/src"; \

cmd/editor/css/css.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package css

cmd/editor/dom/document.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package dom

cmd/editor/dom/element.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package dom
@@ -111,14 +112,20 @@ func (e *Element) QuerySelectorAll(query string) []*Element {
 	return sliceFromArray(e.elem.Call("querySelectorAll", query))
 }
 
-func (e *Element) AddEventListener(name string, listener EventListener) {
-	e.elem.Call("addEventListener", name, js.FuncOf(func(this js.Value, args []js.Value) interface{} {
+func (e *Element) RemoveEventListener(name string, listener js.Func) {
+	e.elem.Call("removeEventListener", name, listener)
+}
+
+func (e *Element) AddEventListener(name string, listener EventListener) js.Func {
+	listenerFunc := js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
 		defer common.CatchExceptionHandler(func(err error) {
 			log.Error("recovered from panic: ", err, "\n", string(debug.Stack()))
 		})
 		listener(args[0])
 		return nil
-	}))
+	})
+	e.elem.Call("addEventListener", name, listenerFunc)
+	return listenerFunc
 }
 
 func (e *Element) Focus() {

cmd/editor/dom/rect.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package dom

cmd/editor/dom/window.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package dom

cmd/editor/editor.go

@@ -1,9 +1,9 @@
+//go:build js
 // +build js
 
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"syscall/js"
 
@@ -13,19 +13,20 @@ import (
 )
 
 // editorJSFunc is a JS function that opens on a JS element and returns a JS object with the following spec:
-// {
-//   getContents() string
-//   setContents(string)
-//   getCursorIndex() int
-//   setCursorIndex(int)
-// }
+//
+//	{
+//	  getContents() string
+//	  setContents(string)
+//	  getCursorIndex() int
+//	  setCursorIndex(int)
+//	}
 type editorJSFunc js.Value
 
 func (e editorJSFunc) New(elem *dom.Element) ide.Editor {
 	editor := &jsEditor{
 		titleChan: make(chan string, 1),
 	}
-	editor.elem = js.Value(e).Invoke(elem, js.FuncOf(editor.onEdit))
+	editor.elem = js.Value(e).Invoke(elem.JSValue(), js.FuncOf(editor.onEdit))
 	return editor
 }
 
@@ -43,7 +44,7 @@ func (j *jsEditor) onEdit(js.Value, []js.Value) interface{} {
 		if err == nil {
 			perm = info.Mode()
 		}
-		err = ioutil.WriteFile(j.filePath, []byte(contents), perm)
+		err = os.WriteFile(j.filePath, []byte(contents), perm)
 		if err != nil {
 			log.Error("Failed to write file contents: ", err)
 		}
@@ -62,7 +63,7 @@ func (j *jsEditor) CurrentFile() string {
 }
 
 func (j *jsEditor) ReloadFile() error {
-	contents, err := ioutil.ReadFile(j.filePath)
+	contents, err := os.ReadFile(j.filePath)
 	if err != nil {
 		return err
 	}

cmd/editor/ide/command.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package ide
@@ -16,15 +17,15 @@ const (
 )
 
 // runGoProcess optimizes runProcess by skipping the wait time for listing PATH directories on startup
-func (w *window) runGoProcess(console TaskConsole, args ...string) promise.Promise {
+func (w *window) runGoProcess(console TaskConsole, args ...string) promise.JS {
 	return w.runRawProcess(console, goBinaryPath, "go", args...)
 }
 
-func (w *window) runProcess(console TaskConsole, name string, args ...string) promise.Promise {
+func (w *window) runProcess(console TaskConsole, name string, args ...string) promise.JS {
 	return w.runRawProcess(console, name, name, args...)
 }
 
-func (w *window) runRawProcess(console TaskConsole, fullPath, name string, args ...string) promise.Promise {
+func (w *window) runRawProcess(console TaskConsole, fullPath, name string, args ...string) promise.JS {
 	resolve, reject, prom := promise.New()
 	go func() {
 		var success bool
@@ -69,6 +70,6 @@ func (w *window) startProcess(console TaskConsole, rawPath, name string, args ..
 
 func (w *window) runPlayground(console TaskConsole) {
 	w.runGoProcess(console, "build", "-v", ".").Then(func(_ interface{}) interface{} {
-		return w.runProcess(console, "./playground")
+		return w.runProcess(console, "./playground").JSValue()
 	})
 }

cmd/editor/ide/console.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package ide

cmd/editor/ide/dropdown.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package ide
@@ -33,7 +34,7 @@ func newDropdown(attachTo, content *dom.Element) *dropdown {
 		attached: attachTo,
 	}
 	dom.GetDocument().AddEventListener("click", func(event js.Value) {
-		if !event.Call("composedPath").Call("includes", drop).Bool() {
+		if !event.Call("composedPath").Call("includes", drop.JSValue()).Bool() {
 			drop.Close()
 		}
 	})

cmd/editor/ide/editor.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package ide

cmd/editor/ide/settings.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package ide

cmd/editor/ide/tab.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package ide

cmd/editor/ide/tab_pane.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package ide

cmd/editor/ide/window.go

@@ -1,11 +1,12 @@
+//go:build js
 // +build js
 
 package ide
 
 import (
 	_ "embed"
 	"go/format"
-	"io/ioutil"
+	"os"
 	"strings"
 	"syscall/js"
 
@@ -99,7 +100,7 @@ func New(elem *dom.Element, editorBuilder EditorBuilder, consoleBuilder ConsoleB
 		}
 
 		go func() {
-			src, err := ioutil.ReadFile(path)
+			src, err := os.ReadFile(path)
 			if err != nil {
 				log.Errorf("Failed to read Go file %q: %v", path, err)
 				return
@@ -109,7 +110,7 @@ func New(elem *dom.Element, editorBuilder EditorBuilder, consoleBuilder ConsoleB
 				log.Errorf("Failed to format Go file %q: %v", path, err)
 				return
 			}
-			err = ioutil.WriteFile(path, out, 0)
+			err = os.WriteFile(path, out, 0)
 			if err != nil {
 				log.Errorf("Failed to write Go file %q: %v", path, err)
 				return
@@ -183,11 +184,12 @@ func (w *window) makeDefaultEditor(id int, title, contents *dom.Element) Tabber
 
 	title.SetInnerHTML(`<input type="text" class="editor-file-picker" placeholder="file_name.go" spellcheck=false />`)
 	inputElem := title.QuerySelector("input")
-	dom.QueueMicrotask(func() {
-		inputElem.Focus() // run focus on next run loop so opening a file immediately doesn't trigger onblur
-	})
+	inputElem.Focus()
 
-	keydownFn := func(event js.Value) {
+	blurListener := inputElem.AddEventListener("blur", func(js.Value) {
+		w.editorsPane.closeTabID(id)
+	})
+	title.AddEventListener("keydown", func(event js.Value) {
 		if event.Get("key").String() != "Enter" {
 			return
 		}
@@ -199,19 +201,15 @@ func (w *window) makeDefaultEditor(id int, title, contents *dom.Element) Tabber
 		if fileName == "" {
 			return
 		}
-		title.SetInnerText("New file")
-		err := editor.OpenFile(fileName)
-		if err != nil {
-			log.Error(err)
-		}
-		w.editorsPane.focusID(id)
-	}
-	title.AddEventListener("keydown", keydownFn)
-	inputElem.AddEventListener("blur", func(event js.Value) {
-		titleText := title.InnerText()
-		if titleText != "New file" {
-			w.editorsPane.closeTabID(id)
-		}
+		inputElem.RemoveEventListener("blur", blurListener)
+		title.SetInnerText("New file") // setting inner text triggers onblur because the input HTML is about to be removed
+		go func() {
+			err := editor.OpenFile(fileName)
+			if err != nil {
+				log.Error(err)
+			}
+			w.editorsPane.focusID(id)
+		}()
 	})
 	return editor
 }

cmd/editor/main.go

@@ -1,10 +1,10 @@
+//go:build js
 // +build js
 
 package main
 
 import (
 	"flag"
-	"io/ioutil"
 	"os"
 	"syscall/js"
 
@@ -85,7 +85,7 @@ func main() {
 	fmt.Println("Hello from Wasm!", datasize.Gigabytes(4))
 }
 `
-		err := ioutil.WriteFile("main.go", []byte(mainGoContents), 0600)
+		err := os.WriteFile("main.go", []byte(mainGoContents), 0600)
 		if err != nil {
 			log.Error("Failed to write to main.go: ", err)
 			return

cmd/editor/plaineditor/editor.go

@@ -1,9 +1,10 @@
+//go:build js
 // +build js
 
 package plaineditor
 
 import (
-	"io/ioutil"
+	"os"
 	"syscall/js"
 
 	"github.com/hack-pad/hackpad/cmd/editor/dom"
@@ -50,7 +51,7 @@ func (e *textAreaEditor) CurrentFile() string {
 }
 
 func (e *textAreaEditor) ReloadFile() error {
-	contents, err := ioutil.ReadFile(e.filePath)
+	contents, err := os.ReadFile(e.filePath)
 	if err != nil {
 		return err
 	}
@@ -59,7 +60,7 @@ func (e *textAreaEditor) ReloadFile() error {
 }
 
 func (e *textAreaEditor) edited(newContents func() string) {
-	err := ioutil.WriteFile(e.filePath, []byte(newContents()), 0600)
+	err := os.WriteFile(e.filePath, []byte(newContents()), 0600)
 	if err != nil {
 		log.Errorf("Failed to write %s: %s", e.filePath, err.Error())
 		return

cmd/editor/plaineditor/typer.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package plaineditor
@@ -42,7 +43,7 @@ func handleKeydown(event js.Value) {
 	selectionEnd := target.Get("selectionEnd").Int()
 	key := event.Get("key").String()
 	code := event.Get("code").String()
-	//metaKey := event.Get("metaKey").Bool()
+	// metaKey := event.Get("metaKey").Bool()
 
 	preventDefault := func() {
 		event.Call("preventDefault")
@@ -59,11 +60,11 @@ func handleKeydown(event js.Value) {
 
 	if code == KeyEnter {
 		// TODO restore cmd+enter triggering run button
-		//if metaKey {
-		//preventDefault()
-		//runPlayground()
-		//return
-		//}
+		// if metaKey {
+		//     preventDefault()
+		//     runPlayground()
+		//     return
+		// }
 
 		lastNewLine := strings.LastIndexByte(slice(text, 0, selectionStart), '\n')
 		if lastNewLine != -1 {

cmd/editor/taskconsole/console.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package taskconsole