Skip to content

Commit 4b54f61

Browse files
renovate[bot]renovate-botchambo-e
authored
fix(deps): update formatjs monorepo (#527)
* fix(deps): update formatjs monorepo * fix: custom types * fix: correct tests Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Emmanuel Chambon <[email protected]>
1 parent 8814ed4 commit 4b54f61

File tree

5 files changed

+47
-44
lines changed

5 files changed

+47
-44
lines changed

‎packages/use-dataloader/src/__tests__/dataloader.test.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { nextTick } from 'process';
21
import waitForExpect from 'wait-for-expect'
32
import { StatusEnum } from '../constants'
43
import DataLoader from '../dataloader'
@@ -205,16 +204,15 @@ describe('Dataloader class', () => {
205204
expect(method).toBeCalledTimes(3)
206205
await instance.load()
207206
await instance.load()
208-
await new Promise(nextTick)
209-
expect(method).toBeCalledTimes(4)
207+
await waitForExpect(() => {
208+
expect(method).toBeCalledTimes(4)
209+
})
210210
await instance.load()
211211
await instance.load()
212212
await instance.load(true)
213-
await new Promise(resolve => {
214-
setTimeout(resolve)
213+
await waitForExpect(() => {
214+
expect(method).toBeCalledTimes(6)
215215
})
216-
await new Promise(nextTick)
217-
expect(method).toBeCalledTimes(6)
218216
instance.setPollingInterval(PROMISE_TIMEOUT * 4)
219217
await instance.destroy()
220218
})

‎packages/use-i18n/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
},
2828
"license": "MIT",
2929
"dependencies": {
30-
"@formatjs/fast-memoize": "1.2.0",
30+
"@formatjs/ecma402-abstract": "^1.11.1",
31+
"@formatjs/fast-memoize": "1.2.1",
3132
"date-fns": "2.28.0",
3233
"filesize": "8.0.6",
33-
"intl-messageformat": "9.9.6",
34+
"intl-messageformat": "9.11.1",
3435
"prop-types": "15.8.0"
3536
},
3637
"peerDependencies": {

‎packages/use-i18n/src/formatters.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { NumberFormatOptions } from '@formatjs/ecma402-abstract'
12
import memoize, { Cache, strategies } from '@formatjs/fast-memoize'
23
import IntlTranslationFormat from 'intl-messageformat'
34

@@ -21,7 +22,7 @@ declare abstract class IntlListFormat {
2122

2223
interface BaseFormatters {
2324
getNumberFormat(
24-
...args: ConstructorParameters<typeof Intl.NumberFormat>
25+
locales?: string | string[], opts?: NumberFormatOptions
2526
): Intl.NumberFormat
2627
getDateTimeFormat(
2728
...args: ConstructorParameters<typeof Intl.DateTimeFormat>

‎packages/use-i18n/src/usei18n.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { NumberFormatOptions } from '@formatjs/ecma402-abstract'
12
import { Locale, formatDistanceToNow, formatDistanceToNowStrict } from 'date-fns'
23
import PropTypes from 'prop-types'
34
import React, {
@@ -61,7 +62,7 @@ interface Context {
6162
datetime: (date: Date | number, options?: Intl.DateTimeFormatOptions) => string,
6263
formatDate: (value: Date | number | string, options?: FormatDateOptions) => string,
6364
formatList: (listFormat: string[], options?: IntlListFormatOptions) => string,
64-
formatNumber: (numb: number, options?: Intl.NumberFormatOptions) => string,
65+
formatNumber: (numb: number, options?: NumberFormatOptions) => string,
6566
formatUnit: (value: number, options: FormatUnitOptions) => string,
6667
loadTranslations: (namespace: string, load?: LoadTranslationsFn) => Promise<string>,
6768
locales: string[],
@@ -211,7 +212,7 @@ const I18nContextProvider = ({
211212
)
212213

213214
const formatNumber = useCallback(
214-
(numb: number, options?: Intl.NumberFormatOptions) => formatters.getNumberFormat(currentLocale, options).format(numb),
215+
(numb: number, options?: NumberFormatOptions) => formatters.getNumberFormat(currentLocale, options).format(numb),
215216
[currentLocale],
216217
)
217218

‎yarn.lock‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,52 +1755,52 @@ __metadata:
17551755
languageName: node
17561756
linkType: hard
17571757

1758-
"@formatjs/ecma402-abstract@npm:1.10.0":
1759-
version: 1.10.0
1760-
resolution: "@formatjs/ecma402-abstract@npm:1.10.0"
1758+
"@formatjs/ecma402-abstract@npm:1.11.1, @formatjs/ecma402-abstract@npm:^1.11.1":
1759+
version: 1.11.1
1760+
resolution: "@formatjs/ecma402-abstract@npm:1.11.1"
17611761
dependencies:
1762-
"@formatjs/intl-localematcher": 0.2.21
1762+
"@formatjs/intl-localematcher": 0.2.22
17631763
tslib: ^2.1.0
1764-
checksum: 3ea000ba9e9e9ca21018a782d0cd26c0ef84ce7a242b3538b17f4450ff5eeac539a0d1b41bad629499bd8c7857119da5363690958e68bb4724bb01341f68559d
1764+
checksum: e0321ba103f3f95d4dea526acca80651073fc8c210d9a447bc2124db0540ecd1e332a206eadfa2ccb533cc215678c6372ee8e516c5eca774decb6b64cd7b6b95
17651765
languageName: node
17661766
linkType: hard
17671767

1768-
"@formatjs/fast-memoize@npm:1.2.0":
1769-
version: 1.2.0
1770-
resolution: "@formatjs/fast-memoize@npm:1.2.0"
1768+
"@formatjs/fast-memoize@npm:1.2.1":
1769+
version: 1.2.1
1770+
resolution: "@formatjs/fast-memoize@npm:1.2.1"
17711771
dependencies:
17721772
tslib: ^2.1.0
1773-
checksum: fbc94672c4d0abc595c5680052c1fdaa652e7ffca98175a631a19ec44c5b6e2861ce0410c8ea3c4b46827aad5d229f89c0143a2ccf34ca2fbff79bdf63d27377
1773+
checksum: 7df9e941142be16e5862afe7387926cec44ec136d2c2f9a7e1598cb6c8c23a65e420ed90251ec9b48df083f5473b10d6fbbee2e9fc7233d5bf1f27efffba59a7
17741774
languageName: node
17751775
linkType: hard
17761776

1777-
"@formatjs/icu-messageformat-parser@npm:2.0.14":
1778-
version: 2.0.14
1779-
resolution: "@formatjs/icu-messageformat-parser@npm:2.0.14"
1777+
"@formatjs/icu-messageformat-parser@npm:2.0.16":
1778+
version: 2.0.16
1779+
resolution: "@formatjs/icu-messageformat-parser@npm:2.0.16"
17801780
dependencies:
1781-
"@formatjs/ecma402-abstract": 1.10.0
1782-
"@formatjs/icu-skeleton-parser": 1.3.1
1781+
"@formatjs/ecma402-abstract": 1.11.1
1782+
"@formatjs/icu-skeleton-parser": 1.3.3
17831783
tslib: ^2.1.0
1784-
checksum: efbf72704cf462bf832b1f309daee0b16cc7ea5fe533a2f7ff470f4ba863b5958bef9f4fa222de6ecd18c00c2997dde12d5d36f2e9faaffca42a4c1e96da074e
1784+
checksum: 066b2247dbda43c893aab48675829810899ff3c971a472b5145e1f3c8cfb4f9eedcd8fafdf58105f76ddd2e2ed20bc0aa5d80e7274b52730c8c8a3fd91b9fbed
17851785
languageName: node
17861786
linkType: hard
17871787

1788-
"@formatjs/icu-skeleton-parser@npm:1.3.1":
1789-
version: 1.3.1
1790-
resolution: "@formatjs/icu-skeleton-parser@npm:1.3.1"
1788+
"@formatjs/icu-skeleton-parser@npm:1.3.3":
1789+
version: 1.3.3
1790+
resolution: "@formatjs/icu-skeleton-parser@npm:1.3.3"
17911791
dependencies:
1792-
"@formatjs/ecma402-abstract": 1.10.0
1792+
"@formatjs/ecma402-abstract": 1.11.1
17931793
tslib: ^2.1.0
1794-
checksum: 03aae4b10c824fc675e68bac9bbb3a9cb73f35af242e17dcee120e1b85061e7d421ca1f468dce7fe9e7d0efbcfff718469e662de97b24ae37182ac3c11ed6b10
1794+
checksum: d9da7c27d8c4b4d73321f18c98c74e84a52371b18bf077c11c9da97409bb56a68999108a9f6f45bca3c9515099e4432b634c2ab7f36318e530ac61742c48c6bb
17951795
languageName: node
17961796
linkType: hard
17971797

1798-
"@formatjs/intl-localematcher@npm:0.2.21":
1799-
version: 0.2.21
1800-
resolution: "@formatjs/intl-localematcher@npm:0.2.21"
1798+
"@formatjs/intl-localematcher@npm:0.2.22":
1799+
version: 0.2.22
1800+
resolution: "@formatjs/intl-localematcher@npm:0.2.22"
18011801
dependencies:
18021802
tslib: ^2.1.0
1803-
checksum: d766eb8ce8b2628d781fdb34fd0833a0a1b28f20e70a72dfabbca27cf02bd1b994a72c357b2b3d4888bc20c33b6b7cc7e10e92847ec228a40745a2e84d8d2e24
1803+
checksum: 2bc06280be07b58dc3b825ab0a1ff6337f4bee2187f382a5fb1cc41f2ea27b7b711eab578fceaf482128d963ae7e56d646aeb624b3246e3b476bf81d20c07c23
18041804
languageName: node
18051805
linkType: hard
18061806

@@ -3204,10 +3204,11 @@ __metadata:
32043204
version: 0.0.0-use.local
32053205
resolution: "@scaleway/use-i18n@workspace:packages/use-i18n"
32063206
dependencies:
3207-
"@formatjs/fast-memoize": 1.2.0
3207+
"@formatjs/ecma402-abstract": ^1.11.1
3208+
"@formatjs/fast-memoize": 1.2.1
32083209
date-fns: 2.28.0
32093210
filesize: 8.0.6
3210-
intl-messageformat: 9.9.6
3211+
intl-messageformat: 9.11.1
32113212
prop-types: 15.8.0
32123213
peerDependencies:
32133214
date-fns: 2.x
@@ -6720,14 +6721,15 @@ __metadata:
67206721
languageName: node
67216722
linkType: hard
67226723

6723-
"intl-messageformat@npm:9.9.6":
6724-
version: 9.9.6
6725-
resolution: "intl-messageformat@npm:9.9.6"
6724+
"intl-messageformat@npm:9.11.1":
6725+
version: 9.11.1
6726+
resolution: "intl-messageformat@npm:9.11.1"
67266727
dependencies:
6727-
"@formatjs/fast-memoize": 1.2.0
6728-
"@formatjs/icu-messageformat-parser": 2.0.14
6728+
"@formatjs/ecma402-abstract": 1.11.1
6729+
"@formatjs/fast-memoize": 1.2.1
6730+
"@formatjs/icu-messageformat-parser": 2.0.16
67296731
tslib: ^2.1.0
6730-
checksum: 204e83338a47afed1093501506d553052ffbc8b55e1e7f07a81fedbeb645389388dfbaf9a9fd9d83ba9a500a7701947f6b0c8b949cdbc32f81f6f71c84961413
6732+
checksum: 93062f9409e1201bb9857020986c0c1a15e589b21bc45c69f02d68a838c47c2a5f4fe4db4d9b7b576d415041e863476c26122732c1efbce2b4dda7542129fb8c
67316733
languageName: node
67326734
linkType: hard
67336735

0 commit comments

Comments
 (0)