chore: update frontend to Angular v14 and Node v18 (LTS)

* chore: updated to Angular version 12 and Node version 16 (LTS) * fix: updated to Angular version 14, fixed dependency conflicts, updated Dockerfile * chore: removed yarn.lock * chore: updated to Angular version 12 and Node version 16 (LTS) * fix: updated to Angular version 14, fixed dependency conflicts, updated Dockerfile * chore: removed yarn.lock * fix: updated angular.json with a working configuration for conditional styles, updated angular to v14 the styles were moved to the assets folder for better consistency * ci: attempt at fixing build automation * ci: attempt at fixing build automation * ci: attempt at fixing build automation * ci: updated test gradle version to match local * fix: dockerfile configuration environment variable --------- Co-authored-by: ewout <[email protected]>
ugent · Feb 28, 2023 · bd2808a · bd2808a
1 parent 978d181
commit bd2808a
Show file tree

Hide file tree

Showing 94 changed files with 19,310 additions and 52,503 deletions.
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: gradle:jdk8
+      image: gradle:6.4.1-jdk
       env:
         SPRING_PROFILES_ACTIVE: test,ci
 

diff --git a/backend/settings.gradle b/backend/settings.gradle
@@ -1,5 +1,4 @@
 /*
  * This file was generated by the Gradle 'init' task.
  */
-
-rootProject.name = 'BlokAtUGent'
+rootProject.name = 'BlokAtUGent'
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -32,6 +32,7 @@ speed-measure-plugin*.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -1,20 +1,21 @@
 ### STAGE 1: Build ###
+FROM node:18.14.0-alpine AS build
 
-FROM node:14.21-alpine AS build
 WORKDIR /app
-RUN npm install -g @angular/cli
+
 COPY package.json package-lock.json ./
-RUN npm install
+
+RUN npm install -g @angular/cli@^14.0.0
+RUN npm install --legacy-peer-deps
+
 COPY . .
 
 ARG configuration=production
 
 RUN ng build --configuration=${configuration}
 
-RUN echo ${configuration}
-
 ### STAGE 2: Run ###
-
 FROM nginx:1.17.1-alpine
+
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY --from=build /app/dist/frontend /usr/share/nginx/html
diff --git a/frontend/angular.json b/frontend/angular.json
@@ -8,7 +8,7 @@
 			"schematics": {
 				"@schematics/angular:component": {
 					"style": "scss"
-				}
+                }
 			},
 			"root": "",
 			"sourceRoot": "src",
@@ -22,7 +22,6 @@
 						"main": "src/main.ts",
 						"polyfills": "src/polyfills.ts",
 						"tsConfig": "tsconfig.app.json",
-						"aot": true,
 						"assets": [
 							"src/favicon.ico",
 							"src/assets",
@@ -38,35 +37,35 @@
 								"output": "./assets/"
 							  }
 						],
-						"styles": [
-							"src/styles.scss",
-							"src/development.scss"
-						],
-						"scripts": [
-						],
-            "stylePreprocessorOptions": {
-              "includePaths": [
-                "node_modules/breakpoint-sass/stylesheets",
-                "node_modules/susy/sass"
-              ]
-            }
+                        "styles": [
+                            "src/assets/styles/local/styles.scss"
+                        ],
+                        "stylePreprocessorOptions": {
+                          "includePaths": [
+                            "node_modules/breakpoint-sass/stylesheets",
+                            "node_modules/susy/sass"
+                          ]
+                        },
+						"vendorChunk": true,
+						"extractLicenses": false,
+						"buildOptimizer": false,
+						"sourceMap": true,
+						"optimization": false,
+						"namedChunks": true
 					},
 					"configurations": {
 						"production": {
 							"fileReplacements": [
 								{
 									"replace": "src/environments/environment.ts",
-									"with": "src/environments/environment.prod.ts"
-								},
-								{
-									"replace": "src/development.scss",
-									"with": "src/extra-styling-placeholder.scss"
+									"with": "src/environments/environment.production.ts"
 								}
 							],
+                            "styles": [
+                                "src/assets/styles/production/styles.scss"
+                            ],
 							"optimization": true,
 							"outputHashing": "all",
-							"sourceMap": true,
-							"extractCss": true,
 							"namedChunks": false,
 							"extractLicenses": true,
 							"vendorChunk": false,
@@ -88,17 +87,15 @@
 							"fileReplacements": [
 								{
 									"replace": "src/environments/environment.ts",
-									"with": "src/environments/environment.local-prod.ts"
-								},
-								{
-									"replace": "src/development.scss",
-									"with": "src/extra-styling-placeholder.scss"
+									"with": "src/environments/environment.local-production.ts"
 								}
 							],
+                            "styles": [
+                                "src/assets/styles/production/styles.scss"
+                            ],
 							"optimization": true,
 							"outputHashing": "all",
 							"sourceMap": false,
-							"extractCss": true,
 							"namedChunks": false,
 							"extractLicenses": true,
 							"vendorChunk": false,
@@ -120,13 +117,14 @@
 							"fileReplacements": [
 								{
 									"replace": "src/environments/environment.ts",
-									"with": "src/environments/environment.stag.ts"
+									"with": "src/environments/environment.staging.ts"
 								}
 							],
+                            "styles": [
+                                "src/assets/styles/staging/styles.scss"
+                            ],
 							"optimization": true,
 							"outputHashing": "all",
-							"sourceMap": true,
-							"extractCss": true,
 							"namedChunks": false,
 							"extractLicenses": true,
 							"vendorChunk": false,
@@ -153,11 +151,11 @@
 						"proxyConfig": "proxy.conf.json"
 					},
 					"configurations": {
-						"production": {
-							"browserTarget": "frontend:build:production"
+						"local-production": {
+							"browserTarget": "frontend:build:local-production"
 						}
 					}
-				},
+                },
 				"extract-i18n": {
 					"builder": "@angular-devkit/build-angular:extract-i18n",
 					"options": {
@@ -215,8 +213,7 @@
 				}
 			}
 		}
-	},
-	"defaultProject": "frontend",
+  },
 	"cli": {
 		"analytics": false
 	}