From 50feeed8bf10c96a38ded800395908b20e577b54 Mon Sep 17 00:00:00 2001 From: Vasily Belolapotkov Date: Tue, 24 Sep 2019 12:47:42 +0300 Subject: [PATCH 01/65] fix the bug with scrolling post comments into view --- webapp/components/CommentList/CommentList.vue | 27 +++++++++++++++++++ webapp/pages/post/_id.vue | 11 -------- webapp/pages/post/_id/_slug/index.vue | 2 +- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/webapp/components/CommentList/CommentList.vue b/webapp/components/CommentList/CommentList.vue index 17da8dda4..b5eb070c8 100644 --- a/webapp/components/CommentList/CommentList.vue +++ b/webapp/components/CommentList/CommentList.vue @@ -47,6 +47,33 @@ export default { return comment.id === updatedComment.id ? updatedComment : comment }) }, + scrollCommentsIntoView() { + if (!window || !document) { + return + } + const container = document.getElementById('comments') + if (container) { + const top = container.offsetTop + window.scroll({ + top, + left: 0, + behavior: 'smooth', + }) + } + }, + }, + watch: { + $route(to, from) { + // scroll inside the same page + if (to.hash === '#comments') { + this.scrollCommentsIntoView() + } + }, + }, + mounted() { + if (this.$route.hash === '#comments') { + setTimeout(this.scrollCommentsIntoView, 250) + } }, } diff --git a/webapp/pages/post/_id.vue b/webapp/pages/post/_id.vue index 3f8d93868..a02afd3b9 100644 --- a/webapp/pages/post/_id.vue +++ b/webapp/pages/post/_id.vue @@ -77,17 +77,6 @@ export default { ] }, }, - watch: { - $route(to, from) { - if (to.hash === '#comments') { - window.scroll({ - top: document.getElementById('comments').offsetTop, - left: 0, - behavior: 'smooth', - }) - } - }, - }, } diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue index dd84ee3d7..147a04663 100644 --- a/webapp/pages/post/_id/_slug/index.vue +++ b/webapp/pages/post/_id/_slug/index.vue @@ -193,7 +193,7 @@ export default { .ds-card-image { img { - max-height: 300px; + height: 300px; object-fit: cover; object-position: center; } From e1751347fc59a5a1974389179e7e047ce89203bf Mon Sep 17 00:00:00 2001 From: Vasily Belolapotkov Date: Wed, 25 Sep 2019 10:32:35 +0300 Subject: [PATCH 02/65] fix failing client tests --- webapp/components/CommentList/CommentList.spec.js | 3 +++ webapp/components/FollowButton.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/webapp/components/CommentList/CommentList.spec.js b/webapp/components/CommentList/CommentList.spec.js index 460f1a4ea..3e77d84fb 100644 --- a/webapp/components/CommentList/CommentList.spec.js +++ b/webapp/components/CommentList/CommentList.spec.js @@ -50,6 +50,9 @@ describe('CommentList.vue', () => { }, }, }, + $route: { + hash: '', + }, } stubs = { EditorContent: "
", diff --git a/webapp/components/FollowButton.vue b/webapp/components/FollowButton.vue index e1cad8c8e..22046e047 100644 --- a/webapp/components/FollowButton.vue +++ b/webapp/components/FollowButton.vue @@ -75,7 +75,7 @@ export default { const followedUser = follow ? data.followUser : data.unfollowUser this.$emit('update', followedUser) - } catch { + } catch (err) { optimisticResult.followedByCurrentUser = !follow this.$emit('optimistic', optimisticResult) } From 73cc068469f0f2b61338b6b6d9547b80e633b6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 19 Sep 2019 09:55:31 +0200 Subject: [PATCH 03/65] Fix lost translation --- .../Notification/Notification.spec.js | 14 +++++++------- .../notifications/Notification/Notification.vue | 6 ++++-- webapp/locales/de.json | 5 +++-- webapp/locales/en.json | 5 +++-- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/webapp/components/notifications/Notification/Notification.spec.js b/webapp/components/notifications/Notification/Notification.spec.js index 9ca47e7a0..54e6b4ab3 100644 --- a/webapp/components/notifications/Notification/Notification.spec.js +++ b/webapp/components/notifications/Notification/Notification.spec.js @@ -69,16 +69,16 @@ describe('Notification', () => { it('renders reason', () => { wrapper = Wrapper() expect(wrapper.find('.reason-text-for-test').text()).toEqual( - 'notifications.menu.commented_on_post', + 'notifications.reason.commented_on_post', ) }) it('renders title', () => { wrapper = Wrapper() expect(wrapper.text()).toContain("It's a post title") }) - it('renders the "Comment:"', () => { + it('renders the identifier "notifications.comment"', () => { wrapper = Wrapper() - expect(wrapper.text()).toContain('Comment:') + expect(wrapper.text()).toContain('notifications.comment') }) it('renders the contentExcerpt', () => { wrapper = Wrapper() @@ -119,7 +119,7 @@ describe('Notification', () => { it('renders reason', () => { wrapper = Wrapper() expect(wrapper.find('.reason-text-for-test').text()).toEqual( - 'notifications.menu.mentioned_in_post', + 'notifications.reason.mentioned_in_post', ) }) it('renders title', () => { @@ -169,7 +169,7 @@ describe('Notification', () => { it('renders reason', () => { wrapper = Wrapper() expect(wrapper.find('.reason-text-for-test').text()).toEqual( - 'notifications.menu.mentioned_in_comment', + 'notifications.reason.mentioned_in_comment', ) }) it('renders title', () => { @@ -177,9 +177,9 @@ describe('Notification', () => { expect(wrapper.text()).toContain("It's a post title") }) - it('renders the "Comment:"', () => { + it('renders the identifier "notifications.comment"', () => { wrapper = Wrapper() - expect(wrapper.text()).toContain('Comment:') + expect(wrapper.text()).toContain('notifications.comment') }) it('renders the contentExcerpt', () => { diff --git a/webapp/components/notifications/Notification/Notification.vue b/webapp/components/notifications/Notification/Notification.vue index 93ca42980..dc9383c85 100644 --- a/webapp/components/notifications/Notification/Notification.vue +++ b/webapp/components/notifications/Notification/Notification.vue @@ -5,7 +5,7 @@ - {{ $t(`notifications.menu.${notification.reason}`) }} + {{ $t(`notifications.reason.${notification.reason}`) }} @@ -23,7 +23,9 @@ >
- Comment: + + {{ $t(`notifications.comment`) }}: + {{ from.contentExcerpt | removeHtml }}
diff --git a/webapp/locales/de.json b/webapp/locales/de.json index fa9d66860..7b7bc3ec1 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -135,11 +135,12 @@ } }, "notifications": { - "menu": { + "reason": { "mentioned_in_post": "Hat dich in einem Beitrag erwähnt …", "mentioned_in_comment": "Hat dich in einem Kommentar erwähnt …", "commented_on_post": "Hat deinen Beitrag kommentiert …" - } + }, + "comment": "Kommentar" }, "search": { "placeholder": "Suchen", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 592fc57e4..8204d4741 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -136,11 +136,12 @@ } }, "notifications": { - "menu": { + "reason": { "mentioned_in_post": "Mentioned you in a post …", "mentioned_in_comment": "Mentioned you in a comment …", "commented_on_post": "Commented on your post …" - } + }, + "comment": "Comment" }, "search": { "placeholder": "Search", From f968c12ccfa2c9c0b530e92fb62289da5b3d9f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 19 Sep 2019 15:33:35 +0200 Subject: [PATCH 04/65] Implement updating by time and add new ones to the list --- .../NotificationMenu/NotificationMenu.vue | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue index 51b90089f..af52d8395 100644 --- a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue +++ b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue @@ -35,7 +35,39 @@ export default { props: { placement: { type: String }, }, + created() { + setInterval(this.updateNotifications, 10000) + }, + destroyed() { + clearInterval(this.updateNotifications) + }, methods: { + async updateNotifications() { + try { + const { + data: { notifications }, + } = await this.$apollo.mutate({ + mutation: notificationQuery(this.$i18n), + }) + // add all the new notifications to the notifications + if (notifications) { + notifications.forEach(updatedElement => { + const sameNotification = this.notifications.find(function(oldElement) { + return ( + oldElement.from.id === updatedElement.from.id && + oldElement.createdAt === updatedElement.createdAt && + oldElement.reason === updatedElement.reason + ) + }) + if (sameNotification === undefined) { + this.notifications.unshift(updatedElement) + } + }) + } + } catch (err) { + throw new Error(err) + } + }, async markAsRead(notificationSourceId) { const variables = { id: notificationSourceId } try { From ca8bb9e43448d8a4ea6b66a43c080787c72c052b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Fri, 20 Sep 2019 09:19:35 +0200 Subject: [PATCH 05/65] Added timing as constant --- .../notifications/NotificationMenu/NotificationMenu.vue | 3 ++- webapp/constants/notifications.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 webapp/constants/notifications.js diff --git a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue index af52d8395..1bff000ed 100644 --- a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue +++ b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue @@ -18,6 +18,7 @@ diff --git a/webapp/mixins/scrollToAnchor.js b/webapp/mixins/scrollToAnchor.js new file mode 100644 index 000000000..e68658f07 --- /dev/null +++ b/webapp/mixins/scrollToAnchor.js @@ -0,0 +1,32 @@ +export function scrollToAnchor(anchor) { + if (!anchor) return + if (!window || !document) { + return + } + const container = document.querySelector(anchor) + if (container) { + const { top } = container.getBoundingClientRect() + setTimeout(() => { + // we have to set a small timeout to ensure this part comes after nuxt + // scrollBehaviour: https://nuxtjs.org/api/configuration-router/#scrollbehavior + window.scroll({ + top, + left: 0, + behavior: 'smooth', + }) + }, 250) + } +} + +export default { + watch: { + $route(to, from) { + const anchor = to && to.hash + scrollToAnchor(anchor) + }, + }, + mounted() { + const anchor = this.$route && this.$route.hash + scrollToAnchor(anchor) + }, +} From 2ad375497db88102c4dc5f14601bde40f8e9173f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2019 15:45:04 +0000 Subject: [PATCH 32/65] Bump @babel/node from 7.6.1 to 7.6.2 in /backend Bumps [@babel/node](https://github.com/babel/babel) from 7.6.1 to 7.6.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.6.1...v7.6.2) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/backend/package.json b/backend/package.json index cd51dee0b..4bf44442f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -108,7 +108,7 @@ "devDependencies": { "@babel/cli": "~7.6.2", "@babel/core": "~7.6.2", - "@babel/node": "~7.6.1", + "@babel/node": "~7.6.2", "@babel/plugin-proposal-throw-expressions": "^7.2.0", "@babel/preset-env": "~7.6.0", "@babel/register": "~7.6.2", diff --git a/backend/yarn.lock b/backend/yarn.lock index 557988bfb..f43b0fafc 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -241,16 +241,17 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/node@~7.6.1": - version "7.6.1" - resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.6.1.tgz#84f8f4f1d86647d99537a681f32e65e70bb59f19" - integrity sha512-q2sJw+7aES/5wwjccECJfOuIgM1XIbZcn7b63JZM6VpaZwvOq913jL+tXRIn41Eg/Hr+BeIGWnvnjLTuT579pA== +"@babel/node@~7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.6.2.tgz#a94479f95ee2008342f4847346c8bb8ff2770f44" + integrity sha512-59UxvVtRpVpL5i0KTcw41FqLNPT/Jc9k/48Rq00wfN49lAIQeRKGwZ6xX1FWlCfcIGP+5l4rfZajORvmYkhfGg== dependencies: - "@babel/polyfill" "^7.6.0" - "@babel/register" "^7.6.0" + "@babel/register" "^7.6.2" commander "^2.8.1" + core-js "^3.2.1" lodash "^4.17.13" node-environment-flags "^1.0.5" + regenerator-runtime "^0.13.3" v8flags "^3.1.1" "@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.2": @@ -604,7 +605,7 @@ "@babel/helper-regex" "^7.4.4" regexpu-core "^4.5.4" -"@babel/polyfill@^7.2.3", "@babel/polyfill@^7.6.0": +"@babel/polyfill@^7.2.3": version "7.6.0" resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.6.0.tgz#6d89203f8b6cd323e8d946e47774ea35dc0619cc" integrity sha512-q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw== @@ -668,7 +669,7 @@ js-levenshtein "^1.1.3" semver "^5.5.0" -"@babel/register@^7.6.0", "@babel/register@~7.6.2": +"@babel/register@^7.6.2", "@babel/register@~7.6.2": version "7.6.2" resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.6.2.tgz#25765a922202cb06f8bdac5a3b1e70cd6bf3dd45" integrity sha512-xgZk2LRZvt6i2SAUWxc7ellk4+OYRgS3Zpsnr13nMS1Qo25w21Uu8o6vTOAqNaxiqrnv30KTYzh9YWY2k21CeQ== @@ -2682,7 +2683,7 @@ core-js@^2.4.0, core-js@^2.6.5: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== -core-js@^3.0.1: +core-js@^3.0.1, core-js@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09" integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw== @@ -7275,7 +7276,7 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.2: +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== From d33fb8f74589e9dc56f399d3d69f49004f4332d7 Mon Sep 17 00:00:00 2001 From: Vasily Belolapotkov Date: Sun, 29 Sep 2019 21:13:34 +0300 Subject: [PATCH 33/65] fix email transport config --- backend/src/middleware/email/emailMiddleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/middleware/email/emailMiddleware.js b/backend/src/middleware/email/emailMiddleware.js index e5b0678b8..bea1bf9b3 100644 --- a/backend/src/middleware/email/emailMiddleware.js +++ b/backend/src/middleware/email/emailMiddleware.js @@ -21,7 +21,7 @@ if (!hasEmailConfig) { const transporter = nodemailer.createTransport({ host: CONFIG.SMTP_HOST, port: CONFIG.SMTP_PORT, - ignoreTLS: CONFIG.SMTP_IGNORE_TLS, + ignoreTLS: CONFIG.SMTP_IGNORE_TLS === 'true', secure: false, // true for 465, false for other ports auth: hasAuthData && { user: CONFIG.SMTP_USERNAME, From d635b64eecbf622c4292344879a369860f21fcb7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:27:07 +0000 Subject: [PATCH 34/65] Bump nodemon from 1.19.2 to 1.19.3 in /backend Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.2 to 1.19.3. - [Release notes](https://github.com/remy/nodemon/releases) - [Commits](https://github.com/remy/nodemon/compare/v1.19.2...v1.19.3) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index cd51dee0b..ed5096a68 100644 --- a/backend/package.json +++ b/backend/package.json @@ -129,7 +129,7 @@ "eslint-plugin-standard": "~4.0.1", "graphql-request": "~1.8.2", "jest": "~24.9.0", - "nodemon": "~1.19.2", + "nodemon": "~1.19.3", "prettier": "~1.18.2", "supertest": "~4.0.2" } diff --git a/backend/yarn.lock b/backend/yarn.lock index 557988bfb..246393cd8 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -6354,10 +6354,10 @@ nodemailer@^6.3.0: resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.3.0.tgz#a89b0c62d3937bdcdeecbf55687bd7911b627e12" integrity sha512-TEHBNBPHv7Ie/0o3HXnb7xrPSSQmH1dXwQKRaMKDBGt/ZN54lvDVujP6hKkO/vjkIYL9rK8kHSG11+G42Nhxuw== -nodemon@~1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.2.tgz#b0975147dc99b3761ceb595b3f9277084931dcc0" - integrity sha512-hRLYaw5Ihyw9zK7NF+9EUzVyS6Cvgc14yh8CAYr38tPxJa6UrOxwAQ351GwrgoanHCF0FalQFn6w5eoX/LGdJw== +nodemon@~1.19.3: + version "1.19.3" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.3.tgz#db71b3e62aef2a8e1283a9fa00164237356102c0" + integrity sha512-TBNKRmJykEbxpTniZBusqRrUTHIEqa2fpecbTQDQj1Gxjth7kKAPP296ztR0o5gPUWsiYbuEbt73/+XMYab1+w== dependencies: chokidar "^2.1.5" debug "^3.1.0" From 6a50ebf4e3c48f4fb64ed24521b5d5031e5f19a5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:27:47 +0000 Subject: [PATCH 35/65] Bump metascraper-title from 5.7.5 to 5.7.6 in /backend Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.6. - [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.5...v5.7.6) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/package.json b/backend/package.json index cd51dee0b..ea4abee6d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -84,7 +84,7 @@ "metascraper-logo": "^5.7.5", "metascraper-publisher": "^5.7.4", "metascraper-soundcloud": "^5.7.4", - "metascraper-title": "^5.7.5", + "metascraper-title": "^5.7.6", "metascraper-url": "^5.7.5", "metascraper-video": "^5.7.5", "metascraper-youtube": "^5.7.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index 557988bfb..80036689a 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -970,10 +970,10 @@ url-regex "~4.1.1" video-extensions "~1.1.0" -"@metascraper/helpers@^5.7.4", "@metascraper/helpers@^5.7.5": - version "5.7.5" - resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.5.tgz#fb4ca0e2825f836f1398dcc85227443a36eeb84c" - integrity sha512-ayeJIJqlqeiJHYPYi7fmhjvOg7FHTjfqd57nZCLo0fkqj2exsCa788G5Ihk5qHsk1ASVOgH+flp1XeyMl1vcXQ== +"@metascraper/helpers@^5.7.4", "@metascraper/helpers@^5.7.5", "@metascraper/helpers@^5.7.6": + version "5.7.6" + resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.6.tgz#84007215d3b31525995fd85cf0d28bf6a12bf7bb" + integrity sha512-AD2VTQmMWl/KCUXl9h0fP84VacoiTI/8y8CBgErmYZnm+sliKGedQrDZO3JmzNg73Z5z08GQTjME1WHIDiIQDw== dependencies: audio-extensions "0.0.0" chrono-node "~1.3.11" @@ -989,7 +989,7 @@ lodash "~4.17.15" mem "~5.1.1" mime-types "~2.1.24" - normalize-url "~4.4.1" + normalize-url "~4.5.0" smartquotes "~2.3.1" title "~3.4.1" truncate "~2.1.0" @@ -5963,12 +5963,12 @@ metascraper-soundcloud@^5.7.4: memoize-one "~5.1.1" tldts "~5.4.0" -metascraper-title@^5.7.5: - version "5.7.5" - resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.7.5.tgz#64ea7e9175a6cb2166f3cb13cbc8540c28496d47" - integrity sha512-NEa61pZj3SUMEqKdfqpBZoffNdHyEMCLU626HkP9aeRFQ8e1ejmghRuYf/m4+QmsLSUMs9vlJC+HSoIHBaL9pw== +metascraper-title@^5.7.6: + version "5.7.6" + resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.7.6.tgz#346c637e735a040f299af5f67715eb8ed0016850" + integrity sha512-DF6TeMODzzLgJMLyUtN6wLPrz9/3JcRKyUIfWpuuw+WFC3Kx6ON8nWldTRh1yUu9xbSAOleae//f/dn+JhYlCw== dependencies: - "@metascraper/helpers" "^5.7.5" + "@metascraper/helpers" "^5.7.6" lodash "~4.17.15" metascraper-url@^5.7.5: @@ -6417,10 +6417,10 @@ normalize-url@~4.2.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.2.0.tgz#e747f16b58e6d7f391495fd86415fa04ec7c9897" integrity sha512-n69+KXI+kZApR+sPwSkoAXpGlNkaiYyoHHqKOFPjJWvwZpew/EjKvuPE4+tStNgb42z5yLtdakgZCQI+LalSPg== -normalize-url@~4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.4.1.tgz#81e9c153b0ad5743755696f2aa20488d48e962b6" - integrity sha512-rjH3yRt0Ssx19mUwS0hrDUOdG9VI+oRLpLHJ7tXRdjcuQ7v7wo6qPvOZppHRrqfslTKr0L2yBhjj4UXd7c3cQg== +normalize-url@~4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" + integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== npm-bundled@^1.0.1: version "1.0.6" From d0eb37958ebdc6ec21a3936ba3e5dd24acb42ae5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:28:25 +0000 Subject: [PATCH 36/65] Bump metascraper-image from 5.7.5 to 5.7.6 in /backend Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.6. - [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.5...v5.7.6) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/package.json b/backend/package.json index cd51dee0b..4698c1dd1 100644 --- a/backend/package.json +++ b/backend/package.json @@ -78,7 +78,7 @@ "metascraper-clearbit-logo": "^5.3.0", "metascraper-date": "^5.7.4", "metascraper-description": "^5.7.5", - "metascraper-image": "^5.7.5", + "metascraper-image": "^5.7.6", "metascraper-lang": "^5.7.4", "metascraper-lang-detector": "^4.8.5", "metascraper-logo": "^5.7.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index 557988bfb..6713049a4 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -970,10 +970,10 @@ url-regex "~4.1.1" video-extensions "~1.1.0" -"@metascraper/helpers@^5.7.4", "@metascraper/helpers@^5.7.5": - version "5.7.5" - resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.5.tgz#fb4ca0e2825f836f1398dcc85227443a36eeb84c" - integrity sha512-ayeJIJqlqeiJHYPYi7fmhjvOg7FHTjfqd57nZCLo0fkqj2exsCa788G5Ihk5qHsk1ASVOgH+flp1XeyMl1vcXQ== +"@metascraper/helpers@^5.7.4", "@metascraper/helpers@^5.7.5", "@metascraper/helpers@^5.7.6": + version "5.7.6" + resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.6.tgz#84007215d3b31525995fd85cf0d28bf6a12bf7bb" + integrity sha512-AD2VTQmMWl/KCUXl9h0fP84VacoiTI/8y8CBgErmYZnm+sliKGedQrDZO3JmzNg73Z5z08GQTjME1WHIDiIQDw== dependencies: audio-extensions "0.0.0" chrono-node "~1.3.11" @@ -989,7 +989,7 @@ lodash "~4.17.15" mem "~5.1.1" mime-types "~2.1.24" - normalize-url "~4.4.1" + normalize-url "~4.5.0" smartquotes "~2.3.1" title "~3.4.1" truncate "~2.1.0" @@ -5917,12 +5917,12 @@ metascraper-description@^5.7.5: dependencies: "@metascraper/helpers" "^5.7.5" -metascraper-image@^5.7.5: - version "5.7.5" - resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.7.5.tgz#fef461b706885f6a6be4141e8270318dbc66936d" - integrity sha512-n6SLTCKNugEJuZWHxEISsLOmQKlxs1Rzl+EsZzYeLKYu5fnCI7XegepOC85erofPl3OaivrKyWk3WKUN+qQ3JA== +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== dependencies: - "@metascraper/helpers" "^5.7.5" + "@metascraper/helpers" "^5.7.6" metascraper-lang-detector@^4.8.5: version "4.10.2" @@ -6417,10 +6417,10 @@ normalize-url@~4.2.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.2.0.tgz#e747f16b58e6d7f391495fd86415fa04ec7c9897" integrity sha512-n69+KXI+kZApR+sPwSkoAXpGlNkaiYyoHHqKOFPjJWvwZpew/EjKvuPE4+tStNgb42z5yLtdakgZCQI+LalSPg== -normalize-url@~4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.4.1.tgz#81e9c153b0ad5743755696f2aa20488d48e962b6" - integrity sha512-rjH3yRt0Ssx19mUwS0hrDUOdG9VI+oRLpLHJ7tXRdjcuQ7v7wo6qPvOZppHRrqfslTKr0L2yBhjj4UXd7c3cQg== +normalize-url@~4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" + integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== npm-bundled@^1.0.1: version "1.0.6" From 979534b68aea74956f449f31743534665874d46f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:29:20 +0000 Subject: [PATCH 37/65] Bump apollo-server from 2.9.3 to 2.9.4 in /backend Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.3 to 2.9.4. - [Release notes](https://github.com/apollographql/apollo-server/releases) - [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.3...apollo-server@2.9.4) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/package.json b/backend/package.json index cd51dee0b..9ecf4ca68 100644 --- a/backend/package.json +++ b/backend/package.json @@ -48,7 +48,7 @@ "apollo-client": "~2.6.4", "apollo-link-context": "~1.0.19", "apollo-link-http": "~1.5.16", - "apollo-server": "~2.9.3", + "apollo-server": "~2.9.4", "apollo-server-express": "^2.9.4", "babel-plugin-transform-runtime": "^6.23.0", "bcryptjs": "~2.4.3", diff --git a/backend/yarn.lock b/backend/yarn.lock index 557988bfb..7529725e5 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1694,7 +1694,7 @@ apollo-server-caching@^0.5.0: dependencies: lru-cache "^5.0.0" -apollo-server-core@^2.9.3, apollo-server-core@^2.9.4: +apollo-server-core@^2.9.4: version "2.9.4" resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.4.tgz#0404455884951804d23ea64e45514c73afd34e5e" integrity sha512-6mzipnn9woJxgo/JQFWTlY13svS7HCr0ZsN035eRmKOsXzROfB9ugXcTuc6MP94ICM7TlB/DtJOP+bLX53mijw== @@ -1734,7 +1734,7 @@ apollo-server-errors@^2.3.3: resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz#83763b00352c10dc68fbb0d41744ade66de549ff" integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g== -apollo-server-express@^2.9.3, apollo-server-express@^2.9.4: +apollo-server-express@^2.9.4: version "2.9.4" resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.4.tgz#ae7ca0b70a644ba9fa5e3ac395d1e2d9a4b23522" integrity sha512-diX9n81E0tIJ0Sy2bHvDGPM9QsFBsZ76Nx/dszinY00ViyWG0yIAYEYWeRbsoKTeNDWWTvlMrh/3Eu2oaCIEhQ== @@ -1779,13 +1779,13 @@ apollo-server-types@^0.2.4: apollo-server-caching "^0.5.0" apollo-server-env "^2.4.3" -apollo-server@~2.9.3: - version "2.9.3" - resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.3.tgz#2a79fcee25da0b0673eb70d73839c40c3c4b8cca" - integrity sha512-JQoeseSo3yOBu3WJzju0NTreoqYckNILybgXNUOhdurE55VFpZ8dsBEO6nMfdO2y1A70W14mnnVWCBEm+1rE8w== +apollo-server@~2.9.4: + version "2.9.4" + resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.4.tgz#564a0d0ec6dbefc86dbabe15bd23a83e48f58314" + integrity sha512-huAgQizkmzUkREixsSJHNM4ZnJ08plkwK70dm36mX9j+yYbc0h9J5b5o4E2Fb9U5PMR8kEVto1dz2rOJ0XPApA== dependencies: - apollo-server-core "^2.9.3" - apollo-server-express "^2.9.3" + apollo-server-core "^2.9.4" + apollo-server-express "^2.9.4" express "^4.0.0" graphql-subscriptions "^1.0.0" graphql-tools "^4.0.0" From 644d9e6858266403881c6d8ddb9f8a8428bbc8a6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:29:42 +0000 Subject: [PATCH 38/65] Bump metascraper-video from 5.7.5 to 5.7.6 in /backend Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.6. - [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.5...v5.7.6) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/package.json b/backend/package.json index cd51dee0b..fcd33326b 100644 --- a/backend/package.json +++ b/backend/package.json @@ -86,7 +86,7 @@ "metascraper-soundcloud": "^5.7.4", "metascraper-title": "^5.7.5", "metascraper-url": "^5.7.5", - "metascraper-video": "^5.7.5", + "metascraper-video": "^5.7.6", "metascraper-youtube": "^5.7.5", "minimatch": "^3.0.4", "mustache": "^3.1.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 557988bfb..ea67e1b07 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -970,10 +970,10 @@ url-regex "~4.1.1" video-extensions "~1.1.0" -"@metascraper/helpers@^5.7.4", "@metascraper/helpers@^5.7.5": - version "5.7.5" - resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.5.tgz#fb4ca0e2825f836f1398dcc85227443a36eeb84c" - integrity sha512-ayeJIJqlqeiJHYPYi7fmhjvOg7FHTjfqd57nZCLo0fkqj2exsCa788G5Ihk5qHsk1ASVOgH+flp1XeyMl1vcXQ== +"@metascraper/helpers@^5.7.4", "@metascraper/helpers@^5.7.5", "@metascraper/helpers@^5.7.6": + version "5.7.6" + resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.7.6.tgz#84007215d3b31525995fd85cf0d28bf6a12bf7bb" + integrity sha512-AD2VTQmMWl/KCUXl9h0fP84VacoiTI/8y8CBgErmYZnm+sliKGedQrDZO3JmzNg73Z5z08GQTjME1WHIDiIQDw== dependencies: audio-extensions "0.0.0" chrono-node "~1.3.11" @@ -989,7 +989,7 @@ lodash "~4.17.15" mem "~5.1.1" mime-types "~2.1.24" - normalize-url "~4.4.1" + normalize-url "~4.5.0" smartquotes "~2.3.1" title "~3.4.1" truncate "~2.1.0" @@ -5978,12 +5978,12 @@ metascraper-url@^5.7.5: dependencies: "@metascraper/helpers" "^5.7.5" -metascraper-video@^5.7.5: - version "5.7.5" - resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.7.5.tgz#15dd760fe26acb21cac7ced60f1ad508b0f130d1" - integrity sha512-LZFSttRIvUz9yEM17Z8CN0XI925CFTrV6pHMMSglD3bQH4qtrne1d+xXDUz6riPhBuR80BA5Xb9OrpRPSNCK2w== +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== dependencies: - "@metascraper/helpers" "^5.7.5" + "@metascraper/helpers" "^5.7.6" lodash "~4.17.15" metascraper-youtube@^5.7.5: @@ -6417,10 +6417,10 @@ normalize-url@~4.2.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.2.0.tgz#e747f16b58e6d7f391495fd86415fa04ec7c9897" integrity sha512-n69+KXI+kZApR+sPwSkoAXpGlNkaiYyoHHqKOFPjJWvwZpew/EjKvuPE4+tStNgb42z5yLtdakgZCQI+LalSPg== -normalize-url@~4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.4.1.tgz#81e9c153b0ad5743755696f2aa20488d48e962b6" - integrity sha512-rjH3yRt0Ssx19mUwS0hrDUOdG9VI+oRLpLHJ7tXRdjcuQ7v7wo6qPvOZppHRrqfslTKr0L2yBhjj4UXd7c3cQg== +normalize-url@~4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" + integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== npm-bundled@^1.0.1: version "1.0.6" From dbdd03082a610dc9f2ff0ab6ce0df1bb85596130 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:30:39 +0000 Subject: [PATCH 39/65] Bump graphql-middleware-sentry from 3.2.0 to 3.2.1 in /backend Bumps [graphql-middleware-sentry](https://github.com/BrunoScheufler/graphql-middleware-sentry) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/BrunoScheufler/graphql-middleware-sentry/releases) - [Commits](https://github.com/BrunoScheufler/graphql-middleware-sentry/compare/v3.2.0...v3.2.1) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index cd51dee0b..55e8f84d0 100644 --- a/backend/package.json +++ b/backend/package.json @@ -64,7 +64,7 @@ "graphql-custom-directives": "~0.2.14", "graphql-iso-date": "~3.6.1", "graphql-middleware": "~3.0.5", - "graphql-middleware-sentry": "^3.2.0", + "graphql-middleware-sentry": "^3.2.1", "graphql-shield": "~6.1.0", "graphql-tag": "~2.10.1", "helmet": "~3.21.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index 557988bfb..9483153af 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -4127,10 +4127,10 @@ graphql-iso-date@~3.6.1: resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.6.1.tgz#bd2d0dc886e0f954cbbbc496bbf1d480b57ffa96" integrity sha512-AwFGIuYMJQXOEAgRlJlFL4H1ncFM8n8XmoVDTNypNOZyQ8LFDG2ppMFlsS862BSTCDcSUfHp8PD3/uJhv7t59Q== -graphql-middleware-sentry@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/graphql-middleware-sentry/-/graphql-middleware-sentry-3.2.0.tgz#a72872ae4b9fbe286980023a3c531286b8258df7" - integrity sha512-tIrxJIL+MRh2pxoot+EYJIrFfPgB3OF4nqmmh1gi54q/V1rgv7w46Ahn2jgl2nTu4bKw6mtGVF4CKikWCMPa5Q== +graphql-middleware-sentry@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/graphql-middleware-sentry/-/graphql-middleware-sentry-3.2.1.tgz#b5653d78903d655cf4212a602cfa6e26689cda07" + integrity sha512-lAwmHwsyey1db6scQg32javmqAFifabhqPIr0SUzx46O4kvjQlLZZn7KrRT12XDwgW7i6goAotdSPl9Fq+TBrQ== graphql-middleware@~3.0.5: version "3.0.5" From de3b8bddf3c4631284d3fbe3356d0ae18a205ac5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:31:11 +0000 Subject: [PATCH 40/65] Bump date-fns from 2.3.0 to 2.4.1 in /backend Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.3.0 to 2.4.1. - [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.3.0...v2.4.1) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index cd51dee0b..5a486d9be 100644 --- a/backend/package.json +++ b/backend/package.json @@ -55,7 +55,7 @@ "cheerio": "~1.0.0-rc.3", "cors": "~2.8.5", "cross-env": "~6.0.0", - "date-fns": "2.3.0", + "date-fns": "2.4.1", "debug": "~4.1.1", "dotenv": "~8.1.0", "express": "^4.17.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index 557988bfb..9e7129194 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2867,10 +2867,10 @@ data-urls@^1.0.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -date-fns@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.3.0.tgz#017eae725d0c46173b572da025fb5e4e534270fd" - integrity sha512-A8o+iXBVqQayl9Z39BHgb7m/zLOfhF7LK82t+n9Fq1adds1vaUn8ByVoADqWLe4OTc6BZYc/FdbdTwufNYqkJw== +date-fns@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.4.1.tgz#b53f9bb65ae6bd9239437035710e01cf383b625e" + integrity sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw== 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 ba22b7cca688f783612ca431e920b5e0a9cac48a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:31:25 +0000 Subject: [PATCH 41/65] Bump tiptap-extensions from 1.27.0 to 1.28.0 in /webapp Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.27.0 to 1.28.0. - [Release notes](https://github.com/scrumpy/tiptap/releases) - [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.27.0...tiptap-extensions@1.28.0) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 103 +++++++++++++++++++++++++++++--------------- 2 files changed, 70 insertions(+), 35 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 841b32c53..ad63a71a1 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -77,7 +77,7 @@ "string-hash": "^1.1.3", "tippy.js": "^4.3.5", "tiptap": "~1.25.0", - "tiptap-extensions": "~1.27.0", + "tiptap-extensions": "~1.28.0", "trunc-html": "^1.1.2", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 49375e89c..4401bc31d 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -12342,6 +12342,15 @@ prosemirror-dropcursor@^1.1.1: prosemirror-transform "^1.1.0" prosemirror-view "^1.1.0" +prosemirror-dropcursor@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.1.2.tgz#d54428e0fdbc0fb3d4c5809acd1ad031e6cb6855" + integrity sha512-QHZbYPr8AY0g88TC/Wp7jpYbUoSpTSO8sqHNGvvZOInsAyylIdOpsrfhY1NC+/lh+iuwka0YogGtq2mmE7cr4g== + dependencies: + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + prosemirror-view "^1.1.0" + prosemirror-gapcursor@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz#4ba663fb8511616e18ad222c904403cfbf6866dc" @@ -12377,10 +12386,10 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.0.1: prosemirror-state "^1.0.0" w3c-keyname "^1.1.8" -prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.1.tgz#f140a6e366e1e283aa7a94dbb8c2c7d13139689e" - integrity sha512-hYrZPbJvdo2QWERmkCuS80BEf5Rcf3+S28ETr4xu8XKPYjmU6aeQn23G1Fu/2rwqUmk5ZyWYo2nyEsN+Cdv2Qg== +prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.1, prosemirror-model@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.2.tgz#829abd7fb496783ba088936d2d7aff228206829a" + integrity sha512-mopozod/qNTB6utEyY8q4w1nCLDakpr39d8smzHno/wuAivCzBU8HkC9YOx1MBdTcTU6sXiIEh08hQfkC3damw== dependencies: orderedmap "^1.0.0" @@ -12400,10 +12409,10 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.2.4: prosemirror-model "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-tables@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.9.1.tgz#1669100ee9f64b0c269824dcd1c0584c66075acb" - integrity sha512-n5h2OvlnQGsW1ToT1WOIlemV/3PDw4miUQoHEpawOk2oDhi46czKdzEg/rq3z0f/aZ3CwoyxviuqAZChBILC4A== +prosemirror-tables@^0.9.1, prosemirror-tables@^0.9.5: + version "0.9.5" + resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.9.5.tgz#94d9881a46051e6fff3c51edffafa346da084def" + integrity sha512-RlAF/D7OvnDCOL8B6Qt6KuBkb0w3SedTdrou7wH7Nn2ml7+M5xUalW/h1f7dMD3wjsU47/Cn8zTbEkCDIpIggw== dependencies: prosemirror-keymap "^1.0.0" prosemirror-model "^1.0.0" @@ -12411,10 +12420,10 @@ prosemirror-tables@^0.9.1: prosemirror-transform "^1.0.0" prosemirror-view "^1.0.0" -prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.3.tgz#28cfdf1f9ee514edc40466be7b7db39eed545fdf" - integrity sha512-1O6Di5lOL1mp4nuCnQNkHY7l2roIW5y8RH4ZG3hMYmkmDEWzTaFFnxxAAHsE5ipGLBSRcTlP7SsDhYBIdSuLpQ== +prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.4.tgz#30b35f02dd7761dd8139e5eb7612831fd031036a" + integrity sha512-1Y3XuaFJtwusYDvojcCxi3VZvNIntPVoh/dpeVaIM5Vf1V+M6xiIWcDgktUWWRovMxEhdibnpt5eyFmYJJhHtQ== dependencies: prosemirror-model "^1.0.0" @@ -12423,10 +12432,10 @@ prosemirror-utils@^0.9.6: resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz#3d97bd85897e3b535555867dc95a51399116a973" integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA== -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.10.0.tgz#7de5de75f0c90f8b9f09d09ed4467554d59adddb" - integrity sha512-STHw0xHfk+XPMqMLTKykRL1qEMtO+n1GWINBl94IPIq82AmWO1Ors4wVw93HKo/oIadWRrP/7faNJKh1UVLrTg== +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.10.0, prosemirror-view@^1.11.4: + version "1.11.4" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.11.4.tgz#f80aec8924d59d4c3456dcc5bfea733758ec9b40" + integrity sha512-J0g7xiCDx+p3CtpC69E7HvMmnW7yCILEhOXxSANZPX8iIwUrVTfdWKAzufi9F9MoM08ewsaF254xV90NpkGWVQ== dependencies: prosemirror-model "^1.1.0" prosemirror-state "^1.0.0" @@ -14515,36 +14524,36 @@ tippy.js@^4.3.5: dependencies: popper.js "^1.14.7" -tiptap-commands@^1.11.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.11.0.tgz#8c259e93d70447e93cedefcfa73a36301cd60a81" - integrity sha512-WDX3JfI6Z80CCxkDfKUn6ya2UT3r1AM/McbB63oXq6iUyY5wZmw+qu/9LkSe3aISRTy9tfUKzJLjB7w9UnQ9Ig== +tiptap-commands@^1.11.0, tiptap-commands@^1.12.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.12.0.tgz#603b1c710c6950950eb1a7fc5279008f36bc2962" + integrity sha512-LWAVHOxsFR4yUJuruEwJ2QMwe0e9S4kHQ4HVIPEIofhuXKW4vmjvvX9Lzgi4cHy5cXC/TBAU2D43BNy7vdH1Kg== dependencies: prosemirror-commands "^1.0.8" prosemirror-inputrules "^1.0.4" - prosemirror-model "^1.7.1" + prosemirror-model "^1.7.2" prosemirror-schema-list "^1.0.3" prosemirror-state "^1.2.4" - prosemirror-tables "^0.9.1" + prosemirror-tables "^0.9.5" prosemirror-utils "^0.9.6" - tiptap-utils "^1.7.0" + tiptap-utils "^1.8.0" -tiptap-extensions@~1.27.0: - version "1.27.0" - resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.27.0.tgz#547d2fbc8234818d195eef45a46e14aed7859a70" - integrity sha512-DVazwQuEkWGjE45nhznB9LbD233s/0KOmWHcN6V1Ixm+/97Gaw1fEPUTIz/tHPYg3WKhPFOxI965sSB8Ne7Dnw== +tiptap-extensions@~1.28.0: + version "1.28.0" + resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.28.0.tgz#4704945e7a4fe33a77de11847f7ca3058008895e" + integrity sha512-yGKXGUnOrLhnXpnhTrL4tDJv+CSgyqVu0//M80uiY097btYnf/K0t7i0StRCY3Xg5mX5YFL9Q01f9Ppyi2jgtQ== dependencies: lowlight "^1.12.1" prosemirror-collab "^1.1.2" prosemirror-history "^1.0.4" - prosemirror-model "^1.7.1" + prosemirror-model "^1.7.2" prosemirror-state "^1.2.4" - prosemirror-tables "^0.9.1" - prosemirror-transform "^1.1.3" + prosemirror-tables "^0.9.5" + prosemirror-transform "^1.1.4" prosemirror-utils "^0.9.6" - prosemirror-view "^1.10.0" - tiptap "^1.25.0" - tiptap-commands "^1.11.0" + prosemirror-view "^1.11.4" + tiptap "^1.26.0" + tiptap-commands "^1.12.0" tiptap-utils@^1.7.0: version "1.7.0" @@ -14556,7 +14565,33 @@ tiptap-utils@^1.7.0: prosemirror-tables "^0.9.1" prosemirror-utils "^0.9.6" -tiptap@^1.25.0, tiptap@~1.25.0: +tiptap-utils@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.8.0.tgz#cb03a263a1b1672bf4cccccb2078506fa91bd112" + integrity sha512-0k7zuhwrNpEAnoiH8kjAE9IUnqV8FNX1bv9W7we+jhQZPUuxODcpMX1oUkrN9i1seFVfPcxgQa+SmIy63kRKig== + dependencies: + prosemirror-model "^1.7.2" + prosemirror-state "^1.2.4" + prosemirror-tables "^0.9.5" + prosemirror-utils "^0.9.6" + +tiptap@^1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.26.0.tgz#edaa07b4b9b6836d433d0b8017d26d37cc0cc3c9" + integrity sha512-lKJnZ4jL3luu3C5Y5aZIEj2spAfNPSwc5HPB+n9HhpSaWAfGM9XTOLm6I0EIbkLHiCnYNjItlLP6p1g+KPdtSw== + dependencies: + prosemirror-commands "^1.0.8" + prosemirror-dropcursor "^1.1.2" + prosemirror-gapcursor "^1.0.4" + prosemirror-inputrules "^1.0.4" + prosemirror-keymap "^1.0.1" + prosemirror-model "^1.7.2" + prosemirror-state "^1.2.4" + prosemirror-view "^1.11.4" + tiptap-commands "^1.12.0" + tiptap-utils "^1.8.0" + +tiptap@~1.25.0: version "1.25.0" resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.25.0.tgz#4e518805ac99bb3d157b99f8b902231ad89f054a" integrity sha512-wPE96JjoHIMaWTPkZZqz0cayVe+QgR+1J7FR4h5MvJepPgrtwwQmgVVx7jAG7yXXZZdUhhrYlL2yMji4V7Vpjw== From e24d08f35bb90004635226ca6cce4d459039df03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 30 Sep 2019 10:06:51 +0200 Subject: [PATCH 42/65] Follow Roberts sorting suggestion --- .vscode/settings.json | 2 +- .../notifications/NotificationMenu/NotificationMenu.vue | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9acbf50bd..908252f41 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,6 +7,6 @@ "autoFix": true } ], - "editor.formatOnSave": false, + "editor.formatOnSave": true, "eslint.autoFixOnSave": true } \ No newline at end of file diff --git a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue index 5c24a82f3..1897688e1 100644 --- a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue +++ b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue @@ -133,11 +133,7 @@ export default { this.displayedNotifications = newNotifications .concat(this.displayedNotifications) .sort((a, b) => { - return a.createdAt === b.createdAt - ? 0 - : new Date(a.createdAt) < new Date(b.createdAt) - ? 1 - : -1 + return new Date(b.createdAt) - new Date(a.createdAt) }) this.updateOn = false From 9a4187a6af72502a6cf4809d738e7c5e45a86aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 30 Sep 2019 10:15:56 +0200 Subject: [PATCH 43/65] Remove update on hover and click by Roberts suggestion --- .../NotificationMenu/NotificationMenu.vue | 85 +++---------------- webapp/constants/notifications.js | 3 - 2 files changed, 14 insertions(+), 74 deletions(-) diff --git a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue index 1897688e1..d32eb6c33 100644 --- a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue +++ b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue @@ -1,37 +1,24 @@