From 91d0989a875909839949b033b622ccb178bd7240 Mon Sep 17 00:00:00 2001
From: Johan Girod <johangirod@gmail.com>
Date: Mon, 6 Jan 2020 19:20:58 +0100
Subject: [PATCH] :art: Ajoute un input de type date

---
 package.json                                  |   1 -
 source/components/conversation/DateInput.js   |  63 ------
 source/components/conversation/DateInput.tsx  | 129 ++++++++++++
 .../{FormDecorator.js => FormDecorator.tsx}   |   0
 .../conversation/InputSuggestions.tsx         |   6 +-
 .../components/conversation/conversation.css  |  19 +-
 .../simulationConfigs/auto-entrepreneur.yaml  |   2 +
 source/engine/date.ts                         |  23 +-
 source/engine/grammarFunctions.js             |  11 +-
 source/engine/mecanisms/durée.tsx             |  11 +-
 source/règles/base.yaml                       |   2 +-
 source/storage/persistEverything.ts           |   4 +-
 yarn.lock                                     | 196 ++----------------
 13 files changed, 188 insertions(+), 279 deletions(-)
 delete mode 100644 source/components/conversation/DateInput.js
 create mode 100644 source/components/conversation/DateInput.tsx
 rename source/components/conversation/{FormDecorator.js => FormDecorator.tsx} (100%)

diff --git a/package.json b/package.json
index fe89c7650..64c77128c 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
 		"@babel/polyfill": "^7.4.0",
 		"@babel/runtime": "^7.3.4",
 		"classnames": "^2.2.5",
-		"cleave.js": "^1.5.3",
 		"color-convert": "^1.9.2",
 		"core-js": "^3.2.1",
 		"focus-trap-react": "^3.1.2",
