From 8578cb5ab9a402eecda90a7ffa611a9ede1960a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 9 Aug 2019 13:41:26 +0200 Subject: [PATCH 01/13] I had enough of `--ignore-engines` The maintainers of https://github.com/arthurvasconcelos/vue-izitoast are not extremely responsive, so I decided to point our package to my own fork. This makes the flag `--ignore-engines` obsolete. --- webapp/Dockerfile | 2 +- webapp/package.json | 4 ++-- webapp/yarn.lock | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/webapp/Dockerfile b/webapp/Dockerfile index acd7a76ff..84c435c0a 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -18,7 +18,7 @@ COPY . . FROM base as build-and-test RUN cp .env.template .env -RUN yarn install --ignore-engines --production=false --frozen-lockfile --non-interactive +RUN yarn install --production=false --frozen-lockfile --non-interactive RUN yarn run build FROM base as production diff --git a/webapp/package.json b/webapp/package.json index 0e0ae1d26..f44702b90 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -76,7 +76,7 @@ "tiptap-extensions": "~1.26.1", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", - "vue-izitoast": "1.1.2", + "vue-izitoast": "roschaefer/vue-izitoast#patch-1", "vuex-i18n": "~1.13.1", "vue-sweetalert-icons": "~4.1.0", "zxcvbn": "^4.4.2" @@ -97,8 +97,8 @@ "babel-jest": "~24.8.0", "babel-loader": "~8.0.6", "babel-preset-vue": "~2.0.2", - "css-loader": "~2.1.1", "core-js": "~2.6.9", + "css-loader": "~2.1.1", "eslint": "~5.16.0", "eslint-config-prettier": "~6.0.0", "eslint-config-standard": "~12.0.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index c24852ea3..0ec5d608b 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -14945,10 +14945,9 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz#2756f46cb3258054c5f4723de8ae7e87302a1ccf" integrity sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g== -vue-izitoast@1.1.2: +vue-izitoast@roschaefer/vue-izitoast#patch-1: version "1.1.2" - resolved "https://registry.yarnpkg.com/vue-izitoast/-/vue-izitoast-1.1.2.tgz#0cf8290f045f8a389ccce4c238836c75a130eb03" - integrity sha512-/sNVrYhFg7Moyny5tFNt2e7TTmgPB1xyy04BChKQJkN5r9/D/6vYI7KQWEtG+v9VofnIVg5Em7HXtOL8IOeT7w== + resolved "https://codeload.github.com/roschaefer/vue-izitoast/tar.gz/c246fd78b1964c71b1889683379902d8d6284280" dependencies: izitoast "^1.3.0" From dcb7af1aef14bac50c2cad5f86155fcbda1b1a7b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2019 04:28:15 +0000 Subject: [PATCH 02/13] Bump cypress-cucumber-preprocessor from 1.13.0 to 1.13.1 Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.13.0 to 1.13.1. - [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases) - [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md) - [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.13.0...v1.13.1) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0941d3e64..790365b6e 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "codecov": "^3.5.0", "cross-env": "^5.2.0", "cypress": "^3.4.1", - "cypress-cucumber-preprocessor": "^1.13.0", + "cypress-cucumber-preprocessor": "^1.13.1", "cypress-file-upload": "^3.3.3", "cypress-plugin-retries": "^1.2.2", "dotenv": "^8.0.0", diff --git a/yarn.lock b/yarn.lock index f7bbe5974..fa538a245 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1847,10 +1847,10 @@ cucumber@^4.2.1: util-arity "^1.0.2" verror "^1.9.0" -cypress-cucumber-preprocessor@^1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.13.0.tgz#efacd70ce21c7d0adc60e25af166f5fb2e990fb8" - integrity sha512-Y3B4El3oYqKUvEhfn7k7NrX/hMJvOCJIO+sgMbvvPXsUngzLWUdiS2LOAaSxpV4t2BCyFuvfzGH0j+C3tu4UvA== +cypress-cucumber-preprocessor@^1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.13.1.tgz#d33350343a617c7579e1fed16e169d0a23b18d7a" + integrity sha512-gNmSVTmSVbUftvdTk0MnGGERwKTxtEQ1CwUOK4ujv5kANX29eV3XH9MYMe6gZQlVbLZN9kxz1EhopRF2bqmcwg== dependencies: "@cypress/browserify-preprocessor" "^1.1.2" chai "^4.1.2" From 0fa3333d8638368c2477e60d7b54cc473b9eb940 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2019 04:28:25 +0000 Subject: [PATCH 03/13] Bump apollo-client from 2.6.3 to 2.6.4 in /backend Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.3 to 2.6.4. - [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.3...apollo-client@2.6.4) 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 508040b6b..4313a940c 100644 --- a/backend/package.json +++ b/backend/package.json @@ -45,7 +45,7 @@ "@hapi/joi": "^15.1.0", "activitystrea.ms": "~2.1.3", "apollo-cache-inmemory": "~1.6.2", - "apollo-client": "~2.6.3", + "apollo-client": "~2.6.4", "apollo-link-context": "~1.0.18", "apollo-link-http": "~1.5.15", "apollo-server": "~2.8.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index d327c1bd0..4e1836ed6 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1512,10 +1512,10 @@ apollo-cache@1.3.2, apollo-cache@^1.3.2: apollo-utilities "^1.3.2" tslib "^1.9.3" -apollo-client@~2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.3.tgz#9bb2d42fb59f1572e51417f341c5f743798d22db" - integrity sha512-DS8pmF5CGiiJ658dG+mDn8pmCMMQIljKJSTeMNHnFuDLV0uAPZoeaAwVFiAmB408Ujqt92oIZ/8yJJAwSIhd4A== +apollo-client@~2.6.4: + version "2.6.4" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz#872c32927263a0d34655c5ef8a8949fbb20b6140" + integrity sha512-oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ== dependencies: "@types/zen-observable" "^0.8.0" apollo-cache "1.3.2" From 8741ed567d06fd711da7eac907f9f93541304136 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2019 04:33:06 +0000 Subject: [PATCH 04/13] Bump sass-loader from 7.1.0 to 7.2.0 in /webapp Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.1.0 to 7.2.0. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.1.0...v7.2.0) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 72 ++++++++++++--------------------------------- 2 files changed, 20 insertions(+), 54 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 711ed8221..5be475278 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -117,7 +117,7 @@ "node-sass": "~4.12.0", "nodemon": "~1.19.1", "prettier": "~1.18.2", - "sass-loader": "~7.1.0", + "sass-loader": "~7.2.0", "style-loader": "~0.23.1", "style-resources-loader": "~1.2.1", "tippy.js": "^4.3.5", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index e4ae26349..f6ebd7d10 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -4764,15 +4764,14 @@ cliui@^4.0.0: strip-ansi "^4.0.0" wrap-ansi "^2.0.0" -clone-deep@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713" - integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ== +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== dependencies: - for-own "^1.0.0" is-plain-object "^2.0.4" - kind-of "^6.0.0" - shallow-clone "^1.0.0" + kind-of "^6.0.2" + shallow-clone "^3.0.0" clone-response@1.0.2: version "1.0.2" @@ -6918,23 +6917,11 @@ follow-redirects@^1.0.0: dependencies: debug "^3.2.6" -for-in@^0.1.3: - version "0.1.8" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" - integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE= - -for-in@^1.0.1, for-in@^1.0.2: +for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= - dependencies: - for-in "^1.0.1" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -9574,11 +9561,6 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash.tail@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" - integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ= - lodash.template@^4.2.4, lodash.template@^4.4.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" @@ -10046,14 +10028,6 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mixin-object@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e" - integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4= - dependencies: - for-in "^0.1.3" - is-extendable "^0.1.1" - mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -10149,12 +10123,7 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.5.0, neo-async@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835" - integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA== - -neo-async@^2.6.1: +neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== @@ -13121,16 +13090,15 @@ sass-graph@^2.2.4: scss-tokenizer "^0.2.3" yargs "^7.0.0" -sass-loader@^7.1.0, sass-loader@~7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d" - integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w== +sass-loader@^7.1.0, sass-loader@~7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz#e34115239309d15b2527cb62b5dfefb62a96ff7f" + integrity sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA== dependencies: - clone-deep "^2.0.1" + clone-deep "^4.0.1" loader-utils "^1.0.1" - lodash.tail "^4.1.1" neo-async "^2.5.0" - pify "^3.0.0" + pify "^4.0.1" semver "^5.5.0" sass-resources-loader@^2.0.0: @@ -13313,14 +13281,12 @@ sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallow-clone@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571" - integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA== +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== dependencies: - is-extendable "^0.1.1" - kind-of "^5.0.0" - mixin-object "^2.0.1" + kind-of "^6.0.2" shallow-equal@^1.1.0: version "1.2.0" From b02321b80d9880311acd157a3eb46d0d7f065682 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2019 04:34:10 +0000 Subject: [PATCH 05/13] Bump apollo-client from 2.6.3 to 2.6.4 in /webapp Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.3 to 2.6.4. - [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.3...apollo-client@2.6.4) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 35 ++++++----------------------------- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 711ed8221..c0625b814 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -57,7 +57,7 @@ "@nuxtjs/style-resources": "~1.0.0", "accounting": "~0.4.1", "apollo-cache-inmemory": "~1.6.2", - "apollo-client": "~2.6.3", + "apollo-client": "~2.6.4", "cookie-universal-nuxt": "~2.0.17", "cross-env": "~5.2.0", "date-fns": "2.0.0-beta.4", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index e4ae26349..d33f23db5 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2796,10 +2796,10 @@ apollo-cache@1.3.2, apollo-cache@^1.3.2: apollo-utilities "^1.3.2" tslib "^1.9.3" -apollo-client@^2.6.3, apollo-client@~2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.3.tgz#9bb2d42fb59f1572e51417f341c5f743798d22db" - integrity sha512-DS8pmF5CGiiJ658dG+mDn8pmCMMQIljKJSTeMNHnFuDLV0uAPZoeaAwVFiAmB408Ujqt92oIZ/8yJJAwSIhd4A== +apollo-client@^2.6.3, apollo-client@~2.6.4: + version "2.6.4" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz#872c32927263a0d34655c5ef8a8949fbb20b6140" + integrity sha512-oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ== dependencies: "@types/zen-observable" "^0.8.0" apollo-cache "1.3.2" @@ -3014,17 +3014,7 @@ apollo-link-ws@^1.0.18: apollo-link "^1.2.12" tslib "^1.9.3" -apollo-link@^1.0.0, apollo-link@^1.2.1, apollo-link@^1.2.11, apollo-link@^1.2.3: - version "1.2.11" - resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d" - integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA== - dependencies: - apollo-utilities "^1.2.1" - ts-invariant "^0.3.2" - tslib "^1.9.3" - zen-observable-ts "^0.8.18" - -apollo-link@^1.2.12: +apollo-link@^1.0.0, apollo-link@^1.2.1, apollo-link@^1.2.11, apollo-link@^1.2.12, apollo-link@^1.2.3: version "1.2.12" resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.12.tgz#014b514fba95f1945c38ad4c216f31bcfee68429" integrity sha512-fsgIAXPKThyMVEMWQsUN22AoQI+J/pVXcjRGAShtk97h7D8O+SPskFinCGEkxPeQpE83uKaqafB2IyWdjN+J3Q== @@ -14459,16 +14449,11 @@ tsconfig@^7.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tslib@^1: +tslib@^1, tslib@^1.9.0, tslib@^1.9.3: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -tslib@^1.9.0, tslib@^1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== - tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -15607,14 +15592,6 @@ yn@^3.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.0.tgz#fcbe2db63610361afcc5eb9e0ac91e976d046114" integrity sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg== -zen-observable-ts@^0.8.18: - version "0.8.18" - resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz#ade44b1060cc4a800627856ec10b9c67f5f639c8" - integrity sha512-q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A== - dependencies: - tslib "^1.9.3" - zen-observable "^0.8.0" - zen-observable-ts@^0.8.19: version "0.8.19" resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.19.tgz#c094cd20e83ddb02a11144a6e2a89706946b5694" From db0cd54dbcde2ea2a871c86b4a85c37d035c7185 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2019 14:56:59 +0000 Subject: [PATCH 06/13] Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /webapp Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3. - [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.2...apollo-cache-inmemory@1.6.3) 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 c0625b814..5d0e74ad4 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -56,7 +56,7 @@ "@nuxtjs/dotenv": "~1.4.0", "@nuxtjs/style-resources": "~1.0.0", "accounting": "~0.4.1", - "apollo-cache-inmemory": "~1.6.2", + "apollo-cache-inmemory": "~1.6.3", "apollo-client": "~2.6.4", "cookie-universal-nuxt": "~2.0.17", "cross-env": "~5.2.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index d33f23db5..199e78004 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2777,14 +2777,14 @@ apollo-cache-control@0.8.1: apollo-server-env "2.4.1" graphql-extensions "0.8.1" -apollo-cache-inmemory@^1.6.2, 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== +apollo-cache-inmemory@^1.6.2, apollo-cache-inmemory@~1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz#826861d20baca4abc45f7ca7a874105905b8525d" + integrity sha512-S4B/zQNSuYc0M/1Wq8dJDTIO9yRgU0ZwDGnmlqxGGmFombOZb9mLjylewSfQKmjNpciZ7iUIBbJ0mHlPJTzdXg== dependencies: apollo-cache "^1.3.2" apollo-utilities "^1.3.2" - optimism "^0.9.0" + optimism "^0.10.0" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -10694,10 +10694,10 @@ opn@^3.0.3: dependencies: object-assign "^4.0.1" -optimism@^0.9.0: - version "0.9.6" - resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.6.tgz#5621195486b294c3bfc518d17ac47767234b029f" - integrity sha512-bWr/ZP32UgFCQAoSkz33XctHwpq2via2sBvGvO5JIlrU8gaiM0LvoKj3QMle9LWdSKlzKik8XGSerzsdfYLNxA== +optimism@^0.10.0: + version "0.10.2" + resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.2.tgz#626b6fd28b0923de98ecb36a3fd2d3d4e5632dd9" + integrity sha512-zPfBIxFFWMmQboM9+Z4MSJqc1PXp82v1PFq/GfQaufI69mHKlup7ykGNnfuGIGssXJQkmhSodQ/k9EWwjd8O8A== dependencies: "@wry/context" "^0.4.0" From e34c7f196f9210ff190914dfccc35976a53236d6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2019 14:58:45 +0000 Subject: [PATCH 07/13] Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /backend Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3. - [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.2...apollo-cache-inmemory@1.6.3) 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 4313a940c..aa23ada86 100644 --- a/backend/package.json +++ b/backend/package.json @@ -44,7 +44,7 @@ "dependencies": { "@hapi/joi": "^15.1.0", "activitystrea.ms": "~2.1.3", - "apollo-cache-inmemory": "~1.6.2", + "apollo-cache-inmemory": "~1.6.3", "apollo-client": "~2.6.4", "apollo-link-context": "~1.0.18", "apollo-link-http": "~1.5.15", diff --git a/backend/yarn.lock b/backend/yarn.lock index 4e1836ed6..263239145 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1493,14 +1493,14 @@ apollo-cache-control@0.8.1: apollo-server-env "2.4.1" graphql-extensions "0.8.1" -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== +apollo-cache-inmemory@~1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz#826861d20baca4abc45f7ca7a874105905b8525d" + integrity sha512-S4B/zQNSuYc0M/1Wq8dJDTIO9yRgU0ZwDGnmlqxGGmFombOZb9mLjylewSfQKmjNpciZ7iUIBbJ0mHlPJTzdXg== dependencies: apollo-cache "^1.3.2" apollo-utilities "^1.3.2" - optimism "^0.9.0" + optimism "^0.10.0" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -6478,10 +6478,10 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -optimism@^0.9.0: - version "0.9.5" - resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.5.tgz#b8b5dc9150e97b79ddbf2d2c6c0e44de4d255527" - integrity sha512-lNvmuBgONAGrUbj/xpH69FjMOz1d0jvMNoOCKyVynUPzq2jgVlGL4jFYJqrUHzUfBv+jAFSCP61x5UkfbduYJA== +optimism@^0.10.0: + version "0.10.2" + resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.2.tgz#626b6fd28b0923de98ecb36a3fd2d3d4e5632dd9" + integrity sha512-zPfBIxFFWMmQboM9+Z4MSJqc1PXp82v1PFq/GfQaufI69mHKlup7ykGNnfuGIGssXJQkmhSodQ/k9EWwjd8O8A== dependencies: "@wry/context" "^0.4.0" From b56cabb8a4e46d7e7ffca75ad4a489e39f476466 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2019 04:22:43 +0000 Subject: [PATCH 08/13] Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /backend Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.0 to 22.15.1. - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.15.0...v22.15.1) 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 aa23ada86..19904c22d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -118,7 +118,7 @@ "eslint-config-prettier": "~6.0.0", "eslint-config-standard": "~13.0.1", "eslint-plugin-import": "~2.18.2", - "eslint-plugin-jest": "~22.15.0", + "eslint-plugin-jest": "~22.15.1", "eslint-plugin-node": "~9.1.0", "eslint-plugin-prettier": "~3.1.0", "eslint-plugin-promise": "~4.2.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index 263239145..de67894e7 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -3292,10 +3292,10 @@ eslint-plugin-import@~2.18.2: read-pkg-up "^2.0.0" resolve "^1.11.0" -eslint-plugin-jest@~22.15.0: - version "22.15.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.15.0.tgz#fe70bfff7eeb47ca0ab229588a867f82bb8592c5" - integrity sha512-hgnPbSqAIcLLS9ePb12hNHTRkXnkVaCfOwCt2pzQ8KpOKPWGA4HhLMaFN38NBa/0uvLfrZpcIRjT+6tMAfr58Q== +eslint-plugin-jest@~22.15.1: + version "22.15.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.15.1.tgz#54c4a752a44c4bc5a564ecc22b32e1cd16a2961a" + integrity sha512-CWq/RR/3tLaKFB+FZcCJwU9hH5q/bKeO3rFP8G07+q7hcDCFNqpvdphVbEbGE6o6qo1UbciEev4ejUWv7brUhw== dependencies: "@typescript-eslint/experimental-utils" "^1.13.0" From 459099f1e129b656c712bb10518fdb58f694f15a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2019 04:22:57 +0000 Subject: [PATCH 09/13] Bump @storybook/addon-actions from 5.1.10 to 5.1.11 in /webapp Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.1.10 to 5.1.11. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v5.1.11/addons/actions) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 141 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 121 insertions(+), 22 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index bc1583401..d57697eef 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -86,7 +86,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/preset-env": "~7.5.5", "@storybook/addon-a11y": "^5.1.9", - "@storybook/addon-actions": "^5.1.9", + "@storybook/addon-actions": "^5.1.11", "@storybook/vue": "~5.1.9", "@vue/cli-shared-utils": "~3.10.0", "@vue/eslint-config-prettier": "~5.0.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index c984d8f3a..432ba4f0c 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1668,16 +1668,16 @@ redux "^4.0.1" util-deprecate "^1.0.2" -"@storybook/addon-actions@^5.1.9": - version "5.1.10" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.1.10.tgz#8ed4272a6afc68f4a30372da2eeff414f0fe6ecd" - integrity sha512-njl2AHBGi27NvisOB8LFnWH/3RcyJT/CW7tl1cvV2j5FH2oBjq5MsjxKyJIcKwC677k1Wr8G8fw/zSEHrPpmgA== +"@storybook/addon-actions@^5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.1.11.tgz#ebc299b9dfe476b5c65eb5d148c4b064f682ca08" + integrity sha512-Fp4b8cBYrl9zudvamVYTxE1XK2tzg91hgBDoVxIbDvSMZ2aQXSq8B5OFS4eSdvg+ldEOBbvIgUNS1NIw+FGntQ== dependencies: - "@storybook/addons" "5.1.10" - "@storybook/api" "5.1.10" - "@storybook/components" "5.1.10" - "@storybook/core-events" "5.1.10" - "@storybook/theming" "5.1.10" + "@storybook/addons" "5.1.11" + "@storybook/api" "5.1.11" + "@storybook/components" "5.1.11" + "@storybook/core-events" "5.1.11" + "@storybook/theming" "5.1.11" core-js "^3.0.1" fast-deep-equal "^2.0.1" global "^4.3.2" @@ -1700,6 +1700,18 @@ global "^4.3.2" util-deprecate "^1.0.2" +"@storybook/addons@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.1.11.tgz#27f9cfed8d7f7c8a3fc341cdba3b0bdf608f02aa" + integrity sha512-714Xg6pX4rjDY1urL94w4oOxIiK6jCFSp4oKvqLj7dli5CG7d34Yt9joyTgOb2pkbrgmbMWAZJq0L0iOjHzpzw== + dependencies: + "@storybook/api" "5.1.11" + "@storybook/channels" "5.1.11" + "@storybook/client-logger" "5.1.11" + core-js "^3.0.1" + global "^4.3.2" + util-deprecate "^1.0.2" + "@storybook/api@5.1.10": version "5.1.10" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.1.10.tgz#5eeb5d9a7c268e5c89bd40c9a80293a7c72343b8" @@ -1723,6 +1735,29 @@ telejson "^2.2.1" util-deprecate "^1.0.2" +"@storybook/api@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.1.11.tgz#71ef00285cd8602aad24cdb26c60c5d3c76631e5" + integrity sha512-zzPZM6W67D4YKCbUN4RhC/w+/CtnH/hFbSh/QUBdwXFB1aLh2qA1UTyB8i6m6OA6JgVHBqEkl10KhmeILLv/eA== + dependencies: + "@storybook/channels" "5.1.11" + "@storybook/client-logger" "5.1.11" + "@storybook/core-events" "5.1.11" + "@storybook/router" "5.1.11" + "@storybook/theming" "5.1.11" + core-js "^3.0.1" + fast-deep-equal "^2.0.1" + global "^4.3.2" + lodash "^4.17.11" + memoizerific "^1.11.3" + prop-types "^15.6.2" + react "^16.8.3" + semver "^6.0.0" + shallow-equal "^1.1.0" + store2 "^2.7.1" + telejson "^2.2.1" + util-deprecate "^1.0.2" + "@storybook/channel-postmessage@5.1.10": version "5.1.10" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.1.10.tgz#e0a58461d56ef20a87d8bc4df1067e7afc76950e" @@ -1741,6 +1776,13 @@ dependencies: core-js "^3.0.1" +"@storybook/channels@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.1.11.tgz#77ddf9d777891f975ac10095772c840fed4c4620" + integrity sha512-MlrjVGNvYOnDvv2JDRhr4wikbnZ8HCFCpVsFqKPFxj7I3OYBR417RvFkydX3Rtx4kwB9rmZEgLhfAfsSytkALg== + dependencies: + core-js "^3.0.1" + "@storybook/client-api@5.1.10": version "5.1.10" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.1.10.tgz#a10f028f2d33d044e5c3b3daea5d8375323e6a66" @@ -1766,6 +1808,13 @@ dependencies: core-js "^3.0.1" +"@storybook/client-logger@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.1.11.tgz#9509af3021b7a9977f9dba1f2ff038fd3c994437" + integrity sha512-je4To+9zD3SEJsKe9R4u15N4bdXFBR7pdBToaRIur+XSvvShLFehZGseQi+4uPAj8vyG34quGTCeUC/BKY0LwQ== + dependencies: + core-js "^3.0.1" + "@storybook/components@5.1.10": version "5.1.10" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.1.10.tgz#4b6436f0b5bb2483fb231bee263d173a9ed7d241" @@ -1790,6 +1839,30 @@ recompose "^0.30.0" simplebar-react "^1.0.0-alpha.6" +"@storybook/components@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.1.11.tgz#da253af0a8cb1b063c5c2e8016c4540c983f717d" + integrity sha512-EQgD7HL2CWnnY968KrwUSU2dtKFGTGRJVc4vwphYEeZwAI0lX6qbTMuwEP22hDZ2OSRBxcvcXT8cvduDlZlFng== + dependencies: + "@storybook/client-logger" "5.1.11" + "@storybook/theming" "5.1.11" + core-js "^3.0.1" + global "^4.3.2" + markdown-to-jsx "^6.9.1" + memoizerific "^1.11.3" + polished "^3.3.1" + popper.js "^1.14.7" + prop-types "^15.7.2" + react "^16.8.3" + react-dom "^16.8.3" + react-focus-lock "^1.18.3" + react-helmet-async "^1.0.2" + react-popper-tooltip "^2.8.3" + react-syntax-highlighter "^8.0.1" + react-textarea-autosize "^7.1.0" + recompose "^0.30.0" + simplebar-react "^1.0.0-alpha.6" + "@storybook/core-events@5.1.10": version "5.1.10" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.1.10.tgz#5aed88c572036b6bd6dfff28976ee96e6e175d7a" @@ -1797,6 +1870,13 @@ dependencies: core-js "^3.0.1" +"@storybook/core-events@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.1.11.tgz#9d00503a936d30398f7a64336eb956303d053765" + integrity sha512-m+yIFRdB47+IPBFBGS2OUXrSLkoz5iAXvb3c0lGAePf5wSR+o/Ni/9VD5l6xBf+InxHLSc9gcDEJehrT0fJAaQ== + dependencies: + core-js "^3.0.1" + "@storybook/core@5.1.10": version "5.1.10" resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.1.10.tgz#53d23d07716aa2721e1572d44a7f05967d7da39e" @@ -1891,6 +1971,17 @@ memoizerific "^1.11.3" qs "^6.6.0" +"@storybook/router@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.1.11.tgz#75089e9e623482e52ed894c3f0cb0fc6a5372da9" + integrity sha512-Xt7R1IOWLlIxis6VKV9G8F+e/G4G8ng1zXCqoDq+/RlWzlQJ5ccO4bUm2/XGS1rEgY4agMzmzjum18HoATpLGA== + dependencies: + "@reach/router" "^1.2.1" + core-js "^3.0.1" + global "^4.3.2" + memoizerific "^1.11.3" + qs "^6.6.0" + "@storybook/theming@5.1.10": version "5.1.10" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.1.10.tgz#f9bd519cdf9cccf730656e3f5fd56a339dd07c9f" @@ -1909,6 +2000,24 @@ prop-types "^15.7.2" resolve-from "^5.0.0" +"@storybook/theming@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.1.11.tgz#0d1af46535f2e601293c999a314905069a93ec3b" + integrity sha512-PtRPfiAWx5pQbTm45yyPB+CuW/vyDmcmNOt+xnDzK52omeWaSD7XK2RfadN3u4QXCgha7zs35Ppx1htJio2NRA== + dependencies: + "@emotion/core" "^10.0.9" + "@emotion/styled" "^10.0.7" + "@storybook/client-logger" "5.1.11" + common-tags "^1.8.0" + core-js "^3.0.1" + deep-object-diff "^1.1.0" + emotion-theming "^10.0.9" + global "^4.3.2" + memoizerific "^1.11.3" + polished "^3.3.1" + prop-types "^15.7.2" + resolve-from "^5.0.0" + "@storybook/ui@5.1.10": version "5.1.10" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.1.10.tgz#4262b1b09efa43d125d694452ae879b89071edd1" @@ -5102,12 +5211,7 @@ core-js@^1.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= -core-js@^2.4.0, core-js@^2.6.5: - version "2.6.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895" - integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A== - -core-js@^2.5.0, core-js@~2.6.9: +core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5, core-js@~2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== @@ -9586,12 +9690,7 @@ lodash.uniqueid@^4.0.1: resolved "https://registry.yarnpkg.com/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26" integrity sha1-MmjyanyI5PSxdY1nknGBTjH6WyY= -lodash@4.x, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: - version "4.17.14" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" - integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw== - -lodash@^4.17.12: +lodash@4.x, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== From 5c6fe99ffa2aedc999479badfd5bd02f6a2e6af9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2019 08:10:53 +0000 Subject: [PATCH 10/13] Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /webapp Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.0 to 22.15.1. - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.15.0...v22.15.1) 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 bc1583401..e2d2fe143 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -104,7 +104,7 @@ "eslint-config-standard": "~12.0.0", "eslint-loader": "~2.2.1", "eslint-plugin-import": "~2.18.2", - "eslint-plugin-jest": "~22.15.0", + "eslint-plugin-jest": "~22.15.1", "eslint-plugin-node": "~9.1.0", "eslint-plugin-prettier": "~3.1.0", "eslint-plugin-promise": "~4.2.1", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index c984d8f3a..96d5a058e 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -6208,10 +6208,10 @@ eslint-plugin-import@~2.18.2: read-pkg-up "^2.0.0" resolve "^1.11.0" -eslint-plugin-jest@~22.15.0: - version "22.15.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.15.0.tgz#fe70bfff7eeb47ca0ab229588a867f82bb8592c5" - integrity sha512-hgnPbSqAIcLLS9ePb12hNHTRkXnkVaCfOwCt2pzQ8KpOKPWGA4HhLMaFN38NBa/0uvLfrZpcIRjT+6tMAfr58Q== +eslint-plugin-jest@~22.15.1: + version "22.15.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.15.1.tgz#54c4a752a44c4bc5a564ecc22b32e1cd16a2961a" + integrity sha512-CWq/RR/3tLaKFB+FZcCJwU9hH5q/bKeO3rFP8G07+q7hcDCFNqpvdphVbEbGE6o6qo1UbciEev4ejUWv7brUhw== dependencies: "@typescript-eslint/experimental-utils" "^1.13.0" From 1fa1e278f2fd19599dc2f982e78f56048213cd55 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2019 08:11:45 +0000 Subject: [PATCH 11/13] Bump @storybook/addon-a11y from 5.1.10 to 5.1.11 in /webapp Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.1.10 to 5.1.11. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v5.1.11/addons/a11y) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index d57697eef..fc7c97887 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -85,7 +85,7 @@ "@babel/core": "~7.5.5", "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/preset-env": "~7.5.5", - "@storybook/addon-a11y": "^5.1.9", + "@storybook/addon-a11y": "^5.1.11", "@storybook/addon-actions": "^5.1.11", "@storybook/vue": "~5.1.9", "@vue/cli-shared-utils": "~3.10.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 432ba4f0c..f5723d4cb 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1645,17 +1645,17 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== -"@storybook/addon-a11y@^5.1.9": - version "5.1.10" - resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.1.10.tgz#0bf37a8e2827cdaa199b293b14e71e8434246591" - integrity sha512-YiRj/8IQ5zq/I+x+aRyfS5PP9nTfuTU7O90+WtNomqCJPMBOrR3BYsEcl510jOy2iwhQwh76MFT5s1tKpMclAA== +"@storybook/addon-a11y@^5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.1.11.tgz#170e0f406b6c0a07fd1e28e6323a694df3f087fc" + integrity sha512-kMBDPl0DslamNCtOGGqGlTjRDTxmEcu8JMTaZSa4GnTwzfN+ugb+aUEkbKl3VjMW7GsdpgizMTWBtgf6SwNj8w== dependencies: - "@storybook/addons" "5.1.10" - "@storybook/api" "5.1.10" - "@storybook/client-logger" "5.1.10" - "@storybook/components" "5.1.10" - "@storybook/core-events" "5.1.10" - "@storybook/theming" "5.1.10" + "@storybook/addons" "5.1.11" + "@storybook/api" "5.1.11" + "@storybook/client-logger" "5.1.11" + "@storybook/components" "5.1.11" + "@storybook/core-events" "5.1.11" + "@storybook/theming" "5.1.11" axe-core "^3.2.2" common-tags "^1.8.0" core-js "^3.0.1" From bae2c63c78f5260cfae1831e4a2eebe9233aaecd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2019 08:11:45 +0000 Subject: [PATCH 12/13] Bump @storybook/vue from 5.1.10 to 5.1.11 in /webapp Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.1.10 to 5.1.11. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v5.1.11/app/vue) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 97 +++++++++++++++++++++++---------------------- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index d57697eef..a926492c3 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -87,7 +87,7 @@ "@babel/preset-env": "~7.5.5", "@storybook/addon-a11y": "^5.1.9", "@storybook/addon-actions": "^5.1.11", - "@storybook/vue": "~5.1.9", + "@storybook/vue": "~5.1.11", "@vue/cli-shared-utils": "~3.10.0", "@vue/eslint-config-prettier": "~5.0.0", "@vue/server-test-utils": "~1.0.0-beta.29", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 432ba4f0c..217504f83 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1758,13 +1758,13 @@ telejson "^2.2.1" util-deprecate "^1.0.2" -"@storybook/channel-postmessage@5.1.10": - version "5.1.10" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.1.10.tgz#e0a58461d56ef20a87d8bc4df1067e7afc76950e" - integrity sha512-kQZIwltN2cWDXluhCfdModFDK1LHV9ZhNQ1b/uD9vn1c65rQ9u7r4lRajCfS0X1dmAWqz48cBcEurAubNgmswg== +"@storybook/channel-postmessage@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.1.11.tgz#e75ab7d59ba19476eb631cdb69ee713c3b956c2b" + integrity sha512-S7Uq7+c9kOJ9BB4H9Uro2+dVhqoMchYCipQzAkD4jIIwK99RNzGdAaRipDC1k0k/C+v2SOa+D5xBbb3XVYPSrg== dependencies: - "@storybook/channels" "5.1.10" - "@storybook/client-logger" "5.1.10" + "@storybook/channels" "5.1.11" + "@storybook/client-logger" "5.1.11" core-js "^3.0.1" global "^4.3.2" telejson "^2.2.1" @@ -1783,15 +1783,15 @@ dependencies: core-js "^3.0.1" -"@storybook/client-api@5.1.10": - version "5.1.10" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.1.10.tgz#a10f028f2d33d044e5c3b3daea5d8375323e6a66" - integrity sha512-v2PqiNUhwDlVDLYL94f6LFjdYMToTpuwWh9aeqzt/4PAJUnIcA+2P8+qXiYdJTqQy/u7P72HFMlc9Ru4tl3QFg== +"@storybook/client-api@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.1.11.tgz#30d82c09c6c40aa70d932e77b1d1e65526bddc0c" + integrity sha512-znzSxZ1ZCqtEKrFoW7xT8iBbdiAXaQ8RNxQFKHuYPqWX+RLol6S3duEOxu491X2SzUg0StUmrX5qL9Rnth8dRQ== dependencies: - "@storybook/addons" "5.1.10" - "@storybook/client-logger" "5.1.10" - "@storybook/core-events" "5.1.10" - "@storybook/router" "5.1.10" + "@storybook/addons" "5.1.11" + "@storybook/client-logger" "5.1.11" + "@storybook/core-events" "5.1.11" + "@storybook/router" "5.1.11" common-tags "^1.8.0" core-js "^3.0.1" eventemitter3 "^3.1.0" @@ -1877,25 +1877,25 @@ dependencies: core-js "^3.0.1" -"@storybook/core@5.1.10": - version "5.1.10" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.1.10.tgz#53d23d07716aa2721e1572d44a7f05967d7da39e" - integrity sha512-zkNjufOFrLpFpmr73F/gaJh0W0vWqXIo5zrKvQt1LqmMeCU/v8MstHi4XidlK43UpeogfaXl5tjNCQDO/bd0Dw== +"@storybook/core@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.1.11.tgz#d7c4b14b02f74c183ab5baffe9b3e5ec8289b320" + integrity sha512-LkSoAJlLEtrzFcoINX3dz4oT6xUPEHEp2/WAXLqUFeCnzJHAxIsRvbVxB49Kh/2TrgDFZpL9Or8XXMzZtE6KYw== dependencies: "@babel/plugin-proposal-class-properties" "^7.3.3" "@babel/plugin-proposal-object-rest-spread" "^7.3.2" "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/plugin-transform-react-constant-elements" "^7.2.0" "@babel/preset-env" "^7.4.5" - "@storybook/addons" "5.1.10" - "@storybook/channel-postmessage" "5.1.10" - "@storybook/client-api" "5.1.10" - "@storybook/client-logger" "5.1.10" - "@storybook/core-events" "5.1.10" - "@storybook/node-logger" "5.1.10" - "@storybook/router" "5.1.10" - "@storybook/theming" "5.1.10" - "@storybook/ui" "5.1.10" + "@storybook/addons" "5.1.11" + "@storybook/channel-postmessage" "5.1.11" + "@storybook/client-api" "5.1.11" + "@storybook/client-logger" "5.1.11" + "@storybook/core-events" "5.1.11" + "@storybook/node-logger" "5.1.11" + "@storybook/router" "5.1.11" + "@storybook/theming" "5.1.11" + "@storybook/ui" "5.1.11" airbnb-js-shims "^1 || ^2" autoprefixer "^9.4.9" babel-plugin-add-react-displayname "^0.0.5" @@ -1943,16 +1943,17 @@ shelljs "^0.8.3" style-loader "^0.23.1" terser-webpack-plugin "^1.2.4" + unfetch "^4.1.0" url-loader "^1.1.2" util-deprecate "^1.0.2" webpack "^4.33.0" webpack-dev-middleware "^3.7.0" webpack-hot-middleware "^2.25.0" -"@storybook/node-logger@5.1.10": - version "5.1.10" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.1.10.tgz#92c80b46177687cd8fda1f93a055c22711984154" - integrity sha512-Z4UKh7QBOboQhUF5S/dKOx3OWWCNZGwYu8HZa/O+P68+XnQDhuZCYwqWG49xFhZd0Jb0W9gdUL2mWJw5POG9PA== +"@storybook/node-logger@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.1.11.tgz#bbf5ad0d148e6c9a9b7cf6f62ad4df4e9fa19e5d" + integrity sha512-LG0KM4lzb9LEffcO3Ps9FcHHsVgQUc/oG+kz3p0u9fljFoL3cJHF1Mb4o+HrSydtdWZs/spwZ/BLEo5n/AByDw== dependencies: chalk "^2.4.2" core-js "^3.0.1" @@ -2018,19 +2019,19 @@ prop-types "^15.7.2" resolve-from "^5.0.0" -"@storybook/ui@5.1.10": - version "5.1.10" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.1.10.tgz#4262b1b09efa43d125d694452ae879b89071edd1" - integrity sha512-ezkoVtzoKh93z2wzkqVIqyrIzTkj8tizgAkoPa7mUAbLCxu6LErHITODQoyEiJWI4Epy3yU9GYXFWwT71hdwsA== +"@storybook/ui@5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.1.11.tgz#02246f7656f644a36908430de12abbdf4e2a8a72" + integrity sha512-mopuFSwtodvH4HRdaSBlgYxzYca1qyvzZ0BxOPocXhiFfFR+V9NyNJqKKRA3vinWuuZWpYcnPTu3h8skmjMirg== dependencies: - "@storybook/addons" "5.1.10" - "@storybook/api" "5.1.10" - "@storybook/channels" "5.1.10" - "@storybook/client-logger" "5.1.10" - "@storybook/components" "5.1.10" - "@storybook/core-events" "5.1.10" - "@storybook/router" "5.1.10" - "@storybook/theming" "5.1.10" + "@storybook/addons" "5.1.11" + "@storybook/api" "5.1.11" + "@storybook/channels" "5.1.11" + "@storybook/client-logger" "5.1.11" + "@storybook/components" "5.1.11" + "@storybook/core-events" "5.1.11" + "@storybook/router" "5.1.11" + "@storybook/theming" "5.1.11" copy-to-clipboard "^3.0.8" core-js "^3.0.1" core-js-pure "^3.0.1" @@ -2058,12 +2059,12 @@ telejson "^2.2.1" util-deprecate "^1.0.2" -"@storybook/vue@~5.1.9": - version "5.1.10" - resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.1.10.tgz#37916c93faf2eca21497b359748109727ccf3216" - integrity sha512-UeRbQ5bOWUTx5oBMfPf+ZtP5E5X74nFFhrkg0yNakohW6pLuTVoci/G8hDJ4wsjT7PgNjoE1/dggf4JKCU9tjA== +"@storybook/vue@~5.1.11": + version "5.1.11" + resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.1.11.tgz#440c260afa46247e80431470ee50e2725e06b579" + integrity sha512-hhCBfYyoBHehZf2P4BO9C1CuvY9m9GfiaWwqKl8WTGSdy8H6no5ZCRkG2SskS/h+mzJ1+WIGqnHkm0iIDz6KSg== dependencies: - "@storybook/core" "5.1.10" + "@storybook/core" "5.1.11" common-tags "^1.8.0" core-js "^3.0.1" global "^4.3.2" From 3eee50d952ff61da66b0669c70a55ceb5b048459 Mon Sep 17 00:00:00 2001 From: Matt Rider Date: Tue, 13 Aug 2019 11:24:55 +0200 Subject: [PATCH 13/13] Maintain consistent naming/punctuation conventions --- webapp/locales/de.json | 12 ++++++------ webapp/locales/en.json | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 5a2b77131..d009240d9 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -173,7 +173,7 @@ "commentsCount": "Meine {count} Kommentare löschen", "accountDescription": "Sei dir bewusst, dass deine Beiträge und Kommentare für unsere Community wichtig sind. Wenn du sie trotzdem löschen möchtest, musst du sie unten markieren.", "accountWarning": "Dein Konto, deine Beiträge oder Kommentare kannst du nach dem Löschen WEDER VERWALTEN NOCH WIEDERHERSTELLEN!", - "success": "Konto erfolgreich gelöscht", + "success": "Konto erfolgreich gelöscht!", "pleaseConfirm": "Zerstörerische Aktion! Gib {confirm} ein, um zu bestätigen." }, "organizations": { @@ -329,7 +329,7 @@ "disable": { "submit": "Deaktivieren", "cancel": "Abbrechen", - "success": "Erfolgreich deaktiviert", + "success": "Erfolgreich deaktiviert!", "user": { "title": "Nutzer sperren", "type": "Nutzer", @@ -543,12 +543,12 @@ "description": "Sollte Dir die Alphaversion unseres Netzwerks wider Erwarten, egal aus welchen Gründen, nicht gefallen, überweisen wir Dir Deine gespendeten Monatsbeiträge innerhalb der ersten 2 Monate gerne zurück. Einfach Mail an: info@human-connection.org Achtung: Viele Funktionen werden erst nach und nach eingebaut." }, "questions": { - "title": "Fragen", - "description": "Die Termine und Links zu den Zoom-Räumen findest Du hier: https://human-connection.org/veranstaltungen/ " + "title": "Fragen", + "description": "Die Termine und Links zu den Zoom-Räumen findest Du hier: https://human-connection.org/veranstaltungen/ " }, "human-connection": { - "title": "Von Menschen für Menschen:", - "description": "Bitte hilf uns weitere monatlichen Spender für Human Connection zu bekommen, damit das Netzwerk so schnell wie möglich offiziell an den Start gehen kann. https://human-connection.org " + "title": "Von Menschen für Menschen:", + "description": "Bitte hilf uns weitere monatlichen Spender für Human Connection zu bekommen, damit das Netzwerk so schnell wie möglich offiziell an den Start gehen kann. https://human-connection.org " }, "have-fun": "Jetzt aber viel Spaß mit der Alpha von Human Connection! Für den ersten Weltfrieden. ♥︎", "closing": "Herzlichst

