Merge pull request #121 from nitrictech/fix/nodemon-restart-windows

fix: nodemon poll required for hot reload windows
nitrictech · Mar 1, 2022 · 4426eb2 · 4426eb2
2 parents 389d679 + 8e3a278
commit 4426eb2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/pkg/runtime/javascript.go b/pkg/runtime/javascript.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io"
 	"path/filepath"
+	osruntime "runtime"
 	"strings"
 
 	"github.com/docker/docker/api/types/mount"
@@ -110,6 +111,15 @@ func (t *javascript) LaunchOptsForFunctionCollect(runCtx string) (LaunchOpts, er
 }
 
 func (t *javascript) LaunchOptsForFunction(runCtx string) (LaunchOpts, error) {
+	var cmd []string
+
+	if osruntime.GOOS == "windows" {
+		// https://github.com/remy/nodemon#application-isnt-restarting
+		cmd = strslice.StrSlice{"--watch", "/app/**", "--ext", "ts,js,json", "-L", "--exec", "node " + "/app/" + filepath.ToSlash(t.handler)}
+	} else {
+		cmd = strslice.StrSlice{"--watch", "/app/**", "--ext", "ts,js,json", "--exec", "node " + "/app/" + filepath.ToSlash(t.handler)}
+	}
+
 	return LaunchOpts{
 		Mounts: []mount.Mount{
 			{
@@ -120,6 +130,6 @@ func (t *javascript) LaunchOptsForFunction(runCtx string) (LaunchOpts, error) {
 		},
 		TargetWD:   "/app",
 		Entrypoint: strslice.StrSlice{"nodemon"},
-		Cmd:        strslice.StrSlice{"--watch", "/app/**", "--ext", "ts,js,json", "--exec", "node " + "/app/" + filepath.ToSlash(t.handler)},
+		Cmd:        cmd,
 	}, nil
 }
diff --git a/pkg/runtime/typescript.go b/pkg/runtime/typescript.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io"
 	"path/filepath"
+	osruntime "runtime"
 	"strings"
 
 	"github.com/docker/docker/api/types/mount"
@@ -113,6 +114,15 @@ func (t *typescript) LaunchOptsForFunctionCollect(runCtx string) (LaunchOpts, er
 }
 
 func (t *typescript) LaunchOptsForFunction(runCtx string) (LaunchOpts, error) {
+	var cmd []string
+
+	if osruntime.GOOS == "windows" {
+		// https://github.com/remy/nodemon#application-isnt-restarting
+		cmd = strslice.StrSlice{"--watch", "/app/**", "--ext", "ts,js,json", "-L", "--exec", "ts-node -T " + "/app/" + filepath.ToSlash(t.handler)}
+	} else {
+		cmd = strslice.StrSlice{"--watch", "/app/**", "--ext", "ts,js,json", "--exec", "ts-node -T " + "/app/" + filepath.ToSlash(t.handler)}
+	}
+
 	return LaunchOpts{
 		TargetWD: "/app",
 		Mounts: []mount.Mount{
@@ -123,6 +133,6 @@ func (t *typescript) LaunchOptsForFunction(runCtx string) (LaunchOpts, error) {
 			},
 		},
 		Entrypoint: strslice.StrSlice{"nodemon"},
-		Cmd:        strslice.StrSlice{"--watch", "/app/**", "--ext", "ts,js,json", "--exec", "ts-node -T " + "/app/" + filepath.ToSlash(t.handler)},
+		Cmd:        cmd,
 	}, nil
 }