internal/wasmserve: consider Go 2

Author: hajimehoshi

internal/wasmserveutil/util.go

@@ -17,16 +17,18 @@ func WasmExecJSURL(goVersion string) (string, error) {
 	if len(m) == 0 {
 		return "", fmt.Errorf("wasmserveutil: invalid Go version: %s", goVersion)
 	}
+
+	major, _ := strconv.Atoi(m[1])
 	minor, _ := strconv.Atoi(m[2])
 
 	// go.mod might have a version without `.0` like `go1.22`. This version might not work as a part of URL.
-	if minor >= 22 && m[3] == "" {
+	if (major > 1 || minor >= 22) && m[3] == "" {
 		goVersion += ".0"
 	}
 
 	// The directory name was changed from `misc` to `lib` at Go 1.24.
 	dir := "lib"
-	if minor <= 23 {
+	if major == 1 && minor <= 23 {
 		dir = "misc"
 	}
 

internal/wasmserveutil/util_test.go

@@ -75,6 +75,36 @@ func TestWasmExecJSURL(t *testing.T) {
 			url:       "https://go.googlesource.com/go/+/refs/tags/go1.24.1/lib/wasm/wasm_exec.js?format=TEXT",
 			error:     false,
 		},
+		{
+			goVersion: "go2.23",
+			url:       "https://go.googlesource.com/go/+/refs/tags/go2.23.0/lib/wasm/wasm_exec.js?format=TEXT",
+			error:     false,
+		},
+		{
+			goVersion: "go2.23.0",
+			url:       "https://go.googlesource.com/go/+/refs/tags/go2.23.0/lib/wasm/wasm_exec.js?format=TEXT",
+			error:     false,
+		},
+		{
+			goVersion: "go2.23.1",
+			url:       "https://go.googlesource.com/go/+/refs/tags/go2.23.1/lib/wasm/wasm_exec.js?format=TEXT",
+			error:     false,
+		},
+		{
+			goVersion: "go2.24",
+			url:       "https://go.googlesource.com/go/+/refs/tags/go2.24.0/lib/wasm/wasm_exec.js?format=TEXT",
+			error:     false,
+		},
+		{
+			goVersion: "go2.24.0",
+			url:       "https://go.googlesource.com/go/+/refs/tags/go2.24.0/lib/wasm/wasm_exec.js?format=TEXT",
+			error:     false,
+		},
+		{
+			goVersion: "go2.24.1",
+			url:       "https://go.googlesource.com/go/+/refs/tags/go2.24.1/lib/wasm/wasm_exec.js?format=TEXT",
+			error:     false,
+		},
 	}
 
 	for _, tc := range testCases {