restore base schema in cleanAndMergeSchema in case modules define their own schemas
This commit is contained in:
@@ -231,8 +231,14 @@ function isMedusaModule(mod) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function cleanAndMergeSchema(loadedSchema) {
|
function cleanAndMergeSchema(loadedSchema) {
|
||||||
const { schema: cleanedSchema, notFound } =
|
const defaultMedusaSchema = `
|
||||||
GraphQLUtils.cleanGraphQLSchema(loadedSchema)
|
scalar DateTime
|
||||||
|
scalar JSON
|
||||||
|
directive @enumValue(value: String) on ENUM_VALUE
|
||||||
|
`
|
||||||
|
const { schema: cleanedSchema, notFound } = GraphQLUtils.cleanGraphQLSchema(
|
||||||
|
defaultMedusaSchema + loadedSchema
|
||||||
|
)
|
||||||
const mergedSchema = GraphQLUtils.mergeTypeDefs(cleanedSchema)
|
const mergedSchema = GraphQLUtils.mergeTypeDefs(cleanedSchema)
|
||||||
return {
|
return {
|
||||||
schema: GraphQLUtils.makeExecutableSchema({ typeDefs: mergedSchema }),
|
schema: GraphQLUtils.makeExecutableSchema({ typeDefs: mergedSchema }),
|
||||||
|
|||||||
@@ -3,5 +3,4 @@ export const baseGraphqlSchema = `
|
|||||||
scalar Date
|
scalar Date
|
||||||
scalar Time
|
scalar Time
|
||||||
scalar JSON
|
scalar JSON
|
||||||
directive @enumValue(value: String) on ENUM_VALUE
|
|
||||||
`
|
`
|
||||||
|
|||||||
Reference in New Issue
Block a user