From bce710ad93f03f24dd2eddc5aa2b2a3ab582326b Mon Sep 17 00:00:00 2001
From: Merlin Osayimwen <merlinosayimwen@gmail.com>
Date: Wed, 29 Sep 2021 06:53:50 +0200
Subject: [PATCH 1/2] Add production docker-compose file

---
 docker-compose.dev.yml | 27 +++++++++++++++++++++++++++
 docker-compose.yml     |  5 -----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 docker-compose.dev.yml

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..744095f
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,27 @@
+version: '3.7'
+services:
+  server:
+    image: ehenoma/jsheets:latest
+    build:
+      # Make sure to run 'gradle copyDependencies' before building
+      dockerfile: server/deploy/Dockerfile
+      context: .
+    container_name: jsheets-server
+    environment:
+      JSHEETS_SERVER_PORT: 8080
+      JSHEETS_MONGODB_URI: mongodb://root:root@document-store/jsheets
+    ports:
+      - "8080:8080"
+    networks:
+      - database
+  document-store:
+    container_name: document-store
+    image: mongo:latest
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: root
+    networks:
+      - database
+
+networks:
+  database:
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 744095f..647a44a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,11 +2,6 @@ version: '3.7'
 services:
   server:
     image: ehenoma/jsheets:latest
-    build:
-      # Make sure to run 'gradle copyDependencies' before building
-      dockerfile: server/deploy/Dockerfile
-      context: .
-    container_name: jsheets-server
     environment:
       JSHEETS_SERVER_PORT: 8080
       JSHEETS_MONGODB_URI: mongodb://root:root@document-store/jsheets

From a3bf39dd1350e1971f680d6482862446db02e5e0 Mon Sep 17 00:00:00 2001
From: Merlin Osayimwen <merlinosayimwen@gmail.com>
Date: Wed, 29 Sep 2021 07:06:30 +0200
Subject: [PATCH 2/2] Add commands to build website from CI

---
 website/.gitignore                  | 4 ++++
 website/package.json                | 2 ++
 website/src/editor/java/language.ts | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/website/.gitignore b/website/.gitignore
index f0f7697..0889324 100644
--- a/website/.gitignore
+++ b/website/.gitignore
@@ -11,6 +11,7 @@ public/theme/
 # production
 /build
 
+
 # misc
 .DS_Store
 .env.local
@@ -21,3 +22,6 @@ public/theme/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+website/src/editor/java/parser.js
+website/src/editor/java/parser.terms.js
diff --git a/website/package.json b/website/package.json
index f16abca..98cdc81 100644
--- a/website/package.json
+++ b/website/package.json
@@ -53,6 +53,8 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
+    "build-all": "npm run build-theme && npm run build-grammar && npm run build",
+    "build-grammar": "lezer-generator src/editor/java/java.grammar -o src/editor/java/parser",
     "build-theme": "npm run build-light-theme && npm run build-dark-theme",
     "build-light-theme": "lessc src/theme/light.less public/theme/light.css -js",
     "build-dark-theme": "lessc src/theme/dark.less public/theme/dark.css -js"
diff --git a/website/src/editor/java/language.ts b/website/src/editor/java/language.ts
index 4d4e708..2234988 100644
--- a/website/src/editor/java/language.ts
+++ b/website/src/editor/java/language.ts
@@ -8,6 +8,8 @@ import {
   LRLanguage
 } from "@codemirror/language"
 import {styleTags, Tag, tags as t} from "@codemirror/highlight"
+
+// Make sure that the code is generated (npm run build-grammar)
 import {parser} from "./parser";
 
 export const customTags = {