fix: fix package.json * .gitignore error in merge

.gitignore

@@ -1,18 +1,14 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/build/SetupScripts/nim/skin.zip
 dist/
 /tmp
 /out-tsc
 /app-builds
 /release
-app/*.js
-src/**/*.js
-!src/karma.conf.js
-!src/ng1/**/*.js
+*.js
 *.js.map
-pnpm-lock.yaml
+!core/market/browser/**/*.js
 
 # dependencies
 node_modules
@@ -34,7 +30,7 @@ node_modules
 !.vscode/extensions.json
 
 # misc
-/.angular/cache
+.angular/
 /.sass-cache
 /connect.lock
 /coverage
@@ -53,4 +49,4 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
-# *-lock.json
+# *-lock.json

package.json

@@ -16,7 +16,7 @@
     "start:workbench": "cd workbench/browser&&npm start",
     "build:workbench": "cd workbench/browser&&npm run build",
     "install:market": "cd core/market/browser && npm install",
-    "start1:market": "cd core/market/browser && npm run serve",
+    "start:market": "cd core/market/browser && npm run serve",
     "build:market": "cd core/market/browser && npm run build",
     "install:node-electron": "electron-builder install-app-deps",
     "electron:serve": "wait-on tcp:4200 && npm run electron:dev",
@@ -27,59 +27,35 @@
     "electron:tsc": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@angular/animations": "13.2.6",
-    "@angular/common": "13.2.6",
-    "@angular/compiler": "13.2.6",
-    "@angular/core": "13.2.6",
-    "@angular/forms": "13.2.6",
-    "@angular/language-service": "13.2.6",
-    "@angular/platform-browser": "13.2.6",
-    "@angular/platform-browser-dynamic": "13.2.6",
-    "@angular/router": "13.2.6",
-    "@angular/upgrade": "^13.2.6",
-    "@ngxs/store": "3.7.3",
-    "angular": "1.8.2",
-    "brace": "0.11.1",
+    "@electron/remote": "2.0.8",
+    "cross-spawn": "^7.0.3",
     "dexie": "3.2.1",
-    "js-beautify": "1.14.0",
-    "ng-zorro-antd": "13.1.1",
-    "ngx-ace-wrapper": "12.0.0",
-    "qs": "6.10.3",
+    "electron-log": "^4.4.6",
+    "electron-updater": "^4.6.5",
+    "resolve": "^1.22.0",
     "rxjs": "7.5.5",
-    "tslib": "^2.3.1",
-    "zone.js": "~0.11.5"
+    "content-disposition": "^0.5.4",
+    "crypto-js": "^4.1.1",
+    "form-data": "^4.0.0",
+    "iconv-lite": "^0.6.3",
+    "xml2js": "^0.4.23"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "13.1.0",
-    "@angular-devkit/build-angular": "13.2.6",
-    "@angular-eslint/builder": "13.1.0",
-    "@angular-eslint/eslint-plugin": "13.1.0",
-    "@angular-eslint/eslint-plugin-template": "13.1.0",
-    "@angular-eslint/schematics": "13.1.0",
-    "@angular-eslint/template-parser": "13.1.0",
-    "@angular/cli": "13.2.6",
-    "@angular/compiler-cli": "13.2.6",
-    "@ngx-translate/core": "14.0.0",
-    "@ngx-translate/http-loader": "7.0.0",
-    "@types/jasmine": "3.10.3",
-    "@types/jasminewd2": "2.0.10",
+    "@types/cross-spawn": "6.0.2",
     "@types/node": "17.0.21",
     "@typescript-eslint/eslint-plugin": "5.14.0",
     "@typescript-eslint/parser": "5.14.0",
     "electron": "17.1.2",
     "electron-builder": "^22.14.13",
     "electron-reload": "1.5.0",
+    "eslint": "8.10.0",
+    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-jsdoc": "37.9.7",
+    "eslint-plugin-prefer-arrow": "1.2.3",
     "npm-run-all": "4.1.5",
     "ts-node": "10.7.0",
     "typescript": "~4.6.2",
-    "wait-on": "6.0.1",
-    "webdriver-manager": "12.1.8"
+    "wait-on": "6.0.1"
   },
-  "engines": {
-    "node": ">=14.17.0"
-  },
-  "browserslist": [
-    "chrome 91"
-  ],
   "__npminstall_done": false
 }