diff --git a/Makefile b/Makefile index 65c27d7..cce034c 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,8 @@ setup: ( cd client && yarn install ) @echo "I installing server dependencies" ( cd server/src/ && go mod tidy ) + @echo "I create client output directory" + mkdir -p client/.output/public/ run-all: pexec -R -c -e TARGET \ @@ -55,6 +57,6 @@ run-standalone: $(MAKE) -C server run-standalone clean: - rm -rf client/dist/ + rm -rf client/.output/ rm -rf client/.nuxt/ $(MAKE) -C server clean diff --git a/server/Makefile b/server/Makefile index 14c24b8..d9de308 100644 --- a/server/Makefile +++ b/server/Makefile @@ -31,6 +31,6 @@ clean: generate: src/resources/dist-generated.go -src/resources/dist-generated.go: $(shell find ../client/dist -type f) +src/resources/dist-generated.go: $(shell find ../client/.output/public/ -type f) src/resources/dist-generated.go: src/resources/dist-build.go go generate src/resources/dist-build.go diff --git a/server/src/resources/dist-build.go b/server/src/resources/dist-build.go index fa94e32..830d4d9 100644 --- a/server/src/resources/dist-build.go +++ b/server/src/resources/dist-build.go @@ -1,3 +1,3 @@ package Resources -//go:generate go-bindata -pkg Resources -o dist-generated.go --prefix ../../../client/dist/ ../../../client/dist/ ../../../client/dist/_nuxt/ ../../../client/dist/play/ ../../../client/dist/gamemaster/ ../../../client/dist/admin/ ../../../client/dist/fonts/dosis ../../../client/dist/fonts/wendy-one +//go:generate go-bindata -pkg Resources -o dist-generated.go --prefix ../../../client/.output/public/ ../../../client/.output/public/...