From 886f34ed30d4a23ebfa143abc2d8154331525b7e Mon Sep 17 00:00:00 2001 From: Brent Vardy Date: Thu, 17 Oct 2019 14:52:47 +0100 Subject: [PATCH 01/70] remove need to create new crop overlay --- webapp/components/TeaserImage/TeaserImage.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index dc096710d..a90bf91d6 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -48,6 +48,7 @@ export default { previewTemplate: this.template(), }, error: false, + showCropper: false, } }, watch: { @@ -63,6 +64,7 @@ export default { return `
+
` @@ -74,13 +76,12 @@ export default { transformImage(file) { let thumbnailElement, editor, confirm, thumbnailPreview, contributionImage // Create the image editor overlay - editor = document.createElement('div') + this.showCropper = false thumbnailElement = document.querySelectorAll('#postdropzone')[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') thumbnailElement.appendChild(editor) // Create the confirm button confirm = document.createElement('button') @@ -114,8 +115,9 @@ export default { let cropper = new Cropper(image, { zoomable: false }) }, dropzoneDrop() { - let cropOverlay = document.querySelectorAll('.crop-overlay')[0] - if (cropOverlay) cropOverlay.remove() + let cropperOverlay = this.$refs.cropperOverlay + cropperOverlay.innerHTML = '' + this.showCropper = true }, }, } From d3480534b1f97134685db4e0dbf75f139af7ce43 Mon Sep 17 00:00:00 2001 From: Brent Vardy Date: Thu, 17 Oct 2019 14:54:27 +0100 Subject: [PATCH 02/70] fix assigning editor --- webapp/components/TeaserImage/TeaserImage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index a90bf91d6..7ae64674d 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -76,6 +76,7 @@ export default { transformImage(file) { let thumbnailElement, editor, confirm, thumbnailPreview, contributionImage // Create the image editor overlay + editor = document.querySelectorAll('.crop-overlay')[0] this.showCropper = false thumbnailElement = document.querySelectorAll('#postdropzone')[0] thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0] From ddadcd919e457c226f30bf15859fb716c3835f7e Mon Sep 17 00:00:00 2001 From: Brent Vardy Date: Thu, 17 Oct 2019 15:18:21 +0100 Subject: [PATCH 03/70] update to use ref --- webapp/components/TeaserImage/TeaserImage.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index 7ae64674d..e095c3d23 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -9,6 +9,7 @@ @vdropzone-thumbnail="transformImage" @vdropzone-drop="dropzoneDrop" > +
-
` @@ -76,8 +76,7 @@ export default { transformImage(file) { let thumbnailElement, editor, confirm, thumbnailPreview, contributionImage // Create the image editor overlay - editor = document.querySelectorAll('.crop-overlay')[0] - this.showCropper = false + editor = this.$refs.cropperOverlay thumbnailElement = document.querySelectorAll('#postdropzone')[0] thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0] if (thumbnailPreview) thumbnailPreview.remove() @@ -90,6 +89,7 @@ export default { confirm.textContent = this.$t('contribution.teaserImage.cropperConfirm') confirm.addEventListener('click', () => { // Get the canvas with image data from Cropper.js + this.showCropper = false let canvas = cropper.getCroppedCanvas() canvas.toBlob(blob => { this.$refs.el.manuallyAddFile(blob, canvas.toDataURL(), null, null, { @@ -116,8 +116,6 @@ export default { let cropper = new Cropper(image, { zoomable: false }) }, dropzoneDrop() { - let cropperOverlay = this.$refs.cropperOverlay - cropperOverlay.innerHTML = '' this.showCropper = true }, }, From 9e829da80f53c91dd8ef35219b714f58a9301d99 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 10:57:10 +0000 Subject: [PATCH 04/70] build(deps): bump metascraper-logo from 5.7.6 to 5.7.14 in /backend Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.7.6 to 5.7.14. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.6...v5.7.14) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 16 ++++++++-------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 15fb752e5..b1ecba80d 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8901,17 +8901,17 @@ } }, "metascraper-logo": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.7.6.tgz", - "integrity": "sha512-0pMHxua4dNUcWLCk4WGCqBcuMoUoMAr3kFT34tJZTAd345iCagtwNNs2iAcNLdpNqyXzKyGIKcZPNkbWByVcCQ==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.7.14.tgz", + "integrity": "sha512-5kgH+2+chlJ4mUajHItg1lsXhkcWQbnkLcGrE+7YMIIf/7uHFGehg+dqVNw1CRBPNpwJKibrZSb9aHMlWJPwlg==", "requires": { - "@metascraper/helpers": "^5.7.6" + "@metascraper/helpers": "^5.7.14" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.6.tgz", - "integrity": "sha512-AD2VTQmMWl/KCUXl9h0fP84VacoiTI/8y8CBgErmYZnm+sliKGedQrDZO3JmzNg73Z5z08GQTjME1WHIDiIQDw==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", + "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", @@ -8925,7 +8925,7 @@ "iso-639-3": "~1.2.0", "isostring": "0.0.1", "lodash": "~4.17.15", - "mem": "~5.1.1", + "memoize-one": "~5.1.1", "mime-types": "~2.1.24", "normalize-url": "~4.5.0", "smartquotes": "~2.3.1", diff --git a/backend/package.json b/backend/package.json index 1f1c33a32..041010322 100644 --- a/backend/package.json +++ b/backend/package.json @@ -80,7 +80,7 @@ "metascraper-image": "^5.7.6", "metascraper-lang": "^5.7.14", "metascraper-lang-detector": "^4.8.5", - "metascraper-logo": "^5.7.6", + "metascraper-logo": "^5.7.14", "metascraper-publisher": "^5.7.14", "metascraper-soundcloud": "^5.7.14", "metascraper-title": "^5.7.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index b8b8b69db..05714b798 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5773,12 +5773,12 @@ metascraper-lang@^5.7.14: dependencies: "@metascraper/helpers" "^5.7.14" -metascraper-logo@^5.7.6: - version "5.7.6" - resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.7.6.tgz#92680c8e839c6c357ecb4d7fe0445f46233d0f09" - integrity sha512-0pMHxua4dNUcWLCk4WGCqBcuMoUoMAr3kFT34tJZTAd345iCagtwNNs2iAcNLdpNqyXzKyGIKcZPNkbWByVcCQ== +metascraper-logo@^5.7.14: + version "5.7.14" + resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.7.14.tgz#c5e7f4d4191672e48130e10f21f4a31a9faf539d" + integrity sha512-5kgH+2+chlJ4mUajHItg1lsXhkcWQbnkLcGrE+7YMIIf/7uHFGehg+dqVNw1CRBPNpwJKibrZSb9aHMlWJPwlg== dependencies: - "@metascraper/helpers" "^5.7.6" + "@metascraper/helpers" "^5.7.14" metascraper-publisher@^5.7.14: version "5.7.14" From 33ca36a7fb6031cac39aceb4bac2d294681d1098 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 11:03:34 +0000 Subject: [PATCH 05/70] build(deps): bump metascraper-url from 5.7.6 to 5.7.14 in /backend Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.7.6 to 5.7.14. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.6...v5.7.14) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 16 ++++++++-------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 8c1c12b12..a3b493b22 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9260,17 +9260,17 @@ } }, "metascraper-url": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/metascraper-url/-/metascraper-url-5.7.6.tgz", - "integrity": "sha512-V0ddB/UKsWOXcO5cQVdiX5IHPkC7wpWnVj6sc7NkHWImzq8GAQR6jWaPQ9t8uhQuLdqiXaW9l+a6x6zX3LC/hw==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/metascraper-url/-/metascraper-url-5.7.14.tgz", + "integrity": "sha512-scsXsbhI9VFcmgtMI/bsr+onvzzWGX4h80pitQQpECA7X2K2qcm5qic+anv6K2simbPJ/brDkhHC2rMRm9snbw==", "requires": { - "@metascraper/helpers": "^5.7.6" + "@metascraper/helpers": "^5.7.14" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.6.tgz", - "integrity": "sha512-AD2VTQmMWl/KCUXl9h0fP84VacoiTI/8y8CBgErmYZnm+sliKGedQrDZO3JmzNg73Z5z08GQTjME1WHIDiIQDw==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", + "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", @@ -9284,7 +9284,7 @@ "iso-639-3": "~1.2.0", "isostring": "0.0.1", "lodash": "~4.17.15", - "mem": "~5.1.1", + "memoize-one": "~5.1.1", "mime-types": "~2.1.24", "normalize-url": "~4.5.0", "smartquotes": "~2.3.1", diff --git a/backend/package.json b/backend/package.json index c306f4a7b..91810c7d7 100644 --- a/backend/package.json +++ b/backend/package.json @@ -84,7 +84,7 @@ "metascraper-publisher": "^5.7.14", "metascraper-soundcloud": "^5.7.14", "metascraper-title": "^5.7.14", - "metascraper-url": "^5.7.6", + "metascraper-url": "^5.7.14", "metascraper-video": "^5.7.6", "metascraper-youtube": "^5.7.14", "minimatch": "^3.0.4", diff --git a/backend/yarn.lock b/backend/yarn.lock index e5992a01c..f7680a3e9 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5804,12 +5804,12 @@ metascraper-title@^5.7.14: "@metascraper/helpers" "^5.7.14" lodash "~4.17.15" -metascraper-url@^5.7.6: - version "5.7.6" - resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.7.6.tgz#2f35b50e12ed14e2e6062285fd10cd3f37ec1bd8" - integrity sha512-V0ddB/UKsWOXcO5cQVdiX5IHPkC7wpWnVj6sc7NkHWImzq8GAQR6jWaPQ9t8uhQuLdqiXaW9l+a6x6zX3LC/hw== +metascraper-url@^5.7.14: + version "5.7.14" + resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.7.14.tgz#20645ec0299f1fe4bf194b08037e344b9555bfd0" + integrity sha512-scsXsbhI9VFcmgtMI/bsr+onvzzWGX4h80pitQQpECA7X2K2qcm5qic+anv6K2simbPJ/brDkhHC2rMRm9snbw== dependencies: - "@metascraper/helpers" "^5.7.6" + "@metascraper/helpers" "^5.7.14" metascraper-video@^5.7.6: version "5.7.6" From aeae72f6918861aa2a4c64d0b32c847d9e857e93 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 28 Oct 2019 13:49:32 +0100 Subject: [PATCH 06/70] first implementation --- webapp/components/FilterPosts/FilterPosts.vue | 3 + .../FilterPosts/LanguageFilterMenuItems.vue | 102 ++++++++++++++++++ webapp/locales/de.json | 6 +- webapp/locales/en.json | 6 +- webapp/store/posts.js | 14 +++ 5 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 webapp/components/FilterPosts/LanguageFilterMenuItems.vue diff --git a/webapp/components/FilterPosts/FilterPosts.vue b/webapp/components/FilterPosts/FilterPosts.vue index 58f0794d2..1dd0fa737 100644 --- a/webapp/components/FilterPosts/FilterPosts.vue +++ b/webapp/components/FilterPosts/FilterPosts.vue @@ -14,6 +14,7 @@ + @@ -24,12 +25,14 @@ import Dropdown from '~/components/Dropdown' import { mapGetters } from 'vuex' import CategoriesFilterMenuItems from './CategoriesFilterMenuItems' import GeneralFilterMenuItems from './GeneralFilterMenuItems' +import LanguageFilterMenuItems from './LanguageFilterMenuItems' export default { components: { Dropdown, CategoriesFilterMenuItems, GeneralFilterMenuItems, + LanguageFilterMenuItems, }, props: { placement: { type: String }, diff --git a/webapp/components/FilterPosts/LanguageFilterMenuItems.vue b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue new file mode 100644 index 000000000..5bfb931cb --- /dev/null +++ b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue @@ -0,0 +1,102 @@ + + + diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 67d3b5bbd..07b0fbc0e 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -86,7 +86,11 @@ }, "followers": { "label": "Benutzern, denen ich folge" - } + }, + "language": { + "header": "Sprachen", + "all": "Alle" + } }, "site": { "thanks": "Danke!", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index d9321b13b..094c88e60 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -87,7 +87,11 @@ }, "followers": { "label": "Users I follow" - } + }, + "language": { + "header": "Languages", + "all": "All" + } }, "site": { "thanks": "Thanks!", diff --git a/webapp/store/posts.js b/webapp/store/posts.js index 97c0e1245..9437db956 100644 --- a/webapp/store/posts.js +++ b/webapp/store/posts.js @@ -48,12 +48,23 @@ export const mutations = { delete filter.categories_some state.filter = filter }, + RESET_LANGUAGES(state) { + const filter = clone(state.filter) + delete filter.language_in + state.filter = filter + }, TOGGLE_CATEGORY(state, categoryId) { const filter = clone(state.filter) update(filter, 'categories_some.id_in', categoryIds => xor(categoryIds, [categoryId])) if (isEmpty(get(filter, 'categories_some.id_in'))) delete filter.categories_some state.filter = filter }, + TOGGLE_LANGUAGE(state, languageCode) { + const filter = clone(state.filter) + update(filter, 'language_in', languageCodes => xor(languageCodes, [languageCode])) + if (isEmpty(get(filter, 'language_in'))) delete filter.language_in + state.filter = filter + }, TOGGLE_EMOTION(state, emotion) { const filter = clone(state.filter) update(filter, 'emotions_some.emotion_in', emotions => xor(emotions, [emotion])) @@ -75,6 +86,9 @@ export const getters = { filteredCategoryIds(state) { return get(state.filter, 'categories_some.id_in') || [] }, + filteredLanguagesCodes(state) { + return get(state.filter, 'language_in') || [] + }, filteredByUsersFollowed(state) { return !!get(state.filter, 'author.followedBy_some.id') }, From a66aa0591cf3d3a1835aec454685875637c849ba Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 28 Oct 2019 14:44:20 +0100 Subject: [PATCH 07/70] Typo fixed. Password -> Passwort --- backend/src/middleware/email/templates/wrongAccount.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/middleware/email/templates/wrongAccount.html b/backend/src/middleware/email/templates/wrongAccount.html index 90f8cd357..cbf6e3cbb 100644 --- a/backend/src/middleware/email/templates/wrongAccount.html +++ b/backend/src/middleware/email/templates/wrongAccount.html @@ -24,7 +24,7 @@

Hallo!

-

Du hast bei uns ein neues Password angefordert – leider haben wir aber keinen +

Du hast bei uns ein neues Passwort angefordert – leider haben wir aber keinen Account mit Deiner E-Mailadresse gefunden. Kann es sein, dass Du mit einer anderen Adresse bei uns angemeldet bist?

From 529a8a636567324fd3197b111ef87b89e3954b8d Mon Sep 17 00:00:00 2001 From: Kapil Jain Date: Mon, 28 Oct 2019 15:40:29 -0400 Subject: [PATCH 08/70] send only one notification for mention and comment --- .../notifications/notificationsMiddleware.js | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js index a494783cf..ff1f50c59 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.js @@ -91,11 +91,30 @@ const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo const handleContentDataOfComment = async (resolve, root, args, context, resolveInfo) => { const idsOfUsers = extractMentionedUsers(args.content) - const comment = await resolve(root, args, context, resolveInfo) if (comment) { - await notifyUsers('Comment', comment.id, idsOfUsers, 'mentioned_in_comment', context) + const session = context.driver.session() + const cypherFindUser = ` + MATCH (user: User)-[:WROTE]->(:Post)<-[:COMMENTS]-(:Comment { id: $commentId }) + RETURN user { .id } + ` + const result = await session.run(cypherFindUser, { + commentId: comment.id, + }) + session.close() + const [postAuthor] = await result.records.map(record => { + return record.get('user') + }) + const idsOfUsersExcludingPostAuthor = idsOfUsers.filter(res => !res.equals([postAuthor])) + cosole.log('idsOfUsers1') + await notifyUsers( + 'Comment', + comment.id, + idsOfUsersExcludingPostAuthor, + 'mentioned_in_comment', + context, + ) } return comment From 9b3045e12f0e11011b210e4c7949c6c0d40ab99f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 04:21:15 +0000 Subject: [PATCH 09/70] build(deps-dev): bump eslint-config-prettier in /backend Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.4.0...v6.5.0) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 6 +++--- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index d2e7fafe9..d46252db8 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -4559,9 +4559,9 @@ } }, "eslint-config-prettier": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz", - "integrity": "sha512-YrKucoFdc7SEko5Sxe4r6ixqXPDP1tunGw91POeZTTRKItf/AMFYt/YLEQtZMkR2LVpAVhcAcZgcWpm1oGPW7w==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.5.0.tgz", + "integrity": "sha512-cjXp8SbO9VFGW/Z7mbTydqS9to8Z58E5aYhj3e1+Hx7lS9s6gL5ILKNpCqZAFOVYRcSkWPFYljHrEh8QFEK5EQ==", "dev": true, "requires": { "get-stdin": "^6.0.0" diff --git a/backend/package.json b/backend/package.json index cef03b736..554caf928 100644 --- a/backend/package.json +++ b/backend/package.json @@ -118,7 +118,7 @@ "chai": "~4.2.0", "cucumber": "~6.0.2", "eslint": "~6.5.1", - "eslint-config-prettier": "~6.4.0", + "eslint-config-prettier": "~6.5.0", "eslint-config-standard": "~14.1.0", "eslint-plugin-import": "~2.18.2", "eslint-plugin-jest": "~22.20.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index f89b8333b..9eb2fc0d5 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -3206,10 +3206,10 @@ escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz#0a04f147e31d33c6c161b2dd0971418ac52d0477" - integrity sha512-YrKucoFdc7SEko5Sxe4r6ixqXPDP1tunGw91POeZTTRKItf/AMFYt/YLEQtZMkR2LVpAVhcAcZgcWpm1oGPW7w== +eslint-config-prettier@~6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.5.0.tgz#aaf9a495e2a816865e541bfdbb73a65cc162b3eb" + integrity sha512-cjXp8SbO9VFGW/Z7mbTydqS9to8Z58E5aYhj3e1+Hx7lS9s6gL5ILKNpCqZAFOVYRcSkWPFYljHrEh8QFEK5EQ== dependencies: get-stdin "^6.0.0" From e3eba438ba8b08143d0340ef9f0f32d65c83e4b8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 04:22:10 +0000 Subject: [PATCH 10/70] build(deps-dev): bump cucumber from 6.0.2 to 6.0.3 in /backend Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/cucumber/cucumber-js/releases) - [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/cucumber/cucumber-js/compare/v6.0.2...v6.0.3) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 12 ++++++------ backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index d2e7fafe9..6193c0974 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -3871,9 +3871,9 @@ } }, "cucumber": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/cucumber/-/cucumber-6.0.2.tgz", - "integrity": "sha512-yEwPYGvgS2KG6ODdUXQwWcxjyr/l31dmpGJsZSkJIXNLNNmieKVefTpf8zLj6+0V2TCPwkmUZt4+OIXv97duEw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/cucumber/-/cucumber-6.0.3.tgz", + "integrity": "sha512-FSx7xdAQfFjcxp/iRBAuCFSXp2iJP1tF2Q5k/a67YgHiYbnwsD9F+UNv9ZG90LFHNsNQhb+67AmVxHkp4JRDpg==", "dev": true, "requires": { "assertion-error-formatter": "^3.0.0", @@ -3949,9 +3949,9 @@ } }, "cucumber-expressions": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cucumber-expressions/-/cucumber-expressions-8.0.1.tgz", - "integrity": "sha512-g+A+tUEafNofe6ErwvOkqaMvDj9NuOr0GouGotpw4r5yK2d4144o9/6sQpXBr2YXbRy5ItmER/2bzAyDAzhPyQ==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/cucumber-expressions/-/cucumber-expressions-8.0.2.tgz", + "integrity": "sha512-gETBdn2wJJC5jJkYbvPsgEPp6dnIHcq0UaN1YNAOyVvrbkeeB2D1X3or3LsYOGxsgj5LH0/Ty9fHZQx+QnoKIQ==", "dev": true, "requires": { "becke-ch--regex--s0-0-v1--base--pl--lib": "^1.4.0", diff --git a/backend/package.json b/backend/package.json index cef03b736..6a572cb3e 100644 --- a/backend/package.json +++ b/backend/package.json @@ -116,7 +116,7 @@ "babel-eslint": "~10.0.3", "babel-jest": "~24.9.0", "chai": "~4.2.0", - "cucumber": "~6.0.2", + "cucumber": "~6.0.3", "eslint": "~6.5.1", "eslint-config-prettier": "~6.4.0", "eslint-config-standard": "~14.1.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index f89b8333b..2f9eee522 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2720,10 +2720,10 @@ cucumber-tag-expressions@^2.0.2: resolved "https://registry.yarnpkg.com/cucumber-tag-expressions/-/cucumber-tag-expressions-2.0.2.tgz#aac27aae3690818ec15235bd056282dad8a2d2b8" integrity sha512-DohmT4X641KX/sb96bdb7J2kXNcQBPrYmf3Oc5kiHCLfzFMWx/o2kB4JvjvQPZnYuA9lRt6pqtArM5gvUn4uzw== -cucumber@~6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/cucumber/-/cucumber-6.0.2.tgz#3c4fbf1f76e60ddee79ab58f137a62c897a4d7f0" - integrity sha512-yEwPYGvgS2KG6ODdUXQwWcxjyr/l31dmpGJsZSkJIXNLNNmieKVefTpf8zLj6+0V2TCPwkmUZt4+OIXv97duEw== +cucumber@~6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/cucumber/-/cucumber-6.0.3.tgz#bf69ecc992772e580dabe265b2ed06ddab13d076" + integrity sha512-FSx7xdAQfFjcxp/iRBAuCFSXp2iJP1tF2Q5k/a67YgHiYbnwsD9F+UNv9ZG90LFHNsNQhb+67AmVxHkp4JRDpg== dependencies: assertion-error-formatter "^3.0.0" bluebird "^3.4.1" From bb63afdc4c651e7abfa0bf2180207233ce010bec Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 04:22:58 +0000 Subject: [PATCH 11/70] build(deps-dev): bump eslint-plugin-jest in /webapp Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.0 to 23.0.2. - [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/v23.0.0...v23.0.2) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 7eba6a9ff..68d502d4e 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": "~23.0.0", + "eslint-plugin-jest": "~23.0.2", "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 44cd79c6d..de059085b 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -6774,10 +6774,10 @@ eslint-plugin-import@~2.18.2: read-pkg-up "^2.0.0" resolve "^1.11.0" -eslint-plugin-jest@~23.0.0: - version "23.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.0.tgz#cbf61109b503ca72cab86178ea9a42064b901b4e" - integrity sha512-rvFXz4t/2gjktyJL1CTPz2Kqh3bx82ChsNaLxk4tKXav858e04fw1xfS5o+rIAUCRtoFoj4CI7MeZzUnvGkfMA== +eslint-plugin-jest@~23.0.2: + version "23.0.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.2.tgz#54a59bfe77245186afe13711a297067aefefff0a" + integrity sha512-fkxcvOJm0hC/jbJqYJjtuC9mvpTJqXd0Nixx7joVQvJoBQuXk/ws3+MtRYzD/4TcKSgvr21uuSLdwSxKJKC2cg== dependencies: "@typescript-eslint/experimental-utils" "^2.5.0" From ba7b50b49ce0b280d64e42d29c70946269d7f9e2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 04:23:42 +0000 Subject: [PATCH 12/70] build(deps): bump metascraper-audio from 5.7.6 to 5.7.14 in /backend Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.7.6 to 5.7.14. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.6...v5.7.14) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 16 ++++++++-------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index d2e7fafe9..f84345b0b 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8348,17 +8348,17 @@ } }, "metascraper-audio": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/metascraper-audio/-/metascraper-audio-5.7.6.tgz", - "integrity": "sha512-1CXw5+2WIxF5O0sJ1Hp4Zt8nSg4zXJXa9AUPMhnyhovLJ4cqGBdNVUbsxduuEHfYPiG1PtZyrtgDq+OQqiS5kA==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/metascraper-audio/-/metascraper-audio-5.7.14.tgz", + "integrity": "sha512-ev2PIDNTILznkDeWy/CFaKdhFlG/3URF0OOO4J2MXy8VNKd5IyP/+LF7zoPR9q5+C40+zRAmy8cqJId3qVAa2A==", "requires": { - "@metascraper/helpers": "^5.7.6" + "@metascraper/helpers": "^5.7.14" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.6.tgz", - "integrity": "sha512-AD2VTQmMWl/KCUXl9h0fP84VacoiTI/8y8CBgErmYZnm+sliKGedQrDZO3JmzNg73Z5z08GQTjME1WHIDiIQDw==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", + "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", @@ -8372,7 +8372,7 @@ "iso-639-3": "~1.2.0", "isostring": "0.0.1", "lodash": "~4.17.15", - "mem": "~5.1.1", + "memoize-one": "~5.1.1", "mime-types": "~2.1.24", "normalize-url": "~4.5.0", "smartquotes": "~2.3.1", diff --git a/backend/package.json b/backend/package.json index cef03b736..3da8130b2 100644 --- a/backend/package.json +++ b/backend/package.json @@ -72,7 +72,7 @@ "lodash": "~4.17.14", "merge-graphql-schemas": "^1.7.0", "metascraper": "^4.10.3", - "metascraper-audio": "^5.7.6", + "metascraper-audio": "^5.7.14", "metascraper-author": "^5.7.14", "metascraper-clearbit-logo": "^5.3.0", "metascraper-date": "^5.7.6", diff --git a/backend/yarn.lock b/backend/yarn.lock index f89b8333b..007d69fc0 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5714,12 +5714,12 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -metascraper-audio@^5.7.6: - version "5.7.6" - resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.7.6.tgz#05f3a732e8316eb80c0ee58d5981d053baff6cec" - integrity sha512-1CXw5+2WIxF5O0sJ1Hp4Zt8nSg4zXJXa9AUPMhnyhovLJ4cqGBdNVUbsxduuEHfYPiG1PtZyrtgDq+OQqiS5kA== +metascraper-audio@^5.7.14: + version "5.7.14" + resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.7.14.tgz#f5edbc0249af3fcd09863580c3531eb4b8546589" + integrity sha512-ev2PIDNTILznkDeWy/CFaKdhFlG/3URF0OOO4J2MXy8VNKd5IyP/+LF7zoPR9q5+C40+zRAmy8cqJId3qVAa2A== dependencies: - "@metascraper/helpers" "^5.7.6" + "@metascraper/helpers" "^5.7.14" metascraper-author@^5.7.14: version "5.7.14" From 6c1bd535ac482eb0a05d21e227a476800717a19e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 04:24:25 +0000 Subject: [PATCH 13/70] build(deps-dev): bump eslint-plugin-jest in /backend Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.20.0 to 23.0.2. - [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.20.0...v23.0.2) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 47 +++++++++++++----------------- backend/package.json | 2 +- backend/yarn.lock | 60 ++++++++++++++++++++------------------- 3 files changed, 51 insertions(+), 58 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index d2e7fafe9..8e540ad20 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1603,42 +1603,33 @@ "integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==" }, "@typescript-eslint/experimental-utils": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz", - "integrity": "sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.6.0.tgz", + "integrity": "sha512-34BAFpNOwHXeqT+AvdalLxOvcPYnCxA5JGmBAFL64RGMdP0u65rXjii7l/nwpgk5aLEE1LaqF+SsCU0/Cb64xA==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "1.13.0", - "eslint-scope": "^4.0.0" - }, - "dependencies": { - "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - } + "@typescript-eslint/typescript-estree": "2.6.0", + "eslint-scope": "^5.0.0" } }, "@typescript-eslint/typescript-estree": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz", - "integrity": "sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.6.0.tgz", + "integrity": "sha512-A3lSBVIdj2Gp0lFEL6in2eSPqJ33uAc3Ko+Y4brhjkxzjbzLnwBH22CwsW2sCo+iwogfIyvb56/AJri15H0u5Q==", "dev": true, "requires": { + "debug": "^4.1.1", + "glob": "^7.1.4", + "is-glob": "^4.0.1", "lodash.unescape": "4.0.1", - "semver": "5.5.0" + "semver": "^6.3.0" }, "dependencies": { "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } @@ -4844,12 +4835,12 @@ } }, "eslint-plugin-jest": { - "version": "22.20.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.20.0.tgz", - "integrity": "sha512-UwHGXaYprxwd84Wer8H7jZS+5C3LeEaU8VD7NqORY6NmPJrs+9Ugbq3wyjqO3vWtSsDaLar2sqEB8COmOZA4zw==", + "version": "23.0.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.0.2.tgz", + "integrity": "sha512-fkxcvOJm0hC/jbJqYJjtuC9mvpTJqXd0Nixx7joVQvJoBQuXk/ws3+MtRYzD/4TcKSgvr21uuSLdwSxKJKC2cg==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "^1.13.0" + "@typescript-eslint/experimental-utils": "^2.5.0" } }, "eslint-plugin-node": { diff --git a/backend/package.json b/backend/package.json index cef03b736..445bc6f05 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.20.0", + "eslint-plugin-jest": "~23.0.2", "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 f89b8333b..45f9e3c59 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1361,22 +1361,25 @@ resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d" integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg== -"@typescript-eslint/experimental-utils@^1.13.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e" - integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg== +"@typescript-eslint/experimental-utils@^2.5.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.6.0.tgz#ed70bef72822bff54031ff0615fc888b9e2b6e8a" + integrity sha512-34BAFpNOwHXeqT+AvdalLxOvcPYnCxA5JGmBAFL64RGMdP0u65rXjii7l/nwpgk5aLEE1LaqF+SsCU0/Cb64xA== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "1.13.0" - eslint-scope "^4.0.0" + "@typescript-eslint/typescript-estree" "2.6.0" + eslint-scope "^5.0.0" -"@typescript-eslint/typescript-estree@1.13.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz#8140f17d0f60c03619798f1d628b8434913dc32e" - integrity sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw== +"@typescript-eslint/typescript-estree@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.6.0.tgz#d3e9d8e001492e2b9124c4d4bd4e7f03c0fd7254" + integrity sha512-A3lSBVIdj2Gp0lFEL6in2eSPqJ33uAc3Ko+Y4brhjkxzjbzLnwBH22CwsW2sCo+iwogfIyvb56/AJri15H0u5Q== dependencies: + debug "^4.1.1" + glob "^7.1.4" + is-glob "^4.0.1" lodash.unescape "4.0.1" - semver "5.5.0" + semver "^6.3.0" "@wry/context@^0.4.0": version "0.4.4" @@ -3259,12 +3262,12 @@ eslint-plugin-import@~2.18.2: read-pkg-up "^2.0.0" resolve "^1.11.0" -eslint-plugin-jest@~22.20.0: - version "22.20.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.20.0.tgz#a3c3615c516fcbd20d50dbf395ea37361bd9e3b2" - integrity sha512-UwHGXaYprxwd84Wer8H7jZS+5C3LeEaU8VD7NqORY6NmPJrs+9Ugbq3wyjqO3vWtSsDaLar2sqEB8COmOZA4zw== +eslint-plugin-jest@~23.0.2: + version "23.0.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.2.tgz#54a59bfe77245186afe13711a297067aefefff0a" + integrity sha512-fkxcvOJm0hC/jbJqYJjtuC9mvpTJqXd0Nixx7joVQvJoBQuXk/ws3+MtRYzD/4TcKSgvr21uuSLdwSxKJKC2cg== dependencies: - "@typescript-eslint/experimental-utils" "^1.13.0" + "@typescript-eslint/experimental-utils" "^2.5.0" eslint-plugin-node@~10.0.0: version "10.0.0" @@ -3295,14 +3298,6 @@ eslint-plugin-standard@~4.0.1: resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== -eslint-scope@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" - integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" @@ -3919,6 +3914,18 @@ glob@7.1.4, glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.1.4: + version "7.1.5" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0" + integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + global-dirs@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -7388,11 +7395,6 @@ semver-diff@^2.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@5.5.0: - version "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.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" From 8f6d2704a66c64078278cf2df6eefd91411c27df Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 04:26:41 +0000 Subject: [PATCH 14/70] build(deps): bump metascraper-video from 5.7.6 to 5.7.14 in /backend Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.7.6 to 5.7.14. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.6...v5.7.14) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 16 ++++++++-------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index d2e7fafe9..5900464ab 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9349,18 +9349,18 @@ } }, "metascraper-video": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/metascraper-video/-/metascraper-video-5.7.6.tgz", - "integrity": "sha512-9Ak7QI3Je21h0+3i09SruGn1sLWUSB7ATLPtiVd7DfRb5O164LWhhmvMBxaMHhoMnvWgU9xuMkzQfI8kY66rBw==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/metascraper-video/-/metascraper-video-5.7.14.tgz", + "integrity": "sha512-nmXrxaf83f/nRbSYegAtpPzsoNafiJOT9zaAQFawRCQnxCBlMQoPALEzGGx1b/R5YuyWsqJzjjVTigBgQhcrGg==", "requires": { - "@metascraper/helpers": "^5.7.6", + "@metascraper/helpers": "^5.7.14", "lodash": "~4.17.15" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.6.tgz", - "integrity": "sha512-AD2VTQmMWl/KCUXl9h0fP84VacoiTI/8y8CBgErmYZnm+sliKGedQrDZO3JmzNg73Z5z08GQTjME1WHIDiIQDw==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", + "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", @@ -9374,7 +9374,7 @@ "iso-639-3": "~1.2.0", "isostring": "0.0.1", "lodash": "~4.17.15", - "mem": "~5.1.1", + "memoize-one": "~5.1.1", "mime-types": "~2.1.24", "normalize-url": "~4.5.0", "smartquotes": "~2.3.1", diff --git a/backend/package.json b/backend/package.json index cef03b736..e37d1227b 100644 --- a/backend/package.json +++ b/backend/package.json @@ -85,7 +85,7 @@ "metascraper-soundcloud": "^5.7.14", "metascraper-title": "^5.7.14", "metascraper-url": "^5.7.14", - "metascraper-video": "^5.7.6", + "metascraper-video": "^5.7.14", "metascraper-youtube": "^5.7.14", "minimatch": "^3.0.4", "mustache": "^3.1.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index f89b8333b..f7286ef1b 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5811,12 +5811,12 @@ metascraper-url@^5.7.14: dependencies: "@metascraper/helpers" "^5.7.14" -metascraper-video@^5.7.6: - version "5.7.6" - resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.7.6.tgz#ae149d6804ba026155d4c71e59b4d2ffb95b3062" - integrity sha512-9Ak7QI3Je21h0+3i09SruGn1sLWUSB7ATLPtiVd7DfRb5O164LWhhmvMBxaMHhoMnvWgU9xuMkzQfI8kY66rBw== +metascraper-video@^5.7.14: + version "5.7.14" + resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.7.14.tgz#3deb86e8c63b7bca0222c3b22f9dc27f0c77050e" + integrity sha512-nmXrxaf83f/nRbSYegAtpPzsoNafiJOT9zaAQFawRCQnxCBlMQoPALEzGGx1b/R5YuyWsqJzjjVTigBgQhcrGg== dependencies: - "@metascraper/helpers" "^5.7.6" + "@metascraper/helpers" "^5.7.14" lodash "~4.17.15" metascraper-youtube@^5.7.14: From d29b28bb918f2bc09924e61eacc3e9a6bbf75d1f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 07:55:13 +0000 Subject: [PATCH 15/70] build(deps): bump metascraper-date from 5.7.6 to 5.7.14 in /backend Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.7.6 to 5.7.14. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.6...v5.7.14) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 16 ++++++++-------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 30bcc7492..b03fc7080 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8535,17 +8535,17 @@ } }, "metascraper-date": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/metascraper-date/-/metascraper-date-5.7.6.tgz", - "integrity": "sha512-ikTNuOrKk9nA78/dxeTydkO4kajaFEzR6IAi1GVXTKzhMTaH9A8HA8ra/LndD8KYZMAEmJaIFvefi8vGVVkcUw==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/metascraper-date/-/metascraper-date-5.7.14.tgz", + "integrity": "sha512-eJKMtIFeBrnkAavkNlIT/O2bKmF2gKVgMpPbdg/9yJ+OS0pH3QTdk/I/NeU91fS0dAaC2ztwFKUqw2zjC27vew==", "requires": { - "@metascraper/helpers": "^5.7.6" + "@metascraper/helpers": "^5.7.14" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.6.tgz", - "integrity": "sha512-AD2VTQmMWl/KCUXl9h0fP84VacoiTI/8y8CBgErmYZnm+sliKGedQrDZO3JmzNg73Z5z08GQTjME1WHIDiIQDw==", + "version": "5.7.14", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", + "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", @@ -8559,7 +8559,7 @@ "iso-639-3": "~1.2.0", "isostring": "0.0.1", "lodash": "~4.17.15", - "mem": "~5.1.1", + "memoize-one": "~5.1.1", "mime-types": "~2.1.24", "normalize-url": "~4.5.0", "smartquotes": "~2.3.1", diff --git a/backend/package.json b/backend/package.json index 7c2e154c1..ae834f134 100644 --- a/backend/package.json +++ b/backend/package.json @@ -75,7 +75,7 @@ "metascraper-audio": "^5.7.14", "metascraper-author": "^5.7.14", "metascraper-clearbit-logo": "^5.3.0", - "metascraper-date": "^5.7.6", + "metascraper-date": "^5.7.14", "metascraper-description": "^5.7.14", "metascraper-image": "^5.7.6", "metascraper-lang": "^5.7.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index 52c7f3e33..3eb893b07 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5736,12 +5736,12 @@ metascraper-clearbit-logo@^5.3.0: dependencies: got "~9.6.0" -metascraper-date@^5.7.6: - version "5.7.6" - resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-5.7.6.tgz#6d2e2b39f0a43374abf6f8639017b2500b821a54" - integrity sha512-ikTNuOrKk9nA78/dxeTydkO4kajaFEzR6IAi1GVXTKzhMTaH9A8HA8ra/LndD8KYZMAEmJaIFvefi8vGVVkcUw== +metascraper-date@^5.7.14: + version "5.7.14" + resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-5.7.14.tgz#5cb57c8f60bd15c841268fa983545dd3a0586a3c" + integrity sha512-eJKMtIFeBrnkAavkNlIT/O2bKmF2gKVgMpPbdg/9yJ+OS0pH3QTdk/I/NeU91fS0dAaC2ztwFKUqw2zjC27vew== dependencies: - "@metascraper/helpers" "^5.7.6" + "@metascraper/helpers" "^5.7.14" metascraper-description@^5.7.14: version "5.7.14" From 86be5e743dbfc13d5294690db7997517b1911fbb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 08:04:45 +0000 Subject: [PATCH 16/70] build(deps-dev): bump apollo-server-testing in /backend Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.6 to 2.9.7. - [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.6...apollo-server-testing@2.9.7) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 22 +++++++++++----------- backend/package.json | 2 +- backend/yarn.lock | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 1e65b048d..f09c8d7cf 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1992,9 +1992,9 @@ } }, "apollo-server-core": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.9.6.tgz", - "integrity": "sha512-2tHAWQxP7HrETI/BZvg2fem6YlahF9HUp4Y6SSL95WP3uNMOJBlN12yM1y+O2u5K5e4jwdPNaLjoL2A/26XrLw==", + "version": "2.9.7", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.9.7.tgz", + "integrity": "sha512-EqKyROy+21sM93YHjGpy6wlnzK/vH0fnZh7RCf3uB69aQ3OjgdP4AQ5oWRQ62NDN+aoic7OLhChSDJeDonq/NQ==", "dev": true, "requires": { "@apollographql/apollo-tools": "^0.4.0", @@ -2006,7 +2006,7 @@ "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-errors": "^2.3.4", "apollo-server-plugin-base": "^0.6.5", "apollo-server-types": "^0.2.5", "apollo-tracing": "^0.8.5", @@ -2030,9 +2030,9 @@ } }, "apollo-server-errors": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz", - "integrity": "sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.4.tgz", + "integrity": "sha512-Y0PKQvkrb2Kd18d1NPlHdSqmlr8TgqJ7JQcNIfhNDgdb45CnqZlxL1abuIRhr8tiw8OhVOcFxz2KyglBi8TKdA==", "dev": true }, "apollo-server-express": { @@ -2102,12 +2102,12 @@ } }, "apollo-server-testing": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/apollo-server-testing/-/apollo-server-testing-2.9.6.tgz", - "integrity": "sha512-pbURQD5VjNFk4GMVVxyCds9rY4/NIqjvjE4tyf1k89RHwMdk+zuVggt/DGudteorZtqAqtsOIHWojMBU4s2klA==", + "version": "2.9.7", + "resolved": "https://registry.npmjs.org/apollo-server-testing/-/apollo-server-testing-2.9.7.tgz", + "integrity": "sha512-yy18ceSyX2a9UYcs6X7K0xFZwcS1riEh99zdWU0XB/yzzTIdGZkFYeJmV/zjpGL3CFyXF7Va/muo6otl4nDOsA==", "dev": true, "requires": { - "apollo-server-core": "^2.9.6" + "apollo-server-core": "^2.9.7" } }, "apollo-server-types": { diff --git a/backend/package.json b/backend/package.json index 2a8ec4361..065781ced 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.6", + "apollo-server-testing": "~2.9.7", "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 27e187ffb..e09fb08aa 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1663,7 +1663,7 @@ apollo-server-caching@^0.5.0: dependencies: lru-cache "^5.0.0" -apollo-server-core@^2.9.6, apollo-server-core@^2.9.7: +apollo-server-core@^2.9.7: version "2.9.7" resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.7.tgz#0f32344af90dec445ac780be95350bfa736fc416" integrity sha512-EqKyROy+21sM93YHjGpy6wlnzK/vH0fnZh7RCf3uB69aQ3OjgdP4AQ5oWRQ62NDN+aoic7OLhChSDJeDonq/NQ== @@ -1732,12 +1732,12 @@ apollo-server-plugin-base@^0.6.5: dependencies: apollo-server-types "^0.2.5" -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== +apollo-server-testing@~2.9.7: + version "2.9.7" + resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.7.tgz#8d05058ddda4a715fac2fefb2b8e973e409a7672" + integrity sha512-yy18ceSyX2a9UYcs6X7K0xFZwcS1riEh99zdWU0XB/yzzTIdGZkFYeJmV/zjpGL3CFyXF7Va/muo6otl4nDOsA== dependencies: - apollo-server-core "^2.9.6" + apollo-server-core "^2.9.7" apollo-server-types@^0.2.5: version "0.2.5" From 8776d9aaec8abe31a4dfdc120ebc48e90eeaad13 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 08:05:11 +0000 Subject: [PATCH 17/70] build(deps): bump date-fns from 2.5.1 to 2.6.0 in /backend Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.5.1 to 2.6.0. - [Release notes](https://github.com/date-fns/date-fns/releases) - [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md) - [Commits](https://github.com/date-fns/date-fns/compare/v2.5.1...v2.6.0) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 6 +++--- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 1e65b048d..8a9cd7913 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -4003,9 +4003,9 @@ } }, "date-fns": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.5.1.tgz", - "integrity": "sha512-ZBrQmuaqH9YqIejbgu8f09ki7wdD2JxWsRTZ/+HnnLNmkI56ty0evnWzKY+ihLT0xX5VdUX0vDNZCxJJGKX2+Q==" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.6.0.tgz", + "integrity": "sha512-F55YxqRdEfP/eYQmQjLN798v0AwLjmZ8nMBjdQvNwEE3N/zWVrlkkqT+9seBlPlsbkybG4JmWg3Ee3dIV9BcGQ==" }, "debug": { "version": "4.1.1", diff --git a/backend/package.json b/backend/package.json index 2a8ec4361..ef63251be 100644 --- a/backend/package.json +++ b/backend/package.json @@ -54,7 +54,7 @@ "cheerio": "~1.0.0-rc.3", "cors": "~2.8.5", "cross-env": "~6.0.3", - "date-fns": "2.5.1", + "date-fns": "2.6.0", "debug": "~4.1.1", "dotenv": "~8.2.0", "express": "^4.17.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index 27e187ffb..4b0d651ab 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2785,10 +2785,10 @@ data-urls@^1.0.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -date-fns@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.5.1.tgz#6bd76f01d3a438e9c481d4c18512ddac37585b4c" - integrity sha512-ZBrQmuaqH9YqIejbgu8f09ki7wdD2JxWsRTZ/+HnnLNmkI56ty0evnWzKY+ihLT0xX5VdUX0vDNZCxJJGKX2+Q== +date-fns@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.6.0.tgz#a5bc82e6a4c3995ae124b0ba1a71aec7b8cbd666" + integrity sha512-F55YxqRdEfP/eYQmQjLN798v0AwLjmZ8nMBjdQvNwEE3N/zWVrlkkqT+9seBlPlsbkybG4JmWg3Ee3dIV9BcGQ== debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" From 2c4416c2eee5e9ebc965a4247e3117cfac1e8a51 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 08:07:10 +0000 Subject: [PATCH 18/70] build(deps): bump node from 12.13.0-alpine to 13.0.1-alpine in /webapp Bumps node from 12.13.0-alpine to 13.0.1-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 20f19b5b6..ae951273d 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.13.0-alpine as base +FROM node:13.0.1-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 7daf4f822..8e95ada57 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -1,4 +1,4 @@ -FROM node:12.13.0-alpine as build +FROM node:13.0.1-alpine as build LABEL Description="Maintenance page 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 5d1f7bd86eb1cf62f20e28f691e295eaf461c5fa Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Tue, 29 Oct 2019 11:16:35 +0300 Subject: [PATCH 19/70] remove unused readme files --- webapp/assets.md | 5 ----- webapp/layouts.md | 5 ----- webapp/middleware.md | 5 ----- webapp/pages.md | 6 ------ webapp/plugins.md | 5 ----- webapp/static.md | 9 --------- webapp/store.md | 7 ------- webapp/styleguide.md | 12 ------------ 8 files changed, 54 deletions(-) delete mode 100644 webapp/assets.md delete mode 100644 webapp/layouts.md delete mode 100644 webapp/middleware.md delete mode 100644 webapp/pages.md delete mode 100644 webapp/plugins.md delete mode 100644 webapp/static.md delete mode 100644 webapp/store.md delete mode 100644 webapp/styleguide.md diff --git a/webapp/assets.md b/webapp/assets.md deleted file mode 100644 index 6ac7dc388..000000000 --- a/webapp/assets.md +++ /dev/null @@ -1,5 +0,0 @@ -# ASSETS - -This directory contains your un-compiled assets such as LESS, SASS, or JavaScript – in our case SCSS styles. - -More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#webpacked). diff --git a/webapp/layouts.md b/webapp/layouts.md deleted file mode 100644 index a709d79fe..000000000 --- a/webapp/layouts.md +++ /dev/null @@ -1,5 +0,0 @@ -# LAYOUTS - -This directory contains your Application Layouts. - -More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/views#layouts). diff --git a/webapp/middleware.md b/webapp/middleware.md deleted file mode 100644 index a899527e2..000000000 --- a/webapp/middleware.md +++ /dev/null @@ -1,5 +0,0 @@ -# MIDDLEWARE - -This directory contains our application middleware. The middleware lets you define custom functions to be ran before rendering a page or a group of pages \(layouts\). - -More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing#middleware). diff --git a/webapp/pages.md b/webapp/pages.md deleted file mode 100644 index 352c9fa04..000000000 --- a/webapp/pages.md +++ /dev/null @@ -1,6 +0,0 @@ -# PAGES - -This directory contains your Application Views and Routes. The framework reads all the `*.vue` files inside this directory and create the router of your application. - -More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing). - diff --git a/webapp/plugins.md b/webapp/plugins.md deleted file mode 100644 index dc7b545f2..000000000 --- a/webapp/plugins.md +++ /dev/null @@ -1,5 +0,0 @@ -# PLUGINS - -This directory contains your Javascript plugins that you want to run before mounting the root Vue.js application. - -More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/plugins). diff --git a/webapp/static.md b/webapp/static.md deleted file mode 100644 index db271e3a5..000000000 --- a/webapp/static.md +++ /dev/null @@ -1,9 +0,0 @@ -# STATIC - -This directory contains your static files. Each file inside this directory is mapped to `/`. - -Example: `/static/robots.txt` is mapped as `/robots.txt`. - -We use it for images. - -More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#static). diff --git a/webapp/store.md b/webapp/store.md deleted file mode 100644 index 6c8e3735c..000000000 --- a/webapp/store.md +++ /dev/null @@ -1,7 +0,0 @@ -# STORE - -This directory contains your Vuex Store files. Vuex Store option is implemented in the Nuxt.js framework. - -Creating a file in this directory activates the option in the framework automatically. - -More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/vuex-store). diff --git a/webapp/styleguide.md b/webapp/styleguide.md deleted file mode 100644 index 1c3951494..000000000 --- a/webapp/styleguide.md +++ /dev/null @@ -1,12 +0,0 @@ -# Styleguide - -For this Projoject we decided to use [Jörg Bayreuther's](https://github.com/visualjerk) _\(visualjerk\)_ fantastic Design System called [CION](https://cion.visualjerk.de/). _\(see a_ [_demo_](https://styleguide.cion.visualjerk.de/)_\)_ - -![Styleguide in action under https://localhost:8080](../.gitbook/assets/screenshot-styleguide.png) - -## Checkout the Styleguide - -It's now an npm package. Want to help with it's development or maintenance? - -[Head over to the repo](https://github.com/Human-Connection/Nitro-Styleguide) - From 8816f7be2a9662bc1333e37b306dee6b964fc2e0 Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Tue, 29 Oct 2019 11:43:16 +0300 Subject: [PATCH 20/70] add migration plan to webapp readme --- webapp/README.md | 65 +++++++++++++++++++++++++++++++-------------- webapp/storybook.md | 33 +++++++++++++++++++++++ 2 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 webapp/storybook.md diff --git a/webapp/README.md b/webapp/README.md index b9c235196..a7be4de97 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -33,48 +33,73 @@ $ yarn build $ yarn start ``` -### Storybook +### Run tests -We encourage contributors to use Storybook to test out new components in an isolated way, and benefit from its many features. -See the docs for live examples and answers to FAQ, among other helpful information. ![Storybook docs](https://storybook.js.org/docs/basics/introduction/) +We ensure the quality of our frontend code by using +- [ESLint](https://eslint.org/) for checking our JavaScript code +- [Jest](https://jestjs.io/) and [Vue Test Utils](https://vue-test-utils.vuejs.org/) to unit test our components +- [Storybook](https://storybook.js.org/) to manually test our components in an isolated playground + +Use these commands to run the tests: {% tabs %} -{% tab title="Docker" %} +{% tab title="With Docker" %} -After you have started the application following the instructions above, in another terminal run: +After starting the application following the above guidelines open new terminal windows for each of these commands: ```bash +# run eslint +$ docker-compose exec webapp yarn lint +``` + +```bash +# run unit tests +$ docker-compose exec webapp yarn test +``` + +```bash +# start storybook $ docker-compose exec webapp yarn storybook ``` -The output should look similar to this: -![Storybook output](../.gitbook/assets/storybook-output.png) - -Click on the link http://localhost:3002/ to open the browser to your interactive storybook. +You can then visit the Storybook playground on `http://localhost:3002` {% endtab %} {% tab title="Without Docker" %} -Run the following command: + +After starting the application following the above guidelines open new terminal windows for each of these commands: ```bash -# in webapp/ -yarn storybook +# run eslint +$ yarn lint ``` -Open http://localhost:3002/ in your browser +```bash +# run unit tests +$ yarn test +``` + +```bash +# start storybook +$ yarn storybook +``` + +You can then visit the Storybook playground on `http://localhost:3002` {% endtab %} {% endtabs %} +## Styleguide Migration +We are currently in the process of migrating our styleguide components and design tokens from the [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) into the main [Human Connection repository](https://github.com/Human-Connection/Human-Connection) and refactoring our components in the process. During this migration our new components will live in a `view` folder to separate them from the old, yet untouched components. -## Styleguide +### Folder Structure -All reusable Components \(for example avatar\) should be done inside the [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) repository. +The folder structure we are aiming for is based on the [directory setup proposed by Nuxt.js](https://nuxtjs.org/guide/directory-structure): -![Styleguide Screenshot](../.gitbook/assets/screenshot-styleguide%20%281%29.png) - -More information can be found here: [https://github.com/Human-Connection/Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) - -If you need to change something in the styleguide and want to see the effects on the frontend immediately, then we have you covered. You need to clone the styleguide to the parent directory `../Nitro-Styleguide` and run `yarn && yarn run dev`. After that you run `yarn run dev:styleguide` instead of `yarn run dev` and you will see your changes reflected inside the frontend! +- **assets** contains icons, images and logos in `svg` format +- **components** are the generic building blocks of the app – small, reusable and usually not coupled to state +- **features** are composed of components but tied to a particular function of the app (e.g. `comment` or `post`) +- **pages** are the entry points for all `routes` in the app and are composed of features and components +- **styles** holds all shared SCSS files such as `variables` and `mixins` diff --git a/webapp/storybook.md b/webapp/storybook.md new file mode 100644 index 000000000..b987f2064 --- /dev/null +++ b/webapp/storybook.md @@ -0,0 +1,33 @@ +### Storybook + +We encourage contributors to use Storybook to test out new components in an isolated way, and benefit from its many features. +See the docs for live examples and answers to FAQ, among other helpful information. ![Storybook docs](https://storybook.js.org/docs/basics/introduction/) + +{% tabs %} +{% tab title="Docker" %} + +After you have started the application following the instructions above, in another terminal run: + +```bash +$ docker-compose exec webapp yarn storybook +``` +The output should look similar to this: + +![Storybook output](../.gitbook/assets/storybook-output.png) + +Click on the link http://localhost:3002/ to open the browser to your interactive storybook. + +{% endtab %} + +{% tab title="Without Docker" %} +Run the following command: + +```bash +# in webapp/ +yarn storybook +``` + +Open http://localhost:3002/ in your browser + +{% endtab %} +{% endtabs %} From 13f14aec25ae9fa3122f66a50def46b773ddb4c0 Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Tue, 29 Oct 2019 12:22:30 +0300 Subject: [PATCH 21/70] add component guidelines --- webapp/README.md | 5 +++-- webapp/components.md | 25 ++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/webapp/README.md b/webapp/README.md index a7be4de97..5a92a644e 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -40,7 +40,7 @@ We ensure the quality of our frontend code by using - [Jest](https://jestjs.io/) and [Vue Test Utils](https://vue-test-utils.vuejs.org/) to unit test our components - [Storybook](https://storybook.js.org/) to manually test our components in an isolated playground -Use these commands to run the tests: +For more information see our [frontend testing guide](testing.md). Use these commands to run the tests: {% tabs %} {% tab title="With Docker" %} @@ -101,5 +101,6 @@ The folder structure we are aiming for is based on the [directory setup proposed - **assets** contains icons, images and logos in `svg` format - **components** are the generic building blocks of the app – small, reusable and usually not coupled to state - **features** are composed of components but tied to a particular function of the app (e.g. `comment` or `post`) -- **pages** are the entry points for all `routes` in the app and are composed of features and components +- **layouts** can use components to create templates for pages +- **pages** are the entry points for all `routes` in the app and are composed of layouts, features and components - **styles** holds all shared SCSS files such as `variables` and `mixins` diff --git a/webapp/components.md b/webapp/components.md index 92b3dd1fb..822ebe142 100644 --- a/webapp/components.md +++ b/webapp/components.md @@ -1,5 +1,24 @@ -# COMPONENTS +# Components – Code Guidelines -The components directory contains your Vue.js Components. +## We adhere to the [single responsibility principle](https://en.wikipedia.org/wiki/Single_responsibility_principle) -_Nuxt.js doesn't supercharge these components._ +Each component does _exactly one job_. The goal is to end up with many small components that are: +- easy to understand +- easy to maintain +- easy to reuse + +**How do you decide what is a separate component?** Try to describe what it does in _one sentence_! When you find yourself using `and` and `or` the code you are talking about should probably be split up into two or more components. + +On the other hand, when something is easily expressed in a few lines of HTML and SCSS and not likely to be reused this is a good indicator that it should _not_ go into a separate component. + +## We compose with components + +Usually `pages` use `layouts` as templates and will be composed of `features`. `features` are composed of `components`, the smallest building blocks of the app. The further down we go in this hierarchy the simpler and more generic the components become. Here is an example: + +- The `index` page is responsible for displaying a list of posts. It uses the `default` layout and the `PostList` feature. +- The `PostList` feature uses a `List` component to render `PostTeaser` features. +- The `PostTeaser` feature consists of a `Card` wrapped around a `CardImage`, `CardTitle` and `CardContent` component. + +The `index` page is unique in the app and will never be reused. The `PostList` knows it is handling post data and can therefore not be used for anything else – but it can display posts on the `index` as well as the `user` page. + +The `Card` on the other hand does not care about the type of data it needs to handle. It just takes whatever it receives and renders it in a certain way, so it can be reused throughout the app for many different features. From 05606bfdaf2fa3ecf1157e8be3153a4c9e8341c2 Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Tue, 29 Oct 2019 12:24:35 +0300 Subject: [PATCH 22/70] add html guidelines --- webapp/README.md | 2 +- webapp/html.md | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 webapp/html.md diff --git a/webapp/README.md b/webapp/README.md index 5a92a644e..b47f89c8d 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -101,6 +101,6 @@ The folder structure we are aiming for is based on the [directory setup proposed - **assets** contains icons, images and logos in `svg` format - **components** are the generic building blocks of the app – small, reusable and usually not coupled to state - **features** are composed of components but tied to a particular function of the app (e.g. `comment` or `post`) -- **layouts** can use components to create templates for pages +- **layouts** can use components to create layout templates for pages - **pages** are the entry points for all `routes` in the app and are composed of layouts, features and components - **styles** holds all shared SCSS files such as `variables` and `mixins` diff --git a/webapp/html.md b/webapp/html.md new file mode 100644 index 000000000..e2779c424 --- /dev/null +++ b/webapp/html.md @@ -0,0 +1,22 @@ +# HTML – Code Guidelines + +## We write semantic markup + +We avoid using `divs` and `spans` and try to choose more meaningful HTML elements instead. If unsure which element to use [this list by MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element) can be of help. + +Why? +- semantic markup is crucial for accessibility +- it makes the code more readable for other developers +- it benefits our SEO + +For more background [see this article](https://css-tricks.com/why-how-and-when-to-use-semantic-html-and-aria/). + +This doesn’t mean you can’t ever use a `div` – just think twice before you do! + +## We write as little HTML as possible – and as much as necessary + +HTML is used to _structure content on the page_ and should therefore reflect its complexity. Not more and not less. Most content does not require deep nesting of HTML elements – if you find yourself wrapping `container` around `container` or adding an element just to correctly position another element on the page this calls for the use of CSS instead! + +Why? +- deep nesting makes it hard to understand, style and maintain components +- it can lead to performance issues From 4822fd64362492f3c12bc6df1328ad055e750a80 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 11:03:46 +0000 Subject: [PATCH 23/70] build(deps-dev): bump eslint from 6.5.1 to 6.6.0 in /backend Bumps [eslint](https://github.com/eslint/eslint) from 6.5.1 to 6.6.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v6.5.1...v6.6.0) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 129 ++++++++++++++++++++++++++------------ backend/package.json | 2 +- backend/yarn.lock | 60 +++++++++--------- 3 files changed, 119 insertions(+), 72 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 36b8cb4b0..479ff32e8 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -3499,12 +3499,12 @@ "dev": true }, "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "^3.1.0" } }, "cli-table3": { @@ -4422,9 +4422,9 @@ } }, "eslint": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.5.1.tgz", - "integrity": "sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz", + "integrity": "sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -4434,9 +4434,9 @@ "debug": "^4.0.1", "doctrine": "^3.0.0", "eslint-scope": "^5.0.0", - "eslint-utils": "^1.4.2", + "eslint-utils": "^1.4.3", "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.1", + "espree": "^6.1.2", "esquery": "^1.0.1", "esutils": "^2.0.2", "file-entry-cache": "^5.0.1", @@ -4446,7 +4446,7 @@ "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^6.4.1", + "inquirer": "^7.0.0", "is-glob": "^4.0.0", "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", @@ -4493,6 +4493,15 @@ } } }, + "eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, "glob-parent": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", @@ -4918,13 +4927,13 @@ "dev": true }, "espree": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz", - "integrity": "sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", + "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", "dev": true, "requires": { - "acorn": "^7.0.0", - "acorn-jsx": "^5.0.2", + "acorn": "^7.1.0", + "acorn-jsx": "^5.1.0", "eslint-visitor-keys": "^1.1.0" } }, @@ -5331,9 +5340,9 @@ "integrity": "sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ==" }, "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", + "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", "dev": true, "requires": { "escape-string-regexp": "^1.0.5" @@ -6188,26 +6197,35 @@ "dev": true }, "inquirer": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", - "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz", + "integrity": "sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==", "dev": true, "requires": { - "ansi-escapes": "^3.2.0", + "ansi-escapes": "^4.2.1", "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", + "cli-cursor": "^3.1.0", "cli-width": "^2.0.0", "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", "run-async": "^2.2.0", "rxjs": "^6.4.0", - "string-width": "^2.1.0", + "string-width": "^4.1.0", "strip-ansi": "^5.1.0", "through": "^2.3.6" }, "dependencies": { + "ansi-escapes": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz", + "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==", + "dev": true, + "requires": { + "type-fest": "^0.5.2" + } + }, "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", @@ -6225,12 +6243,35 @@ "supports-color": "^5.3.0" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz", + "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^5.2.0" + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -6248,6 +6289,12 @@ "requires": { "has-flag": "^3.0.0" } + }, + "type-fest": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", + "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==", + "dev": true } } }, @@ -9643,9 +9690,9 @@ "integrity": "sha512-3Bxq1R5LBZp7fbFPZzFe5WN4s0q3+gxZaZuZVY+QctYJiCiVgXHOTIC0/HgZuOPFt/6BQcx5u0H2CUOxT/RoGQ==" }, "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, "mz": { @@ -10189,18 +10236,18 @@ } }, "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "^2.1.0" }, "dependencies": { "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true } } @@ -11195,12 +11242,12 @@ } }, "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, "requires": { - "onetime": "^2.0.0", + "onetime": "^5.1.0", "signal-exit": "^3.0.2" } }, diff --git a/backend/package.json b/backend/package.json index 3cdb4fe4c..2631ea1ed 100644 --- a/backend/package.json +++ b/backend/package.json @@ -117,7 +117,7 @@ "babel-jest": "~24.9.0", "chai": "~4.2.0", "cucumber": "~6.0.3", - "eslint": "~6.5.1", + "eslint": "~6.6.0", "eslint-config-prettier": "~6.5.0", "eslint-config-standard": "~14.1.0", "eslint-plugin-import": "~2.18.2", diff --git a/backend/yarn.lock b/backend/yarn.lock index 20eea9e31..ea7e8a6fd 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1422,10 +1422,10 @@ acorn-globals@^4.1.0: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-jsx@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f" - integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw== +acorn-jsx@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" + integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== acorn-walk@^6.0.1: version "6.2.0" @@ -1442,10 +1442,10 @@ acorn@^6.0.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== -acorn@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a" - integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ== +acorn@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" + integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== agent-base@^4.3.0: version "4.3.0" @@ -3306,22 +3306,22 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" - integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== +eslint-utils@^1.4.2, eslint-utils@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" + integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== dependencies: - eslint-visitor-keys "^1.0.0" + eslint-visitor-keys "^1.1.0" eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint@~6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.5.1.tgz#828e4c469697d43bb586144be152198b91e96ed6" - integrity sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A== +eslint@~6.6.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.6.0.tgz#4a01a2fb48d32aacef5530ee9c5a78f11a8afd04" + integrity sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g== dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.10.0" @@ -3330,9 +3330,9 @@ eslint@~6.5.1: debug "^4.0.1" doctrine "^3.0.0" eslint-scope "^5.0.0" - eslint-utils "^1.4.2" + eslint-utils "^1.4.3" eslint-visitor-keys "^1.1.0" - espree "^6.1.1" + espree "^6.1.2" esquery "^1.0.1" esutils "^2.0.2" file-entry-cache "^5.0.1" @@ -3342,7 +3342,7 @@ eslint@~6.5.1: ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^6.4.1" + inquirer "^7.0.0" is-glob "^4.0.0" js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" @@ -3361,13 +3361,13 @@ eslint@~6.5.1: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de" - integrity sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ== +espree@^6.1.2: + version "6.1.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d" + integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA== dependencies: - acorn "^7.0.0" - acorn-jsx "^5.0.2" + acorn "^7.1.0" + acorn-jsx "^5.1.0" eslint-visitor-keys "^1.1.0" esprima@^3.1.3: @@ -4451,10 +4451,10 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== -inquirer@^6.4.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.1.tgz#8bfb7a5ac02dac6ff641ac4c5ff17da112fcdb42" - integrity sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw== +inquirer@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a" + integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ== dependencies: ansi-escapes "^4.2.1" chalk "^2.4.2" From 0826bcce3b80b114dbb00b8023d6f90d2f58b575 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 11:04:18 +0000 Subject: [PATCH 24/70] build(deps): bump date-fns from 2.5.0 to 2.6.0 in /webapp Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/date-fns/date-fns/releases) - [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md) - [Commits](https://github.com/date-fns/date-fns/compare/v2.5.0...v2.6.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 68d502d4e..ba9281b24 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -65,7 +65,7 @@ "cookie-universal-nuxt": "~2.0.18", "cropperjs": "^1.5.5", "cross-env": "~6.0.3", - "date-fns": "2.5.0", + "date-fns": "2.6.0", "express": "~4.17.1", "graphql": "~14.5.8", "isemail": "^3.2.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index de059085b..140a91866 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -6051,10 +6051,10 @@ data-urls@^1.0.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -date-fns@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.5.0.tgz#b939f17c2902ce81cffe449702ba22c0781b38ec" - integrity sha512-I6Tkis01//nRcmvMQw/MRE1HAtcuA5Ie6jGPb8bJZJub7494LGOObqkV3ParnsSVviAjk5C8mNKDqYVBzCopWg== +date-fns@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.6.0.tgz#a5bc82e6a4c3995ae124b0ba1a71aec7b8cbd666" + integrity sha512-F55YxqRdEfP/eYQmQjLN798v0AwLjmZ8nMBjdQvNwEE3N/zWVrlkkqT+9seBlPlsbkybG4JmWg3Ee3dIV9BcGQ== date-fns@^1.27.2: version "1.30.1" From d90e3075ee347f837e84712aad5a47654a83513e Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Tue, 29 Oct 2019 14:10:44 +0300 Subject: [PATCH 25/70] add scss guidelines --- webapp/components.md | 8 +++++- webapp/scss.md | 66 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 webapp/scss.md diff --git a/webapp/components.md b/webapp/components.md index 822ebe142..186206d67 100644 --- a/webapp/components.md +++ b/webapp/components.md @@ -17,8 +17,14 @@ Usually `pages` use `layouts` as templates and will be composed of `features`. ` - The `index` page is responsible for displaying a list of posts. It uses the `default` layout and the `PostList` feature. - The `PostList` feature uses a `List` component to render `PostTeaser` features. -- The `PostTeaser` feature consists of a `Card` wrapped around a `CardImage`, `CardTitle` and `CardContent` component. +- The `PostTeaser` feature consists of a `LayoutCard` wrapped around a `CardImage`, `CardTitle` and `CardContent` component. The `index` page is unique in the app and will never be reused. The `PostList` knows it is handling post data and can therefore not be used for anything else – but it can display posts on the `index` as well as the `user` page. The `Card` on the other hand does not care about the type of data it needs to handle. It just takes whatever it receives and renders it in a certain way, so it can be reused throughout the app for many different features. + +## We use two-word names + +We follow the W3C rules for naming custom elements as suggested in the [Vue.js docs](https://vuejs.org/v2/guide/components-registration.html#Component-Names) to differentiate our own components from regular HTML elements in our templates. + +Names should also be meaningful and unique to avoid confusion and code duplication, and also not too long to make them readable. Therefore: aim for two-word names, such as `layout-card`, `post-list` or `post-teaser`. diff --git a/webapp/scss.md b/webapp/scss.md new file mode 100644 index 000000000..d9a9dc1ea --- /dev/null +++ b/webapp/scss.md @@ -0,0 +1,66 @@ +# SCSS - Code Guidelines + +## We use classes over tags and ids + +Never apply styles to `tags` or `ids` – use `classes` instead! + +Why? +- HTML tags are responsible for the document _structure_, not the looks +- targeting HTML tags comes with performance issues +- ids are responsible for identifying a unique element, not for styling it +- ids have higher specificity than classes and therefore don't play well together +- classes can be combined and reused while ids are unique + +For more background see the following articles on [why not to style tags](https://frontstuff.io/you-need-to-stop-targeting-tags-in-css) and [why not to style ids](https://dev.to/clairecodes/reasons-not-to-use-ids-in-css-4ni4). + +## We use design tokens instead of magic numbers + +In order to achieve a consistent look and feel we use a set of pre-defined `design tokens` to style our components, for example `colors`, `sizes` and `box-shadows`. These tokens are stored as `SCSS variables` and reused throughout the app. + +So, instead of typing _pixel values_ or _hex codes_ make sure you use design tokens such as `height-header` or `color-input-border`. + +## We name our classes after components + +Our SCSS styles live within the corresponding component (see the [Vue.js docs for single-file components](https://vuejs.org/v2/guide/single-file-components.html) for reference) and should therefore carry the same _unique_ name. + +Why? +- it clearly ties the styles to the one component +- having unique class names means styles will not be accidentally overwritten in other files +- we can avoid using `scoped CSS` which [comes with performance caveats](https://vue-loader.vuejs.org/guide/scoped-css.html#also-keep-in-mind) + +## We use variants instead of overriding styles + +Components will sometimes need to look different depending on the context in which they are used – a button might for example be `green` when it represents a call to action and `red` when it triggers a destructive action. Rather than making the `rounded-button` component `green` by default and then overriding the `color` for, say, the `delete-account` action – use variants! Pass the `rounded-button` a prop, such as `color: danger`, and then apply the respective `variant class`. + +Name variant classes with a dash prefix, such as `-danger`, then target them like this: + +```scss +.rounded-button { + /* other css styles */ + + &.-danger { + color: $color-danger; + } +} +``` + +## We _style_ within the component, we _position_ when we use it + +In order to make components truly reusable it is important to limit their styles to, well, their actual _styling_. What color are they, how big is the text, what happens on `hover`, do they have a rounded border – all that is part of it. + +Margins, alignment and positioning on the other hand need to be defined in the _parent_ because the same component might sometimes be aligned to the left, sometimes to the right and sometimes float above other content. For more details see the [rscss guidelines](https://rscss.io/layouts.html). + +To do that, use the `child selector`, like this: + +```scss +.login-form { + /* other css styles */ + + > .rounded-button { + margin: $margin-small; + justify-self: flex-end; + } +} +``` + +A special case are dimensions like `width` and `height`. If it is important that a component always has the same dimensions (the height of a button should be consistent, for example) define it _within the component_ itself, if a component should have flexible dimensions (a card, for example, could stretch over the whole screen in one place and be limited to a certain width in another) define the dimensions _in the parent_. From d6aa26f8ff8f090d690755ed8ee513f907aa8507 Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Tue, 29 Oct 2019 15:41:28 +0300 Subject: [PATCH 26/70] add vue guidelines --- SUMMARY.md | 13 ++++------- webapp/components.md | 8 +++++++ webapp/scss.md | 7 ++++++ webapp/vue.md | 53 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 9 deletions(-) create mode 100644 webapp/vue.md diff --git a/SUMMARY.md b/SUMMARY.md index 8d8d81534..11c4b0293 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -7,15 +7,10 @@ * [Backend](backend/README.md) * [GraphQL](backend/graphql.md) * [Webapp](webapp/README.md) - * [COMPONENTS](webapp/components.md) - * [PLUGINS](webapp/plugins.md) - * [STORE](webapp/store.md) - * [PAGES](webapp/pages.md) - * [ASSETS](webapp/assets.md) - * [LAYOUTS](webapp/layouts.md) - * [Styleguide](webapp/styleguide.md) - * [STATIC](webapp/static.md) - * [MIDDLEWARE](webapp/middleware.md) + * [Components](webapp/components.md) + * [HTML](webapp/html.md) + * [SCSS](webapp/scss.md) + * [Vue](webapp/vue.md) * [Testing Guide](testing.md) * [End-to-end tests](cypress/README.md) * [Frontend tests](webapp/testing.md) diff --git a/webapp/components.md b/webapp/components.md index 186206d67..ea99214ec 100644 --- a/webapp/components.md +++ b/webapp/components.md @@ -28,3 +28,11 @@ The `Card` on the other hand does not care about the type of data it needs to ha We follow the W3C rules for naming custom elements as suggested in the [Vue.js docs](https://vuejs.org/v2/guide/components-registration.html#Component-Names) to differentiate our own components from regular HTML elements in our templates. Names should also be meaningful and unique to avoid confusion and code duplication, and also not too long to make them readable. Therefore: aim for two-word names, such as `layout-card`, `post-list` or `post-teaser`. + +## Recommended reads + +For a deeper dive into the WHY and HOW have a look at the following resources which the above guidelines are based on: + +- [Atomic design](https://bradfrost.com/blog/post/atomic-web-design/) +- [CDD – component based design](https://medium.com/@wereheavyweight/how-were-using-component-based-design-5f9e3176babb) +- [Vue.js component styleguide](https://pablohpsilva.github.io/vuejs-component-style-guide/#/) diff --git a/webapp/scss.md b/webapp/scss.md index d9a9dc1ea..e8a48792f 100644 --- a/webapp/scss.md +++ b/webapp/scss.md @@ -64,3 +64,10 @@ To do that, use the `child selector`, like this: ``` A special case are dimensions like `width` and `height`. If it is important that a component always has the same dimensions (the height of a button should be consistent, for example) define it _within the component_ itself, if a component should have flexible dimensions (a card, for example, could stretch over the whole screen in one place and be limited to a certain width in another) define the dimensions _in the parent_. + +## Recommended reads + +For a deeper dive into the WHY and HOW have a look at the following resources which the above guidelines are based on: + +- [rscss – reasonable system for css stylesheet structure](https://rscss.io/index.html) +- [itcss – inverted triangle architecture for css](https://csswizardry.net/talks/2014/11/itcss-dafed.pdf) diff --git a/webapp/vue.md b/webapp/vue.md new file mode 100644 index 000000000..47d0620f0 --- /dev/null +++ b/webapp/vue.md @@ -0,0 +1,53 @@ +# Vue – Code Guidelines + +## We use single-file components + +Each component lives in a single file, containing: +- its `template` (the DOM structure) +- its `script` (including `props`, `data` and `methods` among other things) +- its `style` (defining the look of the component) + +See the [Vue.js docs](https://vuejs.org/v2/guide/single-file-components.html) for more details. + +Placed in the same folder are also: +- the test file (e.g. `MyComponent.spec.js`) +- the storybook file (e.g. `MyComponent.story.js`) + +## We use typed props + +Vue.js allows us to define component props either as strings or as objects with `type`, `default` and `required` values. Always go for the second option! + +Also: define defaults _only and always_ for non-required props. + +Why? +- it makes our code more robust – a warning will be shown when passing a wrong prop type +- it clearly defines the component API and tells other developers how to use it + +It is as easy as writing: + +``` +props: { + title: { + type: String, + required: true, + }, + image: { + type: String, + default: 'human-connection-logo.png', + }, +} +``` + +For more complex use cases see the [official Vue.js documentation](https://vuejs.org/v2/guide/components-props.html#Prop-Validation). + +## We use shorthands + +For better readability we prefer +- `:something` over `v-bind:something` +- `@click` over `v-on:click` + +Read more in the [official Vue.js docs](https://vuejs.org/v2/guide/syntax.html#Shorthands) + +## Recommended reads + +The [Vue.js component style guide](https://pablohpsilva.github.io/vuejs-component-style-guide/#/?id=harness-your-component-props) offers a whole list of best-practices for writing Vue components. From a3616b18596f2afe791c55642328dc7d8148f34b Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Tue, 29 Oct 2019 16:34:08 +0300 Subject: [PATCH 27/70] add testing guidelines --- webapp/README.md | 2 +- webapp/html.md | 7 +++++++ webapp/storybook.md | 33 --------------------------------- webapp/testing.md | 29 ++++++++++++++++++++++++++--- 4 files changed, 34 insertions(+), 37 deletions(-) delete mode 100644 webapp/storybook.md diff --git a/webapp/README.md b/webapp/README.md index b47f89c8d..9f44267c2 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -38,7 +38,7 @@ $ yarn start We ensure the quality of our frontend code by using - [ESLint](https://eslint.org/) for checking our JavaScript code - [Jest](https://jestjs.io/) and [Vue Test Utils](https://vue-test-utils.vuejs.org/) to unit test our components -- [Storybook](https://storybook.js.org/) to manually test our components in an isolated playground +- [Storybook](https://storybook.js.org/) to document and manually test our components in an isolated playground For more information see our [frontend testing guide](testing.md). Use these commands to run the tests: diff --git a/webapp/html.md b/webapp/html.md index e2779c424..50a6ab967 100644 --- a/webapp/html.md +++ b/webapp/html.md @@ -20,3 +20,10 @@ HTML is used to _structure content on the page_ and should therefore reflect its Why? - deep nesting makes it hard to understand, style and maintain components - it can lead to performance issues + +## Recommended reads + +For a deeper dive into the WHY and HOW have a look at the following resources: + +- [HTML: a good basis for accessibility](https://developer.mozilla.org/en-US/docs/Learn/Accessibility/HTML) +- [Why, how, and when to use semantic HTML and ARIA](https://css-tricks.com/why-how-and-when-to-use-semantic-html-and-aria/) diff --git a/webapp/storybook.md b/webapp/storybook.md deleted file mode 100644 index b987f2064..000000000 --- a/webapp/storybook.md +++ /dev/null @@ -1,33 +0,0 @@ -### Storybook - -We encourage contributors to use Storybook to test out new components in an isolated way, and benefit from its many features. -See the docs for live examples and answers to FAQ, among other helpful information. ![Storybook docs](https://storybook.js.org/docs/basics/introduction/) - -{% tabs %} -{% tab title="Docker" %} - -After you have started the application following the instructions above, in another terminal run: - -```bash -$ docker-compose exec webapp yarn storybook -``` -The output should look similar to this: - -![Storybook output](../.gitbook/assets/storybook-output.png) - -Click on the link http://localhost:3002/ to open the browser to your interactive storybook. - -{% endtab %} - -{% tab title="Without Docker" %} -Run the following command: - -```bash -# in webapp/ -yarn storybook -``` - -Open http://localhost:3002/ in your browser - -{% endtab %} -{% endtabs %} diff --git a/webapp/testing.md b/webapp/testing.md index 8da854316..f8db21e9b 100644 --- a/webapp/testing.md +++ b/webapp/testing.md @@ -1,8 +1,31 @@ # Component Testing -We are using `Jest` as our test runner, along with `vue-test-utils`. +## Linting -Head over and check out the documentation on [Jest](https://jestjs.io/docs/en/getting-started.html) +We use [ESLint](https://eslint.org/) to make sure all developers follow certain code guidelines when writing JavaScript. -Also, check out [vue-test-utils](https://vue-test-utils.vuejs.org/) +Most code editors offer an ESLint plugin which helps detect mistakes already while you are writing code. To run the linter manually before pushing up new code type `yarn lint` into your terminal. Most minor issues can be fixed automatically with the command `yarn lint --fix`. +## Unit tests + +We write unit tests with the help of [Jest](https://jestjs.io/) and [Vue Test Utils](https://vue-test-utils.vuejs.org/) to make sure our components work in the way they should. In these tests we usually check that a certain input leads to the expected output. They are used to test _functionality_. + +To run all tests use the command `yarn test` in the `/webapp` directory. Other useful commands are: +- `yarn test -t test-name` to run tests including `test-name` in their file or test names +- `yarn test -o` to run tests related to files that have been changed since the latest commit + +## Documentation and manual testing + +[Storybook](https://vue-test-utils.vuejs.org/) is a great tool that performs two important functions in our project: + +### Component documentation + +With Storybook our components can be documented in detail and offer a visual reference to other developers. When all components are properly documented Storybook can be used as a big component library – where developers can browse through design tokens and components and immediately verify that the component offers the desired functionality. + +### Manual testing in an isolated environment + +When adding new components or changing existing ones Storybook can be helpful not only to document the feature for future use but also to test different use cases (e.g. by passing different types of `props`) in an isolated playground. + +With the right addons Storybook also gives immediate feedback on how well the component complies with accessibility guidelines. + +To run Storybook first start the app, then enter the following command in a new terminal window: `yarn storybook`. The Human Connection Storybook will then be available on `http://localhost:3002`. From 0d47f6b1d4fef2f3e8b51a2092c969c1799152c0 Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Tue, 29 Oct 2019 16:38:51 +0300 Subject: [PATCH 28/70] add storybook screenshot --- webapp/testing.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webapp/testing.md b/webapp/testing.md index f8db21e9b..9e530c4bf 100644 --- a/webapp/testing.md +++ b/webapp/testing.md @@ -28,4 +28,10 @@ When adding new components or changing existing ones Storybook can be helpful no With the right addons Storybook also gives immediate feedback on how well the component complies with accessibility guidelines. -To run Storybook first start the app, then enter the following command in a new terminal window: `yarn storybook`. The Human Connection Storybook will then be available on `http://localhost:3002`. +------ + +To run Storybook first start the app, then enter the following command in a new terminal window: `yarn storybook`. The output should look similar to this: + +![Storybook output](../.gitbook/assets/storybook-output.png) + +The Human Connection Storybook will then be available on `http://localhost:3002`. From 1dbd36c1e1b9ebe0b19cfd526a2e768dc002fe92 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 29 Oct 2019 17:20:33 +0100 Subject: [PATCH 29/70] Tests Added For Language Filter Of Posts --- .../FilterPosts/FilterPosts.spec.js | 28 +++++++++++++++++++ .../FilterPosts/LanguageFilterMenuItems.vue | 1 + webapp/locales/de.json | 8 +++--- webapp/locales/en.json | 8 +++--- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/webapp/components/FilterPosts/FilterPosts.spec.js b/webapp/components/FilterPosts/FilterPosts.spec.js index 1f0ee920d..14ebed3c5 100644 --- a/webapp/components/FilterPosts/FilterPosts.spec.js +++ b/webapp/components/FilterPosts/FilterPosts.spec.js @@ -3,6 +3,9 @@ import VTooltip from 'v-tooltip' import Styleguide from '@human-connection/styleguide' import Vuex from 'vuex' import FilterPosts from './FilterPosts.vue' +import locales from '~/locales' +import orderBy from 'lodash/orderBy' + const localVue = createLocalVue() localVue.use(Styleguide) @@ -12,6 +15,8 @@ localVue.use(Vuex) let mutations let getters +const languages = orderBy(locales, 'name') + describe('FilterPosts.vue', () => { let mocks let propsData @@ -20,6 +25,8 @@ describe('FilterPosts.vue', () => { let environmentAndNatureButton let democracyAndPoliticsButton let happyEmotionButton + let englishButton + let spanishButton beforeEach(() => { mocks = { @@ -54,6 +61,8 @@ describe('FilterPosts.vue', () => { 'posts/RESET_CATEGORIES': jest.fn(), 'posts/TOGGLE_CATEGORY': jest.fn(), 'posts/TOGGLE_EMOTION': jest.fn(), + 'posts/TOGGLE_LANGUAGE': jest.fn(), + 'posts/RESET_LANGUAGES': jest.fn(), } getters = { 'posts/isActive': () => false, @@ -64,6 +73,7 @@ describe('FilterPosts.vue', () => { 'posts/filteredCategoryIds': jest.fn(() => []), 'posts/filteredByUsersFollowed': jest.fn(), 'posts/filteredByEmotions': jest.fn(() => []), + 'posts/filteredLanguagesCodes': jest.fn(() => []), } const openFilterPosts = () => { const store = new Vuex.Store({ mutations, getters }) @@ -97,6 +107,15 @@ describe('FilterPosts.vue', () => { expect(mutations['posts/TOGGLE_CATEGORY']).toHaveBeenCalledWith({}, 'cat4') }) + it('calls TOGGLE_LANGUAGE when clicked', () => { + const wrapper = openFilterPosts() + englishButton = wrapper + .findAll('button.language-buttons') + .at(languages.findIndex(l => l.code === 'en')) + englishButton.trigger('click') + expect(mutations['posts/TOGGLE_LANGUAGE']).toHaveBeenCalledWith({}, 'en') + }) + it('sets category button attribute `primary` when corresponding category is filtered', () => { getters['posts/filteredCategoryIds'] = jest.fn(() => ['cat9']) const wrapper = openFilterPosts() @@ -104,6 +123,15 @@ describe('FilterPosts.vue', () => { expect(democracyAndPoliticsButton.attributes().class).toContain('ds-button-primary') }) + it('sets language button attribute `primary` when corresponding language is filtered', () => { + getters['posts/filteredLanguagesCodes'] = jest.fn(() => ['es']) + const wrapper = openFilterPosts() + spanishButton = wrapper + .findAll('button.language-buttons') + .at(languages.findIndex(l => l.code === 'es')) + expect(spanishButton.attributes().class).toContain('ds-button-primary') + }) + it('sets "filter-by-followed-authors-only" button attribute `primary`', () => { getters['posts/filteredByUsersFollowed'] = jest.fn(() => true) const wrapper = openFilterPosts() diff --git a/webapp/components/FilterPosts/LanguageFilterMenuItems.vue b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue index 5bfb931cb..e6af51a82 100644 --- a/webapp/components/FilterPosts/LanguageFilterMenuItems.vue +++ b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue @@ -33,6 +33,7 @@ Date: Tue, 29 Oct 2019 14:20:51 -0400 Subject: [PATCH 30/70] fixed removing original post's user --- .../notifications/notificationsMiddleware.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js index ff1f50c59..2b3f1c2dd 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.js @@ -106,15 +106,13 @@ const handleContentDataOfComment = async (resolve, root, args, context, resolveI const [postAuthor] = await result.records.map(record => { return record.get('user') }) - const idsOfUsersExcludingPostAuthor = idsOfUsers.filter(res => !res.equals([postAuthor])) - cosole.log('idsOfUsers1') - await notifyUsers( - 'Comment', - comment.id, - idsOfUsersExcludingPostAuthor, - 'mentioned_in_comment', - context, - ) + var index = idsOfUsers.indexOf(postAuthor.id) + + if (index > -1) { + idsOfUsers.splice(index) + } + + await notifyUsers('Comment', comment.id, idsOfUsers, 'mentioned_in_comment', context) } return comment From 9b67036b430f1c5c46635b596e909b33b09a1fe4 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Tue, 29 Oct 2019 22:03:44 +0100 Subject: [PATCH 31/70] Add random languages to seeds --- backend/src/seed/seed-db.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js index 76fbb4875..40becda2a 100644 --- a/backend/src/seed/seed-db.js +++ b/backend/src/seed/seed-db.js @@ -1,10 +1,13 @@ import faker from 'faker' +import sample from 'lodash/sample' import { createTestClient } from 'apollo-server-testing' import createServer from '../server' import Factory from './factories' import { neode as getNeode, getDriver } from '../bootstrap/neo4j' import { gql } from '../jest/helpers' +const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] + /* eslint-disable no-multi-spaces */ ;(async function() { let authenticatedUser = null @@ -341,39 +344,46 @@ import { gql } from '../jest/helpers' factory.create('Post', { author: peterLustig, id: 'p0', + language: sample(languages), image: faker.image.unsplash.food(), categoryIds: ['cat16'], }), factory.create('Post', { author: bobDerBaumeister, id: 'p1', + language: sample(languages), image: faker.image.unsplash.technology(), categoryIds: ['cat1'], }), factory.create('Post', { author: huey, id: 'p3', + language: sample(languages), categoryIds: ['cat3'], }), factory.create('Post', { author: dewey, id: 'p4', + language: sample(languages), categoryIds: ['cat4'], }), factory.create('Post', { author: louie, id: 'p5', + language: sample(languages), categoryIds: ['cat5'], }), factory.create('Post', { authorId: 'u1', id: 'p6', + language: sample(languages), image: faker.image.unsplash.buildings(), categoryIds: ['cat6'], }), factory.create('Post', { author: huey, id: 'p9', + language: sample(languages), categoryIds: ['cat9'], }), factory.create('Post', { @@ -384,23 +394,27 @@ import { gql } from '../jest/helpers' factory.create('Post', { author: louie, id: 'p11', + language: sample(languages), image: faker.image.unsplash.people(), categoryIds: ['cat11'], }), factory.create('Post', { author: bobDerBaumeister, id: 'p13', + language: sample(languages), categoryIds: ['cat13'], }), factory.create('Post', { author: jennyRostock, id: 'p14', + language: sample(languages), image: faker.image.unsplash.objects(), categoryIds: ['cat14'], }), factory.create('Post', { author: huey, id: 'p15', + language: sample(languages), categoryIds: ['cat15'], }), ]) From 82002a5a2846ff60e4c92b67ac48f32db782fbf1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 11:37:12 +0000 Subject: [PATCH 32/70] build(deps): bump metascraper-author from 5.7.14 to 5.7.17 in /backend Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 479ff32e8..ea28de2de 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8475,18 +8475,18 @@ } }, "metascraper-author": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-author/-/metascraper-author-5.7.14.tgz", - "integrity": "sha512-P8xpHHoCzlbt1lb8qKbkz9XQ4MWC0c9ElKFORQ1GPmSVh0n+aTO1APKofFYcnl9rq6QIyYU4PLTqQZ54KXMqtA==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-author/-/metascraper-author-5.7.17.tgz", + "integrity": "sha512-vaMAn6glCr9f2PGvNObqMI7ECtQ7+CMkXSxKyn3fyxRVKnV95fBR+xi4+UJ2DWqTvVQ6t7gZwlzFWA4CwxfniQ==", "requires": { - "@metascraper/helpers": "^5.7.14", + "@metascraper/helpers": "^5.7.17", "lodash": "~4.17.15" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index 2631ea1ed..b4dbd6e26 100644 --- a/backend/package.json +++ b/backend/package.json @@ -73,7 +73,7 @@ "merge-graphql-schemas": "^1.7.0", "metascraper": "^4.10.3", "metascraper-audio": "^5.7.14", - "metascraper-author": "^5.7.14", + "metascraper-author": "^5.7.17", "metascraper-clearbit-logo": "^5.3.0", "metascraper-date": "^5.7.14", "metascraper-description": "^5.7.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index ea7e8a6fd..adec6bf37 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -963,10 +963,10 @@ url-regex "~4.1.1" video-extensions "~1.1.0" -"@metascraper/helpers@^5.7.14", "@metascraper/helpers@^5.7.6": - version "5.7.14" - resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.14.tgz#676b11bdc82b1fbe4e6cc1fe0c4be2dddf7d5ba1" - integrity sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag== +"@metascraper/helpers@^5.7.14", "@metascraper/helpers@^5.7.17", "@metascraper/helpers@^5.7.6": + version "5.7.17" + resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.17.tgz#401897c7239090ca7149b83e581712845bbb3709" + integrity sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw== dependencies: audio-extensions "0.0.0" chrono-node "~1.3.11" @@ -5728,12 +5728,12 @@ metascraper-audio@^5.7.14: dependencies: "@metascraper/helpers" "^5.7.14" -metascraper-author@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.7.14.tgz#5504c413eece572c66e72825bb1cff757974a4b8" - integrity sha512-P8xpHHoCzlbt1lb8qKbkz9XQ4MWC0c9ElKFORQ1GPmSVh0n+aTO1APKofFYcnl9rq6QIyYU4PLTqQZ54KXMqtA== +metascraper-author@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.7.17.tgz#0403eaa4d1992152246f01616fac1d52b0583c8a" + integrity sha512-vaMAn6glCr9f2PGvNObqMI7ECtQ7+CMkXSxKyn3fyxRVKnV95fBR+xi4+UJ2DWqTvVQ6t7gZwlzFWA4CwxfniQ== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" lodash "~4.17.15" metascraper-clearbit-logo@^5.3.0: From 5e7643f282fc6fd9b97426ad6b54fc52053cf00d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 11:37:29 +0000 Subject: [PATCH 33/70] build(deps): bump metascraper-youtube from 5.7.14 to 5.7.17 in /backend Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases) - [Commits](https://github.com/microlinkhq/metascraper-youtube/commits) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 479ff32e8..0a208b34f 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9477,11 +9477,11 @@ } }, "metascraper-youtube": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-youtube/-/metascraper-youtube-5.7.14.tgz", - "integrity": "sha512-ZDTc/8bN+XJSLmQmSh4bMFzniywhBr/W7UtloHWr9H86zTq+GEFgJTzu7RniuuU/vDUWFd1bswYb3D8KEjRwjg==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-youtube/-/metascraper-youtube-5.7.17.tgz", + "integrity": "sha512-CZX03wX8ui8fjx+iBZCiAGdSKy4dMFiDrVSPmTMK2W8sn2guYv2QQ41g8gruFJgrF+m+mCOUG6KYgy3B/v5LdQ==", "requires": { - "@metascraper/helpers": "^5.7.14", + "@metascraper/helpers": "^5.7.17", "get-video-id": "~3.1.4", "is-reachable": "~4.0.0", "memoize-one": "~5.1.1", @@ -9489,9 +9489,9 @@ }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index 2631ea1ed..ecf07339f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -86,7 +86,7 @@ "metascraper-title": "^5.7.14", "metascraper-url": "^5.7.14", "metascraper-video": "^5.7.14", - "metascraper-youtube": "^5.7.14", + "metascraper-youtube": "^5.7.17", "minimatch": "^3.0.4", "mustache": "^3.1.0", "neo4j-driver": "~1.7.6", diff --git a/backend/yarn.lock b/backend/yarn.lock index ea7e8a6fd..5d3d13007 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -963,10 +963,10 @@ url-regex "~4.1.1" video-extensions "~1.1.0" -"@metascraper/helpers@^5.7.14", "@metascraper/helpers@^5.7.6": - version "5.7.14" - resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.14.tgz#676b11bdc82b1fbe4e6cc1fe0c4be2dddf7d5ba1" - integrity sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag== +"@metascraper/helpers@^5.7.14", "@metascraper/helpers@^5.7.17", "@metascraper/helpers@^5.7.6": + version "5.7.17" + resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.17.tgz#401897c7239090ca7149b83e581712845bbb3709" + integrity sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw== dependencies: audio-extensions "0.0.0" chrono-node "~1.3.11" @@ -5826,12 +5826,12 @@ metascraper-video@^5.7.14: "@metascraper/helpers" "^5.7.14" lodash "~4.17.15" -metascraper-youtube@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-youtube/-/metascraper-youtube-5.7.14.tgz#8745762dcd1c3721b342351632b21f046b85f2e3" - integrity sha512-ZDTc/8bN+XJSLmQmSh4bMFzniywhBr/W7UtloHWr9H86zTq+GEFgJTzu7RniuuU/vDUWFd1bswYb3D8KEjRwjg== +metascraper-youtube@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-youtube/-/metascraper-youtube-5.7.17.tgz#a3bdf06bbc9aa3766f08a779fa880d8a3fda9f8c" + integrity sha512-CZX03wX8ui8fjx+iBZCiAGdSKy4dMFiDrVSPmTMK2W8sn2guYv2QQ41g8gruFJgrF+m+mCOUG6KYgy3B/v5LdQ== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" get-video-id "~3.1.4" is-reachable "~4.0.0" memoize-one "~5.1.1" From 5ba9f4e01fd869d2bc30a4bbfd8d87b2bef219ac Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 11:37:46 +0000 Subject: [PATCH 34/70] build(deps): bump metascraper-logo from 5.7.14 to 5.7.17 in /backend Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 479ff32e8..24152eb9d 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8939,17 +8939,17 @@ } }, "metascraper-logo": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.7.14.tgz", - "integrity": "sha512-5kgH+2+chlJ4mUajHItg1lsXhkcWQbnkLcGrE+7YMIIf/7uHFGehg+dqVNw1CRBPNpwJKibrZSb9aHMlWJPwlg==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.7.17.tgz", + "integrity": "sha512-S4aqxN4Qi3UXDLN4HhinEuQHUopYXbFw0Y5Cwj9TbGKfESeQ1n6Jm4eOgGifEYyyZMSeRR9li189EK3YPnYcFg==", "requires": { - "@metascraper/helpers": "^5.7.14" + "@metascraper/helpers": "^5.7.17" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index 2631ea1ed..1360a707d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -80,7 +80,7 @@ "metascraper-image": "^5.7.6", "metascraper-lang": "^5.7.14", "metascraper-lang-detector": "^4.8.5", - "metascraper-logo": "^5.7.14", + "metascraper-logo": "^5.7.17", "metascraper-publisher": "^5.7.14", "metascraper-soundcloud": "^5.7.14", "metascraper-title": "^5.7.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index ea7e8a6fd..67e6b32a7 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -963,10 +963,10 @@ url-regex "~4.1.1" video-extensions "~1.1.0" -"@metascraper/helpers@^5.7.14", "@metascraper/helpers@^5.7.6": - version "5.7.14" - resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.14.tgz#676b11bdc82b1fbe4e6cc1fe0c4be2dddf7d5ba1" - integrity sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag== +"@metascraper/helpers@^5.7.14", "@metascraper/helpers@^5.7.17", "@metascraper/helpers@^5.7.6": + version "5.7.17" + resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.17.tgz#401897c7239090ca7149b83e581712845bbb3709" + integrity sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw== dependencies: audio-extensions "0.0.0" chrono-node "~1.3.11" @@ -5780,12 +5780,12 @@ metascraper-lang@^5.7.14: dependencies: "@metascraper/helpers" "^5.7.14" -metascraper-logo@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.7.14.tgz#c5e7f4d4191672e48130e10f21f4a31a9faf539d" - integrity sha512-5kgH+2+chlJ4mUajHItg1lsXhkcWQbnkLcGrE+7YMIIf/7uHFGehg+dqVNw1CRBPNpwJKibrZSb9aHMlWJPwlg== +metascraper-logo@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.7.17.tgz#b26e2fb38e94cfe9ec9dfc7e28d8da26a0a0689d" + integrity sha512-S4aqxN4Qi3UXDLN4HhinEuQHUopYXbFw0Y5Cwj9TbGKfESeQ1n6Jm4eOgGifEYyyZMSeRR9li189EK3YPnYcFg== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" metascraper-publisher@^5.7.14: version "5.7.14" From 922e9ae64d42efbedc143cf56134b435a7706fdb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 11:37:56 +0000 Subject: [PATCH 35/70] build(deps-dev): bump auto-changelog from 1.16.1 to 1.16.2 Bumps [auto-changelog](https://github.com/CookPete/auto-changelog) from 1.16.1 to 1.16.2. - [Release notes](https://github.com/CookPete/auto-changelog/releases) - [Changelog](https://github.com/CookPete/auto-changelog/blob/master/CHANGELOG.md) - [Commits](https://github.com/CookPete/auto-changelog/compare/v1.16.1...v1.16.2) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 42 +++++++++++------------------------------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 420b4d35e..980391d97 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "version": "auto-changelog -p" }, "devDependencies": { - "auto-changelog": "^1.16.1", + "auto-changelog": "^1.16.2", "bcryptjs": "^2.4.3", "codecov": "^3.6.1", "cross-env": "^6.0.3", diff --git a/yarn.lock b/yarn.lock index 4e97326b8..ab8dffd89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1125,10 +1125,10 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -auto-changelog@^1.16.1: - version "1.16.1" - resolved "https://registry.yarnpkg.com/auto-changelog/-/auto-changelog-1.16.1.tgz#8d62a1d3afd72ba848452f9ec9adbb6cb0fd2808" - integrity sha512-1OMUN5UWWhKtlEMpGUfbLFcZHDf4IXMNU4SsGs44xTlSBhjgTOx9ukbahoC7hTqIm6+sRAnlAbLY4UjbDZY18A== +auto-changelog@^1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/auto-changelog/-/auto-changelog-1.16.2.tgz#4b08b7cbd07fdbd9139c6e06ea0b704db3f5485c" + integrity sha512-QL7zKH5FBBHz6tECO8CjZ8LpdevVSJoDskDzzPeoB9Bfe6LyXmRzXUoTIFKJXXdVaX8ydMpDO9Oa8ihZ4Au+CA== dependencies: commander "^3.0.1" core-js "^3.2.1" @@ -1668,21 +1668,16 @@ commander@2.15.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== -commander@^2.9.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" - integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== +commander@^2.9.0, commander@~2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== commander@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@~2.20.3: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - common-tags@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937" @@ -3585,12 +3580,7 @@ node-fetch@2.1.2: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5" integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U= -node-fetch@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5" - integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA== - -node-fetch@^2.6.0: +node-fetch@^2.2.0, node-fetch@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== @@ -4120,12 +4110,7 @@ regenerator-runtime@^0.12.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de" integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== -regenerator-runtime@^0.13.2: - version "0.13.2" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447" - integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA== - -regenerator-runtime@^0.13.3: +regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3: version "0.13.3" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== @@ -4313,16 +4298,11 @@ seed-random@~2.2.0: resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54" integrity sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ= -"semver@2 || 3 || 4 || 5": +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1: version "5.7.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== -semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1: - version "5.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" - integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== - semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" From 5f91cf80570b28b9171a299d11de35323997623b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 11:38:10 +0000 Subject: [PATCH 36/70] build(deps): bump @nuxtjs/apollo in /webapp Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc16 to 4.0.0-rc17. - [Release notes](https://github.com/nuxt-community/apollo-module/releases) - [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.16...v4.0.0-rc.17) 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 ba9281b24..d6cad2c99 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -53,7 +53,7 @@ }, "dependencies": { "@human-connection/styleguide": "0.5.21", - "@nuxtjs/apollo": "^4.0.0-rc16", + "@nuxtjs/apollo": "^4.0.0-rc17", "@nuxtjs/axios": "~5.8.0", "@nuxtjs/dotenv": "~1.4.1", "@nuxtjs/pwa": "^3.0.0-beta.19", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 140a91866..9b548c519 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1386,10 +1386,10 @@ webpack-node-externals "^1.7.2" webpackbar "^4.0.0" -"@nuxtjs/apollo@^4.0.0-rc16": - version "4.0.0-rc16" - resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc16.tgz#b816cbb9eada9dc6a0ef10ad7358dc4b2f290336" - integrity sha512-iMuw6QtZupLF/xbAmUqrS00Fg/bPPbMxwHrFoERtx53PlwMQKaFarmJ63Wp0a0n4eyCTYtJHeFDuoMtvxAGAdA== +"@nuxtjs/apollo@^4.0.0-rc17": + version "4.0.0-rc17" + resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc17.tgz#089ae5bdd70021d2a05076d1a5dfebdc5700cbe2" + integrity sha512-HCtbfvfO2H1HQEKNmPczZfroKPt4SYPyuY6XEMbYW6S16SGr95644Ne7/wo7BW4OSXybpr/HYXKYceEGga9Z2g== dependencies: cross-fetch "^3.0.4" universal-cookie "^4.0.2" From 42479c0ced8bd48a8d4a92b8985c537e821058a1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 14:44:40 +0000 Subject: [PATCH 37/70] build(deps): bump metascraper-video from 5.7.14 to 5.7.17 in /backend Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 1ff8ce844..4142cb1a1 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9387,18 +9387,18 @@ } }, "metascraper-video": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-video/-/metascraper-video-5.7.14.tgz", - "integrity": "sha512-nmXrxaf83f/nRbSYegAtpPzsoNafiJOT9zaAQFawRCQnxCBlMQoPALEzGGx1b/R5YuyWsqJzjjVTigBgQhcrGg==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-video/-/metascraper-video-5.7.17.tgz", + "integrity": "sha512-lftJGynCVNfC15eyMW7tN3QWJl9T2sVNCgP0dZsW8OC1hWQM7WY3PW8yYd2PP6nUuwOTjNLL1F4oWNhldWrE8A==", "requires": { - "@metascraper/helpers": "^5.7.14", + "@metascraper/helpers": "^5.7.17", "lodash": "~4.17.15" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index bd2efa6e4..8fad1f071 100644 --- a/backend/package.json +++ b/backend/package.json @@ -85,7 +85,7 @@ "metascraper-soundcloud": "^5.7.14", "metascraper-title": "^5.7.14", "metascraper-url": "^5.7.14", - "metascraper-video": "^5.7.14", + "metascraper-video": "^5.7.17", "metascraper-youtube": "^5.7.17", "minimatch": "^3.0.4", "mustache": "^3.1.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 8c62d1df2..cf191962c 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5818,12 +5818,12 @@ metascraper-url@^5.7.14: dependencies: "@metascraper/helpers" "^5.7.14" -metascraper-video@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.7.14.tgz#3deb86e8c63b7bca0222c3b22f9dc27f0c77050e" - integrity sha512-nmXrxaf83f/nRbSYegAtpPzsoNafiJOT9zaAQFawRCQnxCBlMQoPALEzGGx1b/R5YuyWsqJzjjVTigBgQhcrGg== +metascraper-video@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.7.17.tgz#414d4641fbea667e73c42fe3706d673ee4c4aec5" + integrity sha512-lftJGynCVNfC15eyMW7tN3QWJl9T2sVNCgP0dZsW8OC1hWQM7WY3PW8yYd2PP6nUuwOTjNLL1F4oWNhldWrE8A== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" lodash "~4.17.15" metascraper-youtube@^5.7.17: From 43b2ef3eb36a53f47e7466e23000ad87a0296ff0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 14:44:41 +0000 Subject: [PATCH 38/70] build(deps): bump metascraper-soundcloud in /backend Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases) - [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 1ff8ce844..466669850 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9117,19 +9117,19 @@ } }, "metascraper-soundcloud": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-soundcloud/-/metascraper-soundcloud-5.7.14.tgz", - "integrity": "sha512-Oc/TEXvq+Qw4acZQipwLCDazME9bsCIbkZmrw1603zOmudANE9EPJ6D3ZdcZkwIDjE/GtYtCkJENjuN55mTQ2Q==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-soundcloud/-/metascraper-soundcloud-5.7.17.tgz", + "integrity": "sha512-yllxXR0AHQmJLXCua+CJtjzmNr9I+mU/H23ED+S2t9Yd07xQDmqL8pkkuD8DAAy7aC6oIL0qghQPwk8qdM97Ug==", "requires": { - "@metascraper/helpers": "^5.7.14", + "@metascraper/helpers": "^5.7.17", "memoize-one": "~5.1.1", "tldts": "~5.6.1" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index bd2efa6e4..4aff38c19 100644 --- a/backend/package.json +++ b/backend/package.json @@ -82,7 +82,7 @@ "metascraper-lang-detector": "^4.8.5", "metascraper-logo": "^5.7.17", "metascraper-publisher": "^5.7.14", - "metascraper-soundcloud": "^5.7.14", + "metascraper-soundcloud": "^5.7.17", "metascraper-title": "^5.7.14", "metascraper-url": "^5.7.14", "metascraper-video": "^5.7.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index 8c62d1df2..7c1487ace 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5794,12 +5794,12 @@ metascraper-publisher@^5.7.14: dependencies: "@metascraper/helpers" "^5.7.14" -metascraper-soundcloud@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.7.14.tgz#5f369ffe06cfee9af9f877dc71da46daa1280218" - integrity sha512-Oc/TEXvq+Qw4acZQipwLCDazME9bsCIbkZmrw1603zOmudANE9EPJ6D3ZdcZkwIDjE/GtYtCkJENjuN55mTQ2Q== +metascraper-soundcloud@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.7.17.tgz#925fc91505b69f1e3e7f0c535567c7918f8afbd9" + integrity sha512-yllxXR0AHQmJLXCua+CJtjzmNr9I+mU/H23ED+S2t9Yd07xQDmqL8pkkuD8DAAy7aC6oIL0qghQPwk8qdM97Ug== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" memoize-one "~5.1.1" tldts "~5.6.1" From 10545eb6c738977b96c45a76f047488259d57853 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 14:44:46 +0000 Subject: [PATCH 39/70] build(deps): bump metascraper-lang from 5.7.14 to 5.7.17 in /backend Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 1ff8ce844..57da372d9 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8840,17 +8840,17 @@ } }, "metascraper-lang": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-lang/-/metascraper-lang-5.7.14.tgz", - "integrity": "sha512-FyH3sILuldQBlMbMR5ObpRbxrPJ58sR2+8XJfo4oxnAvsZhBhe2q2uCxOgPhczJRUISzNLUEwMWY1wnYmu8nZg==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-lang/-/metascraper-lang-5.7.17.tgz", + "integrity": "sha512-G/XqySeDpZmoV1rgWeMs/hmX1NFX0IN2w4viNdgdMRXB+lhqeyk5Z20x9ssPAqiJ4Ab6tyR274NkgYa0ZNRMDw==", "requires": { - "@metascraper/helpers": "^5.7.14" + "@metascraper/helpers": "^5.7.17" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index bd2efa6e4..9a9f1d432 100644 --- a/backend/package.json +++ b/backend/package.json @@ -78,7 +78,7 @@ "metascraper-date": "^5.7.14", "metascraper-description": "^5.7.14", "metascraper-image": "^5.7.6", - "metascraper-lang": "^5.7.14", + "metascraper-lang": "^5.7.17", "metascraper-lang-detector": "^4.8.5", "metascraper-logo": "^5.7.17", "metascraper-publisher": "^5.7.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index 8c62d1df2..59347a1f7 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5773,12 +5773,12 @@ metascraper-lang-detector@^4.8.5: franc "~4.0.0" iso-639-3 "~1.1.0" -metascraper-lang@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-5.7.14.tgz#f7d5fa5c72090229c0524105bfe43e27b3bfd0ab" - integrity sha512-FyH3sILuldQBlMbMR5ObpRbxrPJ58sR2+8XJfo4oxnAvsZhBhe2q2uCxOgPhczJRUISzNLUEwMWY1wnYmu8nZg== +metascraper-lang@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-5.7.17.tgz#3952db650bcd909fff0308d1d2254e954a0c0028" + integrity sha512-G/XqySeDpZmoV1rgWeMs/hmX1NFX0IN2w4viNdgdMRXB+lhqeyk5Z20x9ssPAqiJ4Ab6tyR274NkgYa0ZNRMDw== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" metascraper-logo@^5.7.17: version "5.7.17" From bf7e4eb79c5cbab38b54de81d54e16b5e5272f0a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 14:44:47 +0000 Subject: [PATCH 40/70] build(deps): bump metascraper-date from 5.7.14 to 5.7.17 in /backend Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 1ff8ce844..ff9712db5 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8573,17 +8573,17 @@ } }, "metascraper-date": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-date/-/metascraper-date-5.7.14.tgz", - "integrity": "sha512-eJKMtIFeBrnkAavkNlIT/O2bKmF2gKVgMpPbdg/9yJ+OS0pH3QTdk/I/NeU91fS0dAaC2ztwFKUqw2zjC27vew==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-date/-/metascraper-date-5.7.17.tgz", + "integrity": "sha512-OPKXu7S+S6JoZNVV9Dox6OIG2x5hzDx2J3IzMwzQwVdKzulMPSFMLCcJU8zLZ03dajSOszRf8aL1eSBfZscpIw==", "requires": { - "@metascraper/helpers": "^5.7.14" + "@metascraper/helpers": "^5.7.17" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index bd2efa6e4..efc3ce3ac 100644 --- a/backend/package.json +++ b/backend/package.json @@ -75,7 +75,7 @@ "metascraper-audio": "^5.7.14", "metascraper-author": "^5.7.17", "metascraper-clearbit-logo": "^5.3.0", - "metascraper-date": "^5.7.14", + "metascraper-date": "^5.7.17", "metascraper-description": "^5.7.14", "metascraper-image": "^5.7.6", "metascraper-lang": "^5.7.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index 8c62d1df2..d19cc6a43 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5743,12 +5743,12 @@ metascraper-clearbit-logo@^5.3.0: dependencies: got "~9.6.0" -metascraper-date@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-5.7.14.tgz#5cb57c8f60bd15c841268fa983545dd3a0586a3c" - integrity sha512-eJKMtIFeBrnkAavkNlIT/O2bKmF2gKVgMpPbdg/9yJ+OS0pH3QTdk/I/NeU91fS0dAaC2ztwFKUqw2zjC27vew== +metascraper-date@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-5.7.17.tgz#8777bc5deaccce1235ed0b2eb8f0746c981ee245" + integrity sha512-OPKXu7S+S6JoZNVV9Dox6OIG2x5hzDx2J3IzMwzQwVdKzulMPSFMLCcJU8zLZ03dajSOszRf8aL1eSBfZscpIw== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" metascraper-description@^5.7.14: version "5.7.14" From 063ff17d8bc96a41fa38cb6bcc675bc722bdcbf6 Mon Sep 17 00:00:00 2001 From: Kapil Jain Date: Wed, 30 Oct 2019 20:39:50 -0400 Subject: [PATCH 41/70] add software tests for two notifications bug --- .../notificationsMiddleware.spec.js | 59 ++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js index 88f91d688..9d397cbe0 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js @@ -105,6 +105,7 @@ describe('notifications', () => { let title let postContent let postAuthor + const createPostAction = async () => { authenticatedUser = await postAuthor.toJson() await mutate({ @@ -239,6 +240,7 @@ describe('notifications', () => { describe('mentions me in a post', () => { beforeEach(async () => { title = 'Mentioning Al Capone' + postContent = 'Hey @al-capone how do you do?' }) @@ -439,7 +441,15 @@ describe('notifications', () => { }) }) - it('sends a notification', async () => { + it('sends only one notification with reason mentioned_in_comment', async () => { + postAuthor = await instance.create('User', { + id: 'postAuthor', + name: 'Mr Author', + slug: 'mr-author', + email: 'post-author@example.org', + password: '1234', + }) + await createCommentOnPostAction() const expected = expect.objectContaining({ data: { @@ -467,6 +477,53 @@ describe('notifications', () => { }), ).resolves.toEqual(expected) }) + + beforeEach(async () => { + title = 'Post where Im the author and I get mentioned in a comment' + postContent = 'Content of post where I get mentioned in a comment.' + postAuthor = notifiedUser + const createPostAction = async () => { + authenticatedUser = await postAuthor.toJson() + await mutate({ + mutation: createPostMutation, + variables: { + id: 'p49', + title, + postContent, + categoryIds, + }, + }) + authenticatedUser = await notifiedUser.toJson() + } + }) + it('sends only one notification with reason commented_on_post, no notification with reason mentioned_in_comment', async () => { + await createCommentOnPostAction() + const expected = expect.objectContaining({ + data: { + notifications: [ + { + read: false, + createdAt: expect.any(String), + reason: 'commented_on_post', + from: { + __typename: 'Comment', + id: 'c47', + content: commentContent, + }, + }, + ], + }, + }) + const { query } = createTestClient(server) + await expect( + query({ + query: notificationQuery, + variables: { + read: false, + }, + }), + ).resolves.toEqual(expected) + }) }) describe('but the author of the post blocked me', () => { From c21ad2244f1f024c5d1f68289a4be650e3f5317c Mon Sep 17 00:00:00 2001 From: Kapil Jain Date: Wed, 30 Oct 2019 22:03:52 -0400 Subject: [PATCH 42/70] add software tests for two notifications bug --- .../middleware/notifications/notificationsMiddleware.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js index 9d397cbe0..5d28ec627 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js @@ -443,7 +443,7 @@ describe('notifications', () => { it('sends only one notification with reason mentioned_in_comment', async () => { postAuthor = await instance.create('User', { - id: 'postAuthor', + id: 'MrPostAuthor', name: 'Mr Author', slug: 'mr-author', email: 'post-author@example.org', From b4a9e3e551253846aec6c54bd74e7230056777cd Mon Sep 17 00:00:00 2001 From: Kapil Jain Date: Thu, 31 Oct 2019 05:08:15 -0400 Subject: [PATCH 43/70] add software tests for two notifications bug --- .../notifications/notificationsMiddleware.spec.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js index 5d28ec627..cabcefa19 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js @@ -482,19 +482,6 @@ describe('notifications', () => { title = 'Post where Im the author and I get mentioned in a comment' postContent = 'Content of post where I get mentioned in a comment.' postAuthor = notifiedUser - const createPostAction = async () => { - authenticatedUser = await postAuthor.toJson() - await mutate({ - mutation: createPostMutation, - variables: { - id: 'p49', - title, - postContent, - categoryIds, - }, - }) - authenticatedUser = await notifiedUser.toJson() - } }) it('sends only one notification with reason commented_on_post, no notification with reason mentioned_in_comment', async () => { await createCommentOnPostAction() From 3fc61618bd4a2a5a5b020b926a513f8d080067ba Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Thu, 31 Oct 2019 11:05:29 +0100 Subject: [PATCH 44/70] deleted posts no longer displayed in user profile deleted posts are no longer displayed in the user profile --- backend/src/middleware/softDelete/softDeleteMiddleware.js | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.js b/backend/src/middleware/softDelete/softDeleteMiddleware.js index d3fd13cfc..3360d4085 100644 --- a/backend/src/middleware/softDelete/softDeleteMiddleware.js +++ b/backend/src/middleware/softDelete/softDeleteMiddleware.js @@ -32,6 +32,7 @@ export default { Post: setDefaultFilters, Comment: setDefaultFilters, User: setDefaultFilters, + profilePagePosts: setDefaultFilters, }, Mutation: async (resolve, root, args, context, info) => { args.disabled = false From 70e54c6becea3ff4cf72c73fd16d294447aeeb9f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 10:13:20 +0000 Subject: [PATCH 45/70] build(deps): bump metascraper-url from 5.7.14 to 5.7.17 in /backend Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 3b65819df..6916eee91 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9298,17 +9298,17 @@ } }, "metascraper-url": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-url/-/metascraper-url-5.7.14.tgz", - "integrity": "sha512-scsXsbhI9VFcmgtMI/bsr+onvzzWGX4h80pitQQpECA7X2K2qcm5qic+anv6K2simbPJ/brDkhHC2rMRm9snbw==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-url/-/metascraper-url-5.7.17.tgz", + "integrity": "sha512-7OOhCXpxdMiJatrbxa9rqLmUT/t/s34PDgtknoE/2FfmZY7X/xyORamcuqUHjV37sOpCPTun+GcJL4l3ddCi3Q==", "requires": { - "@metascraper/helpers": "^5.7.14" + "@metascraper/helpers": "^5.7.17" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index 352bf3dce..278ff961e 100644 --- a/backend/package.json +++ b/backend/package.json @@ -84,7 +84,7 @@ "metascraper-publisher": "^5.7.14", "metascraper-soundcloud": "^5.7.17", "metascraper-title": "^5.7.14", - "metascraper-url": "^5.7.14", + "metascraper-url": "^5.7.17", "metascraper-video": "^5.7.17", "metascraper-youtube": "^5.7.17", "minimatch": "^3.0.4", diff --git a/backend/yarn.lock b/backend/yarn.lock index 3a8b24a45..9147f0bb6 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5811,12 +5811,12 @@ metascraper-title@^5.7.14: "@metascraper/helpers" "^5.7.14" lodash "~4.17.15" -metascraper-url@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.7.14.tgz#20645ec0299f1fe4bf194b08037e344b9555bfd0" - integrity sha512-scsXsbhI9VFcmgtMI/bsr+onvzzWGX4h80pitQQpECA7X2K2qcm5qic+anv6K2simbPJ/brDkhHC2rMRm9snbw== +metascraper-url@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.7.17.tgz#e8ba40a17a59b54139f42d6e3cf430dc6f32e7d7" + integrity sha512-7OOhCXpxdMiJatrbxa9rqLmUT/t/s34PDgtknoE/2FfmZY7X/xyORamcuqUHjV37sOpCPTun+GcJL4l3ddCi3Q== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" metascraper-video@^5.7.17: version "5.7.17" From e56f2fb4ff74d2bed53b93ac4b60cad206137876 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 10:13:25 +0000 Subject: [PATCH 46/70] build(deps): bump metascraper-image from 5.7.6 to 5.7.17 in /backend Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.7.6 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.6...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 51 ++++++--------------------------------- backend/package.json | 2 +- backend/yarn.lock | 12 ++++----- 3 files changed, 15 insertions(+), 50 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 3b65819df..7c3a5cba9 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8297,14 +8297,6 @@ "tmpl": "1.0.x" } }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "requires": { - "p-defer": "^1.0.0" - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -8325,23 +8317,6 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, - "mem": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz", - "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==", - "requires": { - "map-age-cleaner": "^0.1.3", - "mimic-fn": "^2.1.0", - "p-is-promise": "^2.1.0" - }, - "dependencies": { - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - } - } - }, "memoize-one": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz", @@ -8751,17 +8726,17 @@ } }, "metascraper-image": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/metascraper-image/-/metascraper-image-5.7.6.tgz", - "integrity": "sha512-SIztcREe0m1p1wCUNh+mFVfXPbFQfOu6dZVhU1BIxb6+0km+pUOtPi6Kxnax10ZH4k0ZlFDmLr98yV/ydYdgvw==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-image/-/metascraper-image-5.7.17.tgz", + "integrity": "sha512-bwAUJrJibJ+fJGxL8T789Ki1z+8sqsz0sqb3W+mfR/ZLkhCu+jWLYqPVtMgTPM9Zaqqqxg5uTQs1uAVrnguKDA==", "requires": { - "@metascraper/helpers": "^5.7.6" + "@metascraper/helpers": "^5.7.17" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.6", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.6.tgz", - "integrity": "sha512-AD2VTQmMWl/KCUXl9h0fP84VacoiTI/8y8CBgErmYZnm+sliKGedQrDZO3JmzNg73Z5z08GQTjME1WHIDiIQDw==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", @@ -8775,7 +8750,7 @@ "iso-639-3": "~1.2.0", "isostring": "0.0.1", "lodash": "~4.17.15", - "mem": "~5.1.1", + "memoize-one": "~5.1.1", "mime-types": "~2.1.24", "normalize-url": "~4.5.0", "smartquotes": "~2.3.1", @@ -10337,11 +10312,6 @@ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" - }, "p-each-series": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz", @@ -10364,11 +10334,6 @@ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, - "p-is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", - "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" - }, "p-limit": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", diff --git a/backend/package.json b/backend/package.json index 352bf3dce..421683d84 100644 --- a/backend/package.json +++ b/backend/package.json @@ -77,7 +77,7 @@ "metascraper-clearbit-logo": "^5.3.0", "metascraper-date": "^5.7.17", "metascraper-description": "^5.7.14", - "metascraper-image": "^5.7.6", + "metascraper-image": "^5.7.17", "metascraper-lang": "^5.7.17", "metascraper-lang-detector": "^4.8.5", "metascraper-logo": "^5.7.17", diff --git a/backend/yarn.lock b/backend/yarn.lock index 3a8b24a45..7e5c46453 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -963,7 +963,7 @@ url-regex "~4.1.1" video-extensions "~1.1.0" -"@metascraper/helpers@^5.7.14", "@metascraper/helpers@^5.7.17", "@metascraper/helpers@^5.7.6": +"@metascraper/helpers@^5.7.14", "@metascraper/helpers@^5.7.17": version "5.7.17" resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.17.tgz#401897c7239090ca7149b83e581712845bbb3709" integrity sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw== @@ -5757,12 +5757,12 @@ metascraper-description@^5.7.14: dependencies: "@metascraper/helpers" "^5.7.14" -metascraper-image@^5.7.6: - version "5.7.6" - resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.7.6.tgz#77c45dfd28f6f0903417545196c129ec64cdbe6d" - integrity sha512-SIztcREe0m1p1wCUNh+mFVfXPbFQfOu6dZVhU1BIxb6+0km+pUOtPi6Kxnax10ZH4k0ZlFDmLr98yV/ydYdgvw== +metascraper-image@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.7.17.tgz#186b29979cb8aefc6c21d0342c386a8fef80be55" + integrity sha512-bwAUJrJibJ+fJGxL8T789Ki1z+8sqsz0sqb3W+mfR/ZLkhCu+jWLYqPVtMgTPM9Zaqqqxg5uTQs1uAVrnguKDA== dependencies: - "@metascraper/helpers" "^5.7.6" + "@metascraper/helpers" "^5.7.17" metascraper-lang-detector@^4.8.5: version "4.10.2" From 181cd76bc3baaffaa66edace519dccaa5b1d744c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 12:12:19 +0000 Subject: [PATCH 47/70] build(deps): bump metascraper-audio from 5.7.14 to 5.7.17 in /backend Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 1ff8ce844..cca9da916 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8386,17 +8386,17 @@ } }, "metascraper-audio": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-audio/-/metascraper-audio-5.7.14.tgz", - "integrity": "sha512-ev2PIDNTILznkDeWy/CFaKdhFlG/3URF0OOO4J2MXy8VNKd5IyP/+LF7zoPR9q5+C40+zRAmy8cqJId3qVAa2A==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-audio/-/metascraper-audio-5.7.17.tgz", + "integrity": "sha512-g11lRNVor5Pu4D1j3tL7aakSQM51CUl2Evp8QgFKcuYGjF+a1RiGq6veojiTf/9nWcKX8dUSTUJkQSIzdoJrFQ==", "requires": { - "@metascraper/helpers": "^5.7.14" + "@metascraper/helpers": "^5.7.17" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index bd2efa6e4..806babae3 100644 --- a/backend/package.json +++ b/backend/package.json @@ -72,7 +72,7 @@ "lodash": "~4.17.14", "merge-graphql-schemas": "^1.7.0", "metascraper": "^4.10.3", - "metascraper-audio": "^5.7.14", + "metascraper-audio": "^5.7.17", "metascraper-author": "^5.7.17", "metascraper-clearbit-logo": "^5.3.0", "metascraper-date": "^5.7.14", diff --git a/backend/yarn.lock b/backend/yarn.lock index 8c62d1df2..0f46613ef 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5721,12 +5721,12 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -metascraper-audio@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.7.14.tgz#f5edbc0249af3fcd09863580c3531eb4b8546589" - integrity sha512-ev2PIDNTILznkDeWy/CFaKdhFlG/3URF0OOO4J2MXy8VNKd5IyP/+LF7zoPR9q5+C40+zRAmy8cqJId3qVAa2A== +metascraper-audio@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.7.17.tgz#b8e78a797deb155b02f30bcbe39da554bf1bf898" + integrity sha512-g11lRNVor5Pu4D1j3tL7aakSQM51CUl2Evp8QgFKcuYGjF+a1RiGq6veojiTf/9nWcKX8dUSTUJkQSIzdoJrFQ== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" metascraper-author@^5.7.17: version "5.7.17" From 6ffbd37c9581b2d0f03d0a270fd7d82c134f50df Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 31 Oct 2019 14:34:23 +0100 Subject: [PATCH 48/70] Language Code As Buttons Instead Of Flag Icon --- .../FilterPosts/LanguageFilterMenuItems.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/components/FilterPosts/LanguageFilterMenuItems.vue b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue index e6af51a82..91910ee7f 100644 --- a/webapp/components/FilterPosts/LanguageFilterMenuItems.vue +++ b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue @@ -32,12 +32,12 @@ - + + {{ language.code.toUpperCase() }} + From 3c8a35d37154efb74be7e2367dc1876c60fccd0c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 31 Oct 2019 14:35:36 +0100 Subject: [PATCH 49/70] Language Code As Buttons Instead Of Flag Icon --- .../FilterPosts/LanguageFilterMenuItems.vue | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/webapp/components/FilterPosts/LanguageFilterMenuItems.vue b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue index 91910ee7f..23748c1ad 100644 --- a/webapp/components/FilterPosts/LanguageFilterMenuItems.vue +++ b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue @@ -32,12 +32,13 @@ - - {{ language.code.toUpperCase() }} - + + {{ language.code.toUpperCase() }} + From cbc547a86b2599f80baba206ca25a39b29e5b5cc Mon Sep 17 00:00:00 2001 From: roschaefer Date: Thu, 31 Oct 2019 16:11:05 +0100 Subject: [PATCH 50/70] refactor: small refactoring for readability @KapilJ your solution is right now the best solution, I think. Probably the ideal solution would be if we could implement the `CreateComment` resolver in such a way that it is doing eager loading of the `comment->post->author` relationship and resolving a commment object which has the required objects all set. Then you wouldn't have to refetch all the stuff. But I think this is OK for now :+1: --- .../notifications/notificationsMiddleware.js | 37 ++++++++++--------- .../notificationsMiddleware.spec.js | 2 +- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js index 2b3f1c2dd..718f0b1e4 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.js @@ -1,5 +1,21 @@ import extractMentionedUsers from './mentions/extractMentionedUsers' +const postAuthorOfComment = async (comment, { context }) => { + const session = context.driver.session() + const cypherFindUser = ` + MATCH (user: User)-[:WROTE]->(:Post)<-[:COMMENTS]-(:Comment { id: $commentId }) + RETURN user { .id } + ` + const result = await session.run(cypherFindUser, { + commentId: comment.id, + }) + session.close() + const [postAuthor] = await result.records.map(record => { + return record.get('user') + }) + return postAuthor +} + const notifyUsers = async (label, id, idsOfUsers, reason, context) => { if (!idsOfUsers.length) return @@ -90,27 +106,12 @@ const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo } const handleContentDataOfComment = async (resolve, root, args, context, resolveInfo) => { - const idsOfUsers = extractMentionedUsers(args.content) + let idsOfUsers = extractMentionedUsers(args.content) const comment = await resolve(root, args, context, resolveInfo) if (comment) { - const session = context.driver.session() - const cypherFindUser = ` - MATCH (user: User)-[:WROTE]->(:Post)<-[:COMMENTS]-(:Comment { id: $commentId }) - RETURN user { .id } - ` - const result = await session.run(cypherFindUser, { - commentId: comment.id, - }) - session.close() - const [postAuthor] = await result.records.map(record => { - return record.get('user') - }) - var index = idsOfUsers.indexOf(postAuthor.id) - - if (index > -1) { - idsOfUsers.splice(index) - } + const postAuthor = await postAuthorOfComment(comment, { context }) + idsOfUsers = idsOfUsers.filter(id => id !== postAuthor.id) await notifyUsers('Comment', comment.id, idsOfUsers, 'mentioned_in_comment', context) } diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js index cabcefa19..18ee998db 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js @@ -479,7 +479,7 @@ describe('notifications', () => { }) beforeEach(async () => { - title = 'Post where Im the author and I get mentioned in a comment' + title = "Post where I'm the author and I get mentioned in a comment" postContent = 'Content of post where I get mentioned in a comment.' postAuthor = notifiedUser }) From 5715d3e9d5c7e7a14925d087ec114ea66468fb73 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Thu, 31 Oct 2019 17:32:18 +0100 Subject: [PATCH 51/70] Add vuex store tests for language filter --- .../FilterPosts/FilterPosts.spec.js | 4 +- .../FilterPosts/LanguageFilterMenuItems.vue | 6 +- webapp/store/posts.js | 2 +- webapp/store/posts.spec.js | 66 ++++++++++++++++++- 4 files changed, 71 insertions(+), 7 deletions(-) diff --git a/webapp/components/FilterPosts/FilterPosts.spec.js b/webapp/components/FilterPosts/FilterPosts.spec.js index 14ebed3c5..504112572 100644 --- a/webapp/components/FilterPosts/FilterPosts.spec.js +++ b/webapp/components/FilterPosts/FilterPosts.spec.js @@ -73,7 +73,7 @@ describe('FilterPosts.vue', () => { 'posts/filteredCategoryIds': jest.fn(() => []), 'posts/filteredByUsersFollowed': jest.fn(), 'posts/filteredByEmotions': jest.fn(() => []), - 'posts/filteredLanguagesCodes': jest.fn(() => []), + 'posts/filteredLanguageCodes': jest.fn(() => []), } const openFilterPosts = () => { const store = new Vuex.Store({ mutations, getters }) @@ -124,7 +124,7 @@ describe('FilterPosts.vue', () => { }) it('sets language button attribute `primary` when corresponding language is filtered', () => { - getters['posts/filteredLanguagesCodes'] = jest.fn(() => ['es']) + getters['posts/filteredLanguageCodes'] = jest.fn(() => ['es']) const wrapper = openFilterPosts() spanishButton = wrapper .findAll('button.language-buttons') diff --git a/webapp/components/FilterPosts/LanguageFilterMenuItems.vue b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue index 23748c1ad..258b3acdc 100644 --- a/webapp/components/FilterPosts/LanguageFilterMenuItems.vue +++ b/webapp/components/FilterPosts/LanguageFilterMenuItems.vue @@ -15,7 +15,7 @@ @@ -34,7 +34,7 @@ {{ language.code.toUpperCase() }} @@ -65,7 +65,7 @@ export default { }, computed: { ...mapGetters({ - filteredLanguagesCodes: 'posts/filteredLanguagesCodes', + filteredLanguageCodes: 'posts/filteredLanguageCodes', }), }, methods: { diff --git a/webapp/store/posts.js b/webapp/store/posts.js index 9437db956..25a48f0d5 100644 --- a/webapp/store/posts.js +++ b/webapp/store/posts.js @@ -86,7 +86,7 @@ export const getters = { filteredCategoryIds(state) { return get(state.filter, 'categories_some.id_in') || [] }, - filteredLanguagesCodes(state) { + filteredLanguageCodes(state) { return get(state.filter, 'language_in') || [] }, filteredByUsersFollowed(state) { diff --git a/webapp/store/posts.spec.js b/webapp/store/posts.spec.js index 536c4c924..05cea7b13 100644 --- a/webapp/store/posts.spec.js +++ b/webapp/store/posts.spec.js @@ -19,12 +19,24 @@ describe('getters', () => { expect(getters.filteredCategoryIds(state)).toEqual([24]) }) - it('returns empty array if filter is not set', () => { + it('returns empty array if category filter is not set', () => { state = { filter: { author: { followedBy_some: { id: 7 } } } } expect(getters.filteredCategoryIds(state)).toEqual([]) }) }) + describe('filteredLanguageCodes', () => { + it('returns category ids if filter is set', () => { + state = { filter: { language_in: ['en', 'de', 'pt'] } } + expect(getters.filteredLanguageCodes(state)).toEqual(['en', 'de', 'pt']) + }) + + it('returns empty array if language filter is not set', () => { + state = { filter: { author: { followedBy_some: { id: 7 } } } } + expect(getters.filteredLanguageCodes(state)).toEqual([]) + }) + }) + describe('filter', () => { it('returns filter', () => { state = { filter: { author: { followedBy_some: { id: 7 } } } } @@ -104,6 +116,19 @@ describe('getters', () => { }) describe('mutations', () => { + describe('RESET_LANGUAGES', () => { + it('resets the languages filter', () => { + state = { + filter: { + author: { followedBy_some: { id: 7 } }, + language_in: ['nl'], + }, + } + mutations.RESET_LANGUAGES(state) + expect(getters.filter(state)).toEqual({ author: { followedBy_some: { id: 7 } } }) + }) + }) + describe('RESET_CATEGORIES', () => { beforeEach(() => { testMutation = categoryId => { @@ -122,6 +147,45 @@ describe('mutations', () => { }) }) + describe('TOGGLE_LANGUAGE', () => { + beforeEach(() => { + testMutation = languageCode => { + mutations.TOGGLE_LANGUAGE(state, languageCode) + return getters.filter(state) + } + }) + + it('creates category filter if empty', () => { + state = { filter: {} } + expect(testMutation('de')).toEqual({ language_in: ['de'] }) + }) + + it('adds language code to existing filter', () => { + state = { filter: { language_in: ['de'] } } + expect(testMutation('en')).toEqual({ language_in: ['de', 'en'] }) + }) + + it('removes category id if present', () => { + state = { filter: { language_in: ['de', 'en'] } } + expect(testMutation('de')).toEqual({ language_in: ['en'] }) + }) + + it('removes language filter if empty', () => { + state = { filter: { language_in: ['de'] } } + expect(testMutation('de')).toEqual({}) + }) + + it('does not get in the way of other filters', () => { + state = { + filter: { + author: { followedBy_some: { id: 7 } }, + language_in: ['de'], + }, + } + expect(testMutation('de')).toEqual({ author: { followedBy_some: { id: 7 } } }) + }) + }) + describe('TOGGLE_CATEGORY', () => { beforeEach(() => { testMutation = categoryId => { From ffa1038b86033b7cc34c5590d3d9fc9084322811 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 17:06:58 +0000 Subject: [PATCH 52/70] build(deps): bump metascraper-title from 5.7.14 to 5.7.17 in /backend Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index ffa7944ab..60ec6a2fa 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9183,18 +9183,18 @@ } }, "metascraper-title": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.7.14.tgz", - "integrity": "sha512-ZiVo4LEfqiNHlCGjht5OSZ3yRKxcZnbaXeRmUReMkCHcFujok5YZBj5ktDpAANmG9T3x2gn3twM3ZbBSyXLYyg==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.7.17.tgz", + "integrity": "sha512-YCEbiU2MbPMLulXmLbSBN/N7ti9tBVr45yqMKSuFsWiNJ98bFsM1IQp1LN5KqRQmNkOg+8JsYgK+R9vqYwaGjg==", "requires": { - "@metascraper/helpers": "^5.7.14", + "@metascraper/helpers": "^5.7.17", "lodash": "~4.17.15" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index 4e53f99a9..da1c3be5c 100644 --- a/backend/package.json +++ b/backend/package.json @@ -83,7 +83,7 @@ "metascraper-logo": "^5.7.17", "metascraper-publisher": "^5.7.14", "metascraper-soundcloud": "^5.7.17", - "metascraper-title": "^5.7.14", + "metascraper-title": "^5.7.17", "metascraper-url": "^5.7.17", "metascraper-video": "^5.7.17", "metascraper-youtube": "^5.7.17", diff --git a/backend/yarn.lock b/backend/yarn.lock index 169eef3db..600ba0a8e 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5803,12 +5803,12 @@ metascraper-soundcloud@^5.7.17: memoize-one "~5.1.1" tldts "~5.6.1" -metascraper-title@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.7.14.tgz#4abea12bc9f0d3df5b442cb3c1a8c6559e417ea4" - integrity sha512-ZiVo4LEfqiNHlCGjht5OSZ3yRKxcZnbaXeRmUReMkCHcFujok5YZBj5ktDpAANmG9T3x2gn3twM3ZbBSyXLYyg== +metascraper-title@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.7.17.tgz#5b947635361bfb4d7557eadcb623489c812322e6" + integrity sha512-YCEbiU2MbPMLulXmLbSBN/N7ti9tBVr45yqMKSuFsWiNJ98bFsM1IQp1LN5KqRQmNkOg+8JsYgK+R9vqYwaGjg== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" lodash "~4.17.15" metascraper-url@^5.7.17: From 206b5e8ce7f21f845da05871bb5ea5022c2eaf0f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 17:07:22 +0000 Subject: [PATCH 53/70] build(deps): bump metascraper-publisher in /backend Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index ffa7944ab..118c58598 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9003,17 +9003,17 @@ } }, "metascraper-publisher": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-publisher/-/metascraper-publisher-5.7.14.tgz", - "integrity": "sha512-6WHVr03tu4+KtcETR/q8y7ND9HxKI8QEEI1NAVpAolm1szDSpzV1PXVxWILcc2zPsaAHBSvM0iMwmE1zBEs+BA==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-publisher/-/metascraper-publisher-5.7.17.tgz", + "integrity": "sha512-BxiweB0vxXX0UF2YVxzwC7Y8X0A5mU+eaa6TsTrTGHPBWeZCUJaLJ2Ge35c00SIC+USgdu8KFyzF6+pJBObwvQ==", "requires": { - "@metascraper/helpers": "^5.7.14" + "@metascraper/helpers": "^5.7.17" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index 4e53f99a9..2e83aba52 100644 --- a/backend/package.json +++ b/backend/package.json @@ -81,7 +81,7 @@ "metascraper-lang": "^5.7.17", "metascraper-lang-detector": "^4.8.5", "metascraper-logo": "^5.7.17", - "metascraper-publisher": "^5.7.14", + "metascraper-publisher": "^5.7.17", "metascraper-soundcloud": "^5.7.17", "metascraper-title": "^5.7.14", "metascraper-url": "^5.7.17", diff --git a/backend/yarn.lock b/backend/yarn.lock index 169eef3db..bf369c5a9 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5787,12 +5787,12 @@ metascraper-logo@^5.7.17: dependencies: "@metascraper/helpers" "^5.7.17" -metascraper-publisher@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.7.14.tgz#74218cd2c1042264a3df754930e18d5e1f731750" - integrity sha512-6WHVr03tu4+KtcETR/q8y7ND9HxKI8QEEI1NAVpAolm1szDSpzV1PXVxWILcc2zPsaAHBSvM0iMwmE1zBEs+BA== +metascraper-publisher@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.7.17.tgz#38455e035d8d34c42eff529316ee15f31726d641" + integrity sha512-BxiweB0vxXX0UF2YVxzwC7Y8X0A5mU+eaa6TsTrTGHPBWeZCUJaLJ2Ge35c00SIC+USgdu8KFyzF6+pJBObwvQ== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" metascraper-soundcloud@^5.7.17: version "5.7.17" From f503dc09f5c724f19a9c712638f70fb6c3f20301 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 17:07:35 +0000 Subject: [PATCH 54/70] build(deps): bump metascraper-description in /backend Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index ffa7944ab..245b1df12 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -8637,17 +8637,17 @@ } }, "metascraper-description": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/metascraper-description/-/metascraper-description-5.7.14.tgz", - "integrity": "sha512-++qN4Rf0Hx13SbhJgRiLSuVOZHsYwhUkMfHa5sVVihSJkrLVjOSdBTpNBajRC7yHwG6m6/qIesuERbT1jdu5bw==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/metascraper-description/-/metascraper-description-5.7.17.tgz", + "integrity": "sha512-cQfg9Spl3FLK2x8O7DvecwSYEBUmRjtdZW2y1EVqHsOKwT13SeUy1kp+lZa8+8vFh4o8oJPzXHxgbLhAfAmVqQ==", "requires": { - "@metascraper/helpers": "^5.7.14" + "@metascraper/helpers": "^5.7.17" }, "dependencies": { "@metascraper/helpers": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.14.tgz", - "integrity": "sha512-xQa24LVinzyT/5H4LKNP4YDdR/kcz+j5GIIB123DyxvhQZTRuDu8BRmEUB/Yj+jY7U5qhwabIgwCT/eN1Y9Uag==", + "version": "5.7.17", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.7.17.tgz", + "integrity": "sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw==", "requires": { "audio-extensions": "0.0.0", "chrono-node": "~1.3.11", diff --git a/backend/package.json b/backend/package.json index 4e53f99a9..ad0aa2219 100644 --- a/backend/package.json +++ b/backend/package.json @@ -76,7 +76,7 @@ "metascraper-author": "^5.7.17", "metascraper-clearbit-logo": "^5.3.0", "metascraper-date": "^5.7.17", - "metascraper-description": "^5.7.14", + "metascraper-description": "^5.7.17", "metascraper-image": "^5.7.17", "metascraper-lang": "^5.7.17", "metascraper-lang-detector": "^4.8.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index 169eef3db..f3415b762 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5750,12 +5750,12 @@ metascraper-date@^5.7.17: dependencies: "@metascraper/helpers" "^5.7.17" -metascraper-description@^5.7.14: - version "5.7.14" - resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.7.14.tgz#4b77b04120f5f4f17dcabb4f549a7954da74b581" - integrity sha512-++qN4Rf0Hx13SbhJgRiLSuVOZHsYwhUkMfHa5sVVihSJkrLVjOSdBTpNBajRC7yHwG6m6/qIesuERbT1jdu5bw== +metascraper-description@^5.7.17: + version "5.7.17" + resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.7.17.tgz#b0daa54d0345546ececcc033065790402aabb5ec" + integrity sha512-cQfg9Spl3FLK2x8O7DvecwSYEBUmRjtdZW2y1EVqHsOKwT13SeUy1kp+lZa8+8vFh4o8oJPzXHxgbLhAfAmVqQ== dependencies: - "@metascraper/helpers" "^5.7.14" + "@metascraper/helpers" "^5.7.17" metascraper-image@^5.7.17: version "5.7.17" From 4305142daac6508647f7b3fd209c661fb2f78c23 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 07:11:12 +0000 Subject: [PATCH 55/70] build(deps-dev): bump cypress-plugin-retries from 1.3.0 to 1.4.0 Bumps [cypress-plugin-retries](https://github.com/Bkucera/cypress-plugin-retries) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/Bkucera/cypress-plugin-retries/releases) - [Commits](https://github.com/Bkucera/cypress-plugin-retries/compare/v1.3.0...v1.4.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 980391d97..f7cbc957c 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "cypress": "^3.5.0", "cypress-cucumber-preprocessor": "^1.16.2", "cypress-file-upload": "^3.4.0", - "cypress-plugin-retries": "^1.3.0", + "cypress-plugin-retries": "^1.4.0", "date-fns": "^2.6.0", "dotenv": "^8.2.0", "faker": "Marak/faker.js#master", diff --git a/yarn.lock b/yarn.lock index ab8dffd89..40b824c68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1929,10 +1929,10 @@ cypress-file-upload@^3.4.0: resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.4.0.tgz#f066853357994ed7b64e0ea35920d3d85273914e" integrity sha512-BY7jrpOPFEGcGBzkTReEjwQ59+O3u2SH2OleXdnDCuWIPHjbDx7haXukyAFd906JsI4Z2zXPiKrUVFHZc96eFA== -cypress-plugin-retries@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.3.0.tgz#a2c1f49dce69b521cbb5ce3ab1a3a25acf41f08f" - integrity sha512-s2STd3vVeoIeKmdOvDhmWicARxK3cu7xF02MhH120wycUhdtR0SbAbo+zmcNnHquyshccE6cv17DfNvPOV7Rog== +cypress-plugin-retries@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.4.0.tgz#30477294a22e368c874d50dc282e657906080955" + integrity sha512-Pudna9+dn0wp3flUVWt1ttn6hKTnD1MIBUSznYkw+uRv3JPNJhxHIv9cfxrZmig49/R1fIyGBVNORchtnFedEw== cypress@^3.5.0: version "3.5.0" From 6b0829516bc509c0a8cb6d045cad4d7274d6b327 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 10:29:46 +0000 Subject: [PATCH 56/70] build(deps-dev): bump cypress from 3.5.0 to 3.6.0 Bumps [cypress](https://github.com/cypress-io/cypress) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Commits](https://github.com/cypress-io/cypress/compare/v3.5.0...v3.6.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f7cbc957c..6ceb433da 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "bcryptjs": "^2.4.3", "codecov": "^3.6.1", "cross-env": "^6.0.3", - "cypress": "^3.5.0", + "cypress": "^3.6.0", "cypress-cucumber-preprocessor": "^1.16.2", "cypress-file-upload": "^3.4.0", "cypress-plugin-retries": "^1.4.0", diff --git a/yarn.lock b/yarn.lock index 40b824c68..4b731231e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1934,10 +1934,10 @@ cypress-plugin-retries@^1.4.0: resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.4.0.tgz#30477294a22e368c874d50dc282e657906080955" integrity sha512-Pudna9+dn0wp3flUVWt1ttn6hKTnD1MIBUSznYkw+uRv3JPNJhxHIv9cfxrZmig49/R1fIyGBVNORchtnFedEw== -cypress@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.5.0.tgz#e188bc8f48782953f6865d8830a4dc342334b81c" - integrity sha512-I1iSReD2C8CTP6s4BvQky4gEqHBnKLmhBIqFyCUZdj6BQ6ZDxGnmIbQPM5g79E2iP60KTIbTK99ZPSDVtsNUUg== +cypress@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.6.0.tgz#b7c88c169970aeb74a00182a1e8dc43a355d9eea" + integrity sha512-ODhbOrH1XZx0DUoYmJSvOSbEQjycNOpFYe7jOnHkT1+sdsn2+uqwAjZ1x982q3H4R/5iZjpSd50gd/iw2bofzg== dependencies: "@cypress/listr-verbose-renderer" "0.4.1" "@cypress/xvfb" "1.2.4" From 4cb46b617862b99d631a88108d73bfb9cd23ec13 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 1 Nov 2019 12:11:54 +0100 Subject: [PATCH 57/70] Fix: Poll Interval --- .../notifications/NotificationMenu/NotificationMenu.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue index 26d8256bd..04642e1e4 100644 --- a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue +++ b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue @@ -78,9 +78,7 @@ export default { query() { return notificationQuery(this.$i18n) }, - pollInterval() { - return NOTIFICATIONS_POLL_INTERVAL - }, + pollInterval: NOTIFICATIONS_POLL_INTERVAL, update(data) { const newNotifications = data.notifications.filter(newN => { return !this.displayedNotifications.find(oldN => this.equalNotification(newN, oldN)) From 2670b4869481e9256d5475807af7b43c2d38fb66 Mon Sep 17 00:00:00 2001 From: Brent Vardy Date: Sat, 2 Nov 2019 11:07:06 +0000 Subject: [PATCH 58/70] removed unused code and refactor cropper - Removed unused code - updated confirm button to be ds-button component - split into multiple functions Co-Authored-By: mattwr18 --- backend/yarn.lock | 3 +- webapp/components/TeaserImage/TeaserImage.vue | 75 +++++++++---------- 2 files changed, 37 insertions(+), 41 deletions(-) diff --git a/backend/yarn.lock b/backend/yarn.lock index c8589a508..e6c662229 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -963,7 +963,7 @@ url-regex "~4.1.1" video-extensions "~1.1.0" -"@metascraper/helpers@^5.7.14", "@metascraper/helpers@^5.7.17": +"@metascraper/helpers@^5.7.17": version "5.7.17" resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.17.tgz#401897c7239090ca7149b83e581712845bbb3709" integrity sha512-t21LqfDpaIrWg2JaivXG6mVzUsIVW05cAsKySA5Tj9Hgi9oZXxaaNes5XipOzk6P242RI48SDo7CkSbYiio7Tw== @@ -3589,7 +3589,6 @@ extsprintf@^1.2.0: faker@Marak/faker.js#master: version "4.1.0" - uid "9fd8d7d37b398842d0784a116a340f7aa6afb89b" resolved "https://codeload.github.com/Marak/faker.js/tar.gz/9fd8d7d37b398842d0784a116a340f7aa6afb89b" fast-deep-equal@^2.0.1: diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue index 245436612..c50f69cd8 100644 --- a/webapp/components/TeaserImage/TeaserImage.vue +++ b/webapp/components/TeaserImage/TeaserImage.vue @@ -7,9 +7,10 @@ :use-custom-slot="true" @vdropzone-error="verror" @vdropzone-thumbnail="transformImage" - @vdropzone-drop="dropzoneDrop" > -
+
+ {{ $t('contribution.teaserImage.cropperConfirm') }} +
- {{ $t('contribution.teaserImage.cropperConfirm') }} + + {{ $t('contribution.teaserImage.cropperConfirm') }} + +
Date: Mon, 4 Nov 2019 12:19:53 +0300 Subject: [PATCH 63/70] follow even more suggestions by @mattwr18 --- webapp/README.md | 8 ++++---- webapp/vue.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/README.md b/webapp/README.md index b692b3d9c..def0b739e 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -68,20 +68,20 @@ You can then visit the Storybook playground on `http://localhost:3002` {% tab title="Without Docker" %} -After starting the application following the above guidelines, open new terminal windows for each of these commands: +After starting the application following the above guidelines, open new terminal windows and navigate to the `/webapp` directory for each of these commands: ```bash -# run eslint +# run eslint in /webapp $ yarn lint ``` ```bash -# run unit tests +# run unit tests in /webapp $ yarn test ``` ```bash -# start storybook +# start storybook in /webapp $ yarn storybook ``` diff --git a/webapp/vue.md b/webapp/vue.md index 47d0620f0..5116bd713 100644 --- a/webapp/vue.md +++ b/webapp/vue.md @@ -15,9 +15,9 @@ Placed in the same folder are also: ## We use typed props -Vue.js allows us to define component props either as strings or as objects with `type`, `default` and `required` values. Always go for the second option! +Vue.js allows us to define component props either as strings or as objects (with `type` and `default` or `required` values). Always go for the second option! -Also: define defaults _only and always_ for non-required props. +Also: only (and always!) define a `default` for props that are _not required_. Why? - it makes our code more robust – a warning will be shown when passing a wrong prop type From a05d63e34e75bcb7fadfd5fe723603eebba3dd6c Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Mon, 4 Nov 2019 12:38:45 +0100 Subject: [PATCH 64/70] v0.1.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ceb433da..d6b6e77a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nitro-cypress", - "version": "0.1.8", + "version": "0.1.9", "description": "Fullstack tests with cypress for Human Connection", "author": "Human Connection gGmbh", "license": "MIT", From 0644380afc26d41ca1698257b83560a2de5d2443 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Mon, 4 Nov 2019 12:39:18 +0100 Subject: [PATCH 65/70] Update to version 0.1.9 --- CHANGELOG.md | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++-- VERSION | 2 +- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f41d1062..580e9e333 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,72 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). -#### [0.1.8](https://github.com/Human-Connection/Human-Connection/compare/0.1.7...0.1.8) +#### [v0.1.9](https://github.com/Human-Connection/Human-Connection/compare/v0.1.8...v0.1.9) + +> 4 November 2019 + +- Refactor and tidy up crop image implementation [`#1956`](https://github.com/Human-Connection/Human-Connection/pull/1956) +- 🍰 First Implementation Of Filtering Posts By Language [`#2059`](https://github.com/Human-Connection/Human-Connection/pull/2059) +- build(deps-dev): bump cypress from 3.5.0 to 3.6.0 [`#2105`](https://github.com/Human-Connection/Human-Connection/pull/2105) +- Fix: Poll Interval [`#2108`](https://github.com/Human-Connection/Human-Connection/pull/2108) +- build(deps-dev): bump cypress-plugin-retries from 1.3.0 to 1.4.0 [`#2104`](https://github.com/Human-Connection/Human-Connection/pull/2104) +- build(deps): bump metascraper-title from 5.7.14 to 5.7.17 in /backend [`#2082`](https://github.com/Human-Connection/Human-Connection/pull/2082) +- build(deps): bump metascraper-publisher from 5.7.14 to 5.7.17 in /backend [`#2098`](https://github.com/Human-Connection/Human-Connection/pull/2098) +- build(deps): bump metascraper-description from 5.7.14 to 5.7.17 in /backend [`#2096`](https://github.com/Human-Connection/Human-Connection/pull/2096) +- build(deps): bump metascraper-audio from 5.7.14 to 5.7.17 in /backend [`#2097`](https://github.com/Human-Connection/Human-Connection/pull/2097) +- build(deps): bump metascraper-url from 5.7.14 to 5.7.17 in /backend [`#2086`](https://github.com/Human-Connection/Human-Connection/pull/2086) +- build(deps): bump metascraper-image from 5.7.6 to 5.7.17 in /backend [`#2090`](https://github.com/Human-Connection/Human-Connection/pull/2090) +- deleted posts no longer displayed in user profile [`#2093`](https://github.com/Human-Connection/Human-Connection/pull/2093) +- Send only one notification for mention and comment [`#2062`](https://github.com/Human-Connection/Human-Connection/pull/2062) +- build(deps): bump metascraper-date from 5.7.14 to 5.7.17 in /backend [`#2089`](https://github.com/Human-Connection/Human-Connection/pull/2089) +- build(deps): bump @nuxtjs/apollo from 4.0.0-rc16 to 4.0.0-rc17 in /webapp [`#2088`](https://github.com/Human-Connection/Human-Connection/pull/2088) +- build(deps): bump metascraper-lang from 5.7.14 to 5.7.17 in /backend [`#2087`](https://github.com/Human-Connection/Human-Connection/pull/2087) +- build(deps): bump metascraper-video from 5.7.14 to 5.7.17 in /backend [`#2084`](https://github.com/Human-Connection/Human-Connection/pull/2084) +- build(deps): bump metascraper-soundcloud from 5.7.14 to 5.7.17 in /backend [`#2081`](https://github.com/Human-Connection/Human-Connection/pull/2081) +- build(deps-dev): bump auto-changelog from 1.16.1 to 1.16.2 [`#2085`](https://github.com/Human-Connection/Human-Connection/pull/2085) +- build(deps): bump metascraper-logo from 5.7.14 to 5.7.17 in /backend [`#2083`](https://github.com/Human-Connection/Human-Connection/pull/2083) +- build(deps): bump metascraper-youtube from 5.7.14 to 5.7.17 in /backend [`#2080`](https://github.com/Human-Connection/Human-Connection/pull/2080) +- build(deps): bump metascraper-author from 5.7.14 to 5.7.17 in /backend [`#2079`](https://github.com/Human-Connection/Human-Connection/pull/2079) +- build(deps): bump date-fns from 2.5.0 to 2.6.0 in /webapp [`#2007`](https://github.com/Human-Connection/Human-Connection/pull/2007) +- build(deps-dev): bump eslint from 6.5.1 to 6.6.0 in /backend [`#2071`](https://github.com/Human-Connection/Human-Connection/pull/2071) +- build(deps): bump node from 12.13.0-alpine to 13.0.1-alpine in /webapp [`#2019`](https://github.com/Human-Connection/Human-Connection/pull/2019) +- [FIX # 2058] Typo Fixed. Password -> Passwort [`#2060`](https://github.com/Human-Connection/Human-Connection/pull/2060) +- build(deps-dev): bump eslint-config-prettier from 6.4.0 to 6.5.0 in /backend [`#2064`](https://github.com/Human-Connection/Human-Connection/pull/2064) +- build(deps): bump date-fns from 2.5.1 to 2.6.0 in /backend [`#2010`](https://github.com/Human-Connection/Human-Connection/pull/2010) +- build(deps-dev): bump apollo-server-testing from 2.9.6 to 2.9.7 in /backend [`#1984`](https://github.com/Human-Connection/Human-Connection/pull/1984) +- build(deps): bump metascraper-date from 5.7.6 to 5.7.14 in /backend [`#2070`](https://github.com/Human-Connection/Human-Connection/pull/2070) +- build(deps): bump metascraper-video from 5.7.6 to 5.7.14 in /backend [`#2072`](https://github.com/Human-Connection/Human-Connection/pull/2072) +- build(deps-dev): bump eslint-plugin-jest from 22.20.0 to 23.0.2 in /backend [`#2069`](https://github.com/Human-Connection/Human-Connection/pull/2069) +- build(deps): bump metascraper-audio from 5.7.6 to 5.7.14 in /backend [`#2068`](https://github.com/Human-Connection/Human-Connection/pull/2068) +- build(deps-dev): bump eslint-plugin-jest from 23.0.0 to 23.0.2 in /webapp [`#2066`](https://github.com/Human-Connection/Human-Connection/pull/2066) +- build(deps-dev): bump cucumber from 6.0.2 to 6.0.3 in /backend [`#2065`](https://github.com/Human-Connection/Human-Connection/pull/2065) +- build(deps): bump metascraper-logo from 5.7.6 to 5.7.14 in /backend [`#2039`](https://github.com/Human-Connection/Human-Connection/pull/2039) +- build(deps): bump metascraper-url from 5.7.6 to 5.7.14 in /backend [`#2053`](https://github.com/Human-Connection/Human-Connection/pull/2053) +- build(deps): bump metascraper-youtube from 5.7.6 to 5.7.14 in /backend [`#2054`](https://github.com/Human-Connection/Human-Connection/pull/2054) +- build(deps): bump neo4j-graphql-js from 2.7.2 to 2.8.0 in /backend [`#2036`](https://github.com/Human-Connection/Human-Connection/pull/2036) +- build(deps): bump metascraper-soundcloud from 5.7.7 to 5.7.14 in /backend [`#2052`](https://github.com/Human-Connection/Human-Connection/pull/2052) +- build(deps): bump metascraper-author from 5.7.6 to 5.7.14 in /backend [`#2055`](https://github.com/Human-Connection/Human-Connection/pull/2055) +- build(deps-dev): bump eslint-plugin-jest from 22.20.0 to 23.0.0 in /webapp [`#2051`](https://github.com/Human-Connection/Human-Connection/pull/2051) +- build(deps): bump metascraper-title from 5.7.6 to 5.7.14 in /backend [`#2050`](https://github.com/Human-Connection/Human-Connection/pull/2050) +- build(deps-dev): bump eslint-config-prettier from 6.4.0 to 6.5.0 in /webapp [`#2049`](https://github.com/Human-Connection/Human-Connection/pull/2049) +- build(deps): bump metascraper-description from 5.7.6 to 5.7.14 in /backend [`#2038`](https://github.com/Human-Connection/Human-Connection/pull/2038) +- build(deps-dev): bump node-sass from 4.12.0 to 4.13.0 in /webapp [`#2037`](https://github.com/Human-Connection/Human-Connection/pull/2037) +- build(deps): bump metascraper-publisher from 5.7.6 to 5.7.14 in /backend [`#2033`](https://github.com/Human-Connection/Human-Connection/pull/2033) +- build(deps): bump apollo-server from 2.9.6 to 2.9.7 in /backend [`#2004`](https://github.com/Human-Connection/Human-Connection/pull/2004) +- fix #1993 [`#2043`](https://github.com/Human-Connection/Human-Connection/pull/2043) +- Update to version 0.1.8 [`#2032`](https://github.com/Human-Connection/Human-Connection/pull/2032) +- build(deps): bump graphql-shield from 6.1.0 to 7.0.0 in /backend [`#2035`](https://github.com/Human-Connection/Human-Connection/pull/2035) +- build(deps): bump metascraper-lang from 5.7.6 to 5.7.14 in /backend [`#2034`](https://github.com/Human-Connection/Human-Connection/pull/2034) +- change Changes & History to Changes [`#2030`](https://github.com/Human-Connection/Human-Connection/pull/2030) +- chnage Änderungen & Verlauf zu Änderungen [`#2029`](https://github.com/Human-Connection/Human-Connection/pull/2029) +- build(deps): bump @nuxtjs/apollo from 4.0.0-rc15 to 4.0.0-rc16 in /webapp [`#1990`](https://github.com/Human-Connection/Human-Connection/pull/1990) +- Merge pull request #2043 from Human-Connection/fix-1993 [`#1993`](https://github.com/Human-Connection/Human-Connection/issues/1993) +- fix #1993 [`#1993`](https://github.com/Human-Connection/Human-Connection/issues/1993) +- first implementation [`aeae72f`](https://github.com/Human-Connection/Human-Connection/commit/aeae72f6918861aa2a4c64d0b32c847d9e857e93) +- build(deps-dev): bump eslint-plugin-jest in /backend [`6c1bd53`](https://github.com/Human-Connection/Human-Connection/commit/6c1bd535ac482eb0a05d21e227a476800717a19e) +- Add auto changelog [`6f4517b`](https://github.com/Human-Connection/Human-Connection/commit/6f4517b0e9d832abab271471cedeea0aa00f4d43) + +#### [v0.1.8](https://github.com/Human-Connection/Human-Connection/compare/0.1.7...v0.1.8) > 25 October 2019 @@ -23,8 +88,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - build(deps-dev): bump @vue/cli-shared-utils from 4.0.4 to 4.0.5 in /webapp [`#2002`](https://github.com/Human-Connection/Human-Connection/pull/2002) - Update to version 0.1.7 [`#2015`](https://github.com/Human-Connection/Human-Connection/pull/2015) - Update to version 0.1.8 [`d45264b`](https://github.com/Human-Connection/Human-Connection/commit/d45264b3afa1557c2205e7ca1b77c778ee37ab5a) +- build(deps): bump @nuxtjs/apollo in /webapp [`26c21b5`](https://github.com/Human-Connection/Human-Connection/commit/26c21b5b76c96206d98ff6bbfdbd1ca973ffcd4f) - build(deps-dev): bump @storybook/addon-actions in /webapp [`7e95d37`](https://github.com/Human-Connection/Human-Connection/commit/7e95d376a311a5ede6351d577d30e25aea9cb65d) -- new terms and conditions fixed [`ff8680f`](https://github.com/Human-Connection/Human-Connection/commit/ff8680ff862846cf619423007809ea3139cada96) #### [0.1.7](https://github.com/Human-Connection/Human-Connection/compare/0.1.6...0.1.7) diff --git a/VERSION b/VERSION index 699c6c6d4..1a030947e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.8 +0.1.9 From 24143f835033da306523bf9610b54e66094be6e8 Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Mon, 4 Nov 2019 16:27:36 +0300 Subject: [PATCH 66/70] ask for a more detailed description in the feature template --- .github/ISSUE_TEMPLATE/feature_request.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 1fba3fa58..ef3b30be2 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -6,11 +6,19 @@ title: 🚀 [Feature] --- ## :rocket: Feature - + + +### User Problem + + +### Implementation + ### Design & Layout - + +### Validation + ### Additional context - + From 3a1f878ce3d7dfb0f1f03b964053b7b744e111f6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 08:36:26 +0000 Subject: [PATCH 67/70] build(deps-dev): bump async-validator from 3.2.0 to 3.2.1 in /webapp Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/yiminghe/async-validator/releases) - [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md) - [Commits](https://github.com/yiminghe/async-validator/compare/v3.2.0...v3.2.1) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index d6cad2c99..02c1a907f 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -102,7 +102,7 @@ "@vue/eslint-config-prettier": "~5.0.0", "@vue/server-test-utils": "~1.0.0-beta.29", "@vue/test-utils": "~1.0.0-beta.29", - "async-validator": "^3.2.0", + "async-validator": "^3.2.1", "babel-core": "~7.0.0-bridge.0", "babel-eslint": "~10.0.3", "babel-jest": "~24.9.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 9b548c519..0422fa4a7 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -3831,10 +3831,10 @@ async-retry@^1.2.1: dependencies: retry "0.12.0" -async-validator@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.2.0.tgz#fcbd644e7b5b7c9304d29a4752c3f06214ef0d56" - integrity sha512-QBuW7Qrg8wbh7Wtqw1QdN162GUmXDs9gayxFaXcCOf3bCqHJ/TQep0H4I63iVk7Q3kIGWU4wbAr/C0Uj64JiMw== +async-validator@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.2.1.tgz#19ac8655c1296a5331b00c75f2492f0d33cae1f8" + integrity sha512-yc96RhAthww0n52m9osoI1uDQbbyd/N2xwPWS1gVvngSWOsKerpBFCulvmhp8GfNwUay41TWskNTd3swQM1XMA== async@^1.4.0: version "1.5.2" From 852f7d92bcda77a6c61482821a4fc43833eecb15 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 08:36:34 +0000 Subject: [PATCH 68/70] build(deps): bump merge-graphql-schemas from 1.7.0 to 1.7.2 in /backend Bumps [merge-graphql-schemas](https://github.com/Urigo/merge-graphql-schemas) from 1.7.0 to 1.7.2. - [Release notes](https://github.com/Urigo/merge-graphql-schemas/releases) - [Changelog](https://github.com/Urigo/merge-graphql-schemas/blob/master/CHANGELOG.md) - [Commits](https://github.com/Urigo/merge-graphql-schemas/compare/v1.7.0...v1.7.2) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 188 +++++++++++++++----------------------- backend/package.json | 2 +- backend/yarn.lock | 185 +++++++++++++------------------------ 3 files changed, 139 insertions(+), 236 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 17ea7753c..f69413860 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -935,6 +935,67 @@ "minimist": "^1.2.0" } }, + "@graphql-toolkit/common": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@graphql-toolkit/common/-/common-0.6.7.tgz", + "integrity": "sha512-givchEE8hiqhGxX3EMiD0qMIyXRKcvpr50a7KozZL5POA8q3mQE3mXmJnJYllY2NRaFXqrNyHeaxwQO6XG85tw==", + "requires": { + "@kamilkisiela/graphql-tools": "4.0.6", + "aggregate-error": "3.0.1", + "lodash": "4.17.15" + }, + "dependencies": { + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + } + } + }, + "@graphql-toolkit/file-loading": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@graphql-toolkit/file-loading/-/file-loading-0.6.7.tgz", + "integrity": "sha512-xhNWoV+QM1m0yKS09KCZHeiULKMV1BGJLHFHXO2xR4DD+N7Z1PmrF3utNh7yW41eAeZqVt4a8TBqFM3NnUz8aA==", + "requires": { + "@graphql-toolkit/common": "0.6.7", + "@kamilkisiela/graphql-tools": "4.0.6", + "glob": "7.1.5" + }, + "dependencies": { + "glob": { + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz", + "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, + "@graphql-toolkit/schema-merging": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@graphql-toolkit/schema-merging/-/schema-merging-0.6.7.tgz", + "integrity": "sha512-bzW/HlQY0YLW52Qeom4gq6Cc3fb887jP5TssoY8g0MlfZzRJS2I08Sb3oWVL2rBep7LllTTGRASM56se3FJG9A==", + "requires": { + "@graphql-toolkit/common": "0.6.7", + "@kamilkisiela/graphql-tools": "4.0.6", + "deepmerge": "4.2.2" + } + }, "@hapi/address": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.2.tgz", @@ -1414,11 +1475,6 @@ "@types/express": "*" } }, - "@types/events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==" - }, "@types/express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz", @@ -1446,16 +1502,6 @@ "@types/node": "*" } }, - "@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", - "requires": { - "@types/events": "*", - "@types/minimatch": "*", - "@types/node": "*" - } - }, "@types/graphql-upload": { "version": "8.0.3", "resolved": "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.3.tgz", @@ -1539,11 +1585,6 @@ "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz", "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==" }, - "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" - }, "@types/node": { "version": "12.7.12", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz", @@ -2294,11 +2335,6 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, - "asyncro": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/asyncro/-/asyncro-3.0.0.tgz", - "integrity": "sha512-nEnWYfrBmA3taTiuiOoZYmgJ/CNrSoQLeLs29SeLcPu60yaw/mHDBHV0iOZ051fTvsTHxpCY+gXibqT9wbQYfg==" - }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -3805,15 +3841,6 @@ "cross-spawn": "^7.0.0" } }, - "cross-fetch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.4.tgz", - "integrity": "sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw==", - "requires": { - "node-fetch": "2.6.0", - "whatwg-fetch": "3.0.0" - } - }, "cross-spawn": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", @@ -4057,9 +4084,9 @@ "dev": true }, "deepmerge": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz", - "integrity": "sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" }, "defer-to-connect": { "version": "1.0.2", @@ -5607,6 +5634,7 @@ "version": "7.1.4", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5724,15 +5752,6 @@ "apollo-server-types": "^0.2.5" } }, - "graphql-import": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/graphql-import/-/graphql-import-0.7.1.tgz", - "integrity": "sha512-YpwpaPjRUVlw2SN3OPljpWbVRWAhMAyfSba5U47qGMOSsPLi2gYeJtngGpymjm9nk57RFWEpjqwh4+dpYuFAPw==", - "requires": { - "lodash": "^4.17.4", - "resolve-from": "^4.0.0" - } - }, "graphql-iso-date": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/graphql-iso-date/-/graphql-iso-date-3.6.1.tgz", @@ -5808,26 +5827,6 @@ "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz", "integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==" }, - "graphql-toolkit": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/graphql-toolkit/-/graphql-toolkit-0.5.0.tgz", - "integrity": "sha512-tBgqyWPHI/Pgt+jp+uLZZy2EBCzjd6yWAu73oUlmrhgg7XM6f1ONotVHvIO2MK7j8khR+ex/cUe8FgpS1i845w==", - "requires": { - "@kamilkisiela/graphql-tools": "4.0.6", - "@types/glob": "7.1.1", - "aggregate-error": "3.0.0", - "asyncro": "^3.0.0", - "cross-fetch": "^3.0.4", - "deepmerge": "4.0.0", - "glob": "7.1.4", - "graphql-import": "0.7.1", - "is-glob": "4.0.1", - "is-valid-path": "0.1.1", - "lodash": "4.17.15", - "tslib": "^1.9.3", - "valid-url": "1.0.9" - } - }, "graphql-tools": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.5.tgz", @@ -6450,7 +6449,8 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", @@ -6474,6 +6474,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -6488,29 +6489,6 @@ "is-path-inside": "^1.0.0" } }, - "is-invalid-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz", - "integrity": "sha1-MHqFWzzxqTi0TqcNLGEQYFNxTzQ=", - "requires": { - "is-glob": "^2.0.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, "is-npm": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", @@ -6655,14 +6633,6 @@ "punycode2": "~1.0.0" } }, - "is-valid-path": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz", - "integrity": "sha1-EQ+f90w39mPh7HkV60UfLbk6yd8=", - "requires": { - "is-invalid-path": "^0.1.0" - } - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -8333,11 +8303,12 @@ "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, "merge-graphql-schemas": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/merge-graphql-schemas/-/merge-graphql-schemas-1.7.0.tgz", - "integrity": "sha512-uxErpYVjlf91eTBdwHxVEwKtaosmmEHMJaQfe35XHwOEpUfhA9OFbYKRfZX5jUUS53xMnk203HDAl/u0EfjP7A==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/merge-graphql-schemas/-/merge-graphql-schemas-1.7.2.tgz", + "integrity": "sha512-klLfSqh+2FkEl88Ix4n+ldcNHw0Y5un+pgDZaTzsz81dUQOHk+ai2fNfNwHRebtYfQUTGFiiykEPL0RhJwHzag==", "requires": { - "graphql-toolkit": "0.5.0", + "@graphql-toolkit/file-loading": "0.6.7", + "@graphql-toolkit/schema-merging": "0.6.7", "tslib": "1.10.0" } }, @@ -11190,7 +11161,8 @@ "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true }, "resolve-url": { "version": "0.2.1", @@ -12879,11 +12851,6 @@ "homedir-polyfill": "^1.0.1" } }, - "valid-url": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz", - "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA=" - }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -12976,11 +12943,6 @@ "iconv-lite": "0.4.24" } }, - "whatwg-fetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", - "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==" - }, "whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", diff --git a/backend/package.json b/backend/package.json index 622a8313d..bb4a0c923 100644 --- a/backend/package.json +++ b/backend/package.json @@ -70,7 +70,7 @@ "jsonwebtoken": "~8.5.1", "linkifyjs": "~2.1.8", "lodash": "~4.17.14", - "merge-graphql-schemas": "^1.7.0", + "merge-graphql-schemas": "^1.7.2", "metascraper": "^4.10.3", "metascraper-audio": "^5.7.17", "metascraper-author": "^5.7.17", diff --git a/backend/yarn.lock b/backend/yarn.lock index e6c662229..9d48c6900 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -728,6 +728,33 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@graphql-toolkit/common@0.6.7": + version "0.6.7" + resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.6.7.tgz#9a23d51913c282fddef149b53dba54c69688f1cf" + integrity sha512-givchEE8hiqhGxX3EMiD0qMIyXRKcvpr50a7KozZL5POA8q3mQE3mXmJnJYllY2NRaFXqrNyHeaxwQO6XG85tw== + dependencies: + "@kamilkisiela/graphql-tools" "4.0.6" + aggregate-error "3.0.1" + lodash "4.17.15" + +"@graphql-toolkit/file-loading@0.6.7": + version "0.6.7" + resolved "https://registry.yarnpkg.com/@graphql-toolkit/file-loading/-/file-loading-0.6.7.tgz#fa19bd5c5562e55d26b3026f3bfb11f14146e84f" + integrity sha512-xhNWoV+QM1m0yKS09KCZHeiULKMV1BGJLHFHXO2xR4DD+N7Z1PmrF3utNh7yW41eAeZqVt4a8TBqFM3NnUz8aA== + dependencies: + "@graphql-toolkit/common" "0.6.7" + "@kamilkisiela/graphql-tools" "4.0.6" + glob "7.1.5" + +"@graphql-toolkit/schema-merging@0.6.7": + version "0.6.7" + resolved "https://registry.yarnpkg.com/@graphql-toolkit/schema-merging/-/schema-merging-0.6.7.tgz#cd438ef45c82f490cae56a2699f553d4492d28d2" + integrity sha512-bzW/HlQY0YLW52Qeom4gq6Cc3fb887jP5TssoY8g0MlfZzRJS2I08Sb3oWVL2rBep7LllTTGRASM56se3FJG9A== + dependencies: + "@graphql-toolkit/common" "0.6.7" + "@kamilkisiela/graphql-tools" "4.0.6" + deepmerge "4.2.2" + "@hapi/address@2.x.x", "@hapi/address@^2.1.2": version "2.1.2" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222" @@ -1182,11 +1209,6 @@ dependencies: "@types/express" "*" -"@types/events@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" - integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== - "@types/express-serve-static-core@*": version "4.16.9" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz#69e00643b0819b024bdede95ced3ff239bb54558" @@ -1211,15 +1233,6 @@ dependencies: "@types/node" "*" -"@types/glob@7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" - integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== - dependencies: - "@types/events" "*" - "@types/minimatch" "*" - "@types/node" "*" - "@types/graphql-upload@^8.0.0": version "8.0.1" resolved "https://registry.yarnpkg.com/@types/graphql-upload/-/graphql-upload-8.0.1.tgz#12c804255c681fd06a904b67bde7506f2484f1a8" @@ -1299,11 +1312,6 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d" integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw== -"@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== - "@types/node@*", "@types/node@>=6": version "12.7.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.2.tgz#c4e63af5e8823ce9cc3f0b34f7b998c2171f0c44" @@ -1454,7 +1462,15 @@ agent-base@^4.3.0: dependencies: es6-promisify "^5.0.0" -aggregate-error@3.0.0, aggregate-error@^3.0.0: +aggregate-error@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" + integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.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" integrity sha512-yKD9kEoJIR+2IFqhMwayIBgheLYbB3PS2OBhWae1L/ODTd/JF/30cW0bc9TqzRL3k4U41Dieu3BF4I29p8xesA== @@ -1931,11 +1947,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -asyncro@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/asyncro/-/asyncro-3.0.0.tgz#3c7a732e263bc4a42499042f48d7d858e9c0134e" - integrity sha512-nEnWYfrBmA3taTiuiOoZYmgJ/CNrSoQLeLs29SeLcPu60yaw/mHDBHV0iOZ051fTvsTHxpCY+gXibqT9wbQYfg== - atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" @@ -2641,14 +2652,6 @@ cross-fetch@2.2.2: node-fetch "2.1.2" whatwg-fetch "2.0.4" -cross-fetch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.4.tgz#7bef7020207e684a7638ef5f2f698e24d9eb283c" - integrity sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw== - dependencies: - node-fetch "2.6.0" - whatwg-fetch "3.0.0" - cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -2845,10 +2848,10 @@ deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -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.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== defer-to-connect@^1.0.1: version "1.0.2" @@ -3901,10 +3904,10 @@ glob-parent@^5.0.0: dependencies: is-glob "^4.0.1" -glob@7.1.4, glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: - version "7.1.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" - integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== +glob@7.1.5, glob@^7.1.4: + version "7.1.5" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0" + integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -3913,10 +3916,10 @@ glob@7.1.4, glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.4: - version "7.1.5" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0" - integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ== +glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: + version "7.1.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" + integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -4004,14 +4007,6 @@ graphql-extensions@^0.10.4: apollo-server-env "^2.4.3" apollo-server-types "^0.2.5" -graphql-import@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/graphql-import/-/graphql-import-0.7.1.tgz#4add8d91a5f752d764b0a4a7a461fcd93136f223" - integrity sha512-YpwpaPjRUVlw2SN3OPljpWbVRWAhMAyfSba5U47qGMOSsPLi2gYeJtngGpymjm9nk57RFWEpjqwh4+dpYuFAPw== - dependencies: - lodash "^4.17.4" - resolve-from "^4.0.0" - graphql-iso-date@~3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.6.1.tgz#bd2d0dc886e0f954cbbbc496bbf1d480b57ffa96" @@ -4058,25 +4053,6 @@ graphql-tag@^2.9.2, graphql-tag@~2.10.1: resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02" integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg== -graphql-toolkit@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/graphql-toolkit/-/graphql-toolkit-0.5.0.tgz#7371c21809898286b2a9e164b45469586cf64498" - integrity sha512-tBgqyWPHI/Pgt+jp+uLZZy2EBCzjd6yWAu73oUlmrhgg7XM6f1ONotVHvIO2MK7j8khR+ex/cUe8FgpS1i845w== - dependencies: - "@kamilkisiela/graphql-tools" "4.0.6" - "@types/glob" "7.1.1" - aggregate-error "3.0.0" - asyncro "^3.0.0" - cross-fetch "^3.0.4" - deepmerge "4.0.0" - glob "7.1.4" - graphql-import "0.7.1" - is-glob "4.0.1" - is-valid-path "0.1.1" - lodash "4.17.15" - tslib "^1.9.3" - valid-url "1.0.9" - graphql-tools@^4.0.0, graphql-tools@^4.0.4, graphql-tools@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.5.tgz#d2b41ee0a330bfef833e5cdae7e1f0b0d86b1754" @@ -4608,11 +4584,6 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= - is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -4645,20 +4616,6 @@ is-generator@^1.0.2: resolved "https://registry.yarnpkg.com/is-generator/-/is-generator-1.0.3.tgz#c14c21057ed36e328db80347966c693f886389f3" integrity sha1-wUwhBX7TbjKNuANHlmxpP4hjifM= -is-glob@4.0.1, is-glob@^4.0.0, is-glob@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-glob@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= - dependencies: - is-extglob "^1.0.0" - is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -4666,6 +4623,13 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" +is-glob@^4.0.0, is-glob@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + is-installed-globally@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" @@ -4674,13 +4638,6 @@ is-installed-globally@^0.1.0: global-dirs "^0.1.0" is-path-inside "^1.0.0" -is-invalid-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-invalid-path/-/is-invalid-path-0.1.0.tgz#307a855b3cf1a938b44ea70d2c61106053714f34" - integrity sha1-MHqFWzzxqTi0TqcNLGEQYFNxTzQ= - dependencies: - is-glob "^2.0.0" - is-npm@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" @@ -4802,13 +4759,6 @@ is-uri@~1.2.0: parse-uri "~1.0.0" punycode2 "~1.0.0" -is-valid-path@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-valid-path/-/is-valid-path-0.1.1.tgz#110f9ff74c37f663e1ec7915eb451f2db93ac9df" - integrity sha1-EQ+f90w39mPh7HkV60UfLbk6yd8= - dependencies: - is-invalid-path "^0.1.0" - is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -5601,7 +5551,7 @@ lodash.unescape@4.0.1: resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw= -lodash@4.17.15, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.11, lodash@~4.17.14, lodash@~4.17.15: +lodash@4.17.15, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.11, lodash@~4.17.14, lodash@~4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -5707,12 +5657,13 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= -merge-graphql-schemas@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.7.0.tgz#bedf99b90096d4b324f8e81271e878e6b5cc930d" - integrity sha512-uxErpYVjlf91eTBdwHxVEwKtaosmmEHMJaQfe35XHwOEpUfhA9OFbYKRfZX5jUUS53xMnk203HDAl/u0EfjP7A== +merge-graphql-schemas@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.7.2.tgz#a35f885ce718c28c7e39863199528f7f70439f2c" + integrity sha512-klLfSqh+2FkEl88Ix4n+ldcNHw0Y5un+pgDZaTzsz81dUQOHk+ai2fNfNwHRebtYfQUTGFiiykEPL0RhJwHzag== dependencies: - graphql-toolkit "0.5.0" + "@graphql-toolkit/file-loading" "0.6.7" + "@graphql-toolkit/schema-merging" "0.6.7" tslib "1.10.0" merge-stream@^2.0.0: @@ -6118,7 +6069,7 @@ node-fetch@2.1.2: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5" integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U= -node-fetch@2.6.0, node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@~2.6.0: +node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@~2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== @@ -8405,11 +8356,6 @@ v8flags@^3.1.1: dependencies: homedir-polyfill "^1.0.1" -valid-url@1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" - integrity sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA= - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -8479,11 +8425,6 @@ whatwg-fetch@2.0.4: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== -whatwg-fetch@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" - integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== - whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" From 997778c05d5267a358f81f3943e76e31c00a9879 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 08:36:44 +0000 Subject: [PATCH 69/70] build(deps-dev): bump vue-loader from 15.7.1 to 15.7.2 in /webapp Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.7.1 to 15.7.2. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/compare/v15.7.1...v15.7.2) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index d6cad2c99..7beb95331 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -133,7 +133,7 @@ "style-loader": "~0.23.1", "style-resources-loader": "~1.2.1", "vue-jest": "~3.0.5", - "vue-loader": "~15.7.0", + "vue-loader": "~15.7.2", "vue-svg-loader": "~0.12.0", "vue-template-compiler": "^2.6.10" } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 9b548c519..adaa3a135 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -16062,10 +16062,10 @@ vue-jest@~3.0.5: tsconfig "^7.0.0" vue-template-es2015-compiler "^1.6.0" -vue-loader@^15.7.1, vue-loader@~15.7.0: - version "15.7.1" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.1.tgz#6ccacd4122aa80f69baaac08ff295a62e3aefcfd" - integrity sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA== +vue-loader@^15.7.1, vue-loader@~15.7.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.2.tgz#cc89e2716df87f70fe656c9da9d7f8bec06c73d6" + integrity sha512-H/P9xt/nkocyu4hZKg5TzPqyCT1oKOaCSk9zs0JCbJuy0Q8KtR0bjJpnT/5R5x/Ckd1GFkkLQnQ1C4x6xXeLZg== dependencies: "@vue/component-compiler-utils" "^3.0.0" hash-sum "^1.0.2" From 194c826e8c53d975ed0fa3311c2b6d1b475005d2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 08:37:10 +0000 Subject: [PATCH 70/70] build(deps): bump graphql-shield from 7.0.0 to 7.0.1 in /backend Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/maticzav/graphql-shield/releases) - [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.0...v7.0.1) Signed-off-by: dependabot-preview[bot] --- backend/package-lock.json | 12 +++--------- backend/package.json | 2 +- backend/yarn.lock | 14 ++++---------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 17ea7753c..f688f79f1 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -5785,12 +5785,11 @@ } }, "graphql-shield": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/graphql-shield/-/graphql-shield-7.0.0.tgz", - "integrity": "sha512-hr0PR6t/UXAO5+BMOOD2W3zTIKbtO/u8twjLn8hw4646E08NeLrIxDAmUFKKlLhyTe5JzlH4nNflP6SRtL6Q2A==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/graphql-shield/-/graphql-shield-7.0.1.tgz", + "integrity": "sha512-wDKpnMeou/XNkHCzRQHsi9kit5FkO1uAu+9UL/erJPEpwO4yaSkkGPNELsTTQdxhsX3SzWly792dqIj2T8suAw==", "requires": { "@types/yup": "0.26.24", - "lightercollective": "^0.3.0", "object-hash": "^2.0.0", "yup": "^0.27.0" } @@ -8120,11 +8119,6 @@ "xml2js": "^0.4.17" } }, - "lightercollective": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/lightercollective/-/lightercollective-0.3.0.tgz", - "integrity": "sha512-RFOLSUVvwdK3xA0P8o6G7QGXLIyy1L2qv5caEI7zXN5ciaEjbAriRF182kbsoJ1S1TgvpyGcN485fMky6qxOPw==" - }, "linkifyjs": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.8.tgz", diff --git a/backend/package.json b/backend/package.json index 622a8313d..426092cff 100644 --- a/backend/package.json +++ b/backend/package.json @@ -64,7 +64,7 @@ "graphql-iso-date": "~3.6.1", "graphql-middleware": "~4.0.1", "graphql-middleware-sentry": "^3.2.1", - "graphql-shield": "~7.0.0", + "graphql-shield": "~7.0.1", "graphql-tag": "~2.10.1", "helmet": "~3.21.2", "jsonwebtoken": "~8.5.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index e6c662229..a99a01445 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -4036,13 +4036,12 @@ graphql-request@~1.8.2: dependencies: cross-fetch "2.2.2" -graphql-shield@~7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.0.tgz#0cdca5c16af4ba7dd4fbcce6df279c5c8e463452" - integrity sha512-hr0PR6t/UXAO5+BMOOD2W3zTIKbtO/u8twjLn8hw4646E08NeLrIxDAmUFKKlLhyTe5JzlH4nNflP6SRtL6Q2A== +graphql-shield@~7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.1.tgz#4d9b5a0e1b169ebe5ee786a4bad102c5fe3354b7" + integrity sha512-wDKpnMeou/XNkHCzRQHsi9kit5FkO1uAu+9UL/erJPEpwO4yaSkkGPNELsTTQdxhsX3SzWly792dqIj2T8suAw== dependencies: "@types/yup" "0.26.24" - lightercollective "^0.3.0" object-hash "^2.0.0" yup "^0.27.0" @@ -5491,11 +5490,6 @@ libphonenumber-js@^1.6.4: minimist "^1.2.0" xml2js "^0.4.17" -lightercollective@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/lightercollective/-/lightercollective-0.3.0.tgz#1f07638642ec645d70bdb69ab2777676f35a28f0" - integrity sha512-RFOLSUVvwdK3xA0P8o6G7QGXLIyy1L2qv5caEI7zXN5ciaEjbAriRF182kbsoJ1S1TgvpyGcN485fMky6qxOPw== - linkifyjs@~2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.8.tgz#2bee2272674dc196cce3740b8436c43df2162f9c"