Ionic/angular package updates

openchargemap · Nov 29, 2023 · 947f0c2 · 947f0c2
1 parent b65d8db
commit 947f0c2
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 103 deletions.
diff --git a/angular.json b/angular.json
@@ -4,11 +4,11 @@
   "newProjectRoot": "projects",
   "projects": {
     "app": {
+      "projectType": "application",
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -17,7 +17,8 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
+            "inlineStyleLanguage": "scss",
             "assets": [
               {
                 "glob": "**/*",
@@ -30,37 +31,11 @@
                 "output": "./svg"
               }
             ],
-            "styles": [
-              {
-                "input": "src/theme/variables.scss"
-              },
-              {
-                "input": "src/global.scss"
-              }
-            ],
-            "scripts": [],
-            "vendorChunk": true,
-            "extractLicenses": false,
-            "buildOptimizer": false,
-            "sourceMap": true,
-            "optimization": false,
-            "namedChunks": true
+            "styles": ["src/theme/variables.scss", "src/global.scss"],
+            "scripts": []
           },
           "configurations": {
             "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -69,37 +44,51 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "6kb"
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
                 }
-              ]
-            },
-            "ci": {
-              "budgets": [
+              ],
+              "fileReplacements": [
                 {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "6kb"
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
                 }
               ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
+            },
+            "ci": {
               "progress": false
             }
-          }
+          },
+          "defaultConfiguration": "production"
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "app:build"
-          },
           "configurations": {
             "production": {
-              "browserTarget": "app:build:production"
+              "buildTarget": "app:build:production"
             },
-            "ci": {}
-          }
+            "development": {
+              "buildTarget": "app:build:development"
+            },
+            "ci": {
+              "progress": false
+            }
+          },
+          "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "app:build"
+            "buildTarget": "app:build"
           }
         },
         "test": {
@@ -109,20 +98,21 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "styles": [],
-            "scripts": [],
+            "inlineStyleLanguage": "scss",
             "assets": [
-              {
-                "glob": "favicon.ico",
-                "input": "src/",
-                "output": "/"
-              },
               {
                 "glob": "**/*",
                 "input": "src/assets",
-                "output": "/assets"
+                "output": "assets"
+              },
+              {
+                "glob": "**/*.svg",
+                "input": "node_modules/ionicons/dist/ionicons/svg",
+                "output": "./svg"
               }
-            ]
+            ],
+            "styles": ["src/theme/variables.scss", "src/global.scss"],
+            "scripts": []
           },
           "configurations": {
             "ci": {
@@ -131,19 +121,13 @@
             }
           }
         },
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "app:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "app:serve:production"
-            },
-            "ci": {
-              "devServerTarget": "app:serve:ci"
-            }
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
           }
         }
       }
@@ -162,4 +146,4 @@
       "styleext": "scss"
     }
   }
