godev/content: use esbuild devtool for styles and scripts

To match the behavior of go telemetry view and allow us to remove
the esbuild dependency from internal/content, the static assets
are generated with the esbuild devtool.

Change-Id: If1b798f12e28b33142cb3c325b8d05f17521a674
Reviewed-on: https://go-review.googlesource.com/c/telemetry/+/524198
TryBot-Result: Gopher Robot <[email protected]>
Run-TryBot: Jamal Carvalho <[email protected]>
Auto-Submit: Jamal Carvalho <[email protected]>
Reviewed-by: Hyang-Ah Hana Kim <[email protected]>

Author: jamalc

.eslintignore

@@ -6,5 +6,6 @@
   ],
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint"],
-  "root": true
+  "root": true,
+  "ignorePatterns": ["*.min.js"]
 }

.eslintrc.json

@@ -6,5 +6,6 @@
     },
     "unit-disallowed-list": ["px"],
     "selector-class-pattern": "^[a-zA-Z\\-]+$"
-  }
+  },
+  "ignoreFiles": ["**/*.min.css"]
 }

.prettierignore

@@ -6,21 +6,25 @@ It is the work of hundreds of contributors. We appreciate your help!
 
 ## Filing issues
 
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
+When [filing an issue](https://golang.org/issue/new), make sure to answer these
+five questions:
 
 1.  What version of Go are you using (`go version`)?
 2.  What operating system and processor architecture are you using?
 3.  What did you do?
 4.  What did you expect to see?
 5.  What did you see instead?
 
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
+General questions should go to the
+[golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead
+of the issue tracker. The gophers there will answer or ask you to file an issue
+if you've tripped over a bug.
 
 ## Contributing code
 
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
+Please read the
+[Contribution Guidelines](https://golang.org/doc/contribute.html) before sending
+patches.
 
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
+Unless otherwise noted, the Go source files are distributed under the BSD-style
+license found in the LICENSE file.

.stylelintrc.json

@@ -2,13 +2,6 @@
 
 This repository holds the Go Telemetry server code and libraries.
 
-## TypeScript Support
-
-TypeScript files served from content directories are transformed into
-JavaScript. Reference .ts files in html templates as module code.
-
-`<script type="module" src="/filename.ts">`
-
 ## Linting & Formatting
 
 This repository uses [eslint](https://eslint.org/) to format TS files,
@@ -38,5 +31,5 @@ This repository uses Gerrit for code changes. To learn how to submit changes to
 this repository, see https://golang.org/doc/contribute.html.
 
 The main issue tracker for the time repository is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/telemetry:" in the
-subject line, so it is easy to find.
+https://github.com/golang/go/issues. Prefix your issue with "x/telemetry:" in
+the subject line, so it is easy to find.

CONTRIBUTING.md

@@ -7,11 +7,10 @@ and active counter files.
 
 ## Development
 
-The static files are generated with a generator command in
-[`./main.go`](./main.go). You can edit the source files and run go generate to
-rebuild them.
+The static files are generated with a generator command. You can edit the source
+files and run go generate to rebuild them.
 
-    go generate ./cmd/gotelemetry/view
+    go generate ./content
 
 Running the server with the `--dev` flag will watch and rebuild the static files
 on save.

README.md

@@ -8,7 +8,6 @@ package view
 
 import (
 	"bytes"
-	"embed"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -19,7 +18,6 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"os/exec"
 	"path"
 	"sort"
 	"strconv"
@@ -30,27 +28,32 @@ import (
 	"golang.org/x/telemetry/cmd/gotelemetry/internal/browser"
 	"golang.org/x/telemetry/internal/config"
 	"golang.org/x/telemetry/internal/configstore"
+	contentfs "golang.org/x/telemetry/internal/content"
 	tcounter "golang.org/x/telemetry/internal/counter"
 	it "golang.org/x/telemetry/internal/telemetry"
+	"golang.org/x/telemetry/internal/unionfs"
 )
 
 var (
 	addr     = flag.String("addr", "localhost:4040", "server listens on the given TCP network address")
 	dev      = flag.Bool("dev", false, "rebuild static assets on save")
 	fsConfig = flag.String("config", "", "load a config from the filesystem")
 	open     = flag.Bool("open", true, "open the browser to the server address")
-
-	//go:embed *
-	content embed.FS
 )
 
 func Start() {
 	flag.Parse()
-	var fsys fs.FS = content
+	var fsys fs.FS = contentfs.FS
 	if *dev {
-		fsys = os.DirFS("cmd/gotelemetry/internal/view")
-		watchStatic()
+		fsys = os.DirFS("internal/content")
+		contentfs.WatchStatic()
+	}
+	var err error
+	fsys, err = unionfs.Sub(fsys, "gotelemetryview", "shared")
+	if err != nil {
+		log.Fatal(err)
 	}
+
 	mux := http.NewServeMux()
 	mux.Handle("/", handleIndex(fsys))
 	listener, err := net.Listen("tcp", *addr)
@@ -65,25 +68,6 @@ func Start() {
 	log.Fatal(http.Serve(listener, mux))
 }
 
-//go:generate go run golang.org/x/telemetry/godev/devtools/cmd/esbuild --outdir static
-
-// watchStatic runs the same command as the generator above when the server is
-// started in dev mode, rebuilding static assets on save.
-func watchStatic() {
-	cmd := exec.Command("go", "run", "golang.org/x/telemetry/godev/devtools/cmd/esbuild", "--outdir", "static", "--watch")
-	cmd.Dir = "cmd/gotelemetry/internal/view"
-	cmd.Stderr = os.Stderr
-	cmd.Stdout = os.Stdout
-	if err := cmd.Start(); err != nil {
-		log.Fatal(err)
-	}
-	go func() {
-		if err := cmd.Wait(); err != nil {
-			log.Fatal(err)
-		}
-	}()
-}
-
 type page struct {
 	// Config is the config used to render the requested page.
 	Config *config.Config

cmd/gotelemetry/internal/view/README.md

@@ -4,13 +4,13 @@
 
 For local development, simply build and run. It serves on localhost:8080.
 
-    go run ./cmd/telemetrygodev
+    go run ./godev/cmd/telemetrygodev
 
 By default, the server will use the filesystem for storage object I/O. Run the
 cloud storage emulator and use the -gcs flag to use the Cloud Storage API.
 
-    ./devtools/localstorage.sh
-    go run ./cmd/telemetrygodev --gcs
+    ./godev/devtools/localstorage.sh
+    go run ./godev/cmd/telemetrygodev --gcs
 
 ### Environment Variables
 

cmd/gotelemetry/internal/view/static/index.min.css

@@ -24,12 +24,12 @@ import (
 	"golang.org/x/exp/slog"
 	"golang.org/x/mod/semver"
 	"golang.org/x/telemetry"
-	"golang.org/x/telemetry/godev"
 	"golang.org/x/telemetry/godev/internal/config"
 	"golang.org/x/telemetry/godev/internal/content"
 	"golang.org/x/telemetry/godev/internal/middleware"
 	"golang.org/x/telemetry/godev/internal/storage"
 	tconfig "golang.org/x/telemetry/internal/config"
+	contentfs "golang.org/x/telemetry/internal/content"
 	"golang.org/x/telemetry/internal/unionfs"
 )
 
@@ -209,11 +209,12 @@ func validate(r *telemetry.Report, cfg *tconfig.Config) error {
 }
 
 func fsys(fromOS bool) fs.FS {
-	var f fs.FS = godev.FS
+	var f fs.FS = contentfs.FS
 	if fromOS {
-		f = os.DirFS(".")
+		f = os.DirFS("internal/content")
+		contentfs.WatchStatic()
 	}
-	f, err := unionfs.Sub(f, "content/telemetrygodev", "content/shared")
+	f, err := unionfs.Sub(f, "telemetrygodev", "shared")
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/gotelemetry/internal/view/view.go

@@ -19,13 +19,13 @@ in generated the report and the location of the chart data.
 
 For local development, simply build and run. It serves on localhost:8082.
 
-    go run ./cmd/worker
+    go run ./godev/cmd/worker
 
 By default, the server will use the filesystem for storage object I/O. Run the
 cloud storage emulator and use the -gcs flag to use the Cloud Storage API.
 
-    ./devtools/localstorage.sh
-    go run ./cmd/worker --gcs
+    ./godev/devtools/localstorage.sh
+    go run ./godev/cmd/worker --gcs
 
 ### Environment Variables
 

godev/cmd/telemetrygodev/README.md

@@ -21,12 +21,12 @@ import (
 	"golang.org/x/exp/slog"
 	"golang.org/x/mod/semver"
 	"golang.org/x/telemetry"
-	"golang.org/x/telemetry/godev"
 	"golang.org/x/telemetry/godev/internal/config"
 	"golang.org/x/telemetry/godev/internal/content"
 	"golang.org/x/telemetry/godev/internal/middleware"
 	"golang.org/x/telemetry/godev/internal/storage"
 	tconfig "golang.org/x/telemetry/internal/config"
+	contentfs "golang.org/x/telemetry/internal/content"
 	"golang.org/x/telemetry/internal/unionfs"
 )
 
@@ -447,11 +447,11 @@ func cutInt(x string) (n, rest string, ok bool) {
 }
 
 func fsys(fromOS bool) fs.FS {
-	var f fs.FS = godev.FS
+	var f fs.FS = contentfs.FS
 	if fromOS {
-		f = os.DirFS(".")
+		f = os.DirFS("internal/content")
 	}
-	f, err := unionfs.Sub(f, "content/worker", "content/shared")
+	f, err := unionfs.Sub(f, "worker", "shared")
 	if err != nil {
 		log.Fatal(err)
 	}