chore(ci): various makefile improvements

Makefile

@@ -1,18 +1,23 @@
+# Please keep this file free of actual scripts
+# It should only be used for adding "non-dot" aliases and documentation
+
 SHELL := /usr/bin/env bash
-MK := ./packages/config/src/mk
+
+KUMAHQ_CONFIG := $(shell npm query .workspace | jq -r '.[] | select(.name == "@kumahq/config") | .path')
+MK := $(KUMAHQ_CONFIG)/src/mk
 
 ## make help: if you're aren't sure use `make help`
 .DEFAULT_GOAL := help
+include $(MK)/help.mk
 
 include $(MK)/install.mk
 include $(MK)/check.mk
-include $(MK)/help.mk
+
+.PHONY: help
+help: .help ## Display this help screen
 
 .PHONY: clean
 clean: .clean ## Dev: Remove all `node_modules` recursively
 
 .PHONY: install
 install: .install ## Dev: Install all dependencies
-
-.PHONY: help
-help: .help ## Display this help screen

packages/config/Makefile

@@ -1,13 +1,26 @@
-MK := ./src/mk
+# Please keep this file free of actual scripts
+# It should only be used for adding "non-dot" aliases and documentation
+
+SHELL := /usr/bin/env bash
+
+KUMAHQ_CONFIG := $(shell npm query .workspace | jq -r '.[] | select(.name == "@kumahq/config") | .path')
+MK := $(KUMAHQ_CONFIG)/src/mk
 
 ## make help: if you're aren't sure use `make help`
 .DEFAULT_GOAL := help
+include $(MK)/help.mk
 
+include $(MK)/install.mk
 include $(MK)/check.mk
-include $(MK)/help.mk
 
 .PHONY: help
 help: .help ## Display this help screen
 
+.PHONY: clean
+clean: .clean ## Dev: Remove all `node_modules` recursively
+
+.PHONY: install
+install: .install ## Dev: Install all dependencies
+
 .PHONY: lint
 lint: .lint/script ## Dev: Run all lint script checks (js,ts)

packages/config/scripts/ci.cjs

@@ -1,5 +1,18 @@
 const { sync: globSync } = require('glob')
+const { readFileSync: read } = require('fs')
 
