From 87efc0ec566a5fc9bfe735b3a0e527bf344e9c55 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2019 08:26:00 +0000 Subject: [PATCH 01/14] Bump metascraper-publisher from 5.6.3 to 5.6.5 in /backend Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5. - [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.6.3...v5.6.5) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index 250e1706d..fbcf83f35 100644 --- a/backend/package.json +++ b/backend/package.json @@ -81,7 +81,7 @@ "metascraper-lang": "^5.6.3", "metascraper-lang-detector": "^4.8.5", "metascraper-logo": "^5.6.5", - "metascraper-publisher": "^5.6.3", + "metascraper-publisher": "^5.6.5", "metascraper-soundcloud": "^5.6.5", "metascraper-title": "^5.6.3", "metascraper-url": "^5.6.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index fe82ffcec..b541294ca 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5868,12 +5868,12 @@ metascraper-logo@^5.6.5: dependencies: "@metascraper/helpers" "^5.6.5" -metascraper-publisher@^5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.6.3.tgz#3729cd7dac117c94f92020ff3a8397a1b965a27e" - integrity sha512-1Z+bwrTn6j4Tf85DatYL0zDmqBfoJCfYa0nNlZ9HWfjM+QWDxBeIu1v/85N3AYGYPwk5G38IdvEYBb4MpMEQvQ== +metascraper-publisher@^5.6.5: + version "5.6.5" + resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.6.5.tgz#c23e93b766d3d0d64116422fa76a8da1145d2f98" + integrity sha512-XKaksI7gjPuuYNJyiowrE2DsrdhXeaoDEoK3/0vV3RfYBxXFgBtRUoFQiDiad+cUN/5lhMhYs0BKRiC+Q3XiZg== dependencies: - "@metascraper/helpers" "^5.6.3" + "@metascraper/helpers" "^5.6.5" metascraper-soundcloud@^5.6.5: version "5.6.5" From 6c3a9878c770abb3ceb3b81bc219dbbcef9cd76d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2019 08:26:00 +0000 Subject: [PATCH 02/14] Bump metascraper-date from 5.6.3 to 5.6.5 in /backend Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5. - [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.6.3...v5.6.5) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index 250e1706d..2ce3a2a2d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -75,7 +75,7 @@ "metascraper-audio": "^5.6.5", "metascraper-author": "^5.6.3", "metascraper-clearbit-logo": "^5.3.0", - "metascraper-date": "^5.6.3", + "metascraper-date": "^5.6.5", "metascraper-description": "^5.6.5", "metascraper-image": "^5.6.3", "metascraper-lang": "^5.6.3", diff --git a/backend/yarn.lock b/backend/yarn.lock index fe82ffcec..d32d94cd7 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5824,12 +5824,12 @@ metascraper-clearbit-logo@^5.3.0: dependencies: got "~9.6.0" -metascraper-date@^5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-5.6.3.tgz#516fad38391a45137a58430f639a57037eee96f2" - integrity sha512-sdbY0IOu1BcZHocwVIJ8/CPkguVR8oDho13apIGNsZjyItIdMMLrziDqzOSGcJI++AXGmS3MNHW8M+bdYHVj1g== +metascraper-date@^5.6.5: + version "5.6.5" + resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-5.6.5.tgz#802a19eaf9dc2874352ec4401fa360347225197b" + integrity sha512-IuKpi5z3S1/qlLhfQbLVv5hitfly/UEGKBxD4dYbn+5xbcsPcNlM+AE7DeDEct390nuZs7+fbSqgPKFtt5fPRg== dependencies: - "@metascraper/helpers" "^5.6.3" + "@metascraper/helpers" "^5.6.5" metascraper-description@^5.6.5: version "5.6.5" From 0663aa59049b344a540cc10fdf62a58d63b84ddd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2019 04:24:18 +0000 Subject: [PATCH 03/14] Bump tiptap from 1.21.0 to 1.24.0 in /webapp Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.21.0 to 1.24.0. - [Release notes](https://github.com/scrumpy/tiptap/releases) - [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.21.0...tiptap@1.24.0) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 77 +++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 45 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 31a8b5f11..c2ec400c6 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -70,7 +70,7 @@ "nuxt-env": "~0.1.0", "stack-utils": "^1.0.2", "string-hash": "^1.1.3", - "tiptap": "1.21.0", + "tiptap": "1.24.0", "tiptap-extensions": "1.22.2", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index d9bc9ffc8..76ec9ff29 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -10237,10 +10237,10 @@ prosemirror-dropcursor@^1.1.1: prosemirror-transform "^1.1.0" prosemirror-view "^1.1.0" -prosemirror-gapcursor@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.3.tgz#acc6537fc5a35e9b38966f91a199a382dfc715c4" - integrity sha512-X+hJhr42PcHWiSWL+lI5f/UeOhXCxlBFb8M6O8aG1hssmaRrW7sS2/Fjg5jFV+pTdS1REFkmm1occh01FMdDIQ== +prosemirror-gapcursor@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz#4ba663fb8511616e18ad222c904403cfbf6866dc" + integrity sha512-k021MtJibWs3NaJI6S9tCXfTZ/kaugFZBndHkkWx3Zfk0QDUO6JfVATpflxADN6DUkRwJ7qWyHlLDWu71hxHFQ== dependencies: prosemirror-keymap "^1.0.0" prosemirror-model "^1.0.0" @@ -10272,7 +10272,7 @@ 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.0, prosemirror-model@^1.7.1: +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== @@ -10318,10 +10318,15 @@ prosemirror-utils@^0.9.0: resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.0.tgz#3ab616c94ccd61fcb18968f0d5aa273a9f1f28e4" integrity sha512-YcvmHcq7phbn+OagJSvmne92qZG9dOVfb3zfuA1HuyWUif3hUDt2Yfu299BHqVkEkUCF6FN7Gi9folDQntMhxA== -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.8: - version "1.9.8" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.8.tgz#47b961204a0b2e8ff87370c270d4f82598e81273" - integrity sha512-yS4yrqxydvi7ddz9VFLeJgbfVd5g3/bMcRxb1PbWtG0i9OrPSsiHaEBJHLVeTbraGqRlAu+tbNLakO7RhUhp1w== +prosemirror-utils@^0.9.4: + version "0.9.5" + resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.5.tgz#34d7e5bc12f3e6774261cc664bac9499899663d4" + integrity sha512-JT3H//Cq2ljNhWadMYRMdlNj2gylFA7L4RC0zmUF9l0IgDpc/gTpPRCmfcDUomDgCrciz57C3MCnZ+058hSTaA== + +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.12, prosemirror-view@^1.9.8: + version "1.9.13" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.13.tgz#8f146038e776fd0aa6d7811c8b9cb11813b9e319" + integrity sha512-afJxCZR4EH04u4thl7xYHSIgyQiGALstLi+5SW9t3868ghrgcFhpQvbJAN17Yb9nwtnltD64t15Msk2UlXkPeQ== dependencies: prosemirror-model "^1.1.0" prosemirror-state "^1.0.0" @@ -11947,10 +11952,10 @@ tippy.js@^4.3.5: dependencies: popper.js "^1.14.7" -tiptap-commands@^1.10.6, tiptap-commands@^1.10.7: - version "1.10.7" - resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.7.tgz#c177f875e8a90e05171fdd441190b4b7a769bd27" - integrity sha512-Ij62dHkYvOFUcaj+xlbahhoqcY8bFIEho6fXKrxcjjtGzS2DyJnvXmWN6Ow65uZWXkf5Zf8ae6XnYNaKqP3Pyg== +tiptap-commands@^1.10.11, tiptap-commands@^1.10.7: + version "1.10.11" + resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.11.tgz#9df1ef7b553e601598892074f9faa6d836fd8238" + integrity sha512-SD1Ep18qKGiCOodUttQrJtOfEC4/sx1pQWfROc4t8xeuxS5FLcrXZ+u9mELRSHkBJ+nDAJsn/ewG+yo58T1+Xg== dependencies: prosemirror-commands "^1.0.8" prosemirror-inputrules "^1.0.4" @@ -11958,8 +11963,8 @@ tiptap-commands@^1.10.6, tiptap-commands@^1.10.7: prosemirror-schema-list "^1.0.3" prosemirror-state "^1.2.3" prosemirror-tables "^0.8.1" - prosemirror-utils "^0.9.0" - tiptap-utils "^1.5.5" + prosemirror-utils "^0.9.4" + tiptap-utils "^1.6.0" tiptap-extensions@1.22.2: version "1.22.2" @@ -11978,47 +11983,31 @@ tiptap-extensions@1.22.2: tiptap "^1.22.2" tiptap-commands "^1.10.7" -tiptap-utils@^1.5.4, tiptap-utils@^1.5.5: - version "1.5.5" - resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.5.5.tgz#f06c70f0319d9215433b3466b6ece369a078de0f" - integrity sha512-lnaCmIIkyK050qfsPeMDjoTW0sTqBHxfw1h2GXaX5Nr6JF4VQe0izgf2MI6LCd3PKecJBoW4ce5lNkDpV99+WA== +tiptap-utils@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.6.0.tgz#6af0bf52f93b291b9be5f6adb92c9afc35dd8d62" + integrity sha512-8ehQyNCe1CJvgBBqS3rKM58MFqcwlJQXS6XtZyhOjJDGQbUKNVR/GbAXTPlHnuVBm0kKKTjTqnrEt/PS4d2aXg== dependencies: prosemirror-model "^1.7.1" prosemirror-state "^1.2.3" prosemirror-tables "^0.8.1" - prosemirror-utils "^0.9.0" + prosemirror-utils "^0.9.4" -tiptap@1.21.0: - version "1.21.0" - resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.21.0.tgz#4d8c1365c611e41c8d4f3d7aa195ddaf891e605b" - integrity sha512-MoOj/8OPMlmoAotIZjAIlUZ59yMMR83xReOw2rGjqbFOooncoY1rLEBp0xz5oe5FLYqoe8dKb+kzOoFERqckVQ== +tiptap@1.24.0, tiptap@^1.22.2: + version "1.24.0" + resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.24.0.tgz#f386c8fca71275a4794a0e95eca2ea37267d370d" + integrity sha512-izw0FM5bbOQRtNczqEgo9/EoUI7X/TAj1LEsteMuDqxaZKmYn6so482UnnQUv13+4DtXHYGj5U+60lVNuZlWJw== dependencies: prosemirror-commands "^1.0.8" prosemirror-dropcursor "^1.1.1" - prosemirror-gapcursor "^1.0.3" - prosemirror-inputrules "^1.0.4" - prosemirror-keymap "^1.0.1" - prosemirror-model "^1.7.0" - prosemirror-state "^1.2.3" - prosemirror-view "^1.9.8" - tiptap-commands "^1.10.6" - tiptap-utils "^1.5.4" - -tiptap@^1.22.2: - version "1.22.2" - resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.22.2.tgz#f3f2b822d9ed087a853520c86593b2e6bd822bdd" - integrity sha512-qMFQJ358Ga8gXzUAMaHGrZDab/IqZf28N8BYYo4hyFIMoEYQVWmBGWuSBHOgpxiueXpC9zMuCoIgrNWN3VpoNQ== - dependencies: - prosemirror-commands "^1.0.8" - prosemirror-dropcursor "^1.1.1" - prosemirror-gapcursor "^1.0.3" + prosemirror-gapcursor "^1.0.4" prosemirror-inputrules "^1.0.4" prosemirror-keymap "^1.0.1" prosemirror-model "^1.7.1" prosemirror-state "^1.2.3" - prosemirror-view "^1.9.8" - tiptap-commands "^1.10.7" - tiptap-utils "^1.5.5" + prosemirror-view "^1.9.12" + tiptap-commands "^1.10.11" + tiptap-utils "^1.6.0" title-case@^2.1.0: version "2.1.1" From ffe6dc7736013f61336c8035b9ad30e0fdd2c487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 2 Aug 2019 13:33:09 +0200 Subject: [PATCH 04/14] Add MutationObserver to fix tests Our build server failed because of frontend tests. However, all our fullstack tests are passing... So maybe an issue in our test setup, not reproducible in a real browser? This commit: https://github.com/scrumpy/tiptap/commit/ee4f132b0f5a82575c1c7c2db093d0c3dd49a01b#diff-0806c5f3fdae5e139222967601c7faca adds MutationObserver to their test setup. Adding it to our test suites that touch the `editor` directly fixes our tests, too! From what I can tell is that prosemirror is calling `this.observer.takeRecords()`. Probably `tiptap` updated its dependencies at some point and that's where `this.observer` was introduced? Hard to tell. It really looks just like an issue only present in test environments, so I think it's safe not to investigate any further. --- .../ContributionForm/ContributionForm.spec.js | 3 ++ webapp/components/Editor/Editor.spec.js | 4 +- .../components/comments/CommentForm/spec.js | 3 ++ webapp/package.json | 5 ++- webapp/yarn.lock | 41 +++++++++++-------- 5 files changed, 37 insertions(+), 19 deletions(-) diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js index 3f9384d27..199d6ab18 100644 --- a/webapp/components/ContributionForm/ContributionForm.spec.js +++ b/webapp/components/ContributionForm/ContributionForm.spec.js @@ -6,6 +6,9 @@ import PostMutations from '~/graphql/PostMutations.js' import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect' import Filters from '~/plugins/vue-filters' import TeaserImage from '~/components/TeaserImage/TeaserImage' +import MutationObserver from 'mutation-observer' + +global.MutationObserver = MutationObserver const localVue = createLocalVue() diff --git a/webapp/components/Editor/Editor.spec.js b/webapp/components/Editor/Editor.spec.js index d457609bd..866b96aba 100644 --- a/webapp/components/Editor/Editor.spec.js +++ b/webapp/components/Editor/Editor.spec.js @@ -1,8 +1,10 @@ import { mount, createLocalVue } from '@vue/test-utils' import Editor from './Editor' import Vuex from 'vuex' - import Styleguide from '@human-connection/styleguide' +import MutationObserver from 'mutation-observer' + +global.MutationObserver = MutationObserver const localVue = createLocalVue() localVue.use(Vuex) diff --git a/webapp/components/comments/CommentForm/spec.js b/webapp/components/comments/CommentForm/spec.js index 8420c97ba..2d212c91d 100644 --- a/webapp/components/comments/CommentForm/spec.js +++ b/webapp/components/comments/CommentForm/spec.js @@ -2,6 +2,9 @@ import { mount, createLocalVue } from '@vue/test-utils' import CommentForm from './index.vue' import Styleguide from '@human-connection/styleguide' import Vuex from 'vuex' +import MutationObserver from 'mutation-observer' + +global.MutationObserver = MutationObserver const localVue = createLocalVue() localVue.use(Vuex) diff --git a/webapp/package.json b/webapp/package.json index c2ec400c6..a8fda5905 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -70,8 +70,8 @@ "nuxt-env": "~0.1.0", "stack-utils": "^1.0.2", "string-hash": "^1.1.3", - "tiptap": "1.24.0", - "tiptap-extensions": "1.22.2", + "tiptap": "~1.24.0", + "tiptap-extensions": "~1.26.0", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", "vue-izitoast": "1.1.2", @@ -104,6 +104,7 @@ "flush-promises": "^1.0.2", "fuse.js": "^3.4.5", "jest": "~24.8.0", + "mutation-observer": "^1.0.3", "node-sass": "~4.12.0", "nodemon": "~1.19.1", "prettier": "~1.18.2", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 76ec9ff29..596fdc05f 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -8472,6 +8472,11 @@ mustache@^2.3.0: resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== +mutation-observer@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0" + integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA== + mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" @@ -10313,17 +10318,21 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor dependencies: prosemirror-model "^1.0.0" -prosemirror-utils@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.0.tgz#3ab616c94ccd61fcb18968f0d5aa273a9f1f28e4" - integrity sha512-YcvmHcq7phbn+OagJSvmne92qZG9dOVfb3zfuA1HuyWUif3hUDt2Yfu299BHqVkEkUCF6FN7Gi9folDQntMhxA== - prosemirror-utils@^0.9.4: version "0.9.5" resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.5.tgz#34d7e5bc12f3e6774261cc664bac9499899663d4" integrity sha512-JT3H//Cq2ljNhWadMYRMdlNj2gylFA7L4RC0zmUF9l0IgDpc/gTpPRCmfcDUomDgCrciz57C3MCnZ+058hSTaA== -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.12, prosemirror-view@^1.9.8: +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0: + version "1.9.8" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.8.tgz#47b961204a0b2e8ff87370c270d4f82598e81273" + integrity sha512-yS4yrqxydvi7ddz9VFLeJgbfVd5g3/bMcRxb1PbWtG0i9OrPSsiHaEBJHLVeTbraGqRlAu+tbNLakO7RhUhp1w== + dependencies: + prosemirror-model "^1.1.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + +prosemirror-view@^1.9.12: version "1.9.13" resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.13.tgz#8f146038e776fd0aa6d7811c8b9cb11813b9e319" integrity sha512-afJxCZR4EH04u4thl7xYHSIgyQiGALstLi+5SW9t3868ghrgcFhpQvbJAN17Yb9nwtnltD64t15Msk2UlXkPeQ== @@ -11952,7 +11961,7 @@ tippy.js@^4.3.5: dependencies: popper.js "^1.14.7" -tiptap-commands@^1.10.11, tiptap-commands@^1.10.7: +tiptap-commands@^1.10.11: version "1.10.11" resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.11.tgz#9df1ef7b553e601598892074f9faa6d836fd8238" integrity sha512-SD1Ep18qKGiCOodUttQrJtOfEC4/sx1pQWfROc4t8xeuxS5FLcrXZ+u9mELRSHkBJ+nDAJsn/ewG+yo58T1+Xg== @@ -11966,10 +11975,10 @@ tiptap-commands@^1.10.11, tiptap-commands@^1.10.7: prosemirror-utils "^0.9.4" tiptap-utils "^1.6.0" -tiptap-extensions@1.22.2: - version "1.22.2" - resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.22.2.tgz#66b24ef63653481da16419efdf6459c7a9f518f7" - integrity sha512-JJe2yAnbaKBWO/16+lfFphePphG9UYhp3wAUkzhSefJx3dtIdDfCmp5jBzZ6NLahUHNT/Z9WeYdhQmngAeVhoA== +tiptap-extensions@~1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.26.0.tgz#d3ee033d121c7243a7e8648c69ec6343a2853ccc" + integrity sha512-icQYbfl6Cu3XkAoz9y+4x1URuB/EzryF2rZT6GsURghcelaxpjIPoMDBMyi00zlSIKJUvkS14NbnjJ2eT0CG6w== dependencies: lowlight "^1.12.1" prosemirror-collab "^1.1.2" @@ -11978,10 +11987,10 @@ tiptap-extensions@1.22.2: prosemirror-state "^1.2.3" prosemirror-tables "^0.8.1" prosemirror-transform "^1.1.3" - prosemirror-utils "^0.9.0" - prosemirror-view "^1.9.8" - tiptap "^1.22.2" - tiptap-commands "^1.10.7" + prosemirror-utils "^0.9.4" + prosemirror-view "^1.9.12" + tiptap "^1.24.0" + tiptap-commands "^1.10.11" tiptap-utils@^1.6.0: version "1.6.0" @@ -11993,7 +12002,7 @@ tiptap-utils@^1.6.0: prosemirror-tables "^0.8.1" prosemirror-utils "^0.9.4" -tiptap@1.24.0, tiptap@^1.22.2: +tiptap@^1.24.0, tiptap@~1.24.0: version "1.24.0" resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.24.0.tgz#f386c8fca71275a4794a0e95eca2ea37267d370d" integrity sha512-izw0FM5bbOQRtNczqEgo9/EoUI7X/TAj1LEsteMuDqxaZKmYn6so482UnnQUv13+4DtXHYGj5U+60lVNuZlWJw== From a2993e4a5270ac5635f9411e8ebac6e922c32bbf Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 2 Aug 2019 16:15:51 +0200 Subject: [PATCH 05/14] seed first and then reset --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c1208496..eb0c6f89a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ script: # Backend - docker-compose exec backend yarn run lint - docker-compose exec backend yarn run test:jest --ci --verbose=false --coverage - - docker-compose exec backend yarn run db:reset - docker-compose exec backend yarn run db:seed + - docker-compose exec backend yarn run db:reset # ActivityPub cucumber testing temporarily disabled because it's too buggy # - docker-compose exec backend yarn run test:cucumber --tags "not @wip" # - docker-compose exec backend yarn run db:reset From 5a46bd3a78c76370f87cccda1f58449a191b8880 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2019 14:34:40 +0000 Subject: [PATCH 06/14] Bump metascraper-video from 5.6.3 to 5.6.5 in /backend Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5. - [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.6.3...v5.6.5) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index 2dd86e456..70d8793e8 100644 --- a/backend/package.json +++ b/backend/package.json @@ -85,7 +85,7 @@ "metascraper-soundcloud": "^5.6.5", "metascraper-title": "^5.6.3", "metascraper-url": "^5.6.5", - "metascraper-video": "^5.6.3", + "metascraper-video": "^5.6.5", "metascraper-youtube": "^5.6.3", "neo4j-driver": "~1.7.5", "neo4j-graphql-js": "^2.6.3", diff --git a/backend/yarn.lock b/backend/yarn.lock index 10d7c1b28..0a5c77f9f 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5899,12 +5899,12 @@ metascraper-url@^5.6.5: dependencies: "@metascraper/helpers" "^5.6.5" -metascraper-video@^5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.6.3.tgz#4567095b52749c7e8083af6d5bd32a5ff182fcf8" - integrity sha512-ejkebLHkktvvDJ1EfPzA4X4LWlkzeJZ69KzslRC94vQJuE36PA6k+EdoorZqryOzhHPV9TaNP5j+ZXU26S731g== +metascraper-video@^5.6.5: + version "5.6.5" + resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.6.5.tgz#ded8124dd164cf8582bb7ed8bbdf767a1e2995d8" + integrity sha512-0kMGgQ2Q9C8XKosZ8Y/mfruT3AKpaY0kiqIDmA4G2S2O+gsE7yYExnW1aGEMjLZp54D1HOqjrYsuyO0KQ2abDA== dependencies: - "@metascraper/helpers" "^5.6.3" + "@metascraper/helpers" "^5.6.5" lodash "~4.17.15" metascraper-youtube@^5.6.3: From ab567663e9ef582ee7fd52d07995c937c959b83e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2019 13:37:13 +0000 Subject: [PATCH 07/14] Bump neode from 0.2.16 to 0.3.0 in /backend Bumps [neode](https://github.com/adam-cowley/neode) from 0.2.16 to 0.3.0. - [Release notes](https://github.com/adam-cowley/neode/releases) - [Commits](https://github.com/adam-cowley/neode/commits) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 53 +++++++++----------------------------------- 2 files changed, 11 insertions(+), 44 deletions(-) diff --git a/backend/package.json b/backend/package.json index 70d8793e8..fc432ed4d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -89,7 +89,7 @@ "metascraper-youtube": "^5.6.3", "neo4j-driver": "~1.7.5", "neo4j-graphql-js": "^2.6.3", - "neode": "^0.2.16", + "neode": "^0.3.0", "node-fetch": "~2.6.0", "nodemailer": "^6.3.0", "npm-run-all": "~4.1.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index 0a5c77f9f..f09d2fef6 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -4285,16 +4285,6 @@ hide-powered-by@1.1.0: resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.1.0.tgz#be3ea9cab4bdb16f8744be873755ca663383fa7a" integrity sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg== -hoek@5.x.x: - version "5.0.4" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.4.tgz#0f7fa270a1cafeb364a4b2ddfaa33f864e4157da" - integrity sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w== - -hoek@6.x.x: - version "6.1.2" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6" - integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q== - homedir-polyfill@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc" @@ -4828,13 +4818,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isemail@3.x.x: - version "3.2.0" - resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c" - integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg== - dependencies: - punycode "2.x.x" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -5274,15 +5257,6 @@ jest@~24.8.0: import-local "^2.0.0" jest-cli "^24.8.0" -joi@^13.7.0: - version "13.7.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-13.7.0.tgz#cfd85ebfe67e8a1900432400b4d03bbd93fb879f" - integrity sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q== - dependencies: - hoek "5.x.x" - isemail "3.x.x" - topo "3.x.x" - jquery@^3.3.1: version "3.4.0" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf" @@ -6169,13 +6143,13 @@ neo4j-graphql-js@^2.6.3: lodash "^4.17.11" neo4j-driver "^1.7.3" -neode@^0.2.16: - version "0.2.16" - resolved "https://registry.yarnpkg.com/neode/-/neode-0.2.16.tgz#20532cc67604fd00cc88de841d422f5238ae5bd3" - integrity sha512-L9p55IDKGzAZsQgHdXrfd2xasDuB46RipcrPw6NP7ESgkmfJMaMWRZ1F3Kv+f4V4U1WnhZ1IILvwVFhYPnpXEg== +neode@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/neode/-/neode-0.3.0.tgz#a4a41234fac23236db6b589ec2b505ad6e5fd832" + integrity sha512-V6uQhap7FDwbeC+mH6JEI352QSou4Ukj7vs/bGZSrVlMZKVS8vs/mbQYXoFdCkmQJuUtJWqO9wmtWg5GjCaNDQ== dependencies: + "@hapi/joi" "^15.1.0" dotenv "^4.0.0" - joi "^13.7.0" neo4j-driver "^1.6.3" uuid "^3.3.2" @@ -7028,16 +7002,16 @@ punycode2@~1.0.0: resolved "https://registry.yarnpkg.com/punycode2/-/punycode2-1.0.0.tgz#e2b4b9a9a8ff157d0b84438e203181ee7892dfd8" integrity sha1-4rS5qaj/FX0LhEOOIDGB7niS39g= -punycode@2.x.x, punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + qs@6.7.0, qs@^6.5.1: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -8220,13 +8194,6 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -topo@3.x.x: - version "3.0.3" - resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c" - integrity sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ== - dependencies: - hoek "6.x.x" - toposort@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" From 26958f6641f4437527103af1499b522f62b0fdaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 2 Aug 2019 23:44:35 +0200 Subject: [PATCH 08/14] Explicitly disallow User.name == null in model --- backend/src/models/User.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/models/User.js b/backend/src/models/User.js index cac8fd7a6..bcd9fcf35 100644 --- a/backend/src/models/User.js +++ b/backend/src/models/User.js @@ -3,7 +3,7 @@ import uuid from 'uuid/v4' module.exports = { id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests actorId: { type: 'string', allow: [null] }, - name: { type: 'string', min: 3 }, + name: { type: 'string', disallow: [null], min: 3 }, slug: 'string', encryptedPassword: 'string', avatar: { type: 'string', allow: [null] }, From 5a523432472ad6ec6a70a24f8592893f099b82de Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2019 04:26:20 +0000 Subject: [PATCH 09/14] Bump metascraper-image from 5.6.3 to 5.6.5 in /backend Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5. - [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.6.3...v5.6.5) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index fc432ed4d..6318a6d79 100644 --- a/backend/package.json +++ b/backend/package.json @@ -77,7 +77,7 @@ "metascraper-clearbit-logo": "^5.3.0", "metascraper-date": "^5.6.5", "metascraper-description": "^5.6.5", - "metascraper-image": "^5.6.3", + "metascraper-image": "^5.6.5", "metascraper-lang": "^5.6.3", "metascraper-lang-detector": "^4.8.5", "metascraper-logo": "^5.6.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index f09d2fef6..81f4d03e8 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5812,12 +5812,12 @@ metascraper-description@^5.6.5: dependencies: "@metascraper/helpers" "^5.6.5" -metascraper-image@^5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.6.3.tgz#1d2fa627d90d5545f45bdda6e874af421ee1c622" - integrity sha512-pDq6fU6X59642KNmE1WmJUUgJxepU4TDj1u2HDR0XCdqeiEGpskqmO/rFJSdgRFJNFUo7RJ1Er8cT4yVKCgqtg== +metascraper-image@^5.6.5: + version "5.6.5" + resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.6.5.tgz#34a5cc5385b173e39b9ffb29e3255d111d7e1339" + integrity sha512-VFy/ztO+KsAZOr3XcSPoLDLWrR8OFsVLNy8z0BHeEjDOpLFn3aSbV+Ji84iVUsduD9kuY6G1i9iOaNDscVJGow== dependencies: - "@metascraper/helpers" "^5.6.3" + "@metascraper/helpers" "^5.6.5" metascraper-lang-detector@^4.8.5: version "4.10.2" From 8f4bdf3b48f4b73dea1d86096bc4ecc412efe78f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2019 04:27:02 +0000 Subject: [PATCH 10/14] Bump metascraper-title from 5.6.3 to 5.6.5 in /backend Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5. - [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.6.3...v5.6.5) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index fc432ed4d..f318cf0df 100644 --- a/backend/package.json +++ b/backend/package.json @@ -83,7 +83,7 @@ "metascraper-logo": "^5.6.5", "metascraper-publisher": "^5.6.5", "metascraper-soundcloud": "^5.6.5", - "metascraper-title": "^5.6.3", + "metascraper-title": "^5.6.5", "metascraper-url": "^5.6.5", "metascraper-video": "^5.6.5", "metascraper-youtube": "^5.6.3", diff --git a/backend/yarn.lock b/backend/yarn.lock index f09d2fef6..bfed368e8 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5858,12 +5858,12 @@ metascraper-soundcloud@^5.6.5: memoize-one "~5.0.5" tldts "~5.3.2" -metascraper-title@^5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.6.3.tgz#219bf9a4da28d48ea180497a1d6d2b4fa4871cc2" - integrity sha512-sZ+SWojZhECisyw+el5fc1q2ENEAeQDzy/HabSkeA/saB3xqf3XnfqtCGIuElyxKiXS65KWzQOX+u3KseZdiAg== +metascraper-title@^5.6.5: + version "5.6.5" + resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.6.5.tgz#20e692c7e971076f7a0d654249cf157153eefb55" + integrity sha512-gTfhH4/BsgslaykP5qTBDZiVRAPNuexR7JTVQ8o1Rzqsil7VrGsr42JOt7k0xlagEbHCLYrIS/QGiX17MDIdlA== dependencies: - "@metascraper/helpers" "^5.6.3" + "@metascraper/helpers" "^5.6.5" lodash "~4.17.15" metascraper-url@^5.6.5: From d1cd26e05a90d3b532b2c556a2371c28c3929ad0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2019 04:27:23 +0000 Subject: [PATCH 11/14] Bump @nuxtjs/apollo from 4.0.0-rc9 to 4.0.0-rc10 in /webapp Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc9 to 4.0.0-rc10. - [Release notes](https://github.com/nuxt-community/apollo-module/releases) - [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.9...v4.0.0-rc.10) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index a8fda5905..fd91cadfa 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -50,7 +50,7 @@ }, "dependencies": { "@human-connection/styleguide": "0.5.17", - "@nuxtjs/apollo": "^4.0.0-rc9", + "@nuxtjs/apollo": "^4.0.0-rc10", "@nuxtjs/axios": "~5.5.4", "@nuxtjs/dotenv": "~1.3.0", "@nuxtjs/style-resources": "~0.1.2", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 596fdc05f..cc5103800 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1208,14 +1208,13 @@ webpack-node-externals "^1.7.2" webpackbar "^3.2.0" -"@nuxtjs/apollo@^4.0.0-rc9": - version "4.0.0-rc9" - resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc9.tgz#9a00166bc88caddc5af25fd43135c99cf1e8e149" - integrity sha512-s69feXtdn4qrWxX8uF4+PzDRRG+NkfazEHfP3W8sG+PFxE6BASe8iW/zsaggOEw3MXG2ZjEd09jlsVoNNZB03g== +"@nuxtjs/apollo@^4.0.0-rc10": + version "4.0.0-rc10" + resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc10.tgz#0a7ed15f1a4a7d3d4b6ca3652ed0314085dc3ffe" + integrity sha512-c8bxYpaOGQe7ZAXwYTne+48EViXYyCOV3T5khAhNk7YFFAkz6r12ouUYZ1aZr/BYczKZNPAlcJdmWAldE29Qzg== dependencies: - cookie "^0.4.0" + cookie-universal "^2.0.16" isomorphic-fetch "^2.2.1" - js-cookie "^2.2.0" vue-apollo "^3.0.0-rc.2" vue-cli-plugin-apollo "^0.21.0" webpack-node-externals "^1.7.2" @@ -4024,7 +4023,7 @@ cookie-universal@^2.0.16: "@types/cookie" "^0.3.1" cookie "^0.3.1" -cookie@0.4.0, cookie@^0.4.0: +cookie@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== @@ -7505,11 +7504,6 @@ js-beautify@^1.6.14: mkdirp "~0.5.1" nopt "~4.0.1" -js-cookie@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb" - integrity sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s= - js-levenshtein@^1.1.3: version "1.1.6" resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" From 562e6dbce790b13389b92e719d7d9ba9ea39e74c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2019 04:27:43 +0000 Subject: [PATCH 12/14] Bump metascraper-author from 5.6.3 to 5.6.5 in /backend Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5. - [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.6.3...v5.6.5) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index fc432ed4d..3cce9ab1f 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.6.5", - "metascraper-author": "^5.6.3", + "metascraper-author": "^5.6.5", "metascraper-clearbit-logo": "^5.3.0", "metascraper-date": "^5.6.5", "metascraper-description": "^5.6.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index f09d2fef6..119fe43e6 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5783,12 +5783,12 @@ metascraper-audio@^5.6.5: dependencies: "@metascraper/helpers" "^5.6.5" -metascraper-author@^5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.6.3.tgz#8ecc0d4257be1438e9f8242b4f0c1a5137f5bb13" - integrity sha512-BNnYWjaEFOS5JX5s6KFo6MIv5M2hgnaWV47LM/EOvfHpe0a6DovVtLkGrVj6SpbPio3tzTjakouBwjQpuo1Dlg== +metascraper-author@^5.6.5: + version "5.6.5" + resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.6.5.tgz#d4e02012e615ccb8a852f4f155a9597301d673cd" + integrity sha512-/UWIVQFNCNoWVIKKoRCuTTRItLTqztoznBR16lIHz5ssiJRCIjRiHfBBmuCHEI9Bki4XAfGg5PTzmALdSa4IMw== dependencies: - "@metascraper/helpers" "^5.6.3" + "@metascraper/helpers" "^5.6.5" lodash "~4.17.15" metascraper-clearbit-logo@^5.3.0: From f5608284adeca918c9b440f35fa91bacee2d8a8e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2019 04:28:12 +0000 Subject: [PATCH 13/14] Bump @vue/cli-shared-utils from 3.9.0 to 3.10.0 in /webapp Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/vuejs/vue-cli/releases) - [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-cli/commits/v3.10.0/packages/@vue/cli-shared-utils) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index a8fda5905..b13dbe582 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -83,7 +83,7 @@ "@babel/core": "~7.5.5", "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/preset-env": "~7.5.5", - "@vue/cli-shared-utils": "~3.9.0", + "@vue/cli-shared-utils": "~3.10.0", "@vue/eslint-config-prettier": "~5.0.0", "@vue/server-test-utils": "~1.0.0-beta.29", "@vue/test-utils": "~1.0.0-beta.29", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 596fdc05f..39c0eeb79 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1810,10 +1810,10 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.0.0" camelcase "^5.0.0" -"@vue/cli-shared-utils@~3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.9.0.tgz#cb56a443bf763a873849a11d07e9e7638aa16cc2" - integrity sha512-wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g== +"@vue/cli-shared-utils@~3.10.0": + version "3.10.0" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.10.0.tgz#9d156f3c0ef675a939319062489e98c8d3d80f7e" + integrity sha512-i96XBUtLdWeKFCC/ot12ngqnVikN/dXpelGdyxvNZczCkX7Je0FUdrZkiw0+uTYTu1RmuYWpLs+vb/YQerjiWg== dependencies: "@hapi/joi" "^15.0.1" chalk "^2.4.1" From 213a138f99cd700708e7c668851d6e684ab20934 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2019 07:45:13 +0000 Subject: [PATCH 14/14] Bump metascraper-lang from 5.6.3 to 5.6.5 in /backend Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5. - [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.6.3...v5.6.5) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index 3ca8dfa12..f3ab17173 100644 --- a/backend/package.json +++ b/backend/package.json @@ -78,7 +78,7 @@ "metascraper-date": "^5.6.5", "metascraper-description": "^5.6.5", "metascraper-image": "^5.6.5", - "metascraper-lang": "^5.6.3", + "metascraper-lang": "^5.6.5", "metascraper-lang-detector": "^4.8.5", "metascraper-logo": "^5.6.5", "metascraper-publisher": "^5.6.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index 5b5dc19d0..0a67da157 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5828,12 +5828,12 @@ metascraper-lang-detector@^4.8.5: franc "~4.0.0" iso-639-3 "~1.1.0" -metascraper-lang@^5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-5.6.3.tgz#d2d7a20f4145b0785391fffec629e154737fc942" - integrity sha512-c13zxmREcB/hDXs7MIxio7RNfVsSzGfixk6FrfQQh3fypmiR84SpeZmQR+G/e2X/BDNwpIydJM62R7BayY709Q== +metascraper-lang@^5.6.5: + version "5.6.5" + resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-5.6.5.tgz#0363514de4bb580f8e571502e7421b2345cd54bf" + integrity sha512-mp9fVytxX9eLGNI16CYGEhBXhG3a0/RtjVqtcngSyeVZl7SKxMyGLrGqDgCuoU6Til/n11ujEnu3wlQfbGclIg== dependencies: - "@metascraper/helpers" "^5.6.3" + "@metascraper/helpers" "^5.6.5" metascraper-logo@^5.6.5: version "5.6.5"