build, compiler/typesutil: Don't use vendor directory to resolve js, nosync.

dmitshur · dmitshur · commit b90dbcb0f885 · 2018-04-20T17:30:27.000-04:00
These core GopherJS packages are already embedded into the GopherJS build system via the gopherjspkg virtual filesystem. The gopherjspkg package can be safely vendored. Therefore, there's no need to try to use vendor directory to resolve those packages. This change makes it possible to use a vendored copy of GopherJS in a project, and use it to build any Go code. Fixes gopherjs#415.
diff --git a/build/build.go b/build/build.go
@@ -144,17 +144,16 @@ func importWithSrcDir(bctx build.Context, path string, srcDir string, mode build
 	case "crypto/x509", "os/user":
 		// These stdlib packages have cgo and non-cgo versions (via build tags); we want the latter.
 		bctx.CgoEnabled = false
+	case "github.com/gopherjs/gopherjs/js", "github.com/gopherjs/gopherjs/nosync":
+		// These packages are already embedded via gopherjspkg.FS virtual filesystem (which can be
+		// safely vendored). Don't try to use vendor directory to resolve them.
+		mode |= build.IgnoreVendor
 	}
 	pkg, err := bctx.Import(path, srcDir, mode)
 	if err != nil {
 		return nil, err
 	}
 
-	// TODO: Resolve issue #415 and remove this temporary workaround.
-	if strings.HasSuffix(pkg.ImportPath, "/vendor/github.com/gopherjs/gopherjs/js") {
-		return nil, fmt.Errorf("vendoring github.com/gopherjs/gopherjs/js package is not supported, see https://github.com/gopherjs/gopherjs/issues/415")
-	}
-
 	switch path {
 	case "os":
 		pkg.GoFiles = excludeExecutable(pkg.GoFiles) // Need to exclude executable implementation files, because some of them contain package scope variables that perform (indirectly) syscalls on init.
diff --git a/compiler/typesutil/typesutil.go b/compiler/typesutil/typesutil.go
@@ -1,12 +1,9 @@
 package typesutil
 
-import (
-	"go/types"
-	"strings"
-)
+import "go/types"
 
 func IsJsPackage(pkg *types.Package) bool {
-	return pkg != nil && (pkg.Path() == "github.com/gopherjs/gopherjs/js" || strings.HasSuffix(pkg.Path(), "/vendor/github.com/gopherjs/gopherjs/js"))
+	return pkg != nil && pkg.Path() == "github.com/gopherjs/gopherjs/js"
 }
 
 func IsJsObject(t types.Type) bool {
