From e90b26ebeda7f8811fd163d195b06ac63ef2ae53 Mon Sep 17 00:00:00 2001
From: Andrew Bastin <andrewbastin.k@gmail.com>
Date: Fri, 17 Sep 2021 13:46:23 +0530
Subject: [PATCH] fix: standardized build scripts

---
 Dockerfile                           |  2 +-
 package.json                         | 10 +++++-----
 packages/hoppscotch-app/package.json |  7 +++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 47a3f4db8..016bc675b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,6 +22,6 @@ EXPOSE 3000
 
 RUN mv packages/hoppscotch-app/.env.example packages/hoppscotch-app/.env
 
-RUN pnpm -r build-prod
+RUN pnpm run generate
 
 CMD ["pnpm", "run", "start"]
diff --git a/package.json b/package.json
index ce560f5cf..3517f7c8a 100644
--- a/package.json
+++ b/package.json
@@ -7,11 +7,11 @@
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "prepare": "husky install",
-    "dev": "pnpm -r dev",
-    "build-prod": "pnpm -r build-prod",
-    "start": "pnpm -r start",
-    "lintfix": "pnpm -r lintfix",
-    "pre-commit": "pnpm -r lint"
+    "dev": "pnpm -r do-dev",
+    "generate": "pnpm -r do-build-prod",
+    "start": "pnpm -r do-prod-start",
+    "lintfix": "pnpm -r do-lintfix",
+    "pre-commit": "pnpm -r do-lintfix"
   },
   "workspaces": [
     "./packages/*"
diff --git a/packages/hoppscotch-app/package.json b/packages/hoppscotch-app/package.json
index a50a8972a..e9642969a 100644
--- a/packages/hoppscotch-app/package.json
+++ b/packages/hoppscotch-app/package.json
@@ -13,13 +13,16 @@
     "build": "vue-tsc --noEmit && nuxt build",
     "start": "nuxt start",
     "generate": "nuxt generate --modern",
-    "build-prod": "nuxt generate --modern",
     "analyze": "npx nuxt build -a",
     "lint:script": "eslint --ext .ts,.js,.vue --ignore-path .gitignore .",
     "lint:style": "stylelint **/*.{css,scss,vue} --ignore-path .gitignore",
     "lint": "npm run lint:script && npm run lint:style",
     "lintfix": "eslint --ext .ts,.js,.vue --ignore-path .gitignore . --fix",
-    "test": "jest"
+    "test": "jest",
+    "do-dev": "pnpm run dev",
+    "do-build-prod": "pnpm run generate",
+    "do-prod-start": "pnpm run start",
+    "do-lintfix": "pnpm run lint"
   },
   "dependencies": {
     "@apollo/client": "^3.4.11",