From 0a33acd448fe598b74b74380c9b5d324e89aa7ef Mon Sep 17 00:00:00 2001
From: Daniel-I-Am <djdecloet@gmail.com>
Date: Tue, 29 Sep 2020 19:53:20 +0200
Subject: [PATCH 1/3] Fix editor config for gitlab CI file

---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index a882442..8d8c248 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,3 +5,6 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+
+[.gitlab-ci.yml]
+indent_size = 2
\ No newline at end of file

From fa483ea3aa2f89a77d04ba8c96745a8c5d7115e9 Mon Sep 17 00:00:00 2001
From: Daniel-I-Am <djdecloet@gmail.com>
Date: Tue, 29 Sep 2020 19:53:34 +0200
Subject: [PATCH 2/3] Update gitlab CI file for node building

---
 .gitlab-ci.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e45ac86..7e8134b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,15 @@ variables:
   OBJECTS_DIRECTORY: 'obj'
   NUGET_PACKAGES_DIRECTORY: '.nuget'
   SOURCE_CODE_PATH: 'ChaosBot/*/'
+  NODE_MODULES_DIRECTORY: 'ChaosBot/wwwroot/node_modules'
   
 stages:
   - version
   - build
   - test
   - release
+  - test_node
+  - release_node
   - docker
   - deploy
   
@@ -28,6 +31,8 @@ cache:
     - '$SOURCE_CODE_PATH$OBJECTS_DIRECTORY/*.csproj.nuget.*'
     # 3) Path to the directory where restored dependencies are kept.
     - '$NUGET_PACKAGES_DIRECTORY'
+    # 4) Path to node_modules
+    - '$NODE_MODULES_DIRECTORY'
   #
   policy: pull-push
 
@@ -106,7 +111,48 @@ release:
   artifacts:
     paths:
       - build/*
-     
+
+test_node:
+  image: node:latest
+  stage: test_node
+  only:
+    changes:
+      - ChaosBot/**/*
+    refs:
+      - master
+  dependencies:
+    - version
+  tags:
+    - docker
+    - hawkeye
+  script:
+    - 'cd ChaosBot/wwwroot'
+    - 'yarn install'
+    - 'yarn lint'
+  artifacts:
+    paths:
+      - wwwroot/dist/
+      
+release_node:
+  image: node:latest
+  stage: release_node
+  only:
+    changes:
+      - ChaosBot/**/*
+    refs:
+      - master
+  dependencies:
+    - test_node
+  tags:
+  - docker
+  - hawkeye
+  script:
+    - 'cd ChaosBot/wwwroot'
+    - 'yarn install'
+    - 'yarn build'
+  artifacts:
+    paths:
+      - wwwroot/dist/**
 
 docker:
   image: docker:stable
@@ -122,6 +168,7 @@ docker:
   dependencies:
     - version
     - release
+    - release_node
   script:
     # Log in to the registry
     - 'docker login -u=$REGISTRY_USER -p=$REGISTRY_PASS registry.chaoticlogic.us'

From 60ffbd8a8874da23b304e24c45abc1e361b2240d Mon Sep 17 00:00:00 2001
From: Daniel-I-Am <djdecloet@gmail.com>
Date: Tue, 29 Sep 2020 19:55:14 +0200
Subject: [PATCH 3/3] Remove dist folder

---
 ChaosBot/wwwroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChaosBot/wwwroot b/ChaosBot/wwwroot
index 5d1ee1a..d1de3d7 160000
--- a/ChaosBot/wwwroot
+++ b/ChaosBot/wwwroot
@@ -1 +1 @@
-Subproject commit 5d1ee1a5568be4bb30122ad25d65a1015d4185bd
+Subproject commit d1de3d7b260a4c50793e4705c7f75e8c1b662c8a