-}
+}
diff --git a/capacitor.config.ts b/capacitor.config.ts
@@ -3,7 +3,7 @@ import { CapacitorConfig } from "@capacitor/cli";
 const config: CapacitorConfig = {
   appId: "com.webprofusion.openchargemap",
   appName: "Open Charge Map",
-  webDir: "www",
+  webDir: "www\browser",
   android: {
     buildOptions: {
       keystorePath: "c:/Work/GIT/ocm-private/Certs/Android/android.keystore",

diff --git a/package.json b/package.json
@@ -16,41 +16,47 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "16.2.2",
-    "@angular/core": "16.2.2",
-    "@angular/forms": "16.2.2",
-    "@angular/localize": "16.2.2",
-    "@angular/platform-browser": "16.2.2",
-    "@angular/platform-browser-dynamic": "16.2.2",
-    "@angular/router": "16.2.2",
-    "@angular/service-worker": "16.2.2",
-    "@auth0/angular-jwt": "5.1.2",
-    "@capacitor/android": "5.3.0",
+    "@angular/common": "17.0.4",
+    "@angular/core": "17.0.4",
+    "@angular/forms": "17.0.4",
+    "@angular/localize": "17.0.4",
+    "@angular/platform-browser": "17.0.4",
+    "@angular/platform-browser-dynamic": "17.0.4",
+    "@angular/router": "17.0.4",
+    "@angular/service-worker": "17.0.4",
+    "@auth0/angular-jwt": "5.2.0",
+    "@capacitor/android": "5.5.1",
     "@capacitor/app": "5.0.6",
-    "@capacitor/core": "5.3.0",
+    "@capacitor/core": "5.5.1",
     "@capacitor/geolocation": "5.0.6",
     "@capacitor/haptics": "5.0.6",
-    "@capacitor/ios": "5.3.0",
+    "@capacitor/ios": "5.5.1",
     "@capacitor/keyboard": "5.0.6",
-    "@capacitor/push-notifications": "5.0.6",
+    "@capacitor/push-notifications": "5.1.0",
     "@capacitor/splash-screen": "5.0.6",
     "@capacitor/status-bar": "5.0.6",
-    "@ionic/angular": "7.3.1",
+    "@ionic/angular": "7.5.6",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "ajv": "^8.12.0",
-    "core-js": "3.31.1",
+    "core-js": "3.33.3",
     "mapbox-gl": "^2.15.0",
     "rxjs": "7.8.1",
-    "zone.js": "0.13.1"
+    "tslib": "^2.3.0",
+    "zone.js": "0.14.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "16.2.0",
-    "@angular/cli": "16.2.0",
-    "@angular/compiler": "16.2.2",
-    "@angular/compiler-cli": "16.2.2",
-    "@angular/language-service": "16.2.2",
-    "@capacitor/cli": "5.3.0",
+    "@angular-devkit/build-angular": "17.0.3",
+    "@angular-eslint/builder": "^17.0.0",
+    "@angular-eslint/eslint-plugin": "^17.0.0",
+    "@angular-eslint/eslint-plugin-template": "^17.0.0",
+    "@angular-eslint/schematics": "^17.0.0",
+    "@angular-eslint/template-parser": "^17.0.0",
+    "@angular/cli": "17.0.3",
+    "@angular/compiler": "17.0.4",
+    "@angular/compiler-cli": "17.0.4",
+    "@angular/language-service": "17.0.4",
+    "@capacitor/cli": "5.5.1",
     "@ionic/angular-toolkit": "10.0.0",
     "@ionic/lab": "3.2.15",
     "@types/google.maps": "3.53.4",
@@ -65,7 +71,7 @@
     "karma-jasmine": "5.1.0",
     "karma-jasmine-html-reporter": "2.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.6",
+    "typescript": "5.2.2",
     "webpack-dev-server": "^4.13.1"
   },
   "browserslist": [

diff --git a/src/global.scss b/src/global.scss
@@ -1,15 +1,15 @@
 // http://ionicframework.com/docs/theming/
-@import "~@ionic/angular/css/core.css";
+@import "@ionic/angular/css/core.css";
 
-@import "~@ionic/angular/css/normalize.css";
-@import "~@ionic/angular/css/structure.css";
-@import "~@ionic/angular/css/typography.css";
+@import "@ionic/angular/css/normalize.css";
+@import "@ionic/angular/css/structure.css";
+@import "@ionic/angular/css/typography.css";
 
-@import "~@ionic/angular/css/padding.css";
-@import "~@ionic/angular/css/float-elements.css";
-@import "~@ionic/angular/css/text-alignment.css";
-@import "~@ionic/angular/css/text-transformation.css";
-@import "~@ionic/angular/css/flex-utils.css";
+@import "@ionic/angular/css/padding.css";
+@import "@ionic/angular/css/float-elements.css";
+@import "@ionic/angular/css/text-alignment.css";
+@import "@ionic/angular/css/text-transformation.css";
+@import "@ionic/angular/css/flex-utils.css";
 
 /*
  * Dark Colors

diff --git a/src/polyfills.ts b/src/polyfills.ts
@@ -47,9 +47,8 @@
 /***************************************************************************************************
  * Zone JS is required by Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
+import 'zone.js';  // Included with Angular CLI.
 
-import 'zone.js/dist/webapis-media-query';
 /**
  * Prevents Angular change detection from
  * running with certain Web Component callbacks

diff --git a/tsconfig.app.json b/tsconfig.app.json
@@ -0,0 +1,15 @@
+/* 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",
+    "src/polyfills.ts"
+  ],
+  "include": [
+    "src/**/*.d.ts"
+  ]
+}