From 4f7bba929088c4fecdfd9549c13faa088092f6fd Mon Sep 17 00:00:00 2001 From: ZauberNerd Date: Wed, 22 Nov 2017 11:05:42 +0100 Subject: [PATCH] refactor(template-react): remove flow type annotations This commit removes the flow type support from our default template BREAKING CHANGE: The template `hops-template-react` now no longer contains flow type annotations. Closes: #277 --- packages/template-react/.flowconfig | 15 -- packages/template-react/README.md | 13 +- .../template-react/flow-typed/css-module.js | 3 - packages/template-react/package.json | 6 +- packages/template-react/src/app.js | 1 - .../template-react/src/counter/actions.js | 20 +- .../template-react/src/counter/constants.js | 6 +- .../template-react/src/counter/counter.js | 21 +- .../src/counter/counterContainer.js | 7 +- packages/template-react/src/counter/index.js | 4 +- .../template-react/src/counter/reducer.js | 8 +- .../src/counter/spec/actions.spec.js | 2 - .../src/counter/spec/counter.spec.js | 2 - .../src/counter/spec/counterContainer.spec.js | 4 +- .../src/counter/spec/reducer.spec.js | 6 +- packages/template-react/src/home/home.js | 1 - packages/template-react/src/home/index.js | 4 +- .../template-react/src/home/spec/home.spec.js | 2 - packages/template-react/src/reducers.js | 8 +- yarn.lock | 253 +----------------- 20 files changed, 33 insertions(+), 353 deletions(-) delete mode 100644 packages/template-react/.flowconfig delete mode 100644 packages/template-react/flow-typed/css-module.js diff --git a/packages/template-react/.flowconfig b/packages/template-react/.flowconfig deleted file mode 100644 index ca1759de7..000000000 --- a/packages/template-react/.flowconfig +++ /dev/null @@ -1,15 +0,0 @@ -[ignore] -.*/node_modules/node-resolve/test/ -.*/node_modules/http-parser-js/package.json - -[include] - -[libs] - -[lints] - -[options] -module.name_mapper='.*\.css$' -> 'CSSModule' -module.system=haste - -suppress_comment=\\(.\\|\n\\)*\\$FlowExpectError diff --git a/packages/template-react/README.md b/packages/template-react/README.md index bc5805557..3f2ed2613 100644 --- a/packages/template-react/README.md +++ b/packages/template-react/README.md @@ -3,12 +3,11 @@ [![npm](https://img.shields.io/npm/v/hops-template-react.svg)](https://www.npmjs.com/package/hops-template-react) This is a small example application showing [hops](https://github.com/xing/hops) in action. -It demonstrates how to use hops with React, Redux, Flow and Jest. +It demonstrates how to use hops with React, Redux and Jest. It has the following folder structure: ``` -├── flow-typed ├── node_modules ├── package.json ├── readme.md @@ -75,16 +74,6 @@ To make use of this execute `npm run build -- --static` or `yarn build --static` This command will test your code with [jest](https://facebook.github.io/jest/) a testrunner by facebook that integrates nicely with react. -### `npm run flow` / `yarn flow` - -This command will run flow to typecheck your code and warn you about errors early on. - - -### (`postinstall`) - -This script isn't really meant to be executed by the user. Instead it will run every time that you install the project or a new dependency and download the latest type definitions from [flow-typed](https://github.com/flowtype/flow-typed) for all of your dependencies. - - ## Configuration Please refer to [hops-config](https://github.com/xing/hops/tree/master/packages/config) to see a list of all supported options. diff --git a/packages/template-react/flow-typed/css-module.js b/packages/template-react/flow-typed/css-module.js deleted file mode 100644 index b67acf749..000000000 --- a/packages/template-react/flow-typed/css-module.js +++ /dev/null @@ -1,3 +0,0 @@ -declare module CSSModule { - declare export default { [key: string]: string }; -} diff --git a/packages/template-react/package.json b/packages/template-react/package.json index 9b88f9fe9..7a8f2d5ae 100644 --- a/packages/template-react/package.json +++ b/packages/template-react/package.json @@ -13,11 +13,9 @@ } }, "scripts": { - "postinstall": "flow-typed install --overwrite", "start": "hops start", "build": "hops build", - "test": "jest", - "flow": "flow" + "test": "jest" }, "dependencies": { "hops-express": "7.3.4", @@ -33,8 +31,6 @@ "redux-thunk": "^2.2.0" }, "devDependencies": { - "flow-bin": "^0.58.0", - "flow-typed": "^2.2.3", "hops-build": "7.4.1", "hops-local-cli": "7.4.0", "jest": "^21.2.1", diff --git a/packages/template-react/src/app.js b/packages/template-react/src/app.js index cd867e8a0..253ab20e4 100644 --- a/packages/template-react/src/app.js +++ b/packages/template-react/src/app.js @@ -1,4 +1,3 @@ -// @flow import React from 'react'; import { Route, Switch, Link } from 'react-router-dom'; diff --git a/packages/template-react/src/counter/actions.js b/packages/template-react/src/counter/actions.js index b3da68cf1..2d00d68e6 100644 --- a/packages/template-react/src/counter/actions.js +++ b/packages/template-react/src/counter/actions.js @@ -1,29 +1,13 @@ -// @flow - import { INCREMENT, DECREMENT } from './constants'; -type IncrementAction = { - type: typeof INCREMENT; - payload: number; -}; - -type DecrementAction = { - type: typeof DECREMENT; - payload: number; -}; - -export type Action = - | IncrementAction - | DecrementAction; - -export function increment(amount: number = 1): IncrementAction { +export function increment(amount = 1) { return { type: INCREMENT, payload: amount, }; } -export function decrement(amount: number = 1): DecrementAction { +export function decrement(amount = 1) { return { type: DECREMENT, payload: amount, diff --git a/packages/template-react/src/counter/constants.js b/packages/template-react/src/counter/constants.js index 2417e1b0a..17e7a7239 100644 --- a/packages/template-react/src/counter/constants.js +++ b/packages/template-react/src/counter/constants.js @@ -1,4 +1,2 @@ -// @flow - -export const INCREMENT: 'INCREMENT_COUNTER' = 'INCREMENT_COUNTER'; -export const DECREMENT: 'DECREMENT_COUNTER' = 'DECREMENT_COUNTER'; \ No newline at end of file +export const INCREMENT = 'INCREMENT_COUNTER'; +export const DECREMENT = 'DECREMENT_COUNTER'; diff --git a/packages/template-react/src/counter/counter.js b/packages/template-react/src/counter/counter.js index 39525e4bc..34c0d22a6 100644 --- a/packages/template-react/src/counter/counter.js +++ b/packages/template-react/src/counter/counter.js @@ -1,18 +1,7 @@ -// @flow - import React from 'react'; +import PropTypes from 'prop-types'; -export type Props = { - count: number; - increment: (amount?: number) => void; - decrement: (amount?: number) => void; -}; - -export default function Counter({ - count, - increment, - decrement, -}: Props) { +export default function Counter({ count, increment, decrement }) { return (
Clicked: {count} times @@ -21,3 +10,9 @@ export default function Counter({
); } + +Counter.propTypes = { + count: PropTypes.number.isRequired, + increment: PropTypes.func.isRequired, + decrement: PropTypes.func.isRequired, +}; diff --git a/packages/template-react/src/counter/counterContainer.js b/packages/template-react/src/counter/counterContainer.js index 9961b1b95..12e92e094 100644 --- a/packages/template-react/src/counter/counterContainer.js +++ b/packages/template-react/src/counter/counterContainer.js @@ -1,13 +1,10 @@ -// @flow - import { connect } from 'react-redux'; import { increment, decrement } from './actions'; -import type { ApplicationState } from '../reducers'; import Counter from './counter'; -export const mapStateToProps = ({ counter }: ApplicationState) => ({ +export const mapStateToProps = ({ counter }) => ({ count: counter, }); @@ -16,4 +13,4 @@ export const actionCreators = { decrement, }; -export default connect(mapStateToProps, actionCreators)(Counter); \ No newline at end of file +export default connect(mapStateToProps, actionCreators)(Counter); diff --git a/packages/template-react/src/counter/index.js b/packages/template-react/src/counter/index.js index 7c598bacf..684b55286 100644 --- a/packages/template-react/src/counter/index.js +++ b/packages/template-react/src/counter/index.js @@ -1,3 +1 @@ -// @flow - -export { default as Counter } from './counterContainer'; \ No newline at end of file +export { default as Counter } from './counterContainer'; diff --git a/packages/template-react/src/counter/reducer.js b/packages/template-react/src/counter/reducer.js index 2e989e29a..c2d0350af 100644 --- a/packages/template-react/src/counter/reducer.js +++ b/packages/template-react/src/counter/reducer.js @@ -1,18 +1,12 @@ -// @flow - import { INCREMENT, DECREMENT } from './constants'; -import type { Action } from './actions'; - -export type State = number; -export default function counter(state: State = 0, action: Action): State { +export default function counter(state = 0, action) { switch (action.type) { case INCREMENT: return state + action.payload; case DECREMENT: return state - action.payload; default: - (action: empty); return state; } } diff --git a/packages/template-react/src/counter/spec/actions.spec.js b/packages/template-react/src/counter/spec/actions.spec.js index cf33afa6f..d9c66c962 100644 --- a/packages/template-react/src/counter/spec/actions.spec.js +++ b/packages/template-react/src/counter/spec/actions.spec.js @@ -1,5 +1,3 @@ -// @flow - import { INCREMENT, DECREMENT } from '../constants'; import { increment, decrement } from '../actions'; diff --git a/packages/template-react/src/counter/spec/counter.spec.js b/packages/template-react/src/counter/spec/counter.spec.js index f19c9ac8f..9cb831e1c 100644 --- a/packages/template-react/src/counter/spec/counter.spec.js +++ b/packages/template-react/src/counter/spec/counter.spec.js @@ -1,5 +1,3 @@ -// @flow - import React from 'react'; import renderer from 'react-test-renderer'; import Counter from '../counter'; diff --git a/packages/template-react/src/counter/spec/counterContainer.spec.js b/packages/template-react/src/counter/spec/counterContainer.spec.js index 5081199d0..d17025f57 100644 --- a/packages/template-react/src/counter/spec/counterContainer.spec.js +++ b/packages/template-react/src/counter/spec/counterContainer.spec.js @@ -1,5 +1,3 @@ -// @flow - import React from 'react'; import renderer from 'react-test-renderer'; import CounterContainer, { mapStateToProps } from '../counterContainer'; @@ -25,4 +23,4 @@ describe('Counter container', () => { it('selects correct state slice', () => { expect(mapStateToProps({ counter: 3 })).toEqual({ count: 3 }); }); -}); \ No newline at end of file +}); diff --git a/packages/template-react/src/counter/spec/reducer.spec.js b/packages/template-react/src/counter/spec/reducer.spec.js index f17b8823c..b568c01e4 100644 --- a/packages/template-react/src/counter/spec/reducer.spec.js +++ b/packages/template-react/src/counter/spec/reducer.spec.js @@ -1,11 +1,8 @@ -// @flow - import counter from '../reducer'; import { increment, decrement } from '../actions'; describe('Counter reducer', () => { it('initializes with 0', () => { - // $FlowExpectError - action must be a union of increment|decrement expect(counter(undefined, {})).toBe(0); }); @@ -22,7 +19,6 @@ describe('Counter reducer', () => { }); it('returns current state on unknown action', () => { - // $FlowExpectError - action must be a union of increment|decrement expect(counter(5, { type: 'FOO' })).toBe(5); }); -}); \ No newline at end of file +}); diff --git a/packages/template-react/src/home/home.js b/packages/template-react/src/home/home.js index b70ea9a55..eb58a058b 100644 --- a/packages/template-react/src/home/home.js +++ b/packages/template-react/src/home/home.js @@ -1,4 +1,3 @@ -// @flow import React from 'react'; import Helmet from 'react-helmet'; diff --git a/packages/template-react/src/home/index.js b/packages/template-react/src/home/index.js index 7370164ef..a0843e729 100644 --- a/packages/template-react/src/home/index.js +++ b/packages/template-react/src/home/index.js @@ -1,3 +1 @@ -// @flow - -export { default as Home } from './home'; \ No newline at end of file +export { default as Home } from './home'; diff --git a/packages/template-react/src/home/spec/home.spec.js b/packages/template-react/src/home/spec/home.spec.js index 24455fbf9..2eb904d5b 100644 --- a/packages/template-react/src/home/spec/home.spec.js +++ b/packages/template-react/src/home/spec/home.spec.js @@ -1,5 +1,3 @@ -// @flow - import React from 'react'; import renderer from 'react-test-renderer'; import { Home } from '../'; diff --git a/packages/template-react/src/reducers.js b/packages/template-react/src/reducers.js index 48def34df..83eb9c5ff 100644 --- a/packages/template-react/src/reducers.js +++ b/packages/template-react/src/reducers.js @@ -1,13 +1,7 @@ -// @flow - -import counter, { type State as CounterState } from './counter/reducer'; +import counter from './counter/reducer'; const reducer = { counter }; -export type ApplicationState = { - counter: CounterState; -}; - export default reducer; diff --git a/yarn.lock b/yarn.lock index e633f9619..2844b5058 100644 --- a/yarn.lock +++ b/yarn.lock @@ -839,7 +839,7 @@ babel-plugin-transform-strict-mode@^6.24.1: babel-runtime "^6.22.0" babel-types "^6.24.1" -babel-polyfill@^6.23.0, babel-polyfill@^6.26.0: +babel-polyfill@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" dependencies: @@ -996,13 +996,6 @@ binary-extensions@^1.0.0: version "1.11.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" -"binary@>= 0.3.0 < 1": - version "0.3.0" - resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" - dependencies: - buffers "~0.1.1" - chainsaw "~0.1.0" - block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" @@ -1178,10 +1171,6 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -buffers@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" - builtin-modules@^1.0.0, builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -1302,12 +1291,6 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chainsaw@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" - dependencies: - traverse ">=0.3.0 <0.4" - chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -1330,10 +1313,6 @@ chardet@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.0.tgz#0bbe1355ac44d7a3ed4a925707c4ef70f8190f6c" -charenc@~0.0.1: - version "0.0.2" - resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" - chokidar@^1.6.0, chokidar@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" @@ -1471,7 +1450,7 @@ colormin@^1.0.5: css-color-names "0.0.4" has "^1.0.1" -colors@^1.1.2, colors@~1.1.2: +colors@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" @@ -1814,10 +1793,6 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0: shebang-command "^1.2.0" which "^1.2.9" -crypt@~0.0.1: - version "0.0.2" - resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" - cryptiles@2.x.x: version "2.0.5" resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" @@ -2021,12 +1996,6 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" -decompress-response@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - dependencies: - mimic-response "^1.0.0" - dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -2827,31 +2796,6 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -flow-bin@^0.58.0: - version "0.58.0" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.58.0.tgz#62d5a776589419e5656800a0e5230a5e585ca65e" - -flow-typed@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/flow-typed/-/flow-typed-2.2.3.tgz#e7a35915a0f4cfcf8068c1ce291b5c99e6b89efa" - dependencies: - babel-polyfill "^6.23.0" - colors "^1.1.2" - fs-extra "^4.0.0" - github "0.2.4" - glob "^7.1.2" - got "^7.1.0" - md5 "^2.1.0" - mkdirp "^0.5.1" - request "^2.81.0" - rimraf "^2.6.1" - semver "^5.1.0" - table "^4.0.1" - through "^2.3.8" - unzip "^0.1.11" - which "^1.2.14" - yargs "^4.2.0" - flush-write-stream@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417" @@ -2912,7 +2856,7 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-extra@^4.0.0, fs-extra@^4.0.1: +fs-extra@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b" dependencies: @@ -2948,15 +2892,6 @@ fstream-ignore@^1.0.5: inherits "2" minimatch "^3.0.0" -"fstream@>= 0.1.30 < 1": - version "0.1.31" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz#7337f058fbbbbefa8c9f561a28cab0849202c988" - dependencies: - graceful-fs "~3.0.2" - inherits "~2.0.0" - mkdirp "0.5" - rimraf "2" - fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: version "1.0.11" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" @@ -3049,12 +2984,6 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -github@0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/github/-/github-0.2.4.tgz#24fa7f0e13fa11b946af91134c51982a91ce538b" - dependencies: - mime "^1.2.11" - glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -3127,35 +3056,10 @@ got@^6.7.1: unzip-response "^2.0.1" url-parse-lax "^1.0.0" -got@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" - dependencies: - decompress-response "^3.2.0" - duplexer3 "^0.1.4" - get-stream "^3.0.0" - is-plain-obj "^1.1.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - isurl "^1.0.0-alpha5" - lowercase-keys "^1.0.0" - p-cancelable "^0.3.0" - p-timeout "^1.1.1" - safe-buffer "^5.0.1" - timed-out "^4.0.0" - url-parse-lax "^1.0.0" - url-to-options "^1.0.1" - graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -graceful-fs@~3.0.2: - version "3.0.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818" - dependencies: - natives "^1.1.0" - graphql-anywhere@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.0.1.tgz#eb53ed5c56ef42e21d34dc22951e3da38f88a342" @@ -3230,16 +3134,6 @@ has-flag@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" -has-symbol-support-x@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz#66ec2e377e0c7d7ccedb07a3a84d77510ff1bc4c" - -has-to-string-tag-x@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" - dependencies: - has-symbol-support-x "^1.4.1" - has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -3593,7 +3487,7 @@ is-binary-path@^1.0.0: dependencies: binary-extensions "^1.0.0" -is-buffer@^1.1.5, is-buffer@~1.1.1: +is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -3687,10 +3581,6 @@ is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" -is-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" - is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -3707,7 +3597,7 @@ is-path-inside@^1.0.0: dependencies: path-is-inside "^1.0.1" -is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: +is-plain-obj@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" @@ -3875,13 +3765,6 @@ istanbul-reports@^1.1.3: dependencies: handlebars "^4.0.3" -isurl@^1.0.0-alpha5: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" - dependencies: - has-to-string-tag-x "^1.2.0" - is-object "^1.0.1" - iterall@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9" @@ -4367,10 +4250,6 @@ lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" -lodash.assign@^4.0.3, lodash.assign@^4.0.6: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -4464,13 +4343,6 @@ map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" -"match-stream@>= 0.0.2 < 1": - version "0.0.2" - resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf" - dependencies: - buffers "~0.1.1" - readable-stream "~1.0.0" - math-expression-evaluator@^1.2.14: version "1.2.17" resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" @@ -4482,14 +4354,6 @@ md5.js@^1.3.4: hash-base "^3.0.0" inherits "^2.0.1" -md5@^2.1.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9" - dependencies: - charenc "~0.0.1" - crypt "~0.0.1" - is-buffer "~1.1.1" - media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -4573,7 +4437,7 @@ mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, dependencies: mime-db "~1.30.0" -mime@1.4.1, mime@^1.2.11, mime@^1.3.4, mime@^1.4.1: +mime@1.4.1, mime@^1.3.4, mime@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" @@ -4585,10 +4449,6 @@ mimic-fn@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" -mimic-response@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e" - minimalistic-assert@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" @@ -4646,7 +4506,7 @@ mississippi@^1.3.0: stream-each "^1.1.0" through2 "^2.0.0" -mkdirp@0.5, mkdirp@0.5.1, mkdirp@0.5.x, "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.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -4709,10 +4569,6 @@ nan@^2.3.0: version "2.8.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" -natives@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31" - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -4986,10 +4842,6 @@ osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" -"over@>= 0.0.5 < 1": - version "0.0.5" - resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708" - p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" @@ -5012,12 +4864,6 @@ p-map@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" -p-timeout@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" - dependencies: - p-finally "^1.0.0" - package-json@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" @@ -5807,15 +5653,6 @@ public-encrypt@^4.0.0: parse-asn1 "^5.0.0" randombytes "^2.0.1" -"pullstream@>= 0.4.1 < 1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz#d6fb3bf5aed697e831150eb1002c25a3f8ae1314" - dependencies: - over ">= 0.0.5 < 1" - readable-stream "~1.0.31" - setimmediate ">= 1.0.2 < 2" - slice-stream ">= 1.0.0 < 2" - pump@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" @@ -6046,15 +5883,6 @@ read-pkg@^2.0.0: string_decoder "~1.0.3" util-deprecate "~1.0.1" -readable-stream@~1.0.0, readable-stream@~1.0.31: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readdirp@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" @@ -6219,7 +6047,7 @@ request@2.81.0: tunnel-agent "^0.6.0" uuid "^3.0.0" -request@^2.79.0, request@^2.81.0: +request@^2.79.0: version "2.83.0" resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" dependencies: @@ -6458,7 +6286,7 @@ set-immediate-shim@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" -"setimmediate@>= 1.0.1 < 2", "setimmediate@>= 1.0.2 < 2", setimmediate@^1.0.4, setimmediate@^1.0.5: +setimmediate@^1.0.4, setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -6519,12 +6347,6 @@ slice-ansi@1.0.0: dependencies: is-fullwidth-code-point "^2.0.0" -"slice-stream@>= 1.0.0 < 2": - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz#5b33bd66f013b1a7f86460b03d463dec39ad3ea0" - dependencies: - readable-stream "~1.0.31" - sntp@1.x.x: version "1.0.9" resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" @@ -6738,10 +6560,6 @@ string_decoder@^1.0.0, string_decoder@~1.0.3: dependencies: safe-buffer "~5.1.0" -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - stringstream@~0.0.4, stringstream@~0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -6938,7 +6756,7 @@ through2@^2.0.0, through2@^2.0.2: readable-stream "^2.1.5" xtend "~4.0.1" -through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8: +through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -6988,10 +6806,6 @@ tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" -"traverse@>=0.3.0 <0.4": - version "0.3.9" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" @@ -7132,17 +6946,6 @@ unzip-response@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" -unzip@^0.1.11: - version "0.1.11" - resolved "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz#89749c63b058d7d90d619f86b98aa1535d3b97f0" - dependencies: - binary ">= 0.3.0 < 1" - fstream ">= 0.1.30 < 1" - match-stream ">= 0.0.2 < 1" - pullstream ">= 0.4.1 < 1" - readable-stream "~1.0.31" - setimmediate ">= 1.0.1 < 2" - url-loader@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7" @@ -7171,10 +6974,6 @@ url-parse@^1.1.8: querystringify "~1.0.0" requires-port "~1.0.0" -url-to-options@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" - url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -7424,7 +7223,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@^1.2.12, which@^1.2.14, which@^1.2.9: +which@^1.2.12, which@^1.2.9: version "1.3.0" resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" dependencies: @@ -7440,10 +7239,6 @@ window-size@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" -window-size@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" - word-wrap@^1.0.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -7534,13 +7329,6 @@ 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@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" - dependencies: - camelcase "^3.0.0" - lodash.assign "^4.0.6" - yargs-parser@^4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" @@ -7576,25 +7364,6 @@ yargs@^10.0.3: y18n "^3.2.1" yargs-parser "^8.0.0" -yargs@^4.2.0: - version "4.8.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" - dependencies: - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - lodash.assign "^4.0.3" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.1" - which-module "^1.0.0" - window-size "^0.2.0" - y18n "^3.2.1" - yargs-parser "^2.4.1" - yargs@^6.6.0: version "6.6.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"