Skip to content

Commit e656767

Browse files
authored
Merge branch 'master' into fix/security_error
2 parents a07d231 + b585339 commit e656767

File tree

6 files changed

+85
-41
lines changed

6 files changed

+85
-41
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"prettier": "^2.2.1",
3333
"read-pkg": "^7.0.0",
3434
"rollup": "^2.36.1",
35-
"rollup-plugin-dts": "^3.0.2",
35+
"rollup-plugin-dts": "^4.0.0",
3636
"rollup-plugin-visualizer": "^5.5.0",
3737
"typescript": "^4.3.5"
3838
},

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.1.1 (2021-08-30)
7+
8+
**Note:** Version bump only for package @scaleway/use-dataloader
9+
10+
11+
12+
13+
614
## 2.1.0 (2021-07-21)
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.1.0",
3+
"version": "2.1.1",
44
"description": "A small hook to handle api requests",
55
"keywords": [
66
"react",

packages/use-dataloader/src/useDataLoader.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ const useDataLoader = <T>(
129129

130130
await onSuccess?.(result)
131131
} catch (err) {
132-
dispatch(Actions.createOnError(err))
133-
await ((onError ?? onErrorProvider)?.(err))
132+
dispatch(Actions.createOnError(err as Error))
133+
await ((onError ?? onErrorProvider)?.(err as Error))
134134
}
135135
},
136136
[

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"compilerOptions": {
3+
"noEmit": true,
34
"target": "esnext",
45
"lib": [
56
"DOM",

yarn.lock

Lines changed: 72 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -997,10 +997,10 @@
997997
core-js-pure "^3.0.0"
998998
regenerator-runtime "^0.13.4"
999999

1000-
"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
1001-
version "7.14.6"
1002-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
1003-
integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
1000+
"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
1001+
version "7.15.3"
1002+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
1003+
integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
10041004
dependencies:
10051005
regenerator-runtime "^0.13.4"
10061006

@@ -2634,27 +2634,27 @@
26342634
"@types/yargs-parser" "*"
26352635

26362636
"@typescript-eslint/eslint-plugin@^4.29.3":
2637-
version "4.29.3"
2638-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz#95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa"
2639-
integrity sha512-tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA==
2637+
version "4.30.0"
2638+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz#4a0c1ae96b953f4e67435e20248d812bfa55e4fb"
2639+
integrity sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==
26402640
dependencies:
2641-
"@typescript-eslint/experimental-utils" "4.29.3"
2642-
"@typescript-eslint/scope-manager" "4.29.3"
2641+
"@typescript-eslint/experimental-utils" "4.30.0"
2642+
"@typescript-eslint/scope-manager" "4.30.0"
26432643
debug "^4.3.1"
26442644
functional-red-black-tree "^1.0.1"
26452645
regexpp "^3.1.0"
26462646
semver "^7.3.5"
26472647
tsutils "^3.21.0"
26482648

2649-
"@typescript-eslint/experimental-utils@4.29.3":
2650-
version "4.29.3"
2651-
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz#52e437a689ccdef73e83c5106b34240a706f15e1"
2652-
integrity sha512-ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg==
2649+
"@typescript-eslint/experimental-utils@4.30.0":
2650+
version "4.30.0"
2651+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz#9e49704fef568432ae16fc0d6685c13d67db0fd5"
2652+
integrity sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==
26532653
dependencies:
26542654
"@types/json-schema" "^7.0.7"
2655-
"@typescript-eslint/scope-manager" "4.29.3"
2656-
"@typescript-eslint/types" "4.29.3"
2657-
"@typescript-eslint/typescript-estree" "4.29.3"
2655+
"@typescript-eslint/scope-manager" "4.30.0"
2656+
"@typescript-eslint/types" "4.30.0"
2657+
"@typescript-eslint/typescript-estree" "4.30.0"
26582658
eslint-scope "^5.1.1"
26592659
eslint-utils "^3.0.0"
26602660

@@ -2676,11 +2676,24 @@
26762676
"@typescript-eslint/types" "4.29.3"
26772677
"@typescript-eslint/visitor-keys" "4.29.3"
26782678

2679+
"@typescript-eslint/[email protected]":
2680+
version "4.30.0"
2681+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz#1a3ffbb385b1a06be85cd5165a22324f069a85ee"
2682+
integrity sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==
2683+
dependencies:
2684+
"@typescript-eslint/types" "4.30.0"
2685+
"@typescript-eslint/visitor-keys" "4.30.0"
2686+
26792687
"@typescript-eslint/[email protected]":
26802688
version "4.29.3"
26812689
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz#d7980c49aef643d0af8954c9f14f656b7fd16017"
26822690
integrity sha512-s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg==
26832691

2692+
"@typescript-eslint/[email protected]":
2693+
version "4.30.0"
2694+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.30.0.tgz#fb9d9b0358426f18687fba82eb0b0f869780204f"
2695+
integrity sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==
2696+
26842697
"@typescript-eslint/[email protected]":
26852698
version "4.29.3"
26862699
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz#1bafad610015c4ded35c85a70b6222faad598b40"
@@ -2694,6 +2707,19 @@
26942707
semver "^7.3.5"
26952708
tsutils "^3.21.0"
26962709

2710+
"@typescript-eslint/[email protected]":
2711+
version "4.30.0"
2712+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz#ae57833da72a753f4846cd3053758c771670c2ac"
2713+
integrity sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==
2714+
dependencies:
2715+
"@typescript-eslint/types" "4.30.0"
2716+
"@typescript-eslint/visitor-keys" "4.30.0"
2717+
debug "^4.3.1"
2718+
globby "^11.0.3"
2719+
is-glob "^4.0.1"
2720+
semver "^7.3.5"
2721+
tsutils "^3.21.0"
2722+
26972723
"@typescript-eslint/[email protected]":
26982724
version "4.29.3"
26992725
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz#c691760a00bd86bf8320d2a90a93d86d322f1abf"
@@ -2702,6 +2728,14 @@
27022728
"@typescript-eslint/types" "4.29.3"
27032729
eslint-visitor-keys "^2.0.0"
27042730

2731+
"@typescript-eslint/[email protected]":
2732+
version "4.30.0"
2733+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz#a47c6272fc71b0c627d1691f68eaecf4ad71445e"
2734+
integrity sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==
2735+
dependencies:
2736+
"@typescript-eslint/types" "4.30.0"
2737+
eslint-visitor-keys "^2.0.0"
2738+
27052739
JSONStream@^1.0.4:
27062740
version "1.3.5"
27072741
resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -4078,13 +4112,14 @@ eslint-plugin-react-hooks@^4.2.0:
40784112
integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
40794113

40804114
eslint-plugin-react@^7.24.0:
4081-
version "7.24.0"
4082-
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"
4083-
integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==
4115+
version "7.25.1"
4116+
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.25.1.tgz#9286b7cd9bf917d40309760f403e53016eda8331"
4117+
integrity sha512-P4j9K1dHoFXxDNP05AtixcJEvIT6ht8FhYKsrkY0MPCPaUMYijhpWwNiRDZVtA8KFuZOkGSeft6QwH8KuVpJug==
40844118
dependencies:
40854119
array-includes "^3.1.3"
40864120
array.prototype.flatmap "^1.2.4"
40874121
doctrine "^2.1.0"
4122+
estraverse "^5.2.0"
40884123
has "^1.0.3"
40894124
jsx-ast-utils "^2.4.1 || ^3.0.0"
40904125
minimatch "^3.0.4"
@@ -7250,24 +7285,24 @@ react-is@^17.0.1:
72507285
integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
72517286

72527287
react-router-dom@^5.2.0:
7253-
version "5.2.0"
7254-
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
7255-
integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
7288+
version "5.2.1"
7289+
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.1.tgz#34af8b551a4ce17487d3f80e651b91651978dff6"
7290+
integrity sha512-xhFFkBGVcIVPbWM2KEYzED+nuHQPmulVa7sqIs3ESxzYd1pYg8N8rxPnQ4T2o1zu/2QeDUWcaqST131SO1LR3w==
72567291
dependencies:
7257-
"@babel/runtime" "^7.1.2"
7292+
"@babel/runtime" "^7.12.13"
72587293
history "^4.9.0"
72597294
loose-envify "^1.3.1"
72607295
prop-types "^15.6.2"
7261-
react-router "5.2.0"
7296+
react-router "5.2.1"
72627297
tiny-invariant "^1.0.2"
72637298
tiny-warning "^1.0.0"
72647299

7265-
7266-
version "5.2.0"
7267-
resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
7268-
integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==
7300+
7301+
version "5.2.1"
7302+
resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d"
7303+
integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==
72697304
dependencies:
7270-
"@babel/runtime" "^7.1.2"
7305+
"@babel/runtime" "^7.12.13"
72717306
history "^4.9.0"
72727307
hoist-non-react-statics "^3.1.0"
72737308
loose-envify "^1.3.1"
@@ -7605,14 +7640,14 @@ rimraf@^3.0.0, rimraf@^3.0.2:
76057640
dependencies:
76067641
glob "^7.1.3"
76077642

7608-
rollup-plugin-dts@^3.0.2:
7609-
version "3.0.2"
7610-
resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-3.0.2.tgz#2b628d88f864d271d6eaec2e4c2a60ae4e944c5c"
7611-
integrity sha512-hswlsdWu/x7k5pXzaLP6OvKRKcx8Bzprksz9i9mUe72zvt8LvqAb/AZpzs6FkLgmyRaN8B6rUQOVtzA3yEt9Yw==
7643+
rollup-plugin-dts@^4.0.0:
7644+
version "4.0.0"
7645+
resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-4.0.0.tgz#7645280183b7624e77375a548a11297f9916f6d8"
7646+
integrity sha512-tgUC8CxVgtlLDVloUEA9uACVaxjJHuYxlDSTp1LdCexA0bJx+RuMi45RjdLG9RTCgZlV5YBh3O7P2u6dS1KlnA==
76127647
dependencies:
76137648
magic-string "^0.25.7"
76147649
optionalDependencies:
7615-
"@babel/code-frame" "^7.12.13"
7650+
"@babel/code-frame" "^7.14.5"
76167651

76177652
rollup-plugin-visualizer@^5.5.0:
76187653
version "5.5.2"
@@ -8424,9 +8459,9 @@ typedarray@^0.0.6:
84248459
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
84258460

84268461
typescript@^4.3.5:
8427-
version "4.3.5"
8428-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
8429-
integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
8462+
version "4.4.2"
8463+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86"
8464+
integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==
84308465

84318466
uglify-js@^3.1.4:
84328467
version "3.14.1"

0 commit comments

Comments
 (0)