internal,static: upgrade esbuild

The previous version of esbuild would sometimes out non-deterministic
versions of minified files. This would generate large diffs when make
small changes to script code on different machines.

Change-Id: I30540088ad2a259e4c086b18505016a95937dc2f
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/469855
Run-TryBot: Jamal Carvalho <[email protected]>
Reviewed-by: Hyang-Ah Hana Kim <[email protected]>
TryBot-Result: kokoro <[email protected]>

Author: jamalc

devtools/cmd/static/main.go

@@ -13,13 +13,11 @@ import (
 )
 
 func main() {
-	_, err := static.Build(static.Config{EntryPoint: "static/frontend", Bundle: true})
-	if err != nil {
+	if err := static.Build(static.Config{EntryPoint: "static/frontend", Bundle: true}); err != nil {
 		log.Fatal(err)
 	}
 
-	_, err = static.Build(static.Config{EntryPoint: "static/worker", Bundle: true})
-	if err != nil {
+	if err := static.Build(static.Config{EntryPoint: "static/worker", Bundle: true}); err != nil {
 		log.Fatal(err)
 	}
 }

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/Masterminds/squirrel v1.5.2
 	github.com/alicebob/miniredis/v2 v2.17.0
 	github.com/andybalholm/cascadia v1.3.1
-	github.com/evanw/esbuild v0.14.10
+	github.com/evanw/esbuild v0.17.8
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-git/go-billy/v5 v5.3.1
 	github.com/go-git/go-git/v5 v5.4.2

go.sum

@@ -399,8 +399,8 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
 github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanw/esbuild v0.14.10 h1:+7c1VNndl7uLLxVEeRH4rOUz0Y+nrSw8xfmE9rGtrtw=
-github.com/evanw/esbuild v0.14.10/go.mod h1:GG+zjdi59yh3ehDn4ZWfPcATxjPDUH53iU4ZJbp7dkY=
+github.com/evanw/esbuild v0.17.8 h1:QzE7cRRq7y3qH7ZKGN0/nUGbdZPyikfNaMaCMNUufnU=
+github.com/evanw/esbuild v0.17.8/go.mod h1:iINY06rn799hi48UqEnaQvVfZWe6W9bET78LbvN8VWk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
@@ -1378,6 +1378,7 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=

internal/frontend/server.go

@@ -779,8 +779,11 @@ func (s *Server) staticHandler() http.Handler {
 			panic("staticPath is empty in dev mode; cannot rebuild static files")
 		}
 		ctx := context.Background()
-		_, err := static.Build(static.Config{EntryPoint: s.staticPath + "/frontend", Watch: true, Bundle: true})
-		if err != nil {
+		if err := static.Build(static.Config{
+			EntryPoint: s.staticPath + "/frontend",
+			Watch:      true,
+			Bundle:     true,
+		}); err != nil {
 			log.Error(ctx, err)
 		}
 	}

internal/static/static.go

@@ -36,41 +36,45 @@ type Config struct {
 // when cmd/frontend is run in dev mode and in
 // devtools/cmd/static/main.go with Watch=false for building
 // productionized assets.
-func Build(config Config) (*api.BuildResult, error) {
+func Build(config Config) error {
 	files, err := getEntry(config.EntryPoint, config.Bundle)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	options := api.BuildOptions{
-		EntryPoints:   files,
-		Bundle:        config.Bundle,
-		Outdir:        config.EntryPoint,
-		Write:         true,
-		Platform:      api.PlatformBrowser,
-		Format:        api.FormatESModule,
-		OutExtensions: map[string]string{".css": ".min.css"},
-		External:      []string{"*.svg"},
+		EntryPoints:  files,
+		Bundle:       config.Bundle,
+		Outdir:       config.EntryPoint,
+		Write:        true,
+		Platform:     api.PlatformBrowser,
+		Format:       api.FormatESModule,
+		OutExtension: map[string]string{".css": ".min.css"},
+		External:     []string{"*.svg"},
 		Banner: map[string]string{"css": "/*!\n" +
 			" * Copyright 2021 The Go Authors. All rights reserved.\n" +
 			" * Use of this source code is governed by a BSD-style\n" +
 			" * license that can be found in the LICENSE file.\n" +
 			" */"},
 	}
-	if config.Watch {
-		options.Watch = &api.WatchMode{}
-	}
 	options.MinifyIdentifiers = true
 	options.MinifySyntax = true
 	options.MinifyWhitespace = true
 	options.Sourcemap = api.SourceMapLinked
+	if config.Watch {
+		ctx, err := api.Context(options)
+		if err != nil {
+			return err
+		}
+		return ctx.Watch(api.WatchOptions{})
+	}
 	result := api.Build(options)
 	if len(result.Errors) > 0 {
-		return nil, fmt.Errorf("error building static files: %v", result.Errors)
+		return fmt.Errorf("error building static files: %v", result.Errors)
 	}
 	if len(result.Warnings) > 0 {
-		return nil, fmt.Errorf("error building static files: %v", result.Warnings)
+		return fmt.Errorf("error building static files: %v", result.Warnings)
 	}
-	return &result, nil
+	return nil
 }
 
 // getEntry walks the the given directory and collects entry file paths