Merge branch 'develop'

GeorgDangl · Jul 2, 2024 · 3a052c0 · 3a052c0
2 parents 8c550cf + 0986039
commit 3a052c0
Show file tree

Hide file tree

Showing 9 changed files with 4,876 additions and 3,803 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to **angular-material-shared** are documented here.
 
+## v2.7.2:
+- Update Angular to v18
+
 ## v2.7.1:
 
 - Fixed an issue where clicking the header text would not work

diff --git a/src/angular-material-shared-demo/angular.json b/src/angular-material-shared-demo/angular.json
@@ -11,12 +11,15 @@
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/angular-material-shared-demo",
+            "outputPath": {
+              "base": "dist/angular-material-shared-demo"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts"
+            ],
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
@@ -28,12 +31,11 @@
             "scripts": [
               "node_modules/tinymce/tinymce.min.js"
             ],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
-            "namedChunks": true
+            "namedChunks": true,
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -53,9 +55,7 @@
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true
+              "extractLicenses": true
             }
           },
           "defaultConfiguration": ""