vendor: bump github.com/gopherjs/gopherjs

To rev 0fee806ad4970060e8f97d37a50fc58572426195, to support Go 1.11.1

Fixes #1227

Change-Id: I8cbb24ff60b3407bec3fad0d660957e36d998324
This commit is contained in:
mpl 2018-10-07 04:29:52 +02:00
parent ae7698101e
commit bcb0ec628e
6 changed files with 67 additions and 33 deletions

2
go.mod
View File

@ -21,7 +21,7 @@ require (
github.com/golang/protobuf v1.0.0
github.com/golang/snappy v0.0.0-20170215233205-553a64147049
github.com/googleapis/gax-go v0.0.0-20161107002406-da06d194a00e
github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c
github.com/gopherjs/gopherjs v0.0.0-20181004052249-0fee806ad497
github.com/gopherjs/jquery v0.0.0-20151020083714-fbbfc4bbe29a
github.com/gopherjs/jsbuiltin v0.0.0-20170427220125-67703bfb044e
github.com/gorilla/websocket v1.2.0

2
go.sum
View File

@ -47,6 +47,8 @@ github.com/gopherjs/gopherjs v0.0.0-20180424202546-8dffc02ea1cb h1:g0omhilXoAZ+6
github.com/gopherjs/gopherjs v0.0.0-20180424202546-8dffc02ea1cb/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c h1:16eHWuMGvCjSfgRJKqIzapE78onvvTbdi1rMkU00lZw=
github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherjs v0.0.0-20181004052249-0fee806ad497 h1:fZpNOC68EbKG4nmRx3ZL/XqG/Fd6SIyPUus23DIvm/Q=
github.com/gopherjs/gopherjs v0.0.0-20181004052249-0fee806ad497/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/jquery v0.0.0-20151020083714-fbbfc4bbe29a h1:weMA9gU+G5BrBBBPaS/gRwHhD1+IAUgpnG05s5N9boE=
github.com/gopherjs/jquery v0.0.0-20151020083714-fbbfc4bbe29a/go.mod h1:xKR3tvLne+vYYPH9d4DM8X9MKlNV2yXDEomxulcK218=
github.com/gopherjs/jsbuiltin v0.0.0-20170427220125-67703bfb044e h1:IQ+8CE5oBzuXnrTl85ohGltMQt0edvNKdKvM//6Yb6I=

View File

@ -312,6 +312,14 @@ func parseAndAugment(bctx *build.Context, pkg *build.Package, isTest bool, fileS
return natives.FS.Open(name)
},
}
// reflect needs to tell Go 1.11 apart from Go 1.11.1 for https://github.com/gopherjs/gopherjs/issues/862,
// so provide it with the custom go1.11.1 build tag whenever we're on Go 1.11.1 or later.
// TODO: Remove this ad hoc special behavior in GopherJS 1.12.
if runtime.Version() != "go1.11" {
nativesContext.ReleaseTags = append(nativesContext.ReleaseTags, "go1.11.1")
}
if nativesPkg, err := nativesContext.Import(importPath, "", 0); err == nil {
names := nativesPkg.GoFiles
if isTest {

File diff suppressed because one or more lines are too long

View File

@ -6,4 +6,4 @@ package compiler
const ___GOPHERJS_REQUIRES_GO_VERSION_1_11___ = true
// Version is the GopherJS compiler version string.
const Version = "1.11-1"
const Version = "1.11-2"

View File

@ -641,7 +641,15 @@ func (fs serveCommandFileSystem) Open(requestName string) (http.File, error) {
if isIndex {
// If there was no index.html file in any dirs, supply our own.
return newFakeFile("index.html", []byte(`<html><head><meta charset="utf-8"><script src="`+base+`.js"></script></head><body></body></html>`)), nil
return newFakeFile("index.html", []byte(`<html>
<head>
<meta name="viewport" content="initial-scale=1">
<meta charset="utf-8">
<script defer src="`+base+`.js"></script>
</head>
<body>
</body>
</html>`)), nil
}
return nil, os.ErrNotExist