From eb631989595e2f2f2cf2fcd2e44afc5ee945d912 Mon Sep 17 00:00:00 2001
From: Garrett <garrett@coder.com>
Date: Tue, 17 May 2022 16:25:39 +0000
Subject: [PATCH 1/2] chore: add make dev

---
 Makefile                         | 4 ++++
 develop.sh => scripts/develop.sh | 0
 2 files changed, 4 insertions(+)
 rename develop.sh => scripts/develop.sh (100%)

diff --git a/Makefile b/Makefile
index 9ea8aa90a13b0..dd0f263c1fbff 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,10 @@ coderd/database/dump.sql: $(wildcard coderd/database/migrations/*.sql)
 coderd/database/querier.go: coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql)
 	coderd/database/generate.sh
 
+dev: build
+	./scripts/develop.sh
+.PHONY: dev
+
 dist/artifacts.json: site/out/index.html $(shell find . -not -path './vendor/*' -type f -name '*.go') go.mod go.sum
 	goreleaser release --snapshot --rm-dist --skip-sign
 
diff --git a/develop.sh b/scripts/develop.sh
similarity index 100%
rename from develop.sh
rename to scripts/develop.sh

From bc57a4a0662e0e7700d21c7710ea8b797154dc63 Mon Sep 17 00:00:00 2001
From: Garrett <garrett@coder.com>
Date: Tue, 17 May 2022 16:44:35 +0000
Subject: [PATCH 2/2] add make dev to contribution docs

---
 docs/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 0658262128fc6..4164727df51fb 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -9,10 +9,10 @@ Coder requires Go 1.18+, Node 14+, and GNU Make.
 
 Use the following `make` commands and scripts in development:
 
+- `make dev` runs the frontend and backend development server
 - `make build` compiles binaries and release packages
 - `make install` installs binaries to `$GOPATH/bin`
 - `make test`
-- `./develop.sh` hot reloads for front-end development
 
 ## Styling