Update app to Angular v17

robisim74 · Jan 4, 2024 · e4783af · e4783af
1 parent d144f27
commit e4783af
Show file tree

Hide file tree

Showing 27 changed files with 9,678 additions and 9,808 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

diff --git a/.stackblitzrc b/.stackblitzrc
@@ -1 +1 @@
-{"installDependencies":true,"startCommand":"turbo build && turbo start","env":{"ENABLE_CJS_IMPORTS":true}}
+{"installDependencies":true,"startCommand":"npm build && npm start","env":{"ENABLE_CJS_IMPORTS":true}}
diff --git a/README.md b/README.md
@@ -467,14 +467,13 @@ Here we are doing three things:
 
 
 ## Server Side Rendering
-You can find a complete sample app with _@nguniversal/express-engine_ [here](projects/angular-l10n-ssr)
+You can find a complete sample app [here](projects/angular-l10n-ssr)
 
 What is important to know:
-- `TranslationLoader` uses dynamic import of json (to avoid fetch requests during SSR)
 - `DirectiveComponent` has `ngSkipHydration` enabled because directives manipolate the DOM
+- `prerender` is enabled in `angular.json`
 - `routes.tsx` file contains localized routes (to prerender pages in different languages)
 
-
 ## Types
 Angular l10n types that it is useful to know:
 - `L10nLocale` Contains a `language`, in the format `language[-script][-region][-extension]`, where:

diff --git a/angular.json b/angular.json
@@ -111,18 +111,18 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "angular-l10n-app:build:production"
+              "buildTarget": "angular-l10n-app:build:production"
             },
             "development": {
-              "browserTarget": "angular-l10n-app:build:development"
+              "buildTarget": "angular-l10n-app:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "angular-l10n-app:build"
+            "buildTarget": "angular-l10n-app:build"
           }
         },
         "test": {
@@ -167,11 +167,11 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/angular-l10n-ssr/browser",
+            "outputPath": "dist/angular-l10n-ssr",
             "index": "projects/angular-l10n-ssr/src/index.html",
-            "main": "projects/angular-l10n-ssr/src/main.ts",
+            "browser": "projects/angular-l10n-ssr/src/main.ts",
             "polyfills": [
               "zone.js"
             ],
@@ -184,7 +184,14 @@
             "styles": [
               "projects/angular-l10n-ssr/src/styles.scss"
             ],
-            "scripts": []
+            "scripts": [],
+            "server": "projects/angular-l10n-ssr/src/main.server.ts",
+            "prerender": {
+              "routesFile": "projects/angular-l10n-ssr/routes.txt"
+            },
+            "ssr": {
+              "entry": "projects/angular-l10n-ssr/server.ts"
+            }
           },
           "configurations": {
             "production": {
@@ -203,12 +210,9 @@
               "outputHashing": "all"
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
+              "sourceMap": true
             }
           },
           "defaultConfiguration": "production"
@@ -217,18 +221,18 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "angular-l10n-ssr:build:production"
+              "buildTarget": "angular-l10n-ssr:build:production"
             },
             "development": {
-              "browserTarget": "angular-l10n-ssr:build:development"
+              "buildTarget": "angular-l10n-ssr:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "angular-l10n-ssr:build"
+            "buildTarget": "angular-l10n-ssr:build"
           }
         },
         "test": {
@@ -258,61 +262,6 @@
               "projects/angular-l10n-ssr/**/*.html"
             ]
           }
-        },
-        "server": {
-          "builder": "@angular-devkit/build-angular:server",
-          "options": {
-            "outputPath": "dist/angular-l10n-ssr/server",
-            "main": "projects/angular-l10n-ssr/server.ts",
-            "tsConfig": "projects/angular-l10n-ssr/tsconfig.server.json",
-            "inlineStyleLanguage": "scss"
-          },
-          "configurations": {
-            "production": {
-              "outputHashing": "media"
-            },
-            "development": {
-              "buildOptimizer": false,
-              "optimization": false,
-              "sourceMap": true,
-              "extractLicenses": false,
-              "vendorChunk": true
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "serve-ssr": {
-          "builder": "@nguniversal/builders:ssr-dev-server",
-          "configurations": {
-            "development": {
-              "browserTarget": "angular-l10n-ssr:build:development",
-              "serverTarget": "angular-l10n-ssr:server:development"
-            },
-            "production": {
-              "browserTarget": "angular-l10n-ssr:build:production",
-              "serverTarget": "angular-l10n-ssr:server:production"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "prerender": {
-          "builder": "@nguniversal/builders:prerender",
-          "options": {
-            "routes": [
-              "/"
-            ]
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "angular-l10n-ssr:build:production",
-              "serverTarget": "angular-l10n-ssr:server:production"
-            },
-            "development": {
-              "browserTarget": "angular-l10n-ssr:build:development",
-              "serverTarget": "angular-l10n-ssr:server:development"
-            }
-          },
-          "defaultConfiguration": "production"
         }
       }
     }