From 30a9390597045f7137c8422708d84ef4a22fb99d Mon Sep 17 00:00:00 2001 From: Nicholas Eduardo Date: Thu, 26 Jul 2018 10:44:48 -0300 Subject: [PATCH 01/19] fix: change link on readme (#168) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cf1dbb923..e1f22c9a5 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ If you need some help you can chat with us on [our Discord server](https://disco This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. - + ### πŸ™πŸ»   Backers From 18798bc3e5342cfbd8332aaa23939e801d99e138 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sat, 28 Jul 2018 00:33:25 -0300 Subject: [PATCH 02/19] fix(docz): humanize array type of flow (fix #167) --- packages/docz/src/utils/humanize-prop.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/docz/src/utils/humanize-prop.ts b/packages/docz/src/utils/humanize-prop.ts index f98d1b474..ed42fd9ea 100644 --- a/packages/docz/src/utils/humanize-prop.ts +++ b/packages/docz/src/utils/humanize-prop.ts @@ -16,6 +16,8 @@ const getTypeStr = (type: PropType | FlowType): any => { return type.value ? type.value.map((t: any) => `${getTypeStr(t)}`).join(' β”‚ ') : type.raw + case 'array': + return type.raw case 'arrayof': return `Array<${getTypeStr(type.value)}>` case 'custom': From 0f8aa56ef2a75fd9106f1c2999bc14489b36a97c Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sat, 28 Jul 2018 01:24:29 -0300 Subject: [PATCH 03/19] fix(docz-theme-default): get fullscreen from localstorage --- packages/docz-theme-default/package.json | 2 ++ .../src/components/ui/Render/index.tsx | 25 ++++++++----------- yarn.lock | 6 +++++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/packages/docz-theme-default/package.json b/packages/docz-theme-default/package.json index dd43f3bd6..d0c400437 100644 --- a/packages/docz-theme-default/package.json +++ b/packages/docz-theme-default/package.json @@ -27,6 +27,7 @@ "emotion-theming": "^9.2.6", "facepaint": "^1.2.1", "hotkeys-js": "^3.3.5", + "lodash.get": "^4.4.2", "match-sorter": "^2.2.3", "polished": "^1.9.3", "prop-types": "15.6.2", @@ -47,6 +48,7 @@ "react-dom": "^16.2.0" }, "devDependencies": { + "@types/lodash.get": "^4.4.4", "@types/react": "^16.4.6", "@types/react-dom": "^16.0.6", "babel-plugin-emotion": "^9.2.6", diff --git a/packages/docz-theme-default/src/components/ui/Render/index.tsx b/packages/docz-theme-default/src/components/ui/Render/index.tsx index 34d7a3501..3b73f20fa 100644 --- a/packages/docz-theme-default/src/components/ui/Render/index.tsx +++ b/packages/docz-theme-default/src/components/ui/Render/index.tsx @@ -6,6 +6,7 @@ import Minimize from 'react-feather/dist/icons/minimize' import Resizable from 're-resizable' import hotkeys from 'hotkeys-js' import styled from 'react-emotion' +import getIn from 'lodash.get' import { ResizeBar } from './ResizeBar' import { Handle, HANDLE_SIZE } from './Handle' @@ -41,6 +42,7 @@ const Wrapper = styled('div')` ` const Playground = styled('div')` + overflow-y: hidden; flex: 1; background: ${p => p.theme.colors.background}; border: 1px solid ${p => p.theme.colors.border}; @@ -60,9 +62,9 @@ const remove = (pos: number): void => storage.remove(pos.toString()) const set = (pos: number, size: string): void => storage.set(pos.toString(), size) -const parseSize = (position: number) => (key: string) => { +const parse = (position: number, key: string, defaultValue: any) => { const obj = JSON.parse(get(position)) - return obj ? obj[key] : '100%' + return obj ? getIn(obj, key) : defaultValue } export interface RenderState { @@ -73,9 +75,9 @@ export interface RenderState { export class Render extends Component { public state: RenderState = { - fullscreen: Boolean(get(this.props.position)), - width: parseSize(this.props.position)('width'), - height: parseSize(this.props.position)('height'), + fullscreen: parse(this.props.position, 'fullscreen', false), + width: parse(this.props.position, 'width', '100%'), + height: parse(this.props.position, 'height', '100%'), } public componentDidMount(): void { @@ -176,8 +178,6 @@ export class Render extends Component { } } - private isFullscreen = (position: number) => Boolean(get(position)) - private setSize = () => { const { fullscreen, ...state } = this.state set(this.props.position, JSON.stringify(state)) @@ -190,15 +190,10 @@ export class Render extends Component { if (fullscreen) remove(position) else this.setSize() - const isFull = this.isFullscreen(position) - const parse = parseSize(position) - const width = parse('width') - const height = parse('height') - this.setState({ - fullscreen: isFull, - width, - height, + fullscreen: parse(position, 'fullscreen', false), + width: parse(position, 'width', '100%'), + height: parse(position, 'height', '100%'), }) } diff --git a/yarn.lock b/yarn.lock index 4fc2ae484..c3232a1b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1355,6 +1355,12 @@ dependencies: "@types/lodash" "*" +"@types/lodash.get@^4.4.4": + version "4.4.4" + resolved "https://registry.npmjs.org/@types/lodash.get/-/lodash.get-4.4.4.tgz#34b67841594e4ddc8853341d65e971a38cb4e2f0" + dependencies: + "@types/lodash" "*" + "@types/lodash@*": version "4.14.108" resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.108.tgz#02656af3add2e5b3174f830862c47421c00ef817" From 56ad7718a3c531c33998b0de4d32f714a982d971 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sat, 28 Jul 2018 01:27:35 -0300 Subject: [PATCH 04/19] chore(docz-theme-default): change text color of light mode --- packages/docz-theme-default/src/styles/modes.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docz-theme-default/src/styles/modes.ts b/packages/docz-theme-default/src/styles/modes.ts index a0b157d00..0da4ee5b4 100644 --- a/packages/docz-theme-default/src/styles/modes.ts +++ b/packages/docz-theme-default/src/styles/modes.ts @@ -3,7 +3,7 @@ import * as colors from './colors' export const light = { ...colors, primary: colors.blue, - text: colors.dark, + text: colors.grayDark, link: colors.blue, footerText: colors.grayDark, sidebarBg: colors.grayExtraLight, From b10c6b11e5e12e83e58c5fbab585c27d938fc04f Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sat, 28 Jul 2018 03:26:29 -0300 Subject: [PATCH 05/19] chore(docz): remove __rawCode from playground --- examples/flow/src/components/Alert.mdx | 3 +-- packages/docz/src/components/DocPreview.tsx | 3 +-- packages/docz/src/components/Playground.tsx | 13 ++++++------- packages/rehype-docz/src/index.ts | 8 +------- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/examples/flow/src/components/Alert.mdx b/examples/flow/src/components/Alert.mdx index 249483765..03a0ec9ef 100644 --- a/examples/flow/src/components/Alert.mdx +++ b/examples/flow/src/components/Alert.mdx @@ -36,6 +36,5 @@ import { Alert } from './Alert' return ( {message} ) - -}} + }} diff --git a/packages/docz/src/components/DocPreview.tsx b/packages/docz/src/components/DocPreview.tsx index 8a8acaf2a..0fb3d65a9 100644 --- a/packages/docz/src/components/DocPreview.tsx +++ b/packages/docz/src/components/DocPreview.tsx @@ -23,8 +23,7 @@ export interface RenderComponentProps { components: ComponentsMap component: JSX.Element position: number - code: (components: ComponentsMap) => any - rawCode: string + code: string } export type RenderComponent = ComponentType diff --git a/packages/docz/src/components/Playground.tsx b/packages/docz/src/components/Playground.tsx index 76515f0b4..45600235d 100644 --- a/packages/docz/src/components/Playground.tsx +++ b/packages/docz/src/components/Playground.tsx @@ -12,8 +12,7 @@ export interface PlaygroundProps { wrapper?: ComponentType children: any __position: number - __code: (components: ComponentsMap) => any - __rawCode: string + __code: string } const BasePlayground: SFC = ({ @@ -24,9 +23,10 @@ const BasePlayground: SFC = ({ children, __position, __code, - __rawCode, }) => { - return components && components.render ? ( + if (!components || !components.render) return null + + return ( = ({ components={components} component={isFn(children) ? children() : children} position={__position} - code={__code(components)} - rawCode={__rawCode} + code={__code} /> - ) : null + ) } export const Playground = withMDXComponents(BasePlayground) diff --git a/packages/rehype-docz/src/index.ts b/packages/rehype-docz/src/index.ts index 926e9e427..e0ea72153 100644 --- a/packages/rehype-docz/src/index.ts +++ b/packages/rehype-docz/src/index.ts @@ -34,15 +34,9 @@ const addCodeProp = async (node: any, idx: number) => { const code = formatted.slice(1, Infinity) const child = strip(removePlayground(code)).trim() - const codeComponent = `(components) => components && ( - - {\`${child}\`} - - )` - node.value = node.value.replace( tagOpen, - `<${name} __position={${idx}} __code={${codeComponent}} __rawCode={\`${child}\`}` + `<${name} __position={${idx}} __code={\`${child}\`}` ) } } From be7a7494ca870cd863c7720eaf68ed5b79a9f0e5 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sat, 28 Jul 2018 03:39:12 -0300 Subject: [PATCH 06/19] feat(docz-theme-default): add html output on playground --- packages/docz-theme-default/librc.js | 1 + packages/docz-theme-default/package.json | 1 + .../src/components/ui/Pre.tsx | 12 +- .../src/components/ui/Render/index.tsx | 108 +++++++++++++++--- packages/docz-theme-default/src/types.d.ts | 3 + yarn.lock | 66 ++++++++++- 6 files changed, 169 insertions(+), 22 deletions(-) diff --git a/packages/docz-theme-default/librc.js b/packages/docz-theme-default/librc.js index c88cd46a2..86682f1f6 100644 --- a/packages/docz-theme-default/librc.js +++ b/packages/docz-theme-default/librc.js @@ -13,6 +13,7 @@ const inline = [ const external = Object.keys(pkg.dependencies) .filter(dep => inline.indexOf(dep) === -1) .concat([ + 'react-dom/server', 'polished/lib/colors/rgba', 'react-syntax-highlighter/prism', 'react-feather/dist/icons/search', diff --git a/packages/docz-theme-default/package.json b/packages/docz-theme-default/package.json index d0c400437..bd6cf7aa8 100644 --- a/packages/docz-theme-default/package.json +++ b/packages/docz-theme-default/package.json @@ -30,6 +30,7 @@ "lodash.get": "^4.4.2", "match-sorter": "^2.2.3", "polished": "^1.9.3", + "pretty": "^2.0.0", "prop-types": "15.6.2", "re-resizable": "^4.7.1", "react": "^16.2.0", diff --git a/packages/docz-theme-default/src/components/ui/Pre.tsx b/packages/docz-theme-default/src/components/ui/Pre.tsx index 0e9845ae7..d431815a6 100644 --- a/packages/docz-theme-default/src/components/ui/Pre.tsx +++ b/packages/docz-theme-default/src/components/ui/Pre.tsx @@ -78,8 +78,16 @@ const Check = styled(BaseCheck)` stroke: ${p => p.theme.colors.primary}; ` -export const ClipboardAction: SFC<{ content: string }> = ({ content }) => ( +interface ClipboardActionProps { + content: string +} + +export const ClipboardAction: SFC = ({ + content, + ...props +}) => ( copy(content)} @@ -92,7 +100,7 @@ export const ClipboardAction: SFC<{ content: string }> = ({ content }) => ( const Nullable: SFC = ({ children }) => {children} const linesStyle = (colors: any) => ({ - padding: `${TOP_PADDING} 0`, + padding: `${TOP_PADDING} 3px`, borderRight: `1px solid ${colors.border}`, background: rgba(colors.background, 0.5), left: 0, diff --git a/packages/docz-theme-default/src/components/ui/Render/index.tsx b/packages/docz-theme-default/src/components/ui/Render/index.tsx index 3b73f20fa..eac6596ce 100644 --- a/packages/docz-theme-default/src/components/ui/Render/index.tsx +++ b/packages/docz-theme-default/src/components/ui/Render/index.tsx @@ -1,12 +1,17 @@ import * as React from 'react' import { Component, Fragment } from 'react' +import { renderToStaticMarkup } from 'react-dom/server' import { RenderComponentProps } from 'docz' +import styled, { css } from 'react-emotion' +import lighten from 'polished/lib/color/lighten' +import darken from 'polished/lib/color/darken' +import rgba from 'polished/lib/color/rgba' +import Resizable from 're-resizable' import Maximize from 'react-feather/dist/icons/maximize' import Minimize from 'react-feather/dist/icons/minimize' -import Resizable from 're-resizable' import hotkeys from 'hotkeys-js' -import styled from 'react-emotion' import getIn from 'lodash.get' +import pretty from 'pretty' import { ResizeBar } from './ResizeBar' import { Handle, HANDLE_SIZE } from './Handle' @@ -56,6 +61,54 @@ const Pre = styled(PreBase)` border-top: 0; ` +const Actions = styled('div')` + display: flex; + padding: 0 5px; + background: ${p => + p.theme.mode === 'light' + ? lighten(0.03, p.theme.colors.border) + : darken(0.05, p.theme.colors.border)}; + border-left: 1px solid ${p => p.theme.colors.border}; + border-bottom: 1px solid ${p => p.theme.colors.border}; +` + +const actionClass = (p: any) => css` + padding: 3px 10px; + border-left: 1px solid ${p.theme.colors.border}; +` + +const Action = styled(ActionButton)` + ${actionClass}; +` + +const Clipboard = styled(ClipboardAction)` + ${actionClass}; +` + +const Tabs = styled('div')` + flex: 1; + display: flex; + align-items: center; +` + +interface TabProps { + active: boolean + theme?: any +} + +const Tab = styled('button')` + position: relative; + cursor: pointer; + display: block; + outline: none; + height: 100%; + background: none; + border: none; + font-size: 14px; + color: ${(p: TabProps) => rgba(p.theme.colors.text, p.active ? 0.8 : 0.4)}; + transition: color 0.3s; +` + const storage = localStorage() const get = (pos: number): any => storage.get(pos.toString()) const remove = (pos: number): void => storage.remove(pos.toString()) @@ -71,6 +124,7 @@ export interface RenderState { fullscreen: boolean width: string height: string + showing: 'jsx' | 'html' } export class Render extends Component { @@ -78,6 +132,7 @@ export class Render extends Component { fullscreen: parse(this.props.position, 'fullscreen', false), width: parse(this.props.position, 'width', '100%'), height: parse(this.props.position, 'height', '100%'), + showing: parse(this.props.position, 'showing', 'jsx'), } public componentDidMount(): void { @@ -91,19 +146,30 @@ export class Render extends Component { } get actions(): JSX.Element { - const { rawCode } = this.props - const { fullscreen } = this.state + const { code } = this.props + const { showing, fullscreen } = this.state + + const showJsx = this.handleShow('jsx') + const showHtml = this.handleShow('html') return ( - - + + + JSX + + + HTML + + + + {fullscreen ? : } - - - + + ) } @@ -146,8 +212,8 @@ export class Render extends Component { } public render(): JSX.Element { - const { className, style, component, rawCode } = this.props - const { fullscreen } = this.state + const { className, style, component, code } = this.props + const { showing, fullscreen } = this.state return ( @@ -157,7 +223,12 @@ export class Render extends Component { {component} - 
{rawCode}
+ {this.actions} + 
}>
+              {showing === 'jsx'
+                ? code
+                : pretty(renderToStaticMarkup(component))}
+
@@ -178,9 +249,8 @@ export class Render extends Component { } } - private setSize = () => { - const { fullscreen, ...state } = this.state - set(this.props.position, JSON.stringify(state)) + private setSize = (fullscreen: boolean) => { + set(this.props.position, JSON.stringify({ ...this.state, fullscreen })) } private handleToggle = () => { @@ -188,7 +258,7 @@ export class Render extends Component { const { fullscreen } = this.state if (fullscreen) remove(position) - else this.setSize() + else this.setSize(true) this.setState({ fullscreen: parse(position, 'fullscreen', false), @@ -197,11 +267,15 @@ export class Render extends Component { }) } + private handleShow = (showing: 'jsx' | 'html') => () => { + this.setState({ showing }) + } + private closeOnEsc = () => { this.state.fullscreen && this.handleToggle() } private handleSetSize = (width: string, height: string) => { - this.setState({ width, height }, () => this.setSize()) + this.setState({ width, height }, () => this.setSize(false)) } } diff --git a/packages/docz-theme-default/src/types.d.ts b/packages/docz-theme-default/src/types.d.ts index d3d314f07..41a6aaee1 100644 --- a/packages/docz-theme-default/src/types.d.ts +++ b/packages/docz-theme-default/src/types.d.ts @@ -16,6 +16,9 @@ declare module 'react-syntax-highlighter/prism-light' declare module 're-resizable' declare module 'match-sorter' declare module 'polished/lib/color/rgba' +declare module 'polished/lib/color/lighten' +declare module 'polished/lib/color/darken' +declare module 'pretty' declare module 'webfontloader' declare module '*.svg' { diff --git a/yarn.lock b/yarn.lock index c3232a1b7..82915028b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2816,7 +2816,7 @@ bluebird-co@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/bluebird-co/-/bluebird-co-2.2.0.tgz#e0a49e63b6b17e34c91f48b3934b769a377fbed7" -bluebird@^3.5.1: +bluebird@^3.0.5, bluebird@^3.5.1: version "3.5.1" resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" @@ -3586,6 +3586,21 @@ concat-stream@^1.4.10, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream readable-stream "^2.2.2" typedarray "^0.0.6" +condense-newlines@^0.2.1: + version "0.2.1" + resolved "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f" + dependencies: + extend-shallow "^2.0.1" + is-whitespace "^0.3.0" + kind-of "^3.0.2" + +config-chain@~1.1.5: + version "1.1.11" + resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2" + dependencies: + ini "^1.3.4" + proto-list "~1.2.1" + configstore@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz#737a3a7036e9886102aa6099e47bb33ab1aba1a1" @@ -4578,6 +4593,16 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" +editorconfig@^0.13.2: + version "0.13.3" + resolved "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34" + dependencies: + bluebird "^3.0.5" + commander "^2.9.0" + lru-cache "^3.2.0" + semver "^5.1.0" + sigmund "^1.0.1" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -6801,6 +6826,10 @@ is-whitespace-character@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz#9ae0176f3282b65457a1992cdb084f8a5f833e3b" +is-whitespace@^0.3.0: + version "0.3.0" + resolved "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f" + is-windows@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" @@ -6878,6 +6907,15 @@ js-base64@^2.1.8: version "2.4.5" resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz#e293cd3c7c82f070d700fc7a1ca0a2e69f101f92" +js-beautify@^1.6.12: + version "1.7.5" + resolved "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz#69d9651ef60dbb649f65527b53674950138a7919" + dependencies: + config-chain "~1.1.5" + editorconfig "^0.13.2" + mkdirp "~0.5.0" + nopt "~3.0.1" + js-tokens@^3.0.0, js-tokens@^3.0.1, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -7677,6 +7715,12 @@ lowlight@~1.9.1: fault "^1.0.2" highlight.js "~9.12.0" +lru-cache@^3.2.0: + version "3.2.0" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee" + dependencies: + pseudomap "^1.0.1" + lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.1: version "4.1.2" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f" @@ -8388,7 +8432,7 @@ node-zopfli@^2.0.2: nan "^2.0.0" node-pre-gyp "^0.6.4" -"nopt@2 || 3": +"nopt@2 || 3", nopt@~3.0.1: version "3.0.6" resolved "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: @@ -9389,6 +9433,14 @@ pretty-time@^1.0.0: is-number "^5.0.0" nanoseconds "^1.0.0" +pretty@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz#adbc7960b7bbfe289a557dc5f737619a220d06a5" + dependencies: + condense-newlines "^0.2.1" + extend-shallow "^2.0.1" + js-beautify "^1.6.12" + prismjs@^1.8.4: version "1.15.0" resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.15.0.tgz#8801d332e472091ba8def94976c8877ad60398d9" @@ -9454,6 +9506,10 @@ property-information@^3.0.0: version "3.2.0" resolved "https://registry.npmjs.org/property-information/-/property-information-3.2.0.tgz#fd1483c8fbac61808f5fe359e7693a1f48a58331" +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + proxy-addr@~2.0.3: version "2.0.3" resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341" @@ -9471,7 +9527,7 @@ ps-tree@^1.1.0: dependencies: event-stream "~3.3.0" -pseudomap@^1.0.2: +pseudomap@^1.0.1, pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -10717,6 +10773,10 @@ shelljs@^0.8.2: interpret "^1.0.0" rechoir "^0.6.2" +sigmund@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" From be67588083058a88bf1c19452cd18847aec00f8c Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sat, 28 Jul 2018 20:25:50 -0300 Subject: [PATCH 07/19] chore(docz-theme-default): some colors adjustments --- .../src/components/ui/Pre.tsx | 15 ++++++++----- .../src/components/ui/Render/Handle.tsx | 21 ++++++++++++------- .../src/components/ui/Render/index.tsx | 4 ++-- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/packages/docz-theme-default/src/components/ui/Pre.tsx b/packages/docz-theme-default/src/components/ui/Pre.tsx index d431815a6..1f5cc008f 100644 --- a/packages/docz-theme-default/src/components/ui/Pre.tsx +++ b/packages/docz-theme-default/src/components/ui/Pre.tsx @@ -3,6 +3,8 @@ import { SFC, Component, Fragment } from 'react' import { ThemeConfig } from 'docz' import styled, { cx } from 'react-emotion' import rgba from 'polished/lib/color/rgba' +import lighten from 'polished/lib/color/lighten' +import darken from 'polished/lib/color/darken' import BaseCheck from 'react-feather/dist/icons/check' import SyntaxHighlighter from 'react-syntax-highlighter/prism-light' import Clipboard from 'react-feather/dist/icons/clipboard' @@ -43,7 +45,7 @@ const Wrapper = styled('div')` position: relative; border: 1px solid ${p => p.theme.colors.border}; border-radius: 5px; - background: ${p => p.theme.colors.preBg}; + background: ${p => darken(0.01, p.theme.colors.preBg)}; ${p => p.theme.mq(p.theme.styles.pre)}; .react-syntax-highlighter-line-number { @@ -99,10 +101,13 @@ export const ClipboardAction: SFC = ({ const Nullable: SFC = ({ children }) => {children} -const linesStyle = (colors: any) => ({ +const linesStyle = (config: any) => ({ padding: `${TOP_PADDING} 3px`, - borderRight: `1px solid ${colors.border}`, - background: rgba(colors.background, 0.5), + borderRight: `1px solid ${config.colors.border}`, + background: + config.mode === 'light' + ? lighten(0.13, config.colors.border) + : darken(0.04, config.colors.border), left: 0, }) @@ -125,7 +130,7 @@ export class Pre extends Component { language="javascript" showLineNumbers useInlineStyles={false} - lineNumberContainerStyle={linesStyle(config.colors)} + lineNumberContainerStyle={linesStyle(config)} PreTag={Nullable} CodeTag={getCode(children)} > diff --git a/packages/docz-theme-default/src/components/ui/Render/Handle.tsx b/packages/docz-theme-default/src/components/ui/Render/Handle.tsx index e937ab497..73e4b720b 100644 --- a/packages/docz-theme-default/src/components/ui/Render/Handle.tsx +++ b/packages/docz-theme-default/src/components/ui/Render/Handle.tsx @@ -33,12 +33,9 @@ export const Handle = styled('div')` display: block; width: ${whenHorizontal(HANDLE_SIZE, 'calc(100% + 5px)')}; height: ${handleHeight}; - border: 1px solid ${p => p.theme.colors.border}; + border: 1px solid ${p => lighten(0.03, p.theme.colors.border)}; border-radius: ${whenHorizontal('0 4px 4px 0', '0 0 4px 4px')}; - background: ${p => - p.theme.mode === 'light' - ? lighten(0.1, p.theme.colors.border) - : darken(0.1, p.theme.colors.border)}; + background: ${p => darken(0.01, p.theme.colors.preBg)}; ${whenHorizontal( ` @@ -52,10 +49,20 @@ export const Handle = styled('div')` )}; &:after { - ${p => line(p.theme.colors.border, 'calc(50% + 3px)', p.horizontal)}; + ${p => + line( + lighten(0.06, p.theme.colors.border), + 'calc(50% + 3px)', + p.horizontal + )}; } &:before { - ${p => line(p.theme.colors.border, 'calc(50% - 3px)', p.horizontal)}; + ${p => + line( + lighten(0.06, p.theme.colors.border), + 'calc(50% - 3px)', + p.horizontal + )}; } ` diff --git a/packages/docz-theme-default/src/components/ui/Render/index.tsx b/packages/docz-theme-default/src/components/ui/Render/index.tsx index eac6596ce..5b4d55052 100644 --- a/packages/docz-theme-default/src/components/ui/Render/index.tsx +++ b/packages/docz-theme-default/src/components/ui/Render/index.tsx @@ -66,8 +66,8 @@ const Actions = styled('div')` padding: 0 5px; background: ${p => p.theme.mode === 'light' - ? lighten(0.03, p.theme.colors.border) - : darken(0.05, p.theme.colors.border)}; + ? lighten(0.13, p.theme.colors.border) + : darken(0.04, p.theme.colors.border)}; border-left: 1px solid ${p => p.theme.colors.border}; border-bottom: 1px solid ${p => p.theme.colors.border}; ` From ed75f0d28b11b49a2c4f232581840daeb3943846 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sat, 28 Jul 2018 20:30:15 -0300 Subject: [PATCH 08/19] v0.8.0 --- CHANGELOG.md | 18 ++++++++++++++++++ examples/babel6/CHANGELOG.md | 8 ++++++++ examples/babel6/package.json | 8 ++++---- examples/basic/CHANGELOG.md | 8 ++++++++ examples/basic/package.json | 6 +++--- examples/css-less/CHANGELOG.md | 8 ++++++++ examples/css-less/package.json | 8 ++++---- examples/css-postcss/CHANGELOG.md | 8 ++++++++ examples/css-postcss/package.json | 8 ++++---- examples/css-sass/CHANGELOG.md | 8 ++++++++ examples/css-sass/package.json | 8 ++++---- examples/css-stylus/CHANGELOG.md | 8 ++++++++ examples/css-stylus/package.json | 8 ++++---- examples/flow/CHANGELOG.md | 8 ++++++++ examples/flow/package.json | 4 ++-- examples/typescript/CHANGELOG.md | 8 ++++++++ examples/typescript/package.json | 4 ++-- lerna.json | 2 +- packages/docz-core/CHANGELOG.md | 8 ++++++++ packages/docz-core/package.json | 4 ++-- packages/docz-plugin-babel6/CHANGELOG.md | 8 ++++++++ packages/docz-plugin-babel6/package.json | 4 ++-- packages/docz-plugin-css/CHANGELOG.md | 8 ++++++++ packages/docz-plugin-css/package.json | 4 ++-- packages/docz-theme-default/CHANGELOG.md | 16 ++++++++++++++++ packages/docz-theme-default/package.json | 4 ++-- packages/docz/CHANGELOG.md | 11 +++++++++++ packages/docz/package.json | 6 +++--- packages/rehype-docz/CHANGELOG.md | 8 ++++++++ packages/rehype-docz/package.json | 2 +- 30 files changed, 181 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a90751885..a2afdcb8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + +### Bug Fixes + +* change link on readme ([#168](https://github.com/pedronauck/docz/issues/168)) ([30a9390](https://github.com/pedronauck/docz/commit/30a9390)) +* **docz:** humanize array type of flow (fix [#167](https://github.com/pedronauck/docz/issues/167)) ([18798bc](https://github.com/pedronauck/docz/commit/18798bc)) +* **docz-theme-default:** get fullscreen from localstorage ([0f8aa56](https://github.com/pedronauck/docz/commit/0f8aa56)) + + +### Features + +* **docz-theme-default:** add html output on playground ([be7a749](https://github.com/pedronauck/docz/commit/be7a749)) + + + + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/examples/babel6/CHANGELOG.md b/examples/babel6/CHANGELOG.md index 3d2acc855..e95cdf34a 100644 --- a/examples/babel6/CHANGELOG.md +++ b/examples/babel6/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-example-babel6 + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/examples/babel6/package.json b/examples/babel6/package.json index 8d94fd009..b45356d26 100644 --- a/examples/babel6/package.json +++ b/examples/babel6/package.json @@ -1,14 +1,14 @@ { "name": "docz-example-babel6", - "version": "0.7.1", + "version": "0.8.0", "license": "MIT", "scripts": { "dev": "docz dev", "build": "docz build" }, "dependencies": { - "docz": "^0.7.1", - "docz-core": "^0.7.0", + "docz": "^0.8.0", + "docz-core": "^0.8.0", "emotion": "^9.2.6", "prop-types": "^15.6.2", "react": "^16.4.1", @@ -17,6 +17,6 @@ }, "devDependencies": { "babel-plugin-emotion": "^9.2.6", - "docz-plugin-babel6": "^0.7.0" + "docz-plugin-babel6": "^0.8.0" } } diff --git a/examples/basic/CHANGELOG.md b/examples/basic/CHANGELOG.md index 53e60ce2c..fc3b54b01 100644 --- a/examples/basic/CHANGELOG.md +++ b/examples/basic/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-example-basic + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/examples/basic/package.json b/examples/basic/package.json index 9505e07b2..af5f7bc7a 100644 --- a/examples/basic/package.json +++ b/examples/basic/package.json @@ -1,14 +1,14 @@ { "name": "docz-example-basic", - "version": "0.7.1", + "version": "0.8.0", "license": "MIT", "scripts": { "dev": "docz dev", "build": "docz build" }, "dependencies": { - "docz": "^0.7.1", - "docz-core": "^0.7.0", + "docz": "^0.8.0", + "docz-core": "^0.8.0", "emotion": "^9.2.6", "prop-types": "^15.6.2", "react": "^16.4.1", diff --git a/examples/css-less/CHANGELOG.md b/examples/css-less/CHANGELOG.md index d1e540a3f..ac53bbfe7 100644 --- a/examples/css-less/CHANGELOG.md +++ b/examples/css-less/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-example-css-less + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/examples/css-less/package.json b/examples/css-less/package.json index 6188a050c..30f26148c 100644 --- a/examples/css-less/package.json +++ b/examples/css-less/package.json @@ -1,6 +1,6 @@ { "name": "docz-example-css-less", - "version": "0.7.1", + "version": "0.8.0", "license": "MIT", "scripts": { "dev": "docz dev", @@ -8,13 +8,13 @@ }, "dependencies": { "classnames": "^2.2.6", - "docz": "^0.7.1", - "docz-core": "^0.7.0", + "docz": "^0.8.0", + "docz-core": "^0.8.0", "prop-types": "^15.6.2", "react": "^16.4.1", "react-dom": "^16.4.1" }, "devDependencies": { - "docz-plugin-css": "^0.7.1" + "docz-plugin-css": "^0.8.0" } } diff --git a/examples/css-postcss/CHANGELOG.md b/examples/css-postcss/CHANGELOG.md index a29a61610..03f9f6ab2 100644 --- a/examples/css-postcss/CHANGELOG.md +++ b/examples/css-postcss/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-example-css-postcss + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/examples/css-postcss/package.json b/examples/css-postcss/package.json index 81632cbd4..066a8be9c 100644 --- a/examples/css-postcss/package.json +++ b/examples/css-postcss/package.json @@ -1,6 +1,6 @@ { "name": "docz-example-css-postcss", - "version": "0.7.1", + "version": "0.8.0", "license": "MIT", "scripts": { "dev": "docz dev", @@ -8,13 +8,13 @@ }, "dependencies": { "classnames": "^2.2.6", - "docz": "^0.7.1", - "docz-core": "^0.7.0", + "docz": "^0.8.0", + "docz-core": "^0.8.0", "prop-types": "^15.6.2", "react": "^16.4.1", "react-dom": "^16.4.1" }, "devDependencies": { - "docz-plugin-css": "^0.7.1" + "docz-plugin-css": "^0.8.0" } } diff --git a/examples/css-sass/CHANGELOG.md b/examples/css-sass/CHANGELOG.md index 9aafd1a6e..2c6f2694d 100644 --- a/examples/css-sass/CHANGELOG.md +++ b/examples/css-sass/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-example-css-sass + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/examples/css-sass/package.json b/examples/css-sass/package.json index 3274bee5b..7ca20fcd7 100644 --- a/examples/css-sass/package.json +++ b/examples/css-sass/package.json @@ -1,6 +1,6 @@ { "name": "docz-example-css-sass", - "version": "0.7.1", + "version": "0.8.0", "license": "MIT", "scripts": { "dev": "docz dev", @@ -8,13 +8,13 @@ }, "dependencies": { "classnames": "^2.2.6", - "docz": "^0.7.1", - "docz-core": "^0.7.0", + "docz": "^0.8.0", + "docz-core": "^0.8.0", "prop-types": "^15.6.2", "react": "^16.4.1", "react-dom": "^16.4.1" }, "devDependencies": { - "docz-plugin-css": "^0.7.1" + "docz-plugin-css": "^0.8.0" } } diff --git a/examples/css-stylus/CHANGELOG.md b/examples/css-stylus/CHANGELOG.md index d513b1b18..5c616c2aa 100644 --- a/examples/css-stylus/CHANGELOG.md +++ b/examples/css-stylus/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-example-css-stylus + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/examples/css-stylus/package.json b/examples/css-stylus/package.json index 278fc4918..4f5e6a08d 100644 --- a/examples/css-stylus/package.json +++ b/examples/css-stylus/package.json @@ -1,6 +1,6 @@ { "name": "docz-example-css-stylus", - "version": "0.7.1", + "version": "0.8.0", "license": "MIT", "scripts": { "dev": "docz dev", @@ -8,13 +8,13 @@ }, "dependencies": { "classnames": "^2.2.6", - "docz": "^0.7.1", - "docz-core": "^0.7.0", + "docz": "^0.8.0", + "docz-core": "^0.8.0", "prop-types": "^15.6.2", "react": "^16.4.1", "react-dom": "^16.4.1" }, "devDependencies": { - "docz-plugin-css": "^0.7.1" + "docz-plugin-css": "^0.8.0" } } diff --git a/examples/flow/CHANGELOG.md b/examples/flow/CHANGELOG.md index e915210ca..89c10fac1 100644 --- a/examples/flow/CHANGELOG.md +++ b/examples/flow/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-example-flow + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/examples/flow/package.json b/examples/flow/package.json index ffbca01fa..e56f379ac 100644 --- a/examples/flow/package.json +++ b/examples/flow/package.json @@ -1,6 +1,6 @@ { "name": "docz-example-flow", - "version": "0.7.1", + "version": "0.8.0", "license": "MIT", "scripts": { "dev": "docz dev", @@ -8,7 +8,7 @@ }, "dependencies": { "@babel/preset-flow": "^7.0.0-beta.54", - "docz": "^0.7.1", + "docz": "^0.8.0", "emotion": "^9.2.6", "prop-types": "^15.6.2", "react": "^16.4.1", diff --git a/examples/typescript/CHANGELOG.md b/examples/typescript/CHANGELOG.md index f8b98bcc3..d2a14a7db 100644 --- a/examples/typescript/CHANGELOG.md +++ b/examples/typescript/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-example-typescript + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/examples/typescript/package.json b/examples/typescript/package.json index 92a3f22e1..f991c53f9 100644 --- a/examples/typescript/package.json +++ b/examples/typescript/package.json @@ -1,13 +1,13 @@ { "name": "docz-example-typescript", - "version": "0.7.1", + "version": "0.8.0", "license": "MIT", "scripts": { "dev": "docz dev", "build": "docz build" }, "dependencies": { - "docz": "^0.7.1", + "docz": "^0.8.0", "emotion": "^9.2.6", "react": "^16.4.1", "react-dom": "^16.4.1", diff --git a/lerna.json b/lerna.json index 6cef9a5bb..d0711141a 100644 --- a/lerna.json +++ b/lerna.json @@ -3,7 +3,7 @@ "packages": [ "packages/**/*" ], - "version": "0.7.1", + "version": "0.8.0", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/docz-core/CHANGELOG.md b/packages/docz-core/CHANGELOG.md index 064e110ec..553fcea30 100644 --- a/packages/docz-core/CHANGELOG.md +++ b/packages/docz-core/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-core + # [0.7.0](https://github.com/pedronauck/docz/compare/v0.6.2...v0.7.0) (2018-07-23) diff --git a/packages/docz-core/package.json b/packages/docz-core/package.json index 383f86cb1..2c192cacc 100644 --- a/packages/docz-core/package.json +++ b/packages/docz-core/package.json @@ -1,6 +1,6 @@ { "name": "docz-core", - "version": "0.7.0", + "version": "0.8.0", "description": "All docz core logic of bundle and parsing is included on this package", "license": "MIT", "main": "dist/index.js", @@ -62,7 +62,7 @@ "react-docgen-typescript-loader": "^2.1.1", "react-hot-loader": "4.3.3", "rehype-autolink-headings": "^2.0.3", - "rehype-docz": "^0.7.0", + "rehype-docz": "^0.8.0", "rehype-slug": "^2.0.1", "remark-docz": "^0.7.0", "remark-frontmatter": "^1.2.0", diff --git a/packages/docz-plugin-babel6/CHANGELOG.md b/packages/docz-plugin-babel6/CHANGELOG.md index 2cad9dc39..15573160d 100644 --- a/packages/docz-plugin-babel6/CHANGELOG.md +++ b/packages/docz-plugin-babel6/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-plugin-babel6 + # [0.7.0](https://github.com/pedronauck/docz/compare/v0.6.2...v0.7.0) (2018-07-23) diff --git a/packages/docz-plugin-babel6/package.json b/packages/docz-plugin-babel6/package.json index f0355a0eb..724acbdab 100644 --- a/packages/docz-plugin-babel6/package.json +++ b/packages/docz-plugin-babel6/package.json @@ -1,6 +1,6 @@ { "name": "docz-plugin-babel6", - "version": "0.7.0", + "version": "0.8.0", "description": "This package makes it possible to use babel6 with docz", "license": "MIT", "main": "dist/index.js", @@ -26,7 +26,7 @@ "babel-loader": "^7.1.5", "babel-preset-react-app": "^3.1.2", "babel-runtime": "^6.26.0", - "docz-core": "^0.7.0", + "docz-core": "^0.8.0", "happypack": "^5.0.0", "react-docgen-typescript-loader": "^2.1.1", "ts-loader": "^4.4.2" diff --git a/packages/docz-plugin-css/CHANGELOG.md b/packages/docz-plugin-css/CHANGELOG.md index 2a387e62f..1ce1037d3 100644 --- a/packages/docz-plugin-css/CHANGELOG.md +++ b/packages/docz-plugin-css/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package docz-plugin-css + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/packages/docz-plugin-css/package.json b/packages/docz-plugin-css/package.json index 3bb619517..a3164ee73 100644 --- a/packages/docz-plugin-css/package.json +++ b/packages/docz-plugin-css/package.json @@ -1,6 +1,6 @@ { "name": "docz-plugin-css", - "version": "0.7.1", + "version": "0.8.0", "description": "This package makes it possible to use preprocessors and css modules on docz", "license": "MIT", "main": "dist/index.js", @@ -25,7 +25,7 @@ "autoprefixer": "^9.0.1", "css-loader": "^1.0.0", "deepmerge": "^2.1.1", - "docz-core": "^0.7.0", + "docz-core": "^0.8.0", "less": "^3.7.1", "less-loader": "^4.1.0", "loader-utils": "^1.1.0", diff --git a/packages/docz-theme-default/CHANGELOG.md b/packages/docz-theme-default/CHANGELOG.md index d585c15b5..1ff781821 100644 --- a/packages/docz-theme-default/CHANGELOG.md +++ b/packages/docz-theme-default/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + +### Bug Fixes + +* **docz-theme-default:** get fullscreen from localstorage ([0f8aa56](https://github.com/pedronauck/docz/commit/0f8aa56)) + + +### Features + +* **docz-theme-default:** add html output on playground ([be7a749](https://github.com/pedronauck/docz/commit/be7a749)) + + + + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/packages/docz-theme-default/package.json b/packages/docz-theme-default/package.json index bd6cf7aa8..e4a530a67 100644 --- a/packages/docz-theme-default/package.json +++ b/packages/docz-theme-default/package.json @@ -1,6 +1,6 @@ { "name": "docz-theme-default", - "version": "0.7.1", + "version": "0.8.0", "description": "The default theme of docz", "license": "MIT", "main": "dist/index.js", @@ -22,7 +22,7 @@ }, "dependencies": { "copy-text-to-clipboard": "^1.0.4", - "docz": "^0.7.1", + "docz": "^0.8.0", "emotion": "^9.2.6", "emotion-theming": "^9.2.6", "facepaint": "^1.2.1", diff --git a/packages/docz/CHANGELOG.md b/packages/docz/CHANGELOG.md index 3659941cf..efe3fadb6 100644 --- a/packages/docz/CHANGELOG.md +++ b/packages/docz/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + +### Bug Fixes + +* **docz:** humanize array type of flow (fix [#167](https://github.com/pedronauck/docz/issues/167)) ([18798bc](https://github.com/pedronauck/docz/commit/18798bc)) + + + + ## [0.7.1](https://github.com/pedronauck/docz/compare/v0.7.0...v0.7.1) (2018-07-24) diff --git a/packages/docz/package.json b/packages/docz/package.json index bcbf9b382..8aec79150 100644 --- a/packages/docz/package.json +++ b/packages/docz/package.json @@ -1,6 +1,6 @@ { "name": "docz", - "version": "0.7.1", + "version": "0.8.0", "description": "It's has never been so easy to documents your things!", "license": "MIT", "main": "dist/index.js", @@ -32,8 +32,8 @@ "capitalize": "^1.0.0", "create-react-context": "^0.2.2", "deepmerge": "^2.1.1", - "docz-core": "^0.7.0", - "docz-theme-default": "^0.7.1", + "docz-core": "^0.8.0", + "docz-theme-default": "^0.8.0", "env-dot-prop": "^1.0.2", "invariant": "^2.2.4", "loadable-components": "^2.2.2", diff --git a/packages/rehype-docz/CHANGELOG.md b/packages/rehype-docz/CHANGELOG.md index 50f07976b..237027746 100644 --- a/packages/rehype-docz/CHANGELOG.md +++ b/packages/rehype-docz/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0](https://github.com/pedronauck/docz/compare/v0.7.1...v0.8.0) (2018-07-28) + + + + +**Note:** Version bump only for package rehype-docz + # [0.7.0](https://github.com/pedronauck/docz/compare/v0.6.2...v0.7.0) (2018-07-23) diff --git a/packages/rehype-docz/package.json b/packages/rehype-docz/package.json index 59ea0edff..05e64347c 100644 --- a/packages/rehype-docz/package.json +++ b/packages/rehype-docz/package.json @@ -1,6 +1,6 @@ { "name": "rehype-docz", - "version": "0.7.0", + "version": "0.8.0", "description": "Rehype plugin used by docz", "license": "MIT", "main": "dist/index.js", From 1c68e2df3f7f35105f9bf2b16a316eabe65c38db Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sun, 29 Jul 2018 19:52:34 -0300 Subject: [PATCH 09/19] fix(docz-theme-default): hot reload on fullscreen mode --- packages/docz-theme-default/src/components/ui/Render/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/docz-theme-default/src/components/ui/Render/index.tsx b/packages/docz-theme-default/src/components/ui/Render/index.tsx index 5b4d55052..84cc0fb20 100644 --- a/packages/docz-theme-default/src/components/ui/Render/index.tsx +++ b/packages/docz-theme-default/src/components/ui/Render/index.tsx @@ -276,6 +276,7 @@ export class Render extends Component { } private handleSetSize = (width: string, height: string) => { - this.setState({ width, height }, () => this.setSize(false)) + const fullscreen = parse(this.props.position, 'fullscreen', false) + this.setState({ width, height }, () => this.setSize(fullscreen)) } } From bd9c1b9838f067ebf76dc6f4ef6bb6aee1572121 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sun, 29 Jul 2018 20:20:21 -0300 Subject: [PATCH 10/19] chore: update dependencies --- examples/flow/package.json | 2 +- package.json | 2 +- packages/docz-core/package.json | 28 +- packages/docz-plugin-css/package.json | 4 +- packages/docz-theme-default/package.json | 2 +- packages/docz/package.json | 6 +- packages/load-cfg/package.json | 2 +- packages/rehype-docz/package.json | 2 +- packages/remark-docz/package.json | 2 +- yarn.lock | 882 +++++++++++++++++------ 10 files changed, 685 insertions(+), 247 deletions(-) diff --git a/examples/flow/package.json b/examples/flow/package.json index e56f379ac..a7c062ab2 100644 --- a/examples/flow/package.json +++ b/examples/flow/package.json @@ -7,7 +7,7 @@ "build": "docz build" }, "dependencies": { - "@babel/preset-flow": "^7.0.0-beta.54", + "@babel/preset-flow": "^7.0.0-beta.55", "docz": "^0.8.0", "emotion": "^9.2.6", "prop-types": "^15.6.2", diff --git a/package.json b/package.json index 4b7dd3154..efe7923d3 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "libundler": "^1.7.1", "lint-staged": "^7.2.0", "npm-run-all": "^4.1.3", - "prettier": "^1.13.7", + "prettier": "^1.14.0", "trash-cli": "^1.4.0", "tslint": "^5.11.0", "tslint-config-prettier": "^1.14.0", diff --git a/packages/docz-core/package.json b/packages/docz-core/package.json index 2c192cacc..1e022dd5a 100644 --- a/packages/docz-core/package.json +++ b/packages/docz-core/package.json @@ -22,12 +22,12 @@ "tslint": "tslint --project ." }, "dependencies": { - "@babel/core": "7.0.0-beta.54", - "@babel/preset-typescript": "^7.0.0-beta.54", - "@babel/runtime": "^7.0.0-beta.54", - "@mdx-js/loader": "^0.14.1", - "@mdx-js/mdx": "^0.14.1", - "@mdx-js/mdxast": "^0.10.0", + "@babel/core": "7.0.0-beta.55", + "@babel/preset-typescript": "^7.0.0-beta.55", + "@babel/runtime": "^7.0.0-beta.55", + "@mdx-js/loader": "^0.15.0-1", + "@mdx-js/mdx": "^0.15.0-1", + "@mdx-js/mdxast": "^0.15.0-1", "@sindresorhus/slugify": "^0.3.0", "art-template": "^4.12.2", "babel-loader": "^8.0.0-beta.4", @@ -57,10 +57,10 @@ "koa-static": "^5.0.0", "load-cfg": "^0.7.0", "lodash.get": "^4.4.2", - "prettier": "^1.13.7", + "prettier": "^1.14.0", "react-dev-utils": "^5.0.1", "react-docgen-typescript-loader": "^2.1.1", - "react-hot-loader": "4.3.3", + "react-hot-loader": "4.3.4", "rehype-autolink-headings": "^2.0.3", "rehype-docz": "^0.8.0", "rehype-slug": "^2.0.1", @@ -78,9 +78,9 @@ "unified": "^7.0.0", "unist-util-find": "^1.0.1", "unist-util-is": "^2.1.2", - "unist-util-visit": "^1.3.1", + "unist-util-visit": "^1.4.0", "url-loader": "^1.0.1", - "webpack": "^4.16.1", + "webpack": "^4.16.3", "webpack-chain": "^4.8.0", "webpack-hot-client": "^4.1.1", "webpack-manifest-plugin": "^2.0.3", @@ -98,13 +98,13 @@ "@types/del": "^3.0.1", "@types/express": "^4.16.0", "@types/fs-extra": "^5.0.4", - "@types/html-webpack-plugin": "^2.30.4", + "@types/html-webpack-plugin": "^3.2.0", "@types/koa": "^2.0.46", - "@types/lodash.get": "^4.4.3", - "@types/node": "10.5.2", + "@types/lodash.get": "^4.4.4", + "@types/node": "10.5.4", "@types/prettier": "^1.13.2", "@types/resolve": "^0.0.8", - "@types/webpack": "^4.4.7", + "@types/webpack": "^4.4.8", "@types/webpack-chain": "^4.8.0", "@types/ws": "^5.1.2", "@types/yargs": "^11.1.1", diff --git a/packages/docz-plugin-css/package.json b/packages/docz-plugin-css/package.json index a3164ee73..ad9da50b0 100644 --- a/packages/docz-plugin-css/package.json +++ b/packages/docz-plugin-css/package.json @@ -26,7 +26,7 @@ "css-loader": "^1.0.0", "deepmerge": "^2.1.1", "docz-core": "^0.8.0", - "less": "^3.7.1", + "less": "^3.8.0", "less-loader": "^4.1.0", "loader-utils": "^1.1.0", "mini-css-extract-plugin": "^0.4.1", @@ -39,7 +39,7 @@ "style-loader": "^0.21.0", "stylus": "^0.54.5", "stylus-loader": "^3.0.2", - "webpack": "^4.16.1", + "webpack": "^4.16.3", "webpack-chain": "^4.8.0" } } diff --git a/packages/docz-theme-default/package.json b/packages/docz-theme-default/package.json index e4a530a67..d2742073f 100644 --- a/packages/docz-theme-default/package.json +++ b/packages/docz-theme-default/package.json @@ -50,7 +50,7 @@ }, "devDependencies": { "@types/lodash.get": "^4.4.4", - "@types/react": "^16.4.6", + "@types/react": "^16.4.7", "@types/react-dom": "^16.0.6", "babel-plugin-emotion": "^9.2.6", "rollup-plugin-svg": "^1.0.1" diff --git a/packages/docz/package.json b/packages/docz/package.json index 8aec79150..c1177e0c6 100644 --- a/packages/docz/package.json +++ b/packages/docz/package.json @@ -26,7 +26,7 @@ "tslint": "tslint --project ." }, "dependencies": { - "@mdx-js/tag": "^0.14.1", + "@mdx-js/tag": "^0.15.0-1", "@sindresorhus/slugify": "^0.3.0", "array-sort": "^1.0.0", "capitalize": "^1.0.0", @@ -50,9 +50,9 @@ "react-dom": "^16.2.0" }, "devDependencies": { - "@types/bluebird": "^3.5.22", + "@types/bluebird": "^3.5.23", "@types/deepmerge": "^2.1.0", - "@types/react": "^16.4.6", + "@types/react": "^16.4.7", "@types/react-dom": "^16.0.6", "@types/react-router-dom": "^4.3.0" } diff --git a/packages/load-cfg/package.json b/packages/load-cfg/package.json index 9f54c34df..d07a19e8e 100644 --- a/packages/load-cfg/package.json +++ b/packages/load-cfg/package.json @@ -28,6 +28,6 @@ }, "devDependencies": { "@types/find-up": "^2.1.1", - "@types/node": "^10.5.2" + "@types/node": "^10.5.4" } } diff --git a/packages/rehype-docz/package.json b/packages/rehype-docz/package.json index 05e64347c..4ec46769c 100644 --- a/packages/rehype-docz/package.json +++ b/packages/rehype-docz/package.json @@ -25,7 +25,7 @@ "babel-traverse": "^6.26.0", "babylon": "^6.18.0", "hast-util-to-string": "^1.0.1", - "prettier": "^1.13.7", + "prettier": "^1.14.0", "signale": "^1.2.1", "strip-indent": "^2.0.0", "unist-util-is": "^2.1.2" diff --git a/packages/remark-docz/package.json b/packages/remark-docz/package.json index d525892c2..d1b29ce4e 100644 --- a/packages/remark-docz/package.json +++ b/packages/remark-docz/package.json @@ -23,6 +23,6 @@ }, "dependencies": { "unist-util-remove": "^1.0.1", - "unist-util-visit": "^1.3.1" + "unist-util-visit": "^1.4.0" } } diff --git a/yarn.lock b/yarn.lock index 82915028b..c7790b459 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,11 +14,11 @@ dependencies: "@babel/highlight" "7.0.0-beta.49" -"@babel/code-frame@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.54.tgz#0024f96fdf7028a21d68e273afd4e953214a1ead" +"@babel/code-frame@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.55.tgz#71f530e7b010af5eb7a7df7752f78921dd57e9ee" dependencies: - "@babel/highlight" "7.0.0-beta.54" + "@babel/highlight" "7.0.0-beta.55" "@babel/core@7.0.0-beta.42": version "7.0.0-beta.42" @@ -40,21 +40,21 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.54.tgz#253c54d0095403a5cfa764e7d9b458194692d02b" - dependencies: - "@babel/code-frame" "7.0.0-beta.54" - "@babel/generator" "7.0.0-beta.54" - "@babel/helpers" "7.0.0-beta.54" - "@babel/parser" "7.0.0-beta.54" - "@babel/template" "7.0.0-beta.54" - "@babel/traverse" "7.0.0-beta.54" - "@babel/types" "7.0.0-beta.54" +"@babel/core@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.55.tgz#9e17c34b5ac855e427c98f570915a17fcc6bab4a" + dependencies: + "@babel/code-frame" "7.0.0-beta.55" + "@babel/generator" "7.0.0-beta.55" + "@babel/helpers" "7.0.0-beta.55" + "@babel/parser" "7.0.0-beta.55" + "@babel/template" "7.0.0-beta.55" + "@babel/traverse" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" convert-source-map "^1.1.0" debug "^3.1.0" json5 "^0.5.0" - lodash "^4.17.5" + lodash "^4.17.10" resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" @@ -99,13 +99,13 @@ source-map "^0.5.0" trim-right "^1.0.1" -"@babel/generator@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.54.tgz#c043c7eebeebfd7e665d95c281a4aafc83d4e1c9" +"@babel/generator@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.55.tgz#8ec11152dcc398bae35dd181122704415c383a01" dependencies: - "@babel/types" "7.0.0-beta.54" + "@babel/types" "7.0.0-beta.55" jsesc "^2.5.1" - lodash "^4.17.5" + lodash "^4.17.10" source-map "^0.5.0" trim-right "^1.0.1" @@ -168,13 +168,13 @@ "@babel/template" "7.0.0-beta.49" "@babel/types" "7.0.0-beta.49" -"@babel/helper-function-name@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.54.tgz#307875507a1eda2482a09a9a4df6a25632ffb34b" +"@babel/helper-function-name@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.55.tgz#16aab21380a2eabcee3328d21b9586ba3427dbef" dependencies: - "@babel/helper-get-function-arity" "7.0.0-beta.54" - "@babel/template" "7.0.0-beta.54" - "@babel/types" "7.0.0-beta.54" + "@babel/helper-get-function-arity" "7.0.0-beta.55" + "@babel/template" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" "@babel/helper-get-function-arity@7.0.0-beta.42": version "7.0.0-beta.42" @@ -188,11 +188,11 @@ dependencies: "@babel/types" "7.0.0-beta.49" -"@babel/helper-get-function-arity@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.54.tgz#757bd189b077074a004028cfde5f083c306cc6c4" +"@babel/helper-get-function-arity@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.55.tgz#8559ded96ecd3b626f9c1f57494edc4fa3cc6a94" dependencies: - "@babel/types" "7.0.0-beta.54" + "@babel/types" "7.0.0-beta.55" "@babel/helper-hoist-variables@7.0.0-beta.42": version "7.0.0-beta.42" @@ -242,9 +242,9 @@ version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.42.tgz#9aa8b3e5dc72abea6b4f686712a7363cb29ea057" -"@babel/helper-plugin-utils@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.54.tgz#61d2a9a0f9a3e31838a458debb9eebd7bdd249b4" +"@babel/helper-plugin-utils@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.55.tgz#31f40777efd6b961da8496a923c22d2b062b3f73" "@babel/helper-regex@7.0.0-beta.42": version "7.0.0-beta.42" @@ -291,11 +291,11 @@ dependencies: "@babel/types" "7.0.0-beta.49" -"@babel/helper-split-export-declaration@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.54.tgz#89cd8833c95481a0827ac6a1bfccddb92b75a109" +"@babel/helper-split-export-declaration@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.55.tgz#ecb8074bf2d22c6518a252282535def137a8704f" dependencies: - "@babel/types" "7.0.0-beta.54" + "@babel/types" "7.0.0-beta.55" "@babel/helper-wrap-function@7.0.0-beta.42": version "7.0.0-beta.42" @@ -322,13 +322,13 @@ "@babel/traverse" "7.0.0-beta.49" "@babel/types" "7.0.0-beta.49" -"@babel/helpers@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.0.0-beta.54.tgz#b86a99a80efd81668caef307610b961197446a74" +"@babel/helpers@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.0.0-beta.55.tgz#d0b4b9a327dba42d58890011deb905c820739617" dependencies: - "@babel/template" "7.0.0-beta.54" - "@babel/traverse" "7.0.0-beta.54" - "@babel/types" "7.0.0-beta.54" + "@babel/template" "7.0.0-beta.55" + "@babel/traverse" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" "@babel/highlight@7.0.0-beta.42": version "7.0.0-beta.42" @@ -346,9 +346,9 @@ esutils "^2.0.2" js-tokens "^3.0.0" -"@babel/highlight@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.54.tgz#155d507358329b8e7068970017c3fd74a9b08584" +"@babel/highlight@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.55.tgz#988653647d629c261dae156e74d5f0252ba520c0" dependencies: chalk "^2.0.0" esutils "^2.0.2" @@ -358,9 +358,9 @@ version "7.0.0-beta.49" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.49.tgz#944d0c5ba2812bb159edbd226743afd265179bdc" -"@babel/parser@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.54.tgz#c01aa63b57c9c8dce8744796c81d9df121f20db4" +"@babel/parser@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.55.tgz#0a527efc148c6c8cd85d5ffddacad817a2daeeb2" "@babel/plugin-proposal-async-generator-functions@7.0.0-beta.42": version "7.0.0-beta.42" @@ -428,11 +428,11 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" -"@babel/plugin-syntax-flow@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0-beta.54.tgz#8d38fffa6da16e2d327f5fee4f90913b14d43d14" +"@babel/plugin-syntax-flow@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0-beta.55.tgz#7290602ef79b342651568d7d7e429a3d85d83d53" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.54" + "@babel/helper-plugin-utils" "7.0.0-beta.55" "@babel/plugin-syntax-jsx@7.0.0-beta.42": version "7.0.0-beta.42" @@ -452,11 +452,11 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" -"@babel/plugin-syntax-typescript@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.0.0-beta.54.tgz#7b01ddebccba8f78693bf2898e1f695bb8a76a7e" +"@babel/plugin-syntax-typescript@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.0.0-beta.55.tgz#6648707176c44da87e4c409a1637941019a681d6" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.54" + "@babel/helper-plugin-utils" "7.0.0-beta.55" "@babel/plugin-transform-arrow-functions@7.0.0-beta.42": version "7.0.0-beta.42" @@ -538,12 +538,12 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/plugin-syntax-flow" "7.0.0-beta.42" -"@babel/plugin-transform-flow-strip-types@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0-beta.54.tgz#3612fa3935e60df6eaae66a33d24fc31b58cc919" +"@babel/plugin-transform-flow-strip-types@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0-beta.55.tgz#352b2b28e599b22fac5af28c15dc7f749161cbf6" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.54" - "@babel/plugin-syntax-flow" "7.0.0-beta.54" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-flow" "7.0.0-beta.55" "@babel/plugin-transform-for-of@7.0.0-beta.42": version "7.0.0-beta.42" @@ -694,12 +694,12 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" -"@babel/plugin-transform-typescript@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.0.0-beta.54.tgz#7b614ba0dbea88b70ae82df9c429e128928c9251" +"@babel/plugin-transform-typescript@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.0.0-beta.55.tgz#290b5a6dfb7730bc167c57ffeb471267b4182557" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.54" - "@babel/plugin-syntax-typescript" "7.0.0-beta.54" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-typescript" "7.0.0-beta.55" "@babel/plugin-transform-unicode-regex@7.0.0-beta.42": version "7.0.0-beta.42" @@ -760,12 +760,12 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/plugin-transform-flow-strip-types" "7.0.0-beta.42" -"@babel/preset-flow@^7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.0.0-beta.54.tgz#7a6f5b75297047ec36d5b3fd0b5009d59bb4240f" +"@babel/preset-flow@^7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.0.0-beta.55.tgz#76c2a8987a79a29d4c462f10ad3c05245dcb95e2" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.54" - "@babel/plugin-transform-flow-strip-types" "7.0.0-beta.54" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-flow-strip-types" "7.0.0-beta.55" "@babel/preset-react@7.0.0-beta.42": version "7.0.0-beta.42" @@ -778,12 +778,19 @@ "@babel/plugin-transform-react-jsx-self" "7.0.0-beta.42" "@babel/plugin-transform-react-jsx-source" "7.0.0-beta.42" -"@babel/preset-typescript@^7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.0.0-beta.54.tgz#7491df7c0f20d08ca63c41f78d2c722c92470391" +"@babel/preset-typescript@^7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.0.0-beta.55.tgz#b1eeffe0b59bc5cfd2a7ace9303b478a783fbe2d" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-typescript" "7.0.0-beta.55" + +"@babel/runtime@7.0.0-beta.42": + version "7.0.0-beta.42" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.42.tgz#352e40c92e0460d3e82f49bd7e79f6cda76f919f" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.54" - "@babel/plugin-transform-typescript" "7.0.0-beta.54" + core-js "^2.5.3" + regenerator-runtime "^0.11.1" "@babel/runtime@7.0.0-beta.49": version "7.0.0-beta.49" @@ -792,9 +799,9 @@ core-js "^2.5.6" regenerator-runtime "^0.11.1" -"@babel/runtime@^7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.54.tgz#39ebb42723fe7ca4b3e1b00e967e80138d47cadf" +"@babel/runtime@^7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.55.tgz#0bc33aa5a6ac0b012f37e25b9e6aaa2e489a916b" dependencies: core-js "^2.5.7" regenerator-runtime "^0.12.0" @@ -817,14 +824,14 @@ "@babel/types" "7.0.0-beta.49" lodash "^4.17.5" -"@babel/template@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.54.tgz#d5b0d2d2d55c0e78b048c61a058f36cfd7d91af3" +"@babel/template@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.55.tgz#c6cab0e2722ba5e33fe034073b6d31673aba326e" dependencies: - "@babel/code-frame" "7.0.0-beta.54" - "@babel/parser" "7.0.0-beta.54" - "@babel/types" "7.0.0-beta.54" - lodash "^4.17.5" + "@babel/code-frame" "7.0.0-beta.55" + "@babel/parser" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + lodash "^4.17.10" "@babel/traverse@7.0.0-beta.42": version "7.0.0-beta.42" @@ -856,19 +863,19 @@ invariant "^2.2.0" lodash "^4.17.5" -"@babel/traverse@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.54.tgz#2c17f98dcdbf19aa918fde128f0e1a0bc089e05a" +"@babel/traverse@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.55.tgz#50be5d0fcc5cc4ac020a7b0c519be8dae345d4be" dependencies: - "@babel/code-frame" "7.0.0-beta.54" - "@babel/generator" "7.0.0-beta.54" - "@babel/helper-function-name" "7.0.0-beta.54" - "@babel/helper-split-export-declaration" "7.0.0-beta.54" - "@babel/parser" "7.0.0-beta.54" - "@babel/types" "7.0.0-beta.54" + "@babel/code-frame" "7.0.0-beta.55" + "@babel/generator" "7.0.0-beta.55" + "@babel/helper-function-name" "7.0.0-beta.55" + "@babel/helper-split-export-declaration" "7.0.0-beta.55" + "@babel/parser" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" debug "^3.1.0" globals "^11.1.0" - lodash "^4.17.5" + lodash "^4.17.10" "@babel/types@7.0.0-beta.42": version "7.0.0-beta.42" @@ -902,12 +909,12 @@ lodash "^4.17.5" to-fast-properties "^2.0.0" -"@babel/types@7.0.0-beta.54": - version "7.0.0-beta.54" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.54.tgz#025ad68492fed542c13f14c579a44c848e531063" +"@babel/types@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.55.tgz#7755c9d2e58315a64f05d8cf3322379be16d9199" dependencies: esutils "^2.0.2" - lodash "^4.17.5" + lodash "^4.17.10" to-fast-properties "^2.0.0" "@commitlint/cli@^7.0.0": @@ -1093,39 +1100,31 @@ mkdirp "^0.5.1" rimraf "^2.5.2" -"@mdx-js/loader@^0.14.1": - version "0.14.1" - resolved "https://registry.npmjs.org/@mdx-js/loader/-/loader-0.14.1.tgz#975e69cabda1f8f389db28fc7cf533592b364d89" +"@mdx-js/loader@^0.15.0-1": + version "0.15.0-1" + resolved "https://registry.npmjs.org/@mdx-js/loader/-/loader-0.15.0-1.tgz#0c0e5899f3ebd803ff122aae64e8685e03260440" dependencies: - "@mdx-js/tag" "^0.14.0" + "@mdx-js/tag" "^0.15.0-1" -"@mdx-js/mdx@^0.14.1": - version "0.14.1" - resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-0.14.1.tgz#11d627d4317a2385e3838a9ed4db2f180031017a" +"@mdx-js/mdx@^0.15.0-1": + version "0.15.0-1" + resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-0.15.0-1.tgz#5c34bc7b810ff7f8640558769be227170bca6953" dependencies: - "@mdx-js/mdxast" "^0.10.0" mdast-util-to-hast "^3.0.0" remark-parse "^5.0.0" remark-squeeze-paragraphs "^3.0.1" unified "^6.1.6" unist-util-visit "^1.3.0" -"@mdx-js/mdxast@^0.10.0": - version "0.10.0" - resolved "https://registry.npmjs.org/@mdx-js/mdxast/-/mdxast-0.10.0.tgz#5d8dfdf96290151487dc07fb42031f3f47b8671e" +"@mdx-js/mdxast@^0.15.0-1": + version "0.15.0-1" + resolved "https://registry.npmjs.org/@mdx-js/mdxast/-/mdxast-0.15.0-1.tgz#2c3814adb2ddb6da5468562af0d506c57803a5d8" dependencies: unist-util-visit "^1.3.0" -"@mdx-js/tag@^0.14.0": - version "0.14.0" - resolved "https://registry.npmjs.org/@mdx-js/tag/-/tag-0.14.0.tgz#4c47ac25b1d34babf00f3ed97599397bdbfc3d9c" - dependencies: - create-react-context "^0.2.2" - prop-types "^15.6.1" - -"@mdx-js/tag@^0.14.1": - version "0.14.1" - resolved "https://registry.npmjs.org/@mdx-js/tag/-/tag-0.14.1.tgz#f2ac14bcd1b71aef92d2f056094786905015dfdf" +"@mdx-js/tag@^0.15.0-1": + version "0.15.0-1" + resolved "https://registry.npmjs.org/@mdx-js/tag/-/tag-0.15.0-1.tgz#77aae264338c856a958c1e2199fd6e16f7a65132" dependencies: create-react-context "^0.2.2" hoist-non-react-statics "^2.5.5" @@ -1204,9 +1203,9 @@ dependencies: "@types/node" "*" -"@types/bluebird@^3.5.22": - version "3.5.22" - resolved "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.22.tgz#519b87fe3c9d290ca6c06381ffc3040770ab452b" +"@types/bluebird@^3.5.23": + version "3.5.23" + resolved "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.23.tgz#e805da976b76892b2b2e50eec29e84914c730670" "@types/body-parser@*": version "1.17.0" @@ -1317,9 +1316,9 @@ "@types/relateurl" "*" "@types/uglify-js" "*" -"@types/html-webpack-plugin@^2.30.4": - version "2.30.4" - resolved "https://registry.npmjs.org/@types/html-webpack-plugin/-/html-webpack-plugin-2.30.4.tgz#65219d1a9b6ad4027100107d3dd08583a890b4b1" +"@types/html-webpack-plugin@^3.2.0": + version "3.2.0" + resolved "https://registry.npmjs.org/@types/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#26b20854124bbcccbc22ccec715a1ba74583526c" dependencies: "@types/html-minifier" "*" "@types/tapable" "*" @@ -1349,12 +1348,6 @@ "@types/koa-compose" "*" "@types/node" "*" -"@types/lodash.get@^4.4.3": - version "4.4.3" - resolved "https://registry.npmjs.org/@types/lodash.get/-/lodash.get-4.4.3.tgz#ac823d175a9593c10555b5097b72281effd544b5" - dependencies: - "@types/lodash" "*" - "@types/lodash.get@^4.4.4": version "4.4.4" resolved "https://registry.npmjs.org/@types/lodash.get/-/lodash.get-4.4.4.tgz#34b67841594e4ddc8853341d65e971a38cb4e2f0" @@ -1362,8 +1355,8 @@ "@types/lodash" "*" "@types/lodash@*": - version "4.14.108" - resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.108.tgz#02656af3add2e5b3174f830862c47421c00ef817" + version "4.14.115" + resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.115.tgz#54d171b2ce12c058742443b5f6754760f701b8f9" "@types/mime@*": version "2.0.0" @@ -1377,9 +1370,9 @@ version "10.0.0" resolved "https://registry.npmjs.org/@types/node/-/node-10.0.0.tgz#c40f8e07dce607d3ef25a626b93a6a7cdcf97881" -"@types/node@10.5.2", "@types/node@^10.5.2": - version "10.5.2" - resolved "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707" +"@types/node@10.5.4", "@types/node@^10.5.4": + version "10.5.4" + resolved "https://registry.npmjs.org/@types/node/-/node-10.5.4.tgz#6eccc158504357d1da91434d75e86acde94bb10b" "@types/prettier@^1.13.2": version "1.13.2" @@ -1413,9 +1406,9 @@ dependencies: csstype "^2.2.0" -"@types/react@^16.4.6": - version "16.4.6" - resolved "https://registry.npmjs.org/@types/react/-/react-16.4.6.tgz#5024957c6bcef4f02823accf5974faba2e54fada" +"@types/react@^16.4.7": + version "16.4.7" + resolved "https://registry.npmjs.org/@types/react/-/react-16.4.7.tgz#f33f6d759a7e1833befa15224d68942d178a5a3f" dependencies: csstype "^2.2.0" @@ -1461,9 +1454,9 @@ "@types/uglify-js" "*" source-map "^0.6.0" -"@types/webpack@^4.4.7": - version "4.4.7" - resolved "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.7.tgz#f56602ec814eff8cf0c7ced071350c9c7dfefc44" +"@types/webpack@^4.4.8": + version "4.4.8" + resolved "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.8.tgz#3af86780489a355e05f3de26b553537afc026acb" dependencies: "@types/node" "*" "@types/tapable" "*" @@ -1671,6 +1664,12 @@ accepts@^1.2.2, accepts@^1.3.5, accepts@~1.3.5: mime-types "~2.1.18" negotiator "0.6.1" +acorn-dynamic-import@^2.0.0: + version "2.0.2" + resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" + dependencies: + acorn "^4.0.3" + acorn-dynamic-import@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" @@ -1687,6 +1686,10 @@ acorn@^3.0.4: version "3.3.0" resolved "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" +acorn@^4.0.3: + version "4.0.13" + resolved "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" + acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.0: version "5.5.3" resolved "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" @@ -1709,7 +1712,7 @@ agent-base@4, agent-base@^4.1.0: dependencies: es6-promisify "^5.0.0" -ajv-keywords@^2.1.0: +ajv-keywords@^2.0.0, ajv-keywords@^2.1.0: version "2.1.1" resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" @@ -1724,7 +1727,7 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: +ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0: version "5.5.2" resolved "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: @@ -1799,6 +1802,10 @@ ansi-escapes@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" +ansi-html@0.0.7: + version "0.0.7" + resolved "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -1875,6 +1882,10 @@ arr-union@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" +array-differ@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" + array-filter@~0.0.0: version "0.0.1" resolved "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" @@ -2001,7 +2012,7 @@ async@^1.4.0, async@^1.5.0: version "1.5.2" resolved "https://registry.npmjs.org/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@^2.0.0-rc.1: +async@^2.0.0-rc.1, async@^2.1.2: version "2.6.1" resolved "https://registry.npmjs.org/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" dependencies: @@ -2052,6 +2063,10 @@ babel-code-frame@6.26.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: esutils "^2.0.2" js-tokens "^3.0.2" +babel-core@7.0.0-bridge.0: + version "7.0.0-bridge.0" + resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" + babel-core@^6.26.0, babel-core@^6.26.3: version "6.26.3" resolved "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" @@ -2198,6 +2213,15 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" +babel-loader@8.0.0-beta.3: + version "8.0.0-beta.3" + resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.0-beta.3.tgz#49efeea6e8058d5af860a18a6de88b8c1450645b" + dependencies: + find-cache-dir "^1.0.0" + loader-utils "^1.0.2" + mkdirp "^0.5.1" + util.promisify "^1.0.0" + babel-loader@^7.1.5: version "7.1.5" resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.5.tgz#e3ee0cd7394aa557e013b02d3e492bfd07aa6d68" @@ -2273,6 +2297,10 @@ babel-plugin-react-docgen@^2.0.0-rc.1: lodash "^4.17.10" react-docgen "^3.0.0-beta12" +babel-plugin-react-require@3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/babel-plugin-react-require/-/babel-plugin-react-require-3.0.0.tgz#2e4e7b4496b93a654a1c80042276de4e4eeb20e3" + babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" @@ -2293,7 +2321,7 @@ babel-plugin-syntax-flow@^6.18.0: version "6.18.0" resolved "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" -babel-plugin-syntax-jsx@^6.18.0, babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: +babel-plugin-syntax-jsx@6.18.0, babel-plugin-syntax-jsx@^6.18.0, babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: version "6.18.0" resolved "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" @@ -2556,6 +2584,10 @@ babel-plugin-transform-react-remove-prop-types@0.4.12: version "0.4.12" resolved "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.12.tgz#a382c27c42d6580748c80caf8c3d5091edbb60b8" +babel-plugin-transform-react-remove-prop-types@0.4.13: + version "0.4.13" + resolved "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.13.tgz#331cfc05099a808238311d78319c27460d481189" + babel-plugin-transform-regenerator@6.26.0, babel-plugin-transform-regenerator@^6.22.0: version "6.26.0" resolved "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" @@ -2732,7 +2764,7 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0: invariant "^2.2.2" lodash "^4.17.4" -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: +babel-types@6.26.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: version "6.26.0" resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" dependencies: @@ -3039,7 +3071,7 @@ bytes@3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" -cacache@^10.0.4: +cacache@^10.0.1, cacache@^10.0.4: version "10.0.4" resolved "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460" dependencies: @@ -3169,6 +3201,10 @@ capture-stack-trace@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" +case-sensitive-paths-webpack-plugin@2.1.1: + version "2.1.1" + resolved "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.1.tgz#3d29ced8c1f124bf6f53846fb3f5894731fdc909" + caseless@~0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -3815,7 +3851,7 @@ conventional-recommended-bump@^1.2.1: meow "^3.3.0" object-assign "^4.0.1" -convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: +convert-source-map@1.5.1, convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: version "1.5.1" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" @@ -3865,7 +3901,7 @@ core-js@^2.4.1, core-js@^2.5.0: version "2.5.6" resolved "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d" -core-js@^2.5.6, core-js@^2.5.7: +core-js@^2.5.3, core-js@^2.5.6, core-js@^2.5.7: version "2.5.7" resolved "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" @@ -4377,7 +4413,18 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -del@^2.0.2: +del@3.0.0, del@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" + dependencies: + globby "^6.1.0" + is-path-cwd "^1.0.0" + is-path-in-cwd "^1.0.0" + p-map "^1.1.1" + pify "^3.0.0" + rimraf "^2.2.8" + +del@^2.0.2, del@^2.2.0: version "2.2.2" resolved "https://registry.npmjs.org/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" dependencies: @@ -4389,17 +4436,6 @@ del@^2.0.2: pinkie-promise "^2.0.0" rimraf "^2.2.8" -del@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" - dependencies: - globby "^6.1.0" - is-path-cwd "^1.0.0" - is-path-in-cwd "^1.0.0" - p-map "^1.1.1" - pify "^3.0.0" - rimraf "^2.2.8" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -4639,6 +4675,10 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emitter-mixin@0.0.3: + version "0.0.3" + resolved "https://registry.npmjs.org/emitter-mixin/-/emitter-mixin-0.0.3.tgz#5948cb286f2e48edc3b251a7cfc1f7883396d65c" + "emoji-regex@>=6.0.0 <=6.1.1": version "6.1.1" resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e" @@ -4660,7 +4700,7 @@ emotion@^9.2.6: babel-plugin-emotion "^9.2.6" create-emotion "^9.2.6" -encodeurl@~1.0.2: +encodeurl@~1.0.1, encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -4676,6 +4716,15 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" +enhanced-resolve@^3.4.0: + version "3.4.1" + resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.4.0" + object-assign "^4.0.1" + tapable "^0.2.7" + enhanced-resolve@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a" @@ -4703,7 +4752,7 @@ env-dot-prop@^1.0.2: circular-json "^0.4.0" dot-prop "^4.2.0" -errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: +errno@^0.1.1, errno@^0.1.2, errno@^0.1.3, errno@~0.1.7: version "0.1.7" resolved "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" dependencies: @@ -4753,6 +4802,14 @@ es-to-primitive@^1.1.1: is-date-object "^1.0.1" is-symbol "^1.0.1" +es5-ext@^0.10.14: + version "0.10.45" + resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz#0bfdf7b473da5919d5adf3bd25ceb754fccc3653" + dependencies: + es6-iterator "~2.0.3" + es6-symbol "~3.1.1" + next-tick "1" + es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: version "0.10.42" resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d" @@ -4761,7 +4818,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: es6-symbol "~3.1.1" next-tick "1" -es6-iterator@~2.0.3: +es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: version "2.0.3" resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" dependencies: @@ -4769,6 +4826,17 @@ es6-iterator@~2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" +es6-map@^0.1.3: + version "0.1.5" + resolved "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" + dependencies: + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-set "~0.1.5" + es6-symbol "~3.1.1" + event-emitter "~0.3.5" + es6-promise@^4.0.3: version "4.2.4" resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29" @@ -4779,13 +4847,32 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" -es6-symbol@^3.1.1, es6-symbol@~3.1.1: +es6-set@~0.1.5: + version "0.1.5" + resolved "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" + dependencies: + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-symbol "3.1.1" + event-emitter "~0.3.5" + +es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: d "1" es5-ext "~0.10.14" +es6-weak-map@^2.0.1: + version "2.0.2" + resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" + dependencies: + d "1" + es5-ext "^0.10.14" + es6-iterator "^2.0.1" + es6-symbol "^3.1.1" + escape-html@^1.0.3, escape-html@~1.0.1, escape-html@~1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -4809,6 +4896,15 @@ escodegen@^1.8.1: optionalDependencies: source-map "~0.6.1" +escope@^3.6.0: + version "3.6.0" + resolved "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3" + dependencies: + es6-map "^0.1.3" + es6-weak-map "^2.0.1" + esrecurse "^4.1.0" + estraverse "^4.1.1" + eslint-scope@^3.7.1: version "3.7.1" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" @@ -4921,10 +5017,21 @@ esutils@^2.0.0, esutils@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" -etag@~1.8.1: +etag@1.8.1, etag@~1.8.1: version "1.8.1" resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" +event-emitter@~0.3.5: + version "0.3.5" + resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" + dependencies: + d "1" + es5-ext "~0.10.14" + +event-source-polyfill@0.0.12: + version "0.0.12" + resolved "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-0.0.12.tgz#e539cd67fdef2760a16aa5262fa98134df52e3af" + event-stream@~3.3.0: version "3.3.4" resolved "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" @@ -5241,7 +5348,7 @@ filesize@3.5.11: version "3.5.11" resolved "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee" -filesize@^3.5.11, filesize@^3.6.1: +filesize@^3.2.1, filesize@^3.5.11, filesize@^3.6.1: version "3.6.1" resolved "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" @@ -5307,6 +5414,12 @@ find-root@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" +find-up@2.1.0, find-up@^2.0.0, find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + dependencies: + locate-path "^2.0.0" + find-up@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -5314,12 +5427,6 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - dependencies: - locate-path "^2.0.0" - find-up@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -5403,6 +5510,10 @@ foreach@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" +foreachasync@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6" + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -5441,6 +5552,14 @@ fresh@0.5.2, fresh@^0.5.2, fresh@~0.5.2: version "0.5.2" resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" +friendly-errors-webpack-plugin@1.6.1: + version "1.6.1" + resolved "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.6.1.tgz#e32781c4722f546a06a9b5d7a7cfa28520375d70" + dependencies: + chalk "^1.1.3" + error-stack-parser "^2.0.0" + string-length "^1.0.1" + friendly-errors-webpack-plugin@^1.7.0: version "1.7.0" resolved "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz#efc86cbb816224565861a1be7a9d84d0aafea136" @@ -5713,24 +5832,24 @@ glob@7.1.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^6.0.4: - version "6.0.4" - resolved "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" +glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: + version "7.1.2" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: + fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "2 || 3" + minimatch "^3.0.4" once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: - version "7.1.2" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" +glob@^6.0.4: + version "6.0.4" + resolved "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" dependencies: - fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "2 || 3" once "^1.3.0" path-is-absolute "^1.0.0" @@ -5902,7 +6021,7 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -5970,6 +6089,10 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-flag@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -6161,6 +6284,10 @@ html-comment-regex@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" +html-entities@^1.2.0: + version "1.2.1" + resolved "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" + html-minifier@^3.2.3, html-minifier@^3.4.3: version "3.5.15" resolved "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz#f869848d4543cbfd84f26d5514a2a87cbf9a05e0" @@ -6185,6 +6312,10 @@ html-webpack-plugin@^3.2.0: toposort "^1.0.0" util.promisify "1.0.0" +htmlescape@1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" + htmlparser2@~3.3.0: version "3.3.0" resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe" @@ -6246,6 +6377,10 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +http-status@1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/http-status/-/http-status-1.0.1.tgz#dc43001a8bfc50ac87d485a892f7578964bc94a2" + https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" @@ -6957,6 +7092,10 @@ jsesc@~0.5.0: version "0.5.0" resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" +json-loader@^0.5.4: + version "0.5.7" + resolved "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" + json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -7020,6 +7159,10 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +junk@^1.0.1: + version "1.0.3" + resolved "https://registry.npmjs.org/junk/-/junk-1.0.3.tgz#87be63488649cbdca6f53ab39bec9ccd2347f592" + keygrip@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/keygrip/-/keygrip-1.0.2.tgz#ad3297c557069dea8bcfe7a4fa491b75c5ddeb91" @@ -7311,9 +7454,9 @@ less-loader@^4.1.0: loader-utils "^1.1.0" pify "^3.0.0" -less@^3.7.1: - version "3.7.1" - resolved "https://registry.npmjs.org/less/-/less-3.7.1.tgz#192e9dcef456ba3181a4e8d78a200f72a75e5c30" +less@^3.8.0: + version "3.8.0" + resolved "https://registry.npmjs.org/less/-/less-3.8.0.tgz#44785e40c23841c15ba3be741d36bd2775dd0596" optionalDependencies: errno "^0.1.1" graceful-fs "^4.1.2" @@ -7633,7 +7776,7 @@ lodash@4.17.5, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0: version "4.17.5" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" -"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.2, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.0, lodash@~4.17.10: +"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.2, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.5.1, lodash@~4.17.10: version "4.17.10" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -7780,6 +7923,15 @@ match-sorter@^2.2.3: dependencies: diacritic "0.0.2" +maximatch@^0.1.0: + version "0.1.0" + resolved "https://registry.npmjs.org/maximatch/-/maximatch-0.1.0.tgz#86cd8d6b04c9f307c05a6b9419906d0360fb13a2" + dependencies: + array-differ "^1.0.0" + array-union "^1.0.1" + arrify "^1.0.0" + minimatch "^3.0.0" + md5.js@^1.3.4: version "1.3.4" resolved "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d" @@ -8005,7 +8157,7 @@ mime@1.4.1: version "1.4.1" resolved "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" -mime@^1.4.1: +mime@^1.3.4, mime@^1.4.1: version "1.6.0" resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" @@ -8120,6 +8272,13 @@ mixin-object@^2.0.1: for-in "^0.1.3" is-extendable "^0.1.1" +mkdirp-then@1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/mkdirp-then/-/mkdirp-then-1.2.0.tgz#a492c879ca4d873f5ee45008f8f55fd0150de3c5" + dependencies: + any-promise "^1.1.0" + mkdirp "^0.5.0" + mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -8134,6 +8293,10 @@ module-details-from-path@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz#114c949673e2a8a35e9d35788527aa37b679da2b" +moment@^2.11.2: + version "2.22.2" + resolved "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" + moment@^2.6.0: version "2.22.1" resolved "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad" @@ -8254,6 +8417,64 @@ next-tick@1: version "1.0.0" resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" +next@^6.1.1: + version "6.1.1" + resolved "https://registry.npmjs.org/next/-/next-6.1.1.tgz#b86d6b773871cfeb189b926eb7089d12f291668e" + dependencies: + "@babel/core" "7.0.0-beta.42" + "@babel/plugin-proposal-class-properties" "7.0.0-beta.42" + "@babel/plugin-proposal-object-rest-spread" "7.0.0-beta.42" + "@babel/plugin-syntax-dynamic-import" "7.0.0-beta.42" + "@babel/plugin-transform-react-jsx-source" "7.0.0-beta.42" + "@babel/plugin-transform-runtime" "7.0.0-beta.42" + "@babel/preset-env" "7.0.0-beta.42" + "@babel/preset-react" "7.0.0-beta.42" + "@babel/runtime" "7.0.0-beta.42" + "@babel/template" "7.0.0-beta.42" + ansi-html "0.0.7" + babel-core "7.0.0-bridge.0" + babel-loader "8.0.0-beta.3" + babel-plugin-react-require "3.0.0" + babel-plugin-transform-react-remove-prop-types "0.4.13" + case-sensitive-paths-webpack-plugin "2.1.1" + cross-spawn "5.1.0" + del "3.0.0" + etag "1.8.1" + event-source-polyfill "0.0.12" + find-up "2.1.0" + fresh "0.5.2" + friendly-errors-webpack-plugin "1.6.1" + glob "7.1.2" + hoist-non-react-statics "2.5.0" + htmlescape "1.1.1" + http-errors "1.6.2" + http-status "1.0.1" + loader-utils "1.1.0" + minimist "1.2.0" + mkdirp-then "1.2.0" + path-to-regexp "2.1.0" + prop-types "15.6.0" + prop-types-exact "1.1.1" + react-lifecycles-compat "3.0.4" + recursive-copy "2.0.6" + resolve "1.5.0" + send "0.16.1" + source-map "0.5.7" + strip-ansi "3.0.1" + styled-jsx "2.2.6" + touch "3.1.0" + uglifyjs-webpack-plugin "1.1.6" + unfetch "3.0.0" + update-check "1.5.2" + url "0.11.0" + uuid "3.1.0" + walk "2.3.9" + webpack "3.10.0" + webpack-dev-middleware "1.12.0" + webpack-hot-middleware "2.19.1" + webpack-sources "1.1.0" + write-file-webpack-plugin "4.2.0" + nice-try@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" @@ -8574,7 +8795,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0: +object.assign@^4.0.4, object.assign@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" dependencies: @@ -8974,6 +9195,10 @@ path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" +path-to-regexp@2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.1.0.tgz#7e30f9f5b134bd6a28ffc2e3ef1e47075ac5259b" + path-to-regexp@^1.7.0: version "1.7.0" resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" @@ -9408,9 +9633,9 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.13.7: - version "1.13.7" - resolved "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" +prettier@^1.14.0: + version "1.14.0" + resolved "https://registry.npmjs.org/prettier/-/prettier-1.14.0.tgz#847c235522035fd988100f1f43cf20a7d24f9372" pretty-error@^2.0.2, pretty-error@^2.1.1: version "2.1.1" @@ -9481,12 +9706,27 @@ promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" -promise@^7.1.1: +promise@^7.0.1, promise@^7.1.1: version "7.3.1" resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" dependencies: asap "~2.0.3" +prop-types-exact@1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.1.1.tgz#c2620207e4f77f9762fa1835b0387a464bd08978" + dependencies: + has "^1.0.1" + object.assign "^4.0.4" + +prop-types@15.6.0: + version "15.6.0" + resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.3.1" + object-assign "^4.1.1" + prop-types@15.6.2, prop-types@^15.6.2: version "15.6.2" resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" @@ -9588,7 +9828,7 @@ querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" -querystring@0.2.0: +querystring@0.2.0, querystring@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" @@ -9736,9 +9976,9 @@ react-feather@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/react-feather/-/react-feather-1.1.1.tgz#dd59143af457601e68f2cd3bf32c0d94d30f89e7" -react-hot-loader@4.3.3: - version "4.3.3" - resolved "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.3.3.tgz#37409a3341c7787563d0972007ba02521f82f5d5" +react-hot-loader@4.3.4: + version "4.3.4" + resolved "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.3.4.tgz#4f9bdd55bb20d77a6ae8931fa1c187e5f0ce6279" dependencies: fast-levenshtein "^2.0.6" global "^4.3.0" @@ -9747,7 +9987,7 @@ react-hot-loader@4.3.3: react-lifecycles-compat "^3.0.4" shallowequal "^1.0.2" -react-lifecycles-compat@^3.0.4: +react-lifecycles-compat@3.0.4, react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -9945,6 +10185,21 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" +recursive-copy@2.0.6: + version "2.0.6" + resolved "https://registry.npmjs.org/recursive-copy/-/recursive-copy-2.0.6.tgz#d590f9eb5f165b96a1b80bc8f9cbcb5c6f9c89e9" + dependencies: + del "^2.2.0" + emitter-mixin "0.0.3" + errno "^0.1.2" + graceful-fs "^4.1.4" + junk "^1.0.1" + maximatch "^0.1.0" + mkdirp "^0.5.1" + pify "^2.3.0" + promise "^7.0.1" + slash "^1.0.0" + recursive-readdir@2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.1.tgz#90ef231d0778c5ce093c9a48d74e5c5422d13a99" @@ -10063,14 +10318,14 @@ regexpu-core@^4.1.3: unicode-match-property-ecmascript "^1.0.3" unicode-match-property-value-ecmascript "^1.0.1" -registry-auth-token@^3.0.1: +registry-auth-token@3.3.2, registry-auth-token@^3.0.1: version "3.3.2" resolved "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" dependencies: rc "^1.1.6" safe-buffer "^5.0.1" -registry-url@^3.0.3: +registry-url@3.1.0, registry-url@^3.0.3: version "3.1.0" resolved "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" dependencies: @@ -10367,6 +10622,12 @@ resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" +resolve@1.5.0: + version "1.5.0" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" + dependencies: + path-parse "^1.0.5" + resolve@^1.1.6, resolve@^1.5.0: version "1.6.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" @@ -10610,7 +10871,7 @@ sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" -schema-utils@^0.4.0, schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5: +schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5: version "0.4.5" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e" dependencies: @@ -10646,6 +10907,24 @@ semver@~5.3.0: version "5.3.0" resolved "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" +send@0.16.1: + version "0.16.1" + resolved "https://registry.npmjs.org/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" + dependencies: + debug "2.6.9" + depd "~1.1.1" + destroy "~1.0.4" + encodeurl "~1.0.1" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.6.2" + mime "1.4.1" + ms "2.0.0" + on-finished "~2.3.0" + range-parser "~1.2.0" + statuses "~1.3.1" + send@0.16.2: version "0.16.2" resolved "https://registry.npmjs.org/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" @@ -10897,20 +11176,20 @@ source-map@0.1.x: dependencies: amdefine ">=0.0.4" -source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: +source-map@0.5.7, source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: version "0.5.7" resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + source-map@^0.4.2, source-map@^0.4.4: version "0.4.4" resolved "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: amdefine ">=0.0.4" -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - source-map@^0.7.2: version "0.7.3" resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" @@ -11025,6 +11304,10 @@ static-extend@^0.1.1: version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" +statuses@~1.3.1: + version "1.3.1" + resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" + statuses@~1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" @@ -11083,6 +11366,16 @@ string-argv@^0.0.2: version "0.0.2" resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736" +string-hash@1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" + +string-length@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac" + dependencies: + strip-ansi "^3.0.0" + string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -11200,6 +11493,18 @@ style-loader@^0.21.0: loader-utils "^1.1.0" schema-utils "^0.4.5" +styled-jsx@2.2.6: + version "2.2.6" + resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-2.2.6.tgz#7e826279e1ef718213ef9cc42ac7370b5008449d" + dependencies: + babel-plugin-syntax-jsx "6.18.0" + babel-types "6.26.0" + convert-source-map "1.5.1" + source-map "0.6.1" + string-hash "1.1.3" + stylis "3.4.10" + stylis-rule-sheet "0.0.8" + stylehacks@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.0.tgz#64b323951c4a24e5fc7b2ec06c137bf32d155e8a" @@ -11208,10 +11513,18 @@ stylehacks@^4.0.0: postcss "^6.0.0" postcss-selector-parser "^3.0.0" +stylis-rule-sheet@0.0.8: + version "0.0.8" + resolved "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.8.tgz#b0d0a126c945b1f3047447a3aae0647013e8d166" + stylis-rule-sheet@^0.0.10: version "0.0.10" resolved "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" +stylis@3.4.10: + version "3.4.10" + resolved "https://registry.npmjs.org/stylis/-/stylis-3.4.10.tgz#a135cab4b9ff208e327fbb5a6fde3fa991c638ee" + stylis@^3.5.0: version "3.5.0" resolved "https://registry.npmjs.org/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1" @@ -11239,6 +11552,12 @@ supports-color@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" +supports-color@^4.2.1: + version "4.5.0" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" + dependencies: + has-flag "^2.0.0" + supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0: version "5.4.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" @@ -11290,6 +11609,10 @@ table@^4.0.2, table@^4.0.3: slice-ansi "1.0.0" string-width "^2.1.1" +tapable@^0.2.7: + version "0.2.8" + resolved "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" + tapable@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2" @@ -11397,6 +11720,10 @@ time-fix-plugin@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/time-fix-plugin/-/time-fix-plugin-2.0.1.tgz#4943dd28c8fa36a543aec34e3af2a173abc43de1" +time-stamp@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357" + timed-out@^3.0.0: version "3.1.3" resolved "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217" @@ -11480,6 +11807,12 @@ toposort@^1.0.0: version "1.0.7" resolved "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" +touch@3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" + dependencies: + nopt "~1.0.10" + touch@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz#449cbe2dbae5a8c8038e30d71fa0ff464947c4de" @@ -11681,7 +12014,7 @@ uglify-js@3.3.x: commander "~2.15.0" source-map "~0.6.1" -uglify-js@^2.6: +uglify-js@^2.6, uglify-js@^2.8.29: version "2.8.29" resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" dependencies: @@ -11694,6 +12027,27 @@ uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" +uglifyjs-webpack-plugin@1.1.6: + version "1.1.6" + resolved "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz#f4ba8449edcf17835c18ba6ae99b9d610857fb19" + dependencies: + cacache "^10.0.1" + find-cache-dir "^1.0.0" + schema-utils "^0.4.2" + serialize-javascript "^1.4.0" + source-map "^0.6.1" + uglify-es "^3.3.4" + webpack-sources "^1.1.0" + worker-farm "^1.5.2" + +uglifyjs-webpack-plugin@^0.4.6: + version "0.4.6" + resolved "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309" + dependencies: + source-map "^0.5.6" + uglify-js "^2.8.29" + webpack-sources "^1.0.1" + uglifyjs-webpack-plugin@^1.2.4: version "1.2.5" resolved "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641" @@ -11728,6 +12082,10 @@ ulid@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz#93063522771a9774121a84d126ecd3eb9804071f" +unfetch@3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/unfetch/-/unfetch-3.0.0.tgz#8d1e0513a4ecd0e5ff2d41a6ba77771aae8b6482" + unherit@^1.0.4: version "1.1.0" resolved "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d" @@ -11881,17 +12239,23 @@ unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz#3ccbdc53679eed6ecf3777dd7f5e3229c1b6aa3c" +unist-util-visit-parents@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz#63fffc8929027bee04bfef7d2cce474f71cb6217" + dependencies: + unist-util-is "^2.1.2" + unist-util-visit@^1.0.0, unist-util-visit@^1.1.0, unist-util-visit@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.0.tgz#41ca7c82981fd1ce6c762aac397fc24e35711444" dependencies: unist-util-is "^2.1.1" -unist-util-visit@^1.3.1: - version "1.3.1" - resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz#c019ac9337a62486be58531bc27e7499ae7d55c7" +unist-util-visit@^1.4.0: + version "1.4.0" + resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz#1cb763647186dc26f5e1df5db6bd1e48b3cc2fb1" dependencies: - unist-util-is "^2.1.1" + unist-util-visit-parents "^2.0.0" universalify@^0.1.0: version "0.1.1" @@ -11942,6 +12306,13 @@ upath@^1.0.5: version "1.1.0" resolved "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" +update-check@1.5.2: + version "1.5.2" + resolved "https://registry.npmjs.org/update-check/-/update-check-1.5.2.tgz#2fe09f725c543440b3d7dabe8971f2d5caaedc28" + dependencies: + registry-auth-token "3.3.2" + registry-url "3.1.0" + update-notifier@^1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz#8f92c515482bd6831b7c93013e70f87552c7cf5a" @@ -12023,7 +12394,7 @@ url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" -url@^0.11.0: +url@0.11.0, url@^0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" dependencies: @@ -12071,6 +12442,10 @@ utils-merge@1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" +uuid@3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + uuid@^2.0.1: version "2.0.3" resolved "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" @@ -12152,6 +12527,12 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" +walk@2.3.9: + version "2.3.9" + resolved "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz#31b4db6678f2ae01c39ea9fb8725a9031e558a7b" + dependencies: + foreachasync "^3.0.0" + warning@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" @@ -12164,7 +12545,7 @@ warning@^4.0.1: dependencies: loose-envify "^1.0.0" -watchpack@^1.5.0: +watchpack@^1.4.0, watchpack@^1.5.0: version "1.6.0" resolved "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" dependencies: @@ -12189,6 +12570,16 @@ webpack-chain@^4.8.0: deepmerge "^1.5.2" javascript-stringify "^1.6.0" +webpack-dev-middleware@1.12.0: + version "1.12.0" + resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709" + dependencies: + memory-fs "~0.4.1" + mime "^1.3.4" + path-is-absolute "^1.0.0" + range-parser "^1.0.3" + time-stamp "^2.0.0" + webpack-dev-middleware@^3.0.0: version "3.1.3" resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz#8b32aa43da9ae79368c1bf1183f2b6cf5e1f39ed" @@ -12214,6 +12605,15 @@ webpack-hot-client@^4.1.0, webpack-hot-client@^4.1.1: webpack-log "^1.1.1" ws "^4.0.0" +webpack-hot-middleware@2.19.1: + version "2.19.1" + resolved "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.19.1.tgz#5db32c31c955c1ead114d37c7519ea554da0d405" + dependencies: + ansi-html "0.0.7" + html-entities "^1.2.0" + querystring "^0.2.0" + strip-ansi "^3.0.0" + webpack-log@^1.0.1, webpack-log@^1.1.1, webpack-log@^1.1.2, webpack-log@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d" @@ -12273,16 +12673,43 @@ webpack-serve@^2.0.2: v8-compile-cache "^2.0.0" webpack-log "^1.1.2" -webpack-sources@^1.0.1, webpack-sources@^1.1.0: +webpack-sources@1.1.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" dependencies: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.16.1: - version "4.16.1" - resolved "https://registry.npmjs.org/webpack/-/webpack-4.16.1.tgz#2c4b89ea648125c3e67bcca6adf49ce2c14b2d31" +webpack@3.10.0: + version "3.10.0" + resolved "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725" + dependencies: + acorn "^5.0.0" + acorn-dynamic-import "^2.0.0" + ajv "^5.1.5" + ajv-keywords "^2.0.0" + async "^2.1.2" + enhanced-resolve "^3.4.0" + escope "^3.6.0" + interpret "^1.0.0" + json-loader "^0.5.4" + json5 "^0.5.1" + loader-runner "^2.3.0" + loader-utils "^1.1.0" + memory-fs "~0.4.1" + mkdirp "~0.5.0" + node-libs-browser "^2.0.0" + source-map "^0.5.3" + supports-color "^4.2.1" + tapable "^0.2.7" + uglifyjs-webpack-plugin "^0.4.6" + watchpack "^1.4.0" + webpack-sources "^1.0.1" + yargs "^8.0.2" + +webpack@^4.16.3: + version "4.16.3" + resolved "https://registry.npmjs.org/webpack/-/webpack-4.16.3.tgz#861be3176d81e7e3d71c66c8acc9bba35588b525" dependencies: "@webassemblyjs/ast" "1.5.13" "@webassemblyjs/helper-module-context" "1.5.13" @@ -12446,6 +12873,17 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" +write-file-webpack-plugin@4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/write-file-webpack-plugin/-/write-file-webpack-plugin-4.2.0.tgz#7bd18547eaa0ea0b23992fb1e0322e5431d339ef" + dependencies: + chalk "^1.1.1" + debug "^2.6.8" + filesize "^3.2.1" + lodash "^4.5.1" + mkdirp "^0.5.1" + moment "^2.11.2" + write-json-file@^2.2.0: version "2.3.0" resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f" From e094f79e75124139ef2a06465b2835ab20007ac6 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Sun, 29 Jul 2018 20:20:53 -0300 Subject: [PATCH 11/19] chore(docz-theme-default): some Handle adjustments --- .../src/components/ui/Render/Handle.tsx | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/packages/docz-theme-default/src/components/ui/Render/Handle.tsx b/packages/docz-theme-default/src/components/ui/Render/Handle.tsx index 73e4b720b..29d5572db 100644 --- a/packages/docz-theme-default/src/components/ui/Render/Handle.tsx +++ b/packages/docz-theme-default/src/components/ui/Render/Handle.tsx @@ -4,23 +4,26 @@ import styled, { css } from 'react-emotion' export const HANDLE_SIZE = '20px' -const line = (color: string, position: string, horizontal: boolean) => css` - position: absolute; - display: block; - top: ${horizontal ? '50%' : position}; - left: ${horizontal ? position : '50%'}; - content: ''; - width: ${horizontal ? '2px' : '25px'}; - height: ${horizontal ? '25px' : '2px'}; - background: ${color}; - transform: translate(-50%, -50%); -` - interface HandleProps { full: boolean horizontal: boolean + theme?: any } +const line = (position: string) => (p: HandleProps) => css` + content: ''; + position: absolute; + display: block; + top: ${p.horizontal ? '50%' : position}; + left: ${p.horizontal ? position : '50%'}; + width: ${p.horizontal ? '2px' : '25px'}; + height: ${p.horizontal ? '25px' : '2px'}; + background: ${p.theme.mode === 'light' + ? darken(0.05, p.theme.colors.border) + : lighten(0.06, p.theme.colors.border)}; + transform: translate(-50%, -50%); +` + const whenHorizontal = (on: any, off: any) => (p: HandleProps) => p.horizontal ? on : off @@ -49,20 +52,10 @@ export const Handle = styled('div')` )}; &:after { - ${p => - line( - lighten(0.06, p.theme.colors.border), - 'calc(50% + 3px)', - p.horizontal - )}; + ${line('calc(50% + 3px)')}; } &:before { - ${p => - line( - lighten(0.06, p.theme.colors.border), - 'calc(50% - 3px)', - p.horizontal - )}; + ${line('calc(50% - 3px)')}; } ` From 2d8526ba21f8b4c27e852dc262b1db93f9923285 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Mon, 30 Jul 2018 00:50:09 -0300 Subject: [PATCH 12/19] chore(docz): use react-loadable instead of loadable-components --- packages/docz/librc.js | 7 + packages/docz/package.json | 3 +- packages/docz/src/components/DocPreview.tsx | 34 +- yarn.lock | 594 +++----------------- 4 files changed, 105 insertions(+), 533 deletions(-) create mode 100644 packages/docz/librc.js diff --git a/packages/docz/librc.js b/packages/docz/librc.js new file mode 100644 index 000000000..fd6872533 --- /dev/null +++ b/packages/docz/librc.js @@ -0,0 +1,7 @@ +module.exports = { + commonjs: { + namedExports: { + '../../node_modules/@mdx-js/tag/dist/index.js': ['MDXProvider'], + }, + }, +} diff --git a/packages/docz/package.json b/packages/docz/package.json index c1177e0c6..419451319 100644 --- a/packages/docz/package.json +++ b/packages/docz/package.json @@ -36,11 +36,11 @@ "docz-theme-default": "^0.8.0", "env-dot-prop": "^1.0.2", "invariant": "^2.2.4", - "loadable-components": "^2.2.2", "pascalcase": "^0.1.1", "prop-types": "^15.6.2", "react": "^16.2.0", "react-dom": "^16.2.0", + "react-loadable": "^5.4.0", "react-router-dom": "^4.3.1", "react-router-hash-link": "^1.2.0", "yargs": "^12.0.1" @@ -54,6 +54,7 @@ "@types/deepmerge": "^2.1.0", "@types/react": "^16.4.7", "@types/react-dom": "^16.0.6", + "@types/react-loadable": "^5.4.0", "@types/react-router-dom": "^4.3.0" } } diff --git a/packages/docz/src/components/DocPreview.tsx b/packages/docz/src/components/DocPreview.tsx index 0fb3d65a9..82de472ed 100644 --- a/packages/docz/src/components/DocPreview.tsx +++ b/packages/docz/src/components/DocPreview.tsx @@ -1,10 +1,11 @@ import * as React from 'react' import { Fragment, SFC, ComponentType } from 'react' import { Switch, Route, RouteComponentProps } from 'react-router-dom' -import { default as mdxtag } from '@mdx-js/tag' -import loadable from 'loadable-components' +import { MDXProvider } from '@mdx-js/tag' +import { withMDXComponents } from '@mdx-js/tag/dist/mdx-provider' +import Loadable from 'react-loadable' -import { dataContext, Entry, ImportMap } from '../theme' +import { dataContext, Entry } from '../theme' export type PageProps = RouteComponentProps & { doc: Entry @@ -59,13 +60,6 @@ export interface ComponentsMap { [key: string]: any } -const loadImport = (imports: ImportMap, components: ComponentsMap) => ( - path: string -) => async (): Promise> => { - const { default: Component } = await imports[path]() - return props => -} - const defaultComponents: ComponentsMap = { loading: DefaultLoading, render: DefaultRender, @@ -85,20 +79,24 @@ export const DocPreview: SFC = ({ ...themeComponents, } - const Page = components.page - const NotFound = components.notFound - const LoadingComponent = components.loading + const Page: any = components.page + const NotFound: any = components.notFound + const LoadingComponent: any = components.loading return ( - + {({ imports, entries }) => ( {Object.keys(imports).map(path => { const entry = entries && entries[path] - const load = loadImport(imports, components) - const AsyncComponent = loadable(load(path), { - LoadingComponent, + const AsyncComponent: any = Loadable({ + loader: imports[path], + loading: LoadingComponent, + render(loaded, props): React.ReactNode { + const Component = withMDXComponents(loaded.default) + return + }, }) return ( @@ -124,6 +122,6 @@ export const DocPreview: SFC = ({ )} - + ) } diff --git a/yarn.lock b/yarn.lock index c7790b459..1b9895ed5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -422,6 +422,12 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-syntax-dynamic-import@^7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.55.tgz#bcefae7e8f7a85a5d56de54b02079998b98b7cd6" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-flow@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0-beta.42.tgz#cc210adacb65c6c155578e7ccee30a53d1003a23" @@ -785,13 +791,6 @@ "@babel/helper-plugin-utils" "7.0.0-beta.55" "@babel/plugin-transform-typescript" "7.0.0-beta.55" -"@babel/runtime@7.0.0-beta.42": - version "7.0.0-beta.42" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.42.tgz#352e40c92e0460d3e82f49bd7e79f6cda76f919f" - dependencies: - core-js "^2.5.3" - regenerator-runtime "^0.11.1" - "@babel/runtime@7.0.0-beta.49": version "7.0.0-beta.49" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.49.tgz#03b3bf07eb982072c8e851dd2ddd5110282e61bf" @@ -1385,6 +1384,13 @@ "@types/node" "*" "@types/react" "*" +"@types/react-loadable@^5.4.0": + version "5.4.0" + resolved "https://registry.npmjs.org/@types/react-loadable/-/react-loadable-5.4.0.tgz#7a4f0673de07473525ab27959cf4c2601e25f37f" + dependencies: + "@types/react" "*" + "@types/webpack" "*" + "@types/react-router-dom@^4.3.0": version "4.3.0" resolved "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.3.0.tgz#c91796d02deb3a5b24bc1c5db4a255df0d18b8b5" @@ -1664,12 +1670,6 @@ accepts@^1.2.2, accepts@^1.3.5, accepts@~1.3.5: mime-types "~2.1.18" negotiator "0.6.1" -acorn-dynamic-import@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" - dependencies: - acorn "^4.0.3" - acorn-dynamic-import@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" @@ -1686,10 +1686,6 @@ acorn@^3.0.4: version "3.3.0" resolved "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.3: - version "4.0.13" - resolved "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" - acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.0: version "5.5.3" resolved "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" @@ -1712,7 +1708,7 @@ agent-base@4, agent-base@^4.1.0: dependencies: es6-promisify "^5.0.0" -ajv-keywords@^2.0.0, ajv-keywords@^2.1.0: +ajv-keywords@^2.1.0: version "2.1.1" resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" @@ -1727,7 +1723,7 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0: +ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: version "5.5.2" resolved "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: @@ -1802,10 +1798,6 @@ ansi-escapes@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" -ansi-html@0.0.7: - version "0.0.7" - resolved "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -1882,10 +1874,6 @@ arr-union@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" -array-differ@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" - array-filter@~0.0.0: version "0.0.1" resolved "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" @@ -2012,7 +2000,7 @@ async@^1.4.0, async@^1.5.0: version "1.5.2" resolved "https://registry.npmjs.org/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@^2.0.0-rc.1, async@^2.1.2: +async@^2.0.0-rc.1: version "2.6.1" resolved "https://registry.npmjs.org/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" dependencies: @@ -2063,10 +2051,6 @@ babel-code-frame@6.26.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-core@7.0.0-bridge.0: - version "7.0.0-bridge.0" - resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" - babel-core@^6.26.0, babel-core@^6.26.3: version "6.26.3" resolved "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" @@ -2213,15 +2197,6 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-loader@8.0.0-beta.3: - version "8.0.0-beta.3" - resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.0-beta.3.tgz#49efeea6e8058d5af860a18a6de88b8c1450645b" - dependencies: - find-cache-dir "^1.0.0" - loader-utils "^1.0.2" - mkdirp "^0.5.1" - util.promisify "^1.0.0" - babel-loader@^7.1.5: version "7.1.5" resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.5.tgz#e3ee0cd7394aa557e013b02d3e492bfd07aa6d68" @@ -2297,10 +2272,6 @@ babel-plugin-react-docgen@^2.0.0-rc.1: lodash "^4.17.10" react-docgen "^3.0.0-beta12" -babel-plugin-react-require@3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/babel-plugin-react-require/-/babel-plugin-react-require-3.0.0.tgz#2e4e7b4496b93a654a1c80042276de4e4eeb20e3" - babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" @@ -2321,7 +2292,7 @@ babel-plugin-syntax-flow@^6.18.0: version "6.18.0" resolved "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" -babel-plugin-syntax-jsx@6.18.0, babel-plugin-syntax-jsx@^6.18.0, babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: +babel-plugin-syntax-jsx@^6.18.0, babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: version "6.18.0" resolved "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" @@ -2584,10 +2555,6 @@ babel-plugin-transform-react-remove-prop-types@0.4.12: version "0.4.12" resolved "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.12.tgz#a382c27c42d6580748c80caf8c3d5091edbb60b8" -babel-plugin-transform-react-remove-prop-types@0.4.13: - version "0.4.13" - resolved "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.13.tgz#331cfc05099a808238311d78319c27460d481189" - babel-plugin-transform-regenerator@6.26.0, babel-plugin-transform-regenerator@^6.22.0: version "6.26.0" resolved "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" @@ -2764,7 +2731,7 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0: invariant "^2.2.2" lodash "^4.17.4" -babel-types@6.26.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: +babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: version "6.26.0" resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" dependencies: @@ -3071,7 +3038,7 @@ bytes@3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" -cacache@^10.0.1, cacache@^10.0.4: +cacache@^10.0.4: version "10.0.4" resolved "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460" dependencies: @@ -3201,10 +3168,6 @@ capture-stack-trace@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" -case-sensitive-paths-webpack-plugin@2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.1.tgz#3d29ced8c1f124bf6f53846fb3f5894731fdc909" - caseless@~0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -3851,7 +3814,7 @@ conventional-recommended-bump@^1.2.1: meow "^3.3.0" object-assign "^4.0.1" -convert-source-map@1.5.1, convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: +convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: version "1.5.1" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" @@ -3901,7 +3864,7 @@ core-js@^2.4.1, core-js@^2.5.0: version "2.5.6" resolved "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d" -core-js@^2.5.3, core-js@^2.5.6, core-js@^2.5.7: +core-js@^2.5.6, core-js@^2.5.7: version "2.5.7" resolved "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" @@ -4413,18 +4376,7 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -del@3.0.0, del@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" - dependencies: - globby "^6.1.0" - is-path-cwd "^1.0.0" - is-path-in-cwd "^1.0.0" - p-map "^1.1.1" - pify "^3.0.0" - rimraf "^2.2.8" - -del@^2.0.2, del@^2.2.0: +del@^2.0.2: version "2.2.2" resolved "https://registry.npmjs.org/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" dependencies: @@ -4436,6 +4388,17 @@ del@^2.0.2, del@^2.2.0: pinkie-promise "^2.0.0" rimraf "^2.2.8" +del@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" + dependencies: + globby "^6.1.0" + is-path-cwd "^1.0.0" + is-path-in-cwd "^1.0.0" + p-map "^1.1.1" + pify "^3.0.0" + rimraf "^2.2.8" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -4675,10 +4638,6 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -emitter-mixin@0.0.3: - version "0.0.3" - resolved "https://registry.npmjs.org/emitter-mixin/-/emitter-mixin-0.0.3.tgz#5948cb286f2e48edc3b251a7cfc1f7883396d65c" - "emoji-regex@>=6.0.0 <=6.1.1": version "6.1.1" resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e" @@ -4700,7 +4659,7 @@ emotion@^9.2.6: babel-plugin-emotion "^9.2.6" create-emotion "^9.2.6" -encodeurl@~1.0.1, encodeurl@~1.0.2: +encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -4716,15 +4675,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^3.4.0: - version "3.4.1" - resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.4.0" - object-assign "^4.0.1" - tapable "^0.2.7" - enhanced-resolve@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a" @@ -4752,7 +4702,7 @@ env-dot-prop@^1.0.2: circular-json "^0.4.0" dot-prop "^4.2.0" -errno@^0.1.1, errno@^0.1.2, errno@^0.1.3, errno@~0.1.7: +errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: version "0.1.7" resolved "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" dependencies: @@ -4802,14 +4752,6 @@ es-to-primitive@^1.1.1: is-date-object "^1.0.1" is-symbol "^1.0.1" -es5-ext@^0.10.14: - version "0.10.45" - resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz#0bfdf7b473da5919d5adf3bd25ceb754fccc3653" - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.1" - next-tick "1" - es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: version "0.10.42" resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d" @@ -4818,7 +4760,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: es6-symbol "~3.1.1" next-tick "1" -es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: +es6-iterator@~2.0.3: version "2.0.3" resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" dependencies: @@ -4826,17 +4768,6 @@ es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" -es6-map@^0.1.3: - version "0.1.5" - resolved "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" - dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-set "~0.1.5" - es6-symbol "~3.1.1" - event-emitter "~0.3.5" - es6-promise@^4.0.3: version "4.2.4" resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29" @@ -4847,32 +4778,13 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" -es6-set@~0.1.5: - version "0.1.5" - resolved "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" - dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-symbol "3.1.1" - event-emitter "~0.3.5" - -es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: +es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: d "1" es5-ext "~0.10.14" -es6-weak-map@^2.0.1: - version "2.0.2" - resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" - dependencies: - d "1" - es5-ext "^0.10.14" - es6-iterator "^2.0.1" - es6-symbol "^3.1.1" - escape-html@^1.0.3, escape-html@~1.0.1, escape-html@~1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -4896,15 +4808,6 @@ escodegen@^1.8.1: optionalDependencies: source-map "~0.6.1" -escope@^3.6.0: - version "3.6.0" - resolved "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3" - dependencies: - es6-map "^0.1.3" - es6-weak-map "^2.0.1" - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^3.7.1: version "3.7.1" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" @@ -5017,21 +4920,10 @@ esutils@^2.0.0, esutils@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" -etag@1.8.1, etag@~1.8.1: +etag@~1.8.1: version "1.8.1" resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" -event-emitter@~0.3.5: - version "0.3.5" - resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" - dependencies: - d "1" - es5-ext "~0.10.14" - -event-source-polyfill@0.0.12: - version "0.0.12" - resolved "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-0.0.12.tgz#e539cd67fdef2760a16aa5262fa98134df52e3af" - event-stream@~3.3.0: version "3.3.4" resolved "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" @@ -5348,7 +5240,7 @@ filesize@3.5.11: version "3.5.11" resolved "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee" -filesize@^3.2.1, filesize@^3.5.11, filesize@^3.6.1: +filesize@^3.5.11, filesize@^3.6.1: version "3.6.1" resolved "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" @@ -5414,12 +5306,6 @@ find-root@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" -find-up@2.1.0, find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - dependencies: - locate-path "^2.0.0" - find-up@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -5427,6 +5313,12 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" +find-up@^2.0.0, find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + dependencies: + locate-path "^2.0.0" + find-up@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -5510,10 +5402,6 @@ foreach@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" -foreachasync@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -5552,14 +5440,6 @@ fresh@0.5.2, fresh@^0.5.2, fresh@~0.5.2: version "0.5.2" resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" -friendly-errors-webpack-plugin@1.6.1: - version "1.6.1" - resolved "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.6.1.tgz#e32781c4722f546a06a9b5d7a7cfa28520375d70" - dependencies: - chalk "^1.1.3" - error-stack-parser "^2.0.0" - string-length "^1.0.1" - friendly-errors-webpack-plugin@^1.7.0: version "1.7.0" resolved "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz#efc86cbb816224565861a1be7a9d84d0aafea136" @@ -5832,24 +5712,24 @@ glob@7.1.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: - version "7.1.2" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" +glob@^6.0.4: + version "6.0.4" + resolved "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" dependencies: - fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "2 || 3" once "^1.3.0" path-is-absolute "^1.0.0" -glob@^6.0.4: - version "6.0.4" - resolved "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: + version "7.1.2" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: + fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "2 || 3" + minimatch "^3.0.4" once "^1.3.0" path-is-absolute "^1.0.0" @@ -6021,7 +5901,7 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -6089,10 +5969,6 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -6284,10 +6160,6 @@ html-comment-regex@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" -html-entities@^1.2.0: - version "1.2.1" - resolved "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" - html-minifier@^3.2.3, html-minifier@^3.4.3: version "3.5.15" resolved "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz#f869848d4543cbfd84f26d5514a2a87cbf9a05e0" @@ -6312,10 +6184,6 @@ html-webpack-plugin@^3.2.0: toposort "^1.0.0" util.promisify "1.0.0" -htmlescape@1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" - htmlparser2@~3.3.0: version "3.3.0" resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe" @@ -6377,10 +6245,6 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -http-status@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/http-status/-/http-status-1.0.1.tgz#dc43001a8bfc50ac87d485a892f7578964bc94a2" - https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" @@ -7092,10 +6956,6 @@ jsesc@~0.5.0: version "0.5.0" resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" -json-loader@^0.5.4: - version "0.5.7" - resolved "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" - json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -7159,10 +7019,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -junk@^1.0.1: - version "1.0.3" - resolved "https://registry.npmjs.org/junk/-/junk-1.0.3.tgz#87be63488649cbdca6f53ab39bec9ccd2347f592" - keygrip@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/keygrip/-/keygrip-1.0.2.tgz#ad3297c557069dea8bcfe7a4fa491b75c5ddeb91" @@ -7621,13 +7477,6 @@ load-json-file@^4.0.0: pify "^3.0.0" strip-bom "^3.0.0" -loadable-components@^2.2.2: - version "2.2.2" - resolved "https://registry.npmjs.org/loadable-components/-/loadable-components-2.2.2.tgz#0362f5d6d0607f5d9bcc7932c7cdba6f256cbd46" - dependencies: - babel-plugin-syntax-dynamic-import "^6.18.0" - hoist-non-react-statics "^2.5.0" - loader-runner@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" @@ -7776,7 +7625,7 @@ lodash@4.17.5, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0: version "4.17.5" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" -"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.2, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.5.1, lodash@~4.17.10: +"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.2, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.0, lodash@~4.17.10: version "4.17.10" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -7923,15 +7772,6 @@ match-sorter@^2.2.3: dependencies: diacritic "0.0.2" -maximatch@^0.1.0: - version "0.1.0" - resolved "https://registry.npmjs.org/maximatch/-/maximatch-0.1.0.tgz#86cd8d6b04c9f307c05a6b9419906d0360fb13a2" - dependencies: - array-differ "^1.0.0" - array-union "^1.0.1" - arrify "^1.0.0" - minimatch "^3.0.0" - md5.js@^1.3.4: version "1.3.4" resolved "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d" @@ -8157,7 +7997,7 @@ mime@1.4.1: version "1.4.1" resolved "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" -mime@^1.3.4, mime@^1.4.1: +mime@^1.4.1: version "1.6.0" resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" @@ -8272,13 +8112,6 @@ mixin-object@^2.0.1: for-in "^0.1.3" is-extendable "^0.1.1" -mkdirp-then@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/mkdirp-then/-/mkdirp-then-1.2.0.tgz#a492c879ca4d873f5ee45008f8f55fd0150de3c5" - dependencies: - any-promise "^1.1.0" - mkdirp "^0.5.0" - mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -8293,10 +8126,6 @@ module-details-from-path@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz#114c949673e2a8a35e9d35788527aa37b679da2b" -moment@^2.11.2: - version "2.22.2" - resolved "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" - moment@^2.6.0: version "2.22.1" resolved "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad" @@ -8417,64 +8246,6 @@ next-tick@1: version "1.0.0" resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" -next@^6.1.1: - version "6.1.1" - resolved "https://registry.npmjs.org/next/-/next-6.1.1.tgz#b86d6b773871cfeb189b926eb7089d12f291668e" - dependencies: - "@babel/core" "7.0.0-beta.42" - "@babel/plugin-proposal-class-properties" "7.0.0-beta.42" - "@babel/plugin-proposal-object-rest-spread" "7.0.0-beta.42" - "@babel/plugin-syntax-dynamic-import" "7.0.0-beta.42" - "@babel/plugin-transform-react-jsx-source" "7.0.0-beta.42" - "@babel/plugin-transform-runtime" "7.0.0-beta.42" - "@babel/preset-env" "7.0.0-beta.42" - "@babel/preset-react" "7.0.0-beta.42" - "@babel/runtime" "7.0.0-beta.42" - "@babel/template" "7.0.0-beta.42" - ansi-html "0.0.7" - babel-core "7.0.0-bridge.0" - babel-loader "8.0.0-beta.3" - babel-plugin-react-require "3.0.0" - babel-plugin-transform-react-remove-prop-types "0.4.13" - case-sensitive-paths-webpack-plugin "2.1.1" - cross-spawn "5.1.0" - del "3.0.0" - etag "1.8.1" - event-source-polyfill "0.0.12" - find-up "2.1.0" - fresh "0.5.2" - friendly-errors-webpack-plugin "1.6.1" - glob "7.1.2" - hoist-non-react-statics "2.5.0" - htmlescape "1.1.1" - http-errors "1.6.2" - http-status "1.0.1" - loader-utils "1.1.0" - minimist "1.2.0" - mkdirp-then "1.2.0" - path-to-regexp "2.1.0" - prop-types "15.6.0" - prop-types-exact "1.1.1" - react-lifecycles-compat "3.0.4" - recursive-copy "2.0.6" - resolve "1.5.0" - send "0.16.1" - source-map "0.5.7" - strip-ansi "3.0.1" - styled-jsx "2.2.6" - touch "3.1.0" - uglifyjs-webpack-plugin "1.1.6" - unfetch "3.0.0" - update-check "1.5.2" - url "0.11.0" - uuid "3.1.0" - walk "2.3.9" - webpack "3.10.0" - webpack-dev-middleware "1.12.0" - webpack-hot-middleware "2.19.1" - webpack-sources "1.1.0" - write-file-webpack-plugin "4.2.0" - nice-try@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" @@ -8795,7 +8566,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.0.4, object.assign@^4.1.0: +object.assign@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" dependencies: @@ -9195,10 +8966,6 @@ path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" -path-to-regexp@2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.1.0.tgz#7e30f9f5b134bd6a28ffc2e3ef1e47075ac5259b" - path-to-regexp@^1.7.0: version "1.7.0" resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" @@ -9706,28 +9473,13 @@ promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" -promise@^7.0.1, promise@^7.1.1: +promise@^7.1.1: version "7.3.1" resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" dependencies: asap "~2.0.3" -prop-types-exact@1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.1.1.tgz#c2620207e4f77f9762fa1835b0387a464bd08978" - dependencies: - has "^1.0.1" - object.assign "^4.0.4" - -prop-types@15.6.0: - version "15.6.0" - resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" - dependencies: - fbjs "^0.8.16" - loose-envify "^1.3.1" - object-assign "^4.1.1" - -prop-types@15.6.2, prop-types@^15.6.2: +prop-types@15.6.2, prop-types@^15.5.0, prop-types@^15.6.2: version "15.6.2" resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" dependencies: @@ -9828,7 +9580,7 @@ querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" -querystring@0.2.0, querystring@^0.2.0: +querystring@0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" @@ -9987,7 +9739,7 @@ react-hot-loader@4.3.4: react-lifecycles-compat "^3.0.4" shallowequal "^1.0.2" -react-lifecycles-compat@3.0.4, react-lifecycles-compat@^3.0.4: +react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -9995,6 +9747,12 @@ react-lightweight-tooltip@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/react-lightweight-tooltip/-/react-lightweight-tooltip-1.0.0.tgz#1fb96831b88de21a4d73d02148aae3d8d0aea9bc" +react-loadable@^5.4.0: + version "5.4.0" + resolved "https://registry.npmjs.org/react-loadable/-/react-loadable-5.4.0.tgz#3b6b7d51121a7868fd155be848a36e02084742c9" + dependencies: + prop-types "^15.5.0" + react-powerplug@^1.0.0-rc.1: version "1.0.0-rc.1" resolved "https://registry.npmjs.org/react-powerplug/-/react-powerplug-1.0.0-rc.1.tgz#6b3bc57e31684e8bc36baa7a65af602ba0e31145" @@ -10185,21 +9943,6 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -recursive-copy@2.0.6: - version "2.0.6" - resolved "https://registry.npmjs.org/recursive-copy/-/recursive-copy-2.0.6.tgz#d590f9eb5f165b96a1b80bc8f9cbcb5c6f9c89e9" - dependencies: - del "^2.2.0" - emitter-mixin "0.0.3" - errno "^0.1.2" - graceful-fs "^4.1.4" - junk "^1.0.1" - maximatch "^0.1.0" - mkdirp "^0.5.1" - pify "^2.3.0" - promise "^7.0.1" - slash "^1.0.0" - recursive-readdir@2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.1.tgz#90ef231d0778c5ce093c9a48d74e5c5422d13a99" @@ -10318,14 +10061,14 @@ regexpu-core@^4.1.3: unicode-match-property-ecmascript "^1.0.3" unicode-match-property-value-ecmascript "^1.0.1" -registry-auth-token@3.3.2, registry-auth-token@^3.0.1: +registry-auth-token@^3.0.1: version "3.3.2" resolved "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" dependencies: rc "^1.1.6" safe-buffer "^5.0.1" -registry-url@3.1.0, registry-url@^3.0.3: +registry-url@^3.0.3: version "3.1.0" resolved "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" dependencies: @@ -10622,12 +10365,6 @@ resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" -resolve@1.5.0: - version "1.5.0" - resolved "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" - dependencies: - path-parse "^1.0.5" - resolve@^1.1.6, resolve@^1.5.0: version "1.6.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" @@ -10871,7 +10608,7 @@ sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" -schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5: +schema-utils@^0.4.0, schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5: version "0.4.5" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e" dependencies: @@ -10907,24 +10644,6 @@ semver@~5.3.0: version "5.3.0" resolved "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" -send@0.16.1: - version "0.16.1" - resolved "https://registry.npmjs.org/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" - dependencies: - debug "2.6.9" - depd "~1.1.1" - destroy "~1.0.4" - encodeurl "~1.0.1" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.6.2" - mime "1.4.1" - ms "2.0.0" - on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.3.1" - send@0.16.2: version "0.16.2" resolved "https://registry.npmjs.org/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" @@ -11176,20 +10895,20 @@ source-map@0.1.x: dependencies: amdefine ">=0.0.4" -source-map@0.5.7, source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: +source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: version "0.5.7" resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" -source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - source-map@^0.4.2, source-map@^0.4.4: version "0.4.4" resolved "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: amdefine ">=0.0.4" +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + source-map@^0.7.2: version "0.7.3" resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" @@ -11304,10 +11023,6 @@ static-extend@^0.1.1: version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" -statuses@~1.3.1: - version "1.3.1" - resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" - statuses@~1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" @@ -11366,16 +11081,6 @@ string-argv@^0.0.2: version "0.0.2" resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736" -string-hash@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" - -string-length@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac" - dependencies: - strip-ansi "^3.0.0" - string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -11493,18 +11198,6 @@ style-loader@^0.21.0: loader-utils "^1.1.0" schema-utils "^0.4.5" -styled-jsx@2.2.6: - version "2.2.6" - resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-2.2.6.tgz#7e826279e1ef718213ef9cc42ac7370b5008449d" - dependencies: - babel-plugin-syntax-jsx "6.18.0" - babel-types "6.26.0" - convert-source-map "1.5.1" - source-map "0.6.1" - string-hash "1.1.3" - stylis "3.4.10" - stylis-rule-sheet "0.0.8" - stylehacks@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.0.tgz#64b323951c4a24e5fc7b2ec06c137bf32d155e8a" @@ -11513,18 +11206,10 @@ stylehacks@^4.0.0: postcss "^6.0.0" postcss-selector-parser "^3.0.0" -stylis-rule-sheet@0.0.8: - version "0.0.8" - resolved "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.8.tgz#b0d0a126c945b1f3047447a3aae0647013e8d166" - stylis-rule-sheet@^0.0.10: version "0.0.10" resolved "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" -stylis@3.4.10: - version "3.4.10" - resolved "https://registry.npmjs.org/stylis/-/stylis-3.4.10.tgz#a135cab4b9ff208e327fbb5a6fde3fa991c638ee" - stylis@^3.5.0: version "3.5.0" resolved "https://registry.npmjs.org/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1" @@ -11552,12 +11237,6 @@ supports-color@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" -supports-color@^4.2.1: - version "4.5.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" - dependencies: - has-flag "^2.0.0" - supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0: version "5.4.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" @@ -11609,10 +11288,6 @@ table@^4.0.2, table@^4.0.3: slice-ansi "1.0.0" string-width "^2.1.1" -tapable@^0.2.7: - version "0.2.8" - resolved "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" - tapable@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2" @@ -11720,10 +11395,6 @@ time-fix-plugin@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/time-fix-plugin/-/time-fix-plugin-2.0.1.tgz#4943dd28c8fa36a543aec34e3af2a173abc43de1" -time-stamp@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357" - timed-out@^3.0.0: version "3.1.3" resolved "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217" @@ -11807,12 +11478,6 @@ toposort@^1.0.0: version "1.0.7" resolved "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" -touch@3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" - dependencies: - nopt "~1.0.10" - touch@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz#449cbe2dbae5a8c8038e30d71fa0ff464947c4de" @@ -12014,7 +11679,7 @@ uglify-js@3.3.x: commander "~2.15.0" source-map "~0.6.1" -uglify-js@^2.6, uglify-js@^2.8.29: +uglify-js@^2.6: version "2.8.29" resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" dependencies: @@ -12027,27 +11692,6 @@ uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" -uglifyjs-webpack-plugin@1.1.6: - version "1.1.6" - resolved "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz#f4ba8449edcf17835c18ba6ae99b9d610857fb19" - dependencies: - cacache "^10.0.1" - find-cache-dir "^1.0.0" - schema-utils "^0.4.2" - serialize-javascript "^1.4.0" - source-map "^0.6.1" - uglify-es "^3.3.4" - webpack-sources "^1.1.0" - worker-farm "^1.5.2" - -uglifyjs-webpack-plugin@^0.4.6: - version "0.4.6" - resolved "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309" - dependencies: - source-map "^0.5.6" - uglify-js "^2.8.29" - webpack-sources "^1.0.1" - uglifyjs-webpack-plugin@^1.2.4: version "1.2.5" resolved "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641" @@ -12082,10 +11726,6 @@ ulid@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz#93063522771a9774121a84d126ecd3eb9804071f" -unfetch@3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/unfetch/-/unfetch-3.0.0.tgz#8d1e0513a4ecd0e5ff2d41a6ba77771aae8b6482" - unherit@^1.0.4: version "1.1.0" resolved "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d" @@ -12306,13 +11946,6 @@ upath@^1.0.5: version "1.1.0" resolved "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" -update-check@1.5.2: - version "1.5.2" - resolved "https://registry.npmjs.org/update-check/-/update-check-1.5.2.tgz#2fe09f725c543440b3d7dabe8971f2d5caaedc28" - dependencies: - registry-auth-token "3.3.2" - registry-url "3.1.0" - update-notifier@^1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz#8f92c515482bd6831b7c93013e70f87552c7cf5a" @@ -12394,7 +12027,7 @@ url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" -url@0.11.0, url@^0.11.0: +url@^0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" dependencies: @@ -12442,10 +12075,6 @@ utils-merge@1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" -uuid@3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" - uuid@^2.0.1: version "2.0.3" resolved "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" @@ -12527,12 +12156,6 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" -walk@2.3.9: - version "2.3.9" - resolved "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz#31b4db6678f2ae01c39ea9fb8725a9031e558a7b" - dependencies: - foreachasync "^3.0.0" - warning@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" @@ -12545,7 +12168,7 @@ warning@^4.0.1: dependencies: loose-envify "^1.0.0" -watchpack@^1.4.0, watchpack@^1.5.0: +watchpack@^1.5.0: version "1.6.0" resolved "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" dependencies: @@ -12570,16 +12193,6 @@ webpack-chain@^4.8.0: deepmerge "^1.5.2" javascript-stringify "^1.6.0" -webpack-dev-middleware@1.12.0: - version "1.12.0" - resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709" - dependencies: - memory-fs "~0.4.1" - mime "^1.3.4" - path-is-absolute "^1.0.0" - range-parser "^1.0.3" - time-stamp "^2.0.0" - webpack-dev-middleware@^3.0.0: version "3.1.3" resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz#8b32aa43da9ae79368c1bf1183f2b6cf5e1f39ed" @@ -12605,15 +12218,6 @@ webpack-hot-client@^4.1.0, webpack-hot-client@^4.1.1: webpack-log "^1.1.1" ws "^4.0.0" -webpack-hot-middleware@2.19.1: - version "2.19.1" - resolved "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.19.1.tgz#5db32c31c955c1ead114d37c7519ea554da0d405" - dependencies: - ansi-html "0.0.7" - html-entities "^1.2.0" - querystring "^0.2.0" - strip-ansi "^3.0.0" - webpack-log@^1.0.1, webpack-log@^1.1.1, webpack-log@^1.1.2, webpack-log@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d" @@ -12673,40 +12277,13 @@ webpack-serve@^2.0.2: v8-compile-cache "^2.0.0" webpack-log "^1.1.2" -webpack-sources@1.1.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0: +webpack-sources@^1.0.1, webpack-sources@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" dependencies: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@3.10.0: - version "3.10.0" - resolved "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725" - dependencies: - acorn "^5.0.0" - acorn-dynamic-import "^2.0.0" - ajv "^5.1.5" - ajv-keywords "^2.0.0" - async "^2.1.2" - enhanced-resolve "^3.4.0" - escope "^3.6.0" - interpret "^1.0.0" - json-loader "^0.5.4" - json5 "^0.5.1" - loader-runner "^2.3.0" - loader-utils "^1.1.0" - memory-fs "~0.4.1" - mkdirp "~0.5.0" - node-libs-browser "^2.0.0" - source-map "^0.5.3" - supports-color "^4.2.1" - tapable "^0.2.7" - uglifyjs-webpack-plugin "^0.4.6" - watchpack "^1.4.0" - webpack-sources "^1.0.1" - yargs "^8.0.2" - webpack@^4.16.3: version "4.16.3" resolved "https://registry.npmjs.org/webpack/-/webpack-4.16.3.tgz#861be3176d81e7e3d71c66c8acc9bba35588b525" @@ -12873,17 +12450,6 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" -write-file-webpack-plugin@4.2.0: - version "4.2.0" - resolved "https://registry.npmjs.org/write-file-webpack-plugin/-/write-file-webpack-plugin-4.2.0.tgz#7bd18547eaa0ea0b23992fb1e0322e5431d339ef" - dependencies: - chalk "^1.1.1" - debug "^2.6.8" - filesize "^3.2.1" - lodash "^4.5.1" - mkdirp "^0.5.1" - moment "^2.11.2" - write-json-file@^2.2.0: version "2.3.0" resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f" From 011baad9815826d61d5ad494742ee39e89486185 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Mon, 30 Jul 2018 00:59:42 -0300 Subject: [PATCH 13/19] fix(docz-core): remove babel plugin/presets when needed --- packages/docz-core/package.json | 1 + packages/docz-core/src/Bundler.ts | 6 +- packages/docz-core/src/Plugin.ts | 2 +- .../docz-core/src/bundlers/webpack/config.ts | 47 ++++----- packages/docz-core/src/commands/args.ts | 2 +- packages/docz-core/src/commands/build.ts | 2 +- packages/docz-core/src/commands/dev.ts | 3 +- packages/docz-core/src/index.ts | 2 +- packages/docz-core/src/utils/babel-config.ts | 99 +++++++++++++++++++ packages/docz-core/src/utils/babelrc.ts | 56 ----------- packages/docz-core/src/utils/load-config.ts | 2 +- packages/docz-core/templates/root.tpl.js | 9 +- 12 files changed, 141 insertions(+), 90 deletions(-) create mode 100644 packages/docz-core/src/utils/babel-config.ts delete mode 100644 packages/docz-core/src/utils/babelrc.ts diff --git a/packages/docz-core/package.json b/packages/docz-core/package.json index 1e022dd5a..16ca80d7f 100644 --- a/packages/docz-core/package.json +++ b/packages/docz-core/package.json @@ -23,6 +23,7 @@ }, "dependencies": { "@babel/core": "7.0.0-beta.55", + "@babel/plugin-syntax-dynamic-import": "^7.0.0-beta.55", "@babel/preset-typescript": "^7.0.0-beta.55", "@babel/runtime": "^7.0.0-beta.55", "@mdx-js/loader": "^0.15.0-1", diff --git a/packages/docz-core/src/Bundler.ts b/packages/docz-core/src/Bundler.ts index 2d9557d67..0865eb02b 100644 --- a/packages/docz-core/src/Bundler.ts +++ b/packages/docz-core/src/Bundler.ts @@ -4,7 +4,7 @@ import logger from 'signale' import { Plugin } from './Plugin' import { Config as Args, Env } from './commands/args' -import { babelrc, BabelRC } from './utils/babelrc' +import { getBabelConfig, BabelRC } from './utils/babel-config' import * as paths from './config/paths' export interface Server { @@ -54,8 +54,8 @@ export class Bundler { this.builder = build } - public getConfig(env: Env): C { - const babelConfig = babelrc(this.args, env) + public async getConfig(env: Env): Promise { + const babelConfig = await getBabelConfig(this.args, env) const config = this.mountConfig(this.config(babelConfig), env) return this.args.modifyBundlerConfig(config, !this.isProd(env), this.args) diff --git a/packages/docz-core/src/Plugin.ts b/packages/docz-core/src/Plugin.ts index af7c62db1..200bd4107 100644 --- a/packages/docz-core/src/Plugin.ts +++ b/packages/docz-core/src/Plugin.ts @@ -2,7 +2,7 @@ import get from 'lodash.get' import { Config } from './commands/args' import { isFn } from './utils/helpers' -import { BabelRC } from './utils/babelrc' +import { BabelRC } from './utils/babel-config' export type SetConfig = (config: Config) => Config export type ModifyBundlerConfig = ( diff --git a/packages/docz-core/src/bundlers/webpack/config.ts b/packages/docz-core/src/bundlers/webpack/config.ts index f766a12c2..9f3e75395 100644 --- a/packages/docz-core/src/bundlers/webpack/config.ts +++ b/packages/docz-core/src/bundlers/webpack/config.ts @@ -8,7 +8,7 @@ import manifestPlugin from 'webpack-manifest-plugin' import UglifyJs from 'uglifyjs-webpack-plugin' import { Config as Args, Env } from '../../commands/args' -import { BabelRC } from '../../utils/babelrc' +import { BabelRC } from '../../utils/babel-config' import * as paths from '../../config/paths' import * as loaders from './loaders' @@ -126,28 +126,30 @@ export const createConfig = (args: Args, env: Env) => ( path.dirname(require.resolve('@babel/runtime/package.json')) ) - const addExtensions = (resolve: any) => { - resolve.extensions - .add('.web.js') - .add('.mjs') - .add('.js') - .add('.json') - .add('.web.jsx') - .add('.jsx') - .add('.mdx') + config.when(isProd, cfg => + cfg.resolve.alias.set( + 'webpack-hot-client/client', + require.resolve('webpack-hot-client/client') + ) + ) + + config.resolve.extensions + .add('.web.js') + .add('.mjs') + .add('.js') + .add('.json') + .add('.web.jsx') + .add('.jsx') + .add('.mdx') + .end() + + if (args.typescript) { + config.resolve.extensions + .prepend('.ts') + .prepend('.tsx') .end() - - if (args.typescript) { - resolve.extensions - .prepend('.ts') - .prepend('.tsx') - .end() - } } - addExtensions(config.resolve) - addExtensions(config.resolveLoader) - config.resolve.modules // prioritize our own .add(paths.ownNodeModules) @@ -170,13 +172,14 @@ export const createConfig = (args: Args, env: Env) => ( loaders.js(config, args) loaders.mdx(config, args) - args.typescript && loaders.ts(config, args) - loaders.setupHappypack(config, args, babelrc) loaders.images(config) loaders.svg(config) loaders.media(config) loaders.fonts(config) + args.typescript && loaders.ts(config, args) + loaders.setupHappypack(config, args, babelrc) + /** * plugins */ diff --git a/packages/docz-core/src/commands/args.ts b/packages/docz-core/src/commands/args.ts index 8f0360e97..bc4f5a3d5 100644 --- a/packages/docz-core/src/commands/args.ts +++ b/packages/docz-core/src/commands/args.ts @@ -4,7 +4,7 @@ import titleize from 'titleize' import envDotProp from 'env-dot-prop' import { Plugin } from '../Plugin' -import { BabelRC } from '../utils/babelrc' +import { BabelRC } from '../utils/babel-config' import * as paths from '../config/paths' const getEnv = (val: string, defaultValue: any = null): any => diff --git a/packages/docz-core/src/commands/build.ts b/packages/docz-core/src/commands/build.ts index 6d971e35b..129db5103 100644 --- a/packages/docz-core/src/commands/build.ts +++ b/packages/docz-core/src/commands/build.ts @@ -24,7 +24,7 @@ export const build = async (args: Config) => { try { await run('onPreBuild') - await bundler.build(bundler.getConfig(env)) + await bundler.build(await bundler.getConfig(env)) await run('onPostBuild') } catch (err) { logger.fatal(err) diff --git a/packages/docz-core/src/commands/dev.ts b/packages/docz-core/src/commands/dev.ts index fc751de7f..c73dbbe0f 100644 --- a/packages/docz-core/src/commands/dev.ts +++ b/packages/docz-core/src/commands/dev.ts @@ -18,7 +18,8 @@ export const dev = async (args: Config) => { const entries = new Entries(config) const bundler = webpack({ ...config, port }, env) - const server = await bundler.createServer(bundler.getConfig(env)) + const bundlerConfig = await bundler.getConfig(env) + const server = await bundler.createServer(bundlerConfig) const { app } = await server.start() const newConfig = { ...config, websocketPort } diff --git a/packages/docz-core/src/index.ts b/packages/docz-core/src/index.ts index b2badb89f..ea8c129e7 100644 --- a/packages/docz-core/src/index.ts +++ b/packages/docz-core/src/index.ts @@ -4,4 +4,4 @@ import { args } from './commands/args' export { commands, args } export { Config } from './commands/args' export { Plugin, createPlugin } from './Plugin' -export { BabelRC } from './utils/babelrc' +export { BabelRC } from './utils/babel-config' diff --git a/packages/docz-core/src/utils/babel-config.ts b/packages/docz-core/src/utils/babel-config.ts new file mode 100644 index 000000000..9a9c42449 --- /dev/null +++ b/packages/docz-core/src/utils/babel-config.ts @@ -0,0 +1,99 @@ +import { load } from 'load-cfg' +import merge from 'deepmerge' + +import { Config, Env } from '../commands/args' +import { Plugin } from '../Plugin' + +export interface BabelRC { + presets: any[] + plugins: any[] + cacheDirectory?: boolean + babelrc?: boolean +} + +/** + * Presets configuration + */ + +const PRESETS_REACT = /@babel\/preset-env|@babel\/preset-react|babel-preset-react-app|next\/babel|razzle/ +const PRESET_TS = /@babel\/preset-typescript/ + +const getPresets = (args: Config, { presets }: BabelRC) => { + const hasPresets = presets && presets.length > 0 + const needReact = !hasPresets || presets.every(p => !PRESETS_REACT.test(p)) + const needTSPreset = !hasPresets || presets.every(p => !PRESET_TS.test(p)) + + const newPresets: any[] = needReact + ? [[require.resolve('babel-preset-react-app'), { flow: !args.typescript }]] + : [] + + if (needTSPreset && args.typescript) { + newPresets.push(require.resolve('@babel/preset-typescript')) + } + + return newPresets +} + +/** + * Plugins configuration + */ + +const PRESETS_WITH_DYNAMIC = /babel-preset-react-app|next\/babel|razzle/ +const DYNAMIC_IMPORT = /@babel\/plugin-syntax-dynamic-import/ +const HOT_LOADER = /react-hot-loader\/babel/ +const DOCGEN = /babel-plugin-react-docgen/ + +const getPlugins = (args: Config, env: Env, { presets, plugins }: BabelRC) => { + const newPlugins: any[] = [] + const isProd = env === 'production' + const hasPresets = presets && presets.length > 0 + + const needHotLoader = plugins.every(p => !HOT_LOADER.test(p)) + const needReactDocgen = plugins.every(p => !DOCGEN.test(p)) + const needBabelDynamicImport = + hasPresets && + presets.every(p => !PRESETS_WITH_DYNAMIC.test(p)) && + plugins.every(p => !DYNAMIC_IMPORT.test(p)) + + if (needHotLoader && !isProd) { + newPlugins.push(require.resolve('react-hot-loader/babel')) + } + + if (needReactDocgen && args.propsParser && !args.typescript) { + newPlugins.push([ + require.resolve('babel-plugin-react-docgen'), + { resolver: 'findAllExportedComponentDefinitions' }, + ]) + } + + if (needBabelDynamicImport) { + newPlugins.push(require.resolve('@babel/plugin-syntax-dynamic-import')) + } + + return newPlugins +} + +/** + * Exporting .babelrc config used on docz + */ + +export const getBabelConfig = async ( + args: Config, + env: Env +): Promise => { + const localBabelRc = load('babel', { presets: [], plugins: [] }) + const presets = getPresets(args, localBabelRc) + const plugins = getPlugins(args, env, localBabelRc) + + const config = merge(localBabelRc, { + presets, + plugins, + cacheDirectory: !args.debug, + babelrc: false, + }) + + const reduce = Plugin.reduceFromPlugins(args.plugins) + const newConfig = reduce('modifyBabelRc', config, args) + + return args.modifyBabelRc(newConfig, args) +} diff --git a/packages/docz-core/src/utils/babelrc.ts b/packages/docz-core/src/utils/babelrc.ts deleted file mode 100644 index b1dc96bd7..000000000 --- a/packages/docz-core/src/utils/babelrc.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { load } from 'load-cfg' -import merge from 'deepmerge' - -import { Config, Env } from '../commands/args' -import { Plugin } from '../Plugin' - -export interface BabelRC { - presets?: any[] - plugins?: any[] - cacheDirectory?: boolean - babelrc?: boolean -} - -const getPresets = (args: Config) => { - const presets: any[] = [ - [require.resolve('babel-preset-react-app'), { flow: !args.typescript }], - ] - - if (args.typescript) presets.push(require.resolve('@babel/preset-typescript')) - return presets -} - -const getPlugins = (args: Config, env: Env) => { - const isProd = env === 'production' - const plugins: any[] = [] - - if (!isProd) { - plugins.push(require.resolve('react-hot-loader/babel')) - } - - if (args.propsParser && !args.typescript) { - plugins.push([ - require.resolve('babel-plugin-react-docgen'), - { resolver: 'findAllExportedComponentDefinitions' }, - ]) - } - - return plugins -} - -export const babelrc = (args: Config, env: Env): BabelRC => { - const presets = getPresets(args) - const plugins = getPlugins(args, env) - - const config = merge(load('babel', null), { - presets, - plugins, - cacheDirectory: !args.debug, - babelrc: false, - }) - - const reduce = Plugin.reduceFromPlugins(args.plugins) - const newConfig = reduce('modifyBabelRc', config, args) - - return args.modifyBabelRc(newConfig, args) -} diff --git a/packages/docz-core/src/utils/load-config.ts b/packages/docz-core/src/utils/load-config.ts index a2a7b054f..3c4fbfdbc 100644 --- a/packages/docz-core/src/utils/load-config.ts +++ b/packages/docz-core/src/utils/load-config.ts @@ -4,7 +4,7 @@ import * as paths from '../config/paths' import { Config } from '../commands/args' import { Plugin } from '../Plugin' import { omit } from './helpers' -import { BabelRC } from './babelrc' +import { BabelRC } from './babel-config' const toOmit = ['_', '$0', 'version', 'help'] diff --git a/packages/docz-core/templates/root.tpl.js b/packages/docz-core/templates/root.tpl.js index b0c96fbe3..501f429c5 100644 --- a/packages/docz-core/templates/root.tpl.js +++ b/packages/docz-core/templates/root.tpl.js @@ -9,9 +9,12 @@ import Theme from '<%- theme %>' <% if (!isProd) {%> class Root extends React.Component { - state = { - config: {}, - entries: {}, + constructor(props, ctx) { + super(props, ctx) + this.state = { + entries: {}, + config: {}, + } } async componentDidMount() { From 1ac1ea825efd97b36f409febd391120619f946ab Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Mon, 30 Jul 2018 01:59:20 -0300 Subject: [PATCH 14/19] feat(docz-plugin-svgr): add initial version of plugin --- README.md | 5 +- packages/docz-plugin-svgr/README.md | 46 ++ packages/docz-plugin-svgr/package.json | 28 + packages/docz-plugin-svgr/src/index.ts | 25 + packages/docz-plugin-svgr/tsconfig.json | 12 + packages/docz-plugin-svgr/tslint.json | 3 + packages/docz-theme-default/src/types.d.ts | 5 - yarn.lock | 778 ++++++++++++++++++++- 8 files changed, 888 insertions(+), 14 deletions(-) create mode 100644 packages/docz-plugin-svgr/README.md create mode 100644 packages/docz-plugin-svgr/package.json create mode 100644 packages/docz-plugin-svgr/src/index.ts create mode 100644 packages/docz-plugin-svgr/tsconfig.json create mode 100644 packages/docz-plugin-svgr/tslint.json diff --git a/README.md b/README.md index e1f22c9a5..f03ec3724 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,9 @@ To break barriers and facilitate the creation of tools was the purpose that **do ## πŸŽ›   Plugins - - **[docz-plugin-babel6](https://github.com/pedronauck/docz/blob/master/packages/docz-plugin-babel6):** Use this plugin to use older babel version -- **[docz-plugin-css](https://github.com/pedronauck/docz/blob/master/packages/docz-plugin-css):** Plugin to parse css files inside your documents + - **[babel6](https://github.com/pedronauck/docz/blob/master/packages/docz-plugin-babel6):** Use this plugin to use older babel version +- **[css](https://github.com/pedronauck/docz/blob/master/packages/docz-plugin-css):** Parse css files inside your documents +- **[svgr](https://github.com/pedronauck/docz/blob/master/packages/docz-plugin-css):** Allow you to parse svg using svgr ## 🚧   Warning! diff --git a/packages/docz-plugin-svgr/README.md b/packages/docz-plugin-svgr/README.md new file mode 100644 index 000000000..711412f10 --- /dev/null +++ b/packages/docz-plugin-svgr/README.md @@ -0,0 +1,46 @@ +# docz-plugin-svgr + +This plugin allow you to use [svgr](https://github.com/smooth-code/svgr/tree/master/packages/webpack) as loader for svg images together with default `file-loader` + +## Install + +```bash +$ yarn add docz-plugin-svgr +``` + +## Usage + +Just import the plugin and add it on your `doczrc.js` + +```js +import { svgr } from 'docz-plugin-svgr' + +export default { + plugins: [svgr()] +} +``` + +Then just use named imports to import using svgr + +```jsx +import starUrl, { ReactComponent as Star } from './star.svg' + +const App = () => ( +
+ star + +
+) +``` + +## Custom options + +If you want to pass [custom options](https://github.com/smooth-code/svgr/tree/master/packages/webpack#passing-options) for `@svgr/webpack` just pass as first argument of the functio + +```js +import { svgr } from 'docz-plugin-svgr' + +export default { + plugins: [svgr({ native: true })] +} +``` diff --git a/packages/docz-plugin-svgr/package.json b/packages/docz-plugin-svgr/package.json new file mode 100644 index 000000000..da09c50f9 --- /dev/null +++ b/packages/docz-plugin-svgr/package.json @@ -0,0 +1,28 @@ +{ + "name": "docz-plugin-svgr", + "version": "0.8.0", + "description": "Use svgr as loader for svg images", + "license": "MIT", + "main": "dist/index.js", + "umd:main": "dist/index.umd.js", + "module": "dist/index.m.js", + "typings": "dist/index.d.ts", + "source": "src/index.ts", + "files": [ + "dist/", + "package.json", + "README.md" + ], + "scripts": { + "dev": "libundler watch --ts -e all", + "build": "libundler build --ts -e all --c", + "fix": "run-s fix:*", + "fix:prettier": "prettier \"src/**/*.{ts,tsx}\" --write", + "fix:tslint": "tslint --fix --project .", + "tslint": "tslint --project ." + }, + "dependencies": { + "@svgr/webpack": "^2.1.1", + "docz-core": "^0.8.0" + } +} diff --git a/packages/docz-plugin-svgr/src/index.ts b/packages/docz-plugin-svgr/src/index.ts new file mode 100644 index 000000000..08f3b7378 --- /dev/null +++ b/packages/docz-plugin-svgr/src/index.ts @@ -0,0 +1,25 @@ +import { createPlugin } from 'docz-core' + +export interface Options { + [key: string]: any +} + +const defaultOptions = { + icon: true, +} + +export const svgr = (options: Options = defaultOptions) => + createPlugin({ + modifyBundlerConfig: config => { + const rule = config.module.rules.find( + (rule: any) => rule.test.toString() === '/\\.(svg)(\\?.*)?$/' + ) + + rule.use.unshift({ + loader: '@svgr/webpack', + options, + }) + + return config + }, + }) diff --git a/packages/docz-plugin-svgr/tsconfig.json b/packages/docz-plugin-svgr/tsconfig.json new file mode 100644 index 000000000..07bd504b8 --- /dev/null +++ b/packages/docz-plugin-svgr/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src", + "declaration": true, + "types": ["node"], + "typeRoots": ["node_modules/@types"] + }, + "include": ["src/**/*"], + "exclude": ["node_modules/**"] +} diff --git a/packages/docz-plugin-svgr/tslint.json b/packages/docz-plugin-svgr/tslint.json new file mode 100644 index 000000000..0946f2096 --- /dev/null +++ b/packages/docz-plugin-svgr/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": "../../tslint.json" +} diff --git a/packages/docz-theme-default/src/types.d.ts b/packages/docz-theme-default/src/types.d.ts index 41a6aaee1..60f34e6ff 100644 --- a/packages/docz-theme-default/src/types.d.ts +++ b/packages/docz-theme-default/src/types.d.ts @@ -21,11 +21,6 @@ declare module 'polished/lib/color/darken' declare module 'pretty' declare module 'webfontloader' -declare module '*.svg' { - const content: any - export default content -} - declare module 'facepaint' { interface Styles { [key: string]: string | number | Styles diff --git a/yarn.lock b/yarn.lock index 1b9895ed5..a0b5c9084 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,7 +40,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@7.0.0-beta.55": +"@babel/core@7.0.0-beta.55", "@babel/core@^7.0.0-beta.52": version "7.0.0-beta.55" resolved "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.55.tgz#9e17c34b5ac855e427c98f570915a17fcc6bab4a" dependencies: @@ -115,6 +115,12 @@ dependencies: "@babel/types" "7.0.0-beta.42" +"@babel/helper-annotate-as-pure@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.55.tgz#3c3e4c00e14e7dea917938e35ed5d9156cdd35ce" + dependencies: + "@babel/types" "7.0.0-beta.55" + "@babel/helper-builder-binary-assignment-operator-visitor@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.42.tgz#7305281eb996954c47f87ec7710e2a9a8edd8077" @@ -122,6 +128,13 @@ "@babel/helper-explode-assignable-expression" "7.0.0-beta.42" "@babel/types" "7.0.0-beta.42" +"@babel/helper-builder-binary-assignment-operator-visitor@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.55.tgz#4d02128acff5c368a2d43ea8608260ce49aeec5d" + dependencies: + "@babel/helper-explode-assignable-expression" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + "@babel/helper-builder-react-jsx@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0-beta.42.tgz#719510a0aa45e9b02909f2e252420e62900c406a" @@ -129,6 +142,13 @@ "@babel/types" "7.0.0-beta.42" esutils "^2.0.0" +"@babel/helper-builder-react-jsx@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0-beta.55.tgz#9f5ef443e3610cf8be450685cbc3658480cfcd8f" + dependencies: + "@babel/types" "7.0.0-beta.55" + esutils "^2.0.0" + "@babel/helper-call-delegate@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.42.tgz#53294eb8c5e6e53af3efda4293ff3c1237772d37" @@ -137,6 +157,14 @@ "@babel/traverse" "7.0.0-beta.42" "@babel/types" "7.0.0-beta.42" +"@babel/helper-call-delegate@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.55.tgz#13f68c85c2adfe87c02f7ab4d2a63d35cd67d724" + dependencies: + "@babel/helper-hoist-variables" "7.0.0-beta.55" + "@babel/traverse" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + "@babel/helper-define-map@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.42.tgz#e5aa10bd7eed2c23cc2873e5d15fbb4b40a30620" @@ -145,6 +173,14 @@ "@babel/types" "7.0.0-beta.42" lodash "^4.2.0" +"@babel/helper-define-map@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.55.tgz#b62bcb37b753be416db7f21563f0162cd933403a" + dependencies: + "@babel/helper-function-name" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + lodash "^4.17.10" + "@babel/helper-explode-assignable-expression@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.42.tgz#ae05c9e7ef9a085b0080b9e4f7a076851a2b17b5" @@ -152,6 +188,13 @@ "@babel/traverse" "7.0.0-beta.42" "@babel/types" "7.0.0-beta.42" +"@babel/helper-explode-assignable-expression@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.55.tgz#f5c096f261ca4efc6154b2633317eec1ed9029ea" + dependencies: + "@babel/traverse" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + "@babel/helper-function-name@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.42.tgz#b38b8f4f85168d1812c543dd700b5d549b0c4658" @@ -200,6 +243,18 @@ dependencies: "@babel/types" "7.0.0-beta.42" +"@babel/helper-hoist-variables@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.55.tgz#a88c5d992dca109199cf95b25907534a959dc461" + dependencies: + "@babel/types" "7.0.0-beta.55" + +"@babel/helper-member-expression-to-functions@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.55.tgz#823d254bc9bd019a529fe2ab7f9e1d26870c5e50" + dependencies: + "@babel/types" "7.0.0-beta.55" + "@babel/helper-module-imports@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.42.tgz#4de334b42fa889d560f15122f66c3bfe1f30cb77" @@ -221,6 +276,13 @@ "@babel/types" "7.0.0-beta.51" lodash "^4.17.5" +"@babel/helper-module-imports@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.55.tgz#93f927c6631d0689b8bbd1991d3fb2aa63eeb3f2" + dependencies: + "@babel/types" "7.0.0-beta.55" + lodash "^4.17.10" + "@babel/helper-module-transforms@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.42.tgz#4d260cc786e712e8440bef58dae28040b77a6183" @@ -232,12 +294,29 @@ "@babel/types" "7.0.0-beta.42" lodash "^4.2.0" +"@babel/helper-module-transforms@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.55.tgz#2bd12f0e9187e5d69599ffa7c11fe9a3a67b03d2" + dependencies: + "@babel/helper-module-imports" "7.0.0-beta.55" + "@babel/helper-simple-access" "7.0.0-beta.55" + "@babel/helper-split-export-declaration" "7.0.0-beta.55" + "@babel/template" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + lodash "^4.17.10" + "@babel/helper-optimise-call-expression@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.42.tgz#9ba770079001672a578fe833190cf03f973568b1" dependencies: "@babel/types" "7.0.0-beta.42" +"@babel/helper-optimise-call-expression@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.55.tgz#57fdc6898bc53f02da78bf4a39509d4dfc3b33cb" + dependencies: + "@babel/types" "7.0.0-beta.55" + "@babel/helper-plugin-utils@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.42.tgz#9aa8b3e5dc72abea6b4f686712a7363cb29ea057" @@ -252,6 +331,12 @@ dependencies: lodash "^4.2.0" +"@babel/helper-regex@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0-beta.55.tgz#74e6c063d1ef9f7e58b7a84c06e6ee4a5bb5a5da" + dependencies: + lodash "^4.17.10" + "@babel/helper-remap-async-to-generator@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.42.tgz#c27dd7789f3a9973493a67a7914ac9253e879071" @@ -262,6 +347,16 @@ "@babel/traverse" "7.0.0-beta.42" "@babel/types" "7.0.0-beta.42" +"@babel/helper-remap-async-to-generator@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.55.tgz#e762d1b8f7f06121ed3e40befb1f9847d4658a7d" + dependencies: + "@babel/helper-annotate-as-pure" "7.0.0-beta.55" + "@babel/helper-wrap-function" "7.0.0-beta.55" + "@babel/template" "7.0.0-beta.55" + "@babel/traverse" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + "@babel/helper-replace-supers@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.42.tgz#fd984b6022982b71a1237d82d932ab69ff988aa4" @@ -271,6 +366,15 @@ "@babel/traverse" "7.0.0-beta.42" "@babel/types" "7.0.0-beta.42" +"@babel/helper-replace-supers@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.55.tgz#d588ad863990f35d8b0f67aa94ef8eec24171855" + dependencies: + "@babel/helper-member-expression-to-functions" "7.0.0-beta.55" + "@babel/helper-optimise-call-expression" "7.0.0-beta.55" + "@babel/traverse" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + "@babel/helper-simple-access@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.42.tgz#9d32bed186b0bc365115c600817e791c22d72c74" @@ -279,6 +383,14 @@ "@babel/types" "7.0.0-beta.42" lodash "^4.2.0" +"@babel/helper-simple-access@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.55.tgz#f3f3ce279f20fc90c166c4fea1667646857ba559" + dependencies: + "@babel/template" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + lodash "^4.17.10" + "@babel/helper-split-export-declaration@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.42.tgz#0d0d5254220a9cc4e7e226240306b939dc210ee7" @@ -306,6 +418,15 @@ "@babel/traverse" "7.0.0-beta.42" "@babel/types" "7.0.0-beta.42" +"@babel/helper-wrap-function@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.55.tgz#3053e77647057b29b88d9625503e033b1bd349b4" + dependencies: + "@babel/helper-function-name" "7.0.0-beta.55" + "@babel/template" "7.0.0-beta.55" + "@babel/traverse" "7.0.0-beta.55" + "@babel/types" "7.0.0-beta.55" + "@babel/helpers@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.0.0-beta.42.tgz#151c1c4e9da1b6ce83d54c1be5fb8c9c57aa5044" @@ -370,6 +491,14 @@ "@babel/helper-remap-async-to-generator" "7.0.0-beta.42" "@babel/plugin-syntax-async-generators" "7.0.0-beta.42" +"@babel/plugin-proposal-async-generator-functions@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.55.tgz#512bb28c0401769811818d6b4453ce9bdf5f21ca" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/helper-remap-async-to-generator" "7.0.0-beta.55" + "@babel/plugin-syntax-async-generators" "7.0.0-beta.55" + "@babel/plugin-proposal-class-properties@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.0.0-beta.42.tgz#2cd29050ab997567071b65896f92afc08a620748" @@ -385,6 +514,13 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.42" +"@babel/plugin-proposal-object-rest-spread@7.0.0-beta.55", "@babel/plugin-proposal-object-rest-spread@^7.0.0-beta.52": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.55.tgz#b611bb83901bf05196237c516a8bb1117a2a9396" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.55" + "@babel/plugin-proposal-optional-catch-binding@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0-beta.42.tgz#d885ba187d2ce6bbae0c227a67a38389c6f930f8" @@ -392,6 +528,13 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.42" +"@babel/plugin-proposal-optional-catch-binding@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0-beta.55.tgz#365727b214a3e3e5cbeb92c471635a5f51839735" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.55" + "@babel/plugin-proposal-unicode-property-regex@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0-beta.42.tgz#84f209398368c194c217edd8131420e0ddb79661" @@ -400,12 +543,26 @@ "@babel/helper-regex" "7.0.0-beta.42" regexpu-core "^4.1.3" +"@babel/plugin-proposal-unicode-property-regex@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0-beta.55.tgz#987f851d4f50fbb91c17ba51cc113d8d3f558c5b" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/helper-regex" "7.0.0-beta.55" + regexpu-core "^4.2.0" + "@babel/plugin-syntax-async-generators@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.42.tgz#deccff2f01c2ed280493b0ba256b14df232ca299" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-syntax-async-generators@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.55.tgz#e72b3857eb80b695c77c3721237b149072cda46b" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-class-properties@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0-beta.42.tgz#80ccce27907f22d0ffb49721e9d2cde311b41459" @@ -446,18 +603,36 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-syntax-jsx@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0-beta.55.tgz#3c16cc972b31c27d4c2e6388e834f146463263a4" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-object-rest-spread@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.42.tgz#aa789865abe78a4895d4a0be9de4d34b1a1d5063" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-syntax-object-rest-spread@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.55.tgz#990ea47e790d7d9a9d28469c6bcc15f580bf19e9" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-optional-catch-binding@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0-beta.42.tgz#d3ebfaa463f42f5a35be5cbd2f27c1fc3bf96c1b" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-syntax-optional-catch-binding@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0-beta.55.tgz#ef903fee2dbc3621773d7db2dec9861c8f976c12" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-typescript@7.0.0-beta.55": version "7.0.0-beta.55" resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.0.0-beta.55.tgz#6648707176c44da87e4c409a1637941019a681d6" @@ -470,6 +645,12 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-arrow-functions@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.55.tgz#eacb446ffc67e5135a4a29ac72bffac1ada181f6" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-async-to-generator@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.42.tgz#c74e278b9722efeb7f2c7da5fbff7540c4a7f353" @@ -478,12 +659,26 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/helper-remap-async-to-generator" "7.0.0-beta.42" +"@babel/plugin-transform-async-to-generator@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.55.tgz#490a4715540807bd89f5858e8aac30d1561bdd65" + dependencies: + "@babel/helper-module-imports" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/helper-remap-async-to-generator" "7.0.0-beta.55" + "@babel/plugin-transform-block-scoped-functions@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.42.tgz#34742dcf409106038e413e0d64b90e98df15f9eb" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-block-scoped-functions@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.55.tgz#0670d0a149435eea73f72e3392a51b38de607270" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-block-scoping@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.42.tgz#272c5cc2b46613ebcd2e19491b19263c36d2c3f4" @@ -491,6 +686,13 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" lodash "^4.2.0" +"@babel/plugin-transform-block-scoping@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.55.tgz#c826f8c20304ac39f6cdd11d14f1cd7d90aa5470" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + lodash "^4.17.10" + "@babel/plugin-transform-classes@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.42.tgz#3b9fdb2e36f9f16b011a2ddc4ebb610e3dc9edfb" @@ -504,18 +706,43 @@ "@babel/helper-split-export-declaration" "7.0.0-beta.42" globals "^11.1.0" +"@babel/plugin-transform-classes@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.55.tgz#fa260266943f7a1e144ef9783d9a07e987755022" + dependencies: + "@babel/helper-annotate-as-pure" "7.0.0-beta.55" + "@babel/helper-define-map" "7.0.0-beta.55" + "@babel/helper-function-name" "7.0.0-beta.55" + "@babel/helper-optimise-call-expression" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/helper-replace-supers" "7.0.0-beta.55" + "@babel/helper-split-export-declaration" "7.0.0-beta.55" + globals "^11.1.0" + "@babel/plugin-transform-computed-properties@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.42.tgz#153662309475099c6948827fc86edbd7fb26f09d" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-computed-properties@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.55.tgz#a04f101f305695031ffda61501728c00180237b9" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-destructuring@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.42.tgz#1aaca42a00d9ef2b0307557c748f32e83ac44899" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-destructuring@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.55.tgz#1d44216cbbdb5d873819abb71fe033c14a1c1723" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-dotall-regex@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0-beta.42.tgz#af7ead30c1b6c3ea8a53973cfcfdbda9edc3c967" @@ -524,12 +751,26 @@ "@babel/helper-regex" "7.0.0-beta.42" regexpu-core "^4.1.3" +"@babel/plugin-transform-dotall-regex@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0-beta.55.tgz#2b9c2d13b79b660789b40f9f49873525d7d77437" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/helper-regex" "7.0.0-beta.55" + regexpu-core "^4.1.3" + "@babel/plugin-transform-duplicate-keys@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.42.tgz#9678ab9480c6120e9b08014371c010bed481485a" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-duplicate-keys@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.55.tgz#d1300c60703d5b5205f65ea178b7b5715d0b9687" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-exponentiation-operator@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.42.tgz#fe637583e8d00ff6d63461e274a63dd2f373baf5" @@ -537,6 +778,13 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-beta.42" "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-exponentiation-operator@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.55.tgz#ddcac0ea80e6641681a473a703093cd2f623a59e" + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-flow-strip-types@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0-beta.42.tgz#0902538b641e1a6fe5d7dc49389560112bfd4071" @@ -557,6 +805,12 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-for-of@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.55.tgz#cf3058c6d81a3d69e5df086294688dac28a42710" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-function-name@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.42.tgz#1eb004a9abde01010d47ec7629d46b1e4e2c6228" @@ -564,12 +818,25 @@ "@babel/helper-function-name" "7.0.0-beta.42" "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-function-name@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.55.tgz#114384d56e1739492bd4ce9337dd158acde14801" + dependencies: + "@babel/helper-function-name" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-literals@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.42.tgz#61a34a82d757be4ddf937eda4b2d6c36b63b9c4e" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-literals@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.55.tgz#8bc92cd24e6419301ef3867e4667b77aa6374e11" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-modules-amd@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.42.tgz#f4c634f49b5051abf6cefcbae100b41ba1369eb6" @@ -577,6 +844,13 @@ "@babel/helper-module-transforms" "7.0.0-beta.42" "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-modules-amd@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.55.tgz#c8b59b84d6f4987512667c6f9410af3ddd562e12" + dependencies: + "@babel/helper-module-transforms" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-modules-commonjs@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-beta.42.tgz#bdfb30e194c8841ec3ddd8a011974102d0d74afc" @@ -585,6 +859,14 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/helper-simple-access" "7.0.0-beta.42" +"@babel/plugin-transform-modules-commonjs@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-beta.55.tgz#748af5037e28a78694df71be2e8d02c5c84b8aaf" + dependencies: + "@babel/helper-module-transforms" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/helper-simple-access" "7.0.0-beta.55" + "@babel/plugin-transform-modules-systemjs@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0-beta.42.tgz#424e25542b4d6ea6ea5f933df6ec9c345358b070" @@ -592,6 +874,13 @@ "@babel/helper-hoist-variables" "7.0.0-beta.42" "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-modules-systemjs@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0-beta.55.tgz#9e36a7d48c9137781484c5442da426873289594e" + dependencies: + "@babel/helper-hoist-variables" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-modules-umd@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0-beta.42.tgz#2fbad368c83471c76f8dcace98492e4e3fdddc76" @@ -599,12 +888,25 @@ "@babel/helper-module-transforms" "7.0.0-beta.42" "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-modules-umd@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0-beta.55.tgz#028c96f64e89313657c6d5f5ff0660fc99f6ee0a" + dependencies: + "@babel/helper-module-transforms" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-new-target@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0-beta.42.tgz#8b309b67b6a92fd1ab6cb93bea0fa12359795c20" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-new-target@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0-beta.55.tgz#0164ad758b68f67fc39dbef1b7d61e37f5a9bfd5" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-object-super@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.42.tgz#f19ae6007ff675ea0f52499d09f73ae9f96db1a0" @@ -612,6 +914,13 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/helper-replace-supers" "7.0.0-beta.42" +"@babel/plugin-transform-object-super@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.55.tgz#b518d13a90352128191514d7d5db8e5a78c9992b" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/helper-replace-supers" "7.0.0-beta.55" + "@babel/plugin-transform-parameters@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.42.tgz#58434afb01afb0a3aa82402142807fb70eb3fb56" @@ -620,6 +929,14 @@ "@babel/helper-get-function-arity" "7.0.0-beta.42" "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-parameters@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.55.tgz#f211f18a560a4d928d9649da11c28dd89f15effe" + dependencies: + "@babel/helper-call-delegate" "7.0.0-beta.55" + "@babel/helper-get-function-arity" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-react-constant-elements@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.0.0-beta.42.tgz#d6fba3670fd57cafc4d07db831c5097528147bdc" @@ -627,12 +944,25 @@ "@babel/helper-annotate-as-pure" "7.0.0-beta.42" "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-react-constant-elements@^7.0.0-beta.52": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.0.0-beta.55.tgz#0f26185822342add98d34a01abfc58068ffea8ea" + dependencies: + "@babel/helper-annotate-as-pure" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-react-display-name@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0-beta.42.tgz#48766efd74d65fb9116ede6354f73299d73e66b9" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-react-display-name@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0-beta.55.tgz#da7207f323cadd68d2614b592fbd3a4ec68e8f75" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-react-jsx-self@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0-beta.42.tgz#f471407f6d87f5456db716ed7ed24dff6864c3de" @@ -640,6 +970,13 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/plugin-syntax-jsx" "7.0.0-beta.42" +"@babel/plugin-transform-react-jsx-self@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0-beta.55.tgz#83138f82f51c4dcc3d75e6cbe40af69ab302b806" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-jsx" "7.0.0-beta.55" + "@babel/plugin-transform-react-jsx-source@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0-beta.42.tgz#2c41adf060e76b9f0652591cfcdaddd192a21898" @@ -647,6 +984,13 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/plugin-syntax-jsx" "7.0.0-beta.42" +"@babel/plugin-transform-react-jsx-source@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0-beta.55.tgz#49156fbe8a8846b51888b8b8bffa486ad8486b70" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-jsx" "7.0.0-beta.55" + "@babel/plugin-transform-react-jsx@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0-beta.42.tgz#a25731396ca87b07f10362a950deab4526345fac" @@ -655,12 +999,26 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/plugin-syntax-jsx" "7.0.0-beta.42" +"@babel/plugin-transform-react-jsx@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0-beta.55.tgz#202b8c80c2eb1ce60bf1f33e113af55d9fb9ad5a" + dependencies: + "@babel/helper-builder-react-jsx" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-syntax-jsx" "7.0.0-beta.55" + "@babel/plugin-transform-regenerator@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.42.tgz#af164751340a7e513c53e614c6f1f90279e459ef" dependencies: regenerator-transform "^0.12.3" +"@babel/plugin-transform-regenerator@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.55.tgz#a12ba1376c647cf0b777dea8a7b55fe4665ed1ff" + dependencies: + regenerator-transform "^0.13.3" + "@babel/plugin-transform-runtime@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.0.0-beta.42.tgz#0142fa2937dd87fea10f5c7c4da9c8b8896bb740" @@ -674,12 +1032,24 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-shorthand-properties@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.55.tgz#75e97575b87c6fe31c008fc3d755fddcd6cb908a" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-spread@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.42.tgz#4d7dde45c95e55d418477e1ea95dd6d9b71f15e4" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-spread@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.55.tgz#d5a1c320aac86469d6d311e136a89fb5a1f65600" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-sticky-regex@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.42.tgz#b0a5585ec24013dd6f0b1b8cc7a73423c4bc082f" @@ -687,6 +1057,13 @@ "@babel/helper-plugin-utils" "7.0.0-beta.42" "@babel/helper-regex" "7.0.0-beta.42" +"@babel/plugin-transform-sticky-regex@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.55.tgz#d0b80b2deb8b4db03bc6459ebe79ad8b39b40546" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/helper-regex" "7.0.0-beta.55" + "@babel/plugin-transform-template-literals@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.42.tgz#7f05c5c003da8e485462cfc36f9d482b0a9a75df" @@ -694,12 +1071,25 @@ "@babel/helper-annotate-as-pure" "7.0.0-beta.42" "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-template-literals@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.55.tgz#b00a6496d4c8384507559598aaf49d8c1ad892e6" + dependencies: + "@babel/helper-annotate-as-pure" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-typeof-symbol@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.42.tgz#7d93fcd194db78b839488cddddefbaa46032e327" dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.42" +"@babel/plugin-transform-typeof-symbol@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.55.tgz#62326918560b765bbe9f362ad3a4ce3bc71477bc" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-typescript@7.0.0-beta.55": version "7.0.0-beta.55" resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.0.0-beta.55.tgz#290b5a6dfb7730bc167c57ffeb471267b4182557" @@ -715,6 +1105,14 @@ "@babel/helper-regex" "7.0.0-beta.42" regexpu-core "^4.1.3" +"@babel/plugin-transform-unicode-regex@7.0.0-beta.55": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.55.tgz#87e7bedbba103f784a7999f82064f47c0b35c796" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/helper-regex" "7.0.0-beta.55" + regexpu-core "^4.1.3" + "@babel/preset-env@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.0.0-beta.42.tgz#671e688057c010b22a7811b965f7da5d79c472d3" @@ -759,6 +1157,51 @@ invariant "^2.2.2" semver "^5.3.0" +"@babel/preset-env@^7.0.0-beta.52": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.0.0-beta.55.tgz#d3d997517761890144081d53c0c669ba7e8334e0" + dependencies: + "@babel/helper-module-imports" "7.0.0-beta.55" + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-proposal-async-generator-functions" "7.0.0-beta.55" + "@babel/plugin-proposal-object-rest-spread" "7.0.0-beta.55" + "@babel/plugin-proposal-optional-catch-binding" "7.0.0-beta.55" + "@babel/plugin-proposal-unicode-property-regex" "7.0.0-beta.55" + "@babel/plugin-syntax-async-generators" "7.0.0-beta.55" + "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.55" + "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.55" + "@babel/plugin-transform-arrow-functions" "7.0.0-beta.55" + "@babel/plugin-transform-async-to-generator" "7.0.0-beta.55" + "@babel/plugin-transform-block-scoped-functions" "7.0.0-beta.55" + "@babel/plugin-transform-block-scoping" "7.0.0-beta.55" + "@babel/plugin-transform-classes" "7.0.0-beta.55" + "@babel/plugin-transform-computed-properties" "7.0.0-beta.55" + "@babel/plugin-transform-destructuring" "7.0.0-beta.55" + "@babel/plugin-transform-dotall-regex" "7.0.0-beta.55" + "@babel/plugin-transform-duplicate-keys" "7.0.0-beta.55" + "@babel/plugin-transform-exponentiation-operator" "7.0.0-beta.55" + "@babel/plugin-transform-for-of" "7.0.0-beta.55" + "@babel/plugin-transform-function-name" "7.0.0-beta.55" + "@babel/plugin-transform-literals" "7.0.0-beta.55" + "@babel/plugin-transform-modules-amd" "7.0.0-beta.55" + "@babel/plugin-transform-modules-commonjs" "7.0.0-beta.55" + "@babel/plugin-transform-modules-systemjs" "7.0.0-beta.55" + "@babel/plugin-transform-modules-umd" "7.0.0-beta.55" + "@babel/plugin-transform-new-target" "7.0.0-beta.55" + "@babel/plugin-transform-object-super" "7.0.0-beta.55" + "@babel/plugin-transform-parameters" "7.0.0-beta.55" + "@babel/plugin-transform-regenerator" "7.0.0-beta.55" + "@babel/plugin-transform-shorthand-properties" "7.0.0-beta.55" + "@babel/plugin-transform-spread" "7.0.0-beta.55" + "@babel/plugin-transform-sticky-regex" "7.0.0-beta.55" + "@babel/plugin-transform-template-literals" "7.0.0-beta.55" + "@babel/plugin-transform-typeof-symbol" "7.0.0-beta.55" + "@babel/plugin-transform-unicode-regex" "7.0.0-beta.55" + browserslist "^3.0.0" + invariant "^2.2.2" + js-levenshtein "^1.1.3" + semver "^5.3.0" + "@babel/preset-flow@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.0.0-beta.42.tgz#580d8d1e418ac1bd0032436a02639267ebdbe1c7" @@ -784,6 +1227,16 @@ "@babel/plugin-transform-react-jsx-self" "7.0.0-beta.42" "@babel/plugin-transform-react-jsx-source" "7.0.0-beta.42" +"@babel/preset-react@^7.0.0-beta.52": + version "7.0.0-beta.55" + resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.0.0-beta.55.tgz#80778064882852bcbc812ecb67736b4a81a2fe6c" + dependencies: + "@babel/helper-plugin-utils" "7.0.0-beta.55" + "@babel/plugin-transform-react-display-name" "7.0.0-beta.55" + "@babel/plugin-transform-react-jsx" "7.0.0-beta.55" + "@babel/plugin-transform-react-jsx-self" "7.0.0-beta.55" + "@babel/plugin-transform-react-jsx-source" "7.0.0-beta.55" + "@babel/preset-typescript@^7.0.0-beta.55": version "7.0.0-beta.55" resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.0.0-beta.55.tgz#b1eeffe0b59bc5cfd2a7ace9303b478a783fbe2d" @@ -1196,6 +1649,29 @@ escape-string-regexp "^1.0.5" lodash.deburr "^4.1.0" +"@svgr/core@^2.1.1": + version "2.1.1" + resolved "https://registry.npmjs.org/@svgr/core/-/core-2.1.1.tgz#e241576eeb42142a971c07dd83c10a0e60928cdc" + dependencies: + cosmiconfig "^5.0.5" + h2x-core "^1.0.0" + h2x-plugin-jsx "^1.0.0" + lodash "^4.17.10" + prettier "^1.13.7" + svgo "^1.0.5" + +"@svgr/webpack@^2.1.1": + version "2.1.1" + resolved "https://registry.npmjs.org/@svgr/webpack/-/webpack-2.1.1.tgz#ab70286a0ad0ae79a446c580152eb184b68f1aa5" + dependencies: + "@babel/core" "^7.0.0-beta.52" + "@babel/plugin-proposal-object-rest-spread" "^7.0.0-beta.52" + "@babel/plugin-transform-react-constant-elements" "^7.0.0-beta.52" + "@babel/preset-env" "^7.0.0-beta.52" + "@babel/preset-react" "^7.0.0-beta.52" + "@svgr/core" "^2.1.1" + loader-utils "^1.1.0" + "@types/accepts@*": version "1.3.5" resolved "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" @@ -1659,6 +2135,14 @@ JSONStream@^1.0.4: jsonparse "^1.2.0" through ">=2.2.7 <3" +abab@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e" + +abab@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" + abbrev@1: version "1.1.1" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -1676,6 +2160,12 @@ acorn-dynamic-import@^3.0.0: dependencies: acorn "^5.0.0" +acorn-globals@^4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538" + dependencies: + acorn "^5.0.0" + acorn-jsx@^3.0.0: version "3.0.1" resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" @@ -1690,6 +2180,10 @@ acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.0: version "5.5.3" resolved "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" +acorn@^5.5.3: + version "5.7.1" + resolved "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8" + acorn@^5.6.2: version "5.6.2" resolved "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7" @@ -1874,6 +2368,10 @@ arr-union@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" +array-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" + array-filter@~0.0.0: version "0.0.1" resolved "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" @@ -2912,6 +3410,10 @@ brorand@^1.0.1: version "1.1.0" resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" +browser-process-hrtime@^0.1.2: + version "0.1.2" + resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e" + browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -3890,7 +4392,7 @@ cosmiconfig@^4.0.0: parse-json "^4.0.0" require-from-string "^2.0.1" -cosmiconfig@^5.0.0, cosmiconfig@^5.0.2: +cosmiconfig@^5.0.0, cosmiconfig@^5.0.2, cosmiconfig@^5.0.5: version "5.0.5" resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.5.tgz#a809e3c2306891ce17ab70359dc8bdf661fe2cd0" dependencies: @@ -4212,6 +4714,16 @@ csso@^3.5.0: dependencies: css-tree "1.0.0-alpha.29" +cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": + version "0.3.4" + resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797" + +cssstyle@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-1.0.0.tgz#79b16d51ec5591faec60e688891f15d2a5705129" + dependencies: + cssom "0.3.x" + csstype@^2.2.0: version "2.4.2" resolved "https://registry.npmjs.org/csstype/-/csstype-2.4.2.tgz#158e36c69566bf968da63d0ba14eda1c20e8643a" @@ -4259,6 +4771,14 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +data-urls@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/data-urls/-/data-urls-1.0.0.tgz#24802de4e81c298ea8a9388bb0d8e461c774684f" + dependencies: + abab "^1.0.4" + whatwg-mimetype "^2.0.0" + whatwg-url "^6.4.0" + date-fns@^1.27.2: version "1.29.0" resolved "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6" @@ -4532,6 +5052,12 @@ domelementtype@~1.1.1: version "1.1.3" resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" +domexception@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" + dependencies: + webidl-conversions "^4.0.2" + domhandler@2.1: version "2.1.0" resolved "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594" @@ -4808,6 +5334,17 @@ escodegen@^1.8.1: optionalDependencies: source-map "~0.6.1" +escodegen@^1.9.1: + version "1.11.0" + resolved "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589" + dependencies: + esprima "^3.1.3" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + eslint-scope@^3.7.1: version "3.7.1" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" @@ -5922,6 +6459,43 @@ gzip-size@^4.1.0: duplexer "^0.1.1" pify "^3.0.0" +h2x-core@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/h2x-core/-/h2x-core-1.0.0.tgz#5135fda1a8688ebc8ce2450d89f1dc6837511e7b" + dependencies: + h2x-generate "^1.0.0" + h2x-parse "^1.0.0" + h2x-traverse "^1.0.0" + +h2x-generate@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/h2x-generate/-/h2x-generate-1.0.0.tgz#72e8020ecede3e589f7acab81e85a8346cc54126" + dependencies: + h2x-traverse "^1.0.0" + +h2x-parse@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/h2x-parse/-/h2x-parse-1.0.0.tgz#3d377642d6d5f5e3fa9940e3620f11ba2d072e99" + dependencies: + h2x-types "^1.0.0" + jsdom "^11.10.0" + +h2x-plugin-jsx@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/h2x-plugin-jsx/-/h2x-plugin-jsx-1.0.0.tgz#9307cc58d75bd241f6c25aef152501fda2bdf43d" + dependencies: + h2x-types "^1.0.0" + +h2x-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/h2x-traverse/-/h2x-traverse-1.0.0.tgz#6f651d41f14e3b4362ea2a909213a43511982de1" + dependencies: + h2x-types "^1.0.0" + +h2x-types@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/h2x-types/-/h2x-types-1.0.0.tgz#4822816ffddf51e4a383aa00594770e8ce230d1f" + handlebars@^4.0.2: version "4.0.11" resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" @@ -6160,6 +6734,12 @@ html-comment-regex@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" +html-encoding-sniffer@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" + dependencies: + whatwg-encoding "^1.0.1" + html-minifier@^3.2.3, html-minifier@^3.4.3: version "3.5.15" resolved "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz#f869848d4543cbfd84f26d5514a2a87cbf9a05e0" @@ -6915,6 +7495,10 @@ js-beautify@^1.6.12: mkdirp "~0.5.0" nopt "~3.0.1" +js-levenshtein@^1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.3.tgz#3ef627df48ec8cf24bacf05c0f184ff30ef413c5" + js-tokens@^3.0.0, js-tokens@^3.0.1, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -6944,6 +7528,37 @@ jsbn@~0.1.0: version "0.1.1" resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" +jsdom@^11.10.0: + version "11.12.0" + resolved "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8" + dependencies: + abab "^2.0.0" + acorn "^5.5.3" + acorn-globals "^4.1.0" + array-equal "^1.0.0" + cssom ">= 0.3.2 < 0.4.0" + cssstyle "^1.0.0" + data-urls "^1.0.0" + domexception "^1.0.1" + escodegen "^1.9.1" + html-encoding-sniffer "^1.0.2" + left-pad "^1.3.0" + nwsapi "^2.0.7" + parse5 "4.0.0" + pn "^1.1.0" + request "^2.87.0" + request-promise-native "^1.0.5" + sax "^1.2.4" + symbol-tree "^3.2.2" + tough-cookie "^2.3.4" + w3c-hr-time "^1.0.1" + webidl-conversions "^4.0.2" + whatwg-encoding "^1.0.3" + whatwg-mimetype "^2.1.0" + whatwg-url "^6.4.1" + ws "^5.2.0" + xml-name-validator "^3.0.0" + jsesc@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" @@ -7214,6 +7829,10 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" +left-pad@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" + lerna@2.9.0: version "2.9.0" resolved "https://registry.npmjs.org/lerna/-/lerna-2.9.0.tgz#303f70bc50b1c4541bdcf54eda13c36fe54401f3" @@ -7580,6 +8199,10 @@ lodash.snakecase@4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + lodash.startcase@4.4.0: version "4.4.0" resolved "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" @@ -7625,7 +8248,7 @@ lodash@4.17.5, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0: version "4.17.5" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" -"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.2, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.0, lodash@~4.17.10: +"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.2, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.0, lodash@~4.17.10: version "4.17.10" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -8540,6 +9163,10 @@ number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" +nwsapi@^2.0.7: + version "2.0.7" + resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.7.tgz#6fc54c254621f10cac5225b76e81c74120139b78" + oauth-sign@~0.8.1, oauth-sign@~0.8.2: version "0.8.2" resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" @@ -8916,6 +9543,10 @@ parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" +parse5@4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" + parseurl@^1.3.0, parseurl@^1.3.2, parseurl@~1.3.2: version "1.3.2" resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" @@ -9069,6 +9700,10 @@ pluralize@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" +pn@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" + polished@^1.9.3: version "1.9.3" resolved "https://registry.npmjs.org/polished/-/polished-1.9.3.tgz#d61b8a0c4624efe31e2583ff24a358932b6b75e1" @@ -9400,7 +10035,7 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.14.0: +prettier@^1.13.7, prettier@^1.14.0: version "1.14.0" resolved "https://registry.npmjs.org/prettier/-/prettier-1.14.0.tgz#847c235522035fd988100f1f43cf20a7d24f9372" @@ -9523,6 +10158,10 @@ pseudomap@^1.0.1, pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" +psl@^1.1.24: + version "1.1.28" + resolved "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz#4fb6ceb08a1e2214d4fd4de0ca22dae13740bc7b" + public-encrypt@^4.0.0: version "4.0.2" resolved "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994" @@ -9983,7 +10622,13 @@ regenerate-unicode-properties@^5.1.1: dependencies: regenerate "^1.3.3" -regenerate@^1.2.1: +regenerate-unicode-properties@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c" + dependencies: + regenerate "^1.4.0" + +regenerate@^1.2.1, regenerate@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" @@ -10017,6 +10662,12 @@ regenerator-transform@^0.12.3: dependencies: private "^0.1.6" +regenerator-transform@^0.13.3: + version "0.13.3" + resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb" + dependencies: + private "^0.1.6" + regex-cache@^0.4.2: version "0.4.4" resolved "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" @@ -10061,6 +10712,17 @@ regexpu-core@^4.1.3: unicode-match-property-ecmascript "^1.0.3" unicode-match-property-value-ecmascript "^1.0.1" +regexpu-core@^4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d" + dependencies: + regenerate "^1.4.0" + regenerate-unicode-properties "^7.0.0" + regjsgen "^0.4.0" + regjsparser "^0.3.0" + unicode-match-property-ecmascript "^1.0.4" + unicode-match-property-value-ecmascript "^1.0.2" + registry-auth-token@^3.0.1: version "3.3.2" resolved "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" @@ -10082,6 +10744,10 @@ regjsgen@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.3.0.tgz#0ee4a3e9276430cda25f1e789ea6c15b87b0cb43" +regjsgen@^0.4.0: + version "0.4.0" + resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561" + regjsparser@^0.1.4: version "0.1.5" resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" @@ -10094,6 +10760,12 @@ regjsparser@^0.2.1: dependencies: jsesc "~0.5.0" +regjsparser@^0.3.0: + version "0.3.0" + resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96" + dependencies: + jsesc "~0.5.0" + rehype-autolink-headings@^2.0.3: version "2.0.3" resolved "https://registry.npmjs.org/rehype-autolink-headings/-/rehype-autolink-headings-2.0.3.tgz#b23d02937019b8e33566362fc1541df42e99b0e5" @@ -10237,6 +10909,20 @@ replace-ext@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" +request-promise-core@1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" + dependencies: + lodash "^4.13.1" + +request-promise-native@^1.0.5: + version "1.0.5" + resolved "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5" + dependencies: + request-promise-core "1.1.1" + stealthy-require "^1.1.0" + tough-cookie ">=2.3.3" + request@2.81.0, "request@>=2.9.0 <2.82.0": version "2.81.0" resolved "https://registry.npmjs.org/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" @@ -10264,7 +10950,7 @@ request@2.81.0, "request@>=2.9.0 <2.82.0": tunnel-agent "^0.6.0" uuid "^3.0.0" -request@2.87.0, request@^2.72.0, request@^2.83.0: +request@2.87.0, request@^2.72.0, request@^2.83.0, request@^2.87.0: version "2.87.0" resolved "https://registry.npmjs.org/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" dependencies: @@ -11039,6 +11725,10 @@ stdout-stream@^1.4.0: dependencies: readable-stream "^2.0.1" +stealthy-require@^1.1.0: + version "1.1.1" + resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + stream-browserify@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" @@ -11243,7 +11933,7 @@ supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0: dependencies: has-flag "^3.0.0" -svgo@^1.0.0: +svgo@^1.0.0, svgo@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/svgo/-/svgo-1.0.5.tgz#7040364c062a0538abacff4401cea6a26a7a389a" dependencies: @@ -11266,6 +11956,10 @@ symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" +symbol-tree@^3.2.2: + version "3.2.2" + resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" + table@4.0.2: version "4.0.2" resolved "https://registry.npmjs.org/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" @@ -11484,12 +12178,25 @@ touch@^1.0.0: dependencies: nopt "~1.0.10" +tough-cookie@>=2.3.3, tough-cookie@^2.3.4: + version "2.4.3" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" + dependencies: + psl "^1.1.24" + punycode "^1.4.1" + tough-cookie@~2.3.0, tough-cookie@~2.3.3: version "2.3.4" resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" dependencies: punycode "^1.4.1" +tr46@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" + dependencies: + punycode "^2.1.0" + trash-cli@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/trash-cli/-/trash-cli-1.4.0.tgz#3288d890c824a5cc978a6c448a9f329b06be069d" @@ -11737,6 +12444,10 @@ unicode-canonical-property-names-ecmascript@^1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.3.tgz#f6119f417467593c0086357c85546b6ad5abc583" +unicode-canonical-property-names-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" + unicode-match-property-ecmascript@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.3.tgz#db9b1cb4ffc67e0c5583780b1b59370e4cbe97b9" @@ -11744,14 +12455,29 @@ unicode-match-property-ecmascript@^1.0.3: unicode-canonical-property-names-ecmascript "^1.0.2" unicode-property-aliases-ecmascript "^1.0.3" +unicode-match-property-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" + dependencies: + unicode-canonical-property-names-ecmascript "^1.0.4" + unicode-property-aliases-ecmascript "^1.0.4" + unicode-match-property-value-ecmascript@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.1.tgz#fea059120a016f403afd3bf586162b4db03e0604" +unicode-match-property-value-ecmascript@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4" + unicode-property-aliases-ecmascript@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.3.tgz#ac3522583b9e630580f916635333e00c5ead690d" +unicode-property-aliases-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0" + unified@^4.1.1: version "4.2.1" resolved "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz#76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e" @@ -12156,6 +12882,12 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" +w3c-hr-time@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" + dependencies: + browser-process-hrtime "^0.1.2" + warning@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" @@ -12186,6 +12918,10 @@ webfontloader@^1.6.28: version "1.6.28" resolved "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae" +webidl-conversions@^4.0.2: + version "4.0.2" + resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" + webpack-chain@^4.8.0: version "4.8.0" resolved "https://registry.npmjs.org/webpack-chain/-/webpack-chain-4.8.0.tgz#06fc3dbb9f2707d4c9e899fc6250fbcf2afe6fd1" @@ -12340,10 +13076,28 @@ websocket-extensions@>=0.1.1: version "0.1.3" resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" +whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: + version "1.0.3" + resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3" + dependencies: + iconv-lite "0.4.19" + whatwg-fetch@>=0.10.0: version "2.0.4" resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" +whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4" + +whatwg-url@^6.4.0, whatwg-url@^6.4.1: + version "6.5.0" + resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8" + dependencies: + lodash.sortby "^4.7.0" + tr46 "^1.0.1" + webidl-conversions "^4.0.2" + when@~3.6.x: version "3.6.4" resolved "https://registry.npmjs.org/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e" @@ -12481,6 +13235,12 @@ ws@^4.0.0: async-limiter "~1.0.0" safe-buffer "~5.1.0" +ws@^5.2.0: + version "5.2.2" + resolved "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f" + dependencies: + async-limiter "~1.0.0" + ws@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/ws/-/ws-6.0.0.tgz#eaa494aded00ac4289d455bac8d84c7c651cef35" @@ -12515,6 +13275,10 @@ xdg-trashdir@^2.1.1: user-home "^2.0.0" xdg-basedir "^2.0.0" +xml-name-validator@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + xregexp@4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" From 263badfd387195d4bf5e0050c967b73e03c7554a Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Mon, 30 Jul 2018 02:45:30 -0300 Subject: [PATCH 15/19] feat(docz-core): add webpack-serve-overlay as error overlay --- packages/docz-core/package.json | 1 + packages/docz-core/src/Entries.tsx | 3 ++- packages/docz-core/src/bundlers/webpack/config.ts | 5 +++++ .../docz-core/src/bundlers/webpack/devserver.ts | 2 ++ packages/docz-core/src/commands/args.ts | 10 ++++++++++ packages/docz-core/src/commands/dev.ts | 11 ++++++++--- packages/docz-core/templates/index.tpl.js | 1 + yarn.lock | 15 +++++++++++++++ 8 files changed, 44 insertions(+), 4 deletions(-) diff --git a/packages/docz-core/package.json b/packages/docz-core/package.json index 16ca80d7f..9c8fd14c9 100644 --- a/packages/docz-core/package.json +++ b/packages/docz-core/package.json @@ -86,6 +86,7 @@ "webpack-hot-client": "^4.1.1", "webpack-manifest-plugin": "^2.0.3", "webpack-serve": "^2.0.2", + "webpack-serve-overlay": "^0.2.2", "webpack-serve-waitpage": "^1.0.1", "webpackbar": "^2.6.1", "ws": "^6.0.0", diff --git a/packages/docz-core/src/Entries.tsx b/packages/docz-core/src/Entries.tsx index 8fb202d40..51005e44d 100644 --- a/packages/docz-core/src/Entries.tsx +++ b/packages/docz-core/src/Entries.tsx @@ -30,13 +30,14 @@ const writeAppFiles = async (config: Config, dev: boolean): Promise => { const root = await compiled(fromTemplates('root.tpl.js')) const js = await compiled(fromTemplates('index.tpl.js')) const html = await compiled(getHtmlFilepath(indexHtml)) + const websocketUrl = `ws://${config.websocketHost}:${config.websocketPort}` const rawRootJs = root({ theme, isProd: !dev, wrapper: config.wrapper, hashRouter: config.hashRouter, - websocketUrl: `ws://${config.websocketHost}:${config.websocketPort}`, + websocketUrl, }) const rawIndexJs = js({ diff --git a/packages/docz-core/src/bundlers/webpack/config.ts b/packages/docz-core/src/bundlers/webpack/config.ts index 9f3e75395..b88d821bd 100644 --- a/packages/docz-core/src/bundlers/webpack/config.ts +++ b/packages/docz-core/src/bundlers/webpack/config.ts @@ -237,6 +237,11 @@ export const createConfig = (args: Args, env: Env) => ( { BASE_URL: JSON.stringify(base), NODE_ENV: JSON.stringify(env), + 'process.env': { + WEBPACK_SERVE_OVERLAY_WS_URL: JSON.stringify( + `ws://${args.hotHost}:${args.hotPort}` + ), + }, }, ]) diff --git a/packages/docz-core/src/bundlers/webpack/devserver.ts b/packages/docz-core/src/bundlers/webpack/devserver.ts index 1841b9537..0639a2633 100644 --- a/packages/docz-core/src/bundlers/webpack/devserver.ts +++ b/packages/docz-core/src/bundlers/webpack/devserver.ts @@ -33,6 +33,8 @@ export const devServerConfig = ( hotClient: { reload: false, logLevel: logLevel('error'), + host: args.hotHost, + port: args.hotPort, }, add: (app: Koa, middleware: any, options: any) => { middleware.webpack() diff --git a/packages/docz-core/src/commands/args.ts b/packages/docz-core/src/commands/args.ts index bc4f5a3d5..24ca0c1d4 100644 --- a/packages/docz-core/src/commands/args.ts +++ b/packages/docz-core/src/commands/args.ts @@ -36,6 +36,8 @@ export interface Argv { port: number websocketPort: number websocketHost: string + hotPort: number + hotHost: string /* template args */ title: string description: string @@ -122,6 +124,14 @@ export const args = (yargs: any) => { type: 'number', default: getEnv('port', 3000), }) + yargs.positional('hotHost', { + type: 'string', + default: getEnv('hot.host', '127.0.0.1'), + }) + yargs.positional('hotPort', { + type: 'number', + default: getEnv('hot.port', 8090), + }) yargs.positional('websocketHost', { type: 'string', default: getEnv('websocket.host', '127.0.0.1'), diff --git a/packages/docz-core/src/commands/dev.ts b/packages/docz-core/src/commands/dev.ts index c73dbbe0f..b5c718caf 100644 --- a/packages/docz-core/src/commands/dev.ts +++ b/packages/docz-core/src/commands/dev.ts @@ -15,14 +15,19 @@ export const dev = async (args: Config) => { const config = loadConfig(args) const port = await detectPort(config.port) const websocketPort = await detectPort(config.websocketPort) + const hotPort = await detectPort(config.hotPort) const entries = new Entries(config) - const bundler = webpack({ ...config, port }, env) + envDotProp.set( + 'webpack.server.overlay.ws.url', + `ws://${config.hotHost}:${hotPort}` + ) + + const newConfig = { ...config, websocketPort, hotPort, port } + const bundler = webpack(newConfig, env) const bundlerConfig = await bundler.getConfig(env) const server = await bundler.createServer(bundlerConfig) const { app } = await server.start() - - const newConfig = { ...config, websocketPort } const dataServer = new DataServer({ server: app.server, config: newConfig, diff --git a/packages/docz-core/templates/index.tpl.js b/packages/docz-core/templates/index.tpl.js index 38b4d53cc..6ae7900a0 100644 --- a/packages/docz-core/templates/index.tpl.js +++ b/packages/docz-core/templates/index.tpl.js @@ -1,3 +1,4 @@ +<% if (!isProd) {%>import 'webpack-serve-overlay'<%}%> import React from 'react' import ReactDOM from 'react-dom' diff --git a/yarn.lock b/yarn.lock index a0b5c9084..1ac093064 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2292,6 +2292,10 @@ ansi-escapes@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" +ansi-html@0.0.7: + version "0.0.7" + resolved "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -6740,6 +6744,10 @@ html-encoding-sniffer@^1.0.2: dependencies: whatwg-encoding "^1.0.1" +html-entities@^1.2.1: + version "1.2.1" + resolved "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" + html-minifier@^3.2.3, html-minifier@^3.4.3: version "3.5.15" resolved "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz#f869848d4543cbfd84f26d5514a2a87cbf9a05e0" @@ -12971,6 +12979,13 @@ webpack-manifest-plugin@^2.0.3: lodash ">=3.5 <5" tapable "^1.0.0" +webpack-serve-overlay@^0.2.2: + version "0.2.2" + resolved "https://registry.npmjs.org/webpack-serve-overlay/-/webpack-serve-overlay-0.2.2.tgz#f67857d07b5cb751c84731c531199a32a325b94c" + dependencies: + ansi-html "0.0.7" + html-entities "^1.2.1" + webpack-serve-waitpage@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/webpack-serve-waitpage/-/webpack-serve-waitpage-1.0.1.tgz#8aee5bf8aafcf997c72a74fc48ae1c495001fde9" From e07a97d58a3538efa4a4d777400131b68425dd58 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Mon, 30 Jul 2018 02:46:14 -0300 Subject: [PATCH 16/19] chore(docz): add entry prop on document wrapper --- packages/docz/src/components/DocPreview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docz/src/components/DocPreview.tsx b/packages/docz/src/components/DocPreview.tsx index 82de472ed..98a2a70ff 100644 --- a/packages/docz/src/components/DocPreview.tsx +++ b/packages/docz/src/components/DocPreview.tsx @@ -95,7 +95,7 @@ export const DocPreview: SFC = ({ loading: LoadingComponent, render(loaded, props): React.ReactNode { const Component = withMDXComponents(loaded.default) - return + return }, }) From 259b72d53dfb7cd7b724b8ad6aeebc9c08fde8f0 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Mon, 30 Jul 2018 04:33:26 -0300 Subject: [PATCH 17/19] feat(docz-core): support env files to set configuration (#171) * feat(docz-core): expose filtered env variables (#140) * refactor(docz-core): support for env config --- packages/docz-core/package.json | 1 + .../docz-core/src/bundlers/webpack/config.ts | 11 +-- packages/docz-core/src/commands/args.ts | 49 +++++----- packages/docz-core/src/config/env.ts | 89 +++++++++++++++++++ packages/docz-core/src/config/paths.ts | 4 +- packages/docz-core/src/index.ts | 3 +- packages/docz-theme-default/librc.js | 36 ++++---- packages/docz/bin/index.js | 33 +++---- packages/docz/librc.js | 10 +-- packages/docz/package.json | 2 +- yarn.lock | 4 + 11 files changed, 169 insertions(+), 73 deletions(-) create mode 100644 packages/docz-core/src/config/env.ts diff --git a/packages/docz-core/package.json b/packages/docz-core/package.json index 9c8fd14c9..00c5b20af 100644 --- a/packages/docz-core/package.json +++ b/packages/docz-core/package.json @@ -42,6 +42,7 @@ "cpy": "^7.0.1", "deepmerge": "^2.1.1", "detect-port": "^1.2.3", + "dotenv": "^6.0.0", "env-dot-prop": "^1.0.2", "express": "^4.16.3", "fast-glob": "^2.2.2", diff --git a/packages/docz-core/src/bundlers/webpack/config.ts b/packages/docz-core/src/bundlers/webpack/config.ts index b88d821bd..6d722fbf1 100644 --- a/packages/docz-core/src/bundlers/webpack/config.ts +++ b/packages/docz-core/src/bundlers/webpack/config.ts @@ -7,10 +7,11 @@ import htmlWebpackPlugin from 'html-webpack-plugin' import manifestPlugin from 'webpack-manifest-plugin' import UglifyJs from 'uglifyjs-webpack-plugin' +import * as loaders from './loaders' +import * as paths from '../../config/paths' +import { getClientEnvironment } from '../../config/env' import { Config as Args, Env } from '../../commands/args' import { BabelRC } from '../../utils/babel-config' -import * as paths from '../../config/paths' -import * as loaders from './loaders' const uglify = new UglifyJs({ parallel: true, @@ -235,13 +236,9 @@ export const createConfig = (args: Args, env: Env) => ( config.plugin('injections').use(require('webpack/lib/DefinePlugin'), [ { + ...getClientEnvironment(base).stringified, BASE_URL: JSON.stringify(base), NODE_ENV: JSON.stringify(env), - 'process.env': { - WEBPACK_SERVE_OVERLAY_WS_URL: JSON.stringify( - `ws://${args.hotHost}:${args.hotPort}` - ), - }, }, ]) diff --git a/packages/docz-core/src/commands/args.ts b/packages/docz-core/src/commands/args.ts index 24ca0c1d4..7a584d41f 100644 --- a/packages/docz-core/src/commands/args.ts +++ b/packages/docz-core/src/commands/args.ts @@ -5,9 +5,10 @@ import envDotProp from 'env-dot-prop' import { Plugin } from '../Plugin' import { BabelRC } from '../utils/babel-config' +import { setEnv } from '../config/env' import * as paths from '../config/paths' -const getEnv = (val: string, defaultValue: any = null): any => +const getEnv = (val: string | string[], defaultValue: any = null): any => envDotProp.get(val, defaultValue, { parse: true }) const removeScope = (name: string) => name.replace(/^@.*\//, '') @@ -18,6 +19,11 @@ const getInitialTitle = (): string => { return titleize(humanize(removeScope(name))) } +const getInitialDescription = (): string => { + const pkg = fs.readJsonSync(paths.packageJson, { throws: false }) + return pkg && pkg.description ? pkg.description : 'My awesome app using docz' +} + export type Env = 'production' | 'development' export type ThemeConfig = Record @@ -57,87 +63,90 @@ export interface Config extends Argv { modifyBabelRc(babelrc: BabelRC, args: Config): BabelRC } -export const args = (yargs: any) => { +export const args = (env: Env) => (yargs: any) => { + setEnv(env) yargs.positional('base', { type: 'string', - default: '/', + default: getEnv('docz.base', '/'), }) yargs.positional('source', { alias: 'src', type: 'string', - default: './', + default: getEnv('docz.source', '/'), }) yargs.positional('files', { type: 'string', - default: '**/*.mdx', + default: getEnv('docz.files', '**/*.mdx'), }) yargs.positional('dest', { alias: 'd', type: 'string', - default: '.docz/dist', + default: getEnv('docz.dest', '.docz/dist'), }) yargs.positional('title', { type: 'string', - default: getInitialTitle(), + default: getEnv('docz.title', getInitialTitle()), }) yargs.positional('description', { type: 'string', - default: 'My awesome app using Docz', + default: getEnv('docz.description', getInitialDescription()), }) yargs.positional('theme', { type: 'string', - default: 'docz-theme-default', + default: getEnv('docz.theme', 'docz-theme-default'), }) yargs.positional('typescript', { alias: 'ts', type: 'boolean', - default: false, + default: getEnv('docz.typescript', false), }) yargs.positional('propsParser', { type: 'boolean', - default: true, + default: getEnv('docz.props.parser', true), }) yargs.positional('wrapper', { type: 'string', + default: getEnv('docz.wrapper', null), }) yargs.positional('indexHtml', { type: 'string', + default: getEnv('docz.index.html', null), }) yargs.positional('ordering', { type: 'string', - default: 'descending', + default: getEnv('docz.ordering', 'descending'), }) yargs.positional('debug', { type: 'boolean', - default: getEnv('debug', false), + default: getEnv('docz.debug', false), }) yargs.positional('protocol', { type: 'string', - default: getEnv('https') ? 'https' : 'http', + default: getEnv('docz.https', true) ? 'https' : 'http', }) yargs.positional('host', { type: 'string', - default: getEnv('host', '127.0.0.1'), + default: getEnv('docz.host', '127.0.0.1'), }) yargs.positional('port', { alias: 'p', type: 'number', - default: getEnv('port', 3000), + default: getEnv('docz.port', 3000), }) yargs.positional('hotHost', { type: 'string', - default: getEnv('hot.host', '127.0.0.1'), + default: getEnv('docz.hot.host', '127.0.0.1'), }) yargs.positional('hotPort', { type: 'number', - default: getEnv('hot.port', 8090), + default: getEnv('docz.hot.port', 8089), }) yargs.positional('websocketHost', { type: 'string', - default: getEnv('websocket.host', '127.0.0.1'), + default: getEnv('docz.websocket.host', '127.0.0.1'), }) yargs.positional('websocketPort', { type: 'number', - default: getEnv('websocket.port', 8089), + default: getEnv('docz.websocket.port', 8090), }) } diff --git a/packages/docz-core/src/config/env.ts b/packages/docz-core/src/config/env.ts new file mode 100644 index 000000000..8ef08d083 --- /dev/null +++ b/packages/docz-core/src/config/env.ts @@ -0,0 +1,89 @@ +import * as path from 'path' +import envDotProp from 'env-dot-prop' + +import { root, resolveApp } from './paths' + +const populateNodePath = () => { + // We support resolving modules according to `NODE_PATH`. + // It works similar to `NODE_PATH` in Node itself: + // https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders + // Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored. + // Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims. + // https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421 + // We also resolve them to make sure all tools using them work consistently. + return (envDotProp.get('node.path') || '') + .split(path.delimiter) + .filter((folder: any) => folder && !path.isAbsolute(folder)) + .map((folder: any) => path.resolve(root, folder)) + .join(path.delimiter) +} + +const configDotEnv = () => { + const NODE_ENV = envDotProp.get('node.env') + const dotenv = resolveApp('.env') + + const dotenvFiles = [ + `${dotenv}.${NODE_ENV}.local`, + `${dotenv}.${NODE_ENV}`, + // Don't include `.env.local` for `test` environment + // since normally you expect tests to produce the same + // results for everyone + NODE_ENV !== 'test' && `${dotenv}.local`, + dotenv, + ] + + // Load environment variables from .env* files. Suppress warnings using silent + // if this file is missing. dotenv will never modify any environment variables + // that have already been set. Variable expansion is supported in .env files. + // https://github.com/motdotla/dotenv + dotenvFiles.filter(Boolean).forEach(dotenvFile => { + require('dotenv').config({ + path: dotenvFile, + }) + }) +} + +export const setEnv = (env: string) => { + envDotProp.set('babel.env', env) + envDotProp.set('node.env', env) + + configDotEnv() + populateNodePath() +} + +export interface RT { + [key: string]: any +} + +export const getClientEnvironment = (publicUrl: string) => { + const APP_TEST = /^(REACT_APP_)|(ANGULAR_APP_)|(VUE_APP_)|(DOCZ_)/i + const raw: RT = Object.keys(process.env) + .filter(key => APP_TEST.test(key)) + .reduce( + (env: RT, key) => { + env[key] = process.env[key] + return env + }, + { + // Useful for determining whether we’re running in production mode. Most + // importantly, it switches React into the correct mode. + NODE_ENV: envDotProp.get('node.env') || 'development', + // Useful for resolving the correct path to static assets in `public`. For + // example, . This should + // only be used as an escape hatch. Normally you would put images into the `src` + // and `import` them in code to get their + PUBLIC_URL: publicUrl, + WEBPACK_SERVE_OVERLAY_WS_URL: envDotProp.get( + 'webpack.server.overlay.ws.url' + ), + } + ) + const stringified = { + 'process.env': Object.keys(raw).reduce((env: RT, key) => { + env[key] = JSON.stringify(raw[key]) + return env + }, {}), + } + + return { raw, stringified } +} diff --git a/packages/docz-core/src/config/paths.ts b/packages/docz-core/src/config/paths.ts index 9fb5e1c0c..675824a0e 100644 --- a/packages/docz-core/src/config/paths.ts +++ b/packages/docz-core/src/config/paths.ts @@ -15,8 +15,8 @@ const ensureSlash = (filepath: any, needsSlash: boolean) => { } export const root = fs.realpathSync(process.cwd()) -const resolveApp = (to: string) => path.resolve(root, to) -const resolveOwn = (to: string) => path.resolve(__dirname, '../', to) +export const resolveApp = (to: string) => path.resolve(root, to) +export const resolveOwn = (to: string) => path.resolve(__dirname, '../', to) export interface Paths { root: string diff --git a/packages/docz-core/src/index.ts b/packages/docz-core/src/index.ts index ea8c129e7..5b9921e49 100644 --- a/packages/docz-core/src/index.ts +++ b/packages/docz-core/src/index.ts @@ -2,6 +2,7 @@ import * as commands from './commands' import { args } from './commands/args' export { commands, args } +export { setEnv } from './config/env' export { Config } from './commands/args' -export { Plugin, createPlugin } from './Plugin' export { BabelRC } from './utils/babel-config' +export { Plugin, createPlugin } from './Plugin' diff --git a/packages/docz-theme-default/librc.js b/packages/docz-theme-default/librc.js index 86682f1f6..a3f0325a0 100644 --- a/packages/docz-theme-default/librc.js +++ b/packages/docz-theme-default/librc.js @@ -1,26 +1,26 @@ const svg = require('rollup-plugin-svg') const pkg = require('./package.json') -const inline = [ - 'facepaint', - 'match-sorter', - 'react-breakpoints', - 'react-feather', - 'react-powerplug', - 'webfontloader', -] - -const external = Object.keys(pkg.dependencies) - .filter(dep => inline.indexOf(dep) === -1) - .concat([ - 'react-dom/server', - 'polished/lib/colors/rgba', - 'react-syntax-highlighter/prism', - 'react-feather/dist/icons/search', - 'react-feather/dist/icons/chevron-down', - ]) +const external = Object.keys(pkg.dependencies).concat([ + 'react-dom/server', + 'polished/lib/color/rgba', + 'polished/lib/color/lighten', + 'polished/lib/color/darken', + 'react-syntax-highlighter/prism', + 'react-syntax-highlighter/prism-light', + 'react-feather/dist/icons/chevron-down', + 'react-feather/dist/icons/search', + 'react-feather/dist/icons/clipboard', + 'react-feather/dist/icons/check', + 'react-feather/dist/icons/smartphone', + 'react-feather/dist/icons/tablet', + 'react-feather/dist/icons/monitor', + 'react-feather/dist/icons/maximize', + 'react-feather/dist/icons/minimize', +]) module.exports = { + sourcemap: false, plugins: [svg()], external, } diff --git a/packages/docz/bin/index.js b/packages/docz/bin/index.js index 4acbac652..a66d98d8e 100755 --- a/packages/docz/bin/index.js +++ b/packages/docz/bin/index.js @@ -1,27 +1,22 @@ #!/usr/bin/env node const yargs = require('yargs') -const envDotProp = require('env-dot-prop') -const { args: defaultArgs } = require('docz-core') - -const setEnv = val => { - envDotProp.set('babel.env', val) - envDotProp.set('node.env', val) -} - -const execCommand = (cmd, args) => { - require('docz-core').commands[cmd](args) -} +const { args: defaultArgs, setEnv } = require('docz-core') +const execCommand = cmd => args => require('docz-core').commands[cmd](args) yargs - .command('dev', 'initialize docz dev server', defaultArgs, args => { - setEnv('development') - execCommand('dev', args) - }) - .command('build', 'build dir as static site', defaultArgs, args => { - setEnv('production') - execCommand('build', args) - }) + .command( + 'dev', + 'initialize docz dev server', + defaultArgs('development'), + execCommand('dev') + ) + .command( + 'build', + 'build dir as static site', + defaultArgs('production'), + execCommand('build') + ) .demandCommand() .help() .wrap(72) diff --git a/packages/docz/librc.js b/packages/docz/librc.js index fd6872533..555c6bd56 100644 --- a/packages/docz/librc.js +++ b/packages/docz/librc.js @@ -1,7 +1,7 @@ +const pkg = require('./package.json') + module.exports = { - commonjs: { - namedExports: { - '../../node_modules/@mdx-js/tag/dist/index.js': ['MDXProvider'], - }, - }, + external: Object.keys(pkg.dependencies).concat([ + '@mdx-js/tag/dist/mdx-provider', + ]), } diff --git a/packages/docz/package.json b/packages/docz/package.json index 419451319..60dc4f64a 100644 --- a/packages/docz/package.json +++ b/packages/docz/package.json @@ -34,13 +34,13 @@ "deepmerge": "^2.1.1", "docz-core": "^0.8.0", "docz-theme-default": "^0.8.0", - "env-dot-prop": "^1.0.2", "invariant": "^2.2.4", "pascalcase": "^0.1.1", "prop-types": "^15.6.2", "react": "^16.2.0", "react-dom": "^16.2.0", "react-loadable": "^5.4.0", + "react-router": "^4.3.1", "react-router-dom": "^4.3.1", "react-router-hash-link": "^1.2.0", "yargs": "^12.0.1" diff --git a/yarn.lock b/yarn.lock index 1ac093064..27007a196 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5093,6 +5093,10 @@ dot-prop@^4.1.0, dot-prop@^4.1.1, dot-prop@^4.2.0: dependencies: is-obj "^1.0.0" +dotenv@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935" + duplexer2@^0.1.4, duplexer2@~0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" From 8c9f74edb76c9786c0a3c4d650f7cc97a633c983 Mon Sep 17 00:00:00 2001 From: Piotr Date: Mon, 30 Jul 2018 17:01:48 +0200 Subject: [PATCH 18/19] fix(docz-theme-default): not found typo (#173) --- packages/docz-theme-default/src/components/ui/NotFound.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docz-theme-default/src/components/ui/NotFound.tsx b/packages/docz-theme-default/src/components/ui/NotFound.tsx index 8acb6215c..952816b9d 100644 --- a/packages/docz-theme-default/src/components/ui/NotFound.tsx +++ b/packages/docz-theme-default/src/components/ui/NotFound.tsx @@ -35,7 +35,7 @@ export const NotFound = () => ( Page Not Found - Check if you haven't changed the document route or delete it! + Check if you haven't changed the document route or deleted it! From e125a4f9a8ccd8f22e79f5710c1e206c82fe9613 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Tue, 31 Jul 2018 19:10:48 -0300 Subject: [PATCH 19/19] feat(docz-theme-default): add edit button for document (#180) * feat(docz-core): add link property on Entry * fix(docz-core): adjust default arguments * feat(docz-theme-default): add edit page button on Page * chore(docz-theme-default): some css adjustments --- packages/docz-core/package.json | 2 + packages/docz-core/src/Entries.tsx | 12 +++- packages/docz-core/src/Entry.ts | 13 +++- packages/docz-core/src/commands/args.ts | 6 +- packages/docz-core/src/commands/dev.ts | 2 +- packages/docz-core/src/config/paths.ts | 2 + packages/docz-core/src/types.d.ts | 2 + packages/docz-core/src/utils/repo-info.ts | 27 ++++++++ packages/docz-theme-default/librc.js | 1 + .../src/components/ui/Button.tsx | 13 +++- .../src/components/ui/Page.tsx | 61 ++++++++++++++++--- .../src/components/ui/Pre.tsx | 2 +- .../docz-theme-default/src/styles/index.ts | 4 +- packages/docz-theme-default/src/types.d.ts | 1 + yarn.lock | 10 +++ 15 files changed, 136 insertions(+), 22 deletions(-) create mode 100644 packages/docz-core/src/utils/repo-info.ts diff --git a/packages/docz-core/package.json b/packages/docz-core/package.json index 00c5b20af..40d815eef 100644 --- a/packages/docz-core/package.json +++ b/packages/docz-core/package.json @@ -47,8 +47,10 @@ "express": "^4.16.3", "fast-glob": "^2.2.2", "file-loader": "^1.1.11", + "find-up": "^3.0.0", "friendly-errors-webpack-plugin": "^1.7.0", "fs-extra": "^7.0.0", + "get-pkg-repo": "^2.0.0", "happypack": "^5.0.0", "html-webpack-plugin": "^3.2.0", "humanize-string": "^1.0.2", diff --git a/packages/docz-core/src/Entries.tsx b/packages/docz-core/src/Entries.tsx index 51005e44d..d600a4eb9 100644 --- a/packages/docz-core/src/Entries.tsx +++ b/packages/docz-core/src/Entries.tsx @@ -1,6 +1,6 @@ +import * as path from 'path' import * as fs from 'fs-extra' import * as glob from 'fast-glob' -import * as path from 'path' import * as paths from './config/paths' import { touch, compiled } from './utils/fs' @@ -9,6 +9,7 @@ import { mapToObj } from './utils/helpers' import { Entry, EntryObj, parseMdx } from './Entry' import { Plugin } from './Plugin' import { Config } from './commands/args' +import { repoInfo } from './utils/repo-info' const fromTemplates = (file: string) => path.join(paths.templates, file) @@ -92,8 +93,10 @@ export class Entries { public all: Map public get: () => Promise + public repoUrl: string | null constructor(config: Config) { + this.repoUrl = repoInfo() this.all = new Map() this.get = async () => this.getMap(config) } @@ -108,11 +111,14 @@ export class Entries { const createEntry = async (file: string) => { const ast = await parseMdx(file) - const { settings, ...entry } = new Entry(ast, file, src) + const entry = new Entry(ast, file, src) + + if (this.repoUrl) entry.setLink(this.repoUrl) + const { settings, ...rest } = entry return { ...settings, - ...entry, + ...rest, } } diff --git a/packages/docz-core/src/Entry.ts b/packages/docz-core/src/Entry.ts index 5461bfb8e..3c6e40a98 100644 --- a/packages/docz-core/src/Entry.ts +++ b/packages/docz-core/src/Entry.ts @@ -61,6 +61,7 @@ const getHeadings = (ast: any): Heading[] => { export interface EntryObj { id: string filepath: string + link: string | null slug: string name: string route: string @@ -75,6 +76,7 @@ export class Entry { public id: string public filepath: string + public link: string | null public slug: string public route: string public name: string @@ -92,6 +94,7 @@ export class Entry { this.id = ulid() this.filepath = filepath + this.link = null this.slug = this.slugify(filepath) this.route = this.getRoute(parsed) this.name = name @@ -101,15 +104,19 @@ export class Entry { this.settings = parsed } + public setLink(url: string): void { + this.link = `${url}/${this.filepath}` + } + private getFilepath(file: string, src: string): string { const srcPath = path.resolve(paths.root, src) - const relativePath = path.relative(srcPath, file) + const filepath = path.relative(srcPath, file) if (process.platform === 'win32') { - return relativePath.split('\\').join('/') + return filepath.split('\\').join('/') } - return relativePath + return filepath } private getName(filepath: string, parsed: ParsedData): string { diff --git a/packages/docz-core/src/commands/args.ts b/packages/docz-core/src/commands/args.ts index 7a584d41f..dba14aea9 100644 --- a/packages/docz-core/src/commands/args.ts +++ b/packages/docz-core/src/commands/args.ts @@ -72,7 +72,7 @@ export const args = (env: Env) => (yargs: any) => { yargs.positional('source', { alias: 'src', type: 'string', - default: getEnv('docz.source', '/'), + default: getEnv('docz.source', './'), }) yargs.positional('files', { type: 'string', @@ -139,7 +139,7 @@ export const args = (env: Env) => (yargs: any) => { }) yargs.positional('hotPort', { type: 'number', - default: getEnv('docz.hot.port', 8089), + default: getEnv('docz.hot.port', 8088), }) yargs.positional('websocketHost', { type: 'string', @@ -147,6 +147,6 @@ export const args = (env: Env) => (yargs: any) => { }) yargs.positional('websocketPort', { type: 'number', - default: getEnv('docz.websocket.port', 8090), + default: getEnv('docz.websocket.port', 8089), }) } diff --git a/packages/docz-core/src/commands/dev.ts b/packages/docz-core/src/commands/dev.ts index b5c718caf..86a076071 100644 --- a/packages/docz-core/src/commands/dev.ts +++ b/packages/docz-core/src/commands/dev.ts @@ -14,8 +14,8 @@ export const dev = async (args: Config) => { const env = envDotProp.get('node.env') const config = loadConfig(args) const port = await detectPort(config.port) - const websocketPort = await detectPort(config.websocketPort) const hotPort = await detectPort(config.hotPort) + const websocketPort = await detectPort(config.websocketPort) const entries = new Entries(config) envDotProp.set( diff --git a/packages/docz-core/src/config/paths.ts b/packages/docz-core/src/config/paths.ts index 675824a0e..528c9c7b4 100644 --- a/packages/docz-core/src/config/paths.ts +++ b/packages/docz-core/src/config/paths.ts @@ -28,6 +28,7 @@ export interface Paths { app: string appPublic: string appNodeModules: string + appPackageJson: string ownNodeModules: string getDist: (dest: string) => string @@ -50,6 +51,7 @@ export const docz = resolveApp('.docz') export const app = path.resolve(docz, 'app/') export const appPublic = path.resolve(docz, 'public/') export const appNodeModules = resolveApp('node_modules') +export const appPackageJson = resolveApp('package.json') export const ownNodeModules = resolveOwn('node_modules') export const getDist = (dest: string) => path.join(root, dest) diff --git a/packages/docz-core/src/types.d.ts b/packages/docz-core/src/types.d.ts index 476bd30f4..e28108a3b 100644 --- a/packages/docz-core/src/types.d.ts +++ b/packages/docz-core/src/types.d.ts @@ -5,7 +5,9 @@ declare module 'babylon' declare module 'babel-traverse' declare module 'env-dot-prop' declare module 'chokidar' +declare module 'find-up' declare module 'humanize-string' +declare module 'get-pkg-repo' declare module 'titleize' declare module 'unified' declare module 'strip-indent' diff --git a/packages/docz-core/src/utils/repo-info.ts b/packages/docz-core/src/utils/repo-info.ts new file mode 100644 index 000000000..0351ee9f2 --- /dev/null +++ b/packages/docz-core/src/utils/repo-info.ts @@ -0,0 +1,27 @@ +import * as path from 'path' +import * as fs from 'fs-extra' +import getPkgRepo from 'get-pkg-repo' +import findup from 'find-up' + +import * as paths from '../config/paths' + +export const repoInfo = (): string | null => { + try { + const project = path.parse(findup.sync('.git')).dir + const relative = path.relative(project, paths.root) + const tree = path.join('/tree/master', relative) + const pkg = fs.readJsonSync(paths.appPackageJson) + const repo = getPkgRepo(pkg) + + return ( + repo && + repo.browsetemplate + .replace('{domain}', repo.domain) + .replace('{user}', repo.user) + .replace('{project}', repo.project) + .replace('{/tree/committish}', tree) + ) + } catch (err) { + return null + } +} diff --git a/packages/docz-theme-default/librc.js b/packages/docz-theme-default/librc.js index a3f0325a0..eb90c11e5 100644 --- a/packages/docz-theme-default/librc.js +++ b/packages/docz-theme-default/librc.js @@ -8,6 +8,7 @@ const external = Object.keys(pkg.dependencies).concat([ 'polished/lib/color/darken', 'react-syntax-highlighter/prism', 'react-syntax-highlighter/prism-light', + 'react-feather/dist/icons/edit-2', 'react-feather/dist/icons/chevron-down', 'react-feather/dist/icons/search', 'react-feather/dist/icons/clipboard', diff --git a/packages/docz-theme-default/src/components/ui/Button.tsx b/packages/docz-theme-default/src/components/ui/Button.tsx index 02c4865a6..28b695e4f 100644 --- a/packages/docz-theme-default/src/components/ui/Button.tsx +++ b/packages/docz-theme-default/src/components/ui/Button.tsx @@ -1,6 +1,8 @@ +import * as React from 'react' +import { SFC, ComponentType } from 'react' import styled from 'react-emotion' -export const Button = styled('button')` +const BaseButton = styled('button')` cursor: pointer; display: flex; align-items: center; @@ -8,6 +10,15 @@ export const Button = styled('button')` border: none; ` +interface ButtonProps { + as?: ComponentType | string +} + +export const Button: SFC = ({ + as: Component = BaseButton, + ...props +}) => + export const ButtonLink = styled(Button)` background: transparent; ` diff --git a/packages/docz-theme-default/src/components/ui/Page.tsx b/packages/docz-theme-default/src/components/ui/Page.tsx index 572e91c1b..7394fa768 100644 --- a/packages/docz-theme-default/src/components/ui/Page.tsx +++ b/packages/docz-theme-default/src/components/ui/Page.tsx @@ -1,33 +1,78 @@ import * as React from 'react' +import { SFC, Fragment } from 'react' import { PageProps, ThemeConfig } from 'docz' -import { SFC } from 'react' +import Edit from 'react-feather/dist/icons/edit-2' import styled from 'react-emotion' +import { ButtonLink } from './Button' import { Sidebar, Main } from '../shared' +const Wrapper = styled('div')` + flex: 1; + height: 100%; + overflow-y: auto; + color: ${p => p.theme.colors.text}; + background: ${p => p.theme.colors.background}; +` + export const Container = styled('div')` + position: relative; margin: 0 auto; width: 960px; max-width: 100%; ${p => p.theme.mq(p.theme.styles.container)}; ` -const Wrapper = styled('div')` - flex: 1; - height: 100%; - overflow-y: auto; +const EditPage = styled(ButtonLink.withComponent('a'))` + display: flex; + align-items: center; + justify-content: center; + position: absolute; + padding: 2px 8px; + margin: 8px; + border-radius: 3px; + border: 1px solid ${p => p.theme.colors.border}; + opacity: 0.7; + transition: opacity 0.4s; + font-size: 13px; color: ${p => p.theme.colors.text}; - background: ${p => p.theme.colors.background}; + text-decoration: none; + text-transform: uppercase; + + &:hover { + opacity: 1; + } + + ${p => + p.theme.mq({ + top: [0, 10], + right: [0, 42], + })}; ` -export const Page: SFC = ({ children, doc: { fullpage } }) => { +const EditIcon = styled(Edit)` + margin-right: 5px; +` + +export const Page: SFC = ({ children, doc: { link, fullpage } }) => { + const content = ( + + {link && ( + + Edit page + + )} + {children} + + ) + return ( {config => (
{!fullpage && } - {fullpage ? children : {children}} + {fullpage ? content : {content}}
)} diff --git a/packages/docz-theme-default/src/components/ui/Pre.tsx b/packages/docz-theme-default/src/components/ui/Pre.tsx index 1f5cc008f..258503a8e 100644 --- a/packages/docz-theme-default/src/components/ui/Pre.tsx +++ b/packages/docz-theme-default/src/components/ui/Pre.tsx @@ -13,7 +13,7 @@ import copy from 'copy-text-to-clipboard' import { ButtonSwap } from './ButtonSwap' import { ButtonLink } from './Button' -const TOP_PADDING = '25px' +const TOP_PADDING = '15px' const PrismTheme = styled('pre')` ${p => p.theme.prismTheme}; diff --git a/packages/docz-theme-default/src/styles/index.ts b/packages/docz-theme-default/src/styles/index.ts index a54c9517f..af56a0525 100644 --- a/packages/docz-theme-default/src/styles/index.ts +++ b/packages/docz-theme-default/src/styles/index.ts @@ -13,13 +13,13 @@ export const styles = { fontWeight: 600, }, h2: { - margin: ['30px 0 20px', '50px 0 20px'], + margin: ['20px 0 20px', '35px 0 20px'], lineHeight: ['1.2em', '1.5em'], fontSize: [28, 32], fontWeight: 400, }, h3: { - margin: '30px 0 20px', + margin: '25px 0 10px', fontSize: [22, 24], fontWeight: 400, }, diff --git a/packages/docz-theme-default/src/types.d.ts b/packages/docz-theme-default/src/types.d.ts index 60f34e6ff..7b537ccc6 100644 --- a/packages/docz-theme-default/src/types.d.ts +++ b/packages/docz-theme-default/src/types.d.ts @@ -1,6 +1,7 @@ declare module 'copy-text-to-clipboard' declare module 'hotkeys-js' declare module 'react-breakpoints' +declare module 'react-feather/dist/icons/edit-2' declare module 'react-feather/dist/icons/chevron-down' declare module 'react-feather/dist/icons/search' declare module 'react-feather/dist/icons/clipboard' diff --git a/yarn.lock b/yarn.lock index 27007a196..a7b5a7d81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6145,6 +6145,16 @@ get-pkg-repo@^1.0.0: parse-github-repo-url "^1.3.0" through2 "^2.0.0" +get-pkg-repo@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-2.0.0.tgz#afe80c3370b2576bbe69aa78aedbfb96d2d025f1" + dependencies: + hosted-git-info "^2.1.4" + meow "^3.3.0" + normalize-package-data "^2.3.0" + parse-github-repo-url "^1.3.0" + through2 "^2.0.0" + get-port@^3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"