From d653a23e66d2cf37b02d670e61856485ce97ab8c Mon Sep 17 00:00:00 2001
From: Mark Bates <mark@markbates.com>
Date: Tue, 24 Jan 2017 08:26:54 +0100
Subject: [PATCH 1/2] fix webpack to run locally on windows

---
 buffalo/cmd/build.go            | 3 ++-
 buffalo/cmd/dev.go              | 3 ++-
 buffalo/cmd/generate/webpack.go | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/buffalo/cmd/build.go b/buffalo/cmd/build.go
index fd018a83d..afc8adf53 100644
--- a/buffalo/cmd/build.go
+++ b/buffalo/cmd/build.go
@@ -33,6 +33,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gobuffalo/buffalo/buffalo/cmd/generate"
 	"github.com/gobuffalo/velvet"
 	"github.com/spf13/cobra"
 )
@@ -70,7 +71,7 @@ func (b *builder) buildWebpack() error {
 	_, err := os.Stat("webpack.config.js")
 	if err == nil {
 		// build webpack
-		return b.exec("./node_modules/webpack/bin/webpack.js")
+		return b.exec(generate.WebpackPath)
 	}
 	return nil
 }
diff --git a/buffalo/cmd/dev.go b/buffalo/cmd/dev.go
index 4d2359332..3dc50370a 100644
--- a/buffalo/cmd/dev.go
+++ b/buffalo/cmd/dev.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"os/exec"
 
+	"github.com/gobuffalo/buffalo/buffalo/cmd/generate"
 	"github.com/markbates/refresh/refresh"
 	"github.com/spf13/cobra"
 )
@@ -73,7 +74,7 @@ func startWebpack(ctx context.Context) error {
 		// there's no webpack, so don't do anything
 		return nil
 	}
-	cmd := exec.Command("./node_modules/webpack/bin/webpack.js", "--watch")
+	cmd := exec.Command(generate.WebpackPath, "--watch")
 	cmd.Stdin = os.Stdin
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout
diff --git a/buffalo/cmd/generate/webpack.go b/buffalo/cmd/generate/webpack.go
index 098fdfaa8..a75b4c2f1 100644
--- a/buffalo/cmd/generate/webpack.go
+++ b/buffalo/cmd/generate/webpack.go
@@ -23,11 +23,14 @@ package generate
 import (
 	"fmt"
 	"os/exec"
+	"path/filepath"
 
 	"github.com/markbates/gentronics"
 	"github.com/spf13/cobra"
 )
 
+var WebpackPath = filepath.Join("node_modules", ".bin", "webpack")
+
 var publicLogo = &gentronics.RemoteFile{
 	File:       gentronics.NewFile("public/assets/images/logo.svg", ""),
 	RemotePath: "https://raw.githubusercontent.com/gobuffalo/buffalo/master/logo.svg",

From 1b9c6ad8dba1f2a00ca347f2798a874a18a05b06 Mon Sep 17 00:00:00 2001
From: Mark Bates <mark@markbates.com>
Date: Tue, 24 Jan 2017 09:02:52 +0100
Subject: [PATCH 2/2] Update webpack.go

---
 buffalo/cmd/generate/webpack.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buffalo/cmd/generate/webpack.go b/buffalo/cmd/generate/webpack.go
index a75b4c2f1..96cd6110a 100644
--- a/buffalo/cmd/generate/webpack.go
+++ b/buffalo/cmd/generate/webpack.go
@@ -29,6 +29,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
+// WebpackPath is the path to the local install of webpack
 var WebpackPath = filepath.Join("node_modules", ".bin", "webpack")
 
 var publicLogo = &gentronics.RemoteFile{