Merge pull request #221 from dxe/alex/devsetup

Developer environment improvements

.devcontainer/devcontainer.json

@@ -40,7 +40,9 @@
 				"ms-vscode.makefile-tools",
 				"golang.go",
 				"Vue.volar",
-				"GitHub.vscode-github-actions"
+				"GitHub.vscode-github-actions",
+				"ms-vscode.vscode-typescript-next",
+				"esbenp.prettier-vscode"
 			]
 		}
 	},

.gitignore

@@ -12,3 +12,4 @@ frontend-v2/node_modules
 frontend-v2/.next
 frontend-v2/out
 npm-debug.log
+server/src/__debug*

.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+    // Stop Makefile extension from asking about installing C++ tools when the
+    // project is opened.
+    "makefile.configureOnOpen": false,
+    "editor.formatOnSave": true,
+    "[typescriptreact]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[css]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+}

Makefile

@@ -48,7 +48,7 @@ dev_db:
 # Install all deps for this project.
 deps:
 	. $(NVM_SCRIPT) && cd frontend && nvm install 16 && npm i --legacy-peer-deps
-	. $(NVM_SCRIPT) && cd frontend-v2 && nvm install 18 && pnpm i
+	. $(NVM_SCRIPT) && cd frontend-v2 && nvm install 18 && npm i -g pnpm && pnpm i
 	cd server/src && go get -t github.com/dxe/adb/...
 
 # Run all tests
@@ -86,5 +86,5 @@ prod_build: clean set_git_hooks
 # Keep in sync with hooks/pre-commit.
 fmt:
 	cd server && gofmt -w `find . -name '*.go'`
-	cd frontend && npx prettier --write *.{ts,vue,js}
+	cd frontend && npx prettier --write **/*.{ts,vue,js}
 	cd frontend-v2 && pnpm fmt

frontend/.prettierignore

@@ -0,0 +1,3 @@
+external/**
+dist/**
+static/external/**

hooks/pre-commit

@@ -3,9 +3,9 @@
 # Adapted from https://golang.org/misc/git/pre-commit
 # Keep in sync with "make fmt".
 
-gofiles=$(gofmt -l $(find . -name "*.go"))
-webfiles=$(npx prettier -l frontend/*.{js,ts,vue})
-webfilesV2=$(npx prettier -l frontend-v2/*.{ts,tsx})
+gofiles=$(cd server && gofmt -l $(find . -name "*.go"))
+webfiles=$(cd frontend && npx prettier -l **/*.{js,ts,vue})
+webfilesV2=$(cd frontend-v2 && npx prettier -l **/*.{ts,tsx})
 [ -z "$gofiles" -a -z "$webfiles" -a -z "$webfilesV2" ] && exit 0
 
 echo >&2 "Misformatted files:"
@@ -16,4 +16,3 @@ echo >&2
 echo >&2 "Please run: make fmt"
 
 exit 1
-