Skip to content

Commit

Permalink
feat: upgrade everything
Browse files Browse the repository at this point in the history
  • Loading branch information
gregberge committed Jan 21, 2019
1 parent 7877f1b commit d07d8fd
Show file tree
Hide file tree
Showing 14 changed files with 1,040 additions and 2,192 deletions.
2 changes: 2 additions & 0 deletions browser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* eslint-disable */
module.exports = require('./lib/browser')
55 changes: 28 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,52 +22,53 @@
"smooth-code-landers": ">=1.0.0"
},
"dependencies": {
"@mdx-js/mdx": "^0.16.5",
"@mdx-js/tag": "^0.16.1",
"@mdx-js/mdx": "^0.16.6",
"@mdx-js/tag": "^0.16.6",
"@smooth-ui/core-sc": "^8.0.1",
"babel-plugin-styled-components": "^1.9.0",
"babel-plugin-styled-components": "^1.10.0",
"fs-extra": "^7.0.1",
"gatsby-image": "^2.0.20",
"gatsby-mdx": "^0.2.0",
"gatsby-plugin-google-analytics": "^2.0.7",
"gatsby-plugin-manifest": "^2.0.10",
"gatsby-image": "^2.0.26",
"gatsby-mdx": "^0.3.5",
"gatsby-plugin-google-analytics": "^2.0.9",
"gatsby-plugin-manifest": "^2.0.13",
"gatsby-plugin-meta-redirect": "^1.1.1",
"gatsby-plugin-react-helmet": "^3.0.2",
"gatsby-plugin-react-helmet": "^3.0.5",
"gatsby-plugin-resolve-src": "^2.0.0-beta.1",
"gatsby-plugin-robots-txt": "^1.3.0",
"gatsby-plugin-sharp": "^2.0.13",
"gatsby-plugin-sharp": "^2.0.17",
"gatsby-plugin-styled-components": "^3.0.3",
"gatsby-plugin-web-font-loader": "^1.0.4",
"gatsby-remark-highlights": "^1.3.4",
"gatsby-source-filesystem": "^2.0.9",
"gatsby-transformer-sharp": "^2.1.4",
"github-slugger": "^1.2.0",
"gatsby-source-filesystem": "^2.0.16",
"gatsby-transformer-sharp": "^2.1.10",
"github-slugger": "^1.2.1",
"mdast-util-to-string": "^1.0.5",
"polished": "^2.3.0",
"react": "^16.6.3",
"react-dom": "^16.6.3",
"polished": "^2.3.3",
"prism-react-renderer": "^0.1.5",
"prismjs": "^1.15.0",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-helmet": "^5.2.0",
"styled-components": "^4.1.1",
"styled-components": "^4.1.3",
"unist-util-visit": "^1.4.0"
},
"devDependencies": {
"@babel/cli": "^7.1.5",
"@babel/core": "^7.1.6",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-syntax-jsx": "^7.0.0",
"@babel/cli": "^7.2.3",
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-class-properties": "^7.2.3",
"@babel/plugin-syntax-jsx": "^7.2.0",
"babel-eslint": "^10.0.1",
"conventional-github-releaser": "^3.1.2",
"eslint": "^5.9.0",
"eslint": "^5.12.1",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-config-prettier": "^3.3.0",
"eslint-config-prettier": "^3.6.0",
"eslint-config-smooth": "^1.1.1",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-react": "^7.11.1",
"gatsby": "^2.0.59",
"prettier": "^1.15.2",
"smooth-code-landers": "^1.2.0",
"eslint-plugin-react": "^7.12.4",
"gatsby": "^2.0.91",
"prettier": "^1.16.0",
"smooth-code-landers": "^1.2.2",
"standard-version": "^4.4.0"
}
}
8 changes: 8 additions & 0 deletions src/browser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react'
import { RootWrapper } from './components/RootWrapper'

export function getGatsbyBrowser() {
return {
wrapRootElement: ({ element }) => <RootWrapper>{element}</RootWrapper>,
}
}
21 changes: 9 additions & 12 deletions src/components/BaseLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { WebsiteHeader } from './WebsiteHeader'
import { ProjectHeader } from './ProjectHeader'
import { GlobalStyle } from './GlobalStyle'
import { Head } from './Head'
import { ThemeProvider } from './ThemeProvider'

