diff --git a/Makefile b/Makefile index b0f160ff4..7ed2d7890 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ SHELL := /usr/bin/env bash -KUMAHQ_CONFIG := $(shell npm query .workspace | jq -r '.[] | select(.name == "@kumahq/config") | .path') +NPM_WORKSPACE_ROOT := $(shell npm prefix) +KUMAHQ_CONFIG := $(NPM_WORKSPACE_ROOT)/$(shell cat $(NPM_WORKSPACE_ROOT)/package-lock.json | jq -r '.packages | to_entries[] | select(.value.name == "@kumahq/config") | .key') MK := $(KUMAHQ_CONFIG)/src/mk ## make help: if you're aren't sure use `make help` diff --git a/packages/config/Makefile b/packages/config/Makefile index 6fe0a4f68..2f898f72c 100644 --- a/packages/config/Makefile +++ b/packages/config/Makefile @@ -3,7 +3,8 @@ SHELL := /usr/bin/env bash -KUMAHQ_CONFIG := $(shell npm query .workspace | jq -r '.[] | select(.name == "@kumahq/config") | .path') +NPM_WORKSPACE_ROOT := $(shell npm prefix) +KUMAHQ_CONFIG := $(NPM_WORKSPACE_ROOT)/$(shell cat $(NPM_WORKSPACE_ROOT)/package-lock.json | jq -r '.packages | to_entries[] | select(.value.name == "@kumahq/config") | .key') MK := $(KUMAHQ_CONFIG)/src/mk ## make help: if you're aren't sure use `make help` diff --git a/packages/config/scripts/ci.cjs b/packages/config/scripts/ci.cjs index fa21fc404..1914ac452 100644 --- a/packages/config/scripts/ci.cjs +++ b/packages/config/scripts/ci.cjs @@ -1,18 +1,5 @@ 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 @@ -46,5 +33,4 @@ function shuffleArray(array) { module.exports = { getPartitionedTestFiles, - depsToDevDeps, } diff --git a/packages/config/scripts/prune.cjs b/packages/config/scripts/prune.cjs new file mode 100644 index 000000000..cc55cab39 --- /dev/null +++ b/packages/config/scripts/prune.cjs @@ -0,0 +1,15 @@ +const { readFileSync: read } = require('fs') +module.exports = { + depsToDevDeps: (path) => { + const pkg = JSON.parse(read(path, 'utf-8')) + return JSON.stringify({ + ...pkg, + dependencies: {}, + peerDependencies: {}, + devDependencies: { + ...pkg.dependencies, + ...pkg.devDependencies, + }, + }) + }, +} diff --git a/packages/config/src/index.cjs b/packages/config/src/index.cjs index 462c79038..a4658e7ff 100644 --- a/packages/config/src/index.cjs +++ b/packages/config/src/index.cjs @@ -1,9 +1,7 @@ const { createEslintConfig } = require('./eslint.cjs') const { createStylelintConfig } = require('./stylelint.cjs') -const ci = require('../scripts/ci.cjs') module.exports = { eslint: createEslintConfig, stylelint: createStylelintConfig, - ci, } diff --git a/packages/config/src/mk/help.mk b/packages/config/src/mk/help.mk index b33f3959e..88a47f14d 100644 --- a/packages/config/src/mk/help.mk +++ b/packages/config/src/mk/help.mk @@ -1,6 +1,6 @@ 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') +KUMAHQ_CONFIG := $(NPM_WORKSPACE_ROOT)/$(shell cat $(NPM_WORKSPACE_ROOT)/package-lock.json | jq -r '.packages | to_entries[] | select(.value.name == "@kumahq/config") | .key') .PHONY: .help .help: ## Display this help screen @@ -21,10 +21,10 @@ KUMAHQ_CONFIG := $(shell npm query .workspace | jq -r '.[] | select(.name == "@k .PHONY: confirm confirm: @if [[ -z "$(CI)" ]]; then \ - CONFIRM="" ; \ + REPLY="" ; \ read -p "=== Please confirm [y/n]: " -r ; \ - if [[ ! $$CONFIRM =~ ^[Yy]$$ ]]; then \ - echo "Aborting" ; \ + if [[ ! $$REPLY =~ ^[Yy]$$ ]]; then \ + echo $$REPLY ; \ exit 1 ; \ else \ exit 0; \ diff --git a/packages/config/src/mk/release.mk b/packages/config/src/mk/release.mk index c65f8df66..013177469 100644 --- a/packages/config/src/mk/release.mk +++ b/packages/config/src/mk/release.mk @@ -46,7 +46,7 @@ echo "Error: EXCLUDE_PATH does not exist or is not a directory: $(EXCLUDE_PATH)"; \ exit 1; \ fi - @echo '$(shell node -e "console.log(require('@kumahq/config').ci.depsToDevDeps('$(EXCLUDE_PATH)/package.json'))")' \ + @echo '$(shell cd $(KUMAHQ_CONFIG) && node -e "console.log(require('./scripts/prune.cjs').depsToDevDeps('$(EXCLUDE_PATH)/package.json'))")' \ > $(EXCLUDE_PATH)/package.json .PHONY: .release/prune diff --git a/packages/kuma-gui/Makefile b/packages/kuma-gui/Makefile index 0eea12823..f0d71783f 100644 --- a/packages/kuma-gui/Makefile +++ b/packages/kuma-gui/Makefile @@ -3,7 +3,8 @@ SHELL := /usr/bin/env bash -KUMAHQ_CONFIG := $(shell npm query .workspace | jq -r '.[] | select(.name == "@kumahq/config") | .path') +NPM_WORKSPACE_ROOT := $(shell npm prefix) +KUMAHQ_CONFIG := $(NPM_WORKSPACE_ROOT)/$(shell cat $(NPM_WORKSPACE_ROOT)/package-lock.json | jq -r '.packages | to_entries[] | select(.value.name == "@kumahq/config") | .key') MK := $(KUMAHQ_CONFIG)/src/mk ## make help: if you're aren't sure use `make help`