test/postcat
1
0
Fork 0
mirror of https://gitee.com/eolink_admin/postcat.git synced 2024-11-30 10:47:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kungfuboy 2022-04-17 09:47:13 +08:00
parent 5932d38035
commit 8a1de0f342
2 changed files with 21 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

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

58
package.json
View File

@ -16,7 +16,7 @@
"start:workbench": "cd workbench/browser&&npm start", "start:workbench": "cd workbench/browser&&npm start",
"build:workbench": "cd workbench/browser&&npm run build", "build:workbench": "cd workbench/browser&&npm run build",
"install:market": "cd core/market/browser && npm install", "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", "build:market": "cd core/market/browser && npm run build",
"install:node-electron": "electron-builder install-app-deps", "install:node-electron": "electron-builder install-app-deps",
"electron:serve": "wait-on tcp:4200 && npm run electron:dev", "electron:serve": "wait-on tcp:4200 && npm run electron:dev",
@ -27,59 +27,35 @@
"electron:tsc": "tsc -p tsconfig.json" "electron:tsc": "tsc -p tsconfig.json"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "13.2.6", "@electron/remote": "2.0.8",
"@angular/common": "13.2.6", "cross-spawn": "^7.0.3",
"@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",
"dexie": "3.2.1", "dexie": "3.2.1",
"js-beautify": "1.14.0", "electron-log": "^4.4.6",
"ng-zorro-antd": "13.1.1", "electron-updater": "^4.6.5",
"ngx-ace-wrapper": "12.0.0", "resolve": "^1.22.0",
"qs": "6.10.3",
"rxjs": "7.5.5", "rxjs": "7.5.5",
"tslib": "^2.3.1", "content-disposition": "^0.5.4",
"zone.js": "~0.11.5" "crypto-js": "^4.1.1",
"form-data": "^4.0.0",
"iconv-lite": "^0.6.3",
"xml2js": "^0.4.23"
}, },
"devDependencies": { "devDependencies": {
"@angular-builders/custom-webpack": "13.1.0", "@types/cross-spawn": "6.0.2",
"@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/node": "17.0.21", "@types/node": "17.0.21",
"@typescript-eslint/eslint-plugin": "5.14.0", "@typescript-eslint/eslint-plugin": "5.14.0",
"@typescript-eslint/parser": "5.14.0", "@typescript-eslint/parser": "5.14.0",
"electron": "17.1.2", "electron": "17.1.2",
"electron-builder": "^22.14.13", "electron-builder": "^22.14.13",
"electron-reload": "1.5.0", "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", "npm-run-all": "4.1.5",
"ts-node": "10.7.0", "ts-node": "10.7.0",
"typescript": "~4.6.2", "typescript": "~4.6.2",
"wait-on": "6.0.1", "wait-on": "6.0.1"
"webdriver-manager": "12.1.8"
}, },
"engines": {
"node": ">=14.17.0"
},
"browserslist": [
"chrome 91"
],
"__npminstall_done": false "__npminstall_done": false
} }