Skip to content

Commit 35a7c8e

Browse files
stuarthendrenstuarthendren
authored
Merge pull request #31 from commitd/cf-upgrade-all
Update dependencies
2 parents 7ade816 + b463b8a commit 35a7c8e

File tree

6 files changed

+4512
-3684
lines changed

6 files changed

+4512
-3684
lines changed

‎example/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
},
1515
"dependencies": {
1616
"@committed/gatsby-theme-docs": "^1.0.7",
17-
"gatsby": "^2.17.6",
18-
"gatsby-plugin-manifest": "^2.2.26",
19-
"react": "^16.11.0",
20-
"react-dom": "^16.11.0"
17+
"gatsby": "^2.21.9",
18+
"gatsby-plugin-manifest": "^2.4.1",
19+
"react": "^16.13.1",
20+
"react-dom": "^16.13.1"
2121
},
2222
"devDependencies": {
23-
"gh-pages": "^2.1.1"
23+
"gh-pages": "^2.2.0"
2424
}
2525
}

‎theme/gatsby-config.js‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = ({
55
header,
66
sidebar,
77
print,
8-
checkLinks = {}
8+
checkLinks = {},
99
}) => ({
1010
siteMetadata: {
1111
title: 'Docs',
@@ -16,41 +16,42 @@ module.exports = ({
1616
title: 'Docs',
1717
logo: { image: '', link: '/' },
1818
helpUrl: '',
19-
links: [{ text: '', link: '' }]
19+
links: [{ text: '', link: '' }],
2020
},
2121
header
2222
),
2323
sidebar: Object.assign(
2424
{
2525
ignoreIndex: true,
26-
links: [{ text: '', link: '' }]
26+
links: [{ text: '', link: '' }],
2727
},
2828
sidebar
2929
),
3030
print: Object.assign(
3131
{
3232
classification: null,
33-
reference: null
33+
reference: null,
3434
},
3535
print
36-
)
36+
),
3737
},
3838
plugins: [
3939
`gatsby-plugin-typescript`,
4040
`gatsby-plugin-material-ui`,
4141
`gatsby-plugin-react-helmet`,
42+
`gatsby-plugin-sharp`,
4243
{
4344
resolve: `gatsby-plugin-layout`,
4445
options: {
45-
component: require.resolve(`./src/layout/index.tsx`)
46-
}
46+
component: require.resolve(`./src/layout/index.tsx`),
47+
},
4748
},
4849
{
4950
resolve: `gatsby-source-filesystem`,
5051
options: {
5152
name: `docs`,
52-
path: docsPath
53-
}
53+
path: docsPath,
54+
},
5455
},
5556
{
5657
resolve: `gatsby-plugin-mdx`,
@@ -59,47 +60,47 @@ module.exports = ({
5960
remarkPlugins: [require('remark-slug'), require('remark-emoji')],
6061
gatsbyRemarkPlugins: [
6162
{
62-
resolve: require.resolve(`./plugins/fix-mermaid-pre`)
63+
resolve: require.resolve(`./plugins/fix-mermaid-pre`),
6364
},
6465
{
6566
resolve: 'gatsby-remark-mermaid',
6667
options: {
6768
mermaidOptions: {
6869
arrowMarkerAbsolute: false,
69-
fontFamily: "'trebuchet ms', verdana, arial"
70-
}
71-
}
70+
fontFamily: "'trebuchet ms', verdana, arial",
71+
},
72+
},
7273
},
7374
{
7475
resolve: `gatsby-remark-autolink-headers`,
7576
options: {
7677
icon: '',
77-
className: `autolink`
78-
}
78+
className: `autolink`,
79+
},
7980
},
8081
`gatsby-remark-prismjs`,
8182
{
8283
resolve: `gatsby-remark-images`,
8384
options: {
8485
maxWidth: 896,
85-
disableBgImage: true
86-
}
86+
disableBgImage: true,
87+
},
8788
},
8889
{
8990
resolve: `gatsby-remark-copy-linked-files`,
9091
options: {
91-
ignoreFileExtensions: [`png`, `jpg`, `jpeg`]
92-
}
92+
ignoreFileExtensions: [`png`, `jpg`, `jpeg`],
93+
},
9394
},
9495
{
95-
resolve: require.resolve(`./plugins/fix-mermaid-post`)
96+
resolve: require.resolve(`./plugins/fix-mermaid-post`),
9697
},
9798
{
9899
resolve: require.resolve(`./plugins/check-links`),
99-
options: checkLinks
100-
}
101-
]
102-
}
103-
}
104-
]
100+
options: checkLinks,
101+
},
102+
],
103+
},
104+
},
105+
],
105106
})

