fixing merging pj

Author: darekf77igt

client-angular/package.json

@@ -42,28 +42,25 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/build-angular": "0.901.3",
-    "@angular-devkit/build-optimizer": "0.900.0-rc.7",
-    "@angular-devkit/schematics": "9.0.0-rc.7",
-    "@angular/animations": "9.1.3",
-    "@angular/cdk": "9.2.1",
-    "@angular/cli": "9.1.3",
-    "@angular/common": "9.1.3",
-    "@angular/compiler": "9.1.3",
-    "@angular/compiler-cli": "9.1.3",
-    "@angular/core": "9.1.3",
-    "@angular/forms": "9.1.3",
-    "@angular/http": "7.2.15",
-    "@angular/language-service": "9.1.3",
-    "@angular/material": "9.2.1",
-    "@angular/platform-browser": "9.1.3",
-    "@angular/platform-browser-dynamic": "9.1.3",
-    "@angular/pwa": "0.900.0-rc.7",
-    "@angular/router": "9.1.3",
-    "@angular/service-worker": "9.1.3",
-    "@iconify/icons-fa-solid": "1.0.1",
-    "@iconify/icons-mdi": "1.0.8",
-    "@iconify/react": "1.1.3",
+    "@angular-devkit/build-angular": "~0.901.3",
+    "@angular-devkit/build-optimizer": "~0.900.0-rc.7",
+    "@angular-devkit/schematics": "~9.0.0-rc.7",
+    "@angular/animations": "~9.1.3",
+    "@angular/cdk": "~9.2.1",
+    "@angular/cli": "~9.1.3",
+    "@angular/common": "~9.1.3",
+    "@angular/compiler": "~9.1.3",
+    "@angular/compiler-cli": "~9.1.3",
+    "@angular/core": "~9.1.3",
+    "@angular/forms": "~9.1.3",
+    "@angular/http": "~7.2.15",
+    "@angular/language-service": "~9.1.3",
+    "@angular/material": "~9.2.1",
+    "@angular/platform-browser": "~9.1.3",
+    "@angular/platform-browser-dynamic": "~9.1.3",
+    "@angular/pwa": "~0.900.0-rc.7",
+    "@angular/router": "~9.1.3",
+    "@angular/service-worker": "~9.1.3",
     "@mdi/js": "5.8.55",
     "@ngx-formly/bootstrap": "5.5.6",
     "@ngx-formly/core": "5.5.6",
@@ -101,7 +98,6 @@
     "@types/progress": "2.0.3",
     "@types/q": "1.0.3",
     "@types/rimraf": "2.0.2",
-    "@types/sharp": "0.23.1",
     "@types/systeminformation": "3.23.0",
     "@types/vinyl": "2.0.2",
     "@types/watch": "1.0.0",
@@ -110,13 +106,13 @@
     "axios": "0.17.1",
     "babel-cli": "6.26.0",
     "babel-preset-env": "1.7.0",
-    "background-worker-process": "~0.0.27",
+    "background-worker-process": "~0.0.35",
     "bcryptjs": "2.4.3",
     "body-parser": "1.18.2",
     "bootstrap": "4.3.1",
-    "bs4-breakpoint": "~2.0.25",
+    "bs4-breakpoint": "~2.0.40",
     "buffer-shims": "1.0.0",
-    "button-dropdown": "~1.0.30",
+    "button-dropdown": "~1.0.45",
     "callsite-record": "4.1.3",
     "chai": "4.2.0",
     "chalk": "2.3.2",
@@ -134,7 +130,6 @@
     "core-js-compat": "3.4.0",
     "cors": "2.8.4",
     "cpr": "3.0.1",
-    "cpuid": "0.1.3",
     "cross-spawn": "7.0.3",
     "dateformat": "3.0.3",
     "detect-mocha": "0.1.0",
@@ -163,15 +158,15 @@
     "http-proxy": "1.16.2",
     "http-proxy-middleware": "0.19.1",
     "http-server": "0.11.1",
-    "incremental-compiler": "~1.1.29",
+    "incremental-compiler": "~1.1.53",
     "inquirer": "7.3.3",
     "inquirer-autocomplete-prompt": "1.3.0",
     "is-elevated": "3.0.0",
     "istanbul-instrumenter-loader": "2.0.0",
     "jasmine-core": "3.5.0",
     "jasmine-spec-reporter": "4.2.1",
     "json-stringify-safe": "5.0.1",
-    "json10": "~1.0.19",
+    "json10": "~1.0.34",
     "json5": "2.1.3",
     "json5-writer": "0.2.0",
     "karma": "5.0.0",
@@ -183,24 +178,24 @@
     "lnk": "1.0.1",
     "lockfile": "1.0.4",
     "lodash": "4.17.4",
-    "lodash-walk-object": "~1.0.20",
+    "lodash-walk-object": "~1.0.35",
     "lowdb": "1.0.0",
