Merge pull request #4398 from cloudfoundry/fix-devkit-dist

Build devkit outside of dist folder
cloudfoundry · Jun 25, 2020 · 836c841 · 836c841
2 parents 9168c68 + b967d56
commit 836c841
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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*

diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "outDir": "../../../../dist/devkit",
+    "outDir": "../../../../dist-devkit",
     "target": "es5",
     "module": "commonjs",
     "moduleResolution": "node",