clean up based on changes to base preset PR

Author: Laurie Barth

packages/gatsby-plugin-theme-ui/README.md

@@ -20,13 +20,8 @@ prevent a flash of unstyled colors when using color modes.
 
 | Key                      | Default value    | Description                                                                      |
 | ------------------------ | ---------------- | -------------------------------------------------------------------------------- |
-| `themeModule`               | `null`            | JSON theme object, use the `require` syntax to include it in options. Make sure the package you're requiring is installed in your dependencies.               |
-| `themeModulePath`            | `null`  | A string package name that the plugin will require for you. Make sure the package you're requiring is installed in your dependencies.                                                             |
-| `moduleExportName`              | `default` | The name of the export from the theme module, applies to `themeModule` or `themeModulePath` resolution depending which one you're using    |
 | `prismPreset`              | `null` | The name of the preset you'd like to use to style code blocks inside your markdown files. The available presets can be found in the [theme-ui docs](https://theme-ui.com/packages/prism/). You can also use a package string of your own choosing. |
 
-> Note that if your theme is exported at the top level, the `moduleExportName` of `default` is bypassed. See [theme-ui/preset-deep](https://github.com/system-ui/theme-ui/blob/master/packages/preset-deep/src/index.ts).
-
 The theme module you include in options is considered your base theme. Any further customization and shadowing will be merged with it. 
 
 ### Using options
@@ -37,8 +32,6 @@ module.exports = {
   plugins: [
     { resolve: 'gatsby-plugin-theme-ui',
       options: {
-        themeModulePath: '@theme-ui/preset-funk',
-        // or themeModule: require('@theme-ui/preset-funk')
         prismPreset: 'night-owl'
       }
     }],

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

@@ -9,24 +9,11 @@ exports.onPreInit = ({ reporter }, options) => {
     try {
       options.prismPreset = require(prismPreset)
     } catch {
-      reporter.error(
-        `It appears the prism dependency is not installed. Try running \`${generateInstallInstructions()}\n\n${prismPreset}\``
-      )
+      reporter.warn(`It appears the prism dependency is not installed.`)
     }
   }
 }
 
-function generateInstallInstructions() {
-  const { getConfigStore } = require(`gatsby-core-utils`)
-
-  const packageMangerConfigKey = `cli.packageManager`
-  const PACKAGE_MANGER = getConfigStore().get(packageMangerConfigKey) || `yarn`
-
-  const installKeyWord = PACKAGE_MANGER === `yarn` ? 'add' : 'install'
-
-  return `${PACKAGE_MANGER} ${installKeyWord}`
-}
-
 exports.createSchemaCustomization = ({ actions }) => {
   const { createTypes } = actions
 

packages/gatsby-plugin-theme-ui/package.json

@@ -6,8 +6,7 @@
   "license": "MIT",
   "peerDependencies": {
     "gatsby": "^2.13.1",
-    "theme-ui": "^0.3.0",
-    "gatsby-core-utils": "^1.2.0"
+    "theme-ui": "^0.3.0"
   },
   "keywords": [
     "gatsby",

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

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import { jsx, ThemeProvider, merge } from 'theme-ui'
-import theme from './index'
+import localTheme from './index'
 import components from './components'
 import useThemeUiConfig from './hooks/configOptions'
 
@@ -17,7 +17,7 @@ const Root = ({ children }) => {
     }
   )
 
-  const fullTheme = merge(themeWithPrism, theme)
+  const fullTheme = merge(themeWithPrism, localTheme)
 
   return (
     <ThemeProvider theme={fullTheme} components={components}>

packages/gatsby-plugin-theme-ui/utils/preset-dictionary.js

@@ -9,6 +9,7 @@ module.exports = {
   'prism-coy': '@theme-ui/prism/presets/prism-coy.json',
   'prism-dark': '@theme-ui/prism/presets/prism-dark.json',
   'prism-funky': '@theme-ui/prism/presets/prism-funky.json',
+  'prism-okaidia': '@theme-ui/prism/presets/prism-okaidia.json',
   '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',