cmd/golangorg: remove special cases for /project/, /doc/devel/release

The special cases were simulating the normal template execution
and passing extra data (the release history).
We have a standard way to pass extra data (template functions),
so use one and delete the special case code.

Also change date format to standard yyyy-mm-dd.
The yyyy/mm/dd we have been using is kind of made up
and certainly unusual (see https://xkcd.com/1179/).

Change-Id: I59f4f67259381dd43cd53c0f6120f87d8f8c77d9
Reviewed-on: https://go-review.googlesource.com/c/website/+/296429
Trust: Russ Cox <[email protected]>
Run-TryBot: Russ Cox <[email protected]>
TryBot-Result: Go Bot <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>

Author: rsc

_content/doc/contrib.html

@@ -35,22 +35,9 @@ <h3 id="release"><a href="/doc/devel/release.html">Release History</a></h3>
 <p>A <a href="/doc/devel/release.html">summary</a> of the changes between Go releases. Notes for the major releases:</p>
 
 <ul>
-	{{range .Major -}}
-	<li><a href="/doc/go{{.V}}">Go {{.V}}</a> <small>({{.Date}})</small></li>
+	{{range releases -}}
+	<li><a href="/doc/go{{.Version}}">Go {{.Version}}</a> <small>({{.Date.Format "January 2006"}})</small></li>
 	{{end -}}
-
-	{{- /* Entries for Go 1.9 and newer are generated using data in the internal/history package. */ -}}
-	{{- /* Entries for Go 1.8 and older are hand-written as raw HTML below. */ -}}
-
-	<li><a href="/doc/go1.8">Go 1.8</a> <small>(February 2017)</small></li>
-	<li><a href="/doc/go1.7">Go 1.7</a> <small>(August 2016)</small></li>
-	<li><a href="/doc/go1.6">Go 1.6</a> <small>(February 2016)</small></li>
-	<li><a href="/doc/go1.5">Go 1.5</a> <small>(August 2015)</small></li>
-	<li><a href="/doc/go1.4">Go 1.4</a> <small>(December 2014)</small></li>
-	<li><a href="/doc/go1.3">Go 1.3</a> <small>(June 2014)</small></li>
-	<li><a href="/doc/go1.2">Go 1.2</a> <small>(December 2013)</small></li>
-	<li><a href="/doc/go1.1">Go 1.1</a> <small>(May 2013)</small></li>
-	<li><a href="/doc/go1">Go 1</a> <small>(March 2012)</small></li>
 </ul>
 
 <h3 id="go1compat"><a href="/doc/go1compat">Go 1 and the Future of Go Programs</a></h3>

_content/doc/devel/release.html

@@ -8,42 +8,10 @@
 package main
 
 import (
-	"bytes"
-	"encoding/json"
 	"net/http"
 	"strings"
 
 	"golang.org/x/website/internal/env"
-	"golang.org/x/website/internal/godoc"
-)
-
-// This file holds common code from the x/tools/godoc serving engine.
-// It's being used during the transition. See golang.org/issue/29206.
-
-// extractMetadata extracts the godoc.Metadata from a byte slice.
-// It returns the godoc.Metadata value and the remaining data.
-// If no metadata is present the original byte slice is returned.
-//
-func extractMetadata(b []byte) (meta godoc.Metadata, tail []byte, _ error) {
-	tail = b
-	if !bytes.HasPrefix(b, jsonStart) {
-		return godoc.Metadata{}, tail, nil
-	}
-	end := bytes.Index(b, jsonEnd)
-	if end < 0 {
-		return godoc.Metadata{}, tail, nil
-	}
-	b = b[len(jsonStart)-1 : end+1] // drop leading <!-- and include trailing }
-	if err := json.Unmarshal(b, &meta); err != nil {
-		return godoc.Metadata{}, nil, err
-	}
-	tail = tail[end+len(jsonEnd):]
-	return meta, tail, nil
-}
-
-var (
-	jsonStart = []byte("<!--{")
-	jsonEnd   = []byte("}-->")
 )
 
 // googleCN reports whether request r is considered

cmd/golangorg/godoc.go

@@ -259,6 +259,13 @@ func testWeb(t *testing.T) {
 			},
 			releaseTag: "go1.11",
 		},
+		{
+			path: "/project/",
+			contains: []string{
+				`<li><a href="/doc/go1.14">Go 1.14</a> <small>(February 2020)</small></li>`,
+				`<li><a href="/doc/go1.1">Go 1.1</a> <small>(May 2013)</small></li>`,
+			},
+		},
 	}
 	for _, test := range tests {
 		url := fmt.Sprintf("http://%s%s", addr, test.path)

cmd/golangorg/godoc_test.go

@@ -19,7 +19,6 @@ import (
 
 	"golang.org/x/website/internal/env"
 	"golang.org/x/website/internal/godoc"
-	"golang.org/x/website/internal/history"
 	"golang.org/x/website/internal/redirect"
 )
 
@@ -87,11 +86,9 @@ func registerHandlers(pres *godoc.Presentation) *http.ServeMux {
 	mux.Handle("/", pres)
 	mux.Handle("/blog/", http.HandlerFunc(blogHandler))
 	mux.Handle("/doc/codewalk/", http.HandlerFunc(codewalk))
-	mux.Handle("/doc/devel/release.html", releaseHandler{ReleaseHistory: sortReleases(history.Releases)})
 	mux.Handle("/doc/play/", pres.FileServer())
 	mux.Handle("/fmt", http.HandlerFunc(fmtHandler))
 	mux.Handle("/pkg/C/", redirect.Handler("/cmd/cgo/"))
-	mux.Handle("/project/", projectHandler{ReleaseHistory: sortMajorReleases(history.Releases)})
 	mux.Handle("/robots.txt", pres.FileServer())
 	mux.Handle("/x/", http.HandlerFunc(xHandler))
 	redirect.Register(mux)