Yarn workspaces (#86)

Author: pepakriz

.dockerignore

@@ -4,8 +4,9 @@
 /dashboard/node_modules
 /dashboard/.next
 /dashboard/out
+/server/node_modules
+/server/lib
+/server/gitlab-merger-bot
+/server/src/generated/
 /yarn-error.log
-/lib
-/data
-/gitlab-merger-bot
 /charts

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ jobs:
         uses: docker://mstruebing/editorconfig-checker:2.0.3
 
       - name: Install
-        run: yarn install
+        run: yarn install && yarn run generate
 
       - name: Lint
         run: yarn run check:cs

.gitignore

@@ -1,6 +1,4 @@
 /.envrc
 /node_modules
 /yarn-error.log
-/lib
 /gitlab-merger-bot
-/src/generated/

.prettierignore

@@ -1,6 +1,6 @@
 /.idea/
 /.github/
 /charts/
-/dashboard/.next/
-/dashboard/out/
-/lib/
+/dashboard/
+/server/
+/common/

Dockerfile

@@ -1,49 +1,56 @@
-FROM node:12.16.1-alpine AS build
+FROM node:12.16.1-alpine AS base
 WORKDIR /app
 
-COPY ./package.json ./yarn.lock ./schema.graphql ./codegen.yml ./
+COPY ./package.json ./yarn.lock ./
+COPY ./server/package.json ./server/
+COPY ./dashboard/package.json ./dashboard/
+COPY ./common/package.json ./common/
 
+# We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
+# See, for example https://github.com/yarnpkg/yarn/issues/5540
 RUN set -ex \
-	&& yarn install
+	&& yarn install --network-timeout 300000
+
+COPY ./schema.graphql ./
 
-COPY ./ ./
+
+FROM base AS server-build
+WORKDIR /app/server
+
+COPY ./server/codegen.yml ./
+
+RUN set -ex \
+	&& yarn run generate
+
+COPY ./server ./
 
 RUN set -ex \
 	&& yarn run build \
 	&& yarn run build-bin
 
 
-FROM node:12.16.1-alpine AS dashboard-build
+FROM base AS dashboard-build
 WORKDIR /app/dashboard
 
-COPY ./dashboard/package.json ./dashboard/yarn.lock ./dashboard/codegen.yml ./
-COPY ./schema.graphql ../
-
-# We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
-# See, for example https://github.com/yarnpkg/yarn/issues/5540
-RUN set -ex \
-	&& yarn install --network-timeout 300000
-
 COPY ./dashboard ./
 
 RUN set -ex \
+	# because it needs src
 	&& yarn run generate \
 	&& yarn run build \
 	&& yarn run export
 
 
 FROM alpine:3.11
 WORKDIR /app
-CMD ["/app/gitlab-merger-bot"]
+CMD ["/app/server/gitlab-merger-bot"]
 ENV NODE_ENV=production
-ENV DATA_DIR=/data
 
 RUN set -ex \
 	&& apk --no-cache --update add \
 		ca-certificates \
 		libstdc++ \
-		libgcc \
-	&& mkdir -p /data
+		libgcc
 
-COPY --from=build /app/gitlab-merger-bot /app/schema.graphql /app/
+COPY --from=server-build /app/server/gitlab-merger-bot /app/server/
 COPY --from=dashboard-build /app/dashboard/out /app/dashboard/out/

common/.gitignore

@@ -0,0 +1 @@
+/node_modules/

common/package.json

@@ -0,0 +1,19 @@
+{
+	"name": "@gitlab-merger-bot/common",
+	"version": "1.0.0",
+	"private": true,
+	"scripts": {
+		"format": "prettier --write \"**/*.{js,json,ts,tsx}\"",
+		"generate": "true",
+		"check": "yarn run check:cs",
+		"check:cs": "prettier --check \"**/*.{js,json,ts,tsx}\"",
+		"check:types": "true",
+		"check:tests": "true"
+	},
+	"devDependencies": {
+		"husky": "^4.2.3",
+		"pkg": "^4.4.4",
+		"prettier": "^2.0.4",
+		"pretty-quick": "^2.0.1"
+	}
+}

dashboard/.dockerignore

@@ -0,0 +1,2 @@
+/.next/
+/out/

dashboard/.prettierignore

@@ -1,19 +1,25 @@
 {
+	"name": "@gitlab-merger-bot/dashboard",
+	"version": "1.0.0",
 	"private": true,
 	"scripts": {
-		"start:dev": "concurrently \"next\" \"yarn generate --watch\"",
+		"start:dev": "next",
 		"start:local": "API_URL=http://127.0.0.1:4000/graphql WS_URL=ws://127.0.0.1:4000/graphql next",
 		"build": "next build",
 		"export": "next export",
 		"start": "next start",
-		"format": "prettier --write \"**/*.{js,json,ts,tsx}\"",
 		"generate": "graphql-codegen",
+		"format": "prettier --write \"**/*.{js,json,ts,tsx}\"",
 		"check": "yarn run check:types",
-		"check:types": "tsc --noEmit"
+		"check:cs": "prettier --check \"**/*.{js,json,ts,tsx}\"",
+		"check:types": "tsc --noEmit",
+		"check:tests": "true"
 	},
 	"dependencies": {
 		"@apollo/react-hooks": "^3.1.3",
 		"@apollo/react-ssr": "^3.1.3",
+		"@gitlab-merger-bot/common": "*",
+		"@gitlab-merger-bot/server": "*",
 		"@material-ui/core": "^4.9.0",
 		"@material-ui/icons": "^4.5.1",
 		"apollo-cache-inmemory": "^1.6.5",
@@ -24,10 +30,7 @@
 		"isomorphic-unfetch": "^3.0.0",
 		"next": "^9.2.1",
 		"react": "^16.12.0",
-		"react-dom": "^16.12.0",
-		"react-number-format": "^4.4.1",
-		"subscriptions-transport-ws": "^0.9.16",
-		"taghiro": "^0.3.1"
+		"react-dom": "^16.12.0"
 	},
 	"devDependencies": {
 		"@graphql-codegen/cli": "^1.12.1",
@@ -36,7 +39,6 @@
 		"@types/node": "^13.7.0",
 		"@types/react": "^16.9.19",
 		"apollo-utilities": "^1.3.3",
-		"concurrently": "^5.1.0",
 		"graphql": "^14.6.0",
 		"typescript": "^3.8.3"
 	}