Skip to content

Commit 58a579e

Browse files
Merge branch 'master' into dependabot/npm_and_yarn/feathersjs/rest-client-4.3.7
2 parents 5901dea + 190054e commit 58a579e

File tree

2 files changed

+53
-46
lines changed

2 files changed

+53
-46
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
"date-fns": "^2.0.0-beta.2",
150150
"deep-object-diff": "^1.1.0",
151151
"eslint": "^5.16.0",
152-
"eslint-config-prettier": "^4.1.0",
152+
"eslint-config-prettier": "^6.4.0",
153153
"eslint-plugin-prettier": "^3.0.1",
154154
"eslint-plugin-vue": "^5.2.2",
155155
"feathers-memory": "^3.0.2",

yarn.lock

Lines changed: 52 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -792,9 +792,9 @@
792792
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
793793

794794
"@types/chai@^4.1.7":
795-
version "4.1.7"
796-
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a"
797-
integrity sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA==
795+
version "4.2.3"
796+
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.3.tgz#419477a3d5202bad19e14c787940a61dc9ea6407"
797+
integrity sha512-VRw2xEGbll3ZiTQ4J02/hUjNqZoue1bMhoo2dgM2LXjDdyaq4q80HgBDHwpI0/VKlo4Eg+BavyQMv/NYgTetzA==
798798

799799
"@types/eslint-visitor-keys@^1.0.0":
800800
version "1.0.0"
@@ -827,6 +827,11 @@
827827
resolved "https://registry.yarnpkg.com/@types/inflection/-/inflection-1.5.28.tgz#43d55e0d72cf333a2dffd9c4ec0407455a1b0931"
828828
integrity sha1-Q9VeDXLPMzot/9nE7AQHRVobCTE=
829829

830+
"@types/json-schema@^7.0.3":
831+
version "7.0.3"
832+
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
833+
integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
834+
830835
"@types/lodash@^4.14.123":
831836
version "4.14.135"
832837
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.135.tgz#d2607c35dd68f70c2b35ba020c667493dedd8447"
@@ -872,11 +877,11 @@
872877
"@types/node" "*"
873878

874879
"@typescript-eslint/eslint-plugin@^1.1.0", "@typescript-eslint/eslint-plugin@^1.5.0":
875-
version "1.11.0"
876-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.11.0.tgz#870f752c520db04db6d3668af7479026a6f2fb9a"
877-
integrity sha512-mXv9ccCou89C8/4avKHuPB2WkSZyY/XcTQUXd5LFZAcLw1I3mWYVjUu6eS9Ja0QkP/ClolbcW9tb3Ov/pMdcqw==
880+
version "1.13.0"
881+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz#22fed9b16ddfeb402fd7bcde56307820f6ebc49f"
882+
integrity sha512-WQHCozMnuNADiqMtsNzp96FNox5sOVpU8Xt4meaT4em8lOG1SrOv92/mUbEHQVh90sldKSfcOc/I0FOb/14G1g==
878883
dependencies:
879-
"@typescript-eslint/experimental-utils" "1.11.0"
884+
"@typescript-eslint/experimental-utils" "1.13.0"
880885
eslint-utils "^1.3.1"
881886
functional-red-black-tree "^1.0.1"
882887
regexpp "^2.0.1"
@@ -890,14 +895,23 @@
890895
"@typescript-eslint/typescript-estree" "1.11.0"
891896
eslint-scope "^4.0.0"
892897

898+
"@typescript-eslint/[email protected]":
899+
version "1.13.0"
900+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e"
901+
integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==
902+
dependencies:
903+
"@types/json-schema" "^7.0.3"
904+
"@typescript-eslint/typescript-estree" "1.13.0"
905+
eslint-scope "^4.0.0"
906+
893907
"@typescript-eslint/parser@^1.1.0", "@typescript-eslint/parser@^1.5.0":
894-
version "1.11.0"
895-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.11.0.tgz#2f6d4f7e64eeb1e7c25b422f8df14d0c9e508e36"
896-
integrity sha512-5xBExyXaxVyczrZvbRKEXvaTUFFq7gIM9BynXukXZE0zF3IQP/FxF4mPmmh3gJ9egafZFqByCpPTFm3dk4SY7Q==
908+
version "1.13.0"
909+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.13.0.tgz#61ac7811ea52791c47dc9fd4dd4a184fae9ac355"
910+
integrity sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ==
897911
dependencies:
898912
"@types/eslint-visitor-keys" "^1.0.0"
899-
"@typescript-eslint/experimental-utils" "1.11.0"
900-
"@typescript-eslint/typescript-estree" "1.11.0"
913+
"@typescript-eslint/experimental-utils" "1.13.0"
914+
"@typescript-eslint/typescript-estree" "1.13.0"
901915
eslint-visitor-keys "^1.0.0"
902916

903917
"@typescript-eslint/[email protected]":
@@ -908,6 +922,14 @@
908922
lodash.unescape "4.0.1"
909923
semver "5.5.0"
910924

925+
"@typescript-eslint/[email protected]":
926+
version "1.13.0"
927+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz#8140f17d0f60c03619798f1d628b8434913dc32e"
928+
integrity sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==
929+
dependencies:
930+
lodash.unescape "4.0.1"
931+
semver "5.5.0"
932+
911933
"@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
912934
version "1.0.0"
913935
resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040"
@@ -2964,9 +2986,9 @@ can-diff@<2.0.0:
29642986
can-reflect "^1.14.1"
29652987

