Merge pull request #37 from camptocamp/angular-18-migration

Angular 18 migration
camptocamp · Nov 11, 2024 · a3b9667 · a3b9667
2 parents a7ecfa5 + f0d43b5
commit a3b9667
Show file tree

Hide file tree

Showing 106 changed files with 7,181 additions and 9,720 deletions.
diff --git a/angular.json b/angular.json
@@ -41,6 +41,7 @@
             "styles": [
               "node_modules/ol/ol.css",
               "node_modules/ol-geocoder/dist/ol-geocoder.min.css",
+              "@angular/material/prebuilt-themes/purple-green.css",
               "src/theme.scss",
               "src/styles.scss"
             ],
@@ -107,57 +108,46 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "front:build"
+            "buildTarget": "front:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "front:build:production"
+              "buildTarget": "front:build:production"
             },
             "development": {
-              "browserTarget": "front:build:development"
+              "buildTarget": "front:build:development"
             },
             "de": {
-              "browserTarget": "front:build:development,de"
+              "buildTarget": "front:build:development,de"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "front:build"
+            "buildTarget": "front:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts"
+            ],
             "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
             "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "**/*",
+                "input": "public"
+              }
             ],
             "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/purple-green.css",
               "src/styles.scss"
             ],
             "scripts": []
           }
         },
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
-          "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "front:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "front:serve:production"
-            }
-          }
-        },
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {

diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts
diff --git a/e2e/src/app.po.ts b/e2e/src/app.po.ts
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
diff --git a/karma.conf.js b/karma.conf.js
@@ -0,0 +1,23 @@
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: [
+      'jasmine',
+      '@angular-devkit/build-angular'
+    ],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-firefox-launcher'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+    ],
+    client: {
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Firefox'],
+    singleRun: false
+  });
+};