‎theme/package.json‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,40 +25,41 @@
2525
"singleQuote": true
2626
},
2727
"peerDependencies": {
28-
"gatsby": "^2.6.0",
29-
"react": "^16.11.0",
30-
"react-dom": "^16.11.0"
28+
"gatsby": "^2.21.9",
29+
"react": "^16.13.1",
30+
"react-dom": "^16.13.1"
3131
},
3232
"dependencies": {
33-
"@committed/components": "^1.0.1",
34-
"@committed/layout": "^1.0.0",
35-
"@material-ui/core": "^4.6.0",
36-
"@material-ui/icons": "^4.5.1",
37-
"@mdx-js/mdx": "^1.5.1",
38-
"@mdx-js/react": "^1.5.1",
33+
"@committed/components": "^3.0.0",
34+
"@committed/layout": "^1.1.0",
35+
"@material-ui/core": "^4.9.12",
36+
"@material-ui/icons": "^4.9.1",
37+
"@mdx-js/mdx": "^1.6.1",
38+
"@mdx-js/react": "^1.6.1",
3939
"gatsby-plugin-layout": "^1.3.0",
40-
"gatsby-plugin-material-ui": "^2.1.6",
41-
"gatsby-plugin-mdx": "^1.0.55",
42-
"gatsby-plugin-react-helmet": "^3.1.13",
43-
"gatsby-plugin-sharp": "^2.3.3",
44-
"gatsby-plugin-typescript": "^2.1.15",
45-
"gatsby-remark-autolink-headers": "^2.1.17",
46-
"gatsby-remark-copy-linked-files": "^2.1.28",
47-
"gatsby-remark-images": "^3.1.29",
40+
"gatsby-plugin-material-ui": "^2.1.8",
41+
"gatsby-plugin-mdx": "^1.2.4",
42+
"gatsby-plugin-react-helmet": "^3.3.0",
43+
"gatsby-plugin-sharp": "^2.6.0",
44+
"gatsby-plugin-typescript": "^2.4.0",
45+
"gatsby-remark-autolink-headers": "^2.3.0",
46+
"gatsby-remark-copy-linked-files": "^2.3.1",
47+
"gatsby-remark-images": "^3.3.0",
4848
"gatsby-remark-mermaid": "^1.2.0",
49-
"gatsby-remark-prismjs": "^3.3.21",
50-
"gatsby-source-filesystem": "^2.1.35",
49+
"gatsby-remark-prismjs": "^3.5.0",
50+
"gatsby-source-filesystem": "^2.3.0",
5151
"lodash.startcase": "^4.4.0",
52-
"prismjs": "^1.17.1",
53-
"react-helmet": "^5.2.1",
54-
"react-hotkeys-hook": "^1.5.3",
55-
"remark-emoji": "^2.0.2",
56-
"remark-slug": "^5.1.2",
57-
"typeface-dosis": "^0.0.72",
52+
"prismjs": "^1.20.0",
53+
"react-helmet": "^6.0.0",
54+
"react-hotkeys-hook": "^2.1.3",
55+
"remark-emoji": "^2.1.0",
56+
"remark-slug": "^6.0.0",
57+
"typeface-dosis": "^1.1.4",
5858
"typeface-lato": "^0.0.75"
5959
},
6060
"devDependencies": {
61-
"gatsby": "^2.17.10",
61+
"@types/react-helmet": "^5.0.15",
62+
"gatsby": "^2.21.9",
6263
"react": "^16.11.0",
6364
"react-dom": "^16.11.0"
6465
}

