From c050afdcf9f3a779081127bea95144b1f6ffafe4 Mon Sep 17 00:00:00 2001 From: streamich Date: Mon, 1 Oct 2018 00:11:46 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20export=20TypeScript=20ty?= =?UTF-8?q?pes=20and=20improve=20build=20process?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Export TypeScript types, build with tsc, remove Gulp, publish to NPM only lib/ folder, upgrade TypeScript to latest, import React as wildcard. --- .npmignore | 24 - build/gulpfile.js | 42 - package.json | 31 +- src/ActiveSensor/__story__/story.tsx | 2 +- src/AfterDraf/__story__/story.tsx | 2 +- src/AfterDraf/createSingleRunDraf.ts | 4 +- src/AfterDraf/index.ts | 4 +- src/AfterTimeout/__story__/story.tsx | 2 +- src/Alert/__story__/story.tsx | 2 +- src/BatterySensor/__story__/story.ts | 2 +- src/BrowserOnly/__story__/story.tsx | 2 +- src/Counter/__story__/story.tsx | 2 +- src/Dimmable/__story__/story.tsx | 2 +- src/Dimmable/index.ts | 12 +- src/Dimmer/__story__/story.tsx | 2 +- src/DropArea/__story__/story.tsx | 2 +- src/DropArea/index.ts | 6 +- src/ElectronOnly/__story__/story.tsx | 2 +- src/ErrorBoundary/__story__/story.tsx | 2 +- src/ExitSensor/__story__/story.tsx | 2 +- src/ExitSensor/index.ts | 8 +- src/Flipflop/__story__/story.tsx | 2 +- src/FocusSensor/__story__/story.tsx | 2 +- src/FullScreen/__story__/story.tsx | 2 +- src/GeoLocation/__story__/story.tsx | 2 +- src/GoogleAuth/__story__/story.tsx | 2 +- src/GoogleAuth/index.ts | 11 +- src/Group/__story__/story.tsx | 2 +- src/HoverSensor/__story__/story.tsx | 2 +- src/IdleSensor/__story__/story.tsx | 2 +- src/Img/__story__/story.tsx | 2 +- src/InlineWidthQuery/__story__/story.tsx | 2 +- src/Interpolation/__story__/story.tsx | 2 +- src/Lifecycles/__story__/story.tsx | 2 +- src/LightSensor/__story__/story.tsx | 2 +- src/List/__story__/story.tsx | 2 +- src/LocalStorage/__story__/story.tsx | 2 +- src/LocationSensor/__story__/story.tsx | 2 +- src/Mailto/__story__/story.tsx | 2 +- src/Map/__story__/story.tsx | 2 +- src/MediaDeviceSensor/__story__/story.tsx | 2 +- src/MediaSensor/__story__/story.ts | 2 +- src/Modal/__story__/story.tsx | 2 +- src/MotionSensor/__story__/story.tsx | 2 +- src/MouseSensor/__story__/story.tsx | 2 +- src/NetworkSensor/__story__/story.tsx | 2 +- src/OrientationSensor/__story__/story.tsx | 2 +- src/OutsideClick/__story__/story.tsx | 2 +- src/OutsideClick/index.ts | 8 +- src/Overlay/__story__/story.tsx | 2 +- src/Parallax/index.ts | 6 +- src/Portal/index.ts | 4 +- src/Prompt/__story__/story.tsx | 2 +- src/Prompt/index.ts | 6 +- src/Render/__story__/story.tsx | 2 +- src/RenderInterval/__story__/story.tsx | 2 +- src/Resolve/index.ts | 4 +- src/Ripple/__story__/story.tsx | 2 +- src/Ripple/index.ts | 10 +- src/ScratchSensor/__story__/story.tsx | 2 +- src/ScrollSensor/story.ts | 2 +- src/ServerOnly/__story__/story.tsx | 2 +- src/ShouldUpdate/__story__/story.tsx | 2 +- {.storybook => src}/ShowDocs.ts | 2 +- src/SizeSensor/__story__/story.ts | 2 +- src/SizeSensor/index.ts | 10 +- src/Slider/__story__/story.tsx | 2 +- src/Slider/index.ts | 6 +- src/Speak/__story__/story.ts | 2 +- src/State/__story__/story.tsx | 2 +- src/Toggle/__story__/story.tsx | 2 +- src/Tween/__story__/story.tsx | 2 +- src/Value/__story__/story.tsx | 2 +- src/Vibrate/story.tsx | 2 +- src/Video/__story__/story.tsx | 2 +- src/ViewportObserverSensor/index.ts | 2 +- src/ViewportScrollSensor/index.ts | 2 +- src/ViewportSensor/__story__/story.tsx | 2 +- src/WhenIdle/__story__/story.tsx | 2 +- src/WidthQuery/__story__/story.tsx | 2 +- src/WidthSensor/__story__/story.ts | 2 +- src/WidthSensor/index.ts | 4 +- src/WindowScrollSensor/__story__/story.ts | 2 +- src/WindowScrollSensor/index.ts | 4 +- src/WindowSizeSensor/__story__/story.ts | 2 +- src/WindowSizeSensor/index.ts | 4 +- src/WindowWidthQuery/__story__/story.tsx | 2 +- src/WindowWidthSensor/__story__/story.js | 2 +- src/__story__/lazy.story.tsx | 2 +- src/__story__/loadable.story.tsx | 2 +- src/cssvars/__story__/story.tsx | 2 +- src/invert.story.tsx | 2 +- src/invert.ts | 4 +- src/route/Link.ts | 6 +- src/route/__story__/story.tsx | 2 +- src/translate/__story__/story.tsx | 2 +- src/typing.d.ts | 4 + src/util.ts | 6 +- src/util/wrapInStatefulComponent.ts | 4 +- src/viewport.story.tsx | 2 +- src/viewport.ts | 4 +- tsconfig.json | 33 +- yarn.lock | 1058 ++------------------- 103 files changed, 274 insertions(+), 1203 deletions(-) delete mode 100644 .npmignore delete mode 100644 build/gulpfile.js rename {.storybook => src}/ShowDocs.ts (97%) diff --git a/.npmignore b/.npmignore deleted file mode 100644 index 98645ebc..00000000 --- a/.npmignore +++ /dev/null @@ -1,24 +0,0 @@ -.idea -node_modules/ -/.idea/ -/.nyc_output/ -/coverage/ -package-lock.json -yarn.lock -*.test.ts -*.spec.ts -*.test.tsx -*.spec.tsx -*.test.js -*.spec.js -/typings/ -/test/ -/.vscode/ -.DS_Store -/dist_docs/ -_book/ -/build/ -/.storybook/ -/docs/ -/storybook-static/ -yarn-error.log diff --git a/build/gulpfile.js b/build/gulpfile.js deleted file mode 100644 index 1eb90986..00000000 --- a/build/gulpfile.js +++ /dev/null @@ -1,42 +0,0 @@ -const gulp = require('gulp'); -const ts = require('gulp-typescript'); -const tsConfig = require('../tsconfig'); -const path = require('path'); - -const ignore = [ - '!../src/**/__tests__/**', - '!../src/**/__story__/**', - '!../src/**/__docs__/**', - '!../src/**/story.ts', - '!../src/**/story.tsx' -]; - -gulp.task('build-ts', () => { - return gulp - .src([ - '../src/**/*.ts', - ...ignore - ]) - .pipe(ts({ - ...tsConfig.compilerOptions, - target: 'es5', - module: 'commonjs' - })) - .pipe(gulp.dest('../lib')); -}); - -gulp.task('build-modules', () => { - return gulp.src([ - '../src/**/*.{ts,tsx}', - ...ignore - ]).pipe(ts({ - ...tsConfig.compilerOptions, - target: 'ESNext', - module: 'ESNext' - })).pipe(gulp.dest('../modules')); -}); - -gulp.task('build', () => { - gulp.start('build-ts'); - gulp.start('build-modules'); -}); diff --git a/package.json b/package.json index 3d8ecfcc..25982b84 100644 --- a/package.json +++ b/package.json @@ -7,22 +7,23 @@ "type": "git", "url": "https://github.com/streamich/libreact.git" }, + "files": ["lib/"], "scripts": { - "start": "npm run test:story", - "build": "npm run clean && gulp --gulpfile build/gulpfile.js build", - "clean": "rimraf lib modules && npm run test:story:clean && npm run docs:clean", - "test": "npm run test:server && npm run test:client", + "start": "yarn test:story", + "clean": "rimraf lib modules && yarn test:story:clean && yarn docs:clean", + "build": "tsc", + "test": "yarn test:server && yarn test:client", "test:server": "mocha -r ts-node/register src/**/*.test-server.ts*", "test:client": "jest", "test:client:coverage": "jest --coverage", "test:watch": "jest --watch", "test:story:clean": "rimraf storybook-static", - "test:story": "npm run storybook", + "test:story": "yarn storybook", "test:story:build": "build-storybook", "docs:clean": "rimraf dist_docs docs/_book", - "docs:serve": "npm run docs:clean && gitbook install ./docs && gitbook serve ./docs", - "docs:build": "npm run docs:clean && gitbook install ./docs && gitbook build ./docs", - "docs:publish": "npm run test:story:build && npm run docs:build && ./build/publish-docs.sh", + "docs:serve": "yarn docs:clean && gitbook install ./docs && gitbook serve ./docs", + "docs:build": "yarn docs:clean && gitbook install ./docs && gitbook build ./docs", + "docs:publish": "yarn test:story:build && yarn docs:build && ./build/publish-docs.sh", "storybook": "start-storybook -p 6007", "semantic-release": "semantic-release" }, @@ -47,14 +48,12 @@ "@types/chai": "4.1.1", "@types/jest": "22.0.1", "@types/node": "9.3.0", - "@types/react": "^16.3.17", - "@types/react-dom": "16.0.3", + "@types/react": "^16.4.14", + "@types/react-dom": "^16.0.8", "chai": "4.1.2", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.1.1", "enzyme-to-json": "^3.3.4", - "gulp": "3.9.1", - "gulp-typescript": "3", "jest": "^23.6.0", "jest-environment-jsdom": "^23.4.0", "jest-environment-jsdom-global": "^1.1.0", @@ -64,10 +63,10 @@ "react-test-renderer": "16.2.0", "rimraf": "2.6.2", "to-string-loader": "1.1.5", - "ts-jest": "22.0.1", - "ts-loader": "3.2.0", - "ts-node": "4.1.0", - "typescript": "2.6.2", + "ts-jest": "^23.10.3", + "ts-loader": "^5.2.1", + "ts-node": "^7.0.1", + "typescript": "^3.1.1", "webpack": "3.10.0", "semantic-release": "^15.5.0", "@semantic-release/changelog": "^2.0.2", diff --git a/src/ActiveSensor/__story__/story.tsx b/src/ActiveSensor/__story__/story.tsx index 3257b38c..b3feac58 100644 --- a/src/ActiveSensor/__story__/story.tsx +++ b/src/ActiveSensor/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {ActiveSensor} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('Sensors/ActiveSensor', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/ActiveSensor.md')})) diff --git a/src/AfterDraf/__story__/story.tsx b/src/AfterDraf/__story__/story.tsx index bbdd7800..05cca7c2 100644 --- a/src/AfterDraf/__story__/story.tsx +++ b/src/AfterDraf/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {AfterDraf} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('Animation/AfterDraf', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/AfterDraf.md')})) diff --git a/src/AfterDraf/createSingleRunDraf.ts b/src/AfterDraf/createSingleRunDraf.ts index 56ce1b7d..569871d0 100644 --- a/src/AfterDraf/createSingleRunDraf.ts +++ b/src/AfterDraf/createSingleRunDraf.ts @@ -1,4 +1,4 @@ -import {Component} from 'react'; +import * as React from 'react'; import {isClient} from '../util'; export interface IAfterDrafState { @@ -9,7 +9,7 @@ export const createSingleRunDraf = isClient ? () => { let signelDrafFinished = false; - return class extends Component<{}, IAfterDrafState> { + return class extends React.Component<{}, IAfterDrafState> { frame; state: IAfterDrafState; diff --git a/src/AfterDraf/index.ts b/src/AfterDraf/index.ts index 30e66d26..26d3abe2 100644 --- a/src/AfterDraf/index.ts +++ b/src/AfterDraf/index.ts @@ -1,4 +1,4 @@ -import {Component} from 'react'; +import * as React from 'react'; import {isClient} from '../util'; export interface IAfterDrafState { @@ -6,7 +6,7 @@ export interface IAfterDrafState { } export const AfterDraf = isClient - ? class AfterDraf extends Component<{}, IAfterDrafState> { + ? class AfterDraf extends React.Component<{}, IAfterDrafState> { frame; state: IAfterDrafState; diff --git a/src/AfterTimeout/__story__/story.tsx b/src/AfterTimeout/__story__/story.tsx index 7d7e0be5..15ea23c0 100644 --- a/src/AfterTimeout/__story__/story.tsx +++ b/src/AfterTimeout/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {AfterTimeout} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('Animation/AfterTimeout', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/AfterTimeout.md')})) diff --git a/src/Alert/__story__/story.tsx b/src/Alert/__story__/story.tsx index a09af01e..9572cfe1 100644 --- a/src/Alert/__story__/story.tsx +++ b/src/Alert/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {Alert} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('Generators/Alert', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Alert.md')})) diff --git a/src/BatterySensor/__story__/story.ts b/src/BatterySensor/__story__/story.ts index d699b2f1..11367ded 100644 --- a/src/BatterySensor/__story__/story.ts +++ b/src/BatterySensor/__story__/story.ts @@ -1,7 +1,7 @@ import {Component, createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {BatterySensor, withBattery} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs'; +import ShowDocs from '../../ShowDocs'; const Print = (props) => h('pre', { style: { diff --git a/src/BrowserOnly/__story__/story.tsx b/src/BrowserOnly/__story__/story.tsx index 56e9c0b1..03b86134 100644 --- a/src/BrowserOnly/__story__/story.tsx +++ b/src/BrowserOnly/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {BrowserOnly} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('Boundaries/BrowserOnly', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/BrowserOnly.md')})) diff --git a/src/Counter/__story__/story.tsx b/src/Counter/__story__/story.tsx index acb763bd..81498bd0 100644 --- a/src/Counter/__story__/story.tsx +++ b/src/Counter/__story__/story.tsx @@ -1,7 +1,7 @@ import {Component, createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {Counter, withCounter} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' const Val = ({value, inc}) =>
inc(3)} onDoubleClick={inc}>{value}
; diff --git a/src/Dimmable/__story__/story.tsx b/src/Dimmable/__story__/story.tsx index f961a289..d8caadc1 100644 --- a/src/Dimmable/__story__/story.tsx +++ b/src/Dimmable/__story__/story.tsx @@ -2,7 +2,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {Dimmable} from '..'; import {Toggle} from '../../Toggle'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('UI/Dimmable', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Dimmable.md')})) diff --git a/src/Dimmable/index.ts b/src/Dimmable/index.ts index 5126f503..85a96d3f 100644 --- a/src/Dimmable/index.ts +++ b/src/Dimmable/index.ts @@ -1,5 +1,5 @@ +import * as React from 'react'; import {IDimmableProps} from './index'; -import {Component, Children, cloneElement} from 'react'; import {h, noop} from '../util'; import {Dimmer, IDimmerProps} from '../Dimmer'; @@ -19,15 +19,15 @@ export interface IDimmableProps extends IDimmerProps { renderOverlay?: (dim?: boolean) => React.ReactChild; } -export class Dimmable extends Component { +export class Dimmable extends React.Component { static defaultProps = { blur: 5, }; render () { const {children, dim, blur, renderOverlay, ...rest} = this.props; - const element = Children.only(children); - const elementChildren = Children.toArray(element.props.children); + const element = React.Children.only(children); + const elementChildren = React.Children.toArray(element.props.children); let child: React.ReactChild; const dimmerProps: IDimmerProps = rest; @@ -65,13 +65,13 @@ export class Dimmable extends Component { } } - child = cloneElement(child, childProps); + child = React.cloneElement(child, childProps); } } else { child = h(onlyTextNodes(elementChildren) ? 'span' : 'div', childProps, ...elementChildren); } - return cloneElement(element, { + return React.cloneElement(element, { style: { ...(element.props.style || {}), position: 'relative' diff --git a/src/Dimmer/__story__/story.tsx b/src/Dimmer/__story__/story.tsx index a638b8d0..43743d69 100644 --- a/src/Dimmer/__story__/story.tsx +++ b/src/Dimmer/__story__/story.tsx @@ -2,7 +2,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {Dimmer} from '..'; import {Toggle} from '../../Toggle'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('UI/Dimmer', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Dimmer.md')})) diff --git a/src/DropArea/__story__/story.tsx b/src/DropArea/__story__/story.tsx index f64890c1..0456239c 100644 --- a/src/DropArea/__story__/story.tsx +++ b/src/DropArea/__story__/story.tsx @@ -2,7 +2,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {action} from '@storybook/addon-actions'; import {DropArea} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('UI/DropArea', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/DropArea.md')})) diff --git a/src/DropArea/index.ts b/src/DropArea/index.ts index bdc1f540..6ec60a9a 100644 --- a/src/DropArea/index.ts +++ b/src/DropArea/index.ts @@ -1,4 +1,4 @@ -import {Component, cloneElement} from 'react'; +import * as React from 'react'; import {render} from 'react-universal-interface'; import {noop} from '../util'; @@ -11,7 +11,7 @@ export interface IDropAreaProps { export interface IDropAreaState { } -export class DropArea extends Component { +export class DropArea extends React.Component { static defaultProps = { onFiles: noop, onText: noop, @@ -73,7 +73,7 @@ export class DropArea extends Component { const element = render(this.props, {}); const {props} = element; - return cloneElement(element, { + return React.cloneElement(element, { ...props, onDragOver: this.onDragOver(props.onDragOver), onDragEnter: this.onDragEnter(props.onDragEnter), diff --git a/src/ElectronOnly/__story__/story.tsx b/src/ElectronOnly/__story__/story.tsx index 5ff30ef0..018cf0cd 100644 --- a/src/ElectronOnly/__story__/story.tsx +++ b/src/ElectronOnly/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {ElectronOnly} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('Boundaries/ElectronOnly', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/ElectronOnly.md')})) diff --git a/src/ErrorBoundary/__story__/story.tsx b/src/ErrorBoundary/__story__/story.tsx index a2a075a9..b81abaf7 100644 --- a/src/ErrorBoundary/__story__/story.tsx +++ b/src/ErrorBoundary/__story__/story.tsx @@ -1,7 +1,7 @@ import {Component, createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {ErrorBoundary, withErrorBoundary} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' class BuggyCounter extends Component { state; diff --git a/src/ExitSensor/__story__/story.tsx b/src/ExitSensor/__story__/story.tsx index fe7147ad..ef1b7b88 100644 --- a/src/ExitSensor/__story__/story.tsx +++ b/src/ExitSensor/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {ExitSensor} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' import {StoryExitSensorExample} from './StoryExitSensorExample'; storiesOf('Sensors/ExitSensor', module) diff --git a/src/ExitSensor/index.ts b/src/ExitSensor/index.ts index b5e97e40..159ea56a 100644 --- a/src/ExitSensor/index.ts +++ b/src/ExitSensor/index.ts @@ -1,4 +1,4 @@ -import {Component, cloneElement} from 'react'; +import * as React from 'react'; export interface IExitSensorProps { children?: React.ReactElement; @@ -8,7 +8,7 @@ export interface IExitSensorProps { export interface IExitSensorState { } -export class ExitSensor extends Component { +export class ExitSensor extends React.Component { static defaultProps = { time: 200 }; @@ -52,7 +52,7 @@ export class ExitSensor extends Component { if (this.exitInFlight) { this.nextElement = element; - return cloneElement(this.element, { + return React.cloneElement(this.element, { exiting: true }); } @@ -69,7 +69,7 @@ export class ExitSensor extends Component { this.timeout = setTimeout(this.transition, this.props.time); - return cloneElement(this.element, { + return React.cloneElement(this.element, { exiting: true }); } diff --git a/src/Flipflop/__story__/story.tsx b/src/Flipflop/__story__/story.tsx index 70542299..ac8b765f 100644 --- a/src/Flipflop/__story__/story.tsx +++ b/src/Flipflop/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {Flipflop} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('Inversion/Flipflop', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Flipflop.md')})) diff --git a/src/FocusSensor/__story__/story.tsx b/src/FocusSensor/__story__/story.tsx index 1bf410f2..2a7bf860 100644 --- a/src/FocusSensor/__story__/story.tsx +++ b/src/FocusSensor/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {FocusSensor} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' storiesOf('Sensors/FocusSensor', module) .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/FocusSensor.md')})) diff --git a/src/FullScreen/__story__/story.tsx b/src/FullScreen/__story__/story.tsx index bcbab64d..890f45ea 100644 --- a/src/FullScreen/__story__/story.tsx +++ b/src/FullScreen/__story__/story.tsx @@ -1,7 +1,7 @@ import {Component, createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {FullScreen} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' import {invert} from '../../invert'; diff --git a/src/GeoLocation/__story__/story.tsx b/src/GeoLocation/__story__/story.tsx index 0ef19a12..fba787d6 100644 --- a/src/GeoLocation/__story__/story.tsx +++ b/src/GeoLocation/__story__/story.tsx @@ -1,7 +1,7 @@ import {createElement as h} from 'react'; import {storiesOf} from '@storybook/react'; import {GeoLocationSensor, withGeoLocation} from '..'; -import ShowDocs from '../../../.storybook/ShowDocs' +import ShowDocs from '../../ShowDocs' const Print = ({geoLocation}) => 
diff --git a/src/GoogleAuth/__story__/story.tsx b/src/GoogleAuth/__story__/story.tsx
index b0a8b3e9..0b11ea6f 100644
--- a/src/GoogleAuth/__story__/story.tsx
+++ b/src/GoogleAuth/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {createGoogleAuthContext} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const clientId = '305188012168-htfit0k0u4vegn0f6hn10rcqoj1m77ca.apps.googleusercontent.com';
 const options = {
diff --git a/src/GoogleAuth/index.ts b/src/GoogleAuth/index.ts
index 17718d73..384ac8a8 100644
--- a/src/GoogleAuth/index.ts
+++ b/src/GoogleAuth/index.ts
@@ -1,5 +1,5 @@
+import * as React from 'react';
 import {h} from '../util';
-import {Component, createContext} from 'react';
 import {
   getGapiAuthInstance,
   GApiAuth2InitOptions,
@@ -25,12 +25,15 @@ export interface IGoogleAuthConsumerProps {
   children: (state: IGoogleAuthProviderState) => React.ReactNode;
 }
 
+export interface IProvider extends React.Component {
+}
+
 /**
  * @param clientId Google App client ID.
  * @param scope Scopes as a comma separated string.
  */
 export const createGoogleAuthContext = (options: GApiAuth2InitOptions) => {
-  const context = createContext({});
+  const context = React.createContext({});
   const googleAuthPromise = getGapiAuthInstance(options);
   let googleAuthInstance: GApiAuth2Instance | undefined;
   let isSignedInListener: GApiAuth2InstanceIsSignedInListener | undefined;
@@ -46,7 +49,7 @@ export const createGoogleAuthContext = (options: GApiAuth2InitOptions) => {
     });
   }, console.error);
 
-  class Provider extends Component {
+  class Provider extends React.Component implements IProvider {
     signIn = async (): Promise => {
       if (!googleAuthInstance) {
         googleAuthInstance = await googleAuthPromise;
@@ -124,7 +127,7 @@ export const createGoogleAuthContext = (options: GApiAuth2InitOptions) => {
   }
 
   return {
-    Provider,
+    Provider: Provider as any as IProvider,
     Consumer: context.Consumer as React.SFC,
   };
 };
diff --git a/src/Group/__story__/story.tsx b/src/Group/__story__/story.tsx
index 1c1c97bf..65fde670 100644
--- a/src/Group/__story__/story.tsx
+++ b/src/Group/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Group} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Custom = () => 
;
 
diff --git a/src/HoverSensor/__story__/story.tsx b/src/HoverSensor/__story__/story.tsx
index 24034d81..236d8618 100644
--- a/src/HoverSensor/__story__/story.tsx
+++ b/src/HoverSensor/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {HoverSensor, withHover} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Demo = ({bond, isHover}) =>
   

   

diff --git a/src/Img/__story__/story.tsx b/src/Img/__story__/story.tsx
index 7966cd5e..e61151d8 100644
--- a/src/Img/__story__/story.tsx
+++ b/src/Img/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Img} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 storiesOf('UI/Img', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Img.md')}))
diff --git a/src/InlineWidthQuery/__story__/story.tsx b/src/InlineWidthQuery/__story__/story.tsx
index dd9bc8ee..fadc303f 100644
--- a/src/InlineWidthQuery/__story__/story.tsx
+++ b/src/InlineWidthQuery/__story__/story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {InlineWidthQuery} from '..';
 import {View} from '../../View';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 storiesOf('UI/InlineWidthQuery', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/InlineWidthQuery.md')}))
diff --git a/src/Interpolation/__story__/story.tsx b/src/Interpolation/__story__/story.tsx
index 9e9fc35a..0a4b5471 100644
--- a/src/Interpolation/__story__/story.tsx
+++ b/src/Interpolation/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Interpolation} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Animation/Interpolation', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Interpolation.md')}))
diff --git a/src/Lifecycles/__story__/story.tsx b/src/Lifecycles/__story__/story.tsx
index 80d4a11a..133f5fb5 100644
--- a/src/Lifecycles/__story__/story.tsx
+++ b/src/Lifecycles/__story__/story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {Lifecycles} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 storiesOf('Inversion/Lifecycles', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Lifecycles.md')}))
diff --git a/src/LightSensor/__story__/story.tsx b/src/LightSensor/__story__/story.tsx
index d85b24c4..900b9070 100644
--- a/src/LightSensor/__story__/story.tsx
+++ b/src/LightSensor/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {LightSensor, withLight} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Print = (props) =>
   
diff --git a/src/List/__story__/story.tsx b/src/List/__story__/story.tsx
index cc36a7f0..e246f39e 100644
--- a/src/List/__story__/story.tsx
+++ b/src/List/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {List, withList} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Demo = ({value, push, filter, sort}) =>
   

diff --git a/src/LocalStorage/__story__/story.tsx b/src/LocalStorage/__story__/story.tsx
index 6d670081..a7856f17 100644
--- a/src/LocalStorage/__story__/story.tsx
+++ b/src/LocalStorage/__story__/story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {LocalStorage} from '..';
 import StoryLocalStorageForm from './StoryLocalStorageForm';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Side Effects/LocalStorage', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/LocalStorage.md')}))
diff --git a/src/LocationSensor/__story__/story.tsx b/src/LocationSensor/__story__/story.tsx
index 5185a6d7..be7a5b6d 100644
--- a/src/LocationSensor/__story__/story.tsx
+++ b/src/LocationSensor/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {LocationSensor, withLocation} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Print = (props) =>
   
diff --git a/src/Mailto/__story__/story.tsx b/src/Mailto/__story__/story.tsx
index 548bec21..43ca6823 100644
--- a/src/Mailto/__story__/story.tsx
+++ b/src/Mailto/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Mailto} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Other/Mailto', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Mailto.md')}))
diff --git a/src/Map/__story__/story.tsx b/src/Map/__story__/story.tsx
index 72525f4d..507d9ce6 100644
--- a/src/Map/__story__/story.tsx
+++ b/src/Map/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Map, withMap} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Demo = ({get, set, remove}) =>
   