diff --git a/source/components/conversation/DateInput.js b/source/components/conversation/DateInput.js
deleted file mode 100644
index 96111e76f..000000000
--- a/source/components/conversation/DateInput.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import FormattedInput from 'cleave.js/react'
-import withColours from 'Components/utils/withColours'
-import { compose } from 'ramda'
-import React, { useCallback } from 'react'
-import { useTranslation } from 'react-i18next'
-import { debounce } from '../../utils'
-import { FormDecorator } from './FormDecorator'
-import InputSuggestions from './InputSuggestions'
-import SendButton from './SendButton'
-
-// TODO: fusionner Input.js et CurrencyInput.js
-export default compose(
-	FormDecorator('input'),
-	withColours
-)(function Input({
-	suggestions,
-	setFormValue,
-	submit,
-	dottedName,
-	value,
-	colours,
-	unit
-}) {
-	const debouncedSetFormValue = useCallback(debounce(750, setFormValue), [])
-	const { language } = useTranslation().i18n
-
-	return (
-		<>
-			<div css="width: 100%">
-				<InputSuggestions
-					suggestions={suggestions}
-					onFirstClick={value => {
-						setFormValue(value)
-					}}
-					onSecondClick={() => submit('suggestion')}
-				/>
-			</div>
-
-			<div className="answer">
-				<FormattedInput
-					autoFocus
-					id={'step-' + dottedName}
-					placeholder="JJ/MM/AAAA"
-					options={{
-						date: true,
-						delimiter: '/',
-						datePattern: ['d', 'm', 'Y']
-					}}
-					style={{ border: `1px solid ${colours.textColourOnWhite}` }}
-					onChange={({ target: { value } }) => {
-						debouncedSetFormValue(value)
-					}}
-					value={value}
-					autoComplete="off"
-				/>
-				<label className="suffix" htmlFor={'step-' + dottedName}>
-					{unit}
-				</label>
-				<SendButton {...{ disabled: value === undefined, submit }} />
-			</div>
-		</>
-	)
-})
diff --git a/source/components/conversation/DateInput.tsx b/source/components/conversation/DateInput.tsx
new file mode 100644
index 000000000..12f81c0fa
--- /dev/null
+++ b/source/components/conversation/DateInput.tsx
@@ -0,0 +1,129 @@
+import { FormDecorator } from 'Components/conversation/FormDecorator'
+import { normalizeDate, normalizeDateString } from 'Engine/date'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled, { css } from 'styled-components'
+import InputSuggestions from './InputSuggestions'
+import SendButton from './SendButton'
+
+const DateField = styled.input`
+	border: none;
+	text-align: center;
+	color: inherit;
+	font-size: inherit;
+	margin: 0 0.1rem;
+	padding: 0;
+	font-style: inherit;
+	${({ placeholder = '' }) => css`
+		width: ${placeholder.length * 0.78}rem;
+	`}
+`
+
+export default FormDecorator('input')(function DateInput({
+	suggestions,
+	setFormValue,
+	submit,
+	value
+}) {
+	const { language } = useTranslation().i18n
+
+	// Refs for focus handling
+	let monthInput = React.createRef()
+	let yearInput = React.createRef()
+
+	const [date, setDate] = useState({ day: '', month: '', year: '' })
+
+	const handleDateChange = useCallback(
+		newDate => setDate(oldDate => ({ ...oldDate, ...newDate })),
+		[setDate]
+	)
+
+	const normalizedDate = useMemo(() => {
+		if (!date.year || +date.year < 1700) {
+			return false
+		}
+		try {
+			return normalizeDate(+date.year, +date.month || 1, +date.day || 1)
+		} catch (e) {
+			return false
+		}
+	}, [date])
+
+	// If date change, and is valid, set form value
+	useEffect(() => {
+		if (!normalizedDate) {
+			return
+		}
+		setFormValue(normalizedDate)
+	}, [normalizedDate])
+
+	// If value change, replace state
+	useEffect(() => {
+		if (!value) {
+			return
+		}
+		const [day, month, year] = value?.split('/')
+		setDate({ day, month, year })
+	}, [value, setDate])
+
+	return (
+		<>
+			<div css="width: 100%">
+				<InputSuggestions
+					suggestions={suggestions}
+					onFirstClick={value => {
+						setFormValue(normalizeDateString(value as string))
+					}}
+					onSecondClick={() => submit('suggestion')}
+				/>
+			</div>
+
+			<div className="answer">
+				<div className="ui__ input">
+					<DateField
+						autoFocus
+						placeholder="JJ"
+						type="tel"
+						onChange={({ target: { value } }) => {
+							if (+value > 31) {
+								return
+							}
+							if (value.length == 2) {
+								monthInput.current.select()
+							}
+							handleDateChange({ day: value })
+						}}
+						value={date.day}
+					/>
+					/
+					<DateField
+						type="tel"
+						placeholder="MM"
+						ref={monthInput}
+						onChange={({ target: { value } }) => {
+							if (+value > 12) {
+								return
+							}
+							if (value.length == 2) {
+								yearInput.current.select()
+							}
+							handleDateChange({ month: value })
+						}}
+						value={date.month}
+					/>
+					/
+					<DateField
+						type="tel"
+						ref={yearInput}
+						placeholder="AAAA"
+						onChange={({ target: { value } }) => {
+							handleDateChange({ year: value })
+						}}
+						value={date.year}
+					/>
+				</div>
+				<SendButton {...{ disabled: !normalizedDate, submit }} />
+			</div>
+		</>
+	)
+})
diff --git a/source/components/conversation/FormDecorator.js b/source/components/conversation/FormDecorator.tsx
similarity index 100%
rename from source/components/conversation/FormDecorator.js
rename to source/components/conversation/FormDecorator.tsx
diff --git a/source/components/conversation/InputSuggestions.tsx b/source/components/conversation/InputSuggestions.tsx
index 0f9a0f020..f4dfda6ef 100644
--- a/source/components/conversation/InputSuggestions.tsx
+++ b/source/components/conversation/InputSuggestions.tsx
@@ -7,9 +7,9 @@ import { convertUnit, parseUnit, Unit } from '../../engine/units'
 
 type InputSuggestionsProps = {
 	suggestions: Record<string, number>
-	onFirstClick: (val: number) => void
-	onSecondClick?: (val: number) => void
-	unit: Unit
+	onFirstClick: (val: number | string) => void
+	onSecondClick?: (val: number | string) => void
+	unit?: Unit
 }
 
 export default function InputSuggestions({
diff --git a/source/components/conversation/conversation.css b/source/components/conversation/conversation.css
index b6221240e..216a3bca4 100644
--- a/source/components/conversation/conversation.css
+++ b/source/components/conversation/conversation.css
@@ -159,14 +159,16 @@
 	display: none;
 }
 
-.step input[type='text'] {
-	border-bottom: 1px solid;
+.step input[type='text'],
+.ui__.input {
+	border: 1px solid var(--color);
 	border-radius: 0.3em;
+	background-color: white;
 	color: var(--color);
 	display: inline-block;
 	line-height: 1.6em;
 	height: 1.6em; /* IE 11 needs this */
-	font-size: 130%;
+	font-size: 120%;
 	padding: 0;
 	padding-right: 0.4em;
 	width: 8em;
@@ -181,8 +183,11 @@
 }
 
 .step input::placeholder {
-	font-style: italic;
-	opacity: 0.85;
+	opacity: 0.7;
+}
+.step input[type='tel']::placeholder {
+	font-family: monospace;
+	font-size: 120%;
 }
 
 .step input.suffixed {
@@ -191,10 +196,6 @@
 	border-radius: 0.2em;
 }
 
-.step input:not(.suffixed) {
-	margin-right: 1em;
-}
-
 .step label.suffix {
 	vertical-align: baseline;
 	transition: color 0.1s;
diff --git a/source/components/simulationConfigs/auto-entrepreneur.yaml b/source/components/simulationConfigs/auto-entrepreneur.yaml
index fda7f5961..21db5b8d4 100644
--- a/source/components/simulationConfigs/auto-entrepreneur.yaml
+++ b/source/components/simulationConfigs/auto-entrepreneur.yaml
@@ -19,3 +19,5 @@ questions:
 unités par défaut: [€/an]
 situation:
   dirigeant: 'auto-entrepreneur'
+  entreprise . catégorie d'activité: 'libérale'
+  entreprise . catégorie d'activité . libérale règlementée: non
diff --git a/source/engine/date.ts b/source/engine/date.ts
index 32b690998..db0484143 100644
--- a/source/engine/date.ts
+++ b/source/engine/date.ts
@@ -1,5 +1,24 @@
-const dateRegexp = /[\d]{2}\/[\d]{2}\/[\d]{4}/
+export function normalizeDateString(dateString: string): string {
+	let [day, month, year] = dateString.split('/')
+	if (!year) {
+		;[day, month, year] = ['01', day, month]
+	}
+	return normalizeDate(+year, +month, +day)
+}
+const pad = (n: number): string => (+n < 10 ? `0${n}` : '' + n)
+export function normalizeDate(
+	year: number,
+	month: number,
+	day: number
+): string {
+	const date = new Date(+year, +month - 1, +day)
+	if (!+date || date.getDate() !== +day) {
+		throw new SyntaxError(`La date ${day}/${month}/${year} n'est pas valide`)
+	}
+	return `${pad(day)}/${pad(month)}/${pad(year)}`
+}
 
+const dateRegexp = /[\d]{2}\/[\d]{2}\/[\d]{4}/
 export function convertToDateIfNeeded(...values: string[]) {
 	const dateStrings = values.map(dateString => '' + dateString)
 	if (!dateStrings.some(dateString => dateString.match(dateRegexp))) {
@@ -14,5 +33,5 @@ export function convertToDateIfNeeded(...values: string[]) {
 	})
 	return dateStrings
 		.map(date => date.split('/'))
-		.map(([jour, mois, année]) => new Date(+année, +mois - 1, +jour))
+		.map(([day, month, year]) => new Date(+year, +month - 1, +day))
 }
diff --git a/source/engine/grammarFunctions.js b/source/engine/grammarFunctions.js
index 33df33729..eecf5c3ad 100644
--- a/source/engine/grammarFunctions.js
+++ b/source/engine/grammarFunctions.js
@@ -1,5 +1,6 @@
 /* Those are postprocessor functions for the Nearley grammar.ne.
 The advantage of putting them here is to get prettier's JS formatting, since Nealrey doesn't support it https://github.com/kach/nearley/issues/310 */
+import { normalizeDateString } from 'Engine/date'
 import { parseUnit } from 'Engine/units'
 
 export let binaryOperation = operationType => ([A, , operator, , B]) => ({
@@ -50,18 +51,10 @@ export let numberWithUnit = ([number, , unit]) => ({
 })
 
 export let date = ([{ value }]) => {
-	let [jour, mois, année] = value.split('/')
-	if (!année) {
-		;[jour, mois, année] = ['01', jour, mois]
-	}
-	const date = new Date(année, +mois - 1, jour)
-	if (!+date || date.getDate() !== +jour) {
-		throw new SyntaxError(`La date ${value} n'est pas valide`)
-	}
 	return {
 		constant: {
 			type: 'date',
-			nodeValue: `${jour}/${mois}/${année}`
+			nodeValue: normalizeDateString(value)
 		}
 	}
 }
diff --git a/source/engine/mecanisms/durée.tsx b/source/engine/mecanisms/durée.tsx
index 81224929f..3ef9ba15d 100644
--- a/source/engine/mecanisms/durée.tsx
+++ b/source/engine/mecanisms/durée.tsx
@@ -1,4 +1,4 @@
-import { convertToDateIfNeeded } from 'Engine/date'
+import { convertToDateIfNeeded, normalizeDate } from 'Engine/date'
 import {
 	defaultNode,
 	evaluateNode,
@@ -31,11 +31,12 @@ function MecanismDurée({ nodeValue, explanation, unit }) {
 		/>
 	)
 }
-const pad = (n: number) => (n < 10 ? `0{n}` : +n)
 const today = new Date()
-const todayString = `${pad(today.getDate())}/${pad(
-	today.getMonth() + 1
-)}/${today.getFullYear()}`
+const todayString = normalizeDate(
+	today.getFullYear(),
+	today.getMonth() + 1,
+	today.getDate()
+)
 
 const objectShape = {
 	depuis: defaultNode(todayString),
diff --git a/source/règles/base.yaml b/source/règles/base.yaml
index 1ece2288d..be7bbe1a4 100644
--- a/source/règles/base.yaml
+++ b/source/règles/base.yaml
@@ -3152,7 +3152,7 @@ entreprise . date de création:
   question: Quand avez-vous créé votre entreprise ?
   par défaut: 01/01/2019
   suggestions:
-    Décembre 2019: 01/12/2019
+    Janvier 2020: 01/01/2020
     Janvier 2019: 01/01/2019
     Janvier 2018: 01/01/2018
   type: date
diff --git a/source/storage/persistEverything.ts b/source/storage/persistEverything.ts
index 8c7a105ea..9c0e9de69 100644
--- a/source/storage/persistEverything.ts
+++ b/source/storage/persistEverything.ts
@@ -5,9 +5,9 @@ import { Store } from 'redux'
 import { debounce } from '../utils'
 import safeLocalStorage from './safeLocalStorage'
 
-const VERSION = 3
+const VERSION = 4
 
-const LOCAL_STORAGE_KEY = 'mycompanyinfrance::persisted-everything:v' + VERSION
+const LOCAL_STORAGE_KEY = 'app::global-state:v' + VERSION
 
 type OptionsType = {
 	except?: Array<string>
diff --git a/yarn.lock b/yarn.lock
index dd53d7df0..f2500b205 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1499,11 +1499,6 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -1828,7 +1823,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
@@ -1838,14 +1833,6 @@ arch@2.1.1, arch@^2.1.0:
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
   integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 arg@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arg/-/arg-2.0.0.tgz#c06e7ff69ab05b3a4a03ebe0407fac4cba657545"
@@ -2813,11 +2800,6 @@ clean-css@4.2.x:
   dependencies:
     source-map "~0.6.0"
 
-cleave.js@^1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/cleave.js/-/cleave.js-1.5.3.tgz#1ef36e1375dea289bffeefe8ebb1e3ef2ee23240"
-  integrity sha512-tLum0abk+NRUZtMxpqLQS0jE9k2KYzsUlnMAqfMd2LAf8bb5xTHLHXTtPyI+dCk6DThtmWER3EzKfUi4NHdR7A==
-
 cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
@@ -3081,11 +3063,6 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -3513,7 +3490,7 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
+debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3603,11 +3580,6 @@ delegate@^3.1.2:
   resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
   integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -3631,11 +3603,6 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -4714,13 +4681,6 @@ fs-extra@^4.0.2:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -4773,20 +4733,6 @@ fuse.js@^3.4.2:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.4.6.tgz#545c3411fed88bf2e27c457cab6e73e7af697a45"
   integrity sha512-H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg==
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -5030,11 +4976,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -5353,7 +5294,7 @@ i18next@^18.0.1:
   dependencies:
     "@babel/runtime" "^7.3.1"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5387,13 +5328,6 @@ iframe-resizer@^4.1.1:
   resolved "https://registry.yarnpkg.com/iframe-resizer/-/iframe-resizer-4.2.8.tgz#4747160adda6feed96259162ff2ea930f712212c"
   integrity sha512-7xL06ARLTqaFJcK7fZmHFgPpV6dapFoV6UgZsvSA4QNpD5yu3Dd+YkOKF4wcor1qA7p2AqDfNZqL8HWgGKGGDg==
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -7105,21 +7039,6 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -7160,7 +7079,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.1, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -7305,15 +7224,6 @@ nearley@^2.19.0, nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
-needle@^2.2.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
-  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -7397,22 +7307,6 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.42:
   version "1.1.44"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.44.tgz#cd66438a6eb875e3eb012b6a12e48d9f4326ffd7"
@@ -7425,14 +7319,6 @@ nodent-runtime@^3.0.3:
   resolved "https://registry.yarnpkg.com/nodent-runtime/-/nodent-runtime-3.2.1.tgz#9e2755d85e39f764288f0d4752ebcfe3e541e00e"
   integrity sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==
 
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -7470,26 +7356,6 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848"
-  integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -7497,16 +7363,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -7701,7 +7557,7 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
@@ -7715,19 +7571,11 @@ os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -8702,7 +8550,7 @@ raw-loader@^0.5.1:
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
   integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
 
-rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+rc@^1.0.1, rc@^1.1.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -9001,7 +8849,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -9577,7 +9425,7 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -9660,7 +9508,7 @@ serve@^11.1.0:
     serve-handler "6.1.2"
     update-check "1.5.2"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -10016,7 +9864,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -10264,19 +10112,6 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -11063,13 +10898,6 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 widest-line@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
@@ -11316,7 +11144,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==