working in angular 17 (#131)

* working in angular 17 * fix test
CaptainGlac1er · Jul 5, 2024 · 32577a4 · 32577a4
1 parent cfa2faf
commit 32577a4
Show file tree

Hide file tree

Showing 21 changed files with 5,814 additions and 4,408 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ### STAGE 1: Build ###
 
-FROM node:18-alpine3.18 AS builder
+FROM node:20-alpine AS builder
 
 WORKDIR /project
 
@@ -13,7 +13,7 @@ RUN npm run build:client-and-server-bundles
 
 ### STAGE 2: Create Image ###
 
-FROM node:18-alpine3.18
+FROM node:20-alpine
 
 COPY --from=builder /project/dist /project/dist
 COPY ./package*.json /project/

diff --git a/angular.json b/angular.json
@@ -134,10 +134,10 @@
           },
           "configurations": {
             "production": {
-              "browserTarget": "angular-georgecolgrove:build:production"
+              "buildTarget": "angular-georgecolgrove:build:production"
             },
             "development": {
-              "browserTarget": "angular-georgecolgrove:build:development"
+              "buildTarget": "angular-georgecolgrove:build:development"
             }
           },
           "defaultConfiguration": "development"
@@ -148,18 +148,18 @@
           },
           "configurations": {
             "production": {
-              "browserTarget": "angular-georgecolgrove:build-dev:development"
+              "buildTarget": "angular-georgecolgrove:build-dev:development"
             },
             "development": {
-              "browserTarget": "angular-georgecolgrove:build-dev:development"
+              "buildTarget": "angular-georgecolgrove:build-dev:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "angular-georgecolgrove:build"
+            "buildTarget": "angular-georgecolgrove:build"
           }
         },
         "test": {
@@ -224,6 +224,39 @@
             }
           },
           "defaultConfiguration": "production"
+        },
+        "serve-ssr": {
+          "builder": "@angular-devkit/build-angular:ssr-dev-server",
+          "configurations": {
+            "development": {
+              "browserTarget": "angular-georgecolgrove:build:development",
+              "serverTarget": "angular-georgecolgrove:server:development"
+            },
+            "production": {
+              "browserTarget": "angular-georgecolgrove:build:production",
+              "serverTarget": "angular-georgecolgrove:server:production"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "prerender": {
+          "builder": "@angular-devkit/build-angular:prerender",
+          "options": {
+            "routes": [
+              "/"
+            ]
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "angular-georgecolgrove:build:production",
+              "serverTarget": "angular-georgecolgrove:server:production"
+            },
+            "development": {
+              "browserTarget": "angular-georgecolgrove:build:development",
+              "serverTarget": "angular-georgecolgrove:server:development"
+            }
+          },
+          "defaultConfiguration": "production"
         }
       }
     }

diff --git a/beta.Dockerfile b/beta.Dockerfile
@@ -1,6 +1,6 @@
 ### STAGE 1: Build ###
 
-FROM node:18-alpine3.18 AS builder
+FROM node:20-alpine AS builder
 
 WORKDIR /project
 
@@ -13,7 +13,7 @@ RUN npm run build:staging:client-and-server-bundles
 
 ### STAGE 2: Create Image ###
 
-FROM node:18-alpine3.18
+FROM node:20-alpine
 
 COPY --from=builder /project/dist /project/dist
 COPY ./package*.json /project/