29662988
can-fixture-socket@^2.0.0:
2967-
version "2.0.2"
2968-
resolved "https://registry.yarnpkg.com/can-fixture-socket/-/can-fixture-socket-2.0.2.tgz#64eb4ef499af3cf4644b80fe419c7b63af73cd66"
2969-
integrity sha512-Ww0S3NMHqzAGhA/zZ2xxo2DwFh9jdIpOEEx6heqswBK7BUL9XzTD4eAerzFunr4JT8hQFyxdngFkVqDcbzCjLQ==
2989+
version "2.0.3"
2990+
resolved "https://registry.yarnpkg.com/can-fixture-socket/-/can-fixture-socket-2.0.3.tgz#61781d6df32832da1a27dd8e820476179a451271"
2991+
integrity sha512-dv/dUGIwDK88K5A45qy6Zy/dPaKPck5tYcVH+3N4m0TBRF4LMZ1Xl+sIPQ4P4ch/BM63+H05hhjA6moLZtkc7w==
29702992
dependencies:
29712993
can-assign "^1.2.0"
29722994
can-fixture "^3.0.0"
@@ -4571,10 +4593,10 @@ eslint-config-prettier@^3.3.0:
45714593
dependencies:
45724594
get-stdin "^6.0.0"
45734595

4574-
eslint-config-prettier@^4.1.0:
4575-
version "4.3.0"
4576-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-4.3.0.tgz#c55c1fcac8ce4518aeb77906984e134d9eb5a4f0"
4577-
integrity sha512-sZwhSTHVVz78+kYD3t5pCWSYEdVSBR0PXnwjDRsUs8ytIrK8PLXw+6FKp8r3Z7rx4ZszdetWlXYKOHoUrrwPlA==
4596+
eslint-config-prettier@^6.4.0:
4597+
version "6.4.0"
4598+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz#0a04f147e31d33c6c161b2dd0971418ac52d0477"
4599+
integrity sha512-YrKucoFdc7SEko5Sxe4r6ixqXPDP1tunGw91POeZTTRKItf/AMFYt/YLEQtZMkR2LVpAVhcAcZgcWpm1oGPW7w==
45784600
dependencies:
45794601
get-stdin "^6.0.0"
45804602

@@ -4641,9 +4663,9 @@ eslint-plugin-node@~7.0.1:
46414663
semver "^5.5.0"
46424664

46434665
eslint-plugin-prettier@^3.0.0, eslint-plugin-prettier@^3.0.1:
4644-
version "3.1.0"
4645-
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d"
4646-
integrity sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA==
4666+
version "3.1.1"
4667+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz#507b8562410d02a03f0ddc949c616f877852f2ba"
4668+
integrity sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA==
46474669
dependencies:
46484670
prettier-linter-helpers "^1.0.0"
46494671

@@ -9480,14 +9502,7 @@ [email protected]:
94809502
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
94819503
integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
94829504

9483-
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.5.0, resolve@^1.6.0:
9484-
version "1.11.1"
9485-
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
9486-
integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
9487-
dependencies:
9488-
path-parse "^1.0.6"
9489-
9490-
resolve@^1.2.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.8.1:
9505+
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1:
94919506
version "1.12.0"
94929507
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
94939508
integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
@@ -9998,15 +10013,7 @@ source-map-support@^0.4.15:
999810013
dependencies:
999910014
source-map "^0.5.6"
1000010015

10001-
source-map-support@^0.5.6:
10002-
version "0.5.12"
10003-
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
10004-
integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
10005-
dependencies:
10006-
buffer-from "^1.0.0"
10007-
source-map "^0.6.0"
10008-
10009-
source-map-support@~0.5.12:
10016+
source-map-support@^0.5.6, source-map-support@~0.5.12:
1001010017
version "0.5.13"
1001110018
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
1001210019
integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
@@ -10231,9 +10238,9 @@ steal@^1.11.0:
1023110238
zlib-browserify "~0.0.3"
1023210239

1023310240
steal@^2.2.1:
10234-
version "2.2.1"
10235-
resolved "https://registry.yarnpkg.com/steal/-/steal-2.2.1.tgz#5c67d34ab57d0b037e052dcbd3df05662f180384"
10236-
integrity sha512-3v1ZJ6ucEG6Rb4iY8hOMAMDBeSio1RTLeNpTD5t60JEkzBb95W9SI2Xg0gYg5Q9f7TAHGyioTx+eR9XzrLjmMA==
10241+
version "2.2.4"
10242+
resolved "https://registry.yarnpkg.com/steal/-/steal-2.2.4.tgz#36bca73e393a2cae16161d5d2e11c6d582ae2753"
10243+
integrity sha512-swLqKn5FTPiUkPpcNj7CBy5AA7CdzmNai1dLRascDnv2AbXBOrLFyKHkAQwn4Tm1dGB9+exyiBxTeGT4v4HYnw==
1023710244
dependencies:
1023810245
assert "~1.4.1"
1023910246
buffer "~5.0.4"
@@ -10798,9 +10805,9 @@ trim-right@^1.0.1:
1079810805
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
1079910806

1080010807
ts-node@^8.0.3:
10801-
version "8.3.0"
10802-
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.3.0.tgz#e4059618411371924a1fb5f3b125915f324efb57"
10803-
integrity sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==
10808+
version "8.4.1"
10809+
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.4.1.tgz#270b0dba16e8723c9fa4f9b4775d3810fd994b4f"
10810+
integrity sha512-5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw==
1080410811
dependencies:
1080510812
arg "^4.1.0"
1080610813
diff "^4.0.1"

0 commit comments

Comments
 (0)