Handle scoped packages

gatsbyjs · Aug 31, 2019 · b8bec09 · b8bec09
1 parent 270a02a
commit b8bec09
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/gatsby/src/schema/schema.js b/packages/gatsby/src/schema/schema.js
@@ -290,6 +290,8 @@ const addTypes = ({ schemaComposer, types, parentSpan }) => {
   })
 }
 
+const GATSBY_THEME = /^(?:@\w+\/)?gatsby-theme-/
+
 const mergeTypes = ({
   schemaComposer,
   typeComposer,
@@ -306,8 +308,7 @@ const mergeTypes = ({
     !plugin ||
     plugin.name === typeOwner ||
     plugin.name === `default-site-plugin` ||
-    (plugin.name.startsWith(`gatsby-theme-`) &&
-      !typeOwner.startsWith(`gatsby-theme-`))
+    (plugin.name.match(GATSBY_THEME) && !typeOwner.match(GATSBY_THEME))
   ) {
     typeComposer.merge(type)
     if (isNamedTypeComposer(type)) {