From 4e9d2352f80711a8da90a67b296b02471c9f2adf Mon Sep 17 00:00:00 2001
From: Pedro Guzman <peterlgh7@gmail.com>
Date: Mon, 9 Jun 2025 15:24:44 +0200
Subject: [PATCH] restore base schema in cleanAndMergeSchema in case modules
 define their own schemas

---
 packages/core/modules-sdk/src/medusa-app.ts            | 10 ++++++++--
 .../modules/index/src/utils/base-graphql-schema.ts     |  1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/core/modules-sdk/src/medusa-app.ts b/packages/core/modules-sdk/src/medusa-app.ts
index e626f851d3..77131903d6 100644
--- a/packages/core/modules-sdk/src/medusa-app.ts
+++ b/packages/core/modules-sdk/src/medusa-app.ts
@@ -231,8 +231,14 @@ function isMedusaModule(mod) {
 }
 
 function cleanAndMergeSchema(loadedSchema) {
-  const { schema: cleanedSchema, notFound } =
-    GraphQLUtils.cleanGraphQLSchema(loadedSchema)
+  const defaultMedusaSchema = `
+    scalar DateTime
+    scalar JSON
+    directive @enumValue(value: String) on ENUM_VALUE
+  `
+  const { schema: cleanedSchema, notFound } = GraphQLUtils.cleanGraphQLSchema(
+    defaultMedusaSchema + loadedSchema
+  )
   const mergedSchema = GraphQLUtils.mergeTypeDefs(cleanedSchema)
   return {
     schema: GraphQLUtils.makeExecutableSchema({ typeDefs: mergedSchema }),
diff --git a/packages/modules/index/src/utils/base-graphql-schema.ts b/packages/modules/index/src/utils/base-graphql-schema.ts
index c07e804ec1..2a29024b99 100644
--- a/packages/modules/index/src/utils/base-graphql-schema.ts
+++ b/packages/modules/index/src/utils/base-graphql-schema.ts
@@ -3,5 +3,4 @@ export const baseGraphqlSchema = `
     scalar Date
     scalar Time
     scalar JSON
-    directive @enumValue(value: String) on ENUM_VALUE
 `