diff --git a/package.json b/package.json
index 7f694d8c56..d15d8cc248 100644
--- a/package.json
+++ b/package.json
@@ -7,18 +7,18 @@
     "packages/docusaurus-init/templates/*"
   ],
   "scripts": {
-    "start": "yarn tsc && yarn start:v2",
+    "start": "yarn build:packages && yarn start:v2",
     "start:v1": "yarn workspace docusaurus-1-website start",
     "start:v2": "yarn workspace docusaurus-2-website start",
     "start:v2:watch": "nodemon --watch \"./packages/*/lib/**/*.*\" --exec \"yarn start:v2\"",
-    "build": "yarn tsc && yarn build:v2",
+    "build": "yarn build:packages && yarn build:v2",
+    "build:packages": "lerna run build --no-private",
     "build:v1": "yarn workspace docusaurus-1-website build",
     "build:v2": "yarn workspace docusaurus-2-website build",
-    "serve": "yarn serve:v2",
     "serve:v1": "serve website-1.x/build/docusaurus",
     "serve:v2": "serve website/build",
     "changelog": "lerna-changelog",
-    "postinstall": "yarn tsc",
+    "postinstall": "yarn build:packages",
     "prettier": "prettier --config .prettierrc --write \"**/*.{js,ts}\"",
     "prettier:diff": "prettier --config .prettierrc --list-different \"**/*.{js,ts}\"",
     "prettier-docs": "prettier --config .prettierrc --write \"**/*.md\"",
@@ -28,7 +28,7 @@
     "lerna": "lerna",
     "test": "jest",
     "test:build:v2": "./admin/scripts/test-release.sh",
-    "tsc": "lerna run tsc --no-private",
+    "tsc": "yarn build:packages && echo '\n\nDOCUSAURUS: yarn tsc is deprecated and will be removed, use yarn build:packages instead\n\n'",
     "watch": "yarn lerna run --parallel --no-private watch",
     "clear": "yarn rimraf website/.docusaurus && rimraf -rf website/node_modules/.cache && yarn lerna exec 'yarn rimraf lib' --ignore docusaurus"
   },
diff --git a/packages/docusaurus-init/package.json b/packages/docusaurus-init/package.json
index 0b7a9dbbba..41c5d6d9c1 100644
--- a/packages/docusaurus-init/package.json
+++ b/packages/docusaurus-init/package.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "scripts": {
-    "tsc": "tsc",
+    "build": "tsc",
     "watch": "tsc --watch"
   },
   "bin": {
diff --git a/packages/docusaurus-plugin-client-redirects/package.json b/packages/docusaurus-plugin-client-redirects/package.json
index 47811a1d48..27fa2cc223 100644
--- a/packages/docusaurus-plugin-client-redirects/package.json
+++ b/packages/docusaurus-plugin-client-redirects/package.json
@@ -4,7 +4,7 @@
   "description": "Client redirects plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
-    "tsc": "tsc",
+    "build": "tsc",
     "watch": "tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json
index e5d0912c56..c8f1c7f977 100644
--- a/packages/docusaurus-plugin-content-blog/package.json
+++ b/packages/docusaurus-plugin-content-blog/package.json
@@ -4,7 +4,7 @@
   "description": "Blog plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
-    "tsc": "tsc",
+    "build": "tsc",
     "watch": "tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json
index 131cc9b237..5416da59c9 100644
--- a/packages/docusaurus-plugin-content-docs/package.json
+++ b/packages/docusaurus-plugin-content-docs/package.json
@@ -4,7 +4,7 @@
   "description": "Docs content plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
-    "tsc": "tsc",
+    "build": "tsc",
     "watch": "tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json
index 13eb71e26f..d7ba01ddd2 100644
--- a/packages/docusaurus-plugin-content-pages/package.json
+++ b/packages/docusaurus-plugin-content-pages/package.json
@@ -4,7 +4,7 @@
   "description": "Pages content plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
-    "tsc": "tsc",
+    "build": "tsc",
     "watch": "tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-debug/package.json b/packages/docusaurus-plugin-debug/package.json
index 862985d152..ecbfa43d62 100644
--- a/packages/docusaurus-plugin-debug/package.json
+++ b/packages/docusaurus-plugin-debug/package.json
@@ -4,7 +4,7 @@
   "description": "Debug plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
-    "tsc": "tsc"
+    "build": "tsc"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json
index 20a6e05508..8c8fc29684 100644
--- a/packages/docusaurus-plugin-ideal-image/package.json
+++ b/packages/docusaurus-plugin-ideal-image/package.json
@@ -4,7 +4,7 @@
   "description": "Docusaurus Plugin to generate an almost ideal image (responsive, lazy-loading, and low quality placeholder)",
   "main": "lib/index.js",
   "scripts": {
-    "tsc": "tsc && node copyUntypedFiles.js",
+    "build": "tsc && node copyUntypedFiles.js",
     "watch": "node copyUntypedFiles.js && tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-sitemap/package.json b/packages/docusaurus-plugin-sitemap/package.json
index 0515f6fb46..6b215e5c84 100644
--- a/packages/docusaurus-plugin-sitemap/package.json
+++ b/packages/docusaurus-plugin-sitemap/package.json
@@ -4,7 +4,7 @@
   "description": "Simple sitemap generation plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
-    "tsc": "tsc",
+    "build": "tsc",
     "watch": "tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json
index 074373a60e..60ada10410 100644
--- a/packages/docusaurus-theme-classic/package.json
+++ b/packages/docusaurus-theme-classic/package.json
@@ -8,7 +8,8 @@
   },
   "license": "MIT",
   "scripts": {
-    "tsc": "tsc --noEmit && yarn babel && yarn prettier",
+    "build": "tsc --noEmit && yarn babel && yarn prettier",
+    "watch": "yarn babel --watch",
     "babel": "babel src -d lib --extensions \".tsx,.ts\" --copy-files",
     "prettier": "prettier --config ../../.prettierrc --write \"**/*.{js,ts}\""
   },
diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json
index 656e866292..3cb63c1bf3 100644
--- a/packages/docusaurus-utils/package.json
+++ b/packages/docusaurus-utils/package.json
@@ -5,7 +5,7 @@
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
-    "tsc": "tsc",
+    "build": "tsc",
     "watch": "tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index daf1913795..b4a8277b90 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "bin/docusaurus.js"
   },
   "scripts": {
-    "tsc": "tsc && tsc -p tsconfig.client.json && node copyUntypedFiles.js",
+    "build": "tsc && tsc -p tsconfig.client.json && node copyUntypedFiles.js",
     "watch": "node copyUntypedFiles.js && concurrently -n \"server,client\" --kill-others \"tsc --watch\" \"tsc -p tsconfig.client.json --watch\""
   },
   "bugs": {