From 5564ff95ebf1a7936e975511aafa9f522c2a5ef3 Mon Sep 17 00:00:00 2001
From: Ronald Moesbergen <rmoesbergen@users.noreply.github.com>
Date: Mon, 22 Apr 2024 14:02:19 +0200
Subject: [PATCH] chore: switch to new vite-based angular builder (#240)

chore: clean up angular.json
---
 Dockerfile   |  2 +-
 angular.json | 38 ++------------------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2c887721..a7158ea2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,4 +8,4 @@ RUN yarn install --frozen-lockfile && yarn build
 
 FROM nginx:stable
 
-COPY --from=builder /build/dist /usr/share/nginx/html
+COPY --from=builder /build/dist/browser /usr/share/nginx/html
diff --git a/angular.json b/angular.json
index e2a33ba8..4f503554 100644
--- a/angular.json
+++ b/angular.json
@@ -15,11 +15,11 @@
             "prefix": "app",
             "architect": {
                 "build": {
-                    "builder": "@angular-devkit/build-angular:browser-esbuild",
+                    "builder": "@angular-devkit/build-angular:application",
                     "options": {
                         "outputPath": "dist/",
                         "index": "src/index.html",
-                        "main": "src/main.ts",
+                        "browser": "src/main.ts",
                         "tsConfig": "tsconfig.app.json",
                         "aot": true,
                         "assets": [
@@ -96,8 +96,6 @@
                             "sourceMap": false,
                             "namedChunks": false,
                             "extractLicenses": true,
-                            "vendorChunk": false,
-                            "buildOptimizer": true,
                             "budgets": [
                                 {
                                     "type": "initial",
@@ -123,8 +121,6 @@
                             "sourceMap": true,
                             "namedChunks": false,
                             "extractLicenses": false,
-                            "vendorChunk": false,
-                            "buildOptimizer": false,
                             "budgets": [
                                 {
                                     "type": "initial",
@@ -164,41 +160,11 @@
                         "buildTarget": "leaphy-client:build"
                     }
                 },
-                "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
-                    "options": {
-                        "main": "src/test.ts",
-                        "tsConfig": "tsconfig.spec.json",
-                        "karmaConfig": "karma.conf.js",
-                        "assets": ["src/favicon.ico", "src/assets"],
-                        "styles": [
-                            "src/styles.scss",
-                            "src/theme.scss",
-                            "./node_modules/bootstrap/@fortawesome/fontawesome-free/css/all.css"
-                        ],
-                        "scripts": []
-                    }
-                },
                 "lint": {
                     "builder": "@angular-eslint/builder:lint",
                     "options": {
                         "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
                     }
-                },
-                "e2e": {
-                    "builder": "@angular-devkit/build-angular:protractor",
-                    "options": {
-                        "protractorConfig": "e2e/protractor.conf.js",
-                        "devServerTarget": "leaphy-client:serve"
-                    },
-                    "configurations": {
-                        "production": {
-                            "devServerTarget": "leaphy-client:serve:production"
-                        },
-                        "dev": {
-                            "devServerTarget": "leaphy-client:serve:dev"
-                        }
-                    }
                 }
             }
         }