gopherjs · visualfc · Jan 25, 2020 · Jan 25, 2020 · Jan 25, 2020 · Jan 26, 2020
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /node-syscall/build
 /node_modules
+package-lock.json
diff --git a/.std_test_pkg_exclusions b/.std_test_pkg_exclusions
@@ -3,6 +3,8 @@ crypto
 crypto/internal/cipherhw
 crypto/tls
 crypto/x509/pkix
+crypto/ed25519
+crypto/ed25519/internal/edwards25519
 debug/gosym
 debug/plan9obj
 encoding
@@ -63,3 +65,23 @@ testing
 testing/internal/testdeps
 testing/iotest
 unsafe
+vendor/golang.org/x/crypto/chacha20poly1305
+vendor/golang.org/x/crypto/cryptobyte
+vendor/golang.org/x/crypto/cryptobyte/asn1
+vendor/golang.org/x/crypto/curve25519
+vendor/golang.org/x/crypto/hkdf
+vendor/golang.org/x/crypto/internal/chacha20
+vendor/golang.org/x/crypto/internal/subtle
+vendor/golang.org/x/crypto/poly1305
+vendor/golang.org/x/net/dns/dnsmessage
+vendor/golang.org/x/net/http/httpguts
+vendor/golang.org/x/net/http/httpproxy
+vendor/golang.org/x/net/http2/hpack
+vendor/golang.org/x/net/idna
+vendor/golang.org/x/net/nettest
+vendor/golang.org/x/net/route
+vendor/golang.org/x/sys/cpu
+vendor/golang.org/x/text/secure/bidirule
+vendor/golang.org/x/text/transform
+vendor/golang.org/x/text/unicode/bidi
+vendor/golang.org/x/text/unicode/norm
diff --git a/build/build.go b/build/build.go
@@ -19,13 +19,17 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gopherjs/gopherjs/internal/goversion"
+
 	"github.com/fsnotify/fsnotify"
 	"github.com/gopherjs/gopherjs/compiler"
 	"github.com/gopherjs/gopherjs/compiler/gopherjspkg"
 	"github.com/gopherjs/gopherjs/compiler/natives"
 	"github.com/neelance/sourcemap"
 	"github.com/shurcooL/httpfs/vfsutil"
 	"golang.org/x/tools/go/buildutil"
