diff --git a/.husky/pre-push b/.husky/pre-push index 03c68d3..cece88b 100755 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -1,7 +1,5 @@ #!/usr/bin/env sh . "$(dirname -- "$0")/_/husky.sh" -pnpm run cleanup:all -pnpm install -pnpm run test -pnpm run build \ No newline at end of file +pnpm run build +pnpm run test \ No newline at end of file diff --git a/api/authentication/package.json b/api/authentication/package.json index 99bf50c..c53cf2e 100644 --- a/api/authentication/package.json +++ b/api/authentication/package.json @@ -5,7 +5,7 @@ "author": "radoslav.irha@gmail.com", "license": "MIT", "scripts": { - "bootstrap": "pnpm run config:all && pnpm run keys", + "bootstrap": "pnpm run config:api && pnpm run keys", "build": "pnpm run barrels && tsc --project tsconfig.compile.json", "barrels": "barrelsby --config .barrelsby.json", "start": "pnpm run barrels && NODE_ENV=localhost tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts", @@ -14,12 +14,12 @@ "lint": "eslint --ext .ts src", "test": "pnpm run config:test && cross-env NODE_ENV=test jest", "test:watch": "pnpm run test --watchAll", - "config": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.authentication.json -t config/localhost.json -f json || true", + "config:localhost": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.authentication.json -t config/localhost.json -f json || true", "config:test": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.authentication.template.json -t config/test.json -f json || true", "config:env": "hikers-book-config-cli -s node_modules/@hikers-book/config/environment-variables/api.authentication.json -t config/custom-environment-variables.json -f json || true", "config:clear": "find ./config -name '*.json' -type f -delete", - "config:all": "pnpm run config:env && pnpm run config && pnpm run config:test", - "postinstall": "pnpm run config:all", + "config:api": "pnpm run config:env && pnpm run config:localhost", + "postinstall": "pnpm run config:api", "cleanup": "rm -rf coverage dist", "cleanup:modules": "rm -rf node_modules", "keys": "openssl genrsa -out keys/jwt.pem 2048 && openssl rsa -in keys/jwt.pem -outform PEM -pubout -out keys/jwt.pem.pub" diff --git a/api/graphql/package.json b/api/graphql/package.json index 8ffbdd8..375d839 100644 --- a/api/graphql/package.json +++ b/api/graphql/package.json @@ -13,12 +13,12 @@ "lint": "eslint --ext .ts src", "test": "pnpm run config:test && cross-env NODE_ENV=test jest", "test:watch": "pnpm run test --watchAll", - "config": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.graphql.json -t config/localhost.json -f json || true", + "config:localhost": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.graphql.json -t config/localhost.json -f json || true", "config:test": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.graphql.template.json -t config/test.json -f json || true", "config:env": "hikers-book-config-cli -s node_modules/@hikers-book/config/environment-variables/api.graphql.json -t config/custom-environment-variables.json -f json || true", "config:clear": "find ./config -name '*.json' -type f -delete", - "config:all": "pnpm run config:env && pnpm run config && pnpm run config:test", - "postinstall": "pnpm run config:all", + "config:api": "pnpm run config:env && pnpm run config:localhost", + "postinstall": "pnpm run config:api", "cleanup": "rm -rf coverage dist", "cleanup:modules": "rm -rf node_modules" }, diff --git a/api/stages/package.json b/api/stages/package.json index c603a65..ea4a4d6 100644 --- a/api/stages/package.json +++ b/api/stages/package.json @@ -13,12 +13,12 @@ "lint": "eslint --ext .ts src", "test": "pnpm run config:test && cross-env NODE_ENV=test jest", "test:watch": "pnpm run test --watchAll", - "config": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.stages.json -t config/localhost.json -f json || true", + "config:localhost": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.stages.json -t config/localhost.json -f json || true", "config:test": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.stages.template.json -t config/test.json -f json || true", "config:env": "hikers-book-config-cli -s node_modules/@hikers-book/config/environment-variables/api.stages.json -t config/custom-environment-variables.json -f json || true", "config:clear": "find ./config -name '*.json' -type f -delete", - "config:all": "pnpm run config:env && pnpm run config && pnpm run config:test", - "postinstall": "pnpm run config:all", + "config:api": "pnpm run config:env && pnpm run config:localhost", + "postinstall": "pnpm run config:api", "cleanup": "rm -rf coverage dist", "cleanup:modules": "rm -rf node_modules" }, diff --git a/api/trips/package.json b/api/trips/package.json index 6ff1b94..90226bb 100644 --- a/api/trips/package.json +++ b/api/trips/package.json @@ -13,12 +13,12 @@ "lint": "eslint --ext .ts src", "test": "pnpm run config:test && cross-env NODE_ENV=test jest", "test:watch": "pnpm run test --watchAll", - "config": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.trips.json -t config/localhost.json -f json || true", + "config:localhost": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.trips.json -t config/localhost.json -f json || true", "config:test": "hikers-book-config-cli -s node_modules/@hikers-book/config/config/api.trips.template.json -t config/test.json -f json || true", "config:env": "hikers-book-config-cli -s node_modules/@hikers-book/config/environment-variables/api.trips.json -t config/custom-environment-variables.json -f json || true", "config:clear": "find ./config -name '*.json' -type f -delete", - "config:all": "pnpm run config:env && pnpm run config && pnpm run config:test", - "postinstall": "pnpm run config:all", + "config:api": "pnpm run config:env && pnpm run config:localhost", + "postinstall": "pnpm run config:api", "cleanup": "rm -rf coverage dist", "cleanup:modules": "rm -rf node_modules" }, diff --git a/package.json b/package.json index 7d59d07..78f28f3 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "pnpm --stream --recursive run build", "clean": "rm -rf .parcel-cache && pnpm --recursive run clean", - "config": "pnpm --filter '@hikers-book/config' run config && pnpm --filter=!'@hikers-book/config' run config:all", + "config": "pnpm --filter '@hikers-book/config' run config && pnpm --filter '@hikers-book/hikers-book-ui' run config && pnpm --filter=!'@hikers-book/config' run config:api", "config:clear": "pnpm --stream --recursive run config:clear", "lint": "pnpm --stream --recursive run lint", "format": "pnpm --stream --recursive run format",