Merge pull request #81 from adamreese/spin-build-site

Use Spin for building components

Makefile

@@ -4,7 +4,7 @@ build:
 
 .PHONY: serve
 serve:
-	./serve.sh
+	spin up --sqlite @highscore/migration.sql
 
 .PHONY: test-server
 test-server:

README.md

@@ -23,7 +23,7 @@ $ brew install kateinoigakukun/wasi-vfs/wasi-vfs
 This will by default build all microservices per the `Makefile` in their directories:
 
 ```console
-make build
+spin build
 ```
 
 You may also build a particular microservice by navigating into its directory
@@ -39,7 +39,7 @@ make build-session
 The following command will serve the Finicky Whiskers site locally:
 
 ```console
-make serve
+spin up --sqlite @highscore/migration.sql
 ```
 
 This will run the game at [http://127.0.0.1:3000](http://127.0.0.1:3000)

site/Makefile

@@ -1,3 +1,4 @@
 .PHONY: build
 build:
-	npm run build
+	[[ -d node_modules ]] || npm install
+	npm run build

spin.toml

@@ -12,7 +12,7 @@ files = [{ source = "site/dist", destination = "/" }]
 route = "/..."
 [component.build]
 workdir = "site"
-command = "npm run build"
+command = "make"
 
 # Redirect / to /index.html
 [[component]]
@@ -87,4 +87,5 @@ route = "/reset"
 [component.build]
 workdir = "reset"
 command = "make"
-watch = ["src/**/*.rs", "Cargo.toml"]
+watch = ["src/**/*.rs", "Cargo.toml"]
+

tests/test-server.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 set -beuo pipefail
 
-./serve.sh &
+spin up --sqlite @highscore/migration.sql &
 
 timeout ${TIMEOUT:-10s} bash -c 'until curl -q 127.0.0.1:3000/index.html &>/dev/null; do sleep 1; done'
 
 trap 'kill -s SIGTERM $(jobs -p)' EXIT
 
 ./tally_test.sh && \
   echo "Tally test success!" || \
-  echo "Tally test failed."
+  echo "Tally test failed."