From c4adb5d5fe0b9af70f7f96554935af695b189d6f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 04:49:43 +0000 Subject: [PATCH 01/46] build(deps-dev): bump @babel/core from 7.6.2 to 7.6.4 in /backend Bumps [@babel/core](https://github.com/babel/babel) from 7.6.2 to 7.6.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.6.2...v7.6.4) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 48 ++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/backend/package.json b/backend/package.json index 3a0cf6be8..d185688dd 100644 --- a/backend/package.json +++ b/backend/package.json @@ -106,7 +106,7 @@ }, "devDependencies": { "@babel/cli": "~7.6.3", - "@babel/core": "~7.6.2", + "@babel/core": "~7.6.4", "@babel/node": "~7.6.3", "@babel/plugin-proposal-throw-expressions": "^7.2.0", "@babel/preset-env": "~7.6.3", diff --git a/backend/yarn.lock b/backend/yarn.lock index 5adc174ce..553e8cdca 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -38,18 +38,18 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.1.0", "@babel/core@~7.6.2": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz#069a776e8d5e9eefff76236bc8845566bd31dd91" - integrity sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ== +"@babel/core@^7.1.0", "@babel/core@~7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff" + integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.6.2" + "@babel/generator" "^7.6.4" "@babel/helpers" "^7.6.2" - "@babel/parser" "^7.6.2" + "@babel/parser" "^7.6.4" "@babel/template" "^7.6.0" - "@babel/traverse" "^7.6.2" - "@babel/types" "^7.6.0" + "@babel/traverse" "^7.6.3" + "@babel/types" "^7.6.3" convert-source-map "^1.1.0" debug "^4.1.0" json5 "^2.1.0" @@ -58,12 +58,12 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.4.0", "@babel/generator@^7.6.2": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz#dac8a3c2df118334c2a29ff3446da1636a8f8c03" - integrity sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ== +"@babel/generator@^7.4.0", "@babel/generator@^7.6.3", "@babel/generator@^7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671" + integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w== dependencies: - "@babel/types" "^7.6.0" + "@babel/types" "^7.6.3" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" @@ -254,10 +254,10 @@ regenerator-runtime "^0.13.3" v8flags "^3.1.1" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.2": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1" - integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg== +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81" + integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A== "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" @@ -696,17 +696,17 @@ "@babel/parser" "^7.6.0" "@babel/types" "^7.6.0" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz#b0e2bfd401d339ce0e6c05690206d1e11502ce2c" - integrity sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ== +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2", "@babel/traverse@^7.6.3": + version "7.6.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz#66d7dba146b086703c0fb10dd588b7364cec47f9" + integrity sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.6.2" + "@babel/generator" "^7.6.3" "@babel/helper-function-name" "^7.1.0" "@babel/helper-split-export-declaration" "^7.4.4" - "@babel/parser" "^7.6.2" - "@babel/types" "^7.6.0" + "@babel/parser" "^7.6.3" + "@babel/types" "^7.6.3" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.13" From b8112b021a9f2968d00775a006822c6d6f2e16c8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 04:50:18 +0000 Subject: [PATCH 02/46] build(deps): bump apollo-server-express from 2.9.5 to 2.9.6 in /backend Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6. - [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-express@2.9.5...apollo-server-express@2.9.6) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 118 +++++++++++++++++++++---------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/backend/package.json b/backend/package.json index 3a0cf6be8..c270082b7 100644 --- a/backend/package.json +++ b/backend/package.json @@ -48,7 +48,7 @@ "apollo-link-context": "~1.0.19", "apollo-link-http": "~1.5.16", "apollo-server": "~2.9.5", - "apollo-server-express": "^2.9.4", + "apollo-server-express": "^2.9.6", "babel-plugin-transform-runtime": "^6.23.0", "bcryptjs": "~2.4.3", "cheerio": "~1.0.0-rc.3", diff --git a/backend/yarn.lock b/backend/yarn.lock index 5adc174ce..43e062c75 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1523,13 +1523,13 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -apollo-cache-control@^0.8.4: - version "0.8.4" - resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.8.4.tgz#a3650d5e4173953e2a3af995bea62147f1ffe4d7" - integrity sha512-IZ1d3AXZtkZhLYo0kWqTbZ6nqLFaeUvLdMESs+9orMadBZ7mvzcAfBwrhKyCWPGeAAZ/jKv8FtYHybpchHgFAg== +apollo-cache-control@^0.8.5: + version "0.8.5" + resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.8.5.tgz#d4b34691f6ca1cefac9d82b99a94a0815a85a5a8" + integrity sha512-2yQ1vKgJQ54SGkoQS/ZLZrDX3La6cluAYYdruFYJMJtL4zQrSdeOCy11CQliCMYEd6eKNyE70Rpln51QswW2Og== dependencies: apollo-server-env "^2.4.3" - graphql-extensions "^0.10.3" + graphql-extensions "^0.10.4" apollo-cache-inmemory@~1.6.3: version "1.6.3" @@ -1572,27 +1572,27 @@ apollo-datasource@^0.6.3: apollo-server-caching "^0.5.0" apollo-server-env "^2.4.3" -apollo-engine-reporting-protobuf@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.0.tgz#e34c192d86493b33a73181fd6be75721559111ec" - integrity sha512-cXHZSienkis8v4RhqB3YG3DkaksqLpcxApRLTpRMs7IXNozgV7CUPYGFyFBEra1ZFgUyHXx4G9MpelV+n2cCfA== +apollo-engine-reporting-protobuf@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.1.tgz#c0a35bcf28487f87dcbc452b03277f575192f5d2" + integrity sha512-d7vFFZ2oUrvGaN0Hpet8joe2ZG0X0lIGilN+SwgVP38dJnOuadjsaYMyrD9JudGQJg0bJA5wVQfYzcCVy0slrw== dependencies: protobufjs "^6.8.6" -apollo-engine-reporting@^1.4.6: - version "1.4.6" - resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.6.tgz#83af6689c4ab82d1c62c3f5dde7651975508114f" - integrity sha512-acfb7oFnru/8YQdY4x6+7WJbZfzdVETI8Cl+9ImgUrvUnE8P+f2SsGTKXTC1RuUvve4c56PAvaPgE+z8X1a1Mw== +apollo-engine-reporting@^1.4.7: + version "1.4.7" + resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.7.tgz#6ca69ebdc1c17200969e2e4e07a0be64d748c27e" + integrity sha512-qsKDz9VkoctFhojM3Nj3nvRBO98t8TS2uTgtiIjUGs3Hln2poKMP6fIQ37Nm2Q2B3JJst76HQtpPwXmRJd1ZUg== dependencies: - apollo-engine-reporting-protobuf "^0.4.0" - apollo-graphql "^0.3.3" + apollo-engine-reporting-protobuf "^0.4.1" + apollo-graphql "^0.3.4" apollo-server-caching "^0.5.0" apollo-server-env "^2.4.3" - apollo-server-types "^0.2.4" + apollo-server-types "^0.2.5" async-retry "^1.2.1" - graphql-extensions "^0.10.3" + graphql-extensions "^0.10.4" -apollo-env@0.5.1: +apollo-env@0.5.1, apollo-env@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.5.1.tgz#b9b0195c16feadf0fe9fd5563edb0b9b7d9e97d3" integrity sha512-fndST2xojgSdH02k5hxk1cbqA9Ti8RX4YzzBoAB4oIe1Puhq7+YlhXGXfXB5Y4XN0al8dLg+5nAkyjNAR2qZTw== @@ -1609,12 +1609,12 @@ apollo-errors@^1.9.0: assert "^1.4.1" extendable-error "^0.1.5" -apollo-graphql@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.3.tgz#ce1df194f6e547ad3ce1e35b42f9c211766e1658" - integrity sha512-t3CO/xIDVsCG2qOvx2MEbuu4b/6LzQjcBBwiVnxclmmFyAxYCIe7rpPlnLHSq7HyOMlCWDMozjoeWfdqYSaLqQ== +apollo-graphql@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.4.tgz#c1f68591a4775945441d049eff9323542ab0401f" + integrity sha512-w+Az1qxePH4oQ8jvbhQBl5iEVvqcqynmU++x/M7MM5xqN1C7m1kyIzpN17gybXlTJXY4Oxej2WNURC2/hwpfYw== dependencies: - apollo-env "0.5.1" + apollo-env "^0.5.1" lodash.sortby "^4.7.0" apollo-link-context@~1.0.19: @@ -1660,26 +1660,26 @@ apollo-server-caching@^0.5.0: dependencies: lru-cache "^5.0.0" -apollo-server-core@^2.9.5: - version "2.9.5" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.5.tgz#b2d9188d7acce5fe92a5460d276794988ffa6737" - integrity sha512-SlM/vhjhWb0ayXV3d4gnpq9gh2BsQj+UPfQXfq2X2KG9EH5I1JUH6EtlsctgMCZozirOZmEmUzlqZWSSUOUPgQ== +apollo-server-core@^2.9.5, apollo-server-core@^2.9.6: + version "2.9.6" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.6.tgz#b6dc087200633f47ca4f08244d3e606b4d616320" + integrity sha512-2tHAWQxP7HrETI/BZvg2fem6YlahF9HUp4Y6SSL95WP3uNMOJBlN12yM1y+O2u5K5e4jwdPNaLjoL2A/26XrLw== dependencies: "@apollographql/apollo-tools" "^0.4.0" "@apollographql/graphql-playground-html" "1.6.24" "@types/graphql-upload" "^8.0.0" "@types/ws" "^6.0.0" - apollo-cache-control "^0.8.4" + apollo-cache-control "^0.8.5" apollo-datasource "^0.6.3" - apollo-engine-reporting "^1.4.6" + apollo-engine-reporting "^1.4.7" apollo-server-caching "^0.5.0" apollo-server-env "^2.4.3" apollo-server-errors "^2.3.3" - apollo-server-plugin-base "^0.6.4" - apollo-server-types "^0.2.4" - apollo-tracing "^0.8.4" + apollo-server-plugin-base "^0.6.5" + apollo-server-types "^0.2.5" + apollo-tracing "^0.8.5" fast-json-stable-stringify "^2.0.0" - graphql-extensions "^0.10.3" + graphql-extensions "^0.10.4" graphql-tag "^2.9.2" graphql-tools "^4.0.0" graphql-upload "^8.0.2" @@ -1700,10 +1700,10 @@ apollo-server-errors@^2.3.3: resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz#83763b00352c10dc68fbb0d41744ade66de549ff" integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g== -apollo-server-express@^2.9.4, apollo-server-express@^2.9.5: - version "2.9.5" - resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.5.tgz#383e0a5cb80cf1172b0bc1e565797edd629d750a" - integrity sha512-6gonP7g5u2Kr+9cvKE+NuGPe+As7wRbz2yWoyLOym/TdXBmTRU4AKW2Qs+wpNanurzm2xbTa7sEfzrHGmembrQ== +apollo-server-express@^2.9.5, apollo-server-express@^2.9.6: + version "2.9.6" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.6.tgz#eec2ec43b829b059278e14994d06bd23e43266f9" + integrity sha512-j80azBeXvLvyZsbqCnus7GH+w8vk+2IOnYzROZu/f0D2roDZtsu1XZkn+aplDJZXMcEXtqB6t4qNpyvV4zY0XQ== dependencies: "@apollographql/graphql-playground-html" "1.6.24" "@types/accepts" "^1.3.5" @@ -1711,8 +1711,8 @@ apollo-server-express@^2.9.4, apollo-server-express@^2.9.5: "@types/cors" "^2.8.4" "@types/express" "4.17.1" accepts "^1.3.5" - apollo-server-core "^2.9.5" - apollo-server-types "^0.2.4" + apollo-server-core "^2.9.6" + apollo-server-types "^0.2.5" body-parser "^1.18.3" cors "^2.8.4" express "^4.17.1" @@ -1722,12 +1722,12 @@ apollo-server-express@^2.9.4, apollo-server-express@^2.9.5: subscriptions-transport-ws "^0.9.16" type-is "^1.6.16" -apollo-server-plugin-base@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.4.tgz#63ea4fd0bbb6c4510bc8d0d2ad0a0684c8d0da8c" - integrity sha512-4rY+cBAIpQomGWYBtk8hHkLQWHrh5hgIBPQqmhXh00YFdcY+Ob1/cU2/2iqTcIzhtcaezsc8OZ63au6ahSBQqg== +apollo-server-plugin-base@^0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.5.tgz#eebe27734c51bf6a45b6a9ec8738750b132ffde7" + integrity sha512-z2ve7HEPWmZI3EzL0iiY9qyt1i0hitT+afN5PzssCw594LB6DfUQWsI14UW+W+gcw8hvl8VQUpXByfUntAx5vw== dependencies: - apollo-server-types "^0.2.4" + apollo-server-types "^0.2.5" apollo-server-testing@~2.9.5: version "2.9.5" @@ -1736,12 +1736,12 @@ apollo-server-testing@~2.9.5: dependencies: apollo-server-core "^2.9.5" -apollo-server-types@^0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.4.tgz#28864900ffc7f9711a859297c143a833fdb6aa43" - integrity sha512-G4FvBVgGQcTW6ZBS2+hvcDQkSfdOIKV+cHADduXA275v+5zl42g+bCaGd/hCCKTDRjmQvObLiMxH/BJ6pDMQgA== +apollo-server-types@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.5.tgz#2d63924706ffc1a59480cbbc93e9fe86655a57a5" + integrity sha512-6iJQsPh59FWu4K7ABrVmpnQVgeK8Ockx8BcawBh+saFYWTlVczwcLyGSZPeV1tPSKwFwKZutyEslrYSafcarXQ== dependencies: - apollo-engine-reporting-protobuf "^0.4.0" + apollo-engine-reporting-protobuf "^0.4.1" apollo-server-caching "^0.5.0" apollo-server-env "^2.4.3" @@ -1756,13 +1756,13 @@ apollo-server@~2.9.5: graphql-subscriptions "^1.0.0" graphql-tools "^4.0.0" -apollo-tracing@^0.8.4: - version "0.8.4" - resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.4.tgz#0117820c3f0ad3aa6daf7bf13ddbb923cbefa6de" - integrity sha512-DjbFW0IvHicSlTVG+vK+1WINfBMRCdPPHJSW/j65JMir9Oe56WGeqL8qz8hptdUUmLYEb+azvcyyGsJsiR3zpQ== +apollo-tracing@^0.8.5: + version "0.8.5" + resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.5.tgz#f07c4584d95bcf750e44bfe9845e073b03774941" + integrity sha512-lZn10/GRBZUlMxVYLghLMFsGcLN0jTYDd98qZfBtxw+wEWUx+PKkZdljDT+XNoOm/kDvEutFGmi5tSLhArIzWQ== dependencies: apollo-server-env "^2.4.3" - graphql-extensions "^0.10.3" + graphql-extensions "^0.10.4" apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.3.0, apollo-utilities@^1.3.2: version "1.3.2" @@ -3988,14 +3988,14 @@ graphql-custom-directives@~0.2.14: moment "^2.22.2" numeral "^2.0.6" -graphql-extensions@^0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.10.3.tgz#9e37f3bd26309c40b03a0be0e63e02b3f99d52ea" - integrity sha512-kwU0gUe+Qdfr8iZYT91qrPSwQNgPhB/ClF1m1LEPdxlptk5FhFmjpxAcbMZ8q7j0kjfnbp2IeV1OhRDCEPqz2w== +graphql-extensions@^0.10.4: + version "0.10.4" + resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.10.4.tgz#af851b0d44ea6838cf54de9df3cfc6a8e575e571" + integrity sha512-lE6MroluEYocbR/ICwccv39w+Pz4cBPadJ11z1rJkbZv5wstISEganbDOwl9qN21rcZGiWzh7QUNxUiFUXXEDw== dependencies: "@apollographql/apollo-tools" "^0.4.0" apollo-server-env "^2.4.3" - apollo-server-types "^0.2.4" + apollo-server-types "^0.2.5" graphql-import@0.7.1: version "0.7.1" From 004de24b9e5cce02ab4eca7139038e726c14d286 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 04:51:11 +0000 Subject: [PATCH 03/46] build(deps-dev): bump @vue/cli-shared-utils in /webapp Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/vuejs/vue-cli/releases) - [Changelog](https://github.com/vuejs/vue-cli/blob/v3.12.0/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-cli/commits/v3.12.0/packages/@vue/cli-shared-utils) 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 952913e4b..117a763ff 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -96,7 +96,7 @@ "@storybook/addon-a11y": "^5.2.3", "@storybook/addon-actions": "^5.2.3", "@storybook/vue": "~5.2.3", - "@vue/cli-shared-utils": "~3.11.0", + "@vue/cli-shared-utils": "~3.12.0", "@vue/eslint-config-prettier": "~5.0.0", "@vue/server-test-utils": "~1.0.0-beta.29", "@vue/test-utils": "~1.0.0-beta.29", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index b6dca2ca6..7e5029c4c 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2532,10 +2532,10 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.0.0" camelcase "^5.0.0" -"@vue/cli-shared-utils@~3.11.0": - version "3.11.0" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.11.0.tgz#a3d6f809b0dfb367e626b71405f85dea0631310b" - integrity sha512-D7pst/4v9H1DD66fLxlZOwRR09R03MV0ROdKxBHmh3FmnApCA/RiaolFA/8w+B3CnevYMlV3SJ5fOAgedbswbA== +"@vue/cli-shared-utils@~3.12.0": + version "3.12.0" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.12.0.tgz#48fcd786129cf02278b9c91f2c3491199f777248" + integrity sha512-8XEn4s0Cc+98eqdGSQJSrzSKIsf0FMDmfDvgXjT7I2qZWs9e0toOAm7RooypRSad2FhwxzY2bLPgCkNPDJN/jQ== dependencies: "@hapi/joi" "^15.0.1" chalk "^2.4.1" From faca2fdce0f68e1b63985271527bbe56ae2e16e9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 04:51:43 +0000 Subject: [PATCH 04/46] build(deps): bump @sentry/node from 5.6.2 to 5.7.0 in /backend Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.6.2 to 5.7.0. - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/5.6.2...5.7.0) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 104 +++++++++++++++++++++---------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/backend/package.json b/backend/package.json index 3a0cf6be8..7e30249b7 100644 --- a/backend/package.json +++ b/backend/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@hapi/joi": "^16.1.7", - "@sentry/node": "^5.6.2", + "@sentry/node": "^5.7.0", "apollo-cache-inmemory": "~1.6.3", "apollo-client": "~2.6.4", "apollo-link-context": "~1.0.19", diff --git a/backend/yarn.lock b/backend/yarn.lock index 5adc174ce..361795465 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1042,60 +1042,60 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= -"@sentry/core@5.6.2": - version "5.6.2" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.6.2.tgz#8c5477654a83ebe41a72e86a79215deb5025e418" - integrity sha512-grbjvNmyxP5WSPR6UobN2q+Nss7Hvz+BClBT8QTr7VTEG5q89TwNddn6Ej3bGkaUVbct/GpVlI3XflWYDsnU6Q== +"@sentry/core@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.0.tgz#c2aa5341e703ec7cf2acc69e51971a0b1f7d102a" + integrity sha512-gQel0d7LBSWJGHc7gfZllYAu+RRGD9GcYGmkRfemurmDyDGQDf/sfjiBi8f9QxUc2iFTHnvIR5nMTyf0U3yl3Q== dependencies: - "@sentry/hub" "5.6.1" - "@sentry/minimal" "5.6.1" - "@sentry/types" "5.6.1" - "@sentry/utils" "5.6.1" + "@sentry/hub" "5.7.0" + "@sentry/minimal" "5.7.0" + "@sentry/types" "5.7.0" + "@sentry/utils" "5.7.0" tslib "^1.9.3" -"@sentry/hub@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.6.1.tgz#9f355c0abcc92327fbd10b9b939608aa4967bece" - integrity sha512-m+OhkIV5yTAL3R1+XfCwzUQka0UF/xG4py8sEfPXyYIcoOJ2ZTX+1kQJLy8QQJ4RzOBwZA+DzRKP0cgzPJ3+oQ== +"@sentry/hub@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.0.tgz#f7c356202a9db1daae82ce7f48ebf1139e4e9d02" + integrity sha512-qNdYheJ6j4P9Sk0eqIINpJohImmu/+trCwFb4F8BGLQth5iGMVQD6D0YUrgjf4ZaQwfhw9tv4W6VEfF5tyASoA== dependencies: - "@sentry/types" "5.6.1" - "@sentry/utils" "5.6.1" + "@sentry/types" "5.7.0" + "@sentry/utils" "5.7.0" tslib "^1.9.3" -"@sentry/minimal@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.6.1.tgz#09d92b26de0b24555cd50c3c33ba4c3e566009a1" - integrity sha512-ercCKuBWHog6aS6SsJRuKhJwNdJ2oRQVWT2UAx1zqvsbHT9mSa8ZRjdPHYOtqY3DoXKk/pLUFW/fkmAnpdMqRw== +"@sentry/minimal@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.0.tgz#832d26bcd862c6ea628d48ad199ac7f966a2d907" + integrity sha512-0sizE2prS9nmfLyVUKmVzFFFqRNr9iorSCCejwnlRe3crqKqjf84tuRSzm6NkZjIyYj9djuuo9l9XN12NLQ/4A== dependencies: - "@sentry/hub" "5.6.1" - "@sentry/types" "5.6.1" + "@sentry/hub" "5.7.0" + "@sentry/types" "5.7.0" tslib "^1.9.3" -"@sentry/node@^5.6.2": - version "5.6.2" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.6.2.tgz#4b62f056031da65cad78220d48c546b8bfbfaed7" - integrity sha512-A9CELco6SjF4zt8iS1pO3KdUVI2WVhtTGhSH6X04OVf2en1fimPR+Vs8YVY/04udwd7o+3mI6byT+rS9+/Qzow== +"@sentry/node@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.7.0.tgz#153777f06b2fcd346edbff9adbb6b231c7e5fa0a" + integrity sha512-iqQbGAJDBlpQkp1rl9RkDCIfnukr4cOtHPgJPmLY19m/KXIHD2cdKhvbqoCvIPBTIAeSGQIvDT9jD5zT46eoqQ== dependencies: - "@sentry/core" "5.6.2" - "@sentry/hub" "5.6.1" - "@sentry/types" "5.6.1" - "@sentry/utils" "5.6.1" - cookie "0.3.1" - https-proxy-agent "2.2.1" - lru_map "0.3.3" + "@sentry/core" "5.7.0" + "@sentry/hub" "5.7.0" + "@sentry/types" "5.7.0" + "@sentry/utils" "5.7.0" + cookie "^0.3.1" + https-proxy-agent "^3.0.0" + lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/types@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.6.1.tgz#5915e1ee4b7a678da3ac260c356b1cb91139a299" - integrity sha512-Kub8TETefHpdhvtnDj3kKfhCj0u/xn3Zi2zIC7PB11NJHvvPXENx97tciz4roJGp7cLRCJsFqCg4tHXniqDSnQ== +"@sentry/types@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.0.tgz#e8677e57b40c2c63cad42c02add12b238e647c10" + integrity sha512-bFRVortg713dE2yJXNFgNe6sNBVVSkpoELLkGPatdVQi0dYc6OggIIX4UZZvkynFx72GwYqO1NOrtUcJY2gmMg== -"@sentry/utils@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.6.1.tgz#69d9e151e50415bc91f2428e3bcca8beb9bc2815" - integrity sha512-rfgha+UsHW816GqlSRPlniKqAZylOmQWML2JsujoUP03nPu80zdN43DK9Poy/d9OxBxv0gd5K2n+bFdM2kqLQQ== +"@sentry/utils@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.0.tgz#a6850aa4f5476fa26517cd5c6248f871d8d9939b" + integrity sha512-XmwQpLqea9mj8x1N7P/l4JvnEb0Rn5Py5OtBgl0ctk090W+GB1uM8rl9mkMf6698o1s1Z8T/tI/QY0yFA5uZXg== dependencies: - "@sentry/types" "5.6.1" + "@sentry/types" "5.7.0" tslib "^1.9.3" "@sindresorhus/is@^0.14.0": @@ -1444,7 +1444,7 @@ acorn@^7.0.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a" integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ== -agent-base@^4.1.0: +agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== @@ -2565,16 +2565,16 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= - cookie@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= + cookiejar@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" @@ -4332,12 +4332,12 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -https-proxy-agent@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0" - integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ== +https-proxy-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz#0106efa5d63d6d6f3ab87c999fa4877a3fd1ff97" + integrity sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ== dependencies: - agent-base "^4.1.0" + agent-base "^4.3.0" debug "^3.1.0" iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: @@ -5641,7 +5641,7 @@ lru-cache@^5.0.0: dependencies: yallist "^3.0.2" -lru_map@0.3.3: +lru_map@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0= From b87f2a52cfc1ae73463254682c70774c61ef2134 Mon Sep 17 00:00:00 2001 From: aonomike Date: Sat, 12 Oct 2019 15:04:43 +0300 Subject: [PATCH 05/46] Refactor rewards spec - Refactor unauthorised path --- backend/src/schema/resolvers/rewards.spec.js | 48 ++++++++++++++------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js index 3b94e93aa..ea6f737b0 100644 --- a/backend/src/schema/resolvers/rewards.spec.js +++ b/backend/src/schema/resolvers/rewards.spec.js @@ -1,10 +1,14 @@ -import { GraphQLClient } from 'graphql-request' +import { createTestClient } from 'apollo-server-testing' import Factory from '../../seed/factories' -import { host, login, gql } from '../../jest/helpers' +import { gql } from '../../jest/helpers' +import { neode as getNeode, getDriver } from '../../bootstrap/neo4j' +import createServer from '../../server' const factory = Factory() -let user -let badge +const driver = getDriver() +const instance = getNeode() + +let authenticatedUser, regularUser, badge, query, mutate, variables describe('rewards', () => { const variables = { @@ -12,20 +16,35 @@ describe('rewards', () => { to: 'u1', } + beforeAll(async()=>{ + const { server } = createServer({ + context: () => { + return { + driver, + neode: instance, + user: authenticatedUser, + } + }, + }) + query = createTestClient(server).query + mutate = createTestClient(server).mutate + }) + beforeEach(async () => { - user = await factory.create('User', { - id: 'u1', + + regularUser = await factory.create('User', { + id: 'regular-user-id', role: 'user', email: 'user@example.org', password: '1234', }) await factory.create('User', { - id: 'u2', + id: 'moderator-id', role: 'moderator', email: 'moderator@example.org', }) await factory.create('User', { - id: 'u3', + id: 'admin-id', role: 'admin', email: 'admin@example.org', }) @@ -54,11 +73,14 @@ describe('rewards', () => { ` describe('unauthenticated', () => { - let client - - it('throws authorization error', async () => { - client = new GraphQLClient(host) - await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised') + it.only('throws authorization error', async () => { + const variables = { + from: 'indiegogo_en_rhino', + to: 'regular-user-id', + } + authenticatedUser = null + await expect(mutate({mutation, variables})).resolves.toMatchObject({ data: {reward: null}, + errors: [{ message: 'Not Authorised!' }]}) }) }) From bd834824650af01df5c5ed8ba35a0de4cd03f564 Mon Sep 17 00:00:00 2001 From: aonomike Date: Sat, 12 Oct 2019 16:50:58 +0300 Subject: [PATCH 06/46] Complete refactor of logged in administrator spec path --- backend/src/schema/resolvers/rewards.spec.js | 144 +++++++++++++------ 1 file changed, 98 insertions(+), 46 deletions(-) diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js index ea6f737b0..4965f3fcf 100644 --- a/backend/src/schema/resolvers/rewards.spec.js +++ b/backend/src/schema/resolvers/rewards.spec.js @@ -2,13 +2,14 @@ import { createTestClient } from 'apollo-server-testing' import Factory from '../../seed/factories' import { gql } from '../../jest/helpers' import { neode as getNeode, getDriver } from '../../bootstrap/neo4j' -import createServer from '../../server' +import createServer from '../../server' +import { addMinutes } from 'date-fns' const factory = Factory() const driver = getDriver() const instance = getNeode() -let authenticatedUser, regularUser, badge, query, mutate, variables +let authenticatedUser, regularUser, administrator, moderator, badge, query, mutate, variables describe('rewards', () => { const variables = { @@ -16,7 +17,7 @@ describe('rewards', () => { to: 'u1', } - beforeAll(async()=>{ + beforeAll(async () => { const { server } = createServer({ context: () => { return { @@ -31,19 +32,18 @@ describe('rewards', () => { }) beforeEach(async () => { - regularUser = await factory.create('User', { id: 'regular-user-id', role: 'user', email: 'user@example.org', password: '1234', }) - await factory.create('User', { + moderator = await factory.create('User', { id: 'moderator-id', role: 'moderator', email: 'moderator@example.org', }) - await factory.create('User', { + administrator = await factory.create('User', { id: 'admin-id', role: 'admin', email: 'admin@example.org', @@ -73,54 +73,62 @@ describe('rewards', () => { ` describe('unauthenticated', () => { - it.only('throws authorization error', async () => { + it('throws authorization error', async () => { const variables = { from: 'indiegogo_en_rhino', to: 'regular-user-id', } authenticatedUser = null - await expect(mutate({mutation, variables})).resolves.toMatchObject({ data: {reward: null}, - errors: [{ message: 'Not Authorised!' }]}) + await expect(mutate({ mutation, variables })).resolves.toMatchObject({ + data: { reward: null }, + errors: [{ message: 'Not Authorised!' }], + }) }) }) describe('authenticated admin', () => { - let client beforeEach(async () => { - const headers = await login({ email: 'admin@example.org', password: '1234' }) - client = new GraphQLClient(host, { headers }) + authenticatedUser = await administrator.toJson() }) describe('badge for id does not exist', () => { it('rejects with a telling error message', async () => { await expect( - client.request(mutation, { - ...variables, - from: 'bullshit', - }), - ).rejects.toThrow("Couldn't find a badge with that id") + mutate({ mutation, variables: { to: 'regular-user-id', from: 'ndiegogo_en_rhino' } }), + ).resolves.toMatchObject({ + data: { reward: null }, + errors: [{ message: "Couldn't find a badge with that id" }], + }) }) }) describe('user for id does not exist', () => { it('rejects with a telling error message', async () => { await expect( - client.request(mutation, { - ...variables, - to: 'bullshit', + mutate({ + mutation, + variables: { to: 'non-existent-user-id', from: 'non-existent-badge' }, }), - ).rejects.toThrow("Couldn't find a user with that id") + ).resolves.toMatchObject({ + data: { reward: null }, + errors: [{ message: "Couldn't find a user with that id" }], + }) }) }) it('rewards a badge to user', async () => { const expected = { - reward: { - id: 'u1', - badges: [{ id: 'indiegogo_en_rhino' }], + data: { + reward: { + id: 'regular-user-id', + badges: [{ id: 'indiegogo_en_rhino' }], + }, }, + errors: undefined, } - await expect(client.request(mutation, variables)).resolves.toEqual(expected) + await expect( + mutate({ mutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_rhino' } }), + ).resolves.toMatchObject(expected) }) it('rewards a second different badge to same user', async () => { @@ -130,42 +138,83 @@ describe('rewards', () => { }) const badges = [{ id: 'indiegogo_en_racoon' }, { id: 'indiegogo_en_rhino' }] const expected = { - reward: { - id: 'u1', - badges: expect.arrayContaining(badges), + data: { + reward: { + id: 'regular-user-id', + badges: expect.arrayContaining(badges), + }, }, + errors: undefined, } - await client.request(mutation, variables) + await mutate({ + mutation, + variables: { + to: 'regular-user-id', + from: 'indiegogo_en_rhino', + }, + }) await expect( - client.request(mutation, { - ...variables, - from: 'indiegogo_en_racoon', + mutate({ + mutation, + variables: { + to: 'regular-user-id', + from: 'indiegogo_en_racoon', + }, }), - ).resolves.toEqual(expected) + ).resolves.toMatchObject(expected) }) it('rewards the same badge as well to another user', async () => { const expected = { - reward: { - id: 'u2', - badges: [{ id: 'indiegogo_en_rhino' }], + data: { + reward: { + id: 'regular-user-2-id', + badges: [{ id: 'indiegogo_en_rhino' }], + }, }, + errors: undefined, } + await factory.create('User', { + id: 'regular-user-2-id', + email: 'regular2@email.com', + }) + await mutate({ + mutation, + variables: { + to: 'regular-user-id', + from: 'indiegogo_en_rhino', + }, + }) await expect( - client.request(mutation, { - ...variables, - to: 'u2', + mutate({ + mutation, + variables: { + to: 'regular-user-2-id', + from: 'indiegogo_en_rhino', + }, }), - ).resolves.toEqual(expected) + ).resolves.toMatchObject(expected) }) it('creates no duplicate reward relationships', async () => { - await client.request(mutation, variables) - await client.request(mutation, variables) + await mutate({ + mutation, + variables: { + to: 'regular-user-id', + from: 'indiegogo_en_rhino', + }, + }) + await mutate({ + mutation, + variables: { + to: 'regular-user-id', + from: 'indiegogo_en_rhino', + }, + }) - const query = gql` + const userQuery = gql` { - User(id: "u1") { + User(id: "regular-user-id") { badgesCount badges { id @@ -173,9 +222,12 @@ describe('rewards', () => { } } ` - const expected = { User: [{ badgesCount: 1, badges: [{ id: 'indiegogo_en_rhino' }] }] } + const expected = { + data: { User: [{ badgesCount: 1, badges: [{ id: 'indiegogo_en_rhino' }] }] }, + errors: undefined, + } - await expect(client.request(query)).resolves.toEqual(expected) + await expect(query({ query: userQuery })).resolves.toMatchObject(expected) }) }) From dcb40c2c33ef89fda0f04f18c8dd3abe8ad4a377 Mon Sep 17 00:00:00 2001 From: aonomike Date: Sat, 12 Oct 2019 17:00:36 +0300 Subject: [PATCH 07/46] refactor moderator user path --- backend/src/schema/resolvers/rewards.spec.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js index 4965f3fcf..2acadfb8c 100644 --- a/backend/src/schema/resolvers/rewards.spec.js +++ b/backend/src/schema/resolvers/rewards.spec.js @@ -232,15 +232,15 @@ describe('rewards', () => { }) describe('authenticated moderator', () => { - let client beforeEach(async () => { - const headers = await login({ email: 'moderator@example.org', password: '1234' }) - client = new GraphQLClient(host, { headers }) + authenticatedUser = moderator.toJson() }) - describe('rewards bage to user', () => { + describe('rewards badge to user', () => { it('throws authorization error', async () => { - await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised') + await expect( + mutate({ mutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_rhino' } }), + ).resolves.toMatchObject({data: {reward: null}, errors: [{message: 'Not Authorised!'}]}) }) }) }) From 0fe94a5d82ce08eae89b0c569bd193d4d37e71cb Mon Sep 17 00:00:00 2001 From: aonomike Date: Sat, 12 Oct 2019 17:39:29 +0300 Subject: [PATCH 08/46] Complete refactor rewards spec - Refactor unreward path - refactor to use variables constant --- backend/src/schema/resolvers/rewards.spec.js | 83 +++++++++----------- 1 file changed, 37 insertions(+), 46 deletions(-) diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js index 2acadfb8c..2af16094d 100644 --- a/backend/src/schema/resolvers/rewards.spec.js +++ b/backend/src/schema/resolvers/rewards.spec.js @@ -3,18 +3,17 @@ import Factory from '../../seed/factories' import { gql } from '../../jest/helpers' import { neode as getNeode, getDriver } from '../../bootstrap/neo4j' import createServer from '../../server' -import { addMinutes } from 'date-fns' const factory = Factory() const driver = getDriver() const instance = getNeode() -let authenticatedUser, regularUser, administrator, moderator, badge, query, mutate, variables +let authenticatedUser, regularUser, administrator, moderator, badge, query, mutate describe('rewards', () => { const variables = { from: 'indiegogo_en_rhino', - to: 'u1', + to: 'regular-user-id', } beforeAll(async () => { @@ -74,10 +73,6 @@ describe('rewards', () => { describe('unauthenticated', () => { it('throws authorization error', async () => { - const variables = { - from: 'indiegogo_en_rhino', - to: 'regular-user-id', - } authenticatedUser = null await expect(mutate({ mutation, variables })).resolves.toMatchObject({ data: { reward: null }, @@ -126,9 +121,7 @@ describe('rewards', () => { }, errors: undefined, } - await expect( - mutate({ mutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_rhino' } }), - ).resolves.toMatchObject(expected) + await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected) }) it('rewards a second different badge to same user', async () => { @@ -180,10 +173,7 @@ describe('rewards', () => { }) await mutate({ mutation, - variables: { - to: 'regular-user-id', - from: 'indiegogo_en_rhino', - }, + variables, }) await expect( mutate({ @@ -199,17 +189,11 @@ describe('rewards', () => { it('creates no duplicate reward relationships', async () => { await mutate({ mutation, - variables: { - to: 'regular-user-id', - from: 'indiegogo_en_rhino', - }, + variables, }) await mutate({ mutation, - variables: { - to: 'regular-user-id', - from: 'indiegogo_en_rhino', - }, + variables, }) const userQuery = gql` @@ -238,9 +222,10 @@ describe('rewards', () => { describe('rewards badge to user', () => { it('throws authorization error', async () => { - await expect( - mutate({ mutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_rhino' } }), - ).resolves.toMatchObject({data: {reward: null}, errors: [{message: 'Not Authorised!'}]}) + await expect(mutate({ mutation, variables })).resolves.toMatchObject({ + data: { reward: null }, + errors: [{ message: 'Not Authorised!' }], + }) }) }) }) @@ -248,9 +233,12 @@ describe('rewards', () => { describe('unreward', () => { beforeEach(async () => { - await user.relateTo(badge, 'rewarded') + await regularUser.relateTo(badge, 'rewarded') }) - const expected = { unreward: { id: 'u1', badges: [] } } + const expected = { + data: { unreward: { id: 'regular-user-id', badges: [] } }, + errors: undefined, + } const mutation = gql` mutation($from: ID!, $to: ID!) { @@ -265,9 +253,10 @@ describe('rewards', () => { describe('check test setup', () => { it('user has one badge', async () => { - const query = gql` + authenticatedUser = regularUser.toJson() + const userQuery = gql` { - User(id: "u1") { + User(id: "regular-user-id") { badgesCount badges { id @@ -275,48 +264,50 @@ describe('rewards', () => { } } ` - const expected = { User: [{ badgesCount: 1, badges: [{ id: 'indiegogo_en_rhino' }] }] } - const client = new GraphQLClient(host) - await expect(client.request(query)).resolves.toEqual(expected) + const expected = { + data: { User: [{ badgesCount: 1, badges: [{ id: 'indiegogo_en_rhino' }] }] }, + errors: undefined, + } + await expect(query({ query: userQuery })).resolves.toMatchObject(expected) }) }) describe('unauthenticated', () => { - let client - it('throws authorization error', async () => { - client = new GraphQLClient(host) - await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised') + authenticatedUser = null + await expect(mutate({ mutation, variables })).resolves.toMatchObject({ + data: { unreward: null }, + errors: [{ message: 'Not Authorised!' }], + }) }) }) describe('authenticated admin', () => { - let client beforeEach(async () => { - const headers = await login({ email: 'admin@example.org', password: '1234' }) - client = new GraphQLClient(host, { headers }) + authenticatedUser = await administrator.toJson() }) it('removes a badge from user', async () => { - await expect(client.request(mutation, variables)).resolves.toEqual(expected) + await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected) }) it('does not crash when unrewarding multiple times', async () => { - await client.request(mutation, variables) - await expect(client.request(mutation, variables)).resolves.toEqual(expected) + await mutate({ mutation, variables }) + await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected) }) }) describe('authenticated moderator', () => { - let client beforeEach(async () => { - const headers = await login({ email: 'moderator@example.org', password: '1234' }) - client = new GraphQLClient(host, { headers }) + authenticatedUser = await moderator.toJson() }) describe('removes bage from user', () => { it('throws authorization error', async () => { - await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised') + await expect(mutate({ mutation, variables })).resolves.toMatchObject({ + data: { unreward: null }, + errors: [{ message: 'Not Authorised!' }], + }) }) }) }) From c2e8a9736aa7ada2c485e9c8644f6843662cd116 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 04:34:37 +0000 Subject: [PATCH 09/46] build(deps): bump @nuxtjs/apollo in /webapp Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc14 to 4.0.0-rc15. - [Release notes](https://github.com/nuxt-community/apollo-module/releases) - [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.14...v4.0.0-rc.15) 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 952913e4b..8903b0ecc 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@human-connection/styleguide": "0.5.21", - "@nuxtjs/apollo": "^4.0.0-rc14", + "@nuxtjs/apollo": "^4.0.0-rc15", "@nuxtjs/axios": "~5.6.0", "@nuxtjs/dotenv": "~1.4.1", "@nuxtjs/pwa": "^3.0.0-beta.19", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index b6dca2ca6..ece58de85 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1400,10 +1400,10 @@ webpack-node-externals "^1.7.2" webpackbar "^4.0.0" -"@nuxtjs/apollo@^4.0.0-rc14": - version "4.0.0-rc14" - resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc14.tgz#b589e72c6e6b36c93154b07c12a5ce59cc350942" - integrity sha512-ap/oiF/0i/EdeeFWnj8IkoHPTjqut6CW46sshdtanZxrGEmYody0Qi98KfQnoO7mYrQg7dbfHHNh1xCPhGYQ7A== +"@nuxtjs/apollo@^4.0.0-rc15": + version "4.0.0-rc15" + resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc15.tgz#349d11e49339f0f53737bba596a4156345ac91fd" + integrity sha512-RiFVTA2Lt1mf5CWBzee0447nMxi7ayFnruuTR0zakJIasK8j5Nf25ROJkzbzdUMBkqekyf5RPuR8CkLgUIOqiA== dependencies: cross-fetch "^3.0.4" universal-cookie "^4.0.2" From a95e55ce3478b5679daec9a47eb7988662435c6c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 04:35:43 +0000 Subject: [PATCH 10/46] build(deps-dev): bump core-js from 2.6.9 to 2.6.10 in /webapp Bumps [core-js](https://github.com/zloirock/core-js) from 2.6.9 to 2.6.10. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/compare/v2.6.9...v2.6.10) 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 952913e4b..d5f98a72e 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -106,7 +106,7 @@ "babel-jest": "~24.9.0", "babel-loader": "~8.0.6", "babel-preset-vue": "~2.0.2", - "core-js": "~2.6.9", + "core-js": "~2.6.10", "css-loader": "~3.2.0", "eslint": "~5.16.0", "eslint-config-prettier": "~6.4.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index b6dca2ca6..90d5cdf61 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -5423,10 +5423,10 @@ 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.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== +core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5, core-js@~2.6.10: + version "2.6.10" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f" + integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA== core-js@^3.0.1, core-js@^3.0.4: version "3.1.4" From 47a2a21fc0db732d8b52992048f8fb9076f0bc5d Mon Sep 17 00:00:00 2001 From: aonomike Date: Mon, 14 Oct 2019 16:46:37 +0300 Subject: [PATCH 11/46] Resolve review comments --- backend/src/schema/resolvers/rewards.spec.js | 51 ++++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js index 2af16094d..a81133373 100644 --- a/backend/src/schema/resolvers/rewards.spec.js +++ b/backend/src/schema/resolvers/rewards.spec.js @@ -60,7 +60,7 @@ describe('rewards', () => { }) describe('reward', () => { - const mutation = gql` + const rewardMutation = gql` mutation($from: ID!, $to: ID!) { reward(badgeKey: $from, userId: $to) { id @@ -74,7 +74,7 @@ describe('rewards', () => { describe('unauthenticated', () => { it('throws authorization error', async () => { authenticatedUser = null - await expect(mutate({ mutation, variables })).resolves.toMatchObject({ + await expect(mutate({ mutation: rewardMutation, variables })).resolves.toMatchObject({ data: { reward: null }, errors: [{ message: 'Not Authorised!' }], }) @@ -87,9 +87,12 @@ describe('rewards', () => { }) describe('badge for id does not exist', () => { - it('rejects with a telling error message', async () => { + it('rejects with an informative error message', async () => { await expect( - mutate({ mutation, variables: { to: 'regular-user-id', from: 'ndiegogo_en_rhino' } }), + mutate({ + mutation: rewardMutation, + variables: { to: 'regular-user-id', from: 'non-existent-badge-id' }, + }), ).resolves.toMatchObject({ data: { reward: null }, errors: [{ message: "Couldn't find a badge with that id" }], @@ -97,12 +100,12 @@ describe('rewards', () => { }) }) - describe('user for id does not exist', () => { + describe('non-existent user', () => { it('rejects with a telling error message', async () => { await expect( mutate({ - mutation, - variables: { to: 'non-existent-user-id', from: 'non-existent-badge' }, + mutation: rewardMutation, + variables: { to: 'non-existent-user-id', from: 'indiegogo_en_rhino' }, }), ).resolves.toMatchObject({ data: { reward: null }, @@ -121,7 +124,9 @@ describe('rewards', () => { }, errors: undefined, } - await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected) + await expect(mutate({ mutation: rewardMutation, variables })).resolves.toMatchObject( + expected, + ) }) it('rewards a second different badge to same user', async () => { @@ -140,7 +145,7 @@ describe('rewards', () => { errors: undefined, } await mutate({ - mutation, + mutation: rewardMutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_rhino', @@ -148,7 +153,7 @@ describe('rewards', () => { }) await expect( mutate({ - mutation, + mutation: rewardMutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_racoon', @@ -172,12 +177,12 @@ describe('rewards', () => { email: 'regular2@email.com', }) await mutate({ - mutation, + mutation: rewardMutation, variables, }) await expect( mutate({ - mutation, + mutation: rewardMutation, variables: { to: 'regular-user-2-id', from: 'indiegogo_en_rhino', @@ -188,11 +193,11 @@ describe('rewards', () => { it('creates no duplicate reward relationships', async () => { await mutate({ - mutation, + mutation: rewardMutation, variables, }) await mutate({ - mutation, + mutation: rewardMutation, variables, }) @@ -222,7 +227,7 @@ describe('rewards', () => { describe('rewards badge to user', () => { it('throws authorization error', async () => { - await expect(mutate({ mutation, variables })).resolves.toMatchObject({ + await expect(mutate({ mutation: rewardMutation, variables })).resolves.toMatchObject({ data: { reward: null }, errors: [{ message: 'Not Authorised!' }], }) @@ -240,7 +245,7 @@ describe('rewards', () => { errors: undefined, } - const mutation = gql` + const unrewardMutation = gql` mutation($from: ID!, $to: ID!) { unreward(badgeKey: $from, userId: $to) { id @@ -275,7 +280,7 @@ describe('rewards', () => { describe('unauthenticated', () => { it('throws authorization error', async () => { authenticatedUser = null - await expect(mutate({ mutation, variables })).resolves.toMatchObject({ + await expect(mutate({ mutation: unrewardMutation, variables })).resolves.toMatchObject({ data: { unreward: null }, errors: [{ message: 'Not Authorised!' }], }) @@ -288,12 +293,16 @@ describe('rewards', () => { }) it('removes a badge from user', async () => { - await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected) + await expect(mutate({ mutation: unrewardMutation, variables })).resolves.toMatchObject( + expected, + ) }) it('does not crash when unrewarding multiple times', async () => { - await mutate({ mutation, variables }) - await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected) + await mutate({ mutation: unrewardMutation, variables }) + await expect(mutate({ mutation: unrewardMutation, variables })).resolves.toMatchObject( + expected, + ) }) }) @@ -304,7 +313,7 @@ describe('rewards', () => { describe('removes bage from user', () => { it('throws authorization error', async () => { - await expect(mutate({ mutation, variables })).resolves.toMatchObject({ + await expect(mutate({ mutation: unrewardMutation, variables })).resolves.toMatchObject({ data: { unreward: null }, errors: [{ message: 'Not Authorised!' }], }) From d59defedf3df22f273486f7c7e2d1f90664981ac Mon Sep 17 00:00:00 2001 From: Brent Vardy Date: Sat, 21 Sep 2019 12:14:04 +0100 Subject: [PATCH 12/46] [WIP] - implement basic image cropping solution #1466 - co-authored-by: mattwr18 --- webapp/components/TeaserImage/TeaserImage.vue | 46 ++++++++++++++++++- webapp/package.json | 3 +- webapp/yarn.lock | 10 ++-- 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index 53f79bfb0..0305fdf44 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -5,8 +5,8 @@ id="postdropzone" class="ds-card-image" :use-custom-slot="true" - @vdropzone-thumbnail="thumbnail" @vdropzone-error="verror" + @vdropzone-thumbnail="transformImage" >
import vueDropzone from 'nuxt-dropzone' +import Cropper from 'cropperjs' +import 'cropperjs/dist/cropper.css' export default { components: { @@ -86,12 +88,52 @@ export default { uploadArea.classList.remove('hc-attachments-upload-area-update-post') } image = new Image() - image.src = URL.createObjectURL(file) + image.src = dataUrl image.classList.add('thumbnail-preview') if (thumbnailPreview) return thumbnailElement.replaceChild(image, thumbnailPreview) thumbnailElement.appendChild(image) } }, + transformImage(file) { + let myDropZone = this + + // Create the image editor overlay + let editor = document.createElement('div') + editor.style.position = 'fixed' + editor.style.left = 0 + editor.style.right = 0 + editor.style.top = 0 + editor.style.bottom = 0 + editor.style.zIndex = 9999 + editor.style.backgroundColor = '#000' + + // Create the confirm button + let confirm = document.createElement('button') + confirm.style.position = 'absolute' + confirm.style.left = '10px' + confirm.style.top = '10px' + confirm.style.zIndex = 9999 + confirm.textContent = 'Confirm' + confirm.addEventListener('click', function() { + // Get the canvas with image data from Cropper.js + let canvas = cropper.getCroppedCanvas() + myDropZone.thumbnail(file, canvas.toDataURL()) + + // Remove the editor from view + editor.parentNode.removeChild(editor) + }) + editor.appendChild(confirm) + + // Load the image + let image = new Image() + image.src = URL.createObjectURL(file) + editor.appendChild(image) + // Append the editor to the page + document.body.appendChild(editor) + + // Create Cropper.js and pass image + let cropper = new Cropper(image, {}) + }, }, } diff --git a/webapp/package.json b/webapp/package.json index 952913e4b..68323f93d 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -64,6 +64,7 @@ "cookie-universal-nuxt": "~2.0.18", "cross-env": "~6.0.3", "date-fns": "2.4.1", + "cropperjs": "^1.5.5", "express": "~4.17.1", "graphql": "~14.5.8", "isemail": "^3.2.0", @@ -133,4 +134,4 @@ "vue-svg-loader": "~0.12.0", "vue-template-compiler": "^2.6.10" } -} \ No newline at end of file +} diff --git a/webapp/yarn.lock b/webapp/yarn.lock index b6dca2ca6..a51aca386 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -5538,6 +5538,11 @@ create-react-context@^0.2.1: fbjs "^0.8.0" gud "^1.0.0" +cropperjs@^1.5.5: + version "1.5.6" + resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.5.6.tgz#82faf432bec709d828f2f7a96d1179198edaf0e2" + integrity sha512-eAgWf4j7sNJIG329qUHIFi17PSV0VtuWyAu9glZSgu/KlQSrfTQOC2zAz+jHGa5fAB+bJldEnQwvJEaJ8zRf5A== + cross-env@~6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941" @@ -13618,11 +13623,6 @@ serve-static@1.14.1, serve-static@^1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.1" server-destroy@^1.0.1: version "1.0.1" From fdcf2b5300832e3429cd460a7cc411fb292ba66f Mon Sep 17 00:00:00 2001 From: Brent Vardy Date: Sat, 21 Sep 2019 12:14:04 +0100 Subject: [PATCH 13/46] [WIP] - implement basic image cropping solution #1466 - co-authored-by: mattwr18 --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index 68323f93d..127e15623 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -62,9 +62,9 @@ "apollo-cache-inmemory": "~1.6.3", "apollo-client": "~2.6.4", "cookie-universal-nuxt": "~2.0.18", + "cropperjs": "^1.5.5", "cross-env": "~6.0.3", "date-fns": "2.4.1", - "cropperjs": "^1.5.5", "express": "~4.17.1", "graphql": "~14.5.8", "isemail": "^3.2.0", From 45dfc5cff1fd231d103b610ac860521eb6d0bae9 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 25 Sep 2019 15:35:09 +0200 Subject: [PATCH 14/46] Contain cropper overlay in image preview area - Co-authored-by: Brent Vardy --- webapp/components/TeaserImage/TeaserImage.vue | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index 0305fdf44..564a66260 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -95,29 +95,24 @@ export default { } }, transformImage(file) { - let myDropZone = this - + let thumbnailElement, editor, confirm // Create the image editor overlay - let editor = document.createElement('div') - editor.style.position = 'fixed' - editor.style.left = 0 - editor.style.right = 0 - editor.style.top = 0 - editor.style.bottom = 0 - editor.style.zIndex = 9999 - editor.style.backgroundColor = '#000' + editor = document.createElement('div') + thumbnailElement = document.querySelectorAll('.dz-image')[0] + // dataDzThumbnail = document.querySelectorAll('[data-dz-thumbnail-bg]')[0] + // thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0] + editor.classList.add('crop-overlay') + // elementToReplace = thumbnailPreview || dataDzThumbnail + thumbnailElement.appendChild(editor) // Create the confirm button - let confirm = document.createElement('button') - confirm.style.position = 'absolute' - confirm.style.left = '10px' - confirm.style.top = '10px' - confirm.style.zIndex = 9999 + confirm = document.createElement('button') + confirm.classList.add('crop-confirm') confirm.textContent = 'Confirm' - confirm.addEventListener('click', function() { + confirm.addEventListener('click', () => { // Get the canvas with image data from Cropper.js let canvas = cropper.getCroppedCanvas() - myDropZone.thumbnail(file, canvas.toDataURL()) + this.thumbnail(file, canvas.toDataURL()) // Remove the editor from view editor.parentNode.removeChild(editor) @@ -129,7 +124,7 @@ export default { image.src = URL.createObjectURL(file) editor.appendChild(image) // Append the editor to the page - document.body.appendChild(editor) + // document.body.appendChild(editor) // Create Cropper.js and pass image let cropper = new Cropper(image, {}) @@ -223,4 +218,19 @@ export default { .contribution-image { max-height: 300px; } + +.crop-overlay { + position: relative; + width: 100%; + height: 100%; + z-index: 9999; + background-color: #000; +} + +.crop-confirm { + position: absolute; + left: 10px; + top: 10px; + z-index: 9999; +} From b089e824344d16078e9ba43421b8bbda3b67689c Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 25 Sep 2019 16:14:25 +0200 Subject: [PATCH 15/46] Configure jest to mock CSS modules - getting error from import cropperjs css --- webapp/package.json | 4 +++- webapp/yarn.lock | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index 127e15623..a8cfb9016 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -44,7 +44,8 @@ ], "moduleNameMapper": { "^@/(.*)$": "/src/$1", - "^~/(.*)$": "/$1" + "^~/(.*)$": "/$1", + "\\.(css|less)$": "identity-obj-proxy" }, "testMatch": [ "**/?(*.)+(spec|test).js?(x)" @@ -122,6 +123,7 @@ "eslint-plugin-vue": "~5.2.3", "flush-promises": "^1.0.2", "fuse.js": "^3.4.5", + "identity-obj-proxy": "^3.0.0", "jest": "~24.9.0", "mutation-observer": "^1.0.3", "node-sass": "~4.12.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index a51aca386..b9dd64d1d 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -7861,6 +7861,11 @@ hard-source-webpack-plugin@^0.13.1: webpack-sources "^1.0.1" write-json-file "^2.3.0" +harmony-reflect@^1.4.6: + version "1.6.1" + resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz#c108d4f2bb451efef7a37861fdbdae72c9bdefa9" + integrity sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA== + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -8271,6 +8276,13 @@ icss-utils@^4.0.0, icss-utils@^4.1.1: dependencies: postcss "^7.0.14" +identity-obj-proxy@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14" + integrity sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ= + dependencies: + harmony-reflect "^1.4.6" + ieee754@^1.1.4: version "1.1.13" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" From 227db5f13ac5de3b583b842b3b51e570be6aebfa Mon Sep 17 00:00:00 2001 From: Brent Vardy Date: Thu, 26 Sep 2019 14:27:01 +0100 Subject: [PATCH 16/46] refactored tranformImage to remove dupication - styled confirm button - added locale translations - added dropzoneDrop method to handle scenario where users drag and drop an image whilst in the cropper interface. - co-authored-by: mattwr18 --- webapp/components/TeaserImage/TeaserImage.vue | 46 +++++++------------ webapp/locales/de.json | 3 ++ webapp/locales/en.json | 3 ++ webapp/locales/es.json | 5 ++ webapp/locales/fr.json | 5 ++ webapp/locales/it.json | 5 ++ webapp/locales/nl.json | 5 +- webapp/locales/pl.json | 3 ++ webapp/locales/pt.json | 5 +- 9 files changed, 48 insertions(+), 32 deletions(-) diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index 564a66260..1d922a073 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -7,6 +7,7 @@ :use-custom-slot="true" @vdropzone-error="verror" @vdropzone-thumbnail="transformImage" + @vdropzone-drop="dropzoneDrop" >
{ - let thumbnailElement, contributionImage, uploadArea, thumbnailPreview, image - if (file.previewElement) { - thumbnailElement = document.querySelectorAll('#postdropzone')[0] - contributionImage = document.querySelectorAll('.contribution-image')[0] - thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0] - if (contributionImage) { - uploadArea = document.querySelectorAll('.hc-attachments-upload-area-update-post')[0] - uploadArea.removeChild(contributionImage) - uploadArea.classList.remove('hc-attachments-upload-area-update-post') - } - image = new Image() - image.src = dataUrl - image.classList.add('thumbnail-preview') - if (thumbnailPreview) return thumbnailElement.replaceChild(image, thumbnailPreview) - thumbnailElement.appendChild(image) - } - }, transformImage(file) { - let thumbnailElement, editor, confirm + let thumbnailElement, editor, confirm, thumbnailPreview, contributionImage // Create the image editor overlay editor = document.createElement('div') thumbnailElement = document.querySelectorAll('.dz-image')[0] - // dataDzThumbnail = document.querySelectorAll('[data-dz-thumbnail-bg]')[0] - // thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0] - + thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0] + if (thumbnailPreview) thumbnailPreview.remove() + contributionImage = document.querySelectorAll('.contribution-image')[0] + if (contributionImage) contributionImage.remove() editor.classList.add('crop-overlay') - // elementToReplace = thumbnailPreview || dataDzThumbnail thumbnailElement.appendChild(editor) // Create the confirm button confirm = document.createElement('button') - confirm.classList.add('crop-confirm') - confirm.textContent = 'Confirm' + confirm.classList.add('crop-confirm', 'ds-button', 'ds-button-primary') + confirm.textContent = this.$t('contribution.teaserImage.cropperConfirm') confirm.addEventListener('click', () => { // Get the canvas with image data from Cropper.js let canvas = cropper.getCroppedCanvas() - this.thumbnail(file, canvas.toDataURL()) - + image = new Image() + image.src = canvas.toDataURL() + image.classList.add('thumbnail-preview') + thumbnailElement.appendChild(image) // Remove the editor from view editor.parentNode.removeChild(editor) }) @@ -123,12 +108,13 @@ export default { let image = new Image() image.src = URL.createObjectURL(file) editor.appendChild(image) - // Append the editor to the page - // document.body.appendChild(editor) - // Create Cropper.js and pass image let cropper = new Cropper(image, {}) }, + dropzoneDrop() { + let cropOverlay = document.querySelectorAll('.crop-overlay')[0] + if (cropOverlay) cropOverlay.remove() + }, }, } diff --git a/webapp/locales/de.json b/webapp/locales/de.json index b2f1313da..96c1cd322 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -562,6 +562,9 @@ "it-internet-data-privacy": "IT, Internet & Datenschutz", "art-culture-sport": "Kunst, Kultur & Sport" } + }, + "teaserImage": { + "cropperConfirm": "Bestätigen" } }, "code-of-conduct": { diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 9d68ae6a0..90bb84c37 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -563,6 +563,9 @@ "it-internet-data-privacy": "IT, Internet & Data Privacy", "art-culture-sport": "Art, Culture, & Sport" } + }, + "teaserImage": { + "cropperConfirm": "Confirm" } }, "code-of-conduct": { diff --git a/webapp/locales/es.json b/webapp/locales/es.json index e52933c69..5890e4314 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -292,6 +292,11 @@ "message": "¿Realmente quieres liberar el comentario de \"{name}\"?" } }, + "contribution": { + "teaserImage": { + "cropperConfirm": "Confirmar" + } + }, "user": { "avatar": { "submitted": "Carga con éxito" diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index 631c9436a..3f3f59b05 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -287,6 +287,11 @@ "message": "Voulez-vous vraiment publier le commentaire de \"{name}\"?" } }, + "contribution": { + "teaserImage": { + "cropperConfirm": "Confirmer" + } + }, "user": { "avatar": { "submitted": "Téléchargement réussi" diff --git a/webapp/locales/it.json b/webapp/locales/it.json index fc6371b24..26dea37bd 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -140,5 +140,10 @@ "save": "Salva", "edit": "Modifica", "delete": "Cancella" + }, + "contribution": { + "teaserImage": { + "cropperConfirm": "Confermare" + } } } diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index da763735a..c62ca9497 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -158,7 +158,10 @@ }, "contribution": { "edit": "Bijdrage bewerken", - "delete": "Bijdrage verwijderen" + "delete": "Bijdrage verwijderen", + "teaserImage": { + "cropperConfirm": "Bevestigen" + } }, "comment": { "edit": "Commentaar bewerken", diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index 305487717..4684290e9 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -362,6 +362,9 @@ "languageSelectLabel": "Język", "categories": { "infoSelectedNoOfMaxCategories": "{chosen} z {max} wybrane kategorie" + }, + "teaserImage": { + "cropperConfirm": "Potwierdzać" } } } diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index b43711998..6eccc2fc0 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -203,7 +203,10 @@ }, "contribution": { "edit": "Editar Contribuição", - "delete": "Apagar Contribuição" + "delete": "Apagar Contribuição", + "teaserImage": { + "cropperConfirm": "Confirmar" + } }, "comment": { "content": { From fa066968922fb4223c4592650ec3400fb2879104 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 2 Oct 2019 21:22:58 +0200 Subject: [PATCH 17/46] Convert canvas to blob to update file - what was happening is that the file was being autocropped still and sent to the backend with cropperjs autocrop... these changes update the file's attributes so they can be saved properly --- webapp/components/TeaserImage/TeaserImage.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index 1d922a073..e60a466e4 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -95,12 +95,19 @@ export default { confirm.addEventListener('click', () => { // Get the canvas with image data from Cropper.js let canvas = cropper.getCroppedCanvas() - image = new Image() - image.src = canvas.toDataURL() - image.classList.add('thumbnail-preview') - thumbnailElement.appendChild(image) - // Remove the editor from view - editor.parentNode.removeChild(editor) + canvas.toBlob(blob => { + this.$refs.el.manuallyAddFile(blob, canvas.toDataURL(), null, null, { + dontSubstractMaxFiles: false, + addToFiles: true, + }) + image = new Image() + image.src = canvas.toDataURL() + image.classList.add('thumbnail-preview') + thumbnailElement.appendChild(image) + // Remove the editor from view + editor.parentNode.removeChild(editor) + this.addTeaserImage([blob]) + }) }) editor.appendChild(confirm) From db48e522cfebb9691c08053f00ccf64ce91c416d Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 2 Oct 2019 22:35:03 +0200 Subject: [PATCH 18/46] Enforce a 16/9 aspect ratio - if we set the max height any greater than this, it takes up the entire page on a desktop screen --- .../src/schema/resolvers/fileUpload/index.js | 4 +++- webapp/components/PostCard/index.vue | 2 +- webapp/components/TeaserImage/TeaserImage.vue | 20 +++++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/backend/src/schema/resolvers/fileUpload/index.js b/backend/src/schema/resolvers/fileUpload/index.js index fa78238c3..81548cab3 100644 --- a/backend/src/schema/resolvers/fileUpload/index.js +++ b/backend/src/schema/resolvers/fileUpload/index.js @@ -11,14 +11,16 @@ const storeUpload = ({ createReadStream, fileLocation }) => ) export default async function fileUpload(params, { file, url }, uploadCallback = storeUpload) { + console.log('params', params) const upload = params[file] + console.log('upload', upload) if (upload) { const { createReadStream, filename } = await upload const { name } = path.parse(filename) const fileLocation = `/uploads/${Date.now()}-${slug(name)}` await uploadCallback({ createReadStream, fileLocation }) delete params[file] - + console.log('fileLocation', fileLocation) params[url] = fileLocation } diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue index c6c967759..3ba575c0d 100644 --- a/webapp/components/PostCard/index.vue +++ b/webapp/components/PostCard/index.vue @@ -131,7 +131,7 @@ export default { } - From 3beddf1f69ef739b7babc9caa71b8bfa794cb00d Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 2 Oct 2019 23:32:25 +0200 Subject: [PATCH 19/46] Contain post/contribution form to limit width - enforce 1.25:1 aspect ratio to be as close to possible with the 1:1 aspect ratio on our root path where we have 3 columns of 300px and a max-height of 300px --- .../ContributionForm/ContributionForm.vue | 138 +++++++++--------- webapp/components/TeaserImage/TeaserImage.vue | 15 +- 2 files changed, 75 insertions(+), 78 deletions(-) diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index 73fa0afd9..3c67b8ae1 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -1,73 +1,75 @@ - From 2818b63fe91411adedb54e57fa8a6046238591ef Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 2 Oct 2019 23:42:42 +0200 Subject: [PATCH 20/46] Fix lint --- backend/src/schema/resolvers/fileUpload/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/src/schema/resolvers/fileUpload/index.js b/backend/src/schema/resolvers/fileUpload/index.js index 81548cab3..960dde7f9 100644 --- a/backend/src/schema/resolvers/fileUpload/index.js +++ b/backend/src/schema/resolvers/fileUpload/index.js @@ -11,16 +11,13 @@ const storeUpload = ({ createReadStream, fileLocation }) => ) export default async function fileUpload(params, { file, url }, uploadCallback = storeUpload) { - console.log('params', params) const upload = params[file] - console.log('upload', upload) if (upload) { const { createReadStream, filename } = await upload const { name } = path.parse(filename) const fileLocation = `/uploads/${Date.now()}-${slug(name)}` await uploadCallback({ createReadStream, fileLocation }) delete params[file] - console.log('fileLocation', fileLocation) params[url] = fileLocation } From cabd68f7d8077f41f2b235c14dd832f156c4bee3 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Mon, 7 Oct 2019 17:22:24 +0200 Subject: [PATCH 21/46] Clean up code - Set dropzoneOptions.url to arrow function which returns empty string... url is required, but we don't use a restful api, we crop the image and save the update file(blob) to an image - set min-height of vuedropzone to 500px to be closer to the cropped image and to center image overlay - remove dz-message div, as one is already created automatically by vue2-dropzone --- webapp/components/TeaserImage/TeaserImage.vue | 42 ++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index cb4a16001..5b46de5e4 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -9,22 +9,20 @@ @vdropzone-thumbnail="transformImage" @vdropzone-drop="dropzoneDrop" > -
+
+
- -
- -
+
@@ -45,7 +43,7 @@ export default { data() { return { dropzoneOptions: { - url: this.addTeaserImage, + url: () => '', maxFilesize: 5.0, previewTemplate: this.template(), }, @@ -73,15 +71,11 @@ export default { this.error = true this.$toast.error(file.status, message) }, - addTeaserImage(file) { - this.$emit('addTeaserImage', file[0]) - return '' - }, transformImage(file) { let thumbnailElement, editor, confirm, thumbnailPreview, contributionImage // Create the image editor overlay editor = document.createElement('div') - thumbnailElement = document.querySelectorAll('.dz-image')[0] + thumbnailElement = document.querySelectorAll('#postdropzone')[0] thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0] if (thumbnailPreview) thumbnailPreview.remove() contributionImage = document.querySelectorAll('.contribution-image')[0] @@ -106,7 +100,7 @@ export default { thumbnailElement.appendChild(image) // Remove the editor from view editor.parentNode.removeChild(editor) - this.addTeaserImage([blob]) + this.$emit('addTeaserImage', blob) }) }) editor.appendChild(confirm) @@ -128,7 +122,7 @@ export default { From 0d5b334f66f7ad44af16624086162d0fb3b599db Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Mon, 7 Oct 2019 17:31:53 +0200 Subject: [PATCH 22/46] Remove unneeded max-heights --- webapp/components/TeaserImage/TeaserImage.vue | 9 --------- 1 file changed, 9 deletions(-) diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index 5b46de5e4..5a8d6cff6 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -201,15 +201,9 @@ export default { border-top: $border-size-base solid $border-color-softest; } -.contribution-image { - max-height: 710px; -} - .crop-overlay { - max-height: 710px; position: relative; width: 100%; - // height: 100%; z-index: 9999; background-color: #000; } @@ -220,7 +214,4 @@ export default { top: 10px; z-index: 9999; } -.thumbnail-preview { - max-height: 710px; -} From c85b2d49b678542c4cebad3579319b1dd30644cf Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Mon, 7 Oct 2019 19:39:28 +0200 Subject: [PATCH 23/46] Remove outdated test directly calling method --- webapp/components/TeaserImage/TeaserImage.spec.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/webapp/components/TeaserImage/TeaserImage.spec.js b/webapp/components/TeaserImage/TeaserImage.spec.js index 07b17e16b..4043cb978 100644 --- a/webapp/components/TeaserImage/TeaserImage.spec.js +++ b/webapp/components/TeaserImage/TeaserImage.spec.js @@ -25,17 +25,6 @@ describe('TeaserImage.vue', () => { wrapper = Wrapper() }) - describe('File upload', () => { - const imageUpload = [ - { file: { filename: 'avataar.svg', previewElement: '' }, url: 'someUrlToImage' }, - ] - - it('supports adding a teaser image', () => { - wrapper.vm.addTeaserImage(imageUpload) - expect(wrapper.emitted().addTeaserImage[0]).toEqual(imageUpload) - }) - }) - describe('handles errors', () => { beforeEach(() => jest.useFakeTimers()) const message = 'File upload failed' From 1c6b5f941b3213e1b73af59eb17e7c8dc058d295 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Mon, 14 Oct 2019 13:45:41 +0200 Subject: [PATCH 24/46] Remove aspect ratio on cropper, limit to max-height 2000px - discussed it today's internal meeting and agreed upon with @alina-beck, @Tirokk, @ogerly, @datenbrei, Dennis Hack - max-height was a suggestion and can be changed at any time --- .../ContributionForm/ContributionForm.vue | 136 +++++++++--------- webapp/components/PostCard/index.vue | 2 +- webapp/components/TeaserImage/TeaserImage.vue | 2 +- webapp/pages/post/_id/_slug/index.vue | 2 +- webapp/pages/post/_id/_slug/more-info.vue | 4 - 5 files changed, 70 insertions(+), 76 deletions(-) diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index 3c67b8ae1..2b21282ae 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -1,75 +1,73 @@ From 01c9e083eb9fe7e99ba50a60328f59844d1c0a16 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 19:27:36 +0000 Subject: [PATCH 30/46] build(deps-dev): bump @babel/cli from 7.6.3 to 7.6.4 in /backend Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.3 to 7.6.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.6.4) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index d185688dd..e86f0fedb 100644 --- a/backend/package.json +++ b/backend/package.json @@ -105,7 +105,7 @@ "xregexp": "^4.2.4" }, "devDependencies": { - "@babel/cli": "~7.6.3", + "@babel/cli": "~7.6.4", "@babel/core": "~7.6.4", "@babel/node": "~7.6.3", "@babel/plugin-proposal-throw-expressions": "^7.2.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 553e8cdca..4f466b039 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -14,10 +14,10 @@ resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz#3ce939cb127fb8aaa3ffc1e90dff9b8af9f2e3dc" integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ== -"@babel/cli@~7.6.3": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.3.tgz#1b0c62098c8a5e01e4a4a59a52cba9682e7e0906" - integrity sha512-kWKOEeuylpa781yCeA5//eEx1u3WtLZqbi2VWXLKmb3QDPb5T2f7Yk311MK7bvvjR70dluAeiu4VXXsG1WwJsw== +"@babel/cli@~7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.4.tgz#9b35a4e15fa7d8f487418aaa8229c8b0bc815f20" + integrity sha512-tqrDyvPryBM6xjIyKKUwr3s8CzmmYidwgdswd7Uc/Cv0ogZcuS1TYQTLx/eWKP3UbJ6JxZAiYlBZabXm/rtRsQ== dependencies: commander "^2.8.1" convert-source-map "^1.1.0" @@ -27,7 +27,7 @@ mkdirp "^0.5.1" output-file-sync "^2.0.0" slash "^2.0.0" - source-map "^0.6.1" + source-map "^0.5.0" optionalDependencies: chokidar "^2.1.8" From d34018f6d44efb8b83bec9e955c8f5138aae8054 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 19:28:20 +0000 Subject: [PATCH 31/46] build(deps-dev): bump @babel/core from 7.6.3 to 7.6.4 in /webapp Bumps [@babel/core](https://github.com/babel/babel) from 7.6.3 to 7.6.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.6.4) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index a8cfb9016..14420f663 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -92,7 +92,7 @@ "zxcvbn": "^4.4.2" }, "devDependencies": { - "@babel/core": "~7.6.3", + "@babel/core": "~7.6.4", "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/preset-env": "~7.6.3", "@storybook/addon-a11y": "^5.2.3", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index b9dd64d1d..b1b8a55b2 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -56,15 +56,15 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.1.0", "@babel/core@^7.6.2", "@babel/core@~7.6.3": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.3.tgz#44de824e89eaa089bb12da7337bc9bdff2ab68f9" - integrity sha512-QfQ5jTBgXLzJuo7Mo8bZK/ePywmgNRgk/UQykiKwEtZPiFIn8ZqE6jB+AnD1hbB1S2xQyL4//it5vuAUOVAMTw== +"@babel/core@^7.1.0", "@babel/core@^7.6.2", "@babel/core@~7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff" + integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.6.3" + "@babel/generator" "^7.6.4" "@babel/helpers" "^7.6.2" - "@babel/parser" "^7.6.3" + "@babel/parser" "^7.6.4" "@babel/template" "^7.6.0" "@babel/traverse" "^7.6.3" "@babel/types" "^7.6.3" @@ -74,7 +74,7 @@ lodash "^4.17.13" resolve "^1.3.2" semver "^5.4.1" - source-map "^0.6.1" + source-map "^0.5.0" "@babel/generator@7.5.5": version "7.5.5" @@ -87,15 +87,15 @@ source-map "^0.5.0" trim-right "^1.0.1" -"@babel/generator@^7.4.0", "@babel/generator@^7.6.3": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.3.tgz#71d5375264f93ec7bac7d9f35a67067733f5578e" - integrity sha512-hLhYbAb3pHwxjlijC4AQ7mqZdcoujiNaW7izCT04CIowHK8psN0IN8QjDv0iyFtycF5FowUOTwDloIheI25aMw== +"@babel/generator@^7.4.0", "@babel/generator@^7.6.3", "@babel/generator@^7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671" + integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w== dependencies: "@babel/types" "^7.6.3" jsesc "^2.5.1" lodash "^4.17.13" - source-map "^0.6.1" + source-map "^0.5.0" "@babel/helper-annotate-as-pure@^7.0.0": version "7.0.0" @@ -294,10 +294,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.3.tgz#9eff8b9c3eeae16a74d8d4ff30da2bd0d6f0487e" - integrity sha512-sUZdXlva1dt2Vw2RqbMkmfoImubO0D0gaCrNngV6Hi0DA4x3o4mlrq0tbfY0dZEUIccH8I6wQ4qgEtwcpOR6Qg== +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81" + integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A== "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" From 30c3cf3e1ddd4d29b65119b60ad9fdc58e1282b2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 19:28:23 +0000 Subject: [PATCH 32/46] build(deps-dev): bump apollo-server-testing in /backend Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6. - [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.9.5...apollo-server-testing@2.9.6) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index 16d051f63..76b8d8d22 100644 --- a/backend/package.json +++ b/backend/package.json @@ -111,7 +111,7 @@ "@babel/plugin-proposal-throw-expressions": "^7.2.0", "@babel/preset-env": "~7.6.3", "@babel/register": "~7.6.2", - "apollo-server-testing": "~2.9.5", + "apollo-server-testing": "~2.9.6", "babel-core": "~7.0.0-0", "babel-eslint": "~10.0.3", "babel-jest": "~24.9.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index a9ecf7ff8..eb7904e6e 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1729,12 +1729,12 @@ apollo-server-plugin-base@^0.6.5: dependencies: apollo-server-types "^0.2.5" -apollo-server-testing@~2.9.5: - version "2.9.5" - resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.5.tgz#ff5bbe3fefdf4d639bb138277d3dfc846b309438" - integrity sha512-IoElvnJ0Zex6i1QZj9v0szbDvCM6LF1gSZlQswRuIeTwvvquzixFVGMpLZKItojmjrCSxsT7DHJxeUFugZJUWA== +apollo-server-testing@~2.9.6: + version "2.9.6" + resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.6.tgz#1cae51c93a8865b85e877e2c9927964cf32625e6" + integrity sha512-pbURQD5VjNFk4GMVVxyCds9rY4/NIqjvjE4tyf1k89RHwMdk+zuVggt/DGudteorZtqAqtsOIHWojMBU4s2klA== dependencies: - apollo-server-core "^2.9.5" + apollo-server-core "^2.9.6" apollo-server-types@^0.2.5: version "0.2.5" From 75d8b6f3fbb4f0d86ae360f4c36de13581b58b2d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 21:29:00 +0000 Subject: [PATCH 33/46] build(deps): bump nuxt from 2.10.0 to 2.10.1 in /webapp Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.10.0 to 2.10.1. - [Release notes](https://github.com/nuxt/nuxt.js/releases) - [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md) - [Commits](https://github.com/nuxt/nuxt.js/compare/v2.10.0...v2.10.1) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 253 +++++++++++++++++++++++++------------------- 2 files changed, 143 insertions(+), 112 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 3e5c01134..5e606caa2 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -72,7 +72,7 @@ "jsonwebtoken": "~8.5.1", "linkify-it": "~2.2.0", "node-fetch": "^2.6.0", - "nuxt": "~2.10.0", + "nuxt": "~2.10.1", "nuxt-dropzone": "^1.0.4", "nuxt-env": "~0.1.0", "stack-utils": "^1.0.2", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 50f58036c..5bac75d16 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -56,7 +56,7 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.1.0", "@babel/core@^7.6.2", "@babel/core@~7.6.4": +"@babel/core@^7.1.0", "@babel/core@^7.6.4", "@babel/core@~7.6.4": version "7.6.4" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff" integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ== @@ -679,7 +679,7 @@ "@babel/helper-regex" "^7.4.4" regexpu-core "^4.6.0" -"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.6.2", "@babel/preset-env@~7.6.3": +"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.6.3", "@babel/preset-env@~7.6.3": version "7.6.3" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271" integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ== @@ -750,13 +750,20 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5": version "7.6.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd" integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg== dependencies: regenerator-runtime "^0.13.2" +"@babel/runtime@^7.6.3": + version "7.6.3" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f" + integrity sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA== + dependencies: + regenerator-runtime "^0.13.2" + "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6" @@ -1158,28 +1165,28 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@nuxt/babel-preset-app@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.10.0.tgz#5f3cd3ef7dbd851d8120c28866f29ede7e64a43d" - integrity sha512-G+HY00F1e80ic2CwGMCA4FNAY1PcKMi/WshYOus8ObZxuHvlvsObKVilZq5l9P1xQqgcCoRyetEnhfMnpxqt7Q== +"@nuxt/babel-preset-app@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.10.1.tgz#9669ff09d652011fefeb55cdc1684cd21f49b34a" + integrity sha512-kTJ1+kperaoPdkIE1Do6x+/2cMEk0zMKiLCc6a4vUvnhkfPLc5m5/ylwx2kke42xXqTGHNX84BSaJ891AxDJgQ== dependencies: - "@babel/core" "^7.6.2" + "@babel/core" "^7.6.4" "@babel/plugin-proposal-class-properties" "^7.5.5" "@babel/plugin-proposal-decorators" "^7.6.0" "@babel/plugin-transform-runtime" "^7.6.2" - "@babel/preset-env" "^7.6.2" - "@babel/runtime" "^7.6.2" - "@vue/babel-preset-jsx" "^1.1.0" + "@babel/preset-env" "^7.6.3" + "@babel/runtime" "^7.6.3" + "@vue/babel-preset-jsx" "^1.1.1" core-js "^2.6.5" -"@nuxt/builder@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.10.0.tgz#3f59fe06c1bde1af25c969ca85ebfee7201d1151" - integrity sha512-c8NgfILAvFRBwstUu8x9l8TZUUM0FiDB8gPewvYPsP2uEuy5HEglhGzj8+/NDU/lgvHh2a9jToDjTX1LpYYHuQ== +"@nuxt/builder@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.10.1.tgz#06df592cb0e3b76a82505dbf34030834650264b2" + integrity sha512-LyKVoR7f8CKkeIk1EYvpXaMxO6ShASH3iA/5ck0PDm0qcl6iyn4bTwvF55cwkbPP+hStEjqpkhTccNxDTWCgQQ== dependencies: "@nuxt/devalue" "^1.2.4" - "@nuxt/utils" "2.10.0" - "@nuxt/vue-app" "2.10.0" + "@nuxt/utils" "2.10.1" + "@nuxt/vue-app" "2.10.1" chokidar "^3.2.1" consola "^2.10.1" fs-extra "^8.1.0" @@ -1192,18 +1199,18 @@ serialize-javascript "^2.1.0" upath "^1.2.0" -"@nuxt/cli@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.10.0.tgz#48c90a7c3d3be5d40b70daf8f2280f1865ccc2fe" - integrity sha512-nmARLjlBLWwWtWsgmyWTk4YGEkkUQvOqJS1YZlQy6CPU/itRdIDv9D/vbZZv2NkWegXQJOQ8UUv9iCue9g06bw== +"@nuxt/cli@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.10.1.tgz#92b43e2d7ea39703b63da0514228f353f2284061" + integrity sha512-byXTGebvtQfzd7yBSVeHD7IZqB+Qeh9shCO8Cn6j803fHJA7s+XwzhZq3lOqOvHBO4rQ3LTkjKnsBaYtGGtVuw== dependencies: - "@nuxt/config" "2.10.0" - "@nuxt/utils" "2.10.0" + "@nuxt/config" "2.10.1" + "@nuxt/utils" "2.10.1" boxen "^4.1.0" chalk "^2.4.2" consola "^2.10.1" esm "^3.2.25" - execa "^2.0.4" + execa "^2.1.0" exit "^0.1.2" fs-extra "^8.1.0" hable "^2.3.2" @@ -1213,25 +1220,25 @@ std-env "^2.2.1" wrap-ansi "^6.0.0" -"@nuxt/config@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.10.0.tgz#72c1713d57b8e50b4f08c1abe6b816a64f7d2e28" - integrity sha512-avDv8sNBhffok7tJXE9bUQm7wcSGcN0ZQdM9N/PFNbHfROZ6wm8umsotQaQbg2XVJQZ2k2PNKCEN+hNKcFmrNw== +"@nuxt/config@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.10.1.tgz#3a2fc555bcdecdedc366a8e5fac94f3553e86603" + integrity sha512-ydxDU1U4bEwLixn8wqYy8Y+4nVOtMaSodW0a4Kuyx9Z/3qnQbI0yvdO58I6CIw+6njAmATsAqaApIcX9bJQOeQ== dependencies: - "@nuxt/utils" "2.10.0" + "@nuxt/utils" "2.10.1" consola "^2.10.1" std-env "^2.2.1" -"@nuxt/core@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.10.0.tgz#71479a2f87160309486be5de358fea97b98cf072" - integrity sha512-Frhyoqz+uGVOvTXA3S1mTguOZVqxJFCbcx+FksC49WCR7q5OdrD8Z6mQeUmUW9dBa2l+p7hj9LCTa6ECf1wwvw== +"@nuxt/core@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.10.1.tgz#fc934d70e9112fdc5fe7b459977d7f82b783c1d8" + integrity sha512-6GLUNo7wILEEeEzxcTLVc3N5ao+A7z36iW5RUK1PibT2CERwlJbyoQILMioxXwTldPTA4tPAm7xmOgb4CC66Yw== dependencies: - "@nuxt/config" "2.10.0" + "@nuxt/config" "2.10.1" "@nuxt/devalue" "^1.2.4" - "@nuxt/server" "2.10.0" - "@nuxt/utils" "2.10.0" - "@nuxt/vue-renderer" "2.10.0" + "@nuxt/server" "2.10.1" + "@nuxt/utils" "2.10.1" + "@nuxt/vue-renderer" "2.10.1" consola "^2.10.1" debug "^4.1.1" esm "^3.2.25" @@ -1257,12 +1264,12 @@ error-stack-parser "^2.0.0" string-width "^2.0.0" -"@nuxt/generator@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.10.0.tgz#614ff34776f1796cbbd22c46dfcbbe7ad7e0ee60" - integrity sha512-5R6yuexDSSMXP5gGAnIZOJIBjfpmFXdaj8PsKkYjN3PNESVXTlJ8quBefV39QbCnyQgvNusOKppN3KmtpbDkdg== +"@nuxt/generator@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.10.1.tgz#5430cd908f25f095af3a07df8fe6febff871a0a0" + integrity sha512-tjd1cf1fX3eGpdIeacgkdWloOIin3XQBFzJoquNbz4noqwWuhjyN6Noi+9FaDrFpMu6qZE5rvX1Zf0/6kP1SJg== dependencies: - "@nuxt/utils" "2.10.0" + "@nuxt/utils" "2.10.1" chalk "^2.4.2" consola "^2.10.1" fs-extra "^8.1.0" @@ -1287,13 +1294,13 @@ consola "^2.10.1" node-fetch "^2.6.0" -"@nuxt/server@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.10.0.tgz#354f9f7fec04c8544791331194aba60eb0631a32" - integrity sha512-K3317JyzvQe7lhVtveOb56k+L9NlFt1I2BgSg5GDt0lp21Rpf+qGUK53GQBXIpvWc9P5VT5hr8m+nxEdZZQYpA== +"@nuxt/server@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.10.1.tgz#6f2a19ccde971df365f6a847c9a33181e81e2142" + integrity sha512-+1PMy8VknZWKj/uxKxwllTXuU+mgGOq17YSWfhKUAidlAb1YpdndlVOuWZgfdEsoQjJYq1vmIHMg8389chy7+g== dependencies: - "@nuxt/config" "2.10.0" - "@nuxt/utils" "2.10.0" + "@nuxt/config" "2.10.1" + "@nuxt/utils" "2.10.1" "@nuxtjs/youch" "^4.2.3" chalk "^2.4.2" compression "^1.7.4" @@ -1310,10 +1317,10 @@ serve-static "^1.14.1" server-destroy "^1.0.1" -"@nuxt/utils@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.10.0.tgz#7e1e618312c4048238050d97bf7ac61d1ce71804" - integrity sha512-DcBcUOf9qhVnaR0RqE/Ft+IbTgCQCttn4DM3CBRJJCQ9RV8CpLG8mfFsNtgnPTYrgDrUet67YrL5JcM9Ok02aw== +"@nuxt/utils@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.10.1.tgz#273f14519354b7676aa8640456716967c0b56857" + integrity sha512-SXTm0vSh3H6Izpib/p0IepopmKaJz4JUtSuHVoauCv+CQMj09GRUeKwZ8SbXjBNQmGI+tdKedVlUUKKYY8R4LQ== dependencies: consola "^2.10.1" fs-extra "^8.1.0" @@ -1324,47 +1331,47 @@ signal-exit "^3.0.2" ua-parser-js "^0.7.20" -"@nuxt/vue-app@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.10.0.tgz#fd5616d91c543ae0dfdf745167c481d8932381ec" - integrity sha512-63tnJCv5IReW9wJh63IHgw/F09hqkQ1ot+u8+umTsk45awYWE39VrwdNOkRdy2IHygIH2xxXIhtYkwZuX8xFhg== +"@nuxt/vue-app@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.10.1.tgz#76fc682d45faddf953044806a7c9f4ed0c6e6945" + integrity sha512-GyjBOwyngKrb4NeSRP5s8tr4ccu05FhwuaN+TIlXsRSaPYaGz7LnLsxp5UgHrgMJH8TqIB6k4b9syejR7FT8Jg== dependencies: node-fetch "^2.6.0" unfetch "^4.1.0" vue "^2.6.10" vue-client-only "^2.0.0" - vue-meta "^2.2.2" + vue-meta "^2.3.1" vue-no-ssr "^1.1.1" vue-router "~3.0.7" vue-template-compiler "^2.6.10" vuex "^3.1.1" -"@nuxt/vue-renderer@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.10.0.tgz#1e467d6b146670311cfb23e7e6f3933d2c58a296" - integrity sha512-uTkBDZUUJWi87RnViyC6x252NwQ9w3GuZMuN0Mv0v42+8S+BQ1/0bN84X2d5imdZz3kAlhsLJQ69GKrI75dCAA== +"@nuxt/vue-renderer@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.10.1.tgz#80219f78cda19fd0e665ed05eccdfcf23e3ee956" + integrity sha512-gjI8/0U5Qe5ieaRW9Y7/a+QOePABgvp4zkUZCUdQKtjniJ3AMKpvppSORKIH0YJl1Uv+X/BY84MfjEnLYdB0AQ== dependencies: "@nuxt/devalue" "^1.2.4" - "@nuxt/utils" "2.10.0" + "@nuxt/utils" "2.10.1" consola "^2.10.1" fs-extra "^8.1.0" lru-cache "^5.1.1" vue "^2.6.10" - vue-meta "^2.2.2" + vue-meta "^2.3.1" vue-server-renderer "^2.6.10" -"@nuxt/webpack@2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.10.0.tgz#c71f54994dbba52f24849f55eb275d87667f2da7" - integrity sha512-ah1G6nIP3PJaeS5oQXrAUyPwmeWos1ycgZXvADN2rkXP4I2hdpdRuFBVrl1NfNoCNq+Hw0hZeEL9vgN4SbbPXQ== +"@nuxt/webpack@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.10.1.tgz#515db338b5df1abc1fef1b196d21679ecc45b92e" + integrity sha512-AH88HI8mJPj6EcMztgsVbfEwcUT46kcAkgFpYbVeMmucf7IxChyS+uf1ev9q4+wWvw1B8Hp9enAIZXBfEIjYTg== dependencies: - "@babel/core" "^7.6.2" - "@nuxt/babel-preset-app" "2.10.0" + "@babel/core" "^7.6.4" + "@nuxt/babel-preset-app" "2.10.1" "@nuxt/friendly-errors-webpack-plugin" "^2.5.0" - "@nuxt/utils" "2.10.0" + "@nuxt/utils" "2.10.1" babel-loader "^8.0.6" cache-loader "^4.1.0" - caniuse-lite "^1.0.30000997" + caniuse-lite "^1.0.30000999" chalk "^2.4.2" consola "^2.10.1" css-loader "^3.2.0" @@ -1388,10 +1395,10 @@ semver "^6.3.0" std-env "^2.2.1" style-resources-loader "^1.2.1" - terser-webpack-plugin "^2.1.2" + terser-webpack-plugin "^2.1.3" thread-loader "^2.1.3" time-fix-plugin "^2.0.6" - url-loader "^2.1.0" + url-loader "^2.2.0" vue-loader "^15.7.1" webpack "^4.41.0" webpack-bundle-analyzer "^3.5.2" @@ -2485,16 +2492,16 @@ lodash.kebabcase "^4.1.1" svg-tags "^1.0.0" -"@vue/babel-preset-jsx@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.0.tgz#c8001329f5b372297a3111a251eb4f9e956c1266" - integrity sha512-EeZ9gwEmu79B4A6LMLAw5cPCVYIcbKWgJgJafWtLzh1S+SgERUmTkVQ9Vx4k8zYBiCuxHK3XziZ3VJIMau7THA== +"@vue/babel-preset-jsx@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.1.tgz#3a74642ca0ecea10aae13649df5ff70f9d24a6f5" + integrity sha512-SeyndwQZc8MAOkhbJaC34ocTwcKekKkwrwnTMC3YF8VmGp5IQWW5gPIU66bqO9WFBXFA3J3ANsUbP2pj8q8KdQ== dependencies: "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0" "@vue/babel-plugin-transform-vue-jsx" "^1.0.0" "@vue/babel-sugar-functional-vue" "^1.0.0" "@vue/babel-sugar-inject-h" "^1.0.0" - "@vue/babel-sugar-v-model" "^1.0.0" + "@vue/babel-sugar-v-model" "^1.1.1" "@vue/babel-sugar-v-on" "^1.1.0" "@vue/babel-sugar-functional-vue@^1.0.0": @@ -2511,10 +2518,10 @@ dependencies: "@babel/plugin-syntax-jsx" "^7.2.0" -"@vue/babel-sugar-v-model@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.0.0.tgz#f4da56aa67f65a349bd2c269a95e72e601af4613" - integrity sha512-Pfg2Al0io66P1eO6zUbRIgpyKCU2qTnumiE0lao/wA/uNdb7Dx5Tfd1W6tO5SsByETPnEs8i8+gawRIXX40rFw== +"@vue/babel-sugar-v-model@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.1.tgz#a0f0750fcee20769805a20178299eebd4babf25a" + integrity sha512-qiPbdUTiqNQdhXzvWQMVfrYGHCiMmscY7j/cudLxdxWZ8AFhgPRVlniVgaWIT7A1iOjs92e8U6qVyqkf0d4ZrA== dependencies: "@babel/plugin-syntax-jsx" "^7.2.0" "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0" @@ -4573,7 +4580,7 @@ cacache@^12.0.2: unique-filename "^1.1.1" y18n "^4.0.0" -cacache@^13.0.0: +cacache@^13.0.1: version "13.0.1" resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c" integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w== @@ -4732,10 +4739,10 @@ caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.300009 resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9" integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw== -caniuse-lite@^1.0.30000997: - version "1.0.30000998" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000998.tgz#7227a8046841e7d01e156ae7227a504d065f6744" - integrity sha512-8Tj5sPZR9kMHeDD9SZXIVr5m9ofufLLCG2Y4QwQrH18GIwG+kCc+zYdlR036ZRkuKjVVetyxeAgGA1xF7XdmzQ== +caniuse-lite@^1.0.30000999: + version "1.0.30000999" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz#427253a69ad7bea4aa8d8345687b8eec51ca0e43" + integrity sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg== capture-exit@^2.0.0: version "2.0.0" @@ -6829,6 +6836,21 @@ execa@^2.0.4: signal-exit "^3.0.2" strip-final-newline "^2.0.0" +execa@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99" + integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^3.0.0" + onetime "^5.1.0" + p-finally "^2.0.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -10882,18 +10904,18 @@ nuxt-env@~0.1.0: resolved "https://registry.yarnpkg.com/nuxt-env/-/nuxt-env-0.1.0.tgz#8ac50b9ff45391ad3044ea932cbd05f06a585f87" integrity sha512-7mTao3qG0zfN0hahk3O6SuDy0KEwYmNojammWQsMwhqMn3aUjX4nMYnWDa0pua+2/rwAY9oG53jQtLgJdG7f9w== -nuxt@~2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.10.0.tgz#854c21e87c8b237359253b9419f05149b6214b63" - integrity sha512-Hl5hbT6gbfNXinY74oFvYroa0d0rCKpJQgJaLDN57e8CZu9kCe/90Gr21BX1+npcguIicjup5EXZ4GwzlcXKDA== +nuxt@~2.10.1: + version "2.10.1" + resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.10.1.tgz#d02237baea11bfaa63d65e45231c41c6a7c18d49" + integrity sha512-75QQ3x1WAcoBb7krHLzSXVK2/TKUFCHfsskd0bbdAl1KI9Xweyd6SGtdgGsdjWOlaUhijsXFqrPnfPPmrpLMzQ== dependencies: - "@nuxt/builder" "2.10.0" - "@nuxt/cli" "2.10.0" - "@nuxt/core" "2.10.0" - "@nuxt/generator" "2.10.0" + "@nuxt/builder" "2.10.1" + "@nuxt/cli" "2.10.1" + "@nuxt/core" "2.10.1" + "@nuxt/generator" "2.10.1" "@nuxt/loading-screen" "^1.2.0" "@nuxt/opencollective" "^0.3.0" - "@nuxt/webpack" "2.10.0" + "@nuxt/webpack" "2.10.1" nwsapi@^2.0.7: version "2.1.4" @@ -14458,18 +14480,18 @@ terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.1: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser-webpack-plugin@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.1.2.tgz#2b9b8147a6f18918348200800cf9560c50f701bb" - integrity sha512-MF/C4KABwqYOfRDi87f7gG07GP7Wj/kyiX938UxIGIO6l5mkh8XJL7xtS0hX/CRdVQaZI7ThGUPZbznrCjsGpg== +terser-webpack-plugin@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.1.3.tgz#85430da71ba88a60072bf659589eafaf6a00dc22" + integrity sha512-z5Utx0TxmirZvRNL1GC795tlDM+bO83ZfcbtkL1y1VLoWtZ7S2a9+HFCLnabSRE/Yjsu4zCEX6U6CIRo4dVmcQ== dependencies: - cacache "^13.0.0" + cacache "^13.0.1" find-cache-dir "^3.0.0" jest-worker "^24.9.0" schema-utils "^2.4.1" serialize-javascript "^2.1.0" source-map "^0.6.1" - terser "^4.3.4" + terser "^4.3.8" webpack-sources "^1.4.3" terser@^4.1.2: @@ -14481,10 +14503,10 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.4.tgz#ad91bade95619e3434685d69efa621a5af5f877d" - integrity sha512-Kcrn3RiW8NtHBP0ssOAzwa2MsIRQ8lJWiBG/K7JgqPlomA3mtb2DEmp4/hrUA+Jujx+WZ02zqd7GYD+QRBB/2Q== +terser@^4.3.8: + version "4.3.8" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.8.tgz#707f05f3f4c1c70c840e626addfdb1c158a17136" + integrity sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ== dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -15082,7 +15104,7 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-loader@^2.0.1, url-loader@^2.1.0: +url-loader@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz#bcc1ecabbd197e913eca23f5e0378e24b4412961" integrity sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A== @@ -15091,6 +15113,15 @@ url-loader@^2.0.1, url-loader@^2.1.0: mime "^2.4.4" schema-utils "^2.0.0" +url-loader@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.2.0.tgz#af321aece1fd0d683adc8aaeb27829f29c75b46e" + integrity sha512-G8nk3np8ZAnwhHXas1JxJEwJyQdqFXAKJehfgZ/XrC48volFBRtO+FIKtF2u0Ma3bw+4vnDVjHPAQYlF9p2vsw== + dependencies: + loader-utils "^1.2.3" + mime "^2.4.4" + schema-utils "^2.4.1" + url-parse-lax@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" @@ -15358,10 +15389,10 @@ vue-loader@^15.7.1, vue-loader@~15.7.0: vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" -vue-meta@^2.2.2: - version "2.3.0" - resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-2.3.0.tgz#7f4af99b02c7a1811ad332110839f0c8ab1c4ea3" - integrity sha512-pLfbtVco5HXWQ6byjK+KdmGZJFaXcE441Dt1UmuQmT1lyX05QLRZo5laDYSHZdgGyHyiUsykZAKVBRXBCvDa6w== +vue-meta@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-2.3.1.tgz#32a1c2634f49433f30e7e7a028aa5e5743f84f6a" + integrity sha512-hnZvDNvLh+PefJLfYkZhG6cSBNKikgQyiEK8lI/P2qscM1DC/qHHOfdACPQ/VDnlaWU9VlcobCTNyVtssTR4XQ== dependencies: deepmerge "^4.0.0" From c8fdaef72984d9bb15668ef4699c6cf91fd6178e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 21:54:45 +0000 Subject: [PATCH 34/46] build(deps): bump apollo-server from 2.9.5 to 2.9.6 in /backend Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6. - [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.9.5...apollo-server@2.9.6) 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 3d681cb8e..d52b11407 100644 --- a/backend/package.json +++ b/backend/package.json @@ -47,7 +47,7 @@ "apollo-client": "~2.6.4", "apollo-link-context": "~1.0.19", "apollo-link-http": "~1.5.16", - "apollo-server": "~2.9.5", + "apollo-server": "~2.9.6", "apollo-server-express": "^2.9.6", "babel-plugin-transform-runtime": "^6.23.0", "bcryptjs": "~2.4.3", diff --git a/backend/yarn.lock b/backend/yarn.lock index 30ec32b2d..b8fd5828f 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1660,7 +1660,7 @@ apollo-server-caching@^0.5.0: dependencies: lru-cache "^5.0.0" -apollo-server-core@^2.9.5, apollo-server-core@^2.9.6: +apollo-server-core@^2.9.6: version "2.9.6" resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.6.tgz#b6dc087200633f47ca4f08244d3e606b4d616320" integrity sha512-2tHAWQxP7HrETI/BZvg2fem6YlahF9HUp4Y6SSL95WP3uNMOJBlN12yM1y+O2u5K5e4jwdPNaLjoL2A/26XrLw== @@ -1700,7 +1700,7 @@ apollo-server-errors@^2.3.3: resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz#83763b00352c10dc68fbb0d41744ade66de549ff" integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g== -apollo-server-express@^2.9.5, apollo-server-express@^2.9.6: +apollo-server-express@^2.9.6: version "2.9.6" resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.6.tgz#eec2ec43b829b059278e14994d06bd23e43266f9" integrity sha512-j80azBeXvLvyZsbqCnus7GH+w8vk+2IOnYzROZu/f0D2roDZtsu1XZkn+aplDJZXMcEXtqB6t4qNpyvV4zY0XQ== @@ -1745,13 +1745,13 @@ apollo-server-types@^0.2.5: apollo-server-caching "^0.5.0" apollo-server-env "^2.4.3" -apollo-server@~2.9.5: - version "2.9.5" - resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.5.tgz#4f616337d04f2f0886d4bbe46b047a32a649b1fd" - integrity sha512-hbWZAZ3g186NG9U9bVmMpPcbUJ+/f/CSL+/tJsK6iQPp5L3hcVYoe+/qDw3zpfDMA5R2Jq/yHZtF2LcI5ylVnQ== +apollo-server@~2.9.6: + version "2.9.6" + resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.6.tgz#11b6f1128ddb674d2651bb289e0c0fc28aa18653" + integrity sha512-sDvrGpMQsTGQ9FTkFm3xracrSUi8nFoh3svlD98pe6qb75UDDrXAZgxwQCSOwZ3BkaJ7UkdndfhnruhFstTeMw== dependencies: - apollo-server-core "^2.9.5" - apollo-server-express "^2.9.5" + apollo-server-core "^2.9.6" + apollo-server-express "^2.9.6" express "^4.0.0" graphql-subscriptions "^1.0.0" graphql-tools "^4.0.0" From 319de54265b91d93570652de0ab2f0ae60b726c9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 07:06:25 +0000 Subject: [PATCH 35/46] build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /backend Bumps node from 12.11.1-alpine to 12.12.0-alpine. Signed-off-by: dependabot-preview[bot] --- backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 1df199c1f..3dae08143 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.11.1-alpine as base +FROM node:12.12.0-alpine as base LABEL Description="Backend of the Social Network Human-Connection.org" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)" EXPOSE 4000 From 34b441a5aaeef5a505200f815cc0b57f99e5662e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 07:06:54 +0000 Subject: [PATCH 36/46] build(deps): bump @nuxtjs/sentry from 3.0.0 to 3.0.1 in /webapp Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/nuxt-community/sentry-module/releases) - [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md) - [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.0.0...v3.0.1) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 1172 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 1040 insertions(+), 134 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 5e606caa2..6c56c2d2a 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -57,7 +57,7 @@ "@nuxtjs/axios": "~5.6.0", "@nuxtjs/dotenv": "~1.4.1", "@nuxtjs/pwa": "^3.0.0-beta.19", - "@nuxtjs/sentry": "^3.0.0", + "@nuxtjs/sentry": "^3.0.1", "@nuxtjs/style-resources": "~1.0.0", "accounting": "~0.4.1", "apollo-cache-inmemory": "~1.6.3", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 5bac75d16..32738415f 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1456,17 +1456,17 @@ jimp-compact "^0.8.0" workbox-cdn "^4.3.1" -"@nuxtjs/sentry@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.0.0.tgz#7ca3a25b7b2ea35a953292a7961deb515a6d9140" - integrity sha512-xVuSpnB6kepdjaZzP9u9DUwRVmJrbPXNIsbxWZNfzw9hv5ZXzjIydJticsnDuDTixzFEuLtsm+vfDY7oVEA8Gw== +"@nuxtjs/sentry@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.0.1.tgz#4ff16fac4008c28349c90a5f51c84231b1a19dfd" + integrity sha512-6Yjx+ICRnBVppz3pAuNePNzevjHlD/27LqVplw8LMr2tRjFwFUXDD+rwFAHdyKhtN7M3CW4NLydDQLEQ4kjRtw== dependencies: - "@sentry/browser" "^5.2.0" - "@sentry/integrations" "^5.2.0" - "@sentry/node" "^5.2.0" - "@sentry/webpack-plugin" "^1.6.2" - consola "^2.6.1" - deepmerge "^3.2.0" + "@sentry/browser" "^5.7.0" + "@sentry/integrations" "^5.7.0" + "@sentry/node" "^5.7.0" + "@sentry/webpack-plugin" "^1.9.1" + consola "^2.10.1" + deepmerge "^4.1.1" "@nuxtjs/style-resources@~1.0.0": version "1.0.0" @@ -1712,105 +1712,187 @@ dependencies: any-observable "^0.3.0" -"@sentry/browser@^5.2.0": - version "5.6.2" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.6.2.tgz#f39e95c3aff2d4b4fd5d0d4aa7192af73f20d24e" - integrity sha512-Nm/W/5ra6+OQCWQkdd86vHjcYUjHCVqCzQyPasd6HE7SNlWe5euGVfFfDuUFsiDrMAG5uKfGYw5u/AqoweiQkQ== +"@sentry/browser@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.0.tgz#daaf36dfd30cf831b8c6d9c5a488a5fc629ebc6b" + integrity sha512-hbybYP5onstb8PfqjCubMuXkoXQBjZ3RCaxrOFLOIqpIxajrQ2zmbnaCzfBPWWwKeHa9P+i625OT973OhhHFMA== dependencies: - "@sentry/core" "5.6.2" - "@sentry/types" "5.6.1" - "@sentry/utils" "5.6.1" + "@sentry/core" "5.7.0" + "@sentry/types" "5.7.0" + "@sentry/utils" "5.7.0" tslib "^1.9.3" -"@sentry/cli@^1.44.4": - version "1.47.1" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.47.1.tgz#6a3238e5bfa4f618867bc0bc145b8e2ba191ff46" - integrity sha512-WijaRu1lb99OL6rHee6uOSb1wDyNCbrWcTJoRCuZD83K2fw3U58p68nli/y8CoMwQ55Mrg6CgtY8pmBiuseG0A== +"@sentry/cli@^1.48.0": + version "1.48.0" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.48.0.tgz#cccf2badd3fab9aeaafeaf6ef21bc74e2f6b6790" + integrity sha512-Td6UpZP6BoI0R5Guctiq3NIphAfskbyeiboWx4H1yuXPA9p4F0hL+Hrz6k3NNfzkt3AQzEkeAhvpKmIfmUOkjA== dependencies: fs-copy-file-sync "^1.1.1" - https-proxy-agent "^2.2.1" + https-proxy-agent "^3.0.0" mkdirp "^0.5.1" node-fetch "^2.1.2" progress "2.0.0" proxy-from-env "^1.0.0" -"@sentry/core@5.6.2": - version "5.6.2" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.6.2.tgz#8c5477654a83ebe41a72e86a79215deb5025e418" - integrity sha512-grbjvNmyxP5WSPR6UobN2q+Nss7Hvz+BClBT8QTr7VTEG5q89TwNddn6Ej3bGkaUVbct/GpVlI3XflWYDsnU6Q== +"@sentry/core@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.0.tgz#c2aa5341e703ec7cf2acc69e51971a0b1f7d102a" + integrity sha512-gQel0d7LBSWJGHc7gfZllYAu+RRGD9GcYGmkRfemurmDyDGQDf/sfjiBi8f9QxUc2iFTHnvIR5nMTyf0U3yl3Q== dependencies: - "@sentry/hub" "5.6.1" - "@sentry/minimal" "5.6.1" - "@sentry/types" "5.6.1" - "@sentry/utils" "5.6.1" + "@sentry/hub" "5.7.0" + "@sentry/minimal" "5.7.0" + "@sentry/types" "5.7.0" + "@sentry/utils" "5.7.0" tslib "^1.9.3" -"@sentry/hub@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.6.1.tgz#9f355c0abcc92327fbd10b9b939608aa4967bece" - integrity sha512-m+OhkIV5yTAL3R1+XfCwzUQka0UF/xG4py8sEfPXyYIcoOJ2ZTX+1kQJLy8QQJ4RzOBwZA+DzRKP0cgzPJ3+oQ== +"@sentry/hub@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.0.tgz#f7c356202a9db1daae82ce7f48ebf1139e4e9d02" + integrity sha512-qNdYheJ6j4P9Sk0eqIINpJohImmu/+trCwFb4F8BGLQth5iGMVQD6D0YUrgjf4ZaQwfhw9tv4W6VEfF5tyASoA== dependencies: - "@sentry/types" "5.6.1" - "@sentry/utils" "5.6.1" + "@sentry/types" "5.7.0" + "@sentry/utils" "5.7.0" tslib "^1.9.3" -"@sentry/integrations@^5.2.0": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.6.1.tgz#fcee1a6e5535a07fdefd365178662283279ce0d7" - integrity sha512-bPtJbmhLDH9Exy0luIKxjlfqmuyAjUPTHZ2CLIw6YlhA5WgK9aYyyjLHTmWK+E9baZBqSp0ShVPAgue2jfpQmQ== +"@sentry/integrations@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.7.0.tgz#17c294d93796f60f2a25be21af20816b9f2e7b90" + integrity sha512-Yin6w2D7w855BO1TaatW5uvsuteJHaZuQmdFYIh1EzDJ5cJC4qZd0Z78Q2e9+dSO/XlaLYgeQT48yJJ9hTVT8g== dependencies: - "@sentry/types" "5.6.1" - "@sentry/utils" "5.6.1" + "@sentry/types" "5.7.0" + "@sentry/utils" "5.7.0" tslib "^1.9.3" -"@sentry/minimal@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.6.1.tgz#09d92b26de0b24555cd50c3c33ba4c3e566009a1" - integrity sha512-ercCKuBWHog6aS6SsJRuKhJwNdJ2oRQVWT2UAx1zqvsbHT9mSa8ZRjdPHYOtqY3DoXKk/pLUFW/fkmAnpdMqRw== +"@sentry/minimal@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.0.tgz#832d26bcd862c6ea628d48ad199ac7f966a2d907" + integrity sha512-0sizE2prS9nmfLyVUKmVzFFFqRNr9iorSCCejwnlRe3crqKqjf84tuRSzm6NkZjIyYj9djuuo9l9XN12NLQ/4A== dependencies: - "@sentry/hub" "5.6.1" - "@sentry/types" "5.6.1" + "@sentry/hub" "5.7.0" + "@sentry/types" "5.7.0" tslib "^1.9.3" -"@sentry/node@^5.2.0": - version "5.6.2" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.6.2.tgz#4b62f056031da65cad78220d48c546b8bfbfaed7" - integrity sha512-A9CELco6SjF4zt8iS1pO3KdUVI2WVhtTGhSH6X04OVf2en1fimPR+Vs8YVY/04udwd7o+3mI6byT+rS9+/Qzow== +"@sentry/node@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.7.0.tgz#153777f06b2fcd346edbff9adbb6b231c7e5fa0a" + integrity sha512-iqQbGAJDBlpQkp1rl9RkDCIfnukr4cOtHPgJPmLY19m/KXIHD2cdKhvbqoCvIPBTIAeSGQIvDT9jD5zT46eoqQ== dependencies: - "@sentry/core" "5.6.2" - "@sentry/hub" "5.6.1" - "@sentry/types" "5.6.1" - "@sentry/utils" "5.6.1" - cookie "0.3.1" - https-proxy-agent "2.2.1" - lru_map "0.3.3" + "@sentry/core" "5.7.0" + "@sentry/hub" "5.7.0" + "@sentry/types" "5.7.0" + "@sentry/utils" "5.7.0" + cookie "^0.3.1" + https-proxy-agent "^3.0.0" + lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/types@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.6.1.tgz#5915e1ee4b7a678da3ac260c356b1cb91139a299" - integrity sha512-Kub8TETefHpdhvtnDj3kKfhCj0u/xn3Zi2zIC7PB11NJHvvPXENx97tciz4roJGp7cLRCJsFqCg4tHXniqDSnQ== +"@sentry/types@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.0.tgz#e8677e57b40c2c63cad42c02add12b238e647c10" + integrity sha512-bFRVortg713dE2yJXNFgNe6sNBVVSkpoELLkGPatdVQi0dYc6OggIIX4UZZvkynFx72GwYqO1NOrtUcJY2gmMg== -"@sentry/utils@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.6.1.tgz#69d9e151e50415bc91f2428e3bcca8beb9bc2815" - integrity sha512-rfgha+UsHW816GqlSRPlniKqAZylOmQWML2JsujoUP03nPu80zdN43DK9Poy/d9OxBxv0gd5K2n+bFdM2kqLQQ== +"@sentry/utils@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.0.tgz#a6850aa4f5476fa26517cd5c6248f871d8d9939b" + integrity sha512-XmwQpLqea9mj8x1N7P/l4JvnEb0Rn5Py5OtBgl0ctk090W+GB1uM8rl9mkMf6698o1s1Z8T/tI/QY0yFA5uZXg== dependencies: - "@sentry/types" "5.6.1" + "@sentry/types" "5.7.0" tslib "^1.9.3" -"@sentry/webpack-plugin@^1.6.2": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.8.0.tgz#eb41194a222789fcf27aebc7d7d453fe85af9dc2" - integrity sha512-cRNvk70o50q0P952f0rArzvjk8Qvzw40K4B8dziLdNjIIYBGQ3fV+JCY7dta72AdBWB13g8L8SPqCQr8C3PgoQ== +"@sentry/webpack-plugin@^1.9.1": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.9.1.tgz#4c4a284cb80179f6cc002fc420b11a0b9d0b50e8" + integrity sha512-CzvPvlgIfer8eBNopvQKnoIeQWL227ZbC4TNEx/jVxyO7LO8PuiTLLkn/ciNA6MrLTWLh1A7tTzGDoK1WdNJew== dependencies: - "@sentry/cli" "^1.44.4" + "@sentry/cli" "^1.48.0" + snyk "^1.231.0" "@sindresorhus/is@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== +"@snyk/cli-interface@1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-1.5.0.tgz#b9dbe6ebfb86e67ffabf29d4e0d28a52670ac456" + integrity sha512-+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg== + dependencies: + tslib "^1.9.3" + +"@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.1.0.tgz#2e7ecd9457c91b78ce3e5b91451e823f218a25af" + integrity sha512-b/magC8iNQP9QhSDeV9RQDSaY3sNy57k0UH1Y/sMOSvVLHLsA7dOi/HrPWTiLouyGqcuYzwjkz7bNbu8cwmVDQ== + dependencies: + tslib "^1.9.3" + +"@snyk/cocoapods-lockfile-parser@2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-2.0.4.tgz#296421454ba2ee9248ce1f13da57aa1b10b54de7" + integrity sha512-d57bajPjqCiNXMuyMmt9Zt98zbjABZUFw+91B705flzV6oB7OThgtA40Eoin6iatYoStIx28bC3T6b0mScy/iA== + dependencies: + "@snyk/dep-graph" "^1.11.0" + "@snyk/ruby-semver" "^2.0.4" + "@types/js-yaml" "^3.12.1" + core-js "^3.2.0" + js-yaml "^3.13.1" + source-map-support "^0.5.7" + tslib "^1.9.3" + +"@snyk/composer-lockfile-parser@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.0.3.tgz#4b703883ec36f3cec63c64355031e06698c771f5" + integrity sha512-hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg== + dependencies: + lodash "^4.17.13" + +"@snyk/dep-graph@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.12.0.tgz#aa0df8549849a4857bc5510e839da268293e4750" + integrity sha512-n7+PlHn3SqznHgsCpeBRfEvU1oiQydoGkXQlnSB2+tfImiKXvY7YZbrg4wlbvYgylYiTbpCi5CpPNkJG14S+UQ== + dependencies: + graphlib "^2.1.5" + lodash "^4.7.14" + object-hash "^1.3.1" + semver "^6.0.0" + source-map-support "^0.5.11" + tslib "^1.9.3" + +"@snyk/dep-graph@1.13.0", "@snyk/dep-graph@^1.11.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.13.0.tgz#855f628da0b833dd16c02c2f977507bbf090b894" + integrity sha512-e0XcLH6Kgs/lunf6iDjbxEnm9+JYFEJn6eo/PlEUW+SMWBZ2uEXHBTDNp9oxjJou48PngzWMveEkniBAN+ulOQ== + dependencies: + graphlib "^2.1.5" + lodash "^4.7.14" + object-hash "^1.3.1" + semver "^6.0.0" + source-map-support "^0.5.11" + tslib "^1.9.3" + +"@snyk/gemfile@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457" + integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== + +"@snyk/ruby-semver@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@snyk/ruby-semver/-/ruby-semver-2.0.4.tgz#457686ea7a4d60b10efddde99587efb3a53ba884" + integrity sha512-ceMD4CBS3qtAg+O0BUvkKdsheUNCqi+/+Rju243Ul8PsUgZnXmGiqfk/2z7DCprRQnxUTra4+IyeDQT7wAheCQ== + dependencies: + lodash "^4.17.14" + +"@snyk/snyk-cocoapods-plugin@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-1.0.3.tgz#eb685590e6a478e1d86f1042c9493426f2f9764a" + integrity sha512-AHAA7z23nPi1eHODsDxeSkl73Ze3yphuqJjMl39ie323EzBDcb9g6uAACrk0Qn2K/K2D8uyxMAf2zDtc+JGQfw== + dependencies: + "@snyk/cli-interface" "1.5.0" + "@snyk/cocoapods-lockfile-parser" "2.0.4" + "@snyk/dep-graph" "1.13.0" + source-map-support "^0.5.7" + tslib "^1.9.3" + "@storybook/addon-a11y@^5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.3.tgz#bcfb50b92b2a17c36e4cbb0b42a0c586e40aa68e" @@ -2143,6 +2225,14 @@ dependencies: "@types/node" "*" +"@types/agent-base@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@types/agent-base/-/agent-base-4.2.0.tgz#00644e8b395b40e1bf50aaf1d22cabc1200d5051" + integrity sha512-8mrhPstU+ZX0Ugya8tl5DsDZ1I5ZwQzbL/8PA0z8Gj0k9nql7nkaMzmPVLj+l/nixWaliXi+EBiLA8bptw3z7Q== + dependencies: + "@types/events" "*" + "@types/node" "*" + "@types/babel__core@^7.1.0": version "7.1.1" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.1.tgz#ce9a9e5d92b7031421e1d0d74ae59f572ba48be6" @@ -2192,6 +2282,13 @@ "@types/connect" "*" "@types/node" "*" +"@types/bunyan@*": + version "1.8.6" + resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.6.tgz#6527641cca30bedec5feb9ab527b7803b8000582" + integrity sha512-YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ== + dependencies: + "@types/node" "*" + "@types/connect@*": version "3.4.32" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28" @@ -2221,6 +2318,11 @@ dependencies: "@types/express" "*" +"@types/debug@^4.1.4": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" + integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== + "@types/events@*": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" @@ -2308,6 +2410,11 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" +"@types/js-yaml@^3.12.1": + version "3.12.1" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656" + integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA== + "@types/json-schema@^7.0.3": version "7.0.3" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" @@ -2362,6 +2469,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.6.tgz#9cbfcb62c50947217f4d88d4d274cc40c22625a9" integrity sha512-Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg== +"@types/node@^6.14.4": + version "6.14.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.7.tgz#2173f79d7a61d97d3aad2feeaac7ac69a3df39af" + integrity sha512-YbPXbaynBTe0pVExPhL76TsWnxSPeFAvImIsmylpBWn/yfw+lHy+Q68aawvZHsgskT44ZAoeE67GM5f+Brekew== + "@types/object-assign@^4.0.30": version "4.0.30" resolved "https://registry.yarnpkg.com/@types/object-assign/-/object-assign-4.0.30.tgz#8949371d5a99f4381ee0f1df0a9b7a187e07e652" @@ -2405,6 +2517,19 @@ "@types/prop-types" "*" csstype "^2.2.0" +"@types/restify@^4.3.6": + version "4.3.6" + resolved "https://registry.yarnpkg.com/@types/restify/-/restify-4.3.6.tgz#5da5889b65c34c33937a67686bab591325dde806" + integrity sha512-4l4f0EXnleXQttlhRCXtTuJ8UelsKiAKIK2AAEd2epBHu41aEbM0U2z6E5tUrNwlbxz7qaNBISduGMeg+G3PaA== + dependencies: + "@types/bunyan" "*" + "@types/node" "*" + +"@types/semver@^5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" + integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== + "@types/serve-static@*": version "1.13.2" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48" @@ -2441,6 +2566,14 @@ "@types/events" "*" "@types/node" "*" +"@types/xml2js@0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.4.3.tgz#2f41bfc74d5a4022511721f872ed395a210ad3b7" + integrity sha512-Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g== + dependencies: + "@types/events" "*" + "@types/node" "*" + "@types/yargs-parser@*": version "13.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0" @@ -2765,12 +2898,17 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +"@yarnpkg/lockfile@^1.0.2": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + abab@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w== -abbrev@1: +abbrev@1, abbrev@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -2831,13 +2969,20 @@ address@^1.0.1: resolved "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz#ef8e047847fcd2c5b6f50c16965f924fd99fe709" integrity sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ== -agent-base@^4.1.0, agent-base@^4.3.0: +agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== dependencies: es6-promisify "^5.0.0" +agent-base@~4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" + integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== + dependencies: + es6-promisify "^5.0.0" + aggregate-error@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.0.tgz#5b5a3c95e9095f311c9ab16c19fb4f3527cd3f79" @@ -2933,7 +3078,7 @@ ansi-colors@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== -ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: +ansi-escapes@3.2.0, ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== @@ -2991,7 +3136,7 @@ ansi-to-html@^0.6.11: dependencies: entities "^1.1.1" -ansicolors@~0.3.2: +ansicolors@^0.3.2, ansicolors@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= @@ -3483,6 +3628,11 @@ aproba@^1.0.3, aproba@^1.1.1: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +archy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= + are-we-there-yet@~1.1.2: version "1.1.5" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" @@ -3650,7 +3800,7 @@ ast-types@0.13.1: resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.1.tgz#9461428a270c5a27fda44b738dd3bab2e9353003" integrity sha512-b+EeK0WlzrSmpMw5jktWvQGxblpWnvMrV+vOp69RLjzGiHwWV0vgq75DPKtUjppKni3yWwSW8WLGV3Ch/XIWcQ== -ast-types@^0.13.0: +ast-types@0.x.x, ast-types@^0.13.0: version "0.13.2" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48" integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA== @@ -3687,6 +3837,11 @@ async-validator@^3.1.0: resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.1.0.tgz#447db5eb003cbb47e650f040037a29fc3881ce92" integrity sha512-XyAHGwtpx3Y3aHIOaGXXFo4tiulnrh+mXBU9INxig6Q8rtmtmBxDuCxb60j7EIGbAsQg9cxfJ2jrUZ+fIqEnBQ== +async@^1.4.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" + integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= + async@^2.1.4: version "2.6.2" resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" @@ -4689,7 +4844,7 @@ camelcase-keys@^2.0.0: camelcase "^2.0.0" map-obj "^1.0.0" -camelcase@^2.0.0: +camelcase@^2.0.0, camelcase@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= @@ -5067,7 +5222,7 @@ clipboard@^2.0.0: select "^1.1.2" tiny-emitter "^2.0.0" -cliui@^3.2.0: +cliui@^3.0.3, cliui@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= @@ -5085,6 +5240,16 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" +clone-deep@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8" + integrity sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg= + dependencies: + for-own "^1.0.0" + is-plain-object "^2.0.1" + kind-of "^3.2.2" + shallow-clone "^0.1.2" + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -5268,7 +5433,7 @@ config-chain@^1.1.12: ini "^1.3.4" proto-list "~1.2.1" -configstore@^3.0.0: +configstore@^3.0.0, configstore@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw== @@ -5290,7 +5455,7 @@ connect@^3.7.0: parseurl "~1.3.3" utils-merge "1.0.1" -consola@^2.10.0, consola@^2.10.1, consola@^2.4.0, consola@^2.5.6, consola@^2.6.0, consola@^2.6.1, consola@^2.9.0: +consola@^2.10.0, consola@^2.10.1, consola@^2.4.0, consola@^2.5.6, consola@^2.6.0, consola@^2.9.0: version "2.10.1" resolved "https://registry.yarnpkg.com/consola/-/consola-2.10.1.tgz#4693edba714677c878d520e4c7e4f69306b4b927" integrity sha512-4sxpH6SGFYLADfUip4vuY65f/gEogrzJoniVhNUYkJHtng0l8ZjnDCqxxrSVRHOHwKxsy8Vm5ONZh1wOR3/l/w== @@ -5372,16 +5537,16 @@ cookie-universal@^2.0.16: "@types/cookie" "^0.3.1" cookie "^0.3.1" -cookie@0.3.1, cookie@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= - cookie@0.4.0, cookie@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= + copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -5440,6 +5605,11 @@ core-js@^3.0.1, core-js@^3.0.4: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07" integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ== +core-js@^3.2.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.2.tgz#cd42da1d7b0bb33ef11326be3a721934277ceb42" + integrity sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg== + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -5874,6 +6044,11 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +data-uri-to-buffer@1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835" + integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ== + data-urls@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" @@ -5903,14 +6078,14 @@ de-indent@^1.0.2: resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9: +debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@=3.1.0: +debug@3.1.0, debug@=3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== @@ -5963,15 +6138,10 @@ deep-object-diff@^1.1.0: resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a" integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw== -deepmerge@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e" - integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow== - -deepmerge@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz#3e3110ca29205f120d7cb064960a39c3d2087c09" - integrity sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww== +deepmerge@^4.0.0, deepmerge@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.1.1.tgz#ee0866e4019fe62c1276b9062d4c4803d9aea14c" + integrity sha512-+qO5WbNBKBaZez95TffdUDnGIo4+r5kmsX8aOb7PDHvXsTbghAmleuxjs6ytNaf5Eg4FGBXDS5vqO61TRi6BMg== defaults@^1.0.3: version "1.0.3" @@ -6019,6 +6189,15 @@ defu@^0.0.3: resolved "https://registry.yarnpkg.com/defu/-/defu-0.0.3.tgz#bdc3ea1e1ab2120d4d4a129147f3ba9b7f9fe103" integrity sha512-u/fe4fBwrD0KACvI0sYWTWFzooqONZq8ywPnK0ZkAgLNwaDTKpSWvMiiU4QmzhrQCXu8Y0+HIWP8amE18lsL4A== +degenerator@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095" + integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU= + dependencies: + ast-types "0.x.x" + escodegen "1.x.x" + esprima "3.x.x" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -6122,6 +6301,13 @@ dir-glob@2.0.0: arrify "^1.0.1" path-type "^3.0.0" +dockerfile-ast@0.0.16: + version "0.0.16" + resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz#10b329d343329dab1de70375833495f85ad65913" + integrity sha512-+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw== + dependencies: + vscode-languageserver-types "^3.5.0" + doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" @@ -6245,6 +6431,17 @@ dotenv@^8.0.0, dotenv@^8.1.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.1.0.tgz#d811e178652bfb8a1e593c6dd704ec7e90d85ea2" integrity sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA== +dotnet-deps-parser@4.5.2: + version "4.5.2" + resolved "https://registry.yarnpkg.com/dotnet-deps-parser/-/dotnet-deps-parser-4.5.2.tgz#f3223fa2b9d0d247c3e855d6b5a292904c2c8109" + integrity sha512-bk5Q1luEwQ10rrBwZbtTxUNadaLz2dM6xzOLoTK+oUBcaq6saCeELmkIgdG+Fwkn58XRgLQvOySVS0gp4OG6RA== + dependencies: + "@types/xml2js" "0.4.3" + lodash "^4.17.11" + source-map-support "^0.5.7" + tslib "^1.9.3" + xml2js "0.4.19" + dropzone@^5.5.1: version "5.5.1" resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.5.1.tgz#06e2f513e61d6aa363d4b556f18574f47cf7ba26" @@ -6345,6 +6542,11 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +email-validator@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed" + integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ== + emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -6494,6 +6696,18 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1 resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escodegen@1.x.x: + version "1.12.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541" + integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg== + dependencies: + esprima "^3.1.3" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + escodegen@^1.9.1: version "1.11.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510" @@ -6698,7 +6912,7 @@ espree@^5.0.1: acorn-jsx "^5.0.0" eslint-visitor-keys "^1.0.0" -esprima@^3.1.3: +esprima@3.x.x, esprima@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM= @@ -7123,6 +7337,11 @@ file-system-cache@^1.0.5: fs-extra "^0.30.0" ramda "^0.21.0" +file-uri-to-path@1: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + filesize@3.6.1, filesize@^3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" @@ -7279,11 +7498,23 @@ follow-redirects@^1.0.0: dependencies: debug "^3.2.6" -for-in@^1.0.2: +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: 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" @@ -7442,6 +7673,14 @@ fstream@^1.0.0, fstream@^1.0.12: mkdirp ">=0.5 0" rimraf "2" +ftp@~0.3.10: + version "0.3.10" + resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d" + integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0= + dependencies: + readable-stream "1.1.x" + xregexp "2.0.0" + function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -7532,6 +7771,18 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" +get-uri@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.4.tgz#d4937ab819e218d4cb5ae18e4f5962bef169cc6a" + integrity sha512-v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q== + dependencies: + data-uri-to-buffer "1" + debug "2" + extend "~3.0.2" + file-uri-to-path "1" + ftp "~0.3.10" + readable-stream "2" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -7562,6 +7813,21 @@ git-rev-sync@1.12.0: graceful-fs "4.1.11" shelljs "0.7.7" +git-up@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0" + integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw== + dependencies: + is-ssh "^1.3.0" + parse-url "^5.0.0" + +git-url-parse@11.1.2: + version "11.1.2" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67" + integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ== + dependencies: + git-up "^4.0.0" + glob-all@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.1.0.tgz#8913ddfb5ee1ac7812656241b03d5217c64b02ab" @@ -7741,6 +8007,13 @@ graceful-fs@^4.2.0, graceful-fs@^4.2.2: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02" integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q== +graphlib@^2.1.1, graphlib@^2.1.5: + version "2.1.7" + resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz#b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc" + integrity sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w== + dependencies: + lodash "^4.17.5" + graphql-anywhere@^4.1.0-alpha.0: version "4.2.1" resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.2.1.tgz#1f7c3a3d9004dbe81b1c553d7fd1ef2e16e14a85" @@ -8102,6 +8375,11 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w== +hosted-git-info@^2.7.1: + version "2.8.5" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" + integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== + hsl-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" @@ -8225,11 +8503,30 @@ http-errors@1.7.2, http-errors@^1.7.2, http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" +http-errors@1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + "http-parser-js@>=0.4.0 <0.4.11": version "0.4.10" resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4" integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q= +http-proxy-agent@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" + integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== + dependencies: + agent-base "4" + debug "3.1.0" + http-proxy-middleware@^0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" @@ -8263,14 +8560,6 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -https-proxy-agent@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0" - integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ== - dependencies: - agent-base "^4.1.0" - debug "^3.1.0" - https-proxy-agent@^2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793" @@ -8279,6 +8568,14 @@ https-proxy-agent@^2.2.1: agent-base "^4.3.0" debug "^3.1.0" +https-proxy-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz#0106efa5d63d6d6f3ab87c999fa4877a3fd1ff97" + integrity sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ== + dependencies: + agent-base "^4.3.0" + debug "^3.1.0" + hyperlinker@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e" @@ -8342,6 +8639,11 @@ ignore@^5.1.1, ignore@^5.1.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= + immer@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d" @@ -8445,7 +8747,12 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +inherits@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@^1.3.0, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -8606,7 +8913,7 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-buffer@^1.1.5: +is-buffer@^1.0.2, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== @@ -8879,6 +9186,13 @@ is-root@2.0.0: resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.0.0.tgz#838d1e82318144e5a6f77819d90207645acc7019" integrity sha512-F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg== +is-ssh@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3" + integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg== + dependencies: + protocols "^1.1.0" + is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -8935,6 +9249,11 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -9619,6 +9938,16 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +jszip@^3.1.5: + version "3.2.2" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.2.tgz#b143816df7e106a9597a94c77493385adca5bd1d" + integrity sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA== + dependencies: + lie "~3.3.0" + pako "~1.0.2" + readable-stream "~2.3.6" + set-immediate-shim "~1.0.1" + jwa@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a" @@ -9643,7 +9972,14 @@ keyv@3.0.0: dependencies: json-buffer "3.0.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: +kind-of@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" + integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU= + dependencies: + is-buffer "^1.0.2" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= @@ -9709,6 +10045,11 @@ launch-editor@^2.2.1: chalk "^2.3.0" shell-quote "^1.6.1" +lazy-cache@^0.2.3: + version "0.2.7" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" + integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U= + lazy-universal-dotenv@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz#a6c8938414bca426ab8c9463940da451a911db38" @@ -9745,6 +10086,13 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +lie@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" + integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ== + dependencies: + immediate "~3.0.5" + linkify-it@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" @@ -9898,12 +10246,37 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= +lodash.assign@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" + integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= + +lodash.assignin@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" + integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= + +lodash.clone@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" + integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= + +lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.get@^4: +lodash.flatten@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= + +lodash.get@^4, lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= @@ -9968,6 +10341,11 @@ lodash.pickby@4.6.0: resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff" integrity sha1-feoh2MGNdwOifHBMFdO4SmfjOv8= +lodash.set@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" + integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= + lodash.some@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" @@ -10008,7 +10386,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -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.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: +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.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.14, 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== @@ -10094,7 +10472,7 @@ lowlight@~1.9.1: fault "^1.0.2" highlight.js "~9.12.0" -lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5: +lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -10109,11 +10487,16 @@ lru-cache@^5.0.0, lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -lru_map@0.3.3: +lru_map@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0= +macos-release@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f" + integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA== + make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -10457,6 +10840,14 @@ 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.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -10538,6 +10929,16 @@ natural-orderby@^2.0.1: resolved "https://registry.yarnpkg.com/natural-orderby/-/natural-orderby-2.0.3.tgz#8623bc518ba162f8ff1cdb8941d74deb0fdcc016" integrity sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q== +nconf@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2" + integrity sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q== + dependencies: + async "^1.4.0" + ini "^1.3.0" + secure-keys "^1.0.0" + yargs "^3.19.0" + needle@^2.2.1: version "2.3.1" resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.1.tgz#d272f2f4034afb9c4c9ab1379aabc17fc85c9388" @@ -10547,6 +10948,15 @@ needle@^2.2.1: iconv-lite "^0.4.4" sax "^1.2.4" +needle@^2.2.4: + version "2.4.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" + integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -10557,6 +10967,11 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== +netmask@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35" + integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU= + netrc-parser@^3.1.4: version "3.1.6" resolved "https://registry.yarnpkg.com/netrc-parser/-/netrc-parser-3.1.6.tgz#7243c9ec850b8e805b9bdc7eae7b1450d4a96e72" @@ -10833,7 +11248,7 @@ normalize-url@2.0.1: query-string "^5.0.1" sort-keys "^2.0.0" -normalize-url@^3.0.0: +normalize-url@^3.0.0, normalize-url@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== @@ -11077,6 +11492,13 @@ opn@^3.0.3: dependencies: object-assign "^4.0.1" +opn@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" + integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== + dependencies: + is-wsl "^1.1.0" + optimism@^0.10.0: version "0.10.2" resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.2.tgz#626b6fd28b0923de98ecb36a3fd2d3d4e5632dd9" @@ -11153,6 +11575,14 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" +os-name@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" + integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg== + dependencies: + macos-release "^2.2.0" + windows-release "^3.1.0" + os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -11262,6 +11692,31 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +pac-proxy-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432" + integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q== + dependencies: + agent-base "^4.2.0" + debug "^3.1.0" + get-uri "^2.0.0" + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.1" + pac-resolver "^3.0.0" + raw-body "^2.2.0" + socks-proxy-agent "^4.0.1" + +pac-resolver@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26" + integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA== + dependencies: + co "^4.6.0" + degenerator "^1.0.4" + ip "^1.1.5" + netmask "^1.0.6" + thunkify "^2.1.2" + package-json@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" @@ -11272,7 +11727,7 @@ package-json@^4.0.0: registry-url "^3.0.3" semver "^5.1.0" -pako@~1.0.5: +pako@~1.0.2, pako@~1.0.5: version "1.0.10" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732" integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw== @@ -11339,6 +11794,24 @@ parse-json@^4.0.0: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" +parse-path@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff" + integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA== + dependencies: + is-ssh "^1.3.0" + protocols "^1.4.0" + +parse-url@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f" + integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg== + dependencies: + is-ssh "^1.3.0" + normalize-url "^3.3.0" + parse-path "^4.0.0" + protocols "^1.4.0" + parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -12377,7 +12850,7 @@ promise.prototype.finally@^3.1.0: es-abstract "^1.9.0" function-bind "^1.1.1" -promise@^7.1.1: +"promise@>=3.2 <8", promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== @@ -12556,6 +13029,11 @@ protobufjs@^6.8.6: "@types/node" "^10.1.0" long "^4.0.0" +protocols@^1.1.0, protocols@^1.4.0: + version "1.4.7" + resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32" + integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg== + proxy-addr@~2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" @@ -12564,6 +13042,20 @@ proxy-addr@~2.0.5: forwarded "~0.1.2" ipaddr.js "1.9.0" +proxy-agent@*: + version "3.1.0" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113" + integrity sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA== + dependencies: + agent-base "^4.2.0" + debug "^3.1.0" + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.1" + lru-cache "^4.1.2" + pac-proxy-agent "^3.0.0" + proxy-from-env "^1.0.0" + socks-proxy-agent "^4.0.1" + proxy-from-env@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" @@ -12723,6 +13215,16 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +raw-body@^2.2.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c" + integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA== + dependencies: + bytes "3.1.0" + http-errors "1.7.3" + iconv-lite "0.4.24" + unpipe "1.0.0" + raw-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-2.0.0.tgz#e2813d9e1e3f80d1bbade5ad082e809679e20c26" @@ -12983,7 +13485,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -12996,6 +13498,16 @@ read-pkg@^3.0.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@1.1.x: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readable-stream@^3.1.1: version "3.3.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9" @@ -13515,7 +14027,7 @@ sass-resources-loader@^2.0.0: glob "^7.1.1" loader-utils "^1.0.4" -sax@^1.2.4, sax@~1.2.4: +sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -13566,6 +14078,11 @@ scss-tokenizer@^0.2.3: js-base64 "^2.1.8" source-map "^0.4.2" +secure-keys@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca" + integrity sha1-8MgtmKOxOah3aogIBQuCRDEIf8o= + select@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" @@ -13588,7 +14105,7 @@ semver@5.5.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== -semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -13668,6 +14185,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= +set-immediate-shim@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" + integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E= + set-value@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" @@ -13706,6 +14228,16 @@ 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@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060" + integrity sha1-WQnodLp3EG1zrEFM/sH/yofZcGA= + dependencies: + is-extendable "^0.1.1" + kind-of "^2.0.1" + lazy-cache "^0.2.3" + mixin-object "^2.0.1" + shallow-clone@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" @@ -13834,6 +14366,11 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +smart-buffer@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d" + integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw== + snake-case@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f" @@ -13871,6 +14408,245 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" +snyk-config@^2.2.1: + version "2.2.3" + resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-2.2.3.tgz#8e09bb98602ad044954d30a9fc1695ab5b6042fa" + integrity sha512-9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw== + dependencies: + debug "^3.1.0" + lodash "^4.17.15" + nconf "^0.10.0" + +snyk-docker-plugin@1.29.1: + version "1.29.1" + resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.29.1.tgz#4ae989e5084eef744b371f88b2890a8d971ab871" + integrity sha512-Mucc1rZ7l0U8Dykr5m6HPjau8b2H8JVtVaXGbKSZD6e/47JDJhudkgrWjsS5Yt/Zdp1weE3+4SguftFiVR971A== + dependencies: + debug "^4.1.1" + dockerfile-ast "0.0.16" + semver "^6.1.0" + tslib "^1" + +snyk-go-parser@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.3.1.tgz#427387507578baf008a3e73828e0e53ed8c796f3" + integrity sha512-jrFRfIk6yGHFeipGD66WV9ei/A/w/lIiGqI80w1ndMbg6D6M5pVNbK7ngDTmo4GdHrZDYqx/VBGBsUm2bol3Rg== + dependencies: + toml "^3.0.0" + tslib "^1.9.3" + +snyk-go-plugin@1.11.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.11.1.tgz#cd7c73c42bd3cf5faa2a90a54cd7c6db926fea5d" + integrity sha512-IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ== + dependencies: + debug "^4.1.1" + graphlib "^2.1.1" + snyk-go-parser "1.3.1" + tmp "0.0.33" + tslib "^1.10.0" + +snyk-gradle-plugin@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz#7e24b5da2210f18e2476a94a3b5586405c3ac262" + integrity sha512-789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ== + dependencies: + "@snyk/cli-interface" "^2.1.0" + "@types/debug" "^4.1.4" + chalk "^2.4.2" + clone-deep "^0.3.0" + debug "^4.1.1" + tmp "0.0.33" + tslib "^1.9.3" + +snyk-module@1.9.1, snyk-module@^1.6.0, snyk-module@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.9.1.tgz#b2a78f736600b0ab680f1703466ed7309c980804" + integrity sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA== + dependencies: + debug "^3.1.0" + hosted-git-info "^2.7.1" + +snyk-mvn-plugin@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.4.0.tgz#b653050a4095feccffc1b9387dc3a3f2f1aa69da" + integrity sha512-Fmt6Mjx6zZz+4q6PnBkhuNGhEX++q/pKMI26ls4p3JPkx4KxBz89oncpkmf7P8YCkoaka8oHhtDEv/R4Z9LleQ== + dependencies: + lodash "^4.17.15" + tslib "1.9.3" + +snyk-nodejs-lockfile-parser@1.16.0: + version "1.16.0" + resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.16.0.tgz#1c1d0aba4643830901ef999415816e7a92b0974d" + integrity sha512-cf3uozRXEG88nsjOQlo+SfOJPpcLs45qpnuk2vhBBZ577IMnV+fTOJQsP2YRiikLUbdgkVlduviwUO6OVn1PhA== + dependencies: + "@yarnpkg/lockfile" "^1.0.2" + graphlib "^2.1.5" + lodash "^4.17.14" + source-map-support "^0.5.7" + tslib "^1.9.3" + uuid "^3.3.2" + +snyk-nuget-plugin@1.13.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.13.0.tgz#6aa3d60c19bcf0731c8a4a594583ac9160500cb5" + integrity sha512-9PrsN6kSz79lKUlpfqAYvMtac7HYbscf4OJ5LTzTcPn2XRs24NCTZylUUpilkSY0r2DyDLY18cl+qHHjfJKnig== + dependencies: + debug "^3.1.0" + dotnet-deps-parser "4.5.2" + jszip "^3.1.5" + lodash "^4.17.14" + snyk-paket-parser "1.5.0" + tslib "^1.9.3" + xml2js "^0.4.17" + +snyk-paket-parser@1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/snyk-paket-parser/-/snyk-paket-parser-1.5.0.tgz#a0e96888d9d304b1ae6203a0369971575f099548" + integrity sha512-1CYMPChJ9D9LBy3NLqHyv8TY7pR/LMISSr08LhfFw/FpfRZ+gTH8W6bbxCmybAYrOFNCqZkRprqOYDqZQFHipA== + dependencies: + tslib "^1.9.3" + +snyk-php-plugin@1.6.4: + version "1.6.4" + resolved "https://registry.yarnpkg.com/snyk-php-plugin/-/snyk-php-plugin-1.6.4.tgz#c3470aea2f185d2f3417cfc5e966ecf7fd1efa20" + integrity sha512-FFQeimtbwq17nDUS0o0zuKgyjXSX7SpoC9iYTeKvxTXrmKf2QlxTtPvmMM4/hQxehEu1i40ow1Ozw0Ahxm8Dpw== + dependencies: + "@snyk/composer-lockfile-parser" "1.0.3" + tslib "1.9.3" + +snyk-policy@1.13.5: + version "1.13.5" + resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.13.5.tgz#c5cf262f759879a65ab0810dd58d59c8ec7e9e47" + integrity sha512-KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ== + dependencies: + debug "^3.1.0" + email-validator "^2.0.4" + js-yaml "^3.13.1" + lodash.clonedeep "^4.5.0" + semver "^6.0.0" + snyk-module "^1.9.1" + snyk-resolve "^1.0.1" + snyk-try-require "^1.3.1" + then-fs "^2.0.0" + +snyk-python-plugin@^1.13.3: + version "1.13.3" + resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.13.3.tgz#34587001de2cca8fb400f3f21110c29b39a80e83" + integrity sha512-Ud7mHmpMG4uCChvYLx5jA8HwOV/FNpT65xTxSt+6wsOjIUTuLiqM86mbvgzgk3pir8vMP9yQEsCi1i0zYLBArw== + dependencies: + "@snyk/cli-interface" "^2.0.3" + tmp "0.0.33" + +snyk-resolve-deps@4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz#ef20fb578a4c920cc262fb73dd292ff21215f52d" + integrity sha512-aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ== + dependencies: + "@types/node" "^6.14.4" + "@types/semver" "^5.5.0" + ansicolors "^0.3.2" + debug "^3.2.5" + lodash.assign "^4.2.0" + lodash.assignin "^4.2.0" + lodash.clone "^4.5.0" + lodash.flatten "^4.4.0" + lodash.get "^4.4.2" + lodash.set "^4.3.2" + lru-cache "^4.0.0" + semver "^5.5.1" + snyk-module "^1.6.0" + snyk-resolve "^1.0.0" + snyk-tree "^1.0.0" + snyk-try-require "^1.1.1" + then-fs "^2.0.0" + +snyk-resolve@1.0.1, snyk-resolve@^1.0.0, snyk-resolve@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.1.tgz#eaa4a275cf7e2b579f18da5b188fe601b8eed9ab" + integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw== + dependencies: + debug "^3.1.0" + then-fs "^2.0.0" + +snyk-sbt-plugin@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/snyk-sbt-plugin/-/snyk-sbt-plugin-2.8.0.tgz#6812e1df1c311e99a7aa565559032c7511d1e4d4" + integrity sha512-ZzyBdND5CsaO0xkv05geZXu8Dd6Llvr/5oTj811U7h7UmrvljrAiABW4RGjRJPrPVuuJaDej2p633sgGtK9UsA== + dependencies: + semver "^6.1.2" + tmp "^0.1.0" + tree-kill "^1.2.1" + tslib "^1.10.0" + +snyk-tree@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/snyk-tree/-/snyk-tree-1.0.0.tgz#0fb73176dbf32e782f19100294160448f9111cc8" + integrity sha1-D7cxdtvzLngvGRAClBYESPkRHMg= + dependencies: + archy "^1.0.0" + +snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.3.1.tgz#6e026f92e64af7fcccea1ee53d524841e418a212" + integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI= + dependencies: + debug "^3.1.0" + lodash.clonedeep "^4.3.0" + lru-cache "^4.0.0" + then-fs "^2.0.0" + +snyk@^1.231.0: + version "1.235.0" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.235.0.tgz#62424d75e7ab071fbc762497abae71a5c0f1cf06" + integrity sha512-pnEXcvu4mGarDxlD7OArLj5/5L18+b+/kIQ9fUG0ykcGpLJ3Rsd8IOZw+O1vBzq11WQ6U3IGGiYya/E/wjcI4g== + dependencies: + "@snyk/cli-interface" "^2.0.3" + "@snyk/dep-graph" "1.12.0" + "@snyk/gemfile" "1.2.0" + "@snyk/snyk-cocoapods-plugin" "1.0.3" + "@types/agent-base" "^4.2.0" + "@types/restify" "^4.3.6" + abbrev "^1.1.1" + ansi-escapes "3.2.0" + chalk "^2.4.2" + configstore "^3.1.2" + debug "^3.1.0" + diff "^4.0.1" + git-url-parse "11.1.2" + glob "^7.1.3" + inquirer "^6.2.2" + lodash "^4.17.14" + needle "^2.2.4" + opn "^5.5.0" + os-name "^3.0.0" + proxy-agent "*" + proxy-from-env "^1.0.0" + semver "^6.0.0" + snyk-config "^2.2.1" + snyk-docker-plugin "1.29.1" + snyk-go-plugin "1.11.1" + snyk-gradle-plugin "3.1.0" + snyk-module "1.9.1" + snyk-mvn-plugin "2.4.0" + snyk-nodejs-lockfile-parser "1.16.0" + snyk-nuget-plugin "1.13.0" + snyk-php-plugin "1.6.4" + snyk-policy "1.13.5" + snyk-python-plugin "^1.13.3" + snyk-resolve "1.0.1" + snyk-resolve-deps "4.4.0" + snyk-sbt-plugin "2.8.0" + snyk-tree "^1.0.0" + snyk-try-require "1.3.1" + source-map-support "^0.5.11" + strip-ansi "^5.2.0" + tempfile "^2.0.0" + then-fs "^2.0.0" + update-notifier "^2.5.0" + uuid "^3.3.2" + wrap-ansi "^5.1.0" + sockjs-client@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177" @@ -13883,6 +14659,22 @@ sockjs-client@1.3.0: json3 "^3.3.2" url-parse "^1.4.3" +socks-proxy-agent@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386" + integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg== + dependencies: + agent-base "~4.2.1" + socks "~2.3.2" + +socks@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e" + integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ== + dependencies: + ip "^1.1.5" + smart-buffer "4.0.2" + sort-keys@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" @@ -13913,18 +14705,18 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.6: - version "0.5.12" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" - integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== +source-map-support@^0.5.11, source-map-support@^0.5.7, source-map-support@~0.5.12: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@~0.5.12: - version "0.5.13" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" - integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== +source-map-support@^0.5.6: + version "0.5.12" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" + integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -14212,6 +15004,11 @@ string_decoder@^1.0.0, string_decoder@^1.1.1: dependencies: safe-buffer "~5.1.0" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -14453,6 +15250,19 @@ telejson@^3.0.2: lodash "^4.17.15" memoizerific "^1.11.3" +temp-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" + integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= + +tempfile@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" + integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= + dependencies: + temp-dir "^1.0.0" + uuid "^3.0.1" + term-size@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" @@ -14527,6 +15337,13 @@ text-table@0.2.0, text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +then-fs@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2" + integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI= + dependencies: + promise ">=3.2 <8" + thread-loader@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda" @@ -14559,6 +15376,11 @@ through@^2.3.6: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= +thunkify@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d" + integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0= + time-fix-plugin@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/time-fix-plugin/-/time-fix-plugin-2.0.6.tgz#3210121d269b475a7e7661766e682bd768ba1ced" @@ -14658,13 +15480,20 @@ title-case@^2.1.0: no-case "^2.2.0" upper-case "^1.0.3" -tmp@^0.0.33: +tmp@0.0.33, tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== dependencies: os-tmpdir "~1.0.2" +tmp@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877" + integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw== + dependencies: + rimraf "^2.6.3" + tmpl@1.0.x: version "1.0.4" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" @@ -14727,6 +15556,11 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toml@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" + integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== + toposort@^1.0.0: version "1.0.7" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" @@ -14762,6 +15596,11 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" +tree-kill@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a" + integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q== + treeify@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8" @@ -14847,7 +15686,12 @@ tsconfig@^7.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tslib@^1, tslib@^1.9.0, tslib@^1.9.3: +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== + +tslib@^1, tslib@^1.10.0, 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== @@ -15199,6 +16043,11 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= +uuid@^3.0.1: + version "3.3.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" + integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== + uuid@^3.1.0, uuid@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" @@ -15258,7 +16107,7 @@ vscode-languageserver-protocol@3.14.1: vscode-jsonrpc "^4.0.0" vscode-languageserver-types "3.14.0" -vscode-languageserver-types@3.14.0: +vscode-languageserver-types@3.14.0, vscode-languageserver-types@^3.5.0: version "3.14.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== @@ -15772,6 +16621,18 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" +window-size@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" + integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= + +windows-release@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f" + integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA== + dependencies: + execa "^1.0.0" + wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" @@ -15910,6 +16771,38 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== +xml2js@0.4.19: + version "0.4.19" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" + integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== + dependencies: + sax ">=0.6.0" + xmlbuilder "~9.0.1" + +xml2js@^0.4.17: + version "0.4.22" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.22.tgz#4fa2d846ec803237de86f30aa9b5f70b6600de02" + integrity sha512-MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw== + dependencies: + sax ">=0.6.0" + util.promisify "~1.0.0" + xmlbuilder "~11.0.0" + +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== + +xmlbuilder@~9.0.1: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + +xregexp@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" + integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM= + xregexp@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.2.4.tgz#02a4aea056d65a42632c02f0233eab8e4d7e57ed" @@ -15934,7 +16827,7 @@ xxhashjs@^0.2.1: dependencies: cuint "^0.2.2" -y18n@^3.2.1: +y18n@^3.2.0, y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= @@ -15990,6 +16883,19 @@ yargs@^13.3.0: y18n "^4.0.0" yargs-parser "^13.1.1" +yargs@^3.19.0: + version "3.32.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" + integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= + dependencies: + camelcase "^2.0.1" + cliui "^3.0.3" + decamelize "^1.1.1" + os-locale "^1.4.0" + string-width "^1.0.1" + window-size "^0.1.4" + y18n "^3.2.0" + yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" From 9aa486f060af77c37ba2611df8f07c6ef0504bef Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 07:08:05 +0000 Subject: [PATCH 37/46] build(deps-dev): bump @storybook/addon-actions in /webapp Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.3 to 5.2.4. - [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.2.4/addons/actions) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 164 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 155 insertions(+), 11 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 5e606caa2..a4e872498 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -96,7 +96,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/preset-env": "~7.6.3", "@storybook/addon-a11y": "^5.2.3", - "@storybook/addon-actions": "^5.2.3", + "@storybook/addon-actions": "^5.2.4", "@storybook/vue": "~5.2.3", "@vue/cli-shared-utils": "~3.12.0", "@vue/eslint-config-prettier": "~5.0.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 5bac75d16..5939cf20c 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1834,17 +1834,17 @@ redux "^4.0.1" util-deprecate "^1.0.2" -"@storybook/addon-actions@^5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.3.tgz#40675f1258428074eebd363e5f9468adeec79046" - integrity sha512-7/Ax5QX2HHuIYS/TwgysEtJhvsfNekc0ofzVQRSlowU+Io5u/wMaD+/FEn43Cx8MXzWxPs+x/KNZ5cWRXx2vjg== +"@storybook/addon-actions@^5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.4.tgz#79d13c1b6e58c75dd548eb162aa6626a93dfd041" + integrity sha512-5E8uXopy6Gq5R3MXrPf0VM9QiLaGLxLCXtDYHQ0gku+HhPYR25KQudS/PyuO+OWzuyB0fsvTi240B3zw+zilOg== dependencies: - "@storybook/addons" "5.2.3" - "@storybook/api" "5.2.3" - "@storybook/client-api" "5.2.3" - "@storybook/components" "5.2.3" - "@storybook/core-events" "5.2.3" - "@storybook/theming" "5.2.3" + "@storybook/addons" "5.2.4" + "@storybook/api" "5.2.4" + "@storybook/client-api" "5.2.4" + "@storybook/components" "5.2.4" + "@storybook/core-events" "5.2.4" + "@storybook/theming" "5.2.4" core-js "^3.0.1" fast-deep-equal "^2.0.1" global "^4.3.2" @@ -1867,6 +1867,19 @@ global "^4.3.2" util-deprecate "^1.0.2" +"@storybook/addons@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.4.tgz#5c4f031e403c90a517cd6d208ec51d7e2455683a" + integrity sha512-Q+bnVlBA308qnELxnh18hBDRSUgltR9KbV537285dUL/okv/NC6n51mxJwIaG+ksBW2wU+5e6tqSayaKF3uHLw== + dependencies: + "@storybook/api" "5.2.4" + "@storybook/channels" "5.2.4" + "@storybook/client-logger" "5.2.4" + "@storybook/core-events" "5.2.4" + core-js "^3.0.1" + global "^4.3.2" + util-deprecate "^1.0.2" + "@storybook/api@5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.3.tgz#f30ab65a5c3d72da6b408a5120d63f0135eee247" @@ -1890,6 +1903,29 @@ telejson "^3.0.2" util-deprecate "^1.0.2" +"@storybook/api@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.4.tgz#b0b3dbd93444d163a80b455fb877d816a37b3149" + integrity sha512-KqAB+NkHIHdwu749NDP+7i44jy1bFgpq7GTJlG+sx/XLZHQveK/8yn109g9bXHFth7SvdXI1+9GA/apzwBU/Mw== + dependencies: + "@storybook/channels" "5.2.4" + "@storybook/client-logger" "5.2.4" + "@storybook/core-events" "5.2.4" + "@storybook/router" "5.2.4" + "@storybook/theming" "5.2.4" + 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 "^3.0.2" + util-deprecate "^1.0.2" + "@storybook/channel-postmessage@5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.3.tgz#e6de415d848a20d0e8a1d32cea178475756d114a" @@ -1901,6 +1937,17 @@ global "^4.3.2" telejson "^3.0.2" +"@storybook/channel-postmessage@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.4.tgz#e3735bdce42156e54bf462083aebaf23245ab5c3" + integrity sha512-ic7/Ho8z2/aOMjoEbr5p8rijOfO3SZdJnwMvDdUxrqvYq7yACZWidPo3w2+iBwQi9HLqEsWesP1c2doJBxVGRw== + dependencies: + "@storybook/channels" "5.2.4" + "@storybook/client-logger" "5.2.4" + core-js "^3.0.1" + global "^4.3.2" + telejson "^3.0.2" + "@storybook/channels@5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.3.tgz#843752fe26bd1c505256050bfbf810531c2198a0" @@ -1908,6 +1955,13 @@ dependencies: core-js "^3.0.1" +"@storybook/channels@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.4.tgz#7ab5c9478517ddb9e8ac0c4188b408b9d7e6b7e4" + integrity sha512-/r39yEZ5QiGdiq95DhXBypdBo7urkD3Sp1WDyK48uGkZ0gdHWSPy3BBy8OJhEhfNz7nVisTiVIBr4gIrubKDjw== + dependencies: + core-js "^3.0.1" + "@storybook/client-api@5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.3.tgz#3878cd93d2c1977dc3ef36682c79d0355a3c5872" @@ -1929,6 +1983,27 @@ qs "^6.6.0" util-deprecate "^1.0.2" +"@storybook/client-api@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.4.tgz#2507a3a739a6f6b13e4afefb938a6f3eab34ed55" + integrity sha512-SOwzEFHoNapURhNqdcI7HA76o5tkWvs2+2s++i/S7xsAd3KyefIVDOdqSMlAxJkxZb8Mlrb3UNRxlrpA8SZqNA== + dependencies: + "@storybook/addons" "5.2.4" + "@storybook/channel-postmessage" "5.2.4" + "@storybook/channels" "5.2.4" + "@storybook/client-logger" "5.2.4" + "@storybook/core-events" "5.2.4" + "@storybook/router" "5.2.4" + common-tags "^1.8.0" + core-js "^3.0.1" + eventemitter3 "^4.0.0" + global "^4.3.2" + is-plain-object "^3.0.0" + lodash "^4.17.11" + memoizerific "^1.11.3" + qs "^6.6.0" + util-deprecate "^1.0.2" + "@storybook/client-logger@5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.3.tgz#a02e7b14c979767665648be4db6185bda17aed88" @@ -1936,6 +2011,13 @@ dependencies: core-js "^3.0.1" +"@storybook/client-logger@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.4.tgz#6ebe37cbc92e0efe27c7119f52d94f647fbb470c" + integrity sha512-ofp6QQPQZBU+RvlAH5KpZRsfAFHecCZDnl/7YG6FwjHseJr3jHTYmBGGjJDMHFHq+Q7FGQu/yVb9lMFgoQ43QQ== + dependencies: + core-js "^3.0.1" + "@storybook/components@5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.3.tgz#acf185b2ed2d1a64fff008b32cc2b2363d73d8cf" @@ -1960,6 +2042,30 @@ react-textarea-autosize "^7.1.0" simplebar-react "^1.0.0-alpha.6" +"@storybook/components@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.4.tgz#9ecd080416eac4e8453030dd601cbeaa32ce4126" + integrity sha512-APhw+XGag0RTCRJ8eCWKVr8dLt9SRqnS8LtzcZJbokCYRxRTFzhmX2eVEE1v+d0gHib1/yh2COxOjMzv3m/rQA== + dependencies: + "@storybook/client-logger" "5.2.4" + "@storybook/theming" "5.2.4" + "@types/react-syntax-highlighter" "10.1.0" + 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" + simplebar-react "^1.0.0-alpha.6" + "@storybook/core-events@5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.3.tgz#b592273a1e00040dcec258e3bd0ca2fd53357c00" @@ -1967,6 +2073,13 @@ dependencies: core-js "^3.0.1" +"@storybook/core-events@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.4.tgz#210c968e96e2fc031cad1d3a09b06fa69ae433fc" + integrity sha512-nQknCmaz2S2HW6PSGcuFzve7Y1Js2Cb268vUG0ZMNtJZwFawqYc+KSQHqmOY0pVm8dyROTcWCudPA0k+hk6N5Q== + dependencies: + core-js "^3.0.1" + "@storybook/core@5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.3.tgz#e06cda6510b7778db1273696fc5b56f7ba33c025" @@ -2065,6 +2178,19 @@ memoizerific "^1.11.3" qs "^6.6.0" +"@storybook/router@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.4.tgz#e47af60478da7730c7d82de3d089d12c17077333" + integrity sha512-GL7eGdj5oYST0mE9fThJB9ye9tTTgrP+aP3okZ6MeMGtNytb7bmJRpAD2E4ouuPTQVppyHI5re8g/HUxUNOT1g== + dependencies: + "@reach/router" "^1.2.1" + "@types/reach__router" "^1.2.3" + core-js "^3.0.1" + global "^4.3.2" + lodash "^4.17.11" + memoizerific "^1.11.3" + qs "^6.6.0" + "@storybook/theming@5.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.3.tgz#b506fa2170d850953bfe84e2cb07e81e647e8c9a" @@ -2083,6 +2209,24 @@ prop-types "^15.7.2" resolve-from "^5.0.0" +"@storybook/theming@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.4.tgz#79c99f65992082fdb4d39fb652db435dd6bebaca" + integrity sha512-2ZlqBrmnm8N0352Fnu2+GB3pEsHL4Eb2eKxV0VLLgkjJuAlm7CK6+I/e4ZknQWxwYm2pQj1y6ta68A62fGBYyA== + dependencies: + "@emotion/core" "^10.0.14" + "@emotion/styled" "^10.0.14" + "@storybook/client-logger" "5.2.4" + common-tags "^1.8.0" + core-js "^3.0.1" + deep-object-diff "^1.1.0" + emotion-theming "^10.0.14" + 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.2.3": version "5.2.3" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.3.tgz#35e3a1147977da923c820db90fb95c95caf47126" From 251c0d93e4ff6601e105f0fd2ed88dac818c3dea Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 08:49:40 +0000 Subject: [PATCH 38/46] build(deps-dev): bump @storybook/vue from 5.2.3 to 5.2.4 in /webapp Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.3 to 5.2.4. - [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.2.4/app/vue) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 102 +++++++++++++++----------------------------- 2 files changed, 36 insertions(+), 68 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index a4e872498..b6e536ce3 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -97,7 +97,7 @@ "@babel/preset-env": "~7.6.3", "@storybook/addon-a11y": "^5.2.3", "@storybook/addon-actions": "^5.2.4", - "@storybook/vue": "~5.2.3", + "@storybook/vue": "~5.2.4", "@vue/cli-shared-utils": "~3.12.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 5939cf20c..94509c162 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1926,17 +1926,6 @@ telejson "^3.0.2" util-deprecate "^1.0.2" -"@storybook/channel-postmessage@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.3.tgz#e6de415d848a20d0e8a1d32cea178475756d114a" - integrity sha512-ixlpr6aAYoRM72cKwEWU/W0rWzOn3mYqb/eUdIaz3Da5BtFGKm3yEFguII0l1my82uhMm5/d3UNfoh0rO3pUyg== - dependencies: - "@storybook/channels" "5.2.3" - "@storybook/client-logger" "5.2.3" - core-js "^3.0.1" - global "^4.3.2" - telejson "^3.0.2" - "@storybook/channel-postmessage@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.4.tgz#e3735bdce42156e54bf462083aebaf23245ab5c3" @@ -1962,27 +1951,6 @@ dependencies: core-js "^3.0.1" -"@storybook/client-api@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.3.tgz#3878cd93d2c1977dc3ef36682c79d0355a3c5872" - integrity sha512-anXxcf2z+KQAk94xxdbeG1N6nTEWXj087XHQ22L3pOoX9TRzfG71UjL0/S7vj4EFUiXVHj8d6YUFwLb5LwpUIw== - dependencies: - "@storybook/addons" "5.2.3" - "@storybook/channel-postmessage" "5.2.3" - "@storybook/channels" "5.2.3" - "@storybook/client-logger" "5.2.3" - "@storybook/core-events" "5.2.3" - "@storybook/router" "5.2.3" - common-tags "^1.8.0" - core-js "^3.0.1" - eventemitter3 "^4.0.0" - global "^4.3.2" - is-plain-object "^3.0.0" - lodash "^4.17.11" - memoizerific "^1.11.3" - qs "^6.6.0" - util-deprecate "^1.0.2" - "@storybook/client-api@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.4.tgz#2507a3a739a6f6b13e4afefb938a6f3eab34ed55" @@ -2080,25 +2048,25 @@ dependencies: core-js "^3.0.1" -"@storybook/core@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.3.tgz#e06cda6510b7778db1273696fc5b56f7ba33c025" - integrity sha512-sktjYY8pH4kQGFRKjXwtwwShdG3ajjHkrnw8oh3R383MRPom7i9owx5yHHMuQedLCXIwAg84s2DzO01I2URTcg== +"@storybook/core@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.4.tgz#188509ac0eb0c85144816c385c21acfb5c8fbefd" + integrity sha512-r5kDgZETNawHxpsAPw+h+pRk6l/mJhsSHeDo9/OdYtYFW7lmk2gadViXOTM+6gIWc6vQ8y750bgkahmyIIY0nQ== 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.2.3" - "@storybook/channel-postmessage" "5.2.3" - "@storybook/client-api" "5.2.3" - "@storybook/client-logger" "5.2.3" - "@storybook/core-events" "5.2.3" - "@storybook/node-logger" "5.2.3" - "@storybook/router" "5.2.3" - "@storybook/theming" "5.2.3" - "@storybook/ui" "5.2.3" + "@storybook/addons" "5.2.4" + "@storybook/channel-postmessage" "5.2.4" + "@storybook/client-api" "5.2.4" + "@storybook/client-logger" "5.2.4" + "@storybook/core-events" "5.2.4" + "@storybook/node-logger" "5.2.4" + "@storybook/router" "5.2.4" + "@storybook/theming" "5.2.4" + "@storybook/ui" "5.2.4" airbnb-js-shims "^1 || ^2" ansi-to-html "^0.6.11" autoprefixer "^9.4.9" @@ -2154,10 +2122,10 @@ webpack-dev-middleware "^3.7.0" webpack-hot-middleware "^2.25.0" -"@storybook/node-logger@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.3.tgz#cb746dbe0d1e56d905bf5601d16bb3a054123792" - integrity sha512-5p+5ltLdr7cZTSCG+vdIMDLHq5AAaL/CQ/bygjl+Rw/RSpvBO5Rg8hryszFyhogToHJbn2JinUbypLA+P6tcuQ== +"@storybook/node-logger@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.4.tgz#52dc380c76bdac68de35e7d72efe920c3ba52a23" + integrity sha512-4OOzce02IAfrRv+Y7h3icyw6WIuDekpWF2eYjgYVVvAJYklCEwgeBTBCY0/2TJjPPTBDPUKHVP1Bdz3Vpci9pA== dependencies: chalk "^2.4.2" core-js "^3.0.1" @@ -2227,19 +2195,19 @@ prop-types "^15.7.2" resolve-from "^5.0.0" -"@storybook/ui@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.3.tgz#35e3a1147977da923c820db90fb95c95caf47126" - integrity sha512-SNyo5oxupb105N4Rz8O5/iJMs/THrmdvP+vsN7CpOTxebM01rHyvk51cNUwHKG1QwlZmpXL8GbtWlbvqL2d/gQ== +"@storybook/ui@5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.4.tgz#7116c9be0dcdcc5d5b425d998263de1e27cdc078" + integrity sha512-zsS43k1h4bWEW6oj9FNHlUL3niHoJJ8v7iqYbRtVM12rxrYhV3K8TGVG3LCuNB75i3Be0Myy+/RHA4x9kco08A== dependencies: - "@storybook/addons" "5.2.3" - "@storybook/api" "5.2.3" - "@storybook/channels" "5.2.3" - "@storybook/client-logger" "5.2.3" - "@storybook/components" "5.2.3" - "@storybook/core-events" "5.2.3" - "@storybook/router" "5.2.3" - "@storybook/theming" "5.2.3" + "@storybook/addons" "5.2.4" + "@storybook/api" "5.2.4" + "@storybook/channels" "5.2.4" + "@storybook/client-logger" "5.2.4" + "@storybook/components" "5.2.4" + "@storybook/core-events" "5.2.4" + "@storybook/router" "5.2.4" + "@storybook/theming" "5.2.4" copy-to-clipboard "^3.0.8" core-js "^3.0.1" core-js-pure "^3.0.1" @@ -2266,13 +2234,13 @@ telejson "^3.0.2" util-deprecate "^1.0.2" -"@storybook/vue@~5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.2.3.tgz#66ec9830e878ffc700aa55a489e3582c91245955" - integrity sha512-HK5vkiiVEHc9N+zjv5dKIP1HlDIzUfGWtAo8TCywnyPskeZXfAjjjuZb5kttdwKjULGuwmpLtzjGcaYRJ/ytkQ== +"@storybook/vue@~5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.2.4.tgz#cc5c61612b50e77e1de18d266434dea40631bcc9" + integrity sha512-JmEGypIl9FOtIp13n4ATa1nPeRr2PMnJ3DgKSs8O8GeuX61cOtZMZ95dvgGW0vfXh8hnzqt83WTkJP7EH/qpEQ== dependencies: - "@storybook/addons" "5.2.3" - "@storybook/core" "5.2.3" + "@storybook/addons" "5.2.4" + "@storybook/core" "5.2.4" "@types/webpack-env" "^1.13.9" common-tags "^1.8.0" core-js "^3.0.1" From b5d0170ab42578e77832f58868cb1f3af50eb77a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 08:53:30 +0000 Subject: [PATCH 39/46] build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /webapp Bumps node from 12.11.1-alpine to 12.12.0-alpine. Signed-off-by: dependabot-preview[bot] --- webapp/Dockerfile | 2 +- webapp/Dockerfile.maintenance | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/Dockerfile b/webapp/Dockerfile index 1a27e6d94..d0122ee0e 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.11.1-alpine as base +FROM node:12.12.0-alpine as base LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" EXPOSE 3000 diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index e32048252..5f4df1dbf 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -1,4 +1,4 @@ -FROM node:12.11.1-alpine as build +FROM node:12.12.0-alpine as build LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" EXPOSE 3000 From 855caf78e9090b985c9d224a47802802243f271f Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 15 Oct 2019 13:05:51 +0200 Subject: [PATCH 40/46] reference to terms of use, data protection, minimum age at added --- webapp/components/Registration/Signup.vue | 10 ++++++++++ webapp/locales/de.json | 3 +++ webapp/locales/en.json | 3 +++ 3 files changed, 16 insertions(+) diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue index 00309b1c6..cbed5b9f8 100644 --- a/webapp/components/Registration/Signup.vue +++ b/webapp/components/Registration/Signup.vue @@ -30,6 +30,16 @@ name="email" icon="envelope" /> + + + + + + + + {{ $t('components.registration.signup.form.minimum-age') }} + + Nutzungsbedingungen!", + "data-privacy": "Es gelten unsere Datenschutzerklärungen!", + "minimum-age": "Du musst das 18 Lebensjahr abgeschlossen haben!", "invitation-code": "Dein Einladungscode lautet: {code}", "errors": { "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 90bb84c37..a22f7a4a4 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -31,6 +31,9 @@ "title": "Join Human Connection!", "form": { "description": "To get started, enter your email address:", + "terms-and-condition": "Our terms of conditions! apply!", + "data-privacy": "Our Data privacy apply!", + "minimum-age": "You must be at least 18 years old!", "invitation-code": "Your invitation code is: {code}", "errors": { "email-exists": "There is already a user account with this email address!", From a42a910ac745e060fa75ff03b9efb219defa45dd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 12:01:43 +0000 Subject: [PATCH 41/46] build(deps-dev): bump eslint-plugin-jest in /backend Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.17.0 to 22.19.0. - [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.17.0...v22.19.0) 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 4ff040992..67c721e0d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -121,7 +121,7 @@ "eslint-config-prettier": "~6.4.0", "eslint-config-standard": "~14.1.0", "eslint-plugin-import": "~2.18.2", - "eslint-plugin-jest": "~22.17.0", + "eslint-plugin-jest": "~22.19.0", "eslint-plugin-node": "~10.0.0", "eslint-plugin-prettier": "~3.1.1", "eslint-plugin-promise": "~4.2.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index b9d5d05eb..f52556865 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -3259,10 +3259,10 @@ eslint-plugin-import@~2.18.2: read-pkg-up "^2.0.0" resolve "^1.11.0" -eslint-plugin-jest@~22.17.0: - version "22.17.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.17.0.tgz#dc170ec8369cd1bff9c5dd8589344e3f73c88cf6" - integrity sha512-WT4DP4RoGBhIQjv+5D0FM20fAdAUstfYAf/mkufLNTojsfgzc5/IYW22cIg/Q4QBavAZsROQlqppiWDpFZDS8Q== +eslint-plugin-jest@~22.19.0: + version "22.19.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.19.0.tgz#0cf90946a8c927d40a2c64458c89bb635d0f2a0b" + integrity sha512-4zUc3rh36ds0SXdl2LywT4YWA3zRe8sfLhz8bPp8qQPIKvynTTkNGwmSCMpl5d9QiZE2JxSinGF+WD8yU+O0Lg== dependencies: "@typescript-eslint/experimental-utils" "^1.13.0" From d0bb81585f764e2d58460c3868107cdca98c6b05 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 12:01:49 +0000 Subject: [PATCH 42/46] build(deps-dev): bump @storybook/addon-a11y in /webapp Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.3 to 5.2.4. - [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.2.4/addons/a11y) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 139 ++++---------------------------------------- 2 files changed, 12 insertions(+), 129 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 62d376a46..7ff8bf932 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -95,7 +95,7 @@ "@babel/core": "~7.6.4", "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/preset-env": "~7.6.3", - "@storybook/addon-a11y": "^5.2.3", + "@storybook/addon-a11y": "^5.2.4", "@storybook/addon-actions": "^5.2.4", "@storybook/vue": "~5.2.4", "@vue/cli-shared-utils": "~3.12.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index c00ad2e79..2bb2eaafe 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1893,17 +1893,17 @@ source-map-support "^0.5.7" tslib "^1.9.3" -"@storybook/addon-a11y@^5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.3.tgz#bcfb50b92b2a17c36e4cbb0b42a0c586e40aa68e" - integrity sha512-1N8hes5J3qyhCahHyFUXwiKif3JH892dzGalxc46jtvC0oCMM0r6lu+lj9J6THc15Oc8Icy9KJZuw4R0wRJl0Q== +"@storybook/addon-a11y@^5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.4.tgz#01a641bf37e2fbeb5ac23ec60824847356cb8dfc" + integrity sha512-m7D78LiREpUzw7U+jiJXQXSsYoYZ+IkewBIxX5K15lh58AqTi0hD8DWHssgbi76GQwdaXKmMPIwI842dgPYobQ== dependencies: - "@storybook/addons" "5.2.3" - "@storybook/api" "5.2.3" - "@storybook/client-logger" "5.2.3" - "@storybook/components" "5.2.3" - "@storybook/core-events" "5.2.3" - "@storybook/theming" "5.2.3" + "@storybook/addons" "5.2.4" + "@storybook/api" "5.2.4" + "@storybook/client-logger" "5.2.4" + "@storybook/components" "5.2.4" + "@storybook/core-events" "5.2.4" + "@storybook/theming" "5.2.4" axe-core "^3.3.2" common-tags "^1.8.0" core-js "^3.0.1" @@ -1936,19 +1936,6 @@ react-inspector "^3.0.2" uuid "^3.3.2" -"@storybook/addons@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.3.tgz#02e35fad3ed4101625896e43e0a1e20215f6be38" - integrity sha512-LTkUJB8ZDc4++yt9acNHNjlnGWCyNtP+NVYPDvg7zFOaMip21Pj4T0pg9UwYxdqrFBWz9tVz7DJeXroS3egXxg== - dependencies: - "@storybook/api" "5.2.3" - "@storybook/channels" "5.2.3" - "@storybook/client-logger" "5.2.3" - "@storybook/core-events" "5.2.3" - core-js "^3.0.1" - global "^4.3.2" - util-deprecate "^1.0.2" - "@storybook/addons@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.4.tgz#5c4f031e403c90a517cd6d208ec51d7e2455683a" @@ -1962,29 +1949,6 @@ global "^4.3.2" util-deprecate "^1.0.2" -"@storybook/api@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.3.tgz#f30ab65a5c3d72da6b408a5120d63f0135eee247" - integrity sha512-2csxa/d64rXy4Dwoc7YjbPeNUJRgcI/wJUo30CLujk2stEFzDnKeMPR1mlHMCIFDW+KDxJ28bW59VPxwrqJFjw== - dependencies: - "@storybook/channels" "5.2.3" - "@storybook/client-logger" "5.2.3" - "@storybook/core-events" "5.2.3" - "@storybook/router" "5.2.3" - "@storybook/theming" "5.2.3" - 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 "^3.0.2" - util-deprecate "^1.0.2" - "@storybook/api@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.4.tgz#b0b3dbd93444d163a80b455fb877d816a37b3149" @@ -2019,13 +1983,6 @@ global "^4.3.2" telejson "^3.0.2" -"@storybook/channels@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.3.tgz#843752fe26bd1c505256050bfbf810531c2198a0" - integrity sha512-13Mlb+XbE0mHXiLLHdg0w9byhRy/bE605U7U96PGQp2cwX4lf+4jpViO2mDCsndAFRc0+2hexXPTkwgzvZzq0A== - dependencies: - core-js "^3.0.1" - "@storybook/channels@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.4.tgz#7ab5c9478517ddb9e8ac0c4188b408b9d7e6b7e4" @@ -2054,13 +2011,6 @@ qs "^6.6.0" util-deprecate "^1.0.2" -"@storybook/client-logger@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.3.tgz#a02e7b14c979767665648be4db6185bda17aed88" - integrity sha512-Z1irXW4jiFs7rClgqJqYOgg5op51ynV6dVuoIqxkSC0MrOG5s/VbX7T+ojGPXKyQWD4XYGw66Hnw9jouSfXL9g== - dependencies: - core-js "^3.0.1" - "@storybook/client-logger@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.4.tgz#6ebe37cbc92e0efe27c7119f52d94f647fbb470c" @@ -2068,30 +2018,6 @@ dependencies: core-js "^3.0.1" -"@storybook/components@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.3.tgz#acf185b2ed2d1a64fff008b32cc2b2363d73d8cf" - integrity sha512-EiWKa3xONP2BPxrssiRdvKELhF2tO14HVL131CCFY+Zg/ylExzWWWVSBun7vYcKhkI52K5lmvC1vFSsB6Gmlhw== - dependencies: - "@storybook/client-logger" "5.2.3" - "@storybook/theming" "5.2.3" - "@types/react-syntax-highlighter" "10.1.0" - 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" - simplebar-react "^1.0.0-alpha.6" - "@storybook/components@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.4.tgz#9ecd080416eac4e8453030dd601cbeaa32ce4126" @@ -2116,13 +2042,6 @@ react-textarea-autosize "^7.1.0" simplebar-react "^1.0.0-alpha.6" -"@storybook/core-events@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.3.tgz#b592273a1e00040dcec258e3bd0ca2fd53357c00" - integrity sha512-sZEv93yE1o+/UJdhtqQ6vo2EauZ90FjN/L8F7CR7iqDEZzqo9g77Idg9LSgcN3TAeXcGAWVSrPb1vkK7H96L2g== - dependencies: - core-js "^3.0.1" - "@storybook/core-events@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.4.tgz#210c968e96e2fc031cad1d3a09b06fa69ae433fc" @@ -2215,19 +2134,6 @@ pretty-hrtime "^1.0.3" regenerator-runtime "^0.12.1" -"@storybook/router@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.3.tgz#d10284325820275ab7971621333988b5021dd3c9" - integrity sha512-sOu6y2GySaY82SdXfF3yOn0IJTKMqd2BDOSGEno7PWWtSenHFQWY+z99C9k0dLBTkjRes5tPcgm0OJ7RdQVRDQ== - dependencies: - "@reach/router" "^1.2.1" - "@types/reach__router" "^1.2.3" - core-js "^3.0.1" - global "^4.3.2" - lodash "^4.17.11" - memoizerific "^1.11.3" - qs "^6.6.0" - "@storybook/router@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.4.tgz#e47af60478da7730c7d82de3d089d12c17077333" @@ -2241,24 +2147,6 @@ memoizerific "^1.11.3" qs "^6.6.0" -"@storybook/theming@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.3.tgz#b506fa2170d850953bfe84e2cb07e81e647e8c9a" - integrity sha512-3/0bo8CaoaHDYZaexydpYcwP6WW8BKRqSQBGXJY9y0TLhwY2Who5nPX9XdOLyu9d7lN//PRZlt8JnZynuncxoQ== - dependencies: - "@emotion/core" "^10.0.14" - "@emotion/styled" "^10.0.14" - "@storybook/client-logger" "5.2.3" - common-tags "^1.8.0" - core-js "^3.0.1" - deep-object-diff "^1.1.0" - emotion-theming "^10.0.14" - global "^4.3.2" - memoizerific "^1.11.3" - polished "^3.3.1" - prop-types "^15.7.2" - resolve-from "^5.0.0" - "@storybook/theming@5.2.4": version "5.2.4" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.4.tgz#79c99f65992082fdb4d39fb652db435dd6bebaca" @@ -5712,12 +5600,7 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5, core-js@~2.6.10: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f" integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA== -core-js@^3.0.1, core-js@^3.0.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07" - integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ== - -core-js@^3.2.0: +core-js@^3.0.1, core-js@^3.0.4, core-js@^3.2.0: version "3.3.2" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.2.tgz#cd42da1d7b0bb33ef11326be3a721934277ceb42" integrity sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg== From d1f2c7bb45f7aebc7863b159a08756820e18e0a8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 12:02:09 +0000 Subject: [PATCH 43/46] build(deps-dev): bump eslint-plugin-jest in /webapp Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.17.0 to 22.19.0. - [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.17.0...v22.19.0) 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 62d376a46..3d7c00e1a 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -115,7 +115,7 @@ "eslint-config-standard": "~12.0.0", "eslint-loader": "~3.0.2", "eslint-plugin-import": "~2.18.2", - "eslint-plugin-jest": "~22.17.0", + "eslint-plugin-jest": "~22.19.0", "eslint-plugin-node": "~10.0.0", "eslint-plugin-prettier": "~3.1.1", "eslint-plugin-promise": "~4.2.1", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index c00ad2e79..a78631bdb 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -6896,10 +6896,10 @@ eslint-plugin-import@~2.18.2: read-pkg-up "^2.0.0" resolve "^1.11.0" -eslint-plugin-jest@~22.17.0: - version "22.17.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.17.0.tgz#dc170ec8369cd1bff9c5dd8589344e3f73c88cf6" - integrity sha512-WT4DP4RoGBhIQjv+5D0FM20fAdAUstfYAf/mkufLNTojsfgzc5/IYW22cIg/Q4QBavAZsROQlqppiWDpFZDS8Q== +eslint-plugin-jest@~22.19.0: + version "22.19.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.19.0.tgz#0cf90946a8c927d40a2c64458c89bb635d0f2a0b" + integrity sha512-4zUc3rh36ds0SXdl2LywT4YWA3zRe8sfLhz8bPp8qQPIKvynTTkNGwmSCMpl5d9QiZE2JxSinGF+WD8yU+O0Lg== dependencies: "@typescript-eslint/experimental-utils" "^1.13.0" From 461defd4606dd2f4a68c0133e1dd528c164f09a5 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 15 Oct 2019 15:43:31 +0200 Subject: [PATCH 44/46] WITH CHECKBOXES --- webapp/components/Registration/Signup.vue | 36 ++++++++++++++++------- webapp/locales/de.json | 6 ++-- webapp/locales/en.json | 6 ++-- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue index cbed5b9f8..18750b300 100644 --- a/webapp/components/Registration/Signup.vue +++ b/webapp/components/Registration/Signup.vue @@ -30,15 +30,24 @@ name="email" icon="envelope" /> - - - - - - - - {{ $t('components.registration.signup.form.minimum-age') }} - +

+ +

+

+ +

+

+ +

Nutzungsbedingungen!", - "data-privacy": "Es gelten unsere Datenschutzerklärungen!", - "minimum-age": "Du musst das 18 Lebensjahr abgeschlossen haben!", + "terms-and-condition": "Ich stimme den Nutzungsbedingungen!zu.", + "data-privacy": "Ich habe die Datenschutzerklärungen! gelesen und verstanden", + "minimum-age": "Ich bin 18 Jahre oder älter.", "invitation-code": "Dein Einladungscode lautet: {code}", "errors": { "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index a22f7a4a4..a97a84a73 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -31,9 +31,9 @@ "title": "Join Human Connection!", "form": { "description": "To get started, enter your email address:", - "terms-and-condition": "Our terms of conditions! apply!", - "data-privacy": "Our Data privacy apply!", - "minimum-age": "You must be at least 18 years old!", + "terms-and-condition": "I confirm to the Terms and conditions.", + "data-privacy": " I have read and understood the Privacy Statement ", + "minimum-age": "I'm 18 years or older.", "invitation-code": "Your invitation code is: {code}", "errors": { "email-exists": "There is already a user account with this email address!", From b2dccfb51ca6f91b1e9646d8be4f956012811c26 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Tue, 15 Oct 2019 15:25:54 +0200 Subject: [PATCH 45/46] refactor: improve locale imports While refactoring the login form component I found many inconsistent ways of importing the list of locales. So I decided to refactor the imports altogether. Don't use `process.env` to import locales! --- package.json | 1 + .../components/LocaleSwitch/LocaleSwitch.vue | 3 ++- webapp/components/RelativeDateTime/index.vue | 14 ++----------- webapp/locales/index.js | 19 ++++++++++++++++- .../source/nuxt.config.maintenance.js | 8 +------ webapp/nuxt.config.js | 2 -- webapp/plugins/i18n.js | 3 ++- webapp/plugins/vue-filters.js | 21 +++---------------- yarn.lock | 5 +++++ 9 files changed, 34 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 6b51d9cca..3ed077b6e 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "cypress-cucumber-preprocessor": "^1.16.2", "cypress-file-upload": "^3.3.4", "cypress-plugin-retries": "^1.3.0", + "date-fns": "^2.4.1", "dotenv": "^8.1.0", "faker": "Marak/faker.js#master", "graphql-request": "^1.8.2", diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue index f765c534f..88959e27b 100644 --- a/webapp/components/LocaleSwitch/LocaleSwitch.vue +++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue @@ -36,6 +36,7 @@ import Dropdown from '~/components/Dropdown' import find from 'lodash/find' import orderBy from 'lodash/orderBy' +import locales from '~/locales' export default { components: { @@ -47,7 +48,7 @@ export default { }, data() { return { - locales: orderBy(process.env.locales, 'name'), + locales: orderBy(locales, 'name'), } }, computed: { diff --git a/webapp/components/RelativeDateTime/index.vue b/webapp/components/RelativeDateTime/index.vue index a6187425f..19018c24b 100644 --- a/webapp/components/RelativeDateTime/index.vue +++ b/webapp/components/RelativeDateTime/index.vue @@ -3,17 +3,8 @@