+
+	"github.com/visualfc/fastmod"
 )
 
 type ImportCError struct {
@@ -54,7 +58,7 @@ func NewBuildContext(installSuffix string, buildTags []string) *build.Context {
 			"netgo",  // See https://godoc.org/net#hdr-Name_Resolution.
 			"purego", // See https://golang.org/issues/23172.
 		),
-		ReleaseTags: build.Default.ReleaseTags,
+		ReleaseTags: goversion.ReleaseTags(),
 		CgoEnabled:  true, // detect `import "C"` to throw proper error
 
 		IsDir: func(path string) bool {
@@ -125,10 +129,10 @@ func Import(path string, mode build.ImportMode, installSuffix string, buildTags
 		wd = ""
 	}
 	bctx := NewBuildContext(installSuffix, buildTags)
-	return importWithSrcDir(*bctx, path, wd, mode, installSuffix)
+	return importWithSrcDir(*bctx, path, wd, mode, installSuffix, nil)
 }
 
-func importWithSrcDir(bctx build.Context, path string, srcDir string, mode build.ImportMode, installSuffix string) (*PackageData, error) {
+func importWithSrcDir(bctx build.Context, path string, srcDir string, mode build.ImportMode, installSuffix string, mod *fastmod.Package) (*PackageData, error) {
 	// bctx is passed by value, so it can be modified here.
 	var isVirtual bool
 	switch path {
@@ -154,7 +158,24 @@ func importWithSrcDir(bctx build.Context, path string, srcDir string, mode build
 		mode |= build.IgnoreVendor
 		isVirtual = true
 	}
-	pkg, err := bctx.Import(path, srcDir, mode)
+	var pkg *build.Package
+	var err error
+	if mod != nil && mod.IsValid() && !mod.IsStd() {
+		if _, dir, typ := mod.Lookup(path); typ != fastmod.PkgTypeNil {
+			srcDir = dir
+			pkg, err = bctx.ImportDir(srcDir, mode)
+			if err == nil {
+				pkg.ImportPath = path
+			}
+		}
+	}
+	if pkg == nil {
+		if filepath.IsAbs(path) {
+			pkg, err = bctx.ImportDir(path, mode)
+		} else {
+			pkg, err = bctx.Import(path, srcDir, mode)
+		}
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -276,11 +297,12 @@ func parseAndAugment(bctx *build.Context, pkg *build.Package, isTest bool, fileS
 	}
 
 	nativesContext := &build.Context{
-		GOROOT:   "/",
-		GOOS:     build.Default.GOOS,
-		GOARCH:   "js",
-		Compiler: "gc",
-		JoinPath: path.Join,
+		GOROOT:      "/",
+		GOOS:        build.Default.GOOS,
+		GOARCH:      "js",
+		Compiler:    "gc",
+		ReleaseTags: goversion.ReleaseTags(),
+		JoinPath:    path.Join,
 		SplitPathList: func(list string) []string {
 			if list == "" {
 				return nil
@@ -443,6 +465,7 @@ type Options struct {
 	Minify         bool
 	Color          bool
 	BuildTags      []string
+	Rebuild        bool
 }
 
 func (o *Options) PrintError(format string, a ...interface{}) {
@@ -471,11 +494,23 @@ type PackageData struct {
 type Session struct {
 	options  *Options
 	bctx     *build.Context
+	mod      *fastmod.Package
 	Archives map[string]*compiler.Archive
 	Types    map[string]*types.Package
 	Watcher  *fsnotify.Watcher
 }
 
+func (s *Session) checkMod(pkg *PackageData) (err error) {
+	s.mod.Clear()
+	if pkg != nil && !pkg.Goroot {
+		err := s.mod.LoadModule(pkg.Dir)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func NewSession(options *Options) *Session {
 	if options.GOROOT == "" {
 		options.GOROOT = build.Default.GOROOT
@@ -490,6 +525,7 @@ func NewSession(options *Options) *Session {
 		Archives: make(map[string]*compiler.Archive),
 	}
 	s.bctx = NewBuildContext(s.InstallSuffix(), s.options.BuildTags)
+	s.mod = fastmod.NewPackage(s.bctx)
 	s.Types = make(map[string]*types.Package)
 	if options.Watch {
 		if out, err := exec.Command("ulimit", "-n").Output(); err == nil {
@@ -531,7 +567,7 @@ func (s *Session) BuildDir(packagePath string, importPath string, pkgObj string)
 		return err
 	}
 	pkg.JSFiles = jsFiles
-	archive, err := s.BuildPackage(pkg)
+	archive, err := s.buildPackage(pkg)
 	if err != nil {
 		return err
 	}
@@ -554,6 +590,10 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri
 			Dir:        packagePath,
 		},
 	}
+	err := s.checkMod(pkg)
+	if err != nil {
+		return err
+	}
 
 	for _, file := range filenames {
 		if strings.HasSuffix(file, ".inc.js") {
@@ -563,7 +603,7 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri
 		pkg.GoFiles = append(pkg.GoFiles, file)
 	}
 
-	archive, err := s.BuildPackage(pkg)
+	archive, err := s.buildPackage(pkg)
 	if err != nil {
 		return err
 	}
@@ -574,20 +614,28 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri
 }
 
 func (s *Session) BuildImportPath(path string) (*compiler.Archive, error) {
-	_, archive, err := s.buildImportPathWithSrcDir(path, "")
+	_, archive, err := s.BuildImportPathWithPackage(path, nil)
 	return archive, err
 }
 
-func (s *Session) buildImportPathWithSrcDir(path string, srcDir string) (*PackageData, *compiler.Archive, error) {
-	pkg, err := importWithSrcDir(*s.bctx, path, srcDir, 0, s.InstallSuffix())
+func (s *Session) BuildImportPathWithPackage(path string, pkgData *PackageData) (*PackageData, *compiler.Archive, error) {
+	var srcDir string
+	var mod *fastmod.Package
+	if pkgData != nil {
+		srcDir = pkgData.Dir
+		if !pkgData.Goroot {
+			mod = s.mod
+		}
+	}
+	pkg, err := importWithSrcDir(*s.bctx, path, srcDir, 0, s.InstallSuffix(), mod)
 	if s.Watcher != nil && pkg != nil { // add watch even on error
 		s.Watcher.Add(pkg.Dir)
 	}
 	if err != nil {
 		return nil, nil, err
 	}
 
-	archive, err := s.BuildPackage(pkg)
+	archive, err := s.buildPackage(pkg)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -596,6 +644,14 @@ func (s *Session) buildImportPathWithSrcDir(path string, srcDir string) (*Packag
 }
 
 func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
+	err := s.checkMod(pkg)
+	if err != nil {
+		return nil, err
+	}
+	return s.buildPackage(pkg)
+}
+
+func (s *Session) buildPackage(pkg *PackageData) (*compiler.Archive, error) {
 	if archive, ok := s.Archives[pkg.ImportPath]; ok {
 		return archive, nil
 	}
@@ -634,7 +690,7 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 			if importedPkgPath == "unsafe" || ignored {
 				continue
 			}
-			importedPkg, _, err := s.buildImportPathWithSrcDir(importedPkgPath, pkg.Dir)
+			importedPkg, _, err := s.BuildImportPathWithPackage(importedPkgPath, pkg)
 			if err != nil {
 				return nil, err
 			}
@@ -655,7 +711,7 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 		}
 
 		pkgObjFileInfo, err := os.Stat(pkg.PkgObj)
-		if err == nil && !pkg.SrcModTime.After(pkgObjFileInfo.ModTime()) {
+		if !s.options.Rebuild && err == nil && !pkg.SrcModTime.After(pkgObjFileInfo.ModTime()) {
 			// package object is up to date, load from disk if library
 			pkg.UpToDate = true
 			if pkg.IsCommand() {
@@ -691,7 +747,7 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 			if archive, ok := localImportPathCache[path]; ok {
 				return archive, nil
 			}
-			_, archive, err := s.buildImportPathWithSrcDir(path, pkg.Dir)
+			_, archive, err := s.BuildImportPathWithPackage(path, pkg)
 			if err != nil {
 				return nil, err
 			}
@@ -715,7 +771,7 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 	}
 
 	if s.options.Verbose {
-		fmt.Println(pkg.ImportPath)
+		fmt.Println(pkg.Dir)
 	}
 
 	s.Archives[pkg.ImportPath] = archive
@@ -784,7 +840,7 @@ func (s *Session) WriteCommandPackage(archive *compiler.Archive, pkgObj string)
 		if archive, ok := s.Archives[path]; ok {
 			return archive, nil
 		}
-		_, archive, err := s.buildImportPathWithSrcDir(path, "")
+		_, archive, err := s.BuildImportPathWithPackage(path, nil)
 		return archive, err
 	})
 	if err != nil {

diff --git a/circle.yml b/circle.yml
@@ -2,22 +2,21 @@ version: 2
 jobs:
   build:
     docker:
-    - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
-      command: /sbin/init
+    - image: ubuntu:18.04
     environment:
       SOURCE_MAP_SUPPORT: false
     working_directory: ~/go/src/github.com/gopherjs/gopherjs
     steps:
+    - run: apt-get update && apt-get install -y sudo curl git python make g++
     - checkout
     - run: git clone https://github.com/creationix/nvm $HOME/.nvm && cd $HOME/.nvm && git checkout v0.33.9 && echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
     - run: nvm install 10.0.0 && nvm alias default 10.0.0
-    - run: cd /usr/local && sudo rm -rf go && curl https://storage.googleapis.com/golang/go1.13beta1.linux-amd64.tar.gz | sudo tar -xz
+    - run: cd /usr/local && sudo rm -rf go && curl https://storage.googleapis.com/golang/go1.13.6.linux-amd64.tar.gz | sudo tar -xz
     - run: echo 'export PATH="$PATH:/usr/local/go/bin:$HOME/go/bin"' >> $BASH_ENV
     - run: go get -t -d -v ./...
     - run: go install -v
     - run: npm install # Install our (dev) dependencies from package.json.
-    - run: npm install --global node-gyp
-    - run: cd node-syscall && node-gyp rebuild && mkdir -p ~/.node_libraries && cp build/Release/syscall.node ~/.node_libraries/syscall.node
+    - run: cd node-syscall && ../node_modules/node-gyp/bin/node-gyp.js rebuild rebuild && mkdir -p ~/.node_libraries && cp build/Release/syscall.node ~/.node_libraries/syscall.node
 
     - run: go generate github.com/gopherjs/gopherjs/compiler/prelude
     - run: diff -u <(echo -n) <(git status --porcelain)

diff --git a/compiler/compiler.go b/compiler/compiler.go
@@ -17,7 +17,7 @@ import (
 
 var sizes32 = &types.StdSizes{WordSize: 4, MaxAlign: 8}
 var reservedKeywords = make(map[string]bool)
-var _ = ___GOPHERJS_REQUIRES_GO_VERSION_1_13___ // Compile error on other Go versions, because they're not supported.
+var _ = ___GOPHERJS_REQUIRES_GO_VERSION_1_12___ // Compile error on other Go versions, because they're not supported.
 
 func init() {
 	for _, keyword := range []string{"abstract", "arguments", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "eval", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "typeof", "undefined", "var", "void", "volatile", "while", "with", "yield"} {

diff --git a/compiler/expressions.go b/compiler/expressions.go
@@ -955,7 +955,8 @@ func (c *funcContext) translateConversion(expr ast.Expr, desiredType types.Type)
 		return c.translateExpr(expr)
 	}
 
-	if c.p.Pkg.Path() == "reflect" {
+	pkgPath := c.p.Pkg.Path()
+	if pkgPath == "reflect" || pkgPath == "internal/reflectlite" {
 		if call, isCall := expr.(*ast.CallExpr); isCall && types.Identical(c.p.TypeOf(call.Fun), types.Typ[types.UnsafePointer]) {
 			if ptr, isPtr := desiredType.(*types.Pointer); isPtr {
 				if named, isNamed := ptr.Elem().(*types.Named); isNamed {

diff --git a/compiler/go113_version_check.go b/compiler/go113_version_check.go
@@ -0,0 +1,8 @@
+// +build go1.13
+
+package compiler
+
+const ___GOPHERJS_REQUIRES_GO_VERSION_1_12___ = true
+
+// Version is the GopherJS compiler version string.
+const Version = "1.13-1"
diff --git a/compiler/gopherjspkg/fs.go b/compiler/gopherjspkg/fs.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	pathpkg "path"
+	"path/filepath"
 
 	"github.com/shurcooL/httpfs/filter"
 )
@@ -23,6 +24,12 @@ var FS = filter.Keep(
 )
 
 func importPathToDir(importPath string) string {
+	for _, src := range build.Default.SrcDirs() {
+		dir := filepath.Join(src, importPath)
+		if _, err := os.Stat(dir); err == nil {
+			return dir
+		}
+	}
 	p, err := build.Import(importPath, "", build.FindOnly)
 	if err != nil {
 		log.Fatalln(err)