Build Connect in Webapps-Build pipeline (gravitational#874)

* Remove get-teleport-connect-dir

We didn't end up using it, see gravitational#13099.

* Run build-term & package-term in Webapps-Build pipeline

* Remove build script from package.json

It seems like it's no longer used anywhere at this point.

web/.cloudbuild/ci/build.yaml

@@ -18,9 +18,28 @@ steps:
       - "go run ./cmd/checkout -w=/workspace"
 
   - name: gcr.io/cloud-builders/docker
-    id: build
+    id: type-check-and-lint
+    waitFor: ['checkout']
     args:
       - build
       - '--build-arg'
-      - NPM_SCRIPT=build
+      - NPM_SCRIPT=type-check-and-lint
+      - .
+
+  - name: gcr.io/cloud-builders/docker
+    id: build-teleport
+    waitFor: ['type-check-and-lint']
+    args:
+      - build
+      - '--build-arg'
+      - NPM_SCRIPT=build-teleport
+      - .
+
+  - name: gcr.io/cloud-builders/docker
+    id: build-term
+    waitFor: ['type-check-and-lint']
+    args:
+      - build
+      - '--build-arg'
+      - NPM_SCRIPT=build-and-package-term
       - .

web/Makefile

@@ -10,7 +10,7 @@ COMMIT_URL = https://github.com/gravitational/webapps/commit/$(COMMIT)
 .PHONY: build
 build:
 	@if [ -d "packages/webapps.e/" ]; then \
-		$(MAKE) docker-build NPM_CMD=build FROM=dist/ TO=dist/; \
+		$(MAKE) docker-build NPM_CMD=build-teleport FROM=dist/ TO=dist/; \
 	else \
 		$(MAKE) docker-build NPM_CMD=build-oss FROM=dist/ TO=dist/; \
 	fi;

web/package.json

@@ -10,6 +10,7 @@
     "tdd": "jest --watch",
     "package-term": "yarn workspace @gravitational/teleterm package",
     "build-term": "yarn workspace @gravitational/teleterm build",
+    "build-and-package-term": "yarn build-term && yarn package-term",
     "start-term": "yarn workspace @gravitational/teleterm start",
     "start-teleport": "yarn workspace @gravitational/teleport start",
     "start-teleport-e": "yarn workspace @gravitational/teleport.e start",
@@ -18,9 +19,8 @@
     "build-teleport-e": "yarn workspace @gravitational/teleport.e build --output-path=../../../dist/e/teleport/app",
     "build-oss": "yarn build-teleport-oss",
     "build-e": "yarn build-teleport-e",
-    "build": "yarn lint && yarn type-check && yarn build-oss && yarn build-e",
+    "type-check-and-lint": "yarn type-check && yarn lint",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx packages/",
-    "get-teleport-connect-dir": "node -p \"require('./package.json').teleportConnectDir\"",
     "type-check": "tsc --noEmit"
   },
   "private": true,
@@ -37,6 +37,5 @@
       "packages/webapps*/**",
       "packages/teleterm"
     ]
-  },
-  "teleportConnectDir": "packages/teleterm"
+  }
 }