diff --git a/content/docs/ref/ci.md b/content/docs/ref/ci.md index 5042e148..8c8ecdba 100644 --- a/content/docs/ref/ci.md +++ b/content/docs/ref/ci.md @@ -1,6 +1,6 @@ # Command Reference: `ci` -```bash +```usage cml ci [options] ``` @@ -25,6 +25,6 @@ Instead of wrangling with `git config user.email` before being able to `git commit` or use [`cml pr`](/doc/ref/pr), simply run: -```bash -cml ci +```cml +$ cml ci ``` diff --git a/gatsby-browser.js b/gatsby-browser.js index 16fbf506..6408214f 100644 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -1,5 +1,2 @@ /* eslint-env node */ - -const PageWrapper = require('./src/components/organisms/PageWrapper').default - -exports.wrapPageElement = PageWrapper +require('./src/styles/global.css') diff --git a/gatsby-config.js b/gatsby-config.js index 1d961d90..2b39cefc 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -24,10 +24,10 @@ const keywords = [ const plugins = [ { - resolve: `gatsby-plugin-typescript`, + resolve: '@dvcorg/gatsby-theme-iterative', options: { - isTSX: true, - allExtensions: true + remark: true, + cssBase: path.join('src', 'components', 'organisms', 'Page', 'base.css') } }, { @@ -38,17 +38,7 @@ const plugins = [ } } }, - 'gatsby-plugin-postcss', - 'gatsby-plugin-react-helmet', - 'gatsby-plugin-sitemap', `gatsby-plugin-theme-ui`, - { - resolve: 'gatsby-source-filesystem', - options: { - name: 'content', - path: path.join(__dirname, 'content') - } - }, { resolve: 'gatsby-source-filesystem', options: { @@ -56,65 +46,6 @@ const plugins = [ path: path.join(__dirname, 'static', 'img') } }, - { - resolve: 'gatsby-transformer-remark', - options: { - plugins: [ - 'gatsby-remark-embedder', - { - resolve: 'gatsby-remark-prismjs', - options: { - noInlineHighlight: true, - languageExtensions: [ - { - language: 'text', - definition: {} - } - ] - } - }, - { - resolve: 'gatsby-remark-smartypants', - options: { - quotes: false - } - }, - `gatsby-plugin-robots-txt`, - { - resolve: 'gatsby-remark-embed-gist', - options: { - includeDefaultCss: true - } - }, - 'gatsby-remark-relative-images', - 'gatsby-remark-copy-linked-files', - 'gatsby-remark-external-links', - { - resolve: 'gatsby-remark-autolink-headers', - options: { - enableCustomId: true, - isIconAfterHeader: true - } - }, - { - resolve: 'gatsby-remark-images', - options: { - maxWidth: 700, - withWebp: true, - quality: 90 - } - }, - 'gatsby-remark-responsive-iframe' - ] - } - }, - { - resolve: 'gatsby-plugin-svgr', - options: { - ref: true - } - }, - 'gatsby-plugin-sharp', 'gatsby-plugin-catch-links', { resolve: 'gatsby-plugin-manifest', @@ -238,8 +169,12 @@ module.exports = { description, author: 'Iterative', keywords, - siteUrl: 'https://cml.dev', - title + title, + siteUrl: process.env.HEROKU_APP_NAME + ? `https://${process.env.HEROKU_APP_NAME}.herokuapp.com` + : 'https://cml.dev', + twitterUsername: '@DVCorg', + titleTemplate: '%s | CML' }, developMiddleware: app => { app.use(redirectsMiddleware) diff --git a/gatsby-ssr.js b/gatsby-ssr.js index 766c9285..d1bd2e38 100644 --- a/gatsby-ssr.js +++ b/gatsby-ssr.js @@ -1,8 +1,6 @@ /* eslint-env node */ const React = require('react') -const PageWrapper = require('./src/components/organisms/PageWrapper').default - const onRenderBody = ({ setHeadComponents }) => { return setHeadComponents([