Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/convert to theme #26

Merged
merged 3 commits into from Dec 4, 2019
Merged

Feature/convert to theme #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
648fd56
Move almost all plugins to gatsby-theme-xdmorgan
xdmorgan Nov 5, 2019
7ca16ee
Continue conversion
xdmorgan Nov 6, 2019
7a44ed3
Update theme version to add testing-library/react
xdmorgan Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 .example.env.development → .example.env
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions .prettierrc
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions gatsby-browser.js
View file
Open in desktop

This file was deleted.

157 changes: 37 additions & 120 deletions gatsby-config.js
View file
Open in desktop
@@ -1,132 +1,49 @@
require('dotenv').config({
path: `.env.${process.env.NODE_ENV}`,
})
require('dotenv').config()

module.exports = {
siteMetadata: {
// site meta description
description: process.env.SITE_META_DESCRIPTION || '',
// site meta keywords
keywords: (process.env.SITE_META_KEYWORDS || '').split(', '),
// site logo (meta json schema)
logo: process.env.SITE_META_LOGO || '',
// organization name (meta json schema)
organization: process.env.SITE_META_ORGANIZATION || '',
// Base page title
title: process.env.SITE_META_TITLE || '',
// twitter card user attribution
twitter: process.env.SITE_META_TWITTER || '',
// fkn base url
url: process.env.SITE_META_URL || '',
},
siteMetadata: {},
plugins: [
`gatsby-plugin-layout`,
/**
* Typescript
* ------------------------------------------------------------------------
*/
`gatsby-plugin-typescript`,

/**
* Sources
* ------------------------------------------------------------------------
*/

{
resolve: `gatsby-source-filesystem`,
resolve: 'gatsby-theme-xdmorgan',
options: {
name: `images`,
path: `${__dirname}/src/images`,
},
},
{
resolve: `gatsby-source-filesystem`,
options: {
name: `posts`,
path: `${__dirname}/src/content/posts`,
},
},
{
resolve: `gatsby-transformer-remark`,
options: {
plugins: [`gatsby-remark-images`],
},
},
{
resolve: `gatsby-plugin-mdx`,
options: {
gatsbyRemarkPlugins: [
gtag: process.env.UA_TRACKING_ID,
gfonts: ['IBM Plex Sans:400,700', 'Montserrat:700'],
filesystem: [
{
name: `images`,
path: `${__dirname}/src/images`,
},
{
resolve: `gatsby-remark-images`,
options: {
maxWidth: 1200,
linkImagesToOriginal: false,
},
name: `posts`,
path: `${__dirname}/src/content/posts`,
},
],
},
}
/**
* Images
* ------------------------------------------------------------------------
*/,

`gatsby-transformer-sharp`,
`gatsby-plugin-sharp`,

/**
* Styling
* ------------------------------------------------------------------------
*/

`gatsby-plugin-postcss`, // global
{
resolve: `gatsby-plugin-styled-components`, // components
options: {}, // Add any options here
},
{
resolve: `gatsby-plugin-google-fonts`,
options: {
fonts: ['IBM Plex Sans:400,700', 'Montserrat:700'],
},
},
/**
* SEO
* ------------------------------------------------------------------------
*/
`gatsby-plugin-react-helmet`,
{
resolve: `gatsby-plugin-google-gtag`,
options: {
trackingIds: [process.env.UA_TRACKING_ID],
},
gtagConfig: {
anonymize_ip: true,
cookie_expires: 0,
},
},

/**
* PWA
* ------------------------------------------------------------------------
* this (optional) plugin enables Progressive Web App + Offline functionality
* To learn more, visit: https://gatsby.app/offline
* ------------------------------------------------------------------------
*/
{
resolve: `gatsby-plugin-manifest`,
options: {
name: `Dan Morgan // UI Engineer`,
short_name: `Dan Morgan`,
start_url: `/`,
background_color: `#2b2b31`,
theme_color: `#0068fa`,
display: `minimal-ui`,
icon: `src/images/avatar.png`,
manifest: {
name: `Dan Morgan // UI Engineer`,
short_name: `Dan Morgan`,
start_url: `/`,
background_color: `#2b2b31`,
theme_color: `#0068fa`,
display: `minimal-ui`,
icon: `src/images/avatar.png`,
},
seo: {
// site meta description
description: process.env.SITE_META_DESCRIPTION || '',
// site meta keywords
keywords: (process.env.SITE_META_KEYWORDS || '').split(', '),
// site logo (meta json schema)
logo: process.env.SITE_META_LOGO || '',
// organization name (meta json schema)
organization: process.env.SITE_META_ORGANIZATION || '',
// Base page title
title: process.env.SITE_META_TITLE || '',
// twitter card user attribution
twitter: process.env.SITE_META_TWITTER || '',
// fkn base url
url: process.env.SITE_META_URL || '',
},
},
},
// ...(process.env.NODE_ENV !== 'development'
// ? ['gatsby-plugin-offline']
// : []),
],
}
7 changes: 0 additions & 7 deletions gatsby-ssr.js
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions jest.config.js
View file
Open in desktop

This file was deleted.

46 changes: 3 additions & 43 deletions package.json
View file
Open in desktop
Expand Up @@ -8,44 +8,13 @@
"node": "^12.0.0"
},
"dependencies": {
"@mdx-js/mdx": "^1.1.6",
"@mdx-js/react": "^1.1.6",
"@types/react-helmet": "^5.0.9",
"@types/styled-components": "^4.1.18",
"babel-plugin-styled-components": "^1.10.6",
"classnames": "^2.2.6",
"cssnano": "^4.1.10",
"dotenv": "^8.0.0",
"gatsby": "^2.13.50",
"gatsby-image": "^2.2.8",
"gatsby-plugin-google-fonts": "^1.0.1",
"gatsby-plugin-google-gtag": "^1.1.4",
"gatsby-plugin-layout": "^1.1.2",
"gatsby-plugin-manifest": "^2.2.4",
"gatsby-plugin-mdx": "^1.0.23",
"gatsby-plugin-offline": "^2.2.4",
"gatsby-plugin-postcss": "^2.1.2",
"gatsby-plugin-react-helmet": "^3.1.3",
"gatsby-plugin-sharp": "^2.2.9",
"gatsby-plugin-styled-components": "^3.1.2",
"gatsby-plugin-typescript": "^2.1.2",
"gatsby-remark-images": "^3.1.17",
"gatsby-source-filesystem": "^2.1.8",
"gatsby-transformer-remark": "^2.6.18",
"gatsby-transformer-sharp": "^2.2.5",
"postcss-import": "^12.0.1",
"postcss-nested": "^4.1.2",
"postcss-preset-env": "^6.7.0",
"gatsby-theme-xdmorgan": "^1.0.8",
"prism-react-renderer": "^0.1.7",
"prismjs": "^1.17.1",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-helmet": "^5.2.1",
"styled-components": "^4.3.2",
"stylelint": "^10.1.0",
"stylelint-config-standard": "^18.3.0",
"typescript": "^3.5.3"
"react-dom": "^16.8.6"
},
"keywords": [
"gatsby",
Expand All @@ -63,16 +32,7 @@
"test": "jest"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-preset-gatsby": "^0.1.6",
"http-server": "^0.11.1",
"identity-obj-proxy": "^3.0.0",
"jest": "^23.6.0",
"prettier": "^1.15.2",
"react-test-renderer": "^16.7.0",
"ts-jest": "^23.10.5"
"http-server": "^0.11.1"
},
"repository": {
"type": "git",
Expand Down
19 changes: 0 additions & 19 deletions postcss.config.js
View file
Open in desktop

This file was deleted.