From 1627655c64a238488e7366ebd286019bd4bad6c5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 04:56:04 +0000 Subject: [PATCH 01/18] Bump prettier from 1.17.1 to 1.18.0 in /webapp Bumps [prettier](https://github.com/prettier/prettier) from 1.17.1 to 1.18.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/1.17.1...1.18.0) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 379053d08..90611f241 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -104,7 +104,7 @@ "jest": "~24.8.0", "node-sass": "~4.12.0", "nodemon": "~1.19.1", - "prettier": "~1.17.1", + "prettier": "~1.18.0", "sass-loader": "~7.1.0", "tippy.js": "^4.3.3", "vue-jest": "~3.0.4", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 56e2e50b3..2a06a9c01 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -8857,15 +8857,10 @@ prettier@1.16.3: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== -prettier@^1.15.2: - version "1.17.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.0.tgz#53b303676eed22cc14a9f0cec09b477b3026c008" - integrity sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw== - -prettier@~1.17.1: - version "1.17.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db" - integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg== +prettier@^1.15.2, prettier@~1.18.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.0.tgz#d1701ca9b2941864b52f3262b35946d2c9cd88f0" + integrity sha512-YsdAD29M0+WY2xXZk3i0PA16olY9qZss+AuODxglXcJ+2ZBwFv+6k5tE8GS8/HKAthaajlS/WqhdgcjumOrPlg== pretty-bytes@^5.2.0: version "5.2.0" From 4194c6f3c17c97fe7b7064344d7858190c0543f9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 04:57:42 +0000 Subject: [PATCH 02/18] Bump date-fns from 2.0.0-alpha.29 to 2.0.0-alpha.31 in /webapp Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.29 to 2.0.0-alpha.31. - [Release notes](https://github.com/date-fns/date-fns/releases) - [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md) - [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.29...v2.0.0-alpha.31) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 379053d08..18a452892 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -59,7 +59,7 @@ "apollo-client": "~2.6.1", "cookie-universal-nuxt": "~2.0.14", "cross-env": "~5.2.0", - "date-fns": "2.0.0-alpha.29", + "date-fns": "2.0.0-alpha.31", "express": "~4.17.1", "graphql": "~14.3.1", "jsonwebtoken": "~8.5.1", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 56e2e50b3..fdef71665 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -3747,10 +3747,10 @@ data-urls@^1.0.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -date-fns@2.0.0-alpha.29: - version "2.0.0-alpha.29" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.29.tgz#9d4a36e3ebba63d009e957fea8fdfef7921bc6cb" - integrity sha512-AIFZ0hG/1fdb7HZHTDyiEJdNiaFyZxXcx/kF8z3I9wxbhkN678KrrLSneKcsb0Xy5KqCA4wCIxmGpdVWSNZnpA== +date-fns@2.0.0-alpha.31: + version "2.0.0-alpha.31" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.31.tgz#51bcfdca25dfc9bea334a556ab33dfc0bb00421c" + integrity sha512-S19PwMqnbYsqcbCg02Yj9gv4veVNZ0OX7v2+zcd+Mq0RI7LoDKJipJjnMrTZ3Cc6blDuTce5G/pHXcVIGRwJWQ== date-now@^0.1.4: version "0.1.4" From b5b3293af0929171b4c1a60f204d4f8714f2d4e3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 04:59:36 +0000 Subject: [PATCH 03/18] Bump date-fns from 2.0.0-alpha.29 to 2.0.0-alpha.31 in /backend Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.29 to 2.0.0-alpha.31. - [Release notes](https://github.com/date-fns/date-fns/releases) - [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md) - [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.29...v2.0.0-alpha.31) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index be5fb086d..25995e848 100644 --- a/backend/package.json +++ b/backend/package.json @@ -52,7 +52,7 @@ "cheerio": "~1.0.0-rc.3", "cors": "~2.8.5", "cross-env": "~5.2.0", - "date-fns": "2.0.0-alpha.29", + "date-fns": "2.0.0-alpha.31", "debug": "~4.1.1", "dotenv": "~8.0.0", "express": "~4.17.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index 9c8fdc3c5..222270fa7 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2579,10 +2579,10 @@ data-urls@^1.0.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -date-fns@2.0.0-alpha.29: - version "2.0.0-alpha.29" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.29.tgz#9d4a36e3ebba63d009e957fea8fdfef7921bc6cb" - integrity sha512-AIFZ0hG/1fdb7HZHTDyiEJdNiaFyZxXcx/kF8z3I9wxbhkN678KrrLSneKcsb0Xy5KqCA4wCIxmGpdVWSNZnpA== +date-fns@2.0.0-alpha.31: + version "2.0.0-alpha.31" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.31.tgz#51bcfdca25dfc9bea334a556ab33dfc0bb00421c" + integrity sha512-S19PwMqnbYsqcbCg02Yj9gv4veVNZ0OX7v2+zcd+Mq0RI7LoDKJipJjnMrTZ3Cc6blDuTce5G/pHXcVIGRwJWQ== debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" From 34a9799facc9887aebe0d781606d9a6ee9c84dec Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 05:00:10 +0000 Subject: [PATCH 04/18] Bump apollo-server from 2.6.1 to 2.6.2 in /backend Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/apollographql/apollo-server/releases) - [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.1...apollo-server@2.6.2) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 95 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 85 insertions(+), 12 deletions(-) diff --git a/backend/package.json b/backend/package.json index be5fb086d..ab22b1e15 100644 --- a/backend/package.json +++ b/backend/package.json @@ -47,7 +47,7 @@ "apollo-client": "~2.6.1", "apollo-link-context": "~1.0.14", "apollo-link-http": "~1.5.14", - "apollo-server": "~2.6.1", + "apollo-server": "~2.6.2", "bcryptjs": "~2.4.3", "cheerio": "~1.0.0-rc.3", "cors": "~2.8.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index 9c8fdc3c5..0f0acb872 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1289,6 +1289,14 @@ apollo-cache-control@0.7.1: apollo-server-env "2.4.0" graphql-extensions "0.7.1" +apollo-cache-control@0.7.2: + version "0.7.2" + resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.7.2.tgz#b8852422d973c582493e85c776abc9c660090162" + integrity sha512-7prjFN8H9lRE0npqGG8kM3XICvNCcgQt6eCy8kkcPOIZwM+F8m8ShjEfNF9UWW32i+poOk3G67HegPRyjCc6/Q== + dependencies: + apollo-server-env "2.4.0" + graphql-extensions "0.7.2" + apollo-cache-control@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.1.1.tgz#173d14ceb3eb9e7cb53de7eb8b61bee6159d4171" @@ -1344,6 +1352,13 @@ apollo-engine-reporting-protobuf@0.3.0: dependencies: protobufjs "^6.8.6" +apollo-engine-reporting-protobuf@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.3.1.tgz#a581257fa8e3bb115ce38bf1b22e052d1475ad69" + integrity sha512-Ui3nPG6BSZF8BEqxFs6EkX6mj2OnFLMejxEHSOdM82bakyeouCGd7J0fiy8AD6liJoIyc4X7XfH4ZGGMvMh11A== + dependencies: + protobufjs "^6.8.6" + apollo-engine-reporting@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.2.1.tgz#0b77fad2e9221d62f4a29b8b4fab8f7f47dcc1d6" @@ -1356,6 +1371,18 @@ apollo-engine-reporting@1.2.1: async-retry "^1.2.1" graphql-extensions "0.7.1" +apollo-engine-reporting@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.0.tgz#50151811a0f5e70f4a73e7092a61fec422d8e722" + integrity sha512-xP+Z+wdQH4ee7xfuP3WsJcIe30AH68gpp2lQm2+rnW5JfjIqD5YehSoO2Svi2jK3CSv8Y561i3QMW9i34P7hEQ== + dependencies: + apollo-engine-reporting-protobuf "0.3.1" + apollo-graphql "^0.3.0" + apollo-server-core "2.6.2" + apollo-server-env "2.4.0" + async-retry "^1.2.1" + graphql-extensions "0.7.2" + apollo-env@0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.5.1.tgz#b9b0195c16feadf0fe9fd5563edb0b9b7d9e97d3" @@ -1450,6 +1477,32 @@ apollo-server-core@2.6.1: subscriptions-transport-ws "^0.9.11" ws "^6.0.0" +apollo-server-core@2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.2.tgz#a792b50d4df9e26ec03759a31fbcbce38361b218" + integrity sha512-AbAnfoQ26NPsNIyBa/BVKBtA/wRsNL/E6eEem1VIhzitfgO25bVXFbEZDLxbgz6wvJ+veyRFpse7Qi1bvRpxOw== + dependencies: + "@apollographql/apollo-tools" "^0.3.6" + "@apollographql/graphql-playground-html" "1.6.20" + "@types/ws" "^6.0.0" + apollo-cache-control "0.7.2" + apollo-datasource "0.5.0" + apollo-engine-reporting "1.3.0" + apollo-server-caching "0.4.0" + apollo-server-env "2.4.0" + apollo-server-errors "2.3.0" + apollo-server-plugin-base "0.5.2" + apollo-tracing "0.7.2" + fast-json-stable-stringify "^2.0.0" + graphql-extensions "0.7.2" + graphql-subscriptions "^1.0.0" + graphql-tag "^2.9.2" + graphql-tools "^4.0.0" + graphql-upload "^8.0.2" + sha.js "^2.4.11" + subscriptions-transport-ws "^0.9.11" + ws "^6.0.0" + apollo-server-core@^1.3.6, apollo-server-core@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.4.0.tgz#4faff7f110bfdd6c3f47008302ae24140f94c592" @@ -1472,10 +1525,10 @@ apollo-server-errors@2.3.0: resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz#700622b66a16dffcad3b017e4796749814edc061" integrity sha512-rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw== -apollo-server-express@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.1.tgz#1e2649d3fd38c0c0a2c830090fd41e086b259c9f" - integrity sha512-TVu68LVp+COMGOXuxc0OFeCUQiPApxy7Isv2Vk85nikZV4t4FXlODB6PrRKf5rfvP31dvGsfE6GHPJTLLbKfyg== +apollo-server-express@2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.2.tgz#526297c01a7a32fe9215566f9fd7ff92e82f1fa0" + integrity sha512-nbL3noJ5KxKGg+hT8UsAA7++oHWq/KNSevfdCluWTfUNqH1vYRTvAnARx/6JM06S9zcPTfOLcqwHnDnY9zYFxA== dependencies: "@apollographql/graphql-playground-html" "1.6.20" "@types/accepts" "^1.3.5" @@ -1483,7 +1536,7 @@ apollo-server-express@2.6.1: "@types/cors" "^2.8.4" "@types/express" "4.16.1" accepts "^1.3.5" - apollo-server-core "2.6.1" + apollo-server-core "2.6.2" body-parser "^1.18.3" cors "^2.8.4" graphql-subscriptions "^1.0.0" @@ -1516,6 +1569,11 @@ apollo-server-plugin-base@0.5.1: resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.1.tgz#b81056666763879bdc98d8d58f3c4c43cbb30da6" integrity sha512-UejnBk6XDqYQ+Ydkbm+gvlOzP+doQA8glVUULs8rCi0/MshsFSsBVl6rtzruELDBVgZhJgGsd4pUexcvNc3aZA== +apollo-server-plugin-base@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.2.tgz#f97ba983f1e825fec49cba8ff6a23d00e1901819" + integrity sha512-j81CpadRLhxikBYHMh91X4aTxfzFnmmebEiIR9rruS6dywWCxV2aLW87l9ocD1MiueNam0ysdwZkX4F3D4csNw== + apollo-server-testing@~2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.6.1.tgz#447f34980819fa52b120f26c632fab4efc55435b" @@ -1523,13 +1581,13 @@ apollo-server-testing@~2.6.1: dependencies: apollo-server-core "2.6.1" -apollo-server@~2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.1.tgz#1b1fc6020b75c0913550da5fa0f2005c62f1bc53" - integrity sha512-Ed0zZjluRYPMC3Yr6oXQjcR11izu86nkjiS2MhjJA1mF8IXJfxbPp2hnX4Jf4vXPSkOP2e5ZHw0cdaIcu9GnRw== +apollo-server@~2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.2.tgz#33fe894b740588f059a7679346516ffce50377d5" + integrity sha512-fMXaAKIb0dX0lzcZ4zlu7ay1L596d9HTNkdn8cKuM7zmTpugZSAL966COguJUDSjUS9CaB1Kh5hl1yRuRqHXSA== dependencies: - apollo-server-core "2.6.1" - apollo-server-express "2.6.1" + apollo-server-core "2.6.2" + apollo-server-express "2.6.2" express "^4.0.0" graphql-subscriptions "^1.0.0" graphql-tools "^4.0.0" @@ -1542,6 +1600,14 @@ apollo-tracing@0.7.1: apollo-server-env "2.4.0" graphql-extensions "0.7.1" +apollo-tracing@0.7.2: + version "0.7.2" + resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.7.2.tgz#7730159a4670bca465ac1bfa01f9902610a7aba4" + integrity sha512-bT4/n8Vy9DweC3+XWJelJD41FBlKMXR0OVxjLMiCe9clb4yTgKhYxRGTyh9KjmhWsng9gG/DphO0ixWsOgdXmA== + dependencies: + apollo-server-env "2.4.0" + graphql-extensions "0.7.2" + apollo-tracing@^0.1.0: version "0.1.4" resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.1.4.tgz#5b8ae1b01526b160ee6e552a7f131923a9aedcc7" @@ -3711,6 +3777,13 @@ graphql-extensions@0.7.1: dependencies: "@apollographql/apollo-tools" "^0.3.6" +graphql-extensions@0.7.2: + version "0.7.2" + resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.2.tgz#8711543f835661eaf24b48d6ac2aad44dbbd5506" + integrity sha512-TuVINuAOrEtzQAkAlCZMi9aP5rcZ+pVaqoBI5fD2k5O9fmb8OuXUQOW028MUhC66tg4E7h4YSF1uYUIimbu4SQ== + dependencies: + "@apollographql/apollo-tools" "^0.3.6" + graphql-extensions@^0.0.x, graphql-extensions@~0.0.9: version "0.0.10" resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.0.10.tgz#34bdb2546d43f6a5bc89ab23c295ec0466c6843d" From a06733fbfd6140e0f8ce481b04866e7b01914207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 7 Jun 2019 13:00:42 +0200 Subject: [PATCH 05/18] Translate network tab on the left profile page --- webapp/locales/de.json | 11 ++++++++++- webapp/locales/en.json | 11 ++++++++++- webapp/pages/profile/_id/_slug.vue | 14 +++++++------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index a790e6461..6ad7d437e 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -25,7 +25,16 @@ "shouted": "Empfohlen", "commented": "Kommentiert", "userAnonym": "Anonymus", - "socialMedia": "Wo sonst finde ich" + "socialMedia": "Wo sonst finde ich", + "network": { + "title": "Netzwerk", + "following": "folgt:", + "followingNobody": "folgt niemandem.", + "followedBy": "wird gefolgt von:", + "followedByNobody": "wird von niemandem gefolgt.", + "and": "und", + "more": "weitere" + } }, "notifications": { "menu": { diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 289928f92..72b2d0a39 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -25,7 +25,16 @@ "shouted": "Shouted", "commented": "Commented", "userAnonym": "Anonymous", - "socialMedia": "Where else can I find" + "socialMedia": "Where else can I find", + "network": { + "title": "Network", + "following": "is following:", + "followingNobody": "follows nobody.", + "followedBy": "is followed by:", + "followedByNobody": "is followed by nobody.", + "and": "and", + "more": "more" + } }, "notifications": { "menu": { diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index 9a7af82ac..27f4994d0 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -69,11 +69,11 @@ - Netzwerk + {{ $t('profile.network.title') }} - Wem folgt {{ userName | truncate(15) }}? + {{ userName | truncate(15) }} {{ $t('profile.network.following')}} - Wer folgt {{ userName | truncate(15) }}? + {{ userName | truncate(15) }} {{ $t('profile.network.followedBy')}} From 7ab6ce4ed2c1dd854bdf905c3d27655a21b71df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 7 Jun 2019 13:10:04 +0200 Subject: [PATCH 06/18] Fix typo in translation keys --- webapp/locales/de.json | 2 +- webapp/pages/profile/_id/_slug.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 6ad7d437e..f2d1e7415 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -175,7 +175,7 @@ "your": { "post": "Dein Beitrag ::: Deine Beiträge", "comment": "Dein Kommentar ::: Deine Kommentare", - "shouted": "Deine Empfehlung ::: Deine Empfehlungen" + "shout": "Deine Empfehlung ::: Deine Empfehlungen" }, "post": "Beitrag ::: Beiträge", "comment": "Kommentar ::: Kommentare", diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index 27f4994d0..882e1bad0 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -177,7 +177,7 @@ Date: Fri, 7 Jun 2019 11:20:28 +0000 Subject: [PATCH 07/18] Bump apollo-server-testing from 2.6.1 to 2.6.2 in /backend Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/apollographql/apollo-server/releases) - [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.1...apollo-server-testing@2.6.2) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 83 +++----------------------------------------- 2 files changed, 6 insertions(+), 79 deletions(-) diff --git a/backend/package.json b/backend/package.json index b87ce61e9..64ce45fd6 100644 --- a/backend/package.json +++ b/backend/package.json @@ -88,7 +88,7 @@ "@babel/plugin-proposal-throw-expressions": "^7.2.0", "@babel/preset-env": "~7.4.5", "@babel/register": "~7.4.4", - "apollo-server-testing": "~2.6.1", + "apollo-server-testing": "~2.6.2", "babel-core": "~7.0.0-0", "babel-eslint": "~10.0.1", "babel-jest": "~24.8.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 7c4115391..5cc580f87 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1281,14 +1281,6 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -apollo-cache-control@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.7.1.tgz#3d4fba232f561f096f61051e103bf58ee4bf8b54" - integrity sha512-3h1TEoMnzex6IIiFb5Ja3owTyLwT5YzK69cRgrSpSscdpYc3ID4KVs0Ht9cbOUmb/L/UKtYVkRC8KeVAYmHEjQ== - dependencies: - apollo-server-env "2.4.0" - graphql-extensions "0.7.1" - apollo-cache-control@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.7.2.tgz#b8852422d973c582493e85c776abc9c660090162" @@ -1345,13 +1337,6 @@ apollo-datasource@0.5.0: apollo-server-caching "0.4.0" apollo-server-env "2.4.0" -apollo-engine-reporting-protobuf@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.3.0.tgz#2c764c054ff9968387cf16115546e0d5b04ee9f1" - integrity sha512-PYowpx/E+TJT/8nKpp3JmJuKh3x1SZcxDF6Cquj0soV205TUpFFCZQMi91i5ACiEp2AkYvM/GDBIrw+rfIwzTg== - dependencies: - protobufjs "^6.8.6" - apollo-engine-reporting-protobuf@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.3.1.tgz#a581257fa8e3bb115ce38bf1b22e052d1475ad69" @@ -1359,18 +1344,6 @@ apollo-engine-reporting-protobuf@0.3.1: dependencies: protobufjs "^6.8.6" -apollo-engine-reporting@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.2.1.tgz#0b77fad2e9221d62f4a29b8b4fab8f7f47dcc1d6" - integrity sha512-DVXZhz/nSZR4lphakjb1guAD0qJ7Wm1PVtZEBjN097cnOor4XSOzQlPfTaYtVuhlxUKUuCx1syiBbOuV8sKqXg== - dependencies: - apollo-engine-reporting-protobuf "0.3.0" - apollo-graphql "^0.3.0" - apollo-server-core "2.6.1" - apollo-server-env "2.4.0" - async-retry "^1.2.1" - graphql-extensions "0.7.1" - apollo-engine-reporting@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.0.tgz#50151811a0f5e70f4a73e7092a61fec422d8e722" @@ -1451,32 +1424,6 @@ apollo-server-caching@0.4.0: dependencies: lru-cache "^5.0.0" -apollo-server-core@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.1.tgz#d0d878b0a4959b6c661fc43300ce45b29996176a" - integrity sha512-jO2BtcP7ozSSK5qtw1gGDwO66WSNtzhvpDJD7erkA9byv8Z0jB2QIPNWN6iaj311LaPahM05k+8hMIhFy9oHWg== - dependencies: - "@apollographql/apollo-tools" "^0.3.6" - "@apollographql/graphql-playground-html" "1.6.20" - "@types/ws" "^6.0.0" - apollo-cache-control "0.7.1" - apollo-datasource "0.5.0" - apollo-engine-reporting "1.2.1" - apollo-server-caching "0.4.0" - apollo-server-env "2.4.0" - apollo-server-errors "2.3.0" - apollo-server-plugin-base "0.5.1" - apollo-tracing "0.7.1" - fast-json-stable-stringify "^2.0.0" - graphql-extensions "0.7.1" - graphql-subscriptions "^1.0.0" - graphql-tag "^2.9.2" - graphql-tools "^4.0.0" - graphql-upload "^8.0.2" - sha.js "^2.4.11" - subscriptions-transport-ws "^0.9.11" - ws "^6.0.0" - apollo-server-core@2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.2.tgz#a792b50d4df9e26ec03759a31fbcbce38361b218" @@ -1564,22 +1511,17 @@ apollo-server-module-graphiql@^1.3.4, apollo-server-module-graphiql@^1.4.0: resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.4.0.tgz#c559efa285578820709f1769bb85d3b3eed3d8ec" integrity sha512-GmkOcb5he2x5gat+TuiTvabnBf1m4jzdecal3XbXBh/Jg+kx4hcvO3TTDFQ9CuTprtzdcVyA11iqG7iOMOt7vA== -apollo-server-plugin-base@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.1.tgz#b81056666763879bdc98d8d58f3c4c43cbb30da6" - integrity sha512-UejnBk6XDqYQ+Ydkbm+gvlOzP+doQA8glVUULs8rCi0/MshsFSsBVl6rtzruELDBVgZhJgGsd4pUexcvNc3aZA== - apollo-server-plugin-base@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.2.tgz#f97ba983f1e825fec49cba8ff6a23d00e1901819" integrity sha512-j81CpadRLhxikBYHMh91X4aTxfzFnmmebEiIR9rruS6dywWCxV2aLW87l9ocD1MiueNam0ysdwZkX4F3D4csNw== -apollo-server-testing@~2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.6.1.tgz#447f34980819fa52b120f26c632fab4efc55435b" - integrity sha512-Qq0u79uKw3g14bq0nGxtUUiueFOv2ETkAax2mum+3f9Lm85VXELkY6c9bCWDVGjkUtt9Aog5qwSzWELb1KiUug== +apollo-server-testing@~2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.6.2.tgz#e0ecddd565fce1c38a346f9fbe6118f543ccf6a6" + integrity sha512-I9QLFk4I/z9oOIXfnLc8RPBYAKih6Olrg3RDeRvWhDjLQ8gfALXVhCO+7WuvM35wNZcZVn7aXBeZ8Y3mlgkj8w== dependencies: - apollo-server-core "2.6.1" + apollo-server-core "2.6.2" apollo-server@~2.6.2: version "2.6.2" @@ -1592,14 +1534,6 @@ apollo-server@~2.6.2: graphql-subscriptions "^1.0.0" graphql-tools "^4.0.0" -apollo-tracing@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.7.1.tgz#6a7356b619f3aa0ca22c623b5d8bb1af5ca1c74c" - integrity sha512-1BYQua+jCWFkZZJP0/rSpzY4XbLLbCrRHCYu8sJn0RCH/hs34BMdFXscS9uSglgIpXwUAIafgsU0hAVCrJjbTw== - dependencies: - apollo-server-env "2.4.0" - graphql-extensions "0.7.1" - apollo-tracing@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.7.2.tgz#7730159a4670bca465ac1bfa01f9902610a7aba4" @@ -3770,13 +3704,6 @@ graphql-deduplicator@^2.0.1: resolved "https://registry.yarnpkg.com/graphql-deduplicator/-/graphql-deduplicator-2.0.2.tgz#d8608161cf6be97725e178df0c41f6a1f9f778f3" integrity sha512-0CGmTmQh4UvJfsaTPppJAcHwHln8Ayat7yXXxdnuWT+Mb1dBzkbErabCWzjXyKh/RefqlGTTA7EQOZHofMaKJA== -graphql-extensions@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.1.tgz#f55b01ac8ddf09a215e21f34caeee3ae66a88f21" - integrity sha512-4NkAz/f0j5a1DSPl3V77OcesBmwhHz56Soj0yTImlcDdRv9knyO2e+ehi1TIeKBOyIKS7d3A7zqOW/4ieGxlVA== - dependencies: - "@apollographql/apollo-tools" "^0.3.6" - graphql-extensions@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.2.tgz#8711543f835661eaf24b48d6ac2aad44dbbd5506" From 7d50c8f9fd657f958b5c8c8712a8337e1a936f1c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 11:20:30 +0000 Subject: [PATCH 08/18] Bump apollo-client from 2.6.1 to 2.6.2 in /backend Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/apollographql/apollo-client/releases) - [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.1...apollo-client@2.6.2) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 44 +++++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/backend/package.json b/backend/package.json index b87ce61e9..a0fa3673a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -44,7 +44,7 @@ "dependencies": { "activitystrea.ms": "~2.1.3", "apollo-cache-inmemory": "~1.6.1", - "apollo-client": "~2.6.1", + "apollo-client": "~2.6.2", "apollo-link-context": "~1.0.14", "apollo-link-http": "~1.5.14", "apollo-server": "~2.6.2", diff --git a/backend/yarn.lock b/backend/yarn.lock index 7c4115391..d34dac846 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1141,6 +1141,13 @@ dependencies: tslib "^1.9.3" +"@wry/equality@^0.1.2": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9" + integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew== + dependencies: + tslib "^1.9.3" + abab@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" @@ -1315,23 +1322,23 @@ apollo-cache-inmemory@~1.6.1: ts-invariant "^0.4.0" tslib "^1.9.3" -apollo-cache@1.3.1, apollo-cache@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.1.tgz#c015f93a9a7f32b3eeea0c471addd6e854da754c" - integrity sha512-BJ/Mehr3u6XCaHYSmgZ6DM71Fh30OkW6aEr828WjHvs+7i0RUuP51/PM7K6T0jPXtuw7UbArFFPZZsNgXnyyJA== +apollo-cache@1.3.2, apollo-cache@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a" + integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg== dependencies: - apollo-utilities "^1.3.1" + apollo-utilities "^1.3.2" tslib "^1.9.3" -apollo-client@~2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.1.tgz#fcf328618d6ad82b750a988bec113fe6edc8ba94" - integrity sha512-Tb6ZthPZUHlGqeoH1WC8Qg/tLnkk9H5+xj4e5nzOAC6dCOW3pVU9tYXscrWdmZ65UDUg1khvTNjrQgPhdf4aTQ== +apollo-client@~2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.2.tgz#03b6af651e09b6e413e486ddc87464c85bd6e514" + integrity sha512-oks1MaT5x7gHcPeC8vPC1UzzsKaEIC0tye+jg72eMDt5OKc7BobStTeS/o2Ib3e0ii40nKxGBnMdl/Xa/p56Yg== dependencies: "@types/zen-observable" "^0.8.0" - apollo-cache "1.3.1" + apollo-cache "1.3.2" apollo-link "^1.0.0" - apollo-utilities "1.3.1" + apollo-utilities "1.3.2" symbol-observable "^1.0.2" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -1625,13 +1632,13 @@ apollo-upload-server@^7.0.0: http-errors "^1.7.0" object-path "^0.11.4" -apollo-utilities@1.3.1, apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.1.tgz#4c45f9b52783c324e2beef822700bdea374f82d1" - integrity sha512-P5cJ75rvhm9hcx9V/xCW0vlHhRd0S2icEcYPoRYNTc5djbynpuO+mQuJ4zMHgjNDpvvDxDfZxXTJ6ZUuJZodiQ== +apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.1, apollo-utilities@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9" + integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg== dependencies: + "@wry/equality" "^0.1.2" fast-json-stable-stringify "^2.0.0" - lodash.isequal "^4.5.0" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -5303,11 +5310,6 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= -lodash.isequal@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= - lodash.isinteger@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" From 94ea9c95300a3cb749c215bb4234eb18d427c98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 7 Jun 2019 13:48:59 +0200 Subject: [PATCH 09/18] Fix lint --- webapp/pages/profile/_id/_slug.vue | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index 882e1bad0..eedcd199b 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -73,7 +73,9 @@ - {{ userName | truncate(15) }} {{ $t('profile.network.following')}} + + {{ userName | truncate(15) }} {{ $t('profile.network.following') }} + - {{ userName | truncate(15) }} {{ $t('profile.network.followedBy')}} + + {{ userName | truncate(15) }} {{ $t('profile.network.followedBy') }} + From 9bccf2b84905c05762e18c9dd42c1e48e64d7bc9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 12:39:39 +0000 Subject: [PATCH 10/18] Bump apollo-client from 2.6.1 to 2.6.2 in /webapp Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/apollographql/apollo-client/releases) - [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.1...apollo-client@2.6.2) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 44 +++++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 6617f7e8a..4526c1130 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -56,7 +56,7 @@ "@nuxtjs/style-resources": "~0.1.2", "accounting": "~0.4.1", "apollo-cache-inmemory": "~1.5.1", - "apollo-client": "~2.6.1", + "apollo-client": "~2.6.2", "cookie-universal-nuxt": "~2.0.14", "cross-env": "~5.2.0", "date-fns": "2.0.0-alpha.31", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index a083f0d7e..52ef2cb87 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1684,6 +1684,13 @@ "@webassemblyjs/wast-parser" "1.8.5" "@xtuc/long" "4.2.2" +"@wry/equality@^0.1.2": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9" + integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew== + dependencies: + tslib "^1.9.3" + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -1878,23 +1885,23 @@ apollo-cache-inmemory@^1.5.1, apollo-cache-inmemory@~1.5.1: ts-invariant "^0.2.1" tslib "^1.9.3" -apollo-cache@1.3.1, apollo-cache@^1.2.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.1.tgz#c015f93a9a7f32b3eeea0c471addd6e854da754c" - integrity sha512-BJ/Mehr3u6XCaHYSmgZ6DM71Fh30OkW6aEr828WjHvs+7i0RUuP51/PM7K6T0jPXtuw7UbArFFPZZsNgXnyyJA== +apollo-cache@1.3.2, apollo-cache@^1.2.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a" + integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg== dependencies: - apollo-utilities "^1.3.1" + apollo-utilities "^1.3.2" tslib "^1.9.3" -apollo-client@^2.5.1, apollo-client@~2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.1.tgz#fcf328618d6ad82b750a988bec113fe6edc8ba94" - integrity sha512-Tb6ZthPZUHlGqeoH1WC8Qg/tLnkk9H5+xj4e5nzOAC6dCOW3pVU9tYXscrWdmZ65UDUg1khvTNjrQgPhdf4aTQ== +apollo-client@^2.5.1, apollo-client@~2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.2.tgz#03b6af651e09b6e413e486ddc87464c85bd6e514" + integrity sha512-oks1MaT5x7gHcPeC8vPC1UzzsKaEIC0tye+jg72eMDt5OKc7BobStTeS/o2Ib3e0ii40nKxGBnMdl/Xa/p56Yg== dependencies: "@types/zen-observable" "^0.8.0" - apollo-cache "1.3.1" + apollo-cache "1.3.2" apollo-link "^1.0.0" - apollo-utilities "1.3.1" + apollo-utilities "1.3.2" symbol-observable "^1.0.2" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -2081,13 +2088,13 @@ apollo-upload-client@^10.0.0: apollo-link-http-common "^0.2.13" extract-files "^5.0.1" -apollo-utilities@1.3.1, apollo-utilities@^1.0.1, apollo-utilities@^1.0.8, apollo-utilities@^1.2.1, apollo-utilities@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.1.tgz#4c45f9b52783c324e2beef822700bdea374f82d1" - integrity sha512-P5cJ75rvhm9hcx9V/xCW0vlHhRd0S2icEcYPoRYNTc5djbynpuO+mQuJ4zMHgjNDpvvDxDfZxXTJ6ZUuJZodiQ== +apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.0.8, apollo-utilities@^1.2.1, apollo-utilities@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9" + integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg== dependencies: + "@wry/equality" "^0.1.2" fast-json-stable-stringify "^2.0.0" - lodash.isequal "^4.5.0" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -6851,11 +6858,6 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= -lodash.isequal@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= - lodash.isinteger@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" From 314b257b45f82db642170bdfa060b83111703044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 7 Jun 2019 13:31:28 +0200 Subject: [PATCH 11/18] Replace dependency `ms` completely I have seen this PR here: https://github.com/Human-Connection/Human-Connection/pull/774 and I thought: Never saw that one before, where is it used and what is the purpose? I could find this line only and thought this is not a justification for having the package installed. --- backend/package.json | 1 - backend/src/jwt/encode.js | 3 +-- backend/yarn.lock | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/package.json b/backend/package.json index b87ce61e9..1950c5561 100644 --- a/backend/package.json +++ b/backend/package.json @@ -69,7 +69,6 @@ "linkifyjs": "~2.1.8", "lodash": "~4.17.11", "merge-graphql-schemas": "^1.5.8", - "ms": "~2.1.1", "neo4j-driver": "~1.7.4", "neo4j-graphql-js": "git+https://github.com/Human-Connection/neo4j-graphql-js.git#temporary_fixes", "node-fetch": "~2.6.0", diff --git a/backend/src/jwt/encode.js b/backend/src/jwt/encode.js index 97c6dcd66..1552804cc 100644 --- a/backend/src/jwt/encode.js +++ b/backend/src/jwt/encode.js @@ -1,11 +1,10 @@ import jwt from 'jsonwebtoken' -import ms from 'ms' import CONFIG from './../config' // Generate an Access Token for the given User ID export default function encode(user) { const token = jwt.sign(user, CONFIG.JWT_SECRET, { - expiresIn: ms('1d'), + expiresIn: 24 * 60 * 60 * 1000, // one day issuer: CONFIG.GRAPHQL_URI, audience: CONFIG.CLIENT_URI, subject: user.id.toString(), diff --git a/backend/yarn.lock b/backend/yarn.lock index 7c4115391..57f582469 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5593,7 +5593,7 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@2.1.1, ms@^2.1.1, ms@~2.1.1: +ms@2.1.1, ms@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== From f0a4149b9e9ca84621c0da2b86c5ff5ca4acb9b0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 22:07:23 +0000 Subject: [PATCH 12/18] Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.1 to 1.6.2. - [Release notes](https://github.com/apollographql/apollo-client/releases) - [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.1...apollo-cache-inmemory@1.6.2) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/package.json b/backend/package.json index d746d1ed6..92b15cc3a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -43,7 +43,7 @@ }, "dependencies": { "activitystrea.ms": "~2.1.3", - "apollo-cache-inmemory": "~1.6.1", + "apollo-cache-inmemory": "~1.6.2", "apollo-client": "~2.6.2", "apollo-link-context": "~1.0.14", "apollo-link-http": "~1.5.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index 28c2b8b55..47cd1be39 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1303,18 +1303,18 @@ apollo-cache-control@^0.1.0: dependencies: graphql-extensions "^0.0.x" -apollo-cache-inmemory@~1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.1.tgz#536b6f366461f6264250041f9146363e2faa1d4c" - integrity sha512-c/WJjh9MTWcdussCTjLKufpPjTx3qOFkBPHIDOOpQ+U0B7K1PczPl9N0LaC4ir3wAWL7s4A0t2EKtoR+6UP92g== +apollo-cache-inmemory@~1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e" + integrity sha512-AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ== dependencies: - apollo-cache "^1.3.1" - apollo-utilities "^1.3.1" + apollo-cache "^1.3.2" + apollo-utilities "^1.3.2" optimism "^0.9.0" ts-invariant "^0.4.0" tslib "^1.9.3" -apollo-cache@1.3.2, apollo-cache@^1.3.1: +apollo-cache@1.3.2, apollo-cache@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a" integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg== @@ -1566,7 +1566,7 @@ apollo-upload-server@^7.0.0: http-errors "^1.7.0" object-path "^0.11.4" -apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.1, apollo-utilities@^1.3.2: +apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9" integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg== From d32f577c8c0bbf06cdeca41998ecde2d5371bd29 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Fri, 7 Jun 2019 19:08:40 -0300 Subject: [PATCH 13/18] Update en.json --- webapp/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 72b2d0a39..093393045 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -31,7 +31,7 @@ "following": "is following:", "followingNobody": "follows nobody.", "followedBy": "is followed by:", - "followedByNobody": "is followed by nobody.", + "followedByNobody": "is not followed by anyone.", "and": "and", "more": "more" } From 8226c900fd044d19d13334ae3650a2fe224b7d70 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 10 Jun 2019 04:52:38 +0000 Subject: [PATCH 14/18] Bump tippy.js from 4.3.3 to 4.3.4 in /webapp Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.3 to 4.3.4. - [Release notes](https://github.com/atomiks/tippyjs/releases) - [Commits](https://github.com/atomiks/tippyjs/commits) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 4526c1130..f3b638d0f 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -106,7 +106,7 @@ "nodemon": "~1.19.1", "prettier": "~1.18.0", "sass-loader": "~7.1.0", - "tippy.js": "^4.3.3", + "tippy.js": "^4.3.4", "vue-jest": "~3.0.4", "vue-svg-loader": "~0.12.0" } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 52ef2cb87..7c66a679c 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -10558,10 +10558,10 @@ timsort@^0.3.0: resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= -tippy.js@^4.3.3: - version "4.3.3" - resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.3.tgz#396304bea577bbff03f2700a1761329e8c1fce86" - integrity sha512-2fPMlquzVQxpLoOd0eJA1sPZ86/R6zD/9985wV0d2zhhX52DiO3aeg7TTS/mBrUjgFwVZh19YLb4l2c8bJkQPw== +tippy.js@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.4.tgz#9a91fd5ce8c401f181b7adaa6b2c27f3d105f3ba" + integrity sha512-O2ukxHOJTLVYZ/TfHjNd8WgAWoefX9uk5QiWRdHfX2PR2lBpUU4BJQLl7U2Ykc8K7o16gTeHEElpuRfgD5b0aA== dependencies: popper.js "^1.14.7" From 3461de56f87f2eae71b6827e212c24a67af1b0b2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 10 Jun 2019 04:53:37 +0000 Subject: [PATCH 15/18] Bump cookie-universal-nuxt from 2.0.14 to 2.0.16 in /webapp Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.14 to 2.0.16. - [Release notes](https://github.com/microcipcip/cookie-universal/releases) - [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.14...v2.0.16) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 4526c1130..23f119f17 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -57,7 +57,7 @@ "accounting": "~0.4.1", "apollo-cache-inmemory": "~1.5.1", "apollo-client": "~2.6.2", - "cookie-universal-nuxt": "~2.0.14", + "cookie-universal-nuxt": "~2.0.16", "cross-env": "~5.2.0", "date-fns": "2.0.0-alpha.31", "express": "~4.17.1", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 52ef2cb87..748752bae 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -3305,18 +3305,18 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie-universal-nuxt@~2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.0.14.tgz#6fdf8e928eadd7611c04a57614fe2e29b60eb971" - integrity sha512-ih9Z0Z2K6eLaugTttGCVN85nogKseIFF/dqup3klvYC4mQS3+1IloqBqzTL/N7degBBAols2oppwYNDmaRtVig== +cookie-universal-nuxt@~2.0.16: + version "2.0.16" + resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.0.16.tgz#8d528098c973162b352199240e40da0e5429b13f" + integrity sha512-wRK2zw8w+a5xPehb5kLbgOic/4mbjl2exUCxWZwGuttcwsFgOymiwDrCOzmQslqrDevPDL2SsBbH6wtOm7dB9g== dependencies: "@types/cookie" "^0.3.1" - cookie-universal "^2.0.14" + cookie-universal "^2.0.16" -cookie-universal@^2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.0.14.tgz#1b4f27cffccfc2e47703fa235c1f67f931213041" - integrity sha512-m6J0DQa4/RQvXhzUG37EY1ynK3Uq1BKzp5hotST9olrzjrRx+B0vNPx7azg0/X0XrYQvL7MMbPXwou8m0BNDwg== +cookie-universal@^2.0.16: + version "2.0.16" + resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.0.16.tgz#ec8b55789b502a377ef02ad230923c1dfa5c1061" + integrity sha512-EHtQ5Tg3UoUHG7LmeV3rlV3iYthkhUuYZ0y86EseypxGcUuvzxuHExEb6mHKDhDPrIrdewAHdG/aCHuG/T4zEg== dependencies: "@types/cookie" "^0.3.1" cookie "^0.3.1" From 46ccaf6b951ef8a5ebb8e5fc4e65dfd786f33f4f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 10 Jun 2019 04:54:10 +0000 Subject: [PATCH 16/18] Bump tiptap-extensions from 1.21.0 to 1.22.1 in /webapp Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.21.0 to 1.22.1. - [Release notes](https://github.com/scrumpy/tiptap/releases) - [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.21.0...tiptap-extensions@1.22.1) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 4526c1130..7516af2da 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -70,7 +70,7 @@ "stack-utils": "^1.0.2", "string-hash": "^1.1.3", "tiptap": "1.20.1", - "tiptap-extensions": "1.21.0", + "tiptap-extensions": "1.22.1", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", "vue-izitoast": "1.1.2", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 52ef2cb87..438871d36 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -10579,10 +10579,10 @@ tiptap-commands@^1.10.5, tiptap-commands@^1.10.7: prosemirror-utils "^0.9.0" tiptap-utils "^1.5.5" -tiptap-extensions@1.21.0: - version "1.21.0" - resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.21.0.tgz#c2f228144b6943755d2de4617e11febe08c78a42" - integrity sha512-dIm9Q/G1qL1+sEqQiPXElUzSBcRhXXPuyOdtHgMrncUaCbnaDxsHdkJl700OXfA/GCu7AlhUpd3R67Rmb+voCQ== +tiptap-extensions@1.22.1: + version "1.22.1" + resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.22.1.tgz#733e5215eb0ef59a3e13e450445bd4f52dc5284d" + integrity sha512-yTQP7A/ycCL22FHlU3gHkXzeajaX37LsTl1B265y4yfGYKHyvUrN57MjoHLfwojT1nLa5m9959BNTH9Kof9+Xg== dependencies: lowlight "^1.12.1" prosemirror-collab "^1.1.2" @@ -10593,7 +10593,7 @@ tiptap-extensions@1.21.0: prosemirror-transform "^1.1.3" prosemirror-utils "^0.9.0" prosemirror-view "^1.9.8" - tiptap "^1.21.1" + tiptap "^1.22.1" tiptap-commands "^1.10.7" tiptap-utils@^1.5.3: @@ -10632,10 +10632,10 @@ tiptap@1.20.1: tiptap-commands "^1.10.5" tiptap-utils "^1.5.3" -tiptap@^1.21.1: - version "1.21.1" - resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.21.1.tgz#c0340375795088b899541b64ce86ae45e98d0369" - integrity sha512-vCKT/UGorAx1SSX5+9vmtZa+WC+LKfJIArgkEJFXmxfZeyBhNXRSwR+rR+UtdPYi8V4CtmIwtv6eRPP+bH6SWA== +tiptap@^1.22.1: + version "1.22.1" + resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.22.1.tgz#c5bf87216176a8c52e808b611d744c4258447efe" + integrity sha512-34kuR26SmU2DDV79mtd8B9VjllZTVNOVTHlnQGhM4Wk7Psn294GYMnNIT7D+HGoo/nNptxjcj1+VfWOPKUgWEw== dependencies: prosemirror-commands "^1.0.8" prosemirror-dropcursor "^1.1.1" From d85f63078f282998cf8472f6c44773ce2e6eb625 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 10 Jun 2019 04:55:09 +0000 Subject: [PATCH 17/18] Bump prettier from 1.18.0 to 1.18.2 in /webapp Bumps [prettier](https://github.com/prettier/prettier) from 1.18.0 to 1.18.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/1.18.0...1.18.2) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 4526c1130..db523b1bd 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -104,7 +104,7 @@ "jest": "~24.8.0", "node-sass": "~4.12.0", "nodemon": "~1.19.1", - "prettier": "~1.18.0", + "prettier": "~1.18.2", "sass-loader": "~7.1.0", "tippy.js": "^4.3.3", "vue-jest": "~3.0.4", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 52ef2cb87..a7f5cc276 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -8859,10 +8859,10 @@ prettier@1.16.3: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== -prettier@^1.15.2, prettier@~1.18.0: - version "1.18.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.0.tgz#d1701ca9b2941864b52f3262b35946d2c9cd88f0" - integrity sha512-YsdAD29M0+WY2xXZk3i0PA16olY9qZss+AuODxglXcJ+2ZBwFv+6k5tE8GS8/HKAthaajlS/WqhdgcjumOrPlg== +prettier@^1.15.2, prettier@~1.18.2: + version "1.18.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" + integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== pretty-bytes@^5.2.0: version "5.2.0" From db37d085f8de78bf4af01ecacf62c703a49236d3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 11 Jun 2019 04:51:32 +0000 Subject: [PATCH 18/18] Bump graphql-shield from 5.3.6 to 5.3.7 in /backend Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.6 to 5.3.7. - [Release notes](https://github.com/maticzav/graphql-shield/releases) - [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.6...v5.3.7) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/package.json b/backend/package.json index 40ea9476d..dfcd675ff 100644 --- a/backend/package.json +++ b/backend/package.json @@ -61,7 +61,7 @@ "graphql-custom-directives": "~0.2.14", "graphql-iso-date": "~3.6.1", "graphql-middleware": "~3.0.2", - "graphql-shield": "~5.3.6", + "graphql-shield": "~5.3.7", "graphql-tag": "~2.10.1", "graphql-yoga": "~1.17.4", "helmet": "~3.18.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 61803eb1f..306339bac 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1119,10 +1119,10 @@ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0" integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA== -"@types/yup@0.26.14": - version "0.26.14" - resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.14.tgz#d31f3b9a04039cca70ebb4db4d6c7fc3f694e80b" - integrity sha512-OcBtVLHvYULVSltpuBdhFiVOKoSsOS58D872HydO93oBf3OdGq5zb+LnqGo18TNNSV2aW8hjIdS6H+wp68zFtQ== +"@types/yup@0.26.15": + version "0.26.15" + resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.15.tgz#7ca57421bcd45bb0ce514a7a9eef82aa4b7b77b8" + integrity sha512-YFNqtrYC7/FUcD8OLiRaqGbMdwh/ctRRfWFm4k4dEYBliPP9vKJAttWvnhpEv+dSV/6K3MBkvIUHQUo+8dykcA== "@types/zen-observable@^0.5.3": version "0.5.4" @@ -3772,12 +3772,12 @@ graphql-request@~1.8.2: dependencies: cross-fetch "2.2.2" -graphql-shield@~5.3.6: - version "5.3.6" - resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.3.6.tgz#20061b02f77056c0870a623c530ef28a1bf4fff4" - integrity sha512-ihw/i4X+d1kpj1SVA6iBkVl2DZhPsI+xV08geR2TX3FWhpU7zakk/16yBzDRJTTCUgKsWfgyebrgIBsuhTwMnA== +graphql-shield@~5.3.7: + version "5.3.7" + resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.3.7.tgz#3f053b6e8481edc6eb29ea5e72d0a93584388ee0" + integrity sha512-h0yrIRAx+z1GE+ec3lykJI/AVIlBMFHnxn+0xwiyWXbplz90hBu+4Rur2GWgxkwNr+NgDu7YvRZCjleMzf5gaA== dependencies: - "@types/yup" "0.26.14" + "@types/yup" "0.26.15" lightercollective "^0.3.0" object-hash "^1.3.1" yup "^0.27.0"