Replace vfsgen with go:embed

Author: flimzy

compiler/gopherjspkg/fs.go

@@ -1,32 +1,14 @@
-//go:build gopherjsdev
-// +build gopherjsdev
-
 package gopherjspkg
 
 import (
-	"go/build"
+	"io/fs"
 	"net/http"
-	"os"
-	pathpkg "path"
-
-	"github.com/shurcooL/httpfs/filter"
-	log "github.com/sirupsen/logrus"
 )
 
 // FS is a virtual filesystem that contains core GopherJS packages.
-var FS = filter.Keep(
-	http.Dir(importPathToDir("github.com/gopherjs/gopherjs")),
-	func(path string, fi os.FileInfo) bool {
-		return path == "/" ||
-			path == "/js" || (pathpkg.Dir(path) == "/js" && !fi.IsDir()) ||
-			path == "/nosync" || (pathpkg.Dir(path) == "/nosync" && !fi.IsDir())
-	},
-)
+var FS http.FileSystem
 
-func importPathToDir(importPath string) string {
-	p, err := build.Import(importPath, "", build.FindOnly)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	return p.Dir
+// RegisterFS allows setting the embedded fs from another package.
+func RegisterFS(fs fs.ReadDirFS) {
+	FS = http.FS(fs)
 }

compiler/gopherjspkg/fs_vfsdata.go

@@ -0,0 +1,21 @@
+// This file exists to embed the js/ and nosync/ directories. The "embed"
+// package only supports embedding files stored beneath the directory level
+// of the go:embed directive, so we do the embedding here, then inject the
+// fs reference to the gopherjspkg package, where it's used.  In the future we
+// may wish to refactor that, as the gopherjspkg package may not really be
+// necessary at all any more.
+
+package main
+
+import (
+	"embed"
+
+	"github.com/gopherjs/gopherjs/compiler/gopherjspkg"
+)
+
+//go:embed js nosync
+var fs embed.FS
+
+func init() {
+	gopherjspkg.RegisterFS(fs)
+}

compiler/gopherjspkg/gen.go

@@ -8,8 +8,6 @@ require (
 	github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86
 	github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c
 	github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636
-	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
-	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5

embed.go

@@ -209,11 +209,7 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636 h1:aSISeOcal5irEhJd1M+IrApc0PdcN7e7Aj4yuEnOrfQ=
 github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
-github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
-github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU=
-github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=