diff --git a/assets/build/build.mk b/assets/build/build.mk index 4833938..19b83ec 100644 --- a/assets/build/build.mk +++ b/assets/build/build.mk @@ -80,4 +80,4 @@ endif ## Builds and bundles the plugin. .PHONY: dist -dist: server webapp bundle +dist: apply server webapp bundle diff --git a/assets/build/deploy.mk b/assets/build/deploy.mk index 9b37e21..a9c0fe0 100644 --- a/assets/build/deploy.mk +++ b/assets/build/deploy.mk @@ -2,6 +2,11 @@ # Deployment and Plugin Management # ==================================================================================== +## Applies the plugin manifest to the server and webapp codebase +.PHONY: apply +apply: + pluginctl manifest apply + ## Builds and installs the plugin to a server. .PHONY: deploy deploy: dist @@ -9,7 +14,7 @@ deploy: dist ## Builds and installs the plugin to a server, updating the webapp automatically when changed. .PHONY: watch -watch: server bundle +watch: apply server bundle ifeq ($(MM_DEBUG),) cd webapp && $(NPM) run build:watch else diff --git a/assets/build/test.mk b/assets/build/test.mk index f084664..e7691a2 100644 --- a/assets/build/test.mk +++ b/assets/build/test.mk @@ -10,7 +10,7 @@ install-go-tools: ## Runs eslint and golangci-lint .PHONY: check-style -check-style: manifest-check webapp/node_modules install-go-tools +check-style: manifest-check apply webapp/node_modules install-go-tools @echo Checking for style guide compliance ifneq ($(HAS_WEBAPP),) @@ -29,7 +29,7 @@ endif ## Runs any lints and unit tests defined for the server and webapp, if they exist. .PHONY: test -test: webapp/node_modules install-go-tools +test: apply webapp/node_modules install-go-tools ifneq ($(HAS_SERVER),) $(GOBIN)/gotestsum -- -v ./... endif @@ -40,7 +40,7 @@ endif ## Runs any lints and unit tests defined for the server and webapp, if they exist, optimized ## for a CI environment. .PHONY: test-ci -test-ci: webapp/node_modules install-go-tools +test-ci: apply webapp/node_modules install-go-tools ifneq ($(HAS_SERVER),) $(GOBIN)/gotestsum --format standard-verbose --junitfile report.xml -- ./... endif @@ -50,7 +50,7 @@ endif ## Creates a coverage report for the server code. .PHONY: coverage -coverage: webapp/node_modules +coverage: apply webapp/node_modules ifneq ($(HAS_SERVER),) $(GO) test $(GO_TEST_FLAGS) -coverprofile=server/coverage.txt ./server/... $(GO) tool cover -html=server/coverage.txt