+const depsToDevDeps = (path) => {
+  const pkg = JSON.parse(read(path, 'utf-8'))
+  return JSON.stringify({
+    ...pkg,
+    dependencies: {},
+    peerDependencies: {},
+    devDependencies: {
+      ...pkg.dependencies,
+      ...pkg.devDependencies,
+    },
+  })
+}
 /**
  * @param {number} length
  * @param {string} prefix
@@ -33,4 +46,5 @@ function shuffleArray(array) {
 
 module.exports = {
   getPartitionedTestFiles,
+  depsToDevDeps,
 }

packages/config/src/index.cjs

@@ -1,7 +1,9 @@
 const { createEslintConfig } = require('./eslint.cjs')
 const { createStylelintConfig } = require('./stylelint.cjs')
+const ci = require('../scripts/ci.cjs')
 
 module.exports = {
   eslint: createEslintConfig,
   stylelint: createStylelintConfig,
+  ci,
 }

packages/config/src/mk/help.mk

@@ -1,6 +1,10 @@
+NPM_WORKSPACE_ROOT := $(shell npm prefix)
+NODE_VERSION := v$(shell cat $(NPM_WORKSPACE_ROOT)/.nvmrc)
+KUMAHQ_CONFIG := $(shell npm query .workspace | jq -r '.[] | select(.name == "@kumahq/config") | .path')
+
 .PHONY: .help
 .help: ## Display this help screen
-	@echo "The following targets can be used by running \`make <target>\`"; echo "---"
+	@echo "The following targets can be used by running \`make <target>\` in this directory:"; echo "---"
 	@# Display top-level targets since they are the ones most developers will need.
 	@grep -h -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort -k1 | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 	@# Now show hierarchical targets in separate sections.
@@ -14,3 +18,17 @@
 			awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' ; \
 	done
 
+.PHONY: confirm
+confirm:
+	@if [[ -z "$(CI)" ]]; then \
+		CONFIRM="" ; \
+		read -p "=== Please confirm [y/n]: " -r ; \
+		if [[ ! $$CONFIRM =~ ^[Yy]$$ ]]; then \
+			echo "Aborting" ; \
+			exit 1 ; \
+		else \
+			exit 0; \
+		fi \
+	fi
+
+

packages/config/src/mk/install.mk

@@ -8,6 +8,8 @@
 
 .PHONY: .clean
 .clean:
-	@echo "Recursively removing all node_modules/ directories in `pwd`..."; \
-		find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +
-
+	@echo "Recursively removing all node_modules/ directories in $(NPM_WORKSPACE_ROOT)..."
+	@find $(NPM_WORKSPACE_ROOT) -name 'node_modules' -type d -prune
+	@if $(MAKE) -s confirm ; then \
+		find $(NPM_WORKSPACE_ROOT) -name 'node_modules' -type d -prune -exec rm -rf '{}' +; \
+	fi

packages/config/src/mk/release.mk

@@ -35,16 +35,21 @@
 #
 # This reduces incorrect SBOM entries, decreasing cataloged dependencies
 # from 872 to 157 at the time of this change.
-.PHONY: .release/prune
-.release/prune:
-	@if [ -z "$(NPM_WORKFLOW_CONFIG_PATH)" ]; then \
-		echo "Error: NPM_WORKFLOW_CONFIG_PATH is not set or empty."; \
+.PHONY: .sbom/exclude
+.sbom/exclude: EXCLUDE_PATH?=$(KUMAHQ_CONFIG)
+.sbom/exclude:
+	@if [ -z "$(EXCLUDE_PATH)" ]; then \
+		echo "Error: EXCLUDE_PATH is not set or empty."; \
 		exit 1; \
 	fi
-	@if [ ! -d "$(NPM_WORKFLOW_CONFIG_PATH)" ]; then \
-		echo "Error: NPM_WORKFLOW_CONFIG_PATH does not exist or is not a directory: $(NPM_WORKFLOW_CONFIG_PATH)"; \
+	@if [ ! -d "$(EXCLUDE_PATH)" ]; then \
+		echo "Error: EXCLUDE_PATH does not exist or is not a directory: $(EXCLUDE_PATH)"; \
 		exit 1; \
 	fi
-	npm pkg delete devDependencies.@kumahq/config
-	rm -rf $(NPM_WORKFLOW_CONFIG_PATH)
-	npm install --package-lock-only
+	@echo '$(shell node -e "console.log(require('@kumahq/config').ci.depsToDevDeps('$(EXCLUDE_PATH)/package.json'))")' \
+		> $(EXCLUDE_PATH)/package.json
+
+.PHONY: .release/prune
+.release/prune:
+	@$(MAKE) .sbom/exclude EXCLUDE_PATH=$(KUMAHQ_CONFIG)
+	@npm install --package-lock-only

packages/config/src/mk/test.mk

@@ -26,6 +26,7 @@ ifdef KUMA_TEST_BROWSER
 			--e2e \
 			--browser $(KUMA_TEST_BROWSER)
 else
+	@while ! nc -z localhost 5681; do sleep 1; done;
 	@CYPRESS_video=true \
 	TZ=UTC \
 		npx cypress \

packages/kuma-gui/Makefile

@@ -2,14 +2,14 @@
 # It should only be used for adding "non-dot" aliases and documentation
 
 SHELL := /usr/bin/env bash
-MK := ../config/src/mk
-NODE_VERSION:=v$(shell cat ../../.nvmrc)
-NPM_WORKFLOW_CONFIG_PATH ?= $(shell readlink -f ../config)
+
+KUMAHQ_CONFIG := $(shell npm query .workspace | jq -r '.[] | select(.name == "@kumahq/config") | .path')
+MK := $(KUMAHQ_CONFIG)/src/mk
 
 ## make help: if you're aren't sure use `make help`
 .DEFAULT_GOAL := help
-
 include $(MK)/help.mk
+
 include $(MK)/run.mk
 include $(MK)/install.mk
 include $(MK)/check.mk
@@ -28,6 +28,9 @@ install/sync: .install/sync
 .PHONY: help
 help: .help ## Display this help screen
 
+.PHONY: clean
+clean: .clean ## Dev: Delete all node_modules directories
+
 .PHONY: install
 install: .install ## Dev: install all dependencies (runs before `make run`)