Skip to content

Commit ee46623

Browse files
Merge branch 'main' into feat/paginated-dataloader
2 parents 7019e0d + a3ea571 commit ee46623

File tree

13 files changed

+561
-523
lines changed

13 files changed

+561
-523
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ jobs:
1919
runs-on: ubuntu-20.04
2020
strategy:
2121
matrix:
22-
node: [ '14', '16', '17' ]
22+
# 17.2 seems to have a bug with Intl.DateTimeFormat
23+
node: [ '14', '16', '17.1' ]
2324
steps:
2425
- uses: actions/checkout@v2.3.5
2526
- name: Use Node.js

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,27 @@
1616
"@commitlint/config-conventional": "15.0.0",
1717
"@rollup/plugin-babel": "5.3.0",
1818
"@rollup/plugin-node-resolve": "13.0.6",
19-
"@testing-library/jest-dom": "5.15.1",
19+
"@testing-library/jest-dom": "5.16.1",
2020
"@testing-library/react": "12.1.2",
2121
"@testing-library/react-hooks": "7.0.2",
22-
"@types/react-router-dom": "5.3.2",
2322
"builtin-modules": "3.2.0",
2423
"cross-env": "7.0.3",
25-
"eslint": "8.3.0",
24+
"eslint": "8.4.1",
2625
"husky": "7.0.4",
27-
"jest": "27.3.1",
26+
"jest": "27.4.3",
2827
"jest-junit": "13.0.0",
2928
"jest-localstorage-mock": "2.4.18",
3029
"lerna": "4.0.0",
3130
"lint-staged": "12.1.2",
3231
"mockdate": "3.0.5",
33-
"prettier": "2.4.1",
32+
"prettier": "2.5.1",
3433
"react": "17.0.2",
3534
"react-dom": "17.0.2",
3635
"read-pkg": "7.0.0",
3736
"rollup": "2.60.2",
3837
"rollup-plugin-dts": "4.0.1",
3938
"rollup-plugin-visualizer": "5.5.2",
40-
"typescript": "4.5.2"
39+
"typescript": "4.5.3"
4140
},
4241
"scripts": {
4342
"lint": "eslint --ext js,ts,tsx --cache .",

packages/eslint-config-react/CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,35 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [3.1.1](https://github.com/scaleway/scaleway-lib/compare/@scaleway/eslint-config-react@3.1.0...@scaleway/eslint-config-react@3.1.1) (2021-12-10)
7+
8+
9+
### Bug Fixes
10+
11+
* **deps:** pin dependency eslint-plugin-eslint-comments to 3.2.0 ([#536](https://github.com/scaleway/scaleway-lib/issues/536)) ([b0fea13](https://github.com/scaleway/scaleway-lib/commit/b0fea134507fda853ce7aefe58052cc5e7c37ef6))
12+
13+
14+
15+
## 3.1.0 (2021-12-10)
16+
17+
18+
### Features
19+
20+
* **eslint-config:** add eslint-comments plugin ([#534](https://github.com/scaleway/scaleway-lib/issues/534)) ([15504d3](https://github.com/scaleway/scaleway-lib/commit/15504d38d151ee54cf44f30bb69cd605bf769277))
21+
22+
23+
24+
### 3.0.1 (2021-12-06)
25+
26+
27+
### Bug Fixes
28+
29+
* **deps:** update dependency eslint-config-airbnb to v19.0.2 ([#528](https://github.com/scaleway/scaleway-lib/issues/528)) ([eb7425f](https://github.com/scaleway/scaleway-lib/commit/eb7425fedea52b8a7b7a1da5b9bae20733fb81eb))
30+
* **deps:** update dependency eslint-config-airbnb-typescript to v16.1.0 ([#525](https://github.com/scaleway/scaleway-lib/issues/525)) ([0573445](https://github.com/scaleway/scaleway-lib/commit/0573445b6930bcca2419e0f02244c0a9ef208e6d))
31+
* **deps:** update typescript-eslint monorepo to v5.6.0 ([#519](https://github.com/scaleway/scaleway-lib/issues/519)) ([ad94af0](https://github.com/scaleway/scaleway-lib/commit/ad94af0770970ec2f8b107fb6206548ed3c8c20f))
32+
33+
34+
635
## 3.0.0 (2021-11-23)
736

837

packages/eslint-config-react/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@scaleway/eslint-config-react",
3-
"version": "3.0.0",
3+
"version": "3.1.1",
44
"description": "Scaleway React eslint shared config",
55
"keywords": [
66
"eslint",
@@ -17,11 +17,12 @@
1717
},
1818
"license": "MIT",
1919
"dependencies": {
20-
"@typescript-eslint/eslint-plugin": "5.4.0",
21-
"@typescript-eslint/parser": "5.4.0",
22-
"eslint-config-airbnb": "19.0.1",
23-
"eslint-config-airbnb-typescript": "16.0.0",
20+
"@typescript-eslint/eslint-plugin": "5.6.0",
21+
"@typescript-eslint/parser": "5.6.0",
22+
"eslint-config-airbnb": "19.0.2",
23+
"eslint-config-airbnb-typescript": "16.1.0",
2424
"eslint-config-prettier": "8.3.0",
25+
"eslint-plugin-eslint-comments": "3.2.0",
2526
"eslint-plugin-import": "2.25.3",
2627
"eslint-plugin-jsx-a11y": "6.5.1",
2728
"eslint-plugin-react": "7.27.1",

packages/eslint-config-react/shared.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
extends: ['airbnb/hooks', 'prettier'],
2+
extends: ['airbnb/hooks', 'prettier', 'plugin:eslint-comments/recommended'],
33
rules: {
44
'import/order': [
55
// https://github.com/import-js/eslint-plugin-import/blob/master/docs/rules/order.md

packages/use-dataloader/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### 2.6.1 (2021-12-10)
7+
8+
**Note:** Version bump only for package @scaleway/use-dataloader
9+
10+
11+
12+
13+
614
## 2.6.0 (2021-11-30)
715

816

packages/use-dataloader/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@scaleway/use-dataloader",
3-
"version": "2.6.0",
3+
"version": "2.6.1",
44
"description": "A small hook to handle api requests",
55
"keywords": [
66
"react",

packages/use-dataloader/src/__tests__/useDataLoader.test.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable no-console */
21
import { act, renderHook } from '@testing-library/react-hooks'
32
import React from 'react'
43
import DataLoaderProvider, { useDataLoaderContext } from '../DataLoaderProvider'
@@ -661,6 +660,8 @@ describe('useDataLoader', () => {
661660
expect(mockedFn).toBeCalledTimes(2)
662661
})
663662

663+
/* eslint-disable no-console */
664+
664665
test('should cancel request', async () => {
665666
const originalError = console.error
666667
console.error = jest.fn()
@@ -741,4 +742,6 @@ describe('useDataLoader', () => {
741742
expect(result.current.isError).toBe(false)
742743
console.error = originalError
743744
})
745+
746+
/* eslint-enable no-console */
744747
})

packages/use-i18n/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [3.1.25](https://github.com/scaleway/scaleway-lib/compare/@scaleway/use-i18n@3.1.24...@scaleway/use-i18n@3.1.25) (2021-12-10)
7+
8+
**Note:** Version bump only for package @scaleway/use-i18n
9+
10+
11+
12+
13+
14+
### 3.1.24 (2021-12-07)
15+
16+
17+
### Bug Fixes
18+
19+
* **deps:** update dependency date-fns to v2.27.0 ([#522](https://github.com/scaleway/scaleway-lib/issues/522)) ([461386f](https://github.com/scaleway/scaleway-lib/commit/461386f0240e01e836fa3144cbdd07df5e720b0d))
20+
21+
22+
623
### [3.1.23](https://github.com/scaleway/scaleway-lib/compare/@scaleway/use-i18n@3.1.22...@scaleway/use-i18n@3.1.23) (2021-11-22)
724

825

packages/use-i18n/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@scaleway/use-i18n",
3-
"version": "3.1.23",
3+
"version": "3.1.25",
44
"description": "A small hook to handle i18n",
55
"keywords": [
66
"react",
@@ -28,7 +28,7 @@
2828
"license": "MIT",
2929
"dependencies": {
3030
"@formatjs/fast-memoize": "1.2.0",
31-
"date-fns": "2.26.0",
31+
"date-fns": "2.27.0",
3232
"filesize": "8.0.6",
3333
"intl-messageformat": "9.9.6",
3434
"prop-types": "15.7.2"

0 commit comments

Comments
 (0)