-    "magic-renamer": "~0.0.9",
+    "magic-renamer": "~0.0.20",
     "material-design-icons": "3.0.1",
     "method-override": "2.3.10",
     "minimist": "1.2.0",
     "mkdirp": "0.5.1",
     "mocha": "5.2.0",
     "moment": "2.22.2",
-    "morphi": "~4.0.22",
+    "morphi": "~4.0.54",
     "ng-modal-lib": "0.0.6",
     "ng-packagr": "5.7.1",
-    "ng-talkback": "~2.4.16",
+    "ng-talkback": "~2.4.25",
     "ng2-file-upload": "1.3.0",
-    "ng2-logger": "~5.0.16",
-    "ng2-rest": "~11.0.26",
-    "ng4-icons": "~0.0.21",
-    "ng4-modal": "~0.0.22",
+    "ng2-logger": "~8.0.20",
+    "ng2-rest": "~11.0.42",
+    "ng4-icons": "~0.0.30",
+    "ng4-modal": "~0.0.30",
     "ngx-bootstrap": "5.2.0",
     "ngx-breadcrumbs": "0.0.3",
     "ngx-editor": "4.1.0",
@@ -210,10 +205,9 @@
     "ngx-toastr": "11.2.1",
     "ngx-wig": "8.0.0",
     "node-cli-test": "0.0.2",
-    "node-cli-tester": "~0.0.9",
+    "node-cli-tester": "~0.0.22",
     "node-localstorage": "2.1.6",
     "node-notifier": "6.0.0",
-    "node-sass": "4.12.0",
     "nodemon": "1.14.11",
     "npm-get-dependents": "1.0.1",
     "npm-run": "4.1.2",
@@ -224,57 +218,53 @@
     "passport-http-bearer": "1.0.1",
     "password-hash": "1.2.2",
     "portfinder": "1.0.21",
+    "prettier": "2.3.2",
     "progress": "2.0.3",
     "prompts": "0.1.8",
     "protractor": "5.4.3",
     "ps-list": "6.1.0",
     "ps-node": "0.1.6",
     "q": "1.5.1",
     "randomcolor": "0.5.3",
-    "record-replay-req-res-scenario": "~0.0.18",
-    "redbird": "0.7.0",
+    "record-replay-req-res-scenario": "~0.0.26",
     "reflect-metadata": "0.1.10",
     "rimraf": "2.6.2",
-    "rxjs": "6.5.4",
-    "rxjs-compat": "6.5.3",
-    "sharp": "0.23.3",
+    "rxjs": "~6.5.4",
+    "rxjs-compat": "~6.5.3",
     "simple-git": "1.96.0",
     "sloc": "0.2.0",
     "socket.io": "2.4.1",
     "sort-package-json": "1.11.0",
-    "sqlite3": "4.0.9",
-    "static-columns": "~1.0.22",
+    "static-columns": "~2.0.17",
     "string-similarity": "4.0.2",
     "sudo-block": "3.0.0",
-    "svg-png-converter": "0.0.9",
     "systeminformation": "3.45.7",
     "task.js": "0.1.5",
-    "tnp-cli": "~0.0.16",
-    "tnp-config": "~0.0.67",
-    "tnp-core": "~0.0.36",
-    "tnp-db": "~0.0.27",
-    "tnp-helpers": "~0.0.37",
-    "tnp-models": "~0.0.28",
-    "tnp-tools": "~0.0.38",
-    "tnp-ui": "~0.0.25",
+    "tnp-cli": "~2.0.20",
+    "tnp-config": "~1.0.20",
+    "tnp-core": "~1.0.35",
+    "tnp-db": "~0.0.44",
+    "tnp-helpers": "~0.0.73",
+    "tnp-models": "~0.0.37",
+    "tnp-tools": "~0.0.46",
+    "tnp-ui": "~0.0.33",
     "ts-loader": "7.0.4",
     "ts-node": "8.3.0",
     "tsickle": "0.26.0",
-    "tslib": "2.2.0",
+    "tslib": "~2.2.0",
     "tslint": "6.1.0",
     "typeorm": "~0.2.7",
-    "typescript": "4.1.5",
-    "typescript-class-helpers": "~1.0.27",
-    "typescript-formatter": "7.2.2",
+    "typescript": "~4.1.5",
+    "typescript-class-helpers": "~1.0.42",
+    "typescript-formatter": "~7.2.2",
     "uglifyjs-webpack-plugin": "2.2.0",
     "underscore": "1.9.1",
     "uuid": "8.3.2",
     "validator": "9.2.0",
-    "vpn-split": "~0.0.9",
-    "wait.for": "0.6.6",
+    "vpn-split": "~0.0.18",
     "watch": "1.0.2",
-    "webpack-cli": "3.3.11",
-    "zone.js": "0.10.2"
+    "webpack-cli": "~3.3.11",
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {},
   "license": "MIT",

recent.json

@@ -1,5 +1,5 @@
 {
   "recentOpenProjects": [
-    "/Users/dariusz/projects/npm/pdf-in-browser-angular-nodejs"
+    "/Users/dfilipiak/projects/npm/pdf-in-browser-angular-nodejs"
   ]
 }