diff --git a/src/MediaDeviceSensor/__story__/story.tsx b/src/MediaDeviceSensor/__story__/story.tsx
index c5f8eb4a..df6b3b10 100644
--- a/src/MediaDeviceSensor/__story__/story.tsx
+++ b/src/MediaDeviceSensor/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {MediaDeviceSensor, withMediaDevices} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Print = (props) => h('pre', {
   style: {fontFamily: 'monospace'}
diff --git a/src/MediaSensor/__story__/story.ts b/src/MediaSensor/__story__/story.ts
index b861942a..c2785c9d 100644
--- a/src/MediaSensor/__story__/story.ts
+++ b/src/MediaSensor/__story__/story.ts
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {MediaSensor, withMedia} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const IsBig = ({isBig}) => h('div', null, `WIDTH IS GREATED THAN 480PX: ${isBig}`);
 
diff --git a/src/Modal/__story__/story.tsx b/src/Modal/__story__/story.tsx
index c7012323..59f6b316 100644
--- a/src/Modal/__story__/story.tsx
+++ b/src/Modal/__story__/story.tsx
@@ -3,7 +3,7 @@ import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {Modal} from '..';
 import {Toggle} from '../../Toggle';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('UI/Modal', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Modal.md')}))
diff --git a/src/MotionSensor/__story__/story.tsx b/src/MotionSensor/__story__/story.tsx
index 586f82cb..7ae9b120 100644
--- a/src/MotionSensor/__story__/story.tsx
+++ b/src/MotionSensor/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {MotionSensor, withMotion} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Print = ({motion}) =>
   
diff --git a/src/MouseSensor/__story__/story.tsx b/src/MouseSensor/__story__/story.tsx
index f4f5a0de..8fb6adf3 100644
--- a/src/MouseSensor/__story__/story.tsx
+++ b/src/MouseSensor/__story__/story.tsx
@@ -2,7 +2,7 @@ import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {MouseSensor, withMouse} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 const Demo = (props) =>
   

   
diff --git a/src/OrientationSensor/__story__/story.tsx b/src/OrientationSensor/__story__/story.tsx
index a51b8c26..b2ec5568 100644
--- a/src/OrientationSensor/__story__/story.tsx
+++ b/src/OrientationSensor/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {OrientationSensor, withOrientation} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Print = ({orientation}) =>
   
diff --git a/src/OutsideClick/__story__/story.tsx b/src/OutsideClick/__story__/story.tsx
index abad3f9e..b7a852c6 100644
--- a/src/OutsideClick/__story__/story.tsx
+++ b/src/OutsideClick/__story__/story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {OutsideClick} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 
 storiesOf('UI/OutsideClick', module)
diff --git a/src/OutsideClick/index.ts b/src/OutsideClick/index.ts
index 8ddd0b21..98d7704f 100644
--- a/src/OutsideClick/index.ts
+++ b/src/OutsideClick/index.ts
@@ -1,4 +1,4 @@
-import {Component, cloneElement, Children} from 'react';
+import * as React from 'react';
 import {on, off, noop} from '../util';
 
 export interface IOutsideClickProps {
@@ -9,7 +9,7 @@ export interface IOutsideClickProps {
 export interface IOutsideClickState {
 }
 
-export class OutsideClick extends Component {
+export class OutsideClick extends React.Component {
   static defaultProps = {
     event: 'mousedown'
   };
@@ -37,13 +37,13 @@ export class OutsideClick extends Component h(ShowDocs, {md: require('../../../docs/en/Overlay.md')}))
diff --git a/src/Parallax/index.ts b/src/Parallax/index.ts
index 7625b4e9..36a16259 100644
--- a/src/Parallax/index.ts
+++ b/src/Parallax/index.ts
@@ -1,4 +1,4 @@
-import {Component, cloneElement} from 'react';
+import * as React from 'react';
 import {render} from 'react-universal-interface';
 import {IUniversalInterfaceProps} from '../typing';
 import {noop, on, off} from '../util';
@@ -22,7 +22,7 @@ export interface IParallaxState {
   root: TRect,
 }
 
-export class Parallax extends Component {
+export class Parallax extends React.Component {
   static defaultProps = {
     distance: Infinity,
     margin: zeros,
@@ -104,7 +104,7 @@ export class Parallax extends Component {
       }
     }
 
-    return cloneElement(element, {
+    return React.cloneElement(element, {
       ref: this.ref(element.ref)
     });
   }
diff --git a/src/Portal/index.ts b/src/Portal/index.ts
index e8e976bd..74d7d801 100644
--- a/src/Portal/index.ts
+++ b/src/Portal/index.ts
@@ -1,4 +1,4 @@
-import {Component} from 'react';
+import * as React from 'react';
 import {createPortal} from 'react-dom';
 import {isClient, noop} from '../util';
 
@@ -11,7 +11,7 @@ export interface IPortalProps {
 export interface IPortalState {
 }
 
-export class Portal extends Component {
+export class Portal extends React.Component {
   el: HTMLElement = null;
 
   constructor (props, context) {
diff --git a/src/Prompt/__story__/story.tsx b/src/Prompt/__story__/story.tsx
index ff5968d4..ee5582ca 100644
--- a/src/Prompt/__story__/story.tsx
+++ b/src/Prompt/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Prompt} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Generators/Prompt', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Prompt.md')}))
diff --git a/src/Prompt/index.ts b/src/Prompt/index.ts
index 9753038a..8df69446 100644
--- a/src/Prompt/index.ts
+++ b/src/Prompt/index.ts
@@ -1,4 +1,4 @@
-import {PureComponent} from 'react';
+import * as React from 'react';
 import {noop, isClient} from '../util';
 
 export interface IPromptProps {
@@ -9,7 +9,7 @@ export interface IPromptProps {
   onResult?: (result: string) => void;
 }
 
-export class Prompt extends PureComponent {
+export class Prompt extends React.PureComponent {
   componentDidMount () {
     if (!(typeof this.props.children === 'function')) {
       this.prompt();
@@ -32,6 +32,8 @@ export class Prompt extends PureComponent {
 
       return result;
     }
+
+    return undefined;
   }
 
   render () {
diff --git a/src/Render/__story__/story.tsx b/src/Render/__story__/story.tsx
index 61f0f630..7fecb2a8 100644
--- a/src/Render/__story__/story.tsx
+++ b/src/Render/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Render} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Animation/Render', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Render.md')}))
diff --git a/src/RenderInterval/__story__/story.tsx b/src/RenderInterval/__story__/story.tsx
index d887c829..26ddfc60 100644
--- a/src/RenderInterval/__story__/story.tsx
+++ b/src/RenderInterval/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {RenderInterval} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Animation/RenderInterval', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/RenderInterval.md')}))
diff --git a/src/Resolve/index.ts b/src/Resolve/index.ts
index 9eaea1b0..536fe51f 100644
--- a/src/Resolve/index.ts
+++ b/src/Resolve/index.ts
@@ -1,4 +1,4 @@
-import {Component} from 'react';
+import * as React from 'react';
 
 export interface IResolveProps {
   promise: Promise;
@@ -11,7 +11,7 @@ export interface IResolveState {
   error?: any;
 }
 
-export class Resolve extends Component {
+export class Resolve extends React.Component {
   mounted = false;
 
   state: IResolveState = {
diff --git a/src/Ripple/__story__/story.tsx b/src/Ripple/__story__/story.tsx
index 276385f6..44ca8811 100644
--- a/src/Ripple/__story__/story.tsx
+++ b/src/Ripple/__story__/story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Ripple} from '..';
 import Button from './Button';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 storiesOf('UI/Ripple', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Ripple.md')}))
diff --git a/src/Ripple/index.ts b/src/Ripple/index.ts
index b8e9e73d..cc648630 100644
--- a/src/Ripple/index.ts
+++ b/src/Ripple/index.ts
@@ -1,4 +1,4 @@
-import {Component, Children, cloneElement} from 'react';
+import * as React from 'react';
 import {rule, keyframes} from '../nano';
 import {h, noop} from '../util';
 
@@ -27,7 +27,7 @@ export interface IRippleProps {
 export interface IRippleState {
 }
 
-export class Ripple extends Component {
+export class Ripple extends React.Component {
   static defaultProps = {
     color: 'rgba(0,0,0,.2)',
     ms: 400
@@ -69,7 +69,7 @@ export class Ripple extends Component {
 
   render () {
     const {children, color} = this.props;
-    const element = Children.only(children);
+    const element = React.Children.only(children);
     const ripple = h('div', {
       className,
       style: {
@@ -85,11 +85,11 @@ export class Ripple extends Component {
       position: 'relative'
     });
 
-    const innerChildren = Children.toArray(element.props.children);
+    const innerChildren = React.Children.toArray(element.props.children);
 
     innerChildren.push(ripple);
 
-    return cloneElement(element, {
+    return React.cloneElement(element, {
       ...element.props,
       style,
       ref: this.ref(element.props.ref),
diff --git a/src/ScratchSensor/__story__/story.tsx b/src/ScratchSensor/__story__/story.tsx
index 35d782b7..7851cb17 100644
--- a/src/ScratchSensor/__story__/story.tsx
+++ b/src/ScratchSensor/__story__/story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {ScratchSensor} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 const Demo = (props) =>
   
 {
   state = {
diff --git a/src/ServerOnly/__story__/story.tsx b/src/ServerOnly/__story__/story.tsx
index 31f719fd..65576c5d 100644
--- a/src/ServerOnly/__story__/story.tsx
+++ b/src/ServerOnly/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {ServerOnly} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Boundaries/ServerOnly', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/ServerOnly.md')}))
diff --git a/src/ShouldUpdate/__story__/story.tsx b/src/ShouldUpdate/__story__/story.tsx
index d1d06010..50b485e3 100644
--- a/src/ShouldUpdate/__story__/story.tsx
+++ b/src/ShouldUpdate/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {ShouldUpdate} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 import {Example1} from './Example1';
 import {Example2} from './Example2';
 import {Example3} from './Example3';
diff --git a/.storybook/ShowDocs.ts b/src/ShowDocs.ts
similarity index 97%
rename from .storybook/ShowDocs.ts
rename to src/ShowDocs.ts
index 77ae9507..bd905919 100644
--- a/.storybook/ShowDocs.ts
+++ b/src/ShowDocs.ts
@@ -1,4 +1,4 @@
-import {createElement as h} from 'react';
+import {h} from './util';
 
 const ShowDocs = (props) => {
   return h('div', {},
diff --git a/src/SizeSensor/__story__/story.ts b/src/SizeSensor/__story__/story.ts
index 4ff0e651..3485a57d 100644
--- a/src/SizeSensor/__story__/story.ts
+++ b/src/SizeSensor/__story__/story.ts
@@ -2,7 +2,7 @@ import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {SizeSensor, withSize} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Print = (props) => h('pre', {
   style: {fontFamily: 'monospace'}
diff --git a/src/SizeSensor/index.ts b/src/SizeSensor/index.ts
index 9fe5b948..973ac25a 100644
--- a/src/SizeSensor/index.ts
+++ b/src/SizeSensor/index.ts
@@ -1,5 +1,5 @@
-import {Component, createElement as h, cloneElement, Children} from 'react';
-import {noop} from '../util';
+import * as React from 'react';
+import {noop, h} from '../util';
 import renderProp from '../util/renderProp';
 import faccToHoc, {divWrapper} from '../util/faccToHoc';
 
@@ -16,7 +16,7 @@ export interface ISizeSensorState {
   height: number;
 }
 
-export class SizeSensor extends Component {
+export class SizeSensor extends React.Component {
   state: ISizeSensorState = {
     width: Infinity,
     height: Infinity,
@@ -84,7 +84,7 @@ export class SizeSensor extends Component {
 
     style.position = 'relative';
 
-    return cloneElement(element, {style}, ...[
+    return React.cloneElement(element, {style}, ...[
       h('iframe', {
         ref: this.ref,
         style: {
@@ -98,7 +98,7 @@ export class SizeSensor extends Component {
           zIndex: -1
         }
       }),
-      ...Children.toArray(element.props.children)
+      ...React.Children.toArray(element.props.children)
     ]);
   }
 }
diff --git a/src/Slider/__story__/story.tsx b/src/Slider/__story__/story.tsx
index 7f577df0..2778e41e 100644
--- a/src/Slider/__story__/story.tsx
+++ b/src/Slider/__story__/story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {Slider} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 storiesOf('UI/Slider', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/Slider.md')}))
diff --git a/src/Slider/index.ts b/src/Slider/index.ts
index dbd38f98..6eb284ad 100644
--- a/src/Slider/index.ts
+++ b/src/Slider/index.ts
@@ -1,4 +1,4 @@
-import {Component, cloneElement} from 'react';
+import * as React from 'react';
 import {noop, on, off} from '../util';
 import renderProp from '../util/renderProp';
 const throttle = require('throttle-debounce/throttle');
@@ -23,7 +23,7 @@ export interface ISliderState {
   length?: number;
 }
 
-export class Slider extends Component {
+export class Slider extends React.Component {
   static defaultProps = {
     disabled: false,
     reverse: false,
@@ -168,6 +168,6 @@ export class Slider extends Component {
       props.onTouchStart = this.onTouchStart(element.props.onTouchStart);
     }
 
-    return cloneElement(element, props);
+    return React.cloneElement(element, props);
   }
 }
diff --git a/src/Speak/__story__/story.ts b/src/Speak/__story__/story.ts
index 6f1b37ed..c8973475 100644
--- a/src/Speak/__story__/story.ts
+++ b/src/Speak/__story__/story.ts
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Speak} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 class StorySpeakBasic extends Component {
   state = {
diff --git a/src/State/__story__/story.tsx b/src/State/__story__/story.tsx
index 0f0bb386..0e9a06ff 100644
--- a/src/State/__story__/story.tsx
+++ b/src/State/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {State, withState} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Cnt = ({cnt, set}) =>
   
 set({cnt: cnt + 1})}>{cnt}
;
diff --git a/src/Toggle/__story__/story.tsx b/src/Toggle/__story__/story.tsx
index 3b97f607..8a25a00b 100644
--- a/src/Toggle/__story__/story.tsx
+++ b/src/Toggle/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Toggle, withToggle} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Checkbox = ({on, toggle}) =>
   

diff --git a/src/Tween/__story__/story.tsx b/src/Tween/__story__/story.tsx
index 7cd4c44c..3789f3b9 100644
--- a/src/Tween/__story__/story.tsx
+++ b/src/Tween/__story__/story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Tween} from '..';
 import {AfterTimeout} from '../../AfterTimeout';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 import createBezierEasing from '../createBezierEasing';
 
 storiesOf('Animation/Tween', module)
diff --git a/src/Value/__story__/story.tsx b/src/Value/__story__/story.tsx
index ff405bdb..cd1ff86f 100644
--- a/src/Value/__story__/story.tsx
+++ b/src/Value/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Value, withValue} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Val = ({value, set}) =>
      set(e.target.value)} />;
diff --git a/src/Vibrate/story.tsx b/src/Vibrate/story.tsx
index cffb9e89..9b500768 100644
--- a/src/Vibrate/story.tsx
+++ b/src/Vibrate/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Vibrate} from '.';
-import ShowDocs from '../../.storybook/ShowDocs'
+import ShowDocs from '../ShowDocs'
 
 storiesOf('Generators/Vibrate', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../docs/en/Vibrate.md')}))
diff --git a/src/Video/__story__/story.tsx b/src/Video/__story__/story.tsx
index 032345bd..31423537 100644
--- a/src/Video/__story__/story.tsx
+++ b/src/Video/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Video} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const src = 'http://dailym.ai/2rG7TBS';
 
diff --git a/src/ViewportObserverSensor/index.ts b/src/ViewportObserverSensor/index.ts
index 07da6802..d8632a15 100644
--- a/src/ViewportObserverSensor/index.ts
+++ b/src/ViewportObserverSensor/index.ts
@@ -1,4 +1,4 @@
-import {Component, cloneElement} from 'react';
+import {Component, cloneElement, SFCElement} from 'react';
 import {noop} from '../util';
 import renderProp from '../util/renderProp';
 
diff --git a/src/ViewportScrollSensor/index.ts b/src/ViewportScrollSensor/index.ts
index a547563d..e24cc845 100644
--- a/src/ViewportScrollSensor/index.ts
+++ b/src/ViewportScrollSensor/index.ts
@@ -1,4 +1,4 @@
-import {Component, cloneElement} from 'react';
+import {Component, cloneElement, SFCElement} from 'react';
 import {on, off, noop} from '../util';
 import * as throttle from 'throttle-debounce/throttle';
 import renderProp from '../util/renderProp';
diff --git a/src/ViewportSensor/__story__/story.tsx b/src/ViewportSensor/__story__/story.tsx
index b6aa3293..6944f774 100644
--- a/src/ViewportSensor/__story__/story.tsx
+++ b/src/ViewportSensor/__story__/story.tsx
@@ -2,7 +2,7 @@ import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {ViewportSensor, withViewport} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 import StoryViewportSensorBasicJsx from './StoryViewportSensorBasicJsx';
 import StoryViewportSensorBasic from '../../ViewportObserverSensor/__story__/StoryViewportSensorBasic';
 import StoryViewportSensorHorizontal from '../../ViewportObserverSensor/__story__/StoryViewportSensorHorizontal';
diff --git a/src/WhenIdle/__story__/story.tsx b/src/WhenIdle/__story__/story.tsx
index a289803d..5a6da9e1 100644
--- a/src/WhenIdle/__story__/story.tsx
+++ b/src/WhenIdle/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {WhenIdle} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Animation/WhenIdle', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/WhenIdle.md')}))
diff --git a/src/WidthQuery/__story__/story.tsx b/src/WidthQuery/__story__/story.tsx
index 671546ec..952a480d 100644
--- a/src/WidthQuery/__story__/story.tsx
+++ b/src/WidthQuery/__story__/story.tsx
@@ -3,7 +3,7 @@ import {storiesOf} from '@storybook/react';
 import {WidthQuery} from '..';
 import {View} from '../../View';
 import {WindowSizeSensor} from '../../WindowSizeSensor';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 storiesOf('UI/WidthQuery', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/WidthQuery.md')}))
diff --git a/src/WidthSensor/__story__/story.ts b/src/WidthSensor/__story__/story.ts
index 440cf42f..cbc7a278 100644
--- a/src/WidthSensor/__story__/story.ts
+++ b/src/WidthSensor/__story__/story.ts
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {WidthSensor, withWidth} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 const Print = (props) => h('pre', {
   style: {fontFamily: 'monospace'}
diff --git a/src/WidthSensor/index.ts b/src/WidthSensor/index.ts
index 13fb62e1..f71fdb5a 100644
--- a/src/WidthSensor/index.ts
+++ b/src/WidthSensor/index.ts
@@ -1,6 +1,6 @@
-import {Component, createElement as h} from 'react';
+import {Component} from 'react';
 import {SizeSensor, ISizeSensorProps, ISizeSensorState} from '../SizeSensor';
-import {noop} from '../util';
+import {noop, h} from '../util';
 import faccToHoc, {divWrapper} from '../util/faccToHoc';
 
 export interface IWidthSensorProps extends ISizeSensorProps {
diff --git a/src/WindowScrollSensor/__story__/story.ts b/src/WindowScrollSensor/__story__/story.ts
index 2e439559..9543e5b2 100644
--- a/src/WindowScrollSensor/__story__/story.ts
+++ b/src/WindowScrollSensor/__story__/story.ts
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {WindowScrollSensor} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Sensors/WindowScrollSensor', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/WindowScrollSensor.md')}))
diff --git a/src/WindowScrollSensor/index.ts b/src/WindowScrollSensor/index.ts
index 208219f6..d138e75a 100644
--- a/src/WindowScrollSensor/index.ts
+++ b/src/WindowScrollSensor/index.ts
@@ -1,6 +1,6 @@
-import {Component, createElement as h} from 'react';
+import {Component} from 'react';
 import {SyncSensor} from '../SyncSensor';
-import {isClient} from '../util';
+import {isClient, h} from '../util';
 import faccToHoc from '../util/faccToHoc';
 
 export interface IWindowScrollSensorValue {
diff --git a/src/WindowSizeSensor/__story__/story.ts b/src/WindowSizeSensor/__story__/story.ts
index a227f096..f3962fec 100644
--- a/src/WindowSizeSensor/__story__/story.ts
+++ b/src/WindowSizeSensor/__story__/story.ts
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {WindowSizeSensor} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Sensors/WindowSizeSensor', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/WindowSizeSensor.md')}))
diff --git a/src/WindowSizeSensor/index.ts b/src/WindowSizeSensor/index.ts
index 7ed1e67c..3a098ce1 100644
--- a/src/WindowSizeSensor/index.ts
+++ b/src/WindowSizeSensor/index.ts
@@ -1,6 +1,6 @@
-import {Component, createElement as h} from 'react';
+import {Component} from 'react';
 import {SyncSensor} from '../SyncSensor';
-import {isClient} from '../util';
+import {isClient, h} from '../util';
 import faccToHoc from '../util/faccToHoc';
 
 export interface IWindowSizeSensorValue {
diff --git a/src/WindowWidthQuery/__story__/story.tsx b/src/WindowWidthQuery/__story__/story.tsx
index 0036c32c..29450242 100644
--- a/src/WindowWidthQuery/__story__/story.tsx
+++ b/src/WindowWidthQuery/__story__/story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {WindowWidthQuery} from '..';
 import {View} from '../../View';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 storiesOf('UI/WindowWidthQuery', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/WindowWidthQuery.md')}))
diff --git a/src/WindowWidthSensor/__story__/story.js b/src/WindowWidthSensor/__story__/story.js
index 7eaeca40..bc73a207 100644
--- a/src/WindowWidthSensor/__story__/story.js
+++ b/src/WindowWidthSensor/__story__/story.js
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {action} from '@storybook/addon-actions';
 import {WindowWidthSensor} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 
 storiesOf('Sensors/WindowWidthSensor', module)
   .add('Documentation', () => h(ShowDocs, {md: require('../../../docs/en/WindowWidthSensor.md')}))
diff --git a/src/__story__/lazy.story.tsx b/src/__story__/lazy.story.tsx
index ea0b116b..de6f8c74 100644
--- a/src/__story__/lazy.story.tsx
+++ b/src/__story__/lazy.story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {lazy} from '../lazy';
-import ShowDocs from '../../.storybook/ShowDocs'
+import ShowDocs from '../ShowDocs'
 
 const MyComponent = () => 
 h(ShowDocs, {md: require('../../docs/en/loadable.md')}))
diff --git a/src/cssvars/__story__/story.tsx b/src/cssvars/__story__/story.tsx
index 11211bef..6fa3f91c 100644
--- a/src/cssvars/__story__/story.tsx
+++ b/src/cssvars/__story__/story.tsx
@@ -1,6 +1,6 @@
 import {createElement as h, Component} from 'react';
 import {storiesOf} from '@storybook/react';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 import {CssVarsProvider, CssVars, withCssVars} from '..';
 import {Example1} from './Example1';
 import {Example2} from './Example2';
diff --git a/src/invert.story.tsx b/src/invert.story.tsx
index 75c22010..e41eedab 100644
--- a/src/invert.story.tsx
+++ b/src/invert.story.tsx
@@ -1,7 +1,7 @@
 import {Component, createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {invert, Inverted} from './invert';
-import ShowDocs from '../.storybook/ShowDocs'
+import ShowDocs from './ShowDocs'
 
 const Audio = invert('audio');
 
diff --git a/src/invert.ts b/src/invert.ts
index 14941abc..ec1e8e3b 100644
--- a/src/invert.ts
+++ b/src/invert.ts
@@ -1,4 +1,4 @@
-import {Component} from 'react';
+import * as React from 'react';
 import {h, noop} from './util';
 import renderProp from './util/renderProp';
 
@@ -16,7 +16,7 @@ export type TInvert = (tag?: keyof React.ReactHTML) => React.ComponentClass
 const defaultWrapper = (element) => element;
 
 export const invert: TInvert = (tag?: keyof React.ReactHTML) => {
-  const Inverted = class Inverted extends Component {
+  const Inverted = class Inverted extends React.Component {
     static defaultProps = {
       wrapper: defaultWrapper
     };
diff --git a/src/route/Link.ts b/src/route/Link.ts
index a4730462..157363aa 100644
--- a/src/route/Link.ts
+++ b/src/route/Link.ts
@@ -1,4 +1,4 @@
-import {Component, cloneElement} from 'react';
+import * as React from 'react';
 import {h, noop} from '../util';
 import go, {TGo} from '../route/go';
 import renderProp from '../util/renderProp';
@@ -19,7 +19,7 @@ export interface ILinkProps extends React.AllHTMLAttributes {
 export interface ILinkState {
 }
 
-class Link extends Component {
+class Link extends React.Component {
   static defaultProps = {
     onGo: go
   };
@@ -94,7 +94,7 @@ class Link extends Component {
       props.href = to;
     }
 
-    return cloneElement(element, props);
+    return React.cloneElement(element, props);
   }
 }
 
diff --git a/src/route/__story__/story.tsx b/src/route/__story__/story.tsx
index 39f66327..d02af648 100644
--- a/src/route/__story__/story.tsx
+++ b/src/route/__story__/story.tsx
@@ -1,6 +1,6 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
-import ShowDocs from '../../../.storybook/ShowDocs'
+import ShowDocs from '../../ShowDocs'
 import {Router, Route, Switch} from '..';
 
 storiesOf('Context/route', module)
diff --git a/src/translate/__story__/story.tsx b/src/translate/__story__/story.tsx
index db73ffd2..b9b692f1 100644
--- a/src/translate/__story__/story.tsx
+++ b/src/translate/__story__/story.tsx
@@ -1,7 +1,7 @@
 import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {Translations, T, withT} from '..';
-import ShowDocs from '../../../.storybook/ShowDocs';
+import ShowDocs from '../../ShowDocs';
 
 const Demo = ({T}) => {
   return (
diff --git a/src/typing.d.ts b/src/typing.d.ts
index 9a905954..bf38221b 100644
--- a/src/typing.d.ts
+++ b/src/typing.d.ts
@@ -6,3 +6,7 @@ export interface IUniversalInterfaceProps {
   comp?: React.ComponentClass | React.SFC;
   component?: React.ComponentClass | React.SFC;
 }
+
+interface React {
+  createElement: any;
+}
diff --git a/src/util.ts b/src/util.ts
index 161d5a53..9c84cabe 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -1,4 +1,4 @@
-import {createElement as h} from 'react';
+import {createElement} from 'react';
 
 export type TComponent = React.ComponentClass | React.StatelessComponent;
 export type THoc = (Comp: TComponent) => TComponent
@@ -29,6 +29,4 @@ export const sym = (name) => {
 
 export const isFn = (fn) => typeof fn === 'function';
 
-export {
-  h
-};
+export const h = createElement as any;
\ No newline at end of file
diff --git a/src/util/wrapInStatefulComponent.ts b/src/util/wrapInStatefulComponent.ts
index 42fe3894..598d272a 100644
--- a/src/util/wrapInStatefulComponent.ts
+++ b/src/util/wrapInStatefulComponent.ts
@@ -1,8 +1,8 @@
-import {Component} from 'react';
+import * as React from 'react';
 import {h} from '../util';
 
 const wrapInStatefulComponent = (Comp) => {
-  const Decorated = class Decorated extends Component {
+  const Decorated = class Decorated extends React.Component {
     render () {
       return h(Comp, this.props);
     }
diff --git a/src/viewport.story.tsx b/src/viewport.story.tsx
index 66b0f475..f7982740 100644
--- a/src/viewport.story.tsx
+++ b/src/viewport.story.tsx
@@ -2,7 +2,7 @@ import {createElement as h} from 'react';
 import {storiesOf} from '@storybook/react';
 import {delayed} from './delayed';
 import {viewport} from './viewport';
-import ShowDocs from '../.storybook/ShowDocs'
+import ShowDocs from './ShowDocs'
 
 
 const Loaded = () => 
LOADED
;
diff --git a/src/viewport.ts b/src/viewport.ts
index 0dc22867..a6aeb155 100644
--- a/src/viewport.ts
+++ b/src/viewport.ts
@@ -1,4 +1,4 @@
-import {Component} from 'react';
+import * as React from 'react';
 import {h} from './util';
 import {ViewportSensor} from './ViewportSensor';
 import {pixel} from './pixel';
@@ -12,7 +12,7 @@ export type TViewport = 
(Comp: React.StatelessComponent
 | React.ComponentC
 export const viewport = (Comp, {placeholder = pixel} = {}) => {
   let flipped = false;
 
-  const Viewport = class Viewport extends Component {
+  const Viewport = class Viewport extends React.Component {
     onChange = () => {
       flipped = true;
       this.forceUpdate();
diff --git a/tsconfig.json b/tsconfig.json
index e5be50f6..745de501 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,9 +5,8 @@
     "moduleResolution": "Node",
     "removeComments": true,
     "noImplicitAny": false,
-    "sourceMap": false,
     "outDir": "./lib",
-    "allowJs": true,
+    "allowJs": false,
     "allowSyntheticDefaultImports": true,
     "jsx": "react",
     "jsxFactory": "h",
@@ -15,31 +14,23 @@
     "skipLibCheck": true,
     "experimentalDecorators": true,
     "importHelpers": true,
+    "pretty": true,
+    "sourceMap": true,
+    "esModuleInterop": true,
+    "noEmitHelpers": true,
     "noErrorTruncation": true,
     "noFallthroughCasesInSwitch": true,
-    "noUnusedLocals": true,
-    "pretty": true,
-    "lib": [
-      "dom",
-      "es5",
-      "es6",
-      "es7",
-      "es2015",
-      "scripthost",
-      "dom.iterable"
-    ]
+    "noImplicitReturns": true,
+    "declaration": true,
+    "lib": ["dom", "es5", "es6", "es7", "es2015", "es2017", "scripthost", "dom.iterable"]
   },
-  "include": [
-    "src/typing.d.ts",
-    "src"
-  ],
+  "include": ["typing.d.ts", "src"],
   "exclude": [
     "node_modules",
     "lib",
-    "src/__tests__",
+    "**/__tests__/**/*",
+    "**/__story__/**/*",
     "*.test.ts",
-    "*.test.tsx",
-    "*.test-server.ts",
-    "*.test-server.tsx"
+    "*.test.tsx"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index c6994352..7e41cdf4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -376,28 +376,20 @@
   version "15.5.6"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.6.tgz#9c03d3fed70a8d517c191b7734da2879b50ca26c"
 
-"@types/react-dom@16.0.3":
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.3.tgz#8accad7eabdab4cca3e1a56f5ccb57de2da0ff64"
+"@types/react-dom@^16.0.8":
+  version "16.0.8"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.8.tgz#6e1366ed629cadf55860cbfcc25db533f5d2fa7d"
   dependencies:
     "@types/node" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.3.17":
+"@types/react@*", "@types/react@^16.4.14":
   version "16.4.14"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.14.tgz#47c604c8e46ed674bbdf4aabf82b34b9041c6a04"
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
-"@types/strip-bom@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2"
-
-"@types/strip-json-comments@0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
-
 JSONStream@^1.0.4, JSONStream@^1.3.4, JSONStream@~1.3.1:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
@@ -551,12 +543,6 @@ ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
 
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -579,10 +565,6 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-wrap@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-
 ansi@^0.3.0, ansi@~0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
@@ -595,13 +577,6 @@ ansistyles@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
 
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -627,7 +602,7 @@ aproba@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1"
 
-archy@^1.0.0, archy@~1.0.0:
+archy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
@@ -666,14 +641,6 @@ arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
 
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-
-array-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
@@ -713,17 +680,13 @@ array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
 
-array-slice@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
   dependencies:
     array-uniq "^1.0.1"
 
-array-uniq@^1.0.0, array-uniq@^1.0.1, array-uniq@^1.0.2:
+array-uniq@^1.0.0, array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
@@ -877,7 +840,7 @@ babel-code-frame@6.26.0, babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.0.0, babel-core@^6.24.1, babel-core@^6.26.0:
+babel-core@^6.0.0, babel-core@^6.26.0:
   version "6.26.3"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
   dependencies:
@@ -1095,7 +1058,7 @@ babel-plugin-check-es2015-constants@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-istanbul@^4.1.4, babel-plugin-istanbul@^4.1.6:
+babel-plugin-istanbul@^4.1.6:
   version "4.1.6"
   resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
   dependencies:
@@ -1104,10 +1067,6 @@ babel-plugin-istanbul@^4.1.4, babel-plugin-istanbul@^4.1.6:
     istanbul-lib-instrument "^1.10.1"
     test-exclude "^4.2.1"
 
-babel-plugin-jest-hoist@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.4.tgz#b9851906eab34c7bf6f8c895a2b08bea1a844c0b"
-
 babel-plugin-jest-hoist@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
@@ -1638,13 +1597,6 @@ babel-preset-flow@^6.23.0:
   dependencies:
     babel-plugin-transform-flow-strip-types "^6.22.0"
 
-babel-preset-jest@^22.0.1:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.4.tgz#ec9fbd8bcd7dfd24b8b5320e0e688013235b7c39"
-  dependencies:
-    babel-plugin-jest-hoist "^22.4.4"
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
-
 babel-preset-jest@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
@@ -1820,10 +1772,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-
 before-after-hook@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a"
@@ -1960,7 +1908,7 @@ browser-process-hrtime@^0.1.2:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
 
-browser-resolve@^1.11.2, browser-resolve@^1.11.3:
+browser-resolve@^1.11.3:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
   dependencies:
@@ -2044,6 +1992,12 @@ browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
+bs-logger@0.x:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.5.tgz#1d82f0cf88864e1341cd9262237f8d0748a49b22"
+  dependencies:
+    fast-json-stable-stringify "^2.0.0"
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -2069,7 +2023,7 @@ buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
 
-buffer-from@^1.0.0:
+buffer-from@1.x, buffer-from@^1.0.0, buffer-from@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
 
@@ -2360,21 +2314,6 @@ chmodr@~1.0.2:
   version "1.0.2"
   resolved "http://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz#04662b932d0f02ec66deaa2b0ea42811968e3eb9"
 
-chokidar@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
 chokidar@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
@@ -2508,15 +2447,7 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-
-clone@^1.0.0, clone@^1.0.2:
+clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
@@ -2572,10 +2503,6 @@ color-string@^0.3.0:
   dependencies:
     color-name "^1.0.0"
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-
 color@^0.11.0:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
@@ -2756,7 +2683,7 @@ conventional-commits-parser@^3.0.0:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-convert-source-map@^1.1.1, convert-source-map@^1.4.0, convert-source-map@^1.5.1:
+convert-source-map@^1.4.0, convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
   dependencies:
@@ -2814,22 +2741,6 @@ cosmiconfig@^5.0.1, cosmiconfig@^5.0.5:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
-cpx@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/cpx/-/cpx-1.5.0.tgz#185be018511d87270dedccc293171e37655ab88f"
-  dependencies:
-    babel-runtime "^6.9.2"
-    chokidar "^1.6.0"
-    duplexer "^0.1.1"
-    glob "^7.0.5"
-    glob2base "^0.0.12"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    resolve "^1.1.7"
-    safe-buffer "^5.0.1"
-    shell-quote "^1.6.1"
-    subarg "^1.0.0"
-
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -3070,10 +2981,6 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
@@ -3151,7 +3058,7 @@ default-require-extensions@^1.0.0:
   dependencies:
     strip-bom "^2.0.0"
 
-defaults@^1.0.0, defaults@^1.0.3:
+defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
   dependencies:
@@ -3202,10 +3109,6 @@ depd@~1.1.1, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
-deprecated@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
-
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -3217,10 +3120,6 @@ destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -3379,12 +3278,6 @@ dotenv@^5.0.1:
   version "5.0.1"
   resolved "http://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  dependencies:
-    readable-stream "~1.1.9"
-
 duplexer2@~0.1.0:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -3399,7 +3292,7 @@ duplexer@^0.1.1:
   version "0.1.1"
   resolved "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
-duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.6.0:
+duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
   dependencies:
@@ -3459,13 +3352,7 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-end-of-stream@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
-  dependencies:
-    once "~1.3.0"
-
-enhanced-resolve@^3.0.0, enhanced-resolve@^3.4.0:
+enhanced-resolve@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
   dependencies:
@@ -3474,6 +3361,14 @@ enhanced-resolve@^3.0.0, enhanced-resolve@^3.4.0:
     object-assign "^4.0.1"
     tapable "^0.2.7"
 
+enhanced-resolve@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    tapable "^1.0.0"
+
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
@@ -3813,17 +3708,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^22.4.0:
-  version "22.4.3"
-  resolved "http://registry.npmjs.org/expect/-/expect-22.4.3.tgz#d5a29d0a0e1fb2153557caef2674d4547e914674"
-  dependencies:
-    ansi-styles "^3.2.0"
-    jest-diff "^22.4.3"
-    jest-get-type "^22.4.3"
-    jest-matcher-utils "^22.4.3"
-    jest-message-util "^22.4.3"
-    jest-regex-util "^22.4.3"
-
 expect@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98"
@@ -3922,14 +3806,6 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
-fancy-log@^1.1.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    time-stamp "^1.0.0"
-
 fast-af@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fast-af/-/fast-af-0.1.0.tgz#1a1e7993e4fd7b370266c484b59325c25507d14a"
@@ -3961,7 +3837,7 @@ fast-glob@^2.0.2:
     merge2 "^1.2.1"
     micromatch "^3.1.10"
 
-fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
 
@@ -4080,10 +3956,6 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
-find-index@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
-
 find-npm-prefix@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"
@@ -4114,33 +3986,6 @@ find-versions@^2.0.0:
     array-uniq "^1.0.0"
     semver-regex "^1.0.0"
 
-findup-sync@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^3.1.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-fined@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
-  dependencies:
-    expand-tilde "^2.0.2"
-    is-plain-object "^2.0.3"
-    object.defaults "^1.1.0"
-    object.pick "^1.2.0"
-    parse-filepath "^1.0.1"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-
-flagged-respawn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
-
 flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
@@ -4166,12 +4011,6 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  dependencies:
-    for-in "^1.0.1"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -4240,14 +4079,6 @@ fs-extra@3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
-fs-extra@4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
@@ -4291,7 +4122,7 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@^1.0.0, fsevents@^1.2.2, fsevents@^1.2.3:
+fsevents@^1.2.2, fsevents@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
   dependencies:
@@ -4382,12 +4213,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaze@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
-  dependencies:
-    globule "~0.1.0"
-
 generate-function@^2.0.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
@@ -4533,53 +4358,17 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob-parent@^3.0.0, glob-parent@^3.1.0:
+glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-stream@^3.1.5:
-  version "3.1.18"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
-  dependencies:
-    glob "^4.3.1"
-    glob2base "^0.0.12"
-    minimatch "^2.0.1"
-    ordered-read-streams "^0.1.0"
-    through2 "^0.6.1"
-    unique-stream "^1.0.0"
-
-glob-stream@^5.3.2:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
-  dependencies:
-    extend "^3.0.0"
-    glob "^5.0.3"
-    glob-parent "^3.0.0"
-    micromatch "^2.3.7"
-    ordered-read-streams "^0.3.0"
-    through2 "^0.6.0"
-    to-absolute-glob "^0.1.1"
-    unique-stream "^2.0.2"
-
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
 
-glob-watcher@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
-  dependencies:
-    gaze "^0.5.1"
-
-glob2base@^0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
-  dependencies:
-    find-index "^0.1.1"
-
 glob@7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -4591,25 +4380,6 @@ glob@7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^4.3.1:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^2.0.1"
-    once "^1.3.0"
-
-glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    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.2:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
@@ -4621,14 +4391,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~3.1.21:
-  version "3.1.21"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
-  dependencies:
-    graceful-fs "~1.2.0"
-    inherits "1"
-    minimatch "~0.2.11"
-
 glob@~7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
@@ -4687,20 +4449,6 @@ globby@^8.0.0:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globule@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
-  dependencies:
-    glob "~3.1.21"
-    lodash "~1.0.1"
-    minimatch "~0.2.11"
-
-glogg@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
-  dependencies:
-    sparkles "^1.0.0"
-
 got@^6.7.1:
   version "6.7.1"
   resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -4717,20 +4465,10 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-graceful-fs@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
-  dependencies:
-    natives "^1.1.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@~4.1.11, graceful-fs@~4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@~4.1.11, graceful-fs@~4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-graceful-fs@~1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
-
 growl@1.10.3:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
@@ -4739,72 +4477,6 @@ growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-gulp-sourcemaps@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
-  dependencies:
-    convert-source-map "^1.1.1"
-    graceful-fs "^4.1.2"
-    strip-bom "^2.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-
-gulp-typescript@3:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/gulp-typescript/-/gulp-typescript-3.2.4.tgz#17c6b941078b02c0522974ed6c963ab190920a47"
-  dependencies:
-    gulp-util "~3.0.7"
-    source-map "~0.5.3"
-    through2 "~2.0.1"
-    vinyl-fs "~2.4.3"
-
-gulp-util@^3.0.0, gulp-util@~3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp@3.9.1:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
-  dependencies:
-    archy "^1.0.0"
-    chalk "^1.0.0"
-    deprecated "^0.0.1"
-    gulp-util "^3.0.0"
-    interpret "^1.0.0"
-    liftoff "^2.1.0"
-    minimist "^1.1.0"
-    orchestrator "^0.3.0"
-    pretty-hrtime "^1.0.0"
-    semver "^4.1.0"
-    tildify "^1.0.0"
-    v8flags "^2.0.2"
-    vinyl-fs "^0.3.0"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  dependencies:
-    glogg "^1.0.0"
-
 gzip-size@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
@@ -4874,12 +4546,6 @@ has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  dependencies:
-    sparkles "^1.0.0"
-
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
@@ -5230,10 +4896,6 @@ inflight@^1.0.4, inflight@~1.0.4, inflight@~1.0.6:
     once "^1.3.0"
     wrappy "1"
 
-inherits@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
-
 inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
@@ -5353,13 +5015,6 @@ is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
 
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -5632,12 +5287,6 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  dependencies:
-    is-unc-path "^1.0.0"
-
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -5686,20 +5335,10 @@ is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  dependencies:
-    unc-path-regex "^0.1.2"
-
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-is-valid-glob@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
-
 is-whitespace-character@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz#ede53b4c6f6fb3874533751ec9280d01928d03ed"
@@ -5873,22 +5512,6 @@ jest-cli@^23.6.0:
     which "^1.2.12"
     yargs "^11.0.0"
 
-jest-config@^22.0.1, jest-config@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.4.tgz#72a521188720597169cd8b4ff86934ef5752d86a"
-  dependencies:
-    chalk "^2.0.1"
-    glob "^7.1.1"
-    jest-environment-jsdom "^22.4.1"
-    jest-environment-node "^22.4.1"
-    jest-get-type "^22.1.0"
-    jest-jasmine2 "^22.4.4"
-    jest-regex-util "^22.1.0"
-    jest-resolve "^22.4.2"
-    jest-util "^22.4.1"
-    jest-validate "^22.4.4"
-    pretty-format "^22.4.0"
-
 jest-config@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
@@ -5908,15 +5531,6 @@ jest-config@^23.6.0:
     micromatch "^2.3.11"
     pretty-format "^23.6.0"
 
-jest-diff@^22.4.0, jest-diff@^22.4.3:
-  version "22.4.3"
-  resolved "http://registry.npmjs.org/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030"
-  dependencies:
-    chalk "^2.0.1"
-    diff "^3.2.0"
-    jest-get-type "^22.4.3"
-    pretty-format "^22.4.3"
-
 jest-diff@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d"
@@ -5943,14 +5557,6 @@ jest-environment-jsdom-global@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom-global/-/jest-environment-jsdom-global-1.1.0.tgz#dea8a3991aa9a6e638dce8933957fdbc42c97bf6"
 
-jest-environment-jsdom@^22.4.1:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e"
-  dependencies:
-    jest-mock "^22.4.3"
-    jest-util "^22.4.3"
-    jsdom "^11.5.1"
-
 jest-environment-jsdom@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
@@ -5959,13 +5565,6 @@ jest-environment-jsdom@^23.4.0:
     jest-util "^23.4.0"
     jsdom "^11.5.1"
 
-jest-environment-node@^22.4.1:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129"
-  dependencies:
-    jest-mock "^22.4.3"
-    jest-util "^22.4.3"
-
 jest-environment-node@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
@@ -5973,7 +5572,7 @@ jest-environment-node@^23.4.0:
     jest-mock "^23.2.0"
     jest-util "^23.4.0"
 
-jest-get-type@^22.1.0, jest-get-type@^22.4.3:
+jest-get-type@^22.1.0:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
 
@@ -5990,22 +5589,6 @@ jest-haste-map@^23.6.0:
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-jasmine2@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.4.tgz#c55f92c961a141f693f869f5f081a79a10d24e23"
-  dependencies:
-    chalk "^2.0.1"
-    co "^4.6.0"
-    expect "^22.4.0"
-    graceful-fs "^4.1.11"
-    is-generator-fn "^1.0.0"
-    jest-diff "^22.4.0"
-    jest-matcher-utils "^22.4.0"
-    jest-message-util "^22.4.0"
-    jest-snapshot "^22.4.0"
-    jest-util "^22.4.1"
-    source-map-support "^0.5.0"
-
 jest-jasmine2@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
@@ -6029,14 +5612,6 @@ jest-leak-detector@^23.6.0:
   dependencies:
     pretty-format "^23.6.0"
 
-jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3:
-  version "22.4.3"
-  resolved "http://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff"
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.4.3"
-    pretty-format "^22.4.3"
-
 jest-matcher-utils@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80"
@@ -6045,16 +5620,6 @@ jest-matcher-utils@^23.6.0:
     jest-get-type "^22.1.0"
     pretty-format "^23.6.0"
 
-jest-message-util@^22.4.0, jest-message-util@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7"
-  dependencies:
-    "@babel/code-frame" "^7.0.0-beta.35"
-    chalk "^2.0.1"
-    micromatch "^2.3.11"
-    slash "^1.0.0"
-    stack-utils "^1.0.1"
-
 jest-message-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
@@ -6065,18 +5630,10 @@ jest-message-util@^23.4.0:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7"
-
 jest-mock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
 
-jest-regex-util@^22.1.0, jest-regex-util@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.4.3.tgz#a826eb191cdf22502198c5401a1fc04de9cef5af"
-
 jest-regex-util@^23.3.0:
   version "23.3.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
@@ -6088,13 +5645,6 @@ jest-resolve-dependencies@^23.6.0:
     jest-regex-util "^23.3.0"
     jest-snapshot "^23.6.0"
 
-jest-resolve@^22.4.2:
-  version "22.4.3"
-  resolved "http://registry.npmjs.org/jest-resolve/-/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea"
-  dependencies:
-    browser-resolve "^1.11.2"
-    chalk "^2.0.1"
-
 jest-resolve@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
@@ -6151,17 +5701,6 @@ jest-serializer@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
 
-jest-snapshot@^22.4.0:
-  version "22.4.3"
-  resolved "http://registry.npmjs.org/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2"
-  dependencies:
-    chalk "^2.0.1"
-    jest-diff "^22.4.3"
-    jest-matcher-utils "^22.4.3"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    pretty-format "^22.4.3"
-
 jest-snapshot@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
@@ -6177,18 +5716,6 @@ jest-snapshot@^23.6.0:
     pretty-format "^23.6.0"
     semver "^5.5.0"
 
-jest-util@^22.4.1, jest-util@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac"
-  dependencies:
-    callsites "^2.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.11"
-    is-ci "^1.0.10"
-    jest-message-util "^22.4.3"
-    mkdirp "^0.5.1"
-    source-map "^0.6.0"
-
 jest-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
@@ -6202,16 +5729,6 @@ jest-util@^23.4.0:
     slash "^1.0.0"
     source-map "^0.6.0"
 
-jest-validate@^22.4.4:
-  version "22.4.4"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.4.tgz#1dd0b616ef46c995de61810d85f57119dbbcec4d"
-  dependencies:
-    chalk "^2.0.1"
-    jest-config "^22.4.4"
-    jest-get-type "^22.1.0"
-    leven "^2.1.0"
-    pretty-format "^22.4.0"
-
 jest-validate@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
@@ -6331,7 +5848,7 @@ json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
 
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+json-stable-stringify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
@@ -6345,6 +5862,12 @@ json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
 
+json5@2.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
+  dependencies:
+    minimist "^1.2.0"
+
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -6424,12 +5947,6 @@ lazy-property@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz#84ddc4b370679ba8bd4cdcfa4c06b43d57111147"
 
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  dependencies:
-    readable-stream "^2.0.5"
-
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -6496,19 +6013,6 @@ libnpx@^10.2.0:
     y18n "^4.0.0"
     yargs "^11.0.0"
 
-liftoff@^2.1.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
-  dependencies:
-    extend "^3.0.0"
-    findup-sync "^2.0.0"
-    fined "^1.0.1"
-    flagged-respawn "^1.0.0"
-    is-plain-object "^2.0.4"
-    object.map "^1.0.0"
-    rechoir "^0.6.2"
-    resolve "^1.1.7"
-
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -6589,14 +6093,6 @@ lodash-es@^4.2.1:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
 
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -6604,10 +6100,6 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
@@ -6616,23 +6108,7 @@ lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
 
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-
-lodash._root@^3.0.0, lodash._root@~3.0.0:
+lodash._root@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
 
@@ -6656,12 +6132,6 @@ lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
 
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  dependencies:
-    lodash._root "^3.0.0"
-
 lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
@@ -6682,7 +6152,7 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
-lodash.isequal@^4.0.0, lodash.isequal@^4.5.0:
+lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
 
@@ -6694,7 +6164,7 @@ lodash.isstring@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
 
-lodash.keys@^3.0.0, lodash.keys@^3.1.2:
+lodash.keys@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
   dependencies:
@@ -6722,10 +6192,6 @@ lodash.pick@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
 
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-
 lodash.some@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
@@ -6734,27 +6200,6 @@ lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
 lodash.throttle@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
@@ -6787,10 +6232,6 @@ lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.3,
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
 
-lodash@~1.0.1:
-  version "1.0.2"
-  resolved "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
-
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -6816,10 +6257,6 @@ lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-
 lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3, lru-cache@~4.1.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
@@ -6844,7 +6281,7 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
-make-error@^1.1.1, make-error@^1.3.4:
+make-error@1.x, make-error@^1.1.1, make-error@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
 
@@ -6896,12 +6333,6 @@ make-fetch-happen@^3.0.0:
     socks-proxy-agent "^3.0.1"
     ssri "^5.2.4"
 
-make-iterator@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
-  dependencies:
-    kind-of "^6.0.2"
-
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -6914,7 +6345,7 @@ map-age-cleaner@^0.1.1:
   dependencies:
     p-defer "^1.0.0"
 
-map-cache@^0.2.0, map-cache@^0.2.2:
+map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
@@ -7027,7 +6458,7 @@ merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
-merge-stream@^1.0.0, merge-stream@^1.0.1:
+merge-stream@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
   dependencies:
@@ -7045,7 +6476,7 @@ methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
-micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
+micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -7063,7 +6494,7 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
@@ -7128,30 +6559,17 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.3:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@^2.0.1:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
-  dependencies:
-    brace-expansion "^1.0.0"
-
-minimatch@~0.2.11:
-  version "0.2.14"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
+    brace-expansion "^1.1.7"
 
 minimist-options@^3.0.1:
   version "3.0.2"
@@ -7164,7 +6582,7 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -7237,7 +6655,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@0.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 "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -7285,12 +6703,6 @@ ms@2.1.1, ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
 
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  dependencies:
-    duplexer2 "0.0.2"
-
 mute-stream@0.0.7, mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -7325,10 +6737,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-natives@^1.1.0:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.5.tgz#3bdbdb4104023e5dd239b56fc7ef3d9a17acc6aa"
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -7545,7 +6953,7 @@ normalize-package-data@~2.3.5:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
@@ -8098,11 +7506,7 @@ oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
 
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-
-object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
@@ -8141,15 +7545,6 @@ object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.defaults@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-  dependencies:
-    array-each "^1.0.1"
-    array-slice "^1.0.0"
-    for-own "^1.0.0"
-    isobject "^3.0.0"
-
 object.entries@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
@@ -8175,13 +7570,6 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
-object.map@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -8189,7 +7577,7 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-object.pick@^1.2.0, object.pick@^1.3.0:
+object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
   dependencies:
@@ -8216,12 +7604,6 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0, once@~1.4.0:
   dependencies:
     wrappy "1"
 
-once@~1.3.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
-  dependencies:
-    wrappy "1"
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -8260,25 +7642,6 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-orchestrator@^0.3.0:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
-  dependencies:
-    end-of-stream "~0.1.5"
-    sequencify "~0.0.7"
-    stream-consume "~0.1.0"
-
-ordered-read-streams@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
-
-ordered-read-streams@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
-  dependencies:
-    is-stream "^1.0.1"
-    readable-stream "^2.0.1"
-
 original@>=0.0.5:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -8495,14 +7858,6 @@ parse-entities@^1.0.2:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-filepath@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
 parse-github-url@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395"
@@ -8592,16 +7947,6 @@ path-parse@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
 
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  dependencies:
-    path-root-regex "^0.1.0"
-
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -8973,13 +8318,6 @@ pretty-error@^2.0.2:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-format@^22.4.0, pretty-format@^22.4.3:
-  version "22.4.3"
-  resolved "http://registry.npmjs.org/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f"
-  dependencies:
-    ansi-regex "^3.0.0"
-    ansi-styles "^3.2.0"
-
 pretty-format@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
@@ -8987,10 +8325,6 @@ pretty-format@^23.6.0:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-pretty-hrtime@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-
 private@^0.1.6, private@^0.1.8, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -9587,7 +8921,7 @@ read@1, read@~1.0.1, read@~1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.2:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.2:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -9599,7 +8933,7 @@ read@1, read@~1.0.1, read@~1.0.7:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
+readable-stream@1.0:
   version "1.0.34"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
@@ -9608,7 +8942,7 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~1.1.10, readable-stream@~1.1.9:
+readable-stream@~1.1.10:
   version "1.1.14"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
@@ -9862,10 +9196,6 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-
 replace-ext@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
@@ -9984,7 +9314,7 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+resolve-dir@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
   dependencies:
@@ -10007,7 +9337,7 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.8.1:
+resolve@^1.1.6, resolve@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
@@ -10196,7 +9526,7 @@ semver-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
@@ -10230,10 +9560,6 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-sequencify@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
-
 serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
@@ -10325,7 +9651,7 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shell-quote@1.6.1, shell-quote@^1.6.1:
+shell-quote@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
   dependencies:
@@ -10346,10 +9672,6 @@ shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
 
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -10491,7 +9813,7 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.0, source-map-support@^0.5.6:
+source-map-support@^0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
   dependencies:
@@ -10502,7 +9824,7 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
+source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -10510,10 +9832,6 @@ 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.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
-
 spawn-error-forwarder@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spawn-error-forwarder/-/spawn-error-forwarder-1.0.0.tgz#1afd94738e999b0346d7b9fc373be55e07577029"
@@ -10646,10 +9964,6 @@ stream-combiner2@~1.1.1:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
 
-stream-consume@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"
-
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
@@ -10772,24 +10086,10 @@ strip-ansi@^4.0.0, strip-ansi@~4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-bom-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    strip-bom "^2.0.0"
-
 strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
-strip-bom@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    is-utf8 "^0.2.0"
-
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -10804,7 +10104,7 @@ strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
 
-strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
+strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
@@ -10819,12 +10119,6 @@ stylis@3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1"
 
-subarg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
-  dependencies:
-    minimist "^1.1.0"
-
 supports-color@4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
@@ -10887,6 +10181,10 @@ tapable@^0.2.7:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
 
+tapable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
+
 tar-fs@^1.15.3:
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
@@ -10960,21 +10258,7 @@ throttle-debounce@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz#51853da37be68a155cb6e827b3514a3c422e89cd"
 
-through2-filter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^0.6.0, through2@^0.6.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
-through2@^2.0.0, through2@^2.0.2, through2@~2.0.0, through2@~2.0.1:
+through2@^2.0.0, through2@^2.0.2, through2@~2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
@@ -10985,16 +10269,6 @@ through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8, through@~2.3.6:
   version "2.3.8"
   resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-tildify@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
-  dependencies:
-    os-homedir "^1.0.0"
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-
 time-stamp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.1.0.tgz#6c5c0b2bc835a244616abcfddf81ce13a1975c9f"
@@ -11029,12 +10303,6 @@ tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
 
-to-absolute-glob@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
-  dependencies:
-    extend-shallow "^2.0.1"
-
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -11126,54 +10394,42 @@ trough@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz#e29bd1614c6458d44869fc28b255ab7857ef7c24"
 
-ts-jest@22.0.1:
-  version "22.0.1"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-22.0.1.tgz#48942936a466c2e76e259b02e2f1356f1839afc3"
+ts-jest@^23.10.3:
+  version "23.10.3"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-23.10.3.tgz#f42de669888dfd2795b1491016b1813230d553fa"
   dependencies:
-    babel-core "^6.24.1"
-    babel-plugin-istanbul "^4.1.4"
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-preset-jest "^22.0.1"
-    cpx "^1.5.0"
-    fs-extra "4.0.3"
-    jest-config "^22.0.1"
-    pkg-dir "^2.0.0"
-    source-map-support "^0.5.0"
-    yargs "^10.0.3"
+    bs-logger "0.x"
+    buffer-from "1.x"
+    fast-json-stable-stringify "2.x"
+    json5 "2.x"
+    make-error "1.x"
+    mkdirp "0.x"
+    semver "^5.5"
+    yargs-parser "10.x"
 
-ts-loader@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.2.0.tgz#23211922179b81f7448754b7fdfca45b8374a15a"
+ts-loader@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.2.1.tgz#e6815c631dcafc24319ce8be6f8af94908749cf3"
   dependencies:
     chalk "^2.3.0"
-    enhanced-resolve "^3.0.0"
+    enhanced-resolve "^4.0.0"
     loader-utils "^1.0.2"
+    micromatch "^3.1.4"
     semver "^5.0.1"
 
-ts-node@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-4.1.0.tgz#36d9529c7b90bb993306c408cd07f7743de20712"
+ts-node@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.1.tgz#9562dc2d1e6d248d24bc55f773e3f614337d9baf"
   dependencies:
     arrify "^1.0.0"
-    chalk "^2.3.0"
+    buffer-from "^1.1.0"
     diff "^3.1.0"
     make-error "^1.1.1"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
-    source-map-support "^0.5.0"
-    tsconfig "^7.0.0"
-    v8flags "^3.0.0"
+    source-map-support "^0.5.6"
     yn "^2.0.0"
 
-tsconfig@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
-  dependencies:
-    "@types/strip-bom" "^3.0.0"
-    "@types/strip-json-comments" "0.0.30"
-    strip-bom "^3.0.0"
-    strip-json-comments "^2.0.0"
-
 tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
@@ -11217,9 +10473,9 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
+typescript@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96"
 
 ua-parser-js@^0.7.18:
   version "0.7.18"
@@ -11281,10 +10537,6 @@ umask@^1.1.0, umask@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
 
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-
 underscore@~1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
@@ -11336,17 +10588,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
-
-unique-stream@^2.0.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
-  dependencies:
-    json-stable-stringify "^1.0.0"
-    through2-filter "^2.0.0"
-
 unique-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
@@ -11496,10 +10737,6 @@ user-home@2.0.0:
   dependencies:
     os-homedir "^1.0.0"
 
-user-home@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
-
 util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -11547,22 +10784,6 @@ uuid@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
-v8flags@^2.0.2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
-  dependencies:
-    user-home "^1.1.1"
-
-v8flags@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.1.tgz#42259a1461c08397e37fe1d4f1cfb59cad85a053"
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-vali-date@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
-
 validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4, validate-npm-package-license@~3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -11630,64 +10851,6 @@ vfile@^2.0.0:
     unist-util-stringify-position "^1.0.0"
     vfile-message "^1.0.0"
 
-vinyl-fs@^0.3.0:
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
-  dependencies:
-    defaults "^1.0.0"
-    glob-stream "^3.1.5"
-    glob-watcher "^0.0.6"
-    graceful-fs "^3.0.0"
-    mkdirp "^0.5.0"
-    strip-bom "^1.0.0"
-    through2 "^0.6.1"
-    vinyl "^0.4.0"
-
-vinyl-fs@~2.4.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
-  dependencies:
-    duplexify "^3.2.0"
-    glob-stream "^5.3.2"
-    graceful-fs "^4.0.0"
-    gulp-sourcemaps "1.6.0"
-    is-valid-glob "^0.3.0"
-    lazystream "^1.0.0"
-    lodash.isequal "^4.0.0"
-    merge-stream "^1.0.0"
-    mkdirp "^0.5.0"
-    object-assign "^4.0.0"
-    readable-stream "^2.0.4"
-    strip-bom "^2.0.0"
-    strip-bom-stream "^1.0.0"
-    through2 "^2.0.0"
-    through2-filter "^2.0.0"
-    vali-date "^1.0.0"
-    vinyl "^1.0.0"
-
-vinyl@^0.4.0:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -11982,7 +11145,7 @@ xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
 
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
@@ -12002,7 +11165,7 @@ yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
-yargs-parser@^10.1.0:
+yargs-parser@10.x, yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
   dependencies:
@@ -12014,35 +11177,12 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
-  dependencies:
-    camelcase "^4.1.0"
-
 yargs-parser@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
   dependencies:
     camelcase "^4.1.0"
 
-yargs@^10.0.3:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5"
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.1.1"
-    find-up "^2.1.0"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^8.1.0"
-
 yargs@^11.0.0:
   version "11.1.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"