Use esbuild to minify prelude

flimzy · flimzy · commit 5938478d5fd8 · 2023-06-11T22:47:03.000+02:00
diff --git a/circle.yml b/circle.yml
@@ -72,12 +72,6 @@ jobs:
     executor: gopherjs
     steps:
     - setup_and_install_gopherjs
-    - run:
-        name: Check minified prelude
-        command: |
-          set -e
-          go generate github.com/gopherjs/gopherjs/compiler/prelude
-          diff -u <(echo -n) <(git status --porcelain)
     - run:
         name: Check gofmt
         command: diff -u <(echo -n) <(gofmt -d .)
diff --git a/compiler/compiler.go b/compiler/compiler.go
@@ -266,7 +266,7 @@ func WriteProgramCode(pkgs []*Archive, w *SourceMapFilter, goVersion string) err
 
 	preludeJS := prelude.Prelude
 	if minify {
-		preludeJS = prelude.Minified
+		preludeJS = prelude.Minified()
 	}
 	if _, err := io.WriteString(w, preludeJS); err != nil {
 		return err
diff --git a/compiler/prelude/genmin.go b/compiler/prelude/genmin.go
diff --git a/compiler/prelude/prelude.go b/compiler/prelude/prelude.go
@@ -2,9 +2,10 @@ package prelude
 
 import (
 	_ "embed"
-)
+	"fmt"
 
-//go:generate go run genmin.go
+	"github.com/evanw/esbuild/pkg/api"
+)
 
 // Prelude is the GopherJS JavaScript interop layer.
 var Prelude = prelude + numeric + types + goroutines + jsmapping
@@ -23,3 +24,20 @@ var jsmapping string
 
 //go:embed goroutines.js
 var goroutines string
+
+func Minified() string {
+	result := api.Transform(Prelude, api.TransformOptions{
+		Target:            api.ES2015,
+		MinifyWhitespace:  true,
+		MinifyIdentifiers: true,
+		MinifySyntax:      true,
+		Charset:           api.CharsetUTF8,
+		LegalComments:     api.LegalCommentsEndOfFile,
+	})
+	if len(result.Errors) > 0 {
+		e := result.Errors[0]
+		panic(fmt.Sprintf("%d:%d: %s\n%s\n", e.Location.Line, e.Location.Column, e.Text, e.Location.LineText))
+	}
+	return string(result.Code)
+
+}
diff --git a/compiler/prelude/prelude_min.go b/compiler/prelude/prelude_min.go
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/gopherjs/gopherjs
 go 1.18
 
 require (
+	github.com/evanw/esbuild v0.18.0
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/google/go-cmp v0.5.7
 	github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86
@@ -14,7 +15,7 @@ require (
 	github.com/visualfc/goembed v0.3.3
 	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
+	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8
 	golang.org/x/tools v0.1.10
 )
 
diff --git a/go.sum b/go.sum
@@ -66,6 +66,8 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanw/esbuild v0.18.0 h1:zJrquhC5ZiricRVQxMQTWqO8zYcV7F7OfUXstB9Ucbg=
+github.com/evanw/esbuild v0.18.0/go.mod h1:iINY06rn799hi48UqEnaQvVfZWe6W9bET78LbvN8VWk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
@@ -399,8 +401,8 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ func WriteProgramCode(pkgs []Archive, w SourceMapFilter, goVersion string) err`
`266`	`266`
`267`	`267`	`preludeJS := prelude.Prelude`
`268`	`268`	`if minify {`
`269`		`- preludeJS = prelude.Minified`
	`269`	`+ preludeJS = prelude.Minified()`
`270`	`270`	`}`
`271`	`271`	`if _, err := io.WriteString(w, preludeJS); err != nil {`
`272`	`272`	`return err`