Skip to content

Commit

Permalink
Bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
felixmosh committed Aug 26, 2021
1 parent 37bbf51 commit f1a1c63
Show file tree
Hide file tree
Showing 6 changed files with 2,732 additions and 3,839 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"@babel/runtime": "^7.14.0",
"@types/bull": "^3.15.1",
"@types/ioredis": "^4.26.4",
"@types/jest": "^26.0.23",
"@types/node": "^15.6.1",
"@types/jest": "^27.0.1",
"@types/node": "^16.7.2",
"@types/redis-info": "^3.0.0",
"@types/supertest": "^2.0.10",
"@typescript-eslint/eslint-plugin": "^4.25.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"devDependencies": {
"@types/bull": "^3.15.1",
"@types/node": "^15.6.1",
"@types/node": "^16.7.2",
"bullmq": "^1.28.0",
"ioredis-mock": "^5.5.7",
"redis-mock": "^0.56.3"
Expand Down
24 changes: 5 additions & 19 deletions packages/api/src/queueAdapters/bullMQ.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
import { Job, Queue } from 'bullmq';
import {
JobCleanStatus,
JobCounts,
JobStatus,
QueueAdapterOptions,
} from '../../typings/app';
import { JobCleanStatus, JobCounts, JobStatus, QueueAdapterOptions } from '../../typings/app';
import { BaseAdapter } from './base';

export class BullMQAdapter extends BaseAdapter {
private readonly LIMIT = 1000;

constructor(
private queue: Queue,
options: Partial<QueueAdapterOptions> = {}
) {
constructor(private queue: Queue, options: Partial<QueueAdapterOptions> = {}) {
super(options);
}

Expand All @@ -27,25 +19,19 @@ export class BullMQAdapter extends BaseAdapter {
}

public clean(jobStatus: JobCleanStatus, graceTimeMs: number): Promise<void> {
return this.queue.clean(graceTimeMs, this.LIMIT, jobStatus);
return this.queue.clean(graceTimeMs, this.LIMIT, jobStatus).then(() => undefined);
}

public getJob(id: string): Promise<Job | undefined> {
return this.queue.getJob(id);
}

public getJobs(
jobStatuses: JobStatus[],
start?: number,
end?: number
): Promise<Job[]> {
public getJobs(jobStatuses: JobStatus[], start?: number, end?: number): Promise<Job[]> {
return this.queue.getJobs(jobStatuses, start, end);
}

public getJobCounts(...jobStatuses: JobStatus[]): Promise<JobCounts> {
return (this.queue.getJobCounts(
...jobStatuses
) as unknown) as Promise<JobCounts>;
return this.queue.getJobCounts(...jobStatuses) as unknown as Promise<JobCounts>;
}

public getJobLogs(id: string): Promise<string[]> {
Expand Down
22 changes: 11 additions & 11 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"@bull-board/api": "3.5.2"
},
"devDependencies": {
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@radix-ui/react-alert-dialog": "^0.0.19",
"@radix-ui/react-dropdown-menu": "^0.0.22",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.0-rc.5",
"@radix-ui/react-alert-dialog": "^0.0.20",
"@radix-ui/react-dropdown-menu": "^0.0.23",
"@types/pretty-bytes": "^5.2.0",
"@types/react-dom": "^17.0.5",
"@types/react-highlight": "^0.12.2",
Expand All @@ -42,14 +42,14 @@
"clean-webpack-plugin": "^4.0.0-alpha.0",
"clsx": "^1.1.1",
"copy-webpack-plugin": "^9.0.0",
"css-loader": "^5.2.6",
"css-minimizer-webpack-plugin": "^2.0.0",
"date-fns": "2.21.3",
"css-loader": "^6.2.0",
"css-minimizer-webpack-plugin": "^3.0.2",
"date-fns": "2.23.0",
"fork-ts-checker-webpack-plugin": "^6.2.10",
"highlight.js": "^10.7.1",
"highlight.js": "^11.2.0",
"html-webpack-plugin": "^5.3.1",
"mini-css-extract-plugin": "^1.6.0",
"postcss-loader": "^5.3.0",
"mini-css-extract-plugin": "^2.2.0",
"postcss-loader": "^6.1.1",
"postcss-preset-env": "^6.7.0",
"pretty-bytes": "5.6.0",
"react": "17.0.2",
Expand All @@ -58,10 +58,10 @@
"react-refresh": "^0.10.0",
"react-router-dom": "^5.2.0",
"react-toastify": "^7.0.4",
"style-loader": "^2.0.0",
"style-loader": "^3.2.1",
"webpack": "^5.38.0",
"webpack-cli": "^4.7.0",
"webpack-dev-server": "^3.11.0"
"webpack-dev-server": "^4.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
7 changes: 4 additions & 3 deletions packages/ui/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,11 @@ module.exports = {
'*': 'http://localhost:3000',
},
compress: true,
writeToDisk: true,
hot: true,
port: devServerPort,
open: true,
openPage: 'ui',
open: ['/ui'],
devMiddleware: {
writeToDisk: true,
},
},
};
Loading

0 comments on commit f1a1c63

Please sign in to comment.