From 8ec2e5688bf7c0f7a5ac871cfd4be8bb8afce58d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 25 Jun 2020 11:22:46 +0100
Subject: [PATCH 1/2] Build devkit outside of dist folder

---
 angular.json                               | 6 +++---
 src/frontend/packages/devkit/build.sh      | 2 +-
 src/frontend/packages/devkit/tsconfig.json | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/angular.json b/angular.json
index 85d687d9fb..caa3bceaa9 100644
--- a/angular.json
+++ b/angular.json
@@ -12,9 +12,9 @@
           "builder": "@angular-builders/custom-webpack:browser",
           "options": {
             "customWebpackConfig": {
-              "path": "./dist/devkit/build/main.js"
+              "path": "./dist-devkit/build/main.js"
             },
-            "indexTransform": "./dist/devkit/build/index.transform.js",
+            "indexTransform": "./dist-devkit/build/index.transform.js",
             "preserveSymlinks": true,
             "outputPath": "dist",
             "index": "src/frontend/packages/core/src/index.html",
@@ -99,7 +99,7 @@
       "projectType": "library",
       "architect": {
         "build": {
-          "builder": "./dist/devkit:stratos-theme",
+          "builder": "./dist-devkit:stratos-theme",
           "options": {
             "outputPath": "dist/theme"
           }
diff --git a/src/frontend/packages/devkit/build.sh b/src/frontend/packages/devkit/build.sh
index 314a531720..a417da73fe 100755
--- a/src/frontend/packages/devkit/build.sh
+++ b/src/frontend/packages/devkit/build.sh
@@ -3,7 +3,7 @@
 # Build script for devkit
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ROOT="$( cd "$( dirname "${DIR}" )" && cd ../../.. && pwd )"
-DIST=$ROOT/dist/devkit
+DIST=$ROOT/dist-devkit
 
 echo $DIST
 echo $DIR
diff --git a/src/frontend/packages/devkit/tsconfig.json b/src/frontend/packages/devkit/tsconfig.json
index 1c7753adec..0a6818d257 100644
--- a/src/frontend/packages/devkit/tsconfig.json
+++ b/src/frontend/packages/devkit/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "outDir": "../../../../dist/devkit",
+    "outDir": "../../../../dist-devkit",
     "target": "es5",
     "module": "commonjs",
     "moduleResolution": "node",

From b967d56607f527982cea1ccf9d2d0dc65dd6d1ce Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 25 Jun 2020 12:01:58 +0100
Subject: [PATCH 2/2] Add dist-devkit to git ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7b4a05898b..6b930df0a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,6 +80,7 @@ deploy/ci/travis/temp/
 deploy/kubernetes/console/imagelist.txt
 
 .dist/
+dist-devkit/
 deploy/uaa/tmp/
 src/backend/*/vendor/
 .v8flags*