Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

build: upgrade apollo and graphql #72

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2,032 changes: 652 additions & 1,380 deletions packages/express/package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion packages/express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"main": "dist/index.js",
"dependencies": {
"@bull-monitor/root": "^5.2.0",
"apollo-server-express": "^3.6.3"
"@apollo/server": "^4.0.0",
"graphql": "^16.7.1"
},
"peerDependencies": {
"express": "4.x"
Expand Down
17 changes: 9 additions & 8 deletions packages/express/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { BullMonitor } from '@bull-monitor/root';
import { ApolloServer } from 'apollo-server-express';
import Express from 'express';
import { ApolloServerPluginDrainHttpServer } from 'apollo-server-core';
import type { Server as HttpServer } from 'http';
import { ApolloServer } from '@apollo/server';
import { startStandaloneServer } from '@apollo/server/standalone';
import { expressMiddleware } from '@apollo/server/express4';
import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer';

const expressVersion = require('express/package.json').version;
const defaultInitParams = {
Expand All @@ -14,7 +16,7 @@ export type InitParams = {
httpServer?: HttpServer;
};

export class BullMonitorExpress extends BullMonitor<ApolloServer> {
export class BullMonitorExpress extends BullMonitor<ApolloServer, any> {
public router: Express.Router;
async init({
disableBodyParser,
Expand All @@ -30,11 +32,10 @@ export class BullMonitorExpress extends BullMonitor<ApolloServer> {
ApolloServer,
httpServer && [ApolloServerPluginDrainHttpServer({ httpServer })]
);
await this.server.start();
this.server.applyMiddleware({
app: router as Express.Express,
bodyParserConfig,
});
await startStandaloneServer(this.server);

(router as Express.Express).use('/', expressMiddleware(this.server, {}));

this.router = router;
}
}
Loading