Skip to content

Commit

Permalink
Merge pull request #162 from caorushizi/feat/dependencies
Browse files Browse the repository at this point in the history
feat: ✨  update dependencies
  • Loading branch information
caorushizi authored May 26, 2024
2 parents ccf17b6 + 3c78808 commit 31dd5d2
Show file tree
Hide file tree
Showing 7 changed files with 1,235 additions and 1,631 deletions.
32 changes: 18 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,29 +33,33 @@
}
},
"devDependencies": {
"@commitlint/cli": "^18.6.0",
"@commitlint/config-conventional": "^18.6.0",
"@commitlint/cz-commitlint": "^18.6.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@waline/client": "^3.1.3",
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@commitlint/cz-commitlint": "^19.2.0",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0",
"@waline/client": "^3.2.0",
"commitizen": "^4.3.0",
"cross-env": "^7.0.3",
"cspell": "^8.3.2",
"cz-git": "^1.8.0",
"eslint": "^8.56.0",
"cspell": "^8.8.3",
"cz-git": "^1.9.1",
"eslint": "^9.3.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"husky": "^9.0.10",
"husky": "^9.0.11",
"prettier": "3.2.5",
"tsx": "^4.7.1",
"vitepress": "1.0.1",
"vue": "^3.4.15",
"zx": "^7.2.3"
"tsx": "^4.11.0",
"vitepress": "1.2.2",
"vue": "^3.4.27",
"zx": "^8.1.1"
},
"pnpm": {
"patchedDependencies": {
"@cliqz/[email protected]": "patches/@[email protected]"
}
},
"dependencies": {
"@commitlint/core": "^19.3.0",
"@commitlint/format": "^19.3.0"
}
}
2 changes: 1 addition & 1 deletion packages/main/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"node-pty": "^1.0.0"
},
"devDependencies": {
"electron": "30.0.6"
"electron": "30.0.8"
}
}
50 changes: 25 additions & 25 deletions packages/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,59 +20,59 @@
"license": "MIT",
"devDependencies": {
"@electron/rebuild": "^3.6.0",
"@rushstack/eslint-patch": "^1.7.0",
"@rushstack/eslint-patch": "^1.10.3",
"@types/fs-extra": "^11.0.4",
"@types/gulp": "^4.0.17",
"@types/lodash": "^4.14.202",
"@types/lodash": "^4.17.4",
"@types/mime-types": "^2.1.4",
"@types/node": "^20.11.5",
"@types/node": "^20.12.12",
"@types/node-fetch": "^2.6.11",
"@types/semver": "^7.5.6",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"@types/semver": "^7.5.8",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"consola": "^3.2.3",
"cross-env": "^7.0.3",
"del": "^7.1.0",
"dotenv": "^16.3.2",
"electron": "30.0.6",
"electron-builder": "^24.9.1",
"electron-updater": "^6.1.7",
"esbuild": "^0.19.11",
"dotenv": "^16.4.5",
"electron": "30.0.8",
"electron-builder": "^24.13.3",
"electron-updater": "^6.1.8",
"esbuild": "^0.21.4",
"esbuild-register": "^3.5.0",
"eslint": "^8.56.0",
"eslint": "^9.3.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard-with-typescript": "^43.0.1",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-n": "16.6.2",
"eslint-plugin-n": "17.7.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "6.1.1",
"gulp": "^5.0.0",
"prebuild-install": "^7.1.1",
"prebuild-install": "^7.1.2",
"prettier": "3.2.5",
"semver": "^7.5.4",
"typescript": "^5.3.3"
"semver": "^7.6.2",
"typescript": "^5.4.5"
},
"dependencies": {
"@cliqz/adblocker-electron": "^1.27.3",
"@cliqz/adblocker-electron-preload": "^1.27.3",
"axios": "^1.6.5",
"better-sqlite3": "^9.3.0",
"axios": "^1.7.2",
"better-sqlite3": "^10.0.0",
"cheerio": "1.0.0-rc.12",
"dayjs": "^1.11.10",
"dayjs": "^1.11.11",
"electron-devtools-installer": "^3.2.0",
"electron-is-dev": "^3.0.1",
"electron-log": "^5.0.3",
"electron-store": "^8.1.0",
"execa": "^8.0.1",
"electron-log": "^5.1.5",
"electron-store": "^9.0.0",
"execa": "^9.1.0",
"fs-extra": "^11.2.0",
"inversify": "^6.0.2",
"lint-staged": "^15.2.2",
"lint-staged": "^15.2.5",
"lodash": "^4.17.21",
"mime-types": "^2.1.35",
"node-fetch": "^3.3.2",
"node-pty": "^1.0.0",
"reflect-metadata": "^0.2.1",
"reflect-metadata": "^0.2.2",
"strip-ansi": "^7.1.0",
"typeorm": "0.3.17"
"typeorm": "0.3.20"
}
}
4 changes: 2 additions & 2 deletions packages/main/src/services/DownloadService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ export default class DownloadService extends EventEmitter {

async stopTask(id: number) {
if (this.signal[id]) {
this.logger.info(`taskId: ${id} stop`);
this.signal[id].abort();
}
}
Expand Down Expand Up @@ -186,15 +185,16 @@ export default class DownloadService extends EventEmitter {
);
this.emit("download-success", task.id);
} catch (err: any) {
this.logger.info(`taskId: ${task.id} failed`);
if (err.message === "AbortError") {
this.logger.info(`taskId: ${task.id} stopped`);
// 下载暂停
await this.videoRepository.changeVideoStatus(
task.id,
DownloadStatus.Stopped,
);
this.emit("download-stop", task.id);
} else {
this.logger.info(`taskId: ${task.id} failed`);
// 下载失败
await this.videoRepository.changeVideoStatus(
task.id,
Expand Down
24 changes: 12 additions & 12 deletions packages/plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@
},
"dependencies": {
"jquery": "^3.7.1",
"lit": "^3.1.2",
"nanoid": "^5.0.4"
"lit": "^3.1.3",
"nanoid": "^5.0.7"
},
"devDependencies": {
"@types/jquery": "^3.5.29",
"@types/node": "^20.11.5",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"eslint": "^8.56.0",
"@types/jquery": "^3.5.30",
"@types/node": "^20.12.12",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0",
"eslint": "^9.3.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"lint-staged": "^15.2.2",
"lint-staged": "^15.2.5",
"prettier": "3.2.5",
"stylelint": "^16.2.1",
"stylelint": "^16.6.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-config-standard-scss": "^13.0.0",
"typescript": "^5.3.3",
"vite": "^5.0.12"
"stylelint-config-standard-scss": "^13.1.0",
"typescript": "^5.4.5",
"vite": "^5.2.11"
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": "eslint",
Expand Down
64 changes: 32 additions & 32 deletions packages/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,54 +12,54 @@
"lint-staged": "lint-staged"
},
"dependencies": {
"@ant-design/icons": "^5.2.6",
"@ant-design/pro-components": "^2.6.48",
"@reduxjs/toolkit": "^2.0.1",
"@ant-design/icons": "^5.3.7",
"@ant-design/pro-components": "^2.7.9",
"@reduxjs/toolkit": "^2.2.5",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"ahooks": "^3.7.8",
"antd": "^5.13.2",
"antd-style": "^3.6.1",
"axios": "^1.6.5",
"ahooks": "^3.8.0",
"antd": "^5.17.3",
"antd-style": "^3.6.2",
"axios": "^1.7.2",
"classnames": "^2.5.1",
"dayjs": "^1.11.10",
"i18next": "^23.8.2",
"i18next-browser-languagedetector": "^7.2.0",
"lint-staged": "^15.2.2",
"dayjs": "^1.11.11",
"i18next": "^23.11.5",
"i18next-browser-languagedetector": "^8.0.0",
"lint-staged": "^15.2.5",
"localforage": "^1.10.0",
"match-sorter": "^6.3.3",
"nanoid": "^5.0.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-i18next": "^14.0.1",
"react-redux": "^9.1.0",
"react-router-dom": "^6.21.3",
"match-sorter": "^6.3.4",
"nanoid": "^5.0.7",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-i18next": "^14.1.2",
"react-redux": "^9.1.2",
"react-router-dom": "^6.23.1",
"sort-by": "^1.2.0"
},
"devDependencies": {
"@types/node": "^20.11.5",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/node": "^20.12.12",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-redux": "^7.1.33",
"@types/sort-by": "^1.2.3",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "6.21.0",
"@vitejs/plugin-react-swc": "^3.5.0",
"eslint": "^8.56.0",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "7.10.0",
"@vitejs/plugin-react-swc": "^3.7.0",
"eslint": "^9.3.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard-with-typescript": "^43.0.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-n": "^17.7.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react": "^7.34.1",
"prettier": "3.2.5",
"sass": "^1.70.0",
"stylelint": "^16.2.1",
"sass": "^1.77.2",
"stylelint": "^16.6.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-config-standard-scss": "^13.0.0",
"typescript": "~5.3.3",
"vite": "^5.0.12",
"stylelint-config-standard-scss": "^13.1.0",
"typescript": "~5.4.5",
"vite": "^5.2.11",
"vite-bundle-visualizer": "^1.2.1"
},
"license": "MIT",
Expand Down
Loading

0 comments on commit 31dd5d2

Please sign in to comment.