‎theme/src/components/SEO.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { graphql, useStaticQuery } from 'gatsby'
12
import React from 'react'
2-
import Helmet from 'react-helmet'
3-
import { useStaticQuery, graphql } from 'gatsby'
3+
import { Helmet } from 'react-helmet'
44

55
export interface SEOProps {
66
description?: string
@@ -29,31 +29,31 @@ export const SEO = ({ description = '', lang = 'en', meta = [], title }) => {
2929
return (
3030
<Helmet
3131
htmlAttributes={{
32-
lang
32+
lang,
3333
}}
3434
title={title}
3535
titleTemplate={`%s | ${site.siteMetadata.title}`}
3636
meta={[
3737
{
3838
property: `og:title`,
39-
content: title
39+
content: title,
4040
},
4141
{
4242
name: `description`,
43-
content: metaDescription
43+
content: metaDescription,
4444
},
4545
{
4646
name: `author`,
47-
content: site.siteMetadata.author
47+
content: site.siteMetadata.author,
4848
},
4949
{
5050
property: `og:description`,
51-
content: metaDescription
51+
content: metaDescription,
5252
},
5353
{
5454
property: `og:type`,
55-
content: `website`
56-
}
55+
content: `website`,
56+
},
5757
].concat(meta)}
5858
/>
5959
)

‎theme/src/layout/print.tsx‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import { Box, CodeStyle, ThemeProvider } from '@committed/components'
2+
import { graphql, navigate } from 'gatsby'
13
import React from 'react'
2-
import '../style/print.css'
3-
import '../style/mermaid.css'
4+
import { useHotkeys } from 'react-hotkeys-hook'
45
import 'typeface-dosis'
56
import 'typeface-lato'
6-
import { useHotkeys } from 'react-hotkeys-hook'
7-
import { graphql, navigate } from 'gatsby'
8-
import { Header } from '../print/Header'
97
import { Footer } from '../print/Footer'
8+
import { Header } from '../print/Header'
109
import { Printdown } from '../print/Printdown'
11-
import { ThemeProvider, CodeStyle, Box, Column } from '@committed/components'
10+
import '../style/mermaid.css'
11+
import '../style/print.css'
1212

1313
export default ({ pageContext, data }) => {
1414
useHotkeys('esc', () => navigate('/'))
@@ -19,16 +19,17 @@ export default ({ pageContext, data }) => {
1919
}, {})
2020
return (
2121
<ThemeProvider
22+
choice="light"
2223
fonts={{
2324
display: {
2425
fontFamily:
2526
'Dosis, "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif',
26-
fontWeight: 700
27+
fontWeight: 700,
2728
},
2829
text: {
2930
fontFamily:
30-
'Lato, -apple-system, BlinkMacSystemFont, "San Francisco", Roboto, "Segoe UI", "Helvetica Neue"'
31-
}
31+
'Lato, -apple-system, BlinkMacSystemFont, "San Francisco", Roboto, "Segoe UI", "Helvetica Neue"',
32+
},
3233
}}
3334
>
3435
<Header />
@@ -46,7 +47,7 @@ export default ({ pageContext, data }) => {
4647
<td>
4748
<Box bgcolor="white" p={3}>
4849
<CodeStyle>
49-
{pageContext.data.map(node => (
50+
{pageContext.data.map((node) => (
5051
<div style={{ breakAfter: 'page' }}>
5152
<Printdown key={node.id}>{docs[node.id]}</Printdown>
5253
</div>

0 commit comments

Comments
 (0)