From b1e68fe647bc45e97474f66ac1cab4f9af08a15e Mon Sep 17 00:00:00 2001 From: meriadec Date: Tue, 3 Apr 2018 14:49:17 +0200 Subject: [PATCH 1/4] Update wallet-common & currencies. Simplify again InputCurrency. --- package.json | 4 +-- src/actions/counterValues.js | 4 +-- src/components/base/InputCurrency/index.js | 35 ++++++-------------- src/components/base/InputCurrency/stories.js | 2 +- yarn.lock | 25 ++++++-------- 5 files changed, 26 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index 9cdc9fd7..049973ba 100644 --- a/package.json +++ b/package.json @@ -44,12 +44,12 @@ "webpack-sources": "1.0.1" }, "dependencies": { - "@ledgerhq/currencies": "^4.7.5", + "@ledgerhq/currencies": "^4.10.0", "@ledgerhq/hw-app-btc": "^4.7.3", "@ledgerhq/hw-app-eth": "^4.7.3", "@ledgerhq/hw-transport": "^4.7.3", "@ledgerhq/hw-transport-node-hid": "^4.7.6", - "@ledgerhq/wallet-common": "^0.10.1", + "@ledgerhq/wallet-common": "^0.11.0", "axios": "^0.18.0", "bcryptjs": "^2.4.3", "bitcoinjs-lib": "^3.3.2", diff --git a/src/actions/counterValues.js b/src/actions/counterValues.js index 58ea6e8a..0f67e94e 100644 --- a/src/actions/counterValues.js +++ b/src/actions/counterValues.js @@ -1,7 +1,7 @@ // @flow import { getFiatUnit } from '@ledgerhq/currencies' -import { fetchHistodayCounterValuesMultiple } from '@ledgerhq/wallet-common/lib/api/countervalue' +import { fetchHistodayRates } from '@ledgerhq/wallet-common/lib/api/countervalue' import type { Currency } from '@ledgerhq/currencies' import type { Dispatch } from 'redux' @@ -32,6 +32,6 @@ export const fetchCounterValues: FetchCounterValues = (currencies: ?(Currency[]) const { counterValue } = settings const fiatUnit = getFiatUnit(counterValue) - const counterValues = await fetchHistodayCounterValuesMultiple(currencies, fiatUnit) + const counterValues = await fetchHistodayRates(currencies, fiatUnit) dispatch(updateCounterValues(counterValues)) } diff --git a/src/components/base/InputCurrency/index.js b/src/components/base/InputCurrency/index.js index dde49cd6..51c8da89 100644 --- a/src/components/base/InputCurrency/index.js +++ b/src/components/base/InputCurrency/index.js @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react' import styled from 'styled-components' -import { parseCurrencyUnit, formatCurrencyUnit } from '@ledgerhq/currencies' +import { formatCurrencyUnit } from '@ledgerhq/currencies' import noop from 'lodash/noop' import isNaN from 'lodash/isNaN' @@ -17,24 +17,14 @@ function parseValue(value) { return value.toString().replace(/,/g, '.') } -function format(unit: Unit, value: number) { +function format(unit: Unit, value: number, useGrouping = false) { return formatCurrencyUnit(unit, value, { + useGrouping, disableRounding: true, showAllDigits: false, }) } -function unformat(unit, value) { - if (value === 0 || value === '') { - return '0' - } - - let v = parseCurrencyUnit(unit, value.toString()) - v /= 10 ** unit.magnitude - - return v.toString() -} - const Currencies = styled(Box)` position: relative; top: -1px; @@ -79,7 +69,7 @@ class InputCurrency extends PureComponent { componentWillMount() { const { value } = this.props const { unit } = this.state - const displayValue = format(unit, value) + const displayValue = format(unit, value, true) this.setState({ displayValue }) } @@ -89,15 +79,15 @@ class InputCurrency extends PureComponent { const { isFocus } = this.state const displayValue = isFocus ? (nextProps.value / 10 ** unit.magnitude).toString() - : format(unit, nextProps.value) + : format(unit, nextProps.value, true) this.setState({ displayValue }) } } handleChange = (v: string) => { - // const { displayValue } = this.state v = parseValue(v) + // forbid multiple 0 at start if (v.startsWith('00')) { return } @@ -114,17 +104,13 @@ class InputCurrency extends PureComponent { handleBlur = () => { const { value } = this.props const { unit } = this.state - const v = format(unit, value) - this.setState({ isFocus: false, displayValue: v }) + this.setState({ isFocus: false, displayValue: format(unit, value, true) }) } handleFocus = () => { + const { value } = this.props const { unit } = this.state - - this.setState(prev => ({ - isFocus: true, - displayValue: unformat(unit, prev.displayValue), - })) + this.setState({ isFocus: true, displayValue: format(unit, value) }) } emitOnChange = (v: string) => { @@ -152,8 +138,7 @@ class InputCurrency extends PureComponent { keyProp="code" flatLeft onChange={item => { - this.setState({ unit: item, displayValue: format(item, value) }) - // onChange(unformat(item, value), item) + this.setState({ unit: item, displayValue: format(item, value, true) }) }} items={units} value={unit} diff --git a/src/components/base/InputCurrency/stories.js b/src/components/base/InputCurrency/stories.js index 06a148b3..3fcc1fcd 100644 --- a/src/components/base/InputCurrency/stories.js +++ b/src/components/base/InputCurrency/stories.js @@ -14,7 +14,7 @@ const { units } = getCurrencyByCoinType(1) class Wrapper extends Component { state = { - value: 1e8, + value: 1000e8, unit: units[0], } diff --git a/yarn.lock b/yarn.lock index bcc804ef..978cce51 100644 --- a/yarn.lock +++ b/yarn.lock @@ -913,17 +913,17 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" -"@ledgerhq/currencies@^4.7.1": - version "4.7.3" - resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.7.3.tgz#0e28c0f1c74cf00b990be6865fbec374f808b71f" +"@ledgerhq/currencies@^4.10.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.10.0.tgz#8cc25a232ca62fa5f4e17140df0678cdb48123e0" dependencies: lodash "^4.17.5" numeral "^2.0.6" querystring "^0.2.0" -"@ledgerhq/currencies@^4.7.5": - version "4.7.5" - resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.7.5.tgz#e852b58359254fbb2087de328df84343b586f4ab" +"@ledgerhq/currencies@^4.7.1": + version "4.7.3" + resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.7.3.tgz#0e28c0f1c74cf00b990be6865fbec374f808b71f" dependencies: lodash "^4.17.5" numeral "^2.0.6" @@ -955,9 +955,9 @@ dependencies: events "^2.0.0" -"@ledgerhq/wallet-common@^0.10.1": - version "0.10.1" - resolved "https://registry.yarnpkg.com/@ledgerhq/wallet-common/-/wallet-common-0.10.1.tgz#72e17329de02bebb5ed54bf797113266824e4af8" +"@ledgerhq/wallet-common@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/wallet-common/-/wallet-common-0.11.0.tgz#3b6bbc4f93ff766ff5f1c570322fe73260fe4835" dependencies: "@ledgerhq/currencies" "^4.7.1" axios "^0.18.0" @@ -4817,7 +4817,7 @@ electron-builder-lib@~20.6.2: semver "^5.5.0" temp-file "^3.1.1" -electron-builder@^20.0.4, electron-builder@^20.8.1: +electron-builder@^20.8.1: version "20.8.1" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.8.1.tgz#3d19607a7f7d3ee7f3e110a6fc66c720ed1d2cc0" dependencies: @@ -4997,7 +4997,7 @@ electron-webpack@^2.0.1: webpack-merge "^4.1.2" yargs "^11.1.0" -electron@1.8.4, electron@^1.8.2: +electron@1.8.4: version "1.8.4" resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.4.tgz#cca8d0e6889f238f55b414ad224f03e03b226a38" dependencies: @@ -8028,9 +8028,6 @@ ledger-test-library@KhalilBellakrid/ledger-test-library-nodejs#7d37482: dependencies: axios "^0.17.1" bindings "^1.3.0" - electron "^1.8.2" - electron-builder "^20.0.4" - electron-rebuild "^1.7.3" nan "^2.6.2" prebuild-install "^2.2.2" From ed3c007fec28450bd952449a2b230c82ea70a288 Mon Sep 17 00:00:00 2001 From: meriadec Date: Tue, 3 Apr 2018 16:16:14 +0200 Subject: [PATCH 2/4] Improve micro-interactions on InputCurrency --- src/components/RequestAmount/index.js | 1 + src/components/base/InputCurrency/index.js | 80 ++++++++++++-------- src/components/base/InputCurrency/stories.js | 11 ++- 3 files changed, 60 insertions(+), 32 deletions(-) diff --git a/src/components/RequestAmount/index.js b/src/components/RequestAmount/index.js index d37b081b..de2677a6 100644 --- a/src/components/RequestAmount/index.js +++ b/src/components/RequestAmount/index.js @@ -102,6 +102,7 @@ export class RequestAmount extends PureComponent { value={right} onChange={this.handleChangeAmount('right')} renderRight={{rightUnit.code}} + showAllDigits /> diff --git a/src/components/base/InputCurrency/index.js b/src/components/base/InputCurrency/index.js index 51c8da89..b5686eb1 100644 --- a/src/components/base/InputCurrency/index.js +++ b/src/components/base/InputCurrency/index.js @@ -17,11 +17,11 @@ function parseValue(value) { return value.toString().replace(/,/g, '.') } -function format(unit: Unit, value: number, useGrouping = false) { +function format(unit: Unit, value: number, { isFocused, showAllDigits }) { return formatCurrencyUnit(unit, value, { - useGrouping, + useGrouping: !isFocused, disableRounding: true, - showAllDigits: false, + showAllDigits: !!showAllDigits && !isFocused, }) } @@ -44,11 +44,12 @@ type Props = { unit: Unit, units: Array, value: number, + showAllDigits?: boolean, } type State = { unit: Unit, - isFocus: boolean, + isFocused: boolean, displayValue: string, } @@ -58,37 +59,52 @@ class InputCurrency extends PureComponent { renderRight: null, units: [], value: 0, + showAllDigits: false, } state = { - isFocus: false, - displayValue: '0', + isFocused: false, + displayValue: '', unit: this.props.unit, } componentWillMount() { - const { value } = this.props - const { unit } = this.state - const displayValue = format(unit, value, true) - this.setState({ displayValue }) + this.syncInput({ isFocused: false }) } componentWillReceiveProps(nextProps: Props) { + const { value, showAllDigits } = this.props const { unit } = this.state - if (this.props.value !== nextProps.value) { - const { isFocus } = this.state - const displayValue = isFocus - ? (nextProps.value / 10 ** unit.magnitude).toString() - : format(unit, nextProps.value, true) - this.setState({ displayValue }) + const needsToBeReformatted = + value !== nextProps.value || showAllDigits !== nextProps.showAllDigits + if (needsToBeReformatted) { + const { isFocused } = this.state + this.setState({ + displayValue: + nextProps.value === 0 + ? '' + : format(unit, nextProps.value, { + isFocused, + showAllDigits: nextProps.showAllDigits, + }), + }) } } handleChange = (v: string) => { v = parseValue(v) + // allow to type directly `.` in input to have `0.` + if (v.startsWith('.')) { + v = `0${v}` + } + // forbid multiple 0 at start - if (v.startsWith('00')) { + if (v === '' || v.startsWith('00')) { + const { onChange } = this.props + const { unit } = this.state + onChange(0, unit) + this.setState({ displayValue: '' }) return } @@ -98,19 +114,19 @@ class InputCurrency extends PureComponent { } this.emitOnChange(v) - this.setState({ displayValue: v || '0' }) + this.setState({ displayValue: v || '' }) } - handleBlur = () => { - const { value } = this.props - const { unit } = this.state - this.setState({ isFocus: false, displayValue: format(unit, value, true) }) - } + handleBlur = () => this.syncInput({ isFocused: false }) + handleFocus = () => this.syncInput({ isFocused: true }) - handleFocus = () => { - const { value } = this.props + syncInput = ({ isFocused }) => { + const { value, showAllDigits } = this.props const { unit } = this.state - this.setState({ isFocus: true, displayValue: format(unit, value) }) + this.setState({ + isFocused, + displayValue: value === 0 ? '' : format(unit, value, { isFocused, showAllDigits }), + }) } emitOnChange = (v: string) => { @@ -124,7 +140,7 @@ class InputCurrency extends PureComponent { } renderListUnits = () => { - const { units, value } = this.props + const { units, value, showAllDigits } = this.props const { unit } = this.state if (units.length <= 1) { @@ -138,7 +154,10 @@ class InputCurrency extends PureComponent { keyProp="code" flatLeft onChange={item => { - this.setState({ unit: item, displayValue: format(item, value, true) }) + this.setState({ + unit: item, + displayValue: format(item, value, { isFocused: false, showAllDigits }), + }) }} items={units} value={unit} @@ -150,8 +169,8 @@ class InputCurrency extends PureComponent { } render() { - const { renderRight } = this.props - const { displayValue } = this.state + const { renderRight, showAllDigits } = this.props + const { displayValue, unit } = this.state return ( { onFocus={this.handleFocus} onBlur={this.handleBlur} renderRight={renderRight || this.renderListUnits()} + placeholder={format(unit, 0, { isFocused: false, showAllDigits })} /> ) } diff --git a/src/components/base/InputCurrency/stories.js b/src/components/base/InputCurrency/stories.js index 3fcc1fcd..a58aca81 100644 --- a/src/components/base/InputCurrency/stories.js +++ b/src/components/base/InputCurrency/stories.js @@ -3,6 +3,7 @@ import React, { Component } from 'react' import { storiesOf } from '@storybook/react' import { action } from '@storybook/addon-actions' +import { boolean } from '@storybook/addon-knobs' import { getCurrencyByCoinType } from '@ledgerhq/currencies' @@ -14,7 +15,7 @@ const { units } = getCurrencyByCoinType(1) class Wrapper extends Component { state = { - value: 1000e8, + value: 0, unit: units[0], } @@ -38,7 +39,13 @@ class Wrapper extends Component { stories.add('InputCurrency', () => ( ( - + )} /> )) From ad8838c74db85f5bdd8dbfa48182a821515a3c08 Mon Sep 17 00:00:00 2001 From: meriadec Date: Tue, 3 Apr 2018 16:41:55 +0200 Subject: [PATCH 3/4] Update wallet-common & currencies and fix flow --- package.json | 4 +- src/components/CounterValue/index.js | 1 + src/components/RequestAmount/index.js | 4 +- src/components/base/InputCurrency/index.js | 2 +- yarn.lock | 77 +++------------------- 5 files changed, 14 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index 049973ba..85e2aa74 100644 --- a/package.json +++ b/package.json @@ -44,12 +44,12 @@ "webpack-sources": "1.0.1" }, "dependencies": { - "@ledgerhq/currencies": "^4.10.0", + "@ledgerhq/currencies": "^4.10.1", "@ledgerhq/hw-app-btc": "^4.7.3", "@ledgerhq/hw-app-eth": "^4.7.3", "@ledgerhq/hw-transport": "^4.7.3", "@ledgerhq/hw-transport-node-hid": "^4.7.6", - "@ledgerhq/wallet-common": "^0.11.0", + "@ledgerhq/wallet-common": "^0.12.0", "axios": "^0.18.0", "bcryptjs": "^2.4.3", "bitcoinjs-lib": "^3.3.2", diff --git a/src/components/CounterValue/index.js b/src/components/CounterValue/index.js index e865a8c5..9af13e76 100644 --- a/src/components/CounterValue/index.js +++ b/src/components/CounterValue/index.js @@ -63,6 +63,7 @@ class CounterValue extends PureComponent { function generateFakeCurrency(ticker) { return { + ticker, units: [ { code: ticker, diff --git a/src/components/RequestAmount/index.js b/src/components/RequestAmount/index.js index de2677a6..d8dcd796 100644 --- a/src/components/RequestAmount/index.js +++ b/src/components/RequestAmount/index.js @@ -6,7 +6,7 @@ import { translate } from 'react-i18next' import styled from 'styled-components' import { connect } from 'react-redux' import type { Account, CalculateCounterValue } from '@ledgerhq/wallet-common/lib/types' -import type { Unit } from '@ledgerhq/currencies' +import type { FiatUnit } from '@ledgerhq/currencies' import type { T } from 'types/common' @@ -59,7 +59,7 @@ type Props = { // used to determine the right input unit // retrieved via selector (take the chosen countervalue unit) - rightUnit: Unit, + rightUnit: FiatUnit, // used to calculate the opposite field value (right & left) getCounterValue: CalculateCounterValue, diff --git a/src/components/base/InputCurrency/index.js b/src/components/base/InputCurrency/index.js index b5686eb1..d25b8164 100644 --- a/src/components/base/InputCurrency/index.js +++ b/src/components/base/InputCurrency/index.js @@ -120,7 +120,7 @@ class InputCurrency extends PureComponent { handleBlur = () => this.syncInput({ isFocused: false }) handleFocus = () => this.syncInput({ isFocused: true }) - syncInput = ({ isFocused }) => { + syncInput = ({ isFocused }: { isFocused: boolean }) => { const { value, showAllDigits } = this.props const { unit } = this.state this.setState({ diff --git a/yarn.lock b/yarn.lock index 978cce51..6d758b3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -913,17 +913,9 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" -"@ledgerhq/currencies@^4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.10.0.tgz#8cc25a232ca62fa5f4e17140df0678cdb48123e0" - dependencies: - lodash "^4.17.5" - numeral "^2.0.6" - querystring "^0.2.0" - -"@ledgerhq/currencies@^4.7.1": - version "4.7.3" - resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.7.3.tgz#0e28c0f1c74cf00b990be6865fbec374f808b71f" +"@ledgerhq/currencies@^4.10.1": + version "4.10.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.10.1.tgz#462081005e3e37e0737bad9aba189eef1663e96a" dependencies: lodash "^4.17.5" numeral "^2.0.6" @@ -955,13 +947,13 @@ dependencies: events "^2.0.0" -"@ledgerhq/wallet-common@^0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/wallet-common/-/wallet-common-0.11.0.tgz#3b6bbc4f93ff766ff5f1c570322fe73260fe4835" +"@ledgerhq/wallet-common@^0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/wallet-common/-/wallet-common-0.12.0.tgz#50ac697929062772182735e4013266c41a661fe2" dependencies: - "@ledgerhq/currencies" "^4.7.1" + "@ledgerhq/currencies" "^4.10.1" axios "^0.18.0" - babel-jest "^23.0.0-alpha.0" + babel-jest "^22.4.3" invariant "^2.2.2" lodash "^4.17.4" prando "^3.0.1" @@ -1927,13 +1919,6 @@ babel-jest@^22.4.3: babel-plugin-istanbul "^4.1.5" babel-preset-jest "^22.4.3" -babel-jest@^23.0.0-alpha.0: - version "23.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.0.0-alpha.4.tgz#e3bb1e486f4178b381cc7b37e6cafb1af3a9d1bf" - dependencies: - babel-plugin-istanbul "^4.1.6" - babel-preset-jest "^23.0.0-alpha.4" - babel-loader@^7.1.4: version "7.1.4" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015" @@ -1976,23 +1961,10 @@ babel-plugin-istanbul@^4.1.5: istanbul-lib-instrument "^1.7.5" test-exclude "^4.1.1" -babel-plugin-istanbul@^4.1.6: - version "4.1.6" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" - dependencies: - babel-plugin-syntax-object-rest-spread "^6.13.0" - find-up "^2.1.0" - istanbul-lib-instrument "^1.10.1" - test-exclude "^4.2.1" - babel-plugin-jest-hoist@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz#7d8bcccadc2667f96a0dcc6afe1891875ee6c14a" -babel-plugin-jest-hoist@^23.0.0-alpha.4: - version "23.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.0-alpha.4.tgz#3f32715d54640e37cc62a84a9d3d7eada6a067fc" - babel-plugin-macros@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.2.0.tgz#31fc16748d6480697a517f692dc4421cb7bff0cc" @@ -2584,13 +2556,6 @@ babel-preset-jest@^22.4.3: babel-plugin-jest-hoist "^22.4.3" babel-plugin-syntax-object-rest-spread "^6.13.0" -babel-preset-jest@^23.0.0-alpha.4: - version "23.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.0.0-alpha.4.tgz#d3080507330e6d23c47dcc366d69f7a330174f70" - dependencies: - babel-plugin-jest-hoist "^23.0.0-alpha.4" - babel-plugin-syntax-object-rest-spread "^6.13.0" - babel-preset-minify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.3.0.tgz#7db64afa75f16f6e06c0aa5f25195f6f36784d77" @@ -7287,28 +7252,12 @@ istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.2.tgz#4113c8ff6b7a40a1ef7350b01016331f63afde14" -istanbul-lib-coverage@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341" - istanbul-lib-hook@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b" - dependencies: - babel-generator "^6.18.0" - babel-template "^6.16.0" - babel-traverse "^6.18.0" - babel-types "^6.18.0" - babylon "^6.18.0" - istanbul-lib-coverage "^1.2.0" - semver "^5.3.0" - istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.2: version "1.9.2" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.2.tgz#84905bf47f7e0b401d6b840da7bad67086b4aab6" @@ -11928,16 +11877,6 @@ test-exclude@^4.1.1: read-pkg-up "^1.0.1" require-main-filename "^1.0.1" -test-exclude@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa" - dependencies: - arrify "^1.0.1" - micromatch "^3.1.8" - object-assign "^4.1.0" - read-pkg-up "^1.0.1" - require-main-filename "^1.0.1" - text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" From 55587b96ee4a210caecf11bb127eb58e567af1f1 Mon Sep 17 00:00:00 2001 From: meriadec Date: Tue, 3 Apr 2018 16:47:25 +0200 Subject: [PATCH 4/4] Disable build from CI for the moment --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89241f4e..d59dd776 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,12 +30,12 @@ jobs: - run: name: Test command: yarn test - - run: - name: Build - command: yarn dist:dir - - run: - name: Generate build stats - command: "du -h dist | sort -h > /tmp/build-stats.txt" - - store_artifacts: - path: /tmp/build-stats.txt - destination: build-stats.txt + # - run: + # name: Build + # command: yarn dist:dir + # - run: + # name: Generate build stats + # command: "du -h dist | sort -h > /tmp/build-stats.txt" + # - store_artifacts: + # path: /tmp/build-stats.txt + # destination: build-stats.txt