update dependencies

package.json

@@ -12,7 +12,7 @@
   "main": "./app/electron-main.js",
   "scripts": {
     "precommit": "lint-staged",
-    "app:dist": "npm-run-all lint test:electron-main test:web clean:app build assets electron-builder:install-app-deps test:e2e",
+    "app:dist": "npm-run-all lint test:electron-main clean:app build assets electron-builder:install-app-deps test:e2e",
     "build": "npm-run-all build:electron-main build:electron-preload build:web",
     "build:dev": "cross-env NODE_ENV=development npm-run-all build",
     "build:electron-main": "webpack --config ./src/webpack/electron-main.ts",
@@ -75,7 +75,7 @@
   },
   "dependencies": {
     "about-window": "1.12.1",
-    "class-transformer": "0.1.9",
+    "class-transformer": "0.1.10",
     "class-transformer-validator": "0.6.0",
     "class-validator": "0.9.1",
     "compare-versions": "3.4.0",
@@ -102,25 +102,25 @@
     "valid-url": "1.0.9"
   },
   "devDependencies": {
-    "@angular-devkit/build-optimizer": "0.8.5",
-    "@angular/animations": "6.1.10",
-    "@angular/common": "6.1.10",
-    "@angular/compiler": "6.1.10",
-    "@angular/compiler-cli": "6.1.10",
-    "@angular/core": "6.1.10",
-    "@angular/forms": "6.1.10",
-    "@angular/http": "6.1.10",
-    "@angular/language-service": "6.1.10",
-    "@angular/platform-browser": "6.1.10",
-    "@angular/platform-browser-dynamic": "6.1.10",
-    "@angular/router": "6.1.10",
+    "@angular-devkit/build-optimizer": "0.10.1",
+    "@angular/animations": "7.0.0",
+    "@angular/common": "7.0.0",
+    "@angular/compiler": "7.0.0",
+    "@angular/compiler-cli": "7.0.0",
+    "@angular/core": "7.0.0",
+    "@angular/forms": "7.0.0",
+    "@angular/http": "7.0.0",
+    "@angular/language-service": "7.0.0",
+    "@angular/platform-browser": "7.0.0",
+    "@angular/platform-browser-dynamic": "7.0.0",
+    "@angular/router": "7.0.0",
     "@angularclass/hmr": "2.1.3",
     "@email-securely-app/import-sort-style": "0.1.0",
-    "@ng-select/ng-select": "2.10.4",
+    "@ng-select/ng-select": "2.10.5",
     "@ngrx/effects": "6.1.0",
     "@ngrx/router-store": "6.1.0",
     "@ngrx/store": "6.1.0",
-    "@ngtools/webpack": "6.2.5",
+    "@ngtools/webpack": "7.0.1",
     "@types/angular": "1.6.51",
     "@types/html-to-text": "1.4.31",
     "@types/html-webpack-plugin": "3.2.0",
@@ -160,9 +160,9 @@
     "cross-env": "5.2.0",
     "cross-spawn": "6.0.5",
     "css-loader": "1.0.0",
-    "cssnano": "4.1.4",
+    "cssnano": "4.1.5",
     "devtron": "1.4.0",
-    "electron": "3.0.4",
+    "electron": "3.0.5",
     "electron-builder": "20.28.4",
     "exports-loader": "0.7.0",
     "file-loader": "2.0.0",
@@ -200,7 +200,7 @@
     "randomstring": "1.1.5",
     "raw-loader": "0.5.1",
     "resolve-url-loader": "3.0.0",
-    "rewiremock": "3.8.0",
+    "rewiremock": "3.9.0",
     "rxjs-compat": "6.3.3",
     "sass-lint": "1.12.1",
     "sass-loader": "7.1.0",
@@ -224,7 +224,7 @@
     "typescript": "3.1.3",
     "uglifyjs-webpack-plugin": "2.0.1",
     "url-loader": "1.1.2",
-    "webpack": "4.20.2",
+    "webpack": "4.21.0",
     "webpack-cli": "3.1.2",
     "webpack-dev-server": "3.1.9",
     "webpack-merge": "4.1.4",

src/electron-main/api/endpoints-builders/database/index.ts

@@ -39,9 +39,6 @@ export async function buildEndpoints(ctx: Context): Promise<Pick<Endpoints, Meth
 
                 for (const entity of source.upsert) {
                     await (destinationMap as EntityMap<typeof entity>).validateAndSet(entity);
-                    // if (entityType === "folders") {
-                    //     console.log(JSON.stringify({entity}, null, 2));
-                    // }
                 }
             }
 

src/web/tsconfig.development.json

@@ -1,8 +1,12 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../tsconfig.json",
+  "include": [
+    "./**/*",
+    "./typings.d.ts"
+  ],
   "exclude": [
     "./**/*.spec.ts",
-    "./src/environments/*.ts"
+    "./src/environments/production/**/*"
   ],
   // section is taken from the parent config, inheritance does not work here
   "angularCompilerOptions": {

src/web/tsconfig.json

@@ -6,8 +6,9 @@
   ],
   "exclude": [
     "./**/*.spec.ts",
-    "./src/environments/**/*.ts"
+    "./src/environments/development/**/*"
   ],
+  // section is taken from the parent config, inheritance does not work here
   "angularCompilerOptions": {
     "preserveWhitespaces": false,
     "fullTemplateTypeCheck": true,

src/webpack/web.ts

@@ -18,7 +18,10 @@ const {readConfiguration} = require("@angular/compiler-cli");
 
 const webSrcPath = (...value: string[]) => srcRelateivePath("./web/src", ...value);
 const webAppPath = (...value: string[]) => webSrcPath("./app", ...value);
-const webSrcEnvPath = (...value: string[]) => webSrcPath("./environments", environmentSate.development ? "./development" : "", ...value);
+const webSrcEnvPath = (...value: string[]) => webSrcPath(
+    "./environments", environmentSate.development ? "./development" : "./production",
+    ...value,
+);
 
 // tslint:disable:no-var-requires
 const packageJson = require(rootRelateivePath("./package.json"));
@@ -53,12 +56,10 @@ const tsConfigFile = srcRelateivePath(({
 const tsConfigCompilerOptions: ts.CompilerOptions = (() => {
     const tsConfig = readConfiguration(tsConfigFile);
 
-    if (environmentSate.development) {
-        if (!tsConfig.options.paths) {
-            tsConfig.options.paths = {};
-        }
-        tsConfig.options.paths["src/web/src/environments/*"] = [webSrcEnvPath() + "/*"];
+    if (!tsConfig.options.paths) {
+        tsConfig.options.paths = {};
     }
+    tsConfig.options.paths["src/web/src/environments/*"] = [webSrcEnvPath() + "/*"];
 
     return tsConfig.options;
 })();