From 1caa18e9d47fee9186db57c813c3f36ac2d08bb8 Mon Sep 17 00:00:00 2001
From: Matthieu Riegler <kyro38@gmail.com>
Date: Mon, 26 Feb 2024 20:03:11 +0100
Subject: [PATCH] refactor(angular): move app tsconfig up a level to match CLI
 output. (#28)

* refactor(angular): move app tsconfig up a level to match CLI output.

This also fixes `ng add @angular/ssr` setup.

* chore: update Angular to 17.2

Note: piscina is overridded because version 4.3.0 relies on the histogram API which isn't fully supported by Webcontainers.
---
 angular/angular.json          |  2 +-
 angular/package.json          | 25 +++++++++++++++----------
 angular/src/tsconfig.app.json |  9 ---------
 angular/tsconfig.app.json     | 10 ++++++++++
 4 files changed, 26 insertions(+), 20 deletions(-)
 delete mode 100644 angular/src/tsconfig.app.json
 create mode 100644 angular/tsconfig.app.json

diff --git a/angular/angular.json b/angular/angular.json
index 0d7309d..7537ba5 100644
--- a/angular/angular.json
+++ b/angular/angular.json
@@ -32,7 +32,7 @@
             "outputPath": "dist/demo",
             "scripts": [],
             "styles": ["src/global_styles.css"],
-            "tsConfig": "src/tsconfig.app.json"
+            "tsConfig": "tsconfig.app.json"
           }
         },
         "serve": {
diff --git a/angular/package.json b/angular/package.json
index 65e702c..e1000bb 100644
--- a/angular/package.json
+++ b/angular/package.json
@@ -7,21 +7,26 @@
     "build": "ng build"
   },
   "dependencies": {
-    "@angular/animations": "~17.1.0",
-    "@angular/common": "~17.1.0",
-    "@angular/compiler": "~17.1.0",
-    "@angular/core": "~17.1.0",
-    "@angular/forms": "~17.1.0",
-    "@angular/platform-browser": "~17.1.0",
-    "@angular/router": "~17.1.0",
+    "@angular/animations": "^17.2.0",
+    "@angular/common": "^17.2.0",
+    "@angular/compiler": "^17.2.0",
+    "@angular/core": "^17.2.0",
+    "@angular/forms": "^17.2.0",
+    "@angular/platform-browser": "^17.2.0",
+    "@angular/router": "^17.2.0",
     "rxjs": "^7.8.1",
     "tslib": "^2.5.0",
     "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~17.1.0",
-    "@angular/cli": "~17.1.0",
-    "@angular/compiler-cli": "~17.1.0",
+    "@angular-devkit/build-angular": "^17.2.0",
+    "@angular/cli": "^17.2.0",
+    "@angular/compiler-cli": "^17.2.0",
     "typescript": "~5.3.0"
+  },
+  "overrides": {
+    "@angular-devkit/build-angular": {
+      "piscina": "~4.2.0"
+    }
   }
 }
diff --git a/angular/src/tsconfig.app.json b/angular/src/tsconfig.app.json
deleted file mode 100644
index 3de9ed5..0000000
--- a/angular/src/tsconfig.app.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "types": []
-  },
-  "files": ["main.ts"],
-  "include": ["**/*.d.ts"]
-}
diff --git a/angular/tsconfig.app.json b/angular/tsconfig.app.json
new file mode 100644
index 0000000..84f1f99
--- /dev/null
+++ b/angular/tsconfig.app.json
@@ -0,0 +1,10 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "types": []
+  },
+  "files": ["src/main.ts"],
+  "include": ["src/**/*.d.ts"]
+}