merge conflict

angular-architects · Jan 23, 2024 · 926d0c2 · 926d0c2
2 parents b3a013e + fef14e6
commit 926d0c2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/angular.json b/angular.json
@@ -21,11 +21,11 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
             "outputPath": "dist/flights",
             "index": "src/index.html",
-            "main": "src/main.ts",
+            "browser": "src/main.ts",
             "polyfills": ["zone.js"],
             "tsConfig": "tsconfig.app.json",
             "assets": ["src/favicon.ico", "src/assets"],
@@ -54,9 +54,7 @@
               "outputHashing": "all"
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
               "sourceMap": true,
               "namedChunks": true
@@ -68,18 +66,18 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "flights:build:production"
+              "buildTarget": "flights:build:production"
             },
             "development": {
-              "browserTarget": "flights:build:development"
+              "buildTarget": "flights:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "flights:build"
+            "buildTarget": "flights:build"
           }
         },
         "test": {

diff --git a/package.json b/package.json
@@ -12,24 +12,24 @@
   "private": true,
   "dependencies": {
     "@angular-architects/paper-design": "^1.0.3",
-    "@angular/animations": "^16.0.4",
-    "@angular/cdk": "^16.0.1",
-    "@angular/common": "^16.0.4",
-    "@angular/compiler": "^16.0.4",
-    "@angular/core": "^16.0.4",
-    "@angular/forms": "^16.0.4",
-    "@angular/material": "^16.0.3",
-    "@angular/platform-browser": "^16.0.4",
-    "@angular/platform-browser-dynamic": "^16.0.4",
-    "@angular/router": "^16.0.4",
+    "@angular/animations": "^17.1.0",
+    "@angular/cdk": "^17.1.0",
+    "@angular/common": "^17.1.0",
+    "@angular/compiler": "^17.1.0",
+    "@angular/core": "^17.1.0",
+    "@angular/forms": "^17.1.0",
+    "@angular/material": "^17.1.0",
+    "@angular/platform-browser": "^17.1.0",
+    "@angular/platform-browser-dynamic": "^17.1.0",
+    "@angular/router": "^17.1.0",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
-    "zone.js": "~0.13.0"
+    "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^16.0.4",
-    "@angular/cli": "~16.0.4",
-    "@angular/compiler-cli": "^16.0.4",
+    "@angular-devkit/build-angular": "^17.1.0",
+    "@angular/cli": "~17.1.0",
+    "@angular/compiler-cli": "^17.1.0",
     "@types/jasmine": "~4.3.0",
     "husky": "^8.0.0",
     "jasmine-core": "~4.5.0",
@@ -38,8 +38,7 @@
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.0.0",
-    "prettier": "^2.8.0",
-    "pretty-quick": "^3.1.3",
-    "typescript": "~5.0.0"
+    "pretty-quick": "^4.0.0",
+    "typescript": "~5.3.0"
   }
 }