fix: custom content type prefix option now actually affects the gener…

…ated content type names and not only the schema
gatsbyjs · Oct 13, 2023 · c0a0ba5 · c0a0ba5
1 parent 8cfe253
commit c0a0ba5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/packages/gatsby-source-contentful/src/__tests__/gatsby-node.js b/packages/gatsby-source-contentful/src/__tests__/gatsby-node.js
@@ -674,13 +674,29 @@ describe(`gatsby-node`, () => {
 
     expect(schema.buildObjectType).not.toHaveBeenCalledWith(
       expect.objectContaining({
-        name: `ContentfulPerson`,
+        name: `ContentfulContentTypePerson`,
       })
     )
 
     expect(schema.buildObjectType).not.toHaveBeenCalledWith(
       expect.objectContaining({
-        name: `ContentfulBlogPost`,
+        name: `ContentfulContentTypeBlogPost`,
+      })
+    )
+
+    expect(actions.createNode).not.toHaveBeenCalledWith(
+      expect.objectContaining({
+        internal: expect.objectContaining({
+          type: `ContentfulContentTypeBlogPost`,
+        }),
+      })
+    )
+
+    expect(actions.createNode).not.toHaveBeenCalledWith(
+      expect.objectContaining({
+        internal: expect.objectContaining({
+          type: `ContentfulContentTypePerson`,
+        }),
       })
     )
   })

diff --git a/packages/gatsby-source-contentful/src/normalize.ts b/packages/gatsby-source-contentful/src/normalize.ts
@@ -554,6 +554,7 @@ export const createNodesForContentType = ({
   const markdownFields: MarkdownFieldDefinition = new Map(
     pluginConfig.get(`markdownFields`)
   )
+  const contentTypePrefix: string = pluginConfig.get(`contentTypePrefix`)
 
   // Establish identifier for content type
   //  Use `name` if specified, otherwise, use internal id (usually a natural-language constant,
@@ -784,7 +785,7 @@ export const createNodesForContentType = ({
           parent: contentTypeItemId,
           children: [],
           internal: {
-            type: makeTypeName(contentTypeItemId),
+            type: makeTypeName(contentTypeItemId, contentTypePrefix),
             // The content of an entry is guaranteed to be updated if and only if the .sys.updatedAt field changed
             contentDigest: entryItem.sys.updatedAt,
           },