Skip to content

Commit ebf2828

Browse files
fix: apollo server merge custom config
1 parent 68d84e2 commit ebf2828

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/routes/apollo-server.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
/*
2-
This file Copy from 'https://github.com/apollo-server-integrations/apollo-server-integration-h3/blob/main/src/index.ts'
3-
4-
There is a bug, after it is fixed, the will be used again
5-
6-
*/
7-
81
import type { BaseContext } from '@apollo/server'
2+
import { importedConfig } from '#nitro-internal-virtual/graphql-config'
93
import { defs } from '#nitro-internal-virtual/server-defs'
104
import { resolvers } from '#nitro-internal-virtual/server-resolvers'
115
import { ApolloServer } from '@apollo/server'
126
import { ApolloServerPluginLandingPageLocalDefault } from '@apollo/server/plugin/landingPage/default'
137
// TODO: fix bug
148
// import { startServerAndCreateH3Handler } from '@as-integrations/h3'
159
import { mergeResolvers, mergeTypeDefs } from '@graphql-tools/merge'
10+
import defu from 'defu'
1611
import { startServerAndCreateH3Handler } from '../utils/apollo'
1712

1813
function createMergedSchema() {
@@ -38,14 +33,14 @@ function createApolloServer() {
3833
if (!apolloServer) {
3934
const { typeDefs, resolvers: mergedResolvers } = createMergedSchema()
4035

41-
apolloServer = new ApolloServer<BaseContext>({
36+
apolloServer = new ApolloServer<BaseContext>(defu({
4237
typeDefs,
4338
resolvers: mergedResolvers,
4439
introspection: true,
4540
plugins: [
4641
ApolloServerPluginLandingPageLocalDefault({ embed: true }),
4742
],
48-
})
43+
}, importedConfig))
4944
}
5045
return apolloServer
5146
}

src/utils/apollo.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/*
2+
This file Copy from 'https://github.com/apollo-server-integrations/apollo-server-integration-h3/blob/main/src/index.ts'
3+
4+
There is a bug, after it is fixed, the will be used again
5+
6+
*/
7+
18
import type {
29
ApolloServer,
310
BaseContext,

0 commit comments

Comments
 (0)