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

docs: fix IE11 issues #4009

Merged
merged 1 commit into from
Jul 30, 2020
Merged

docs: fix IE11 issues #4009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 4 additions & 30 deletions docs/src/components/CodeSnippet/CodeSnippet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import _ from 'lodash'
import * as Prism from 'prismjs/components/prism-core'
import prettier from 'prettier/standalone'
import babel from 'prettier/parser-babel'
import html from 'prettier/parser-html'
import PropTypes from 'prop-types'
import React from 'react'

Expand All @@ -16,19 +13,6 @@ import 'prismjs/components/prism-jsx'

import CodeSnippetLabel from './CodeSnippetLabel'

const prettierConfig = {
htmlWhitespaceSensitivity: 'ignore',
printWidth: 100,
tabWidth: 2,
semi: false,
singleQuote: true,
trailingComma: 'all',
plugins: {
babel,
html,
},
}

const normalizeToString = (value) => {
if (Array.isArray(value)) {
return value.join('\n')
Expand All @@ -37,22 +21,12 @@ const normalizeToString = (value) => {
return _.isObject(value) ? JSON.stringify(value, null, 2) : value
}

export const prettifyCode = (code, parser) => {
const formatted = prettier.format(code, {
...prettierConfig,
// a narrower print width is more friendly to doc examples
parser,
})

return formatted.replace(/^;</m, '<') // remove beginning semi in JSX/HTML
}

const formatters = {
bash: (val = '') => val.replace(/^[\w]/gm, '$$ $&'),
json: (val) => prettifyCode(val, 'json'),
js: (val = '') => prettifyCode(val, 'babel'),
jsx: (val = '') => prettifyCode(val, 'babel'),
html: (val = '') => prettifyCode(val, 'html'),
json: (val) => val,
js: (val = '') => val,
jsx: (val = '') => val,
html: (val = '') => val,
}

export const formatCode = (code, mode) => {
Expand Down
9 changes: 1 addition & 8 deletions docs/src/components/Document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const Document = ({ Body, children, Head, Html, siteData: { dev, versions } }) =
/>

<script src='https://cdn.jsdelivr.net/npm/core-js-bundle/minified.js' />
<script src='https://polyfill.io/v3/polyfill.min.js?features=IntersectionObserver' />
<script
src={`https://cdnjs.cloudflare.com/ajax/libs/anchor-js/${versions.anchor}/anchor.min.js`}
/>
Expand All @@ -29,14 +30,6 @@ const Document = ({ Body, children, Head, Html, siteData: { dev, versions } }) =
/>
<script src={`https://cdn.jsdelivr.net/faker.js/${versions.faker}/faker.min.js`} />

<script
crossOrigin='true'
src={`https://cdn.jsdelivr.net/npm/prettier@${versions.prettier}/standalone.min.js`}
/>
<script
crossOrigin='true'
src={`https://cdn.jsdelivr.net/combine/npm/prettier@${versions.prettier}/parser-babel.min.js,npm/prettier@${versions.prettier}/parser-html.min.js`}
/>
<script
src={`https://cdnjs.cloudflare.com/ajax/libs/prop-types/${versions.propTypes}/prop-types${
siteData.dev ? '' : '.min'
Expand Down
4 changes: 3 additions & 1 deletion docs/src/utils/formatCode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import prettier from 'prettier/standalone'
import babel from 'prettier/parser-babel'

import prettierConfig from '../../../.prettierrc.json'
import isBrowser from '../../../src/lib/isBrowser'

Expand All @@ -21,7 +23,7 @@ const formatCode = isBrowser()
...prettierConfig,
printWidth,
parser,
plugins: window.prettierPlugins,
plugins: { babel },
})

return formatted.replace(/^;</, '<') // remove beginning semi in JSX/HTML
Expand Down
1 change: 0 additions & 1 deletion static.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export default {
standalone: require('@babel/standalone/package.json').version,
},
faker: require('faker/package.json').version,
prettier: require('prettier/package.json').version,
propTypes: require('prop-types/package.json').version,
prismjs: require('prismjs/package.json').version,
react: require('react/package.json').version,
Expand Down
6 changes: 1 addition & 5 deletions static.webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ export default (webpackConfig, { stage }) => ({
'anchor-js': 'AnchorJS',
'@babel/standalone': 'Babel',
faker: 'faker',
'prettier/standalone': 'prettier',
// These Prettier plugins are available under window.prettierPlugins
'prettier/parser-babel': 'prettierPlugins.babel',
'prettier/parser-html': 'prettierPlugins.html',

'prop-types': 'PropTypes',
react: 'React',
'react-dom': 'ReactDOM',
Expand All @@ -43,6 +38,7 @@ export default (webpackConfig, { stage }) => ({
path.resolve(__dirname, 'node_modules/chalk'),
path.resolve(__dirname, 'node_modules/debug'),
path.resolve(__dirname, 'node_modules/leven'),
path.resolve(__dirname, 'node_modules/prettier'),

path.resolve(__dirname, 'docs'),
path.resolve(__dirname, 'src'),
Expand Down