Skip to content

Commit 3c090eb

Browse files
flimzyflimzy
authored
Merge pull request #1197 from gopherjs/embed
Replace vfsgen with go:embed
2 parents ff35b15 + 4c93b05 commit 3c090eb

File tree

8 files changed

+36
-281
lines changed

8 files changed

+36
-281
lines changed

‎build/context_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package build
33
import (
44
"fmt"
55
"go/build"
6+
"net/http"
67
"path/filepath"
78
"strings"
89
"testing"
@@ -13,6 +14,10 @@ import (
1314
"golang.org/x/tools/go/buildutil"
1415
)
1516

17+
func init() {
18+
gopherjspkg.RegisterFS(http.Dir(".."))
19+
}
20+
1621
func TestSimpleCtx(t *testing.T) {
1722
e := DefaultEnv()
1823

‎compiler/gopherjspkg/fs.go

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,13 @@
1-
//go:build gopherjsdev
2-
// +build gopherjsdev
3-
41
package gopherjspkg
52

63
import (
7-
"go/build"
84
"net/http"
9-
"os"
10-
pathpkg "path"
11-
12-
"github.com/shurcooL/httpfs/filter"
13-
log "github.com/sirupsen/logrus"
145
)
156

167
// FS is a virtual filesystem that contains core GopherJS packages.
17-
var FS = filter.Keep(
18-
http.Dir(importPathToDir("github.com/gopherjs/gopherjs")),
19-
func(path string, fi os.FileInfo) bool {
20-
return path == "/" ||
21-
path == "/js" || (pathpkg.Dir(path) == "/js" && !fi.IsDir()) ||
22-
path == "/nosync" || (pathpkg.Dir(path) == "/nosync" && !fi.IsDir())
23-
},
24-
)
8+
var FS http.FileSystem
259

26-
func importPathToDir(importPath string) string {
27-
p, err := build.Import(importPath, "", build.FindOnly)
28-
if err != nil {
29-
log.Fatalln(err)
30-
}
31-
return p.Dir
10+
// RegisterFS allows setting the embedded fs from another package.
11+
func RegisterFS(fs http.FileSystem) {
12+
FS = fs
3213
}

‎compiler/gopherjspkg/fs_vfsdata.go

Lines changed: 0 additions & 241 deletions
This file was deleted.

‎compiler/gopherjspkg/gen.go

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎embed.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// This file exists to embed the js/ and nosync/ directories. The "embed"
2+
// package only supports embedding files stored beneath the directory level
3+
// of the go:embed directive, so we do the embedding here, then inject the
4+
// fs reference to the gopherjspkg package, where it's used. In the future we
5+
// may wish to refactor that, as the gopherjspkg package may not really be
6+
// necessary at all any more.
7+
8+
package main
9+
10+
import (
11+
"embed"
12+
"net/http"
13+
14+
"github.com/gopherjs/gopherjs/compiler/gopherjspkg"
15+
)
16+
17+
//go:embed js nosync
18+
var fs embed.FS
19+
20+
func init() {
21+
gopherjspkg.RegisterFS(http.FS(fs))
22+
}

‎go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ require (
88
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86
99
github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c
1010
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636
11-
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
12-
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
1311
github.com/sirupsen/logrus v1.8.1
1412
github.com/spf13/cobra v1.2.1
1513
github.com/spf13/pflag v1.0.5

‎go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,7 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
209209
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
210210
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636 h1:aSISeOcal5irEhJd1M+IrApc0PdcN7e7Aj4yuEnOrfQ=
211211
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
212-
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
213-
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
214212
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
215-
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU=
216-
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
217213
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
218214
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
219215
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=

‎tests/gopherjsvendored_test.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ func main() {
3737
for pkg in $(go list -f '{{if not .Goroot}}{{.ImportPath}}{{end}}' $(go list -f '{{.ImportPath}} {{join .Deps " "}}' github.com/gopherjs/gopherjs)); do
3838
copyGoPackage "$pkg" "$tmp/src/example.org/hello/vendor/$pkg"
3939
done
40+
# Two special cases
41+
for pkg in "github.com/gopherjs/gopherjs/js" "github.com/gopherjs/gopherjs/nosync"; do
42+
copyGoPackage "$pkg" "$tmp/src/example.org/hello/vendor/$pkg"
43+
done
44+
4045
cp -r "$(go list -f '{{.Dir}}' 'github.com/gopherjs/gopherjs/compiler/natives')/src" \
4146
"$tmp/src/example.org/hello/vendor/github.com/gopherjs/gopherjs/compiler/natives/src"
4247

0 commit comments

Comments
 (0)