chore: adjust script outputs

Author: matyasjay

Makefile

@@ -1,28 +1,28 @@
-# --- Pipeline
-
-info:
-	sh scripts/package/info.sh
-
-bump:
-	sh scripts/package/bump.sh "$(PROJECT)"
+# --- Git
 
 sign:
 	git add .
 	git commit -S
 
 shelf:
+	git add .
+	git commit -S
 	git push
 
-push:
+release:
 	sh scripts/package/bump.sh "$(PROJECT)"
 	git push
 
+# --- Package
+
+info:
+	sh scripts/package/info.sh
+
 reset:
 	sh scripts/deploy/reset.sh
 
 build:
-	${MAKE} -C frontend build
-	${MAKE} -C http build
+	sh scripts/package/build.sh
 
 plan:
 	cd terraform && terraform plan
@@ -31,23 +31,20 @@ apply:
 	cd terraform && terraform apply
 
 deploy:
-	dotenvx run -f .env.production -- sh scripts/deploy/docker.sh
+	sh scripts/deploy/docker.sh
 
 vercel:
-	${MAKE} -C frontend build
-	node scripts/deploy/vercel-pre.mjs
-	vercel build 
-	vercel .
-	node scripts/deploy/vercel-post.mjs
-
-# --- Environment
+	sh scripts/deploy/vercel.sh
 
 env-decrypt:
 	sh scripts/env/decrypt.sh
 
 env-encrypt:
 	sh scripts/env/encrypt.sh
 
+env-validate:
+	sh scripts/env/validate.sh "$(ENV)"
+
 # --- Frontend
 
 frontend-dev:

package.json

@@ -7,6 +7,7 @@
   },
   "dependencies": {
     "@dotenvx/dotenvx": "^1.44.1",
+    "chalk": "^5.4.1",
     "husky": "^9.1.7",
     "semver": "^7.7.2",
     "vercel": "^42.1.1"

pnpm-lock.yaml

@@ -0,0 +1,6 @@
+	cd frontend && make build
+  cd ../
+	node scripts/deploy/vercel-pre.mjs
+	vercel build 
+	vercel .
+	node scripts/deploy/vercel-post.mjs

scripts/deploy/vercel.sh

@@ -1,4 +1,11 @@
-/* eslint-disable */
+import chalk from "chalk";
+
+const red = chalk.redBright;
+const green = chalk.greenBright;
+const bold = chalk.bold;
+
+console.log(chalk.greenBright(bold(`\nValidating environment variables`)));
+
 const REQUIRED_CLIENT_ENVIRONMENT = [];
 
 // prettier-ignore
@@ -14,9 +21,6 @@ const REQUIRED_SERVER_ENVIRONMENT = [
 //   REQUIRED_SERVER_ENVIRONMENT.push("SENTRY_TOKEN");
 // }
 
-const red = "\u001b[31m";
-const resetColor = "\u001b[0m";
-
 const getInvalids = (envs) =>
   envs.reduce(
     (invalids, env) => (process.env[env] ? invalids : [...invalids, env]),
@@ -30,25 +34,31 @@ const isServerEnvValid = getInvalids(REQUIRED_SERVER_ENVIRONMENT).length === 0;
 const isClientEnvValid = getInvalids(REQUIRED_CLIENT_ENVIRONMENT).length === 0;
 
 if (isServerEnvValid && isClientEnvValid) {
-  console.log("Environment validation succeded!");
+  console.log(bold(green(`\nEnvironment validation succeded!\n`)));
   process.exit(0);
 }
+
 const invalids = [
   ...getInvalids(REQUIRED_SERVER_ENVIRONMENT),
   ...getInvalids(REQUIRED_CLIENT_ENVIRONMENT),
 ];
 
+console.log(
+  chalk.redBright(
+    bold(
+      `\nFound ${invalids.length} missing ${invalids.length > 1 ? "variables" : "variable"}.\n`,
+    ),
+  ),
+);
+
 invalids.forEach((env) => {
   const type = REQUIRED_SERVER_ENVIRONMENT.includes(env) ? "server" : "client";
   console.error(
-    `${red}Missing ${type} variable:${resetColor} ${env}${resetColor} is ${getErrorType(env)}!`,
+    chalk.grey(
+      `Missing ${type} variable: ${chalk.bold(chalk.blue(env))} is ${getErrorType(env)}!)`,
+    ),
   );
 });
 
-console.log(
-  `\nFound ${invalids.length} missing ${invalids.length > 1 ? "variables" : "variable"}.\n`,
-);
-
-console.log("Environment validation failed!");
+console.log(red.bold(`\nEnvironment validation failed!\n`));
 process.exit(13);
-/* eslint-enable */

scripts/env/validate.mjs

@@ -0,0 +1,16 @@
+NO_FORMAT="\033[0m"
+F_BOLD="\033[1m"
+F_DIM="\033[2m"
+C_INDIANRED1="\033[38;5;203m"
+C_SEAGREEN2="\033[38;5;83m"
+C_GREY46="\033[38;5;243m"
+C_GREY62="\033[38;5;247m"
+
+if [ -z "$1" ]; then
+  echo "${C_INDIANRED1}No environment provided!${NO_FORMAT}"
+  exit 1
+else
+  ENVIRONMENT=$1
+fi
+
+dotenvx run -f ".env.${ENVIRONMENT}" -- node scripts/env/validate.mjs

scripts/env/validate.sh

@@ -0,0 +1,12 @@
+NO_FORMAT="\033[0m"
+F_BOLD="\033[1m"
+F_DIM="\033[2m"
+C_INDIANRED1="\033[38;5;203m"
+C_SEAGREEN2="\033[38;5;83m"
+C_GREY46="\033[38;5;243m"
+C_GREY62="\033[38;5;247m"
+
+echo "\n${F_BOLD}Build packages${NO_FORMAT}${C_GREY46}\n"
+cd frontend && make build
+cd ../http && make build
+echo "${NO_FORMAT}"

scripts/package/build.sh

@@ -6,7 +6,7 @@ C_SEAGREEN2="\033[38;5;83m"
 C_GREY46="\033[38;5;243m"
 C_GREY62="\033[38;5;247m"
 
-echo "${F_BOLD}Update package versions.${NO_FORMAT}"
+echo "\n${F_BOLD}Update package versions.${NO_FORMAT}\n"
 
 PROJECT=""
 
@@ -19,7 +19,7 @@ fi
 make info
 
 if ! git diff-index --quiet HEAD -- || [ -n "$(git ls-files --others --exclude-standard)" ]; then
-  echo "${F_BOLD}${C_INDIANRED1}Working directory is not clean. Commit or stash your changes first.${NO_FORMAT}"
+  echo "${F_BOLD}${C_INDIANRED1}Working directory is not clean. Commit or stash your changes first.${NO_FORMAT}\n"
   exit 1
 else
   echo "${C_GREY46}INFO\tWorking directory is clean."

scripts/package/bump.sh

@@ -14,7 +14,7 @@ else
   PROJECT=$1
 fi
 
-echo "${F_BOLD}Cluster info for '${PROJECT}-local'${NO_FORMAT}"
+echo "\n${F_BOLD}Cluster info for '${PROJECT}-local'${NO_FORMAT}"
 echo "${C_GREY46}"
 echo "Change project: make bump PROJECT=my-project${NO_FORMAT}"
 echo "${F_DIM}"