Security fixes, angular, electron & other upgrades

thomaschampagne · Apr 28, 2024 · 54a0375 · 54a0375
1 parent c600ef5
commit 54a0375
Show file tree

Hide file tree

Showing 26 changed files with 16,884 additions and 12,089 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,5 +11,25 @@
     "typescriptreact",
     "html",
     "yaml"
-  ]
+  ],
+  "workbench.colorCustomizations": {
+    "activityBar.activeBackground": "#e4e4e4",
+    "activityBar.background": "#e4e4e4",
+    "activityBar.foreground": "#15202b",
+    "activityBar.inactiveForeground": "#15202b99",
+    "activityBarBadge.background": "#cf70cf",
+    "activityBarBadge.foreground": "#15202b",
+    "commandCenter.border": "#15202b99",
+    "sash.hoverBorder": "#e4e4e4",
+    "statusBar.background": "#cbcbcb",
+    "statusBar.foreground": "#15202b",
+    "statusBarItem.hoverBackground": "#b1b1b1",
+    "statusBarItem.remoteBackground": "#cbcbcb",
+    "statusBarItem.remoteForeground": "#15202b",
+    "titleBar.activeBackground": "#cbcbcb",
+    "titleBar.activeForeground": "#15202b",
+    "titleBar.inactiveBackground": "#cbcbcb99",
+    "titleBar.inactiveForeground": "#15202b99"
+  },
+  "peacock.color": "#cbcbcb"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -7,15 +7,22 @@
       "path": "webextension",
       "group": "build",
       "problemMatcher": [],
-      "label": "extension watch"
+      "label": "WebExt Watch"
     },
     {
       "type": "npm",
       "script": "start",
       "group": "build",
       "path": "desktop",
       "problemMatcher": [],
-      "label": "desktop watch",
+      "label": "Desktop Watch"
+    },
+    {
+      "type": "npm",
+      "script": "launch:dev:app",
+      "path": "desktop",
+      "problemMatcher": [],
+      "label": "Desktop Open Dev App",
     }
   ]
 }
diff --git a/appcore/angular.json b/appcore/angular.json
@@ -41,7 +41,12 @@
               "pako",
               "semver",
               "file-saver",
-              "jdenticon"
+              "jdenticon",
+              "p-defer",
+              "plotly.js-basic-dist-min",
+              "json2csv",
+              "katex",
+              "moment"
             ]
           },
           "configurations": {
@@ -226,7 +231,6 @@
       }
     }
   },
-  "defaultProject": "app",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
@@ -238,6 +242,8 @@
   },
   "cli": {
     "analytics": false,
-    "defaultCollection": "@angular-eslint/schematics"
+    "schematicCollections": [
+      "@angular-eslint/schematics"
+    ]
   }
-}
+}
diff --git a/appcore/jest.config.js b/appcore/jest.config.js
@@ -1,16 +1,11 @@
-const { pathsToModuleNameMapper } = require("ts-jest/utils");
-const { compilerOptions } = require("./tsconfig");
-
 module.exports = {
   testRunner: "jest-jasmine2",
+  testEnvironment: "jsdom",
   preset: "jest-preset-angular",
   roots: ["<rootDir>/src/"],
   testMatch: ["**/+(*.)+(spec).+(ts)"],
   setupFilesAfterEnv: ["<rootDir>/src/test.ts"],
   collectCoverage: true,
   coverageReporters: ["html"],
-  coverageDirectory: "coverage/",
-  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths || {}, {
-    prefix: "<rootDir>/"
-  })
+  coverageDirectory: "coverage/"
 };