refactor prism code

Author: Laurie Barth

packages/gatsby-plugin-theme-ui/gatsby-node.js

@@ -1,8 +1,8 @@
 const prismPresetDictionary = {
-  'dracula': '@theme-ui/prism/presets/dracula.json',
+  dracula: '@theme-ui/prism/presets/dracula.json',
   'duotone-dark': '@theme-ui/prism/presets/duotone-dark.json',
   'duotone-light': '@theme-ui/prism/presets/duotone-light.json',
-  'github': '@theme-ui/prism/presets/github.json',
+  github: '@theme-ui/prism/presets/github.json',
   'night-owl-light': '@theme-ui/prism/presets/night-owl-light.json',
   'night-owl': '@theme-ui/prism/presets/night-owl.json',
   'oceanic-next': '@theme-ui/prism/presets/oceanic-next.json',
@@ -12,30 +12,27 @@ const prismPresetDictionary = {
   'prism-solarizedlight': '@theme-ui/prism/presets/prism-solarizedlight.json',
   'prism-tomorrow': '@theme-ui/prism/presets/prism-tomorrow.json',
   'prism-twilight': '@theme-ui/prism/presets/prism-twilight.json',
-  'prism': '@theme-ui/prism/presets/prism.json',
-  'shades-or-purple': '@theme-ui/prism/presets/shades-or-purple.json',
+  prism: '@theme-ui/prism/presets/prism.json',
+  'shades-of-purple': '@theme-ui/prism/presets/shades-of-purple.json',
   'theme-ui': '@theme-ui/prism/presets/theme-ui.json',
-  'ultramin': '@theme-ui/prism/presets/ultramin.json',
+  ultramin: '@theme-ui/prism/presets/ultramin.json',
   'vs-dark': '@theme-ui/prism/presets/vs-dark.json',
 }
 
 exports.onPreInit = (__, options) => {
-    let {themeModulePath} = options
-    if(themeModulePath) {
-        options.themeModulePath = require(themeModulePath)
-    }
-
-    if(prismPreset in prismPresetDictionary) {
-      prismPreset = prismPresetDictionary[prismPreset]
-    }
+  if (prismPreset in prismPresetDictionary) {
+    prismPreset = prismPresetDictionary[prismPreset]
+  }
 
-    if(prismPreset) {
-      try {
-        options.prismPreset = require(prismPreset)
-      } catch {
-        reporter.error(`It appears the prism dependency is not installed. Try running \`${generateInstallInstructions()}\n\n${prismPreset}\``)
-      }
+  if (prismPreset) {
+    try {
+      options.prismPreset = require(prismPreset)
+    } catch {
+      reporter.error(
+        `It appears the prism dependency is not installed. Try running \`${generateInstallInstructions()}\n\n${prismPreset}\``
+      )
     }
+  }
 }
 
 function generateInstallInstructions() {
@@ -44,48 +41,41 @@ function generateInstallInstructions() {
   const packageMangerConfigKey = `cli.packageManager`
   const PACKAGE_MANGER = getConfigStore().get(packageMangerConfigKey) || `yarn`
 
-  const installKeyWord = PACKAGE_MANGER === `yarn` ? "add" : "install"
+  const installKeyWord = PACKAGE_MANGER === `yarn` ? 'add' : 'install'
 
   return `${PACKAGE_MANGER} ${installKeyWord}`
 }
 
 exports.createSchemaCustomization = ({ actions }) => {
-    const { createTypes } = actions
-  
-    createTypes(`
+  const { createTypes } = actions
+
+  createTypes(`
       type ThemeUiConfig implements Node {
-        themeModule: JSON,
-        themeModulePath: JSON,
-        moduleExportName: String,
         prismPreset: JSON,
       }
     `)
+}
+
+exports.sourceNodes = (
+  { actions, createContentDigest },
+  { prismPreset = {} }
+) => {
+  const { createNode } = actions
+
+  const themeUiConfig = {
+    prismPreset,
   }
-  
-  exports.sourceNodes = (
-    { actions, createContentDigest },
-    { prismPreset, moduleExportName = 'default', themeModule, themeModulePath}
-  ) => {      
-    const { createNode } = actions
-  
-    const themeUiConfig = {
-        themeModule,
-        themeModulePath,
-        moduleExportName,
-        prismPreset
-    }
-  
-    createNode({
-      ...themeUiConfig,
-      id: `gatsby-plugin-theme-ui-config`,
-      parent: null,
-      children: [],
-      internal: {
-        type: `ThemeUiConfig`,
-        contentDigest: createContentDigest(themeUiConfig),
-        content: JSON.stringify(themeUiConfig),
-        description: `Options for gatsby-plugin-theme-ui`,
-      },
-    })
-  } 
 
+  createNode({
+    ...themeUiConfig,
+    id: `gatsby-plugin-theme-ui-config`,
+    parent: null,
+    children: [],
+    internal: {
+      type: `ThemeUiConfig`,
+      contentDigest: createContentDigest(themeUiConfig),
+      content: JSON.stringify(themeUiConfig),
+      description: `Options for gatsby-plugin-theme-ui`,
+    },
+  })
+}

packages/gatsby-plugin-theme-ui/src/hooks/configOptions.js

@@ -1,12 +1,9 @@
-import { useStaticQuery, graphql } from "gatsby"
+import { useStaticQuery, graphql } from 'gatsby'
 
 const useThemeUiConfig = () => {
   const data = useStaticQuery(graphql`
     query {
       themeUiConfig(id: { eq: "gatsby-plugin-theme-ui-config" }) {
-        themeModule
-        themeModulePath
-        moduleExportName
         prismPreset
       }
     }
@@ -15,4 +12,4 @@ const useThemeUiConfig = () => {
   return data.themeUiConfig
 }
 
-export default useThemeUiConfig
+export default useThemeUiConfig

packages/gatsby-plugin-theme-ui/src/provider.js

@@ -6,34 +6,19 @@ import useThemeUiConfig from './hooks/configOptions'
 
 const Root = ({ children }) => {
   const themeUiConfig = useThemeUiConfig()
-  const { themeModule, themeModulePath, moduleExportName } = themeUiConfig
+  const { prismPreset } = themeUiConfig
 
-  let themeWrapper
-  if (themeModule) {
-    themeWrapper = themeModule
-  }
-
-  if (themeModulePath) {
-    themeWrapper = themeModulePath
-  }
-
-  if (themeWrapper && moduleExportName in themeWrapper) {
-    themeWrapper = themeWrapper[moduleExportName]
-  }
-
-  if (prismPreset) {
-    themeWrapper = merge(themeWrapper, {
+  const themeWithPrism = merge(
+    {},
+    {
       styles: {
-        pre: {
-          ...prismPreset,
-        },
+        pre: prismPreset,
       },
-    })
-  }
+    }
+  )
+
+  themeWrapper = merge(themeWithPrism, theme)
 
-  themeWrapper = merge(themeWrapper, {
-    ...theme,
-  })
   return (
     <ThemeProvider theme={themeWrapper} components={components}>
       {children}