From a39223ac522fdadd072fdedc0e302d060bee6389 Mon Sep 17 00:00:00 2001
From: Jonathan Hall <flimzy@flimzy.com>
Date: Sun, 18 Oct 2015 09:27:13 +0200
Subject: [PATCH 1/2] Rename JsFiles to JSFiles for consistency with Go norms.

---
 build/build.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/build.go b/build/build.go
index 2263638d0..d2ea9ecfc 100644
--- a/build/build.go
+++ b/build/build.go
@@ -248,7 +248,7 @@ func (o *Options) PrintSuccess(format string, a ...interface{}) {
 
 type PackageData struct {
 	*build.Package
-	JsFiles    []string
+	JSFiles    []string
 	IsTest     bool // IsTest is true if the package is being built for running tests.
 	SrcModTime time.Time
 	UpToDate   bool
@@ -313,7 +313,7 @@ func (s *Session) BuildDir(packagePath string, importPath string, pkgObj string)
 	if err != nil {
 		return err
 	}
-	pkg.JsFiles = jsFiles
+	pkg.JSFiles = jsFiles
 	if err := s.BuildPackage(pkg); err != nil {
 		return err
 	}
@@ -337,7 +337,7 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri
 
 	for _, file := range filenames {
 		if strings.HasSuffix(file, ".inc.js") {
-			pkg.JsFiles = append(pkg.JsFiles, file)
+			pkg.JSFiles = append(pkg.JSFiles, file)
 			continue
 		}
 		pkg.GoFiles = append(pkg.GoFiles, file)
@@ -370,7 +370,7 @@ func (s *Session) ImportPackage(path string) (*compiler.Archive, error) {
 	if err != nil {
 		return nil, err
 	}
-	pkg.JsFiles = jsFiles
+	pkg.JSFiles = jsFiles
 
 	if err := s.BuildPackage(pkg); err != nil {
 		return nil, err
@@ -425,7 +425,7 @@ func (s *Session) BuildPackage(pkg *PackageData) error {
 			}
 		}
 
-		for _, name := range append(pkg.GoFiles, pkg.JsFiles...) {
+		for _, name := range append(pkg.GoFiles, pkg.JSFiles...) {
 			fileInfo, err := os.Stat(filepath.Join(pkg.Dir, name))
 			if err != nil {
 				return err
@@ -470,7 +470,7 @@ func (s *Session) BuildPackage(pkg *PackageData) error {
 	}
 
 	var jsDecls []*compiler.Decl
-	for _, jsFile := range pkg.JsFiles {
+	for _, jsFile := range pkg.JSFiles {
 		code, err := ioutil.ReadFile(filepath.Join(pkg.Dir, jsFile))
 		if err != nil {
 			return err

From 2ef9011b46ebbff946cf769e042d2a6a89e9f44d Mon Sep 17 00:00:00 2001
From: Jonathan Hall <flimzy@flimzy.com>
Date: Sun, 18 Oct 2015 09:43:40 +0200
Subject: [PATCH 2/2] Move jsFilesFromDir() call into BuildPackage to catch all
 cases.

---
 build/build.go | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/build/build.go b/build/build.go
index d2ea9ecfc..020bf9973 100644
--- a/build/build.go
+++ b/build/build.go
@@ -309,11 +309,6 @@ func (s *Session) BuildDir(packagePath string, importPath string, pkgObj string)
 	}
 	pkg := &PackageData{Package: buildPkg}
 	pkg.ImportPath = "main"
-	jsFiles, err := jsFilesFromDir(pkg.Dir)
-	if err != nil {
-		return err
-	}
-	pkg.JSFiles = jsFiles
 	if err := s.BuildPackage(pkg); err != nil {
 		return err
 	}
@@ -337,7 +332,6 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri
 
 	for _, file := range filenames {
 		if strings.HasSuffix(file, ".inc.js") {
-			pkg.JSFiles = append(pkg.JSFiles, file)
 			continue
 		}
 		pkg.GoFiles = append(pkg.GoFiles, file)
@@ -366,12 +360,6 @@ func (s *Session) ImportPackage(path string) (*compiler.Archive, error) {
 	}
 	pkg := &PackageData{Package: buildPkg}
 
-	jsFiles, err := jsFilesFromDir(pkg.Dir)
-	if err != nil {
-		return nil, err
-	}
-	pkg.JSFiles = jsFiles
-
 	if err := s.BuildPackage(pkg); err != nil {
 		return nil, err
 	}
@@ -384,6 +372,12 @@ func (s *Session) BuildPackage(pkg *PackageData) error {
 		return nil
 	}
 
+	jsFiles, err := jsFilesFromDir(pkg.Dir)
+	if err != nil {
+		return err
+	}
+	pkg.JSFiles = jsFiles
+
 	if pkg.PkgObj != "" {
 		var fileInfo os.FileInfo
 		gopherjsBinary, err := osext.Executable()