Euer Human Connection Team" diff --git a/webapp/locales/en.json b/webapp/locales/en.json index fe0f1c99c..474a5a232 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -36,7 +36,7 @@ "newest": "Newest", "oldest": "Oldest", "popular": "Popular", - "commented": "most Commented" + "commented": "Most commented" }, "login": { "copy": "If you already have a human-connection account, login here.", @@ -168,12 +168,12 @@ "name": "Download Data" }, "deleteUserAccount": { - "name": "Delete Data", + "name": "Delete data", "contributionsCount": "Delete my {count} posts", "commentsCount": "Delete my {count} comments", "accountDescription": "Be aware that your Post and Comments are important to our community. If you still choose to delete them, you have to mark them below.", "accountWarning": "You CAN'T MANAGE and CAN'T RECOVER your Account, Posts, or Comments after deleting your account!", - "success": "Account successfully deleted", + "success": "Account successfully deleted!", "pleaseConfirm": "Destructive action! Type {confirm} to confirm" }, "organizations": { @@ -329,7 +329,7 @@ "disable": { "submit": "Disable", "cancel": "Cancel", - "success": "Disabled successfully", + "success": "Disabled successfully!", "user": { "title": "Disable User", "type": "User", @@ -417,7 +417,7 @@ }, "user": { "avatar": { - "submitted": "Upload successful" + "submitted": "Upload successful!" } }, "contribution": {