const Headers = styled.div`
position: fixed;
Expand All @@ -27,15 +26,13 @@ const PageWrapper = styled.div`
`

export const BaseLayout = ({ children, pageContext, variant = 'default' }) => (
<ThemeProvider>
<div>
<GlobalStyle />
<Head pageContext={pageContext} />
<Headers>
<WebsiteHeader />
<ProjectHeader />
</Headers>
<PageWrapper variant={variant}>{children}</PageWrapper>
</div>
</ThemeProvider>
<div>
<GlobalStyle />
<Head pageContext={pageContext} />
<Headers>
<WebsiteHeader />
<ProjectHeader />
</Headers>
<PageWrapper variant={variant}>{children}</PageWrapper>
</div>
)
30 changes: 30 additions & 0 deletions src/components/Code.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from 'react'
import Prism from 'prismjs'
import Highlight, { defaultProps } from 'prism-react-renderer'
import './code-theme.css'

const theme = null

export function Code({ children, lang = 'markup' }) {
return (
<Highlight
{...defaultProps}
Prism={Prism}
theme={theme}
code={children.trim()}
language={lang}
>
{({ className, style, tokens, getLineProps, getTokenProps }) => (
<pre className={className} style={style}>
{tokens.map((line, i) => (
<div {...getLineProps({ line, key: i })}>
{line.map((token, key) => (
<span {...getTokenProps({ token, key })} />
))}
</div>
))}
</pre>
)}
</Highlight>
)
}
1 change: 0 additions & 1 deletion src/components/GlobalStyle.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'
import { createGlobalStyle, th, Normalize } from '@smooth-ui/core-sc'
import '../style/editor.css'

const LocalGlobalStyle = createGlobalStyle`
html, body {
Expand Down
45 changes: 45 additions & 0 deletions src/components/RootWrapper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import React from 'react'
import { MDXProvider } from '@mdx-js/tag'
import { th, styled, down, css } from '@smooth-ui/core-sc'
import { ThemeProvider } from './ThemeProvider'
import { Code } from './Code'

const Editor = styled.div`
background-color: ${th('gray100')};
color: ${th('editorTextColor')};
padding: 15px 20px;
margin: 25px -20px;
overflow: auto;
font-size: 14px;
line-height: 1.45;
border-radius: 3px;
${down(
'sm',
css`
margin-left: -20px;
margin-right: -20px;
border-radius: 0;
`,
)}
`

const components = {
pre: ({ children: { props } }) => {
// props is for MDXTag, props.props is for code element
const lang = props.props.className && props.props.className.split('-')[1]
return (
<Editor>
<Code lang={lang} {...props} />
</Editor>
)
},
}

export function RootWrapper({ children }) {
return (
<ThemeProvider>
<MDXProvider components={components}>{children}</MDXProvider>
</ThemeProvider>
)
}
183 changes: 183 additions & 0 deletions src/components/code-theme.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
/*
Name: Duotone Space
Author: Simurai, adapted from DuoTone themes for Atom (http://simurai.com/projects/2016/01/01/duotone-themes)
Conversion: Bram de Haan (http://atelierbram.github.io/Base2Tone-prism/output/prism/prism-base2tone-space-dark.css)
Generated with Base16 Builder (https://github.com/base16-builder/base16-builder)
*/

code[class*='language-'],
pre[class*='language-'] {
font-family: Consolas, Menlo, Monaco, 'Andale Mono WT', 'Andale Mono',
'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono',
'Bitstream Vera Sans Mono', 'Liberation Mono', 'Nimbus Mono L',
'Courier New', Courier, monospace;
font-size: 14px;
line-height: 1.375;
direction: ltr;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;

-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;

-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
background: #24242e;
color: #767693;
}

pre[class*='language-']::-moz-selection,
pre[class*='language-'] ::-moz-selection,
code[class*='language-']::-moz-selection,
code[class*='language-'] ::-moz-selection {
text-shadow: none;
background: #5151e6;
}

pre[class*='language-']::selection,
pre[class*='language-'] ::selection,
code[class*='language-']::selection,
code[class*='language-'] ::selection {
text-shadow: none;
background: #5151e6;
}

/* Code blocks */
pre[class*='language-'] {
padding: 1em;
margin: 0.5em 0;
overflow: auto;
}

/* Inline code */
:not(pre) > code[class*='language-'] {
padding: 0.1em;
border-radius: 0.3em;
}

.token.comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: #5b5b76;
}

.token.punctuation {
color: #5b5b76;
}

.token.namespace {
opacity: 0.7;
}

.token.tag,
.token.operator,
.token.number {
color: #dd672c;
}

.token.property,
.token.function {
color: #767693;
}

.token.tag-id,
.token.selector,
.token.atrule-id {
color: #ebebff;
}

code.language-javascript,
.token.attr-name {
color: #aaaaca;
}

code.language-css,
code.language-scss,
.token.boolean,
.token.string,
.token.entity,
.token.url,
.language-css .token.string,
.language-scss .token.string,
.style .token.string,
.token.attr-value,
.token.keyword,
.token.control,
.token.directive,
.token.unit,
.token.statement,
.token.regex,
.token.atrule {
color: #fe8c52;
}

.token.placeholder,
.token.variable {
color: #fe8c52;
}

.token.deleted {
text-decoration: line-through;
}

.token.inserted {
border-bottom: 1px dotted #ebebff;
text-decoration: none;
}

.token.italic {
font-style: italic;
}

.token.important,
.token.bold {
font-weight: bold;
}

.token.important {
color: #aaaaca;
}

.token.entity {
cursor: help;
}

pre > code.highlight {
outline: 0.4em solid #7676f4;
outline-offset: 0.4em;
}

/* overrides color-values for the Line Numbers plugin
* http://prismjs.com/plugins/line-numbers/
*/
.line-numbers .line-numbers-rows {
border-right-color: #262631;
}

.line-numbers-rows > span:before {
color: #393949;
}

/* overrides color-values for the Line Highlight plugin
* http://prismjs.com/plugins/line-highlight/
*/
.line-highlight {
background: rgba(221, 103, 44, 0.2);
background: -webkit-linear-gradient(
left,
rgba(221, 103, 44, 0.2) 70%,
rgba(221, 103, 44, 0)
);
background: linear-gradient(
to right,
rgba(221, 103, 44, 0.2) 70%,
rgba(221, 103, 44, 0)
);
}
Loading

0 comments on commit d07d8fd

Please sign in to comment.