Fix Angular 15

bansan85 · Dec 25, 2022 · 922c851 · 922c851
1 parent 185fd93
commit 922c851
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 172 deletions.
diff --git a/src/angular/angular.json b/src/angular/angular.json
@@ -27,7 +27,7 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "projects/toolbox/src/test.ts",
+            "polyfills": ["zone.js", "zone.js/testing"],
             "tsConfig": "projects/toolbox/tsconfig.spec.json",
             "karmaConfig": "projects/toolbox/karma.conf.js"
           }
@@ -58,7 +58,7 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "projects/jessica/src/test.ts",
+            "polyfills": ["zone.js", "zone.js/testing"],
             "tsConfig": "projects/jessica/tsconfig.spec.json",
             "karmaConfig": "projects/jessica/karma.conf.js"
           }
@@ -82,7 +82,7 @@
             "outputPath": "projects/app-main/dist",
             "index": "projects/app-main/src/index.html",
             "main": "projects/app-main/src/main.ts",
-            "polyfills": "projects/app-main/src/polyfills.ts",
+            "polyfills": "zone.js",
             "tsConfig": "projects/app-main/tsconfig.app.json",
             "assets": [
               "projects/app-main/src/favicon.ico",
@@ -151,8 +151,7 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "projects/app-main/src/test.ts",
-            "polyfills": "projects/app-main/src/polyfills.ts",
+            "polyfills": ["zone.js", "zone.js/testing"],
             "tsConfig": "projects/app-main/tsconfig.spec.json",
             "karmaConfig": "projects/app-main/karma.conf.js",
             "assets": [
@@ -166,5 +165,8 @@
       }
     }
   },
-  "defaultProject": "app-main"
+  "defaultProject": "app-main",
+  "cli": {
+    "analytics": "4153d04a-e76f-4106-aef5-5479d2538134"
+  }
 }
diff --git a/src/angular/projects/app-main/src/app/ui/main/main.component.ts b/src/angular/projects/app-main/src/app/ui/main/main.component.ts
@@ -18,7 +18,7 @@ import { FormBuilder, FormGroup } from '@angular/forms';
   styleUrls: ['./main.component.css']
 })
 export class MainComponent {
-  result!: MeyerhofResult;
+  result!: MeyerhofResult | undefined;
   form: FormGroup;
   private _lang?: string;
 

diff --git a/src/angular/projects/app-main/src/polyfills.ts b/src/angular/projects/app-main/src/polyfills.ts
diff --git a/src/angular/projects/app-main/src/test.ts b/src/angular/projects/app-main/src/test.ts
diff --git a/src/angular/projects/app-main/tsconfig.app.json b/src/angular/projects/app-main/tsconfig.app.json
@@ -16,7 +16,7 @@
       "toolbox": ["./projects/toolbox/dist"]
     }
   },
-  "files": ["src/main.ts", "src/polyfills.ts"],
+  "files": ["src/main.ts"],
   "include": [
     "src/**/*.d.ts",
     "./projects/app-main/node_modules/@angular/common/locales/*.d.ts",

diff --git a/src/angular/projects/app-main/tsconfig.spec.json b/src/angular/projects/app-main/tsconfig.spec.json
@@ -15,6 +15,5 @@
       "toolbox": ["./projects/toolbox/dist"]
     }
   },
-  "files": ["src/test.ts", "src/polyfills.ts"],
   "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
 }
diff --git a/src/angular/projects/jessica/src/test.ts b/src/angular/projects/jessica/src/test.ts
diff --git a/src/angular/projects/jessica/tsconfig.lib.json b/src/angular/projects/jessica/tsconfig.lib.json
@@ -13,5 +13,5 @@
     },
     "esModuleInterop": true
   },
-  "exclude": ["src/test.ts", "**/*.spec.ts"]
+  "exclude": ["**/*.spec.ts"]
 }
diff --git a/src/angular/projects/jessica/tsconfig.spec.json b/src/angular/projects/jessica/tsconfig.spec.json
@@ -14,6 +14,6 @@
     },
     "esModuleInterop": true
   },
-  "files": ["src/test.ts"],
+  "files": [],
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }
diff --git a/src/angular/projects/toolbox/src/test.ts b/src/angular/projects/toolbox/src/test.ts
diff --git a/src/angular/projects/toolbox/tsconfig.lib.json b/src/angular/projects/toolbox/tsconfig.lib.json
@@ -8,5 +8,5 @@
     "inlineSources": true,
     "types": []
   },
-  "exclude": ["src/test.ts", "**/*.spec.ts"]
+  "exclude": ["**/*.spec.ts"]
 }
diff --git a/src/angular/projects/toolbox/tsconfig.spec.json b/src/angular/projects/toolbox/tsconfig.spec.json
@@ -12,6 +12,6 @@
       ]
     }
   },
-  "files": ["src/test.ts"],
+  "files": [],
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }
diff --git a/src/javascript/wasm/CMakeLists.txt b/src/javascript/wasm/CMakeLists.txt
@@ -34,7 +34,7 @@ add_custom_target(
     sed -i
     "s#[\\'\\\"]jessica-web.wasm[\\'\\\"]#\\'assets/jessica-web.wasm\\'#g"
     "${CMAKE_CURRENT_BINARY_DIR}/jessica-web.js"
-  COMMAND sed -i "s#var jessica#export var jessica#g"
+  COMMAND sed -i "s#^var jessica#export var jessica#g"
           "${CMAKE_CURRENT_BINARY_DIR}/jessica-web.js"
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/jessica-web.*"
           "${CMAKE_SOURCE_DIR}/src/angular/projects/jessica/src/assets/")