diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 1d2aef77e..595c9d584 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,25 +1,9 @@ --- -name: 🐛 Bug report -about: Create a report to help us improve +name: 🐛 Bug Report +about: Create a report to help us to improve. labels: bug title: 🐛 [Bug] --- -## :bug: Bugreport +## :bug: Bug Report - -### Steps to reproduce the behavior -1. -2. -3. -4. ... -5. Profit - -### Expected behavior - - -### Version & Environment - - -### Additional context - diff --git a/.github/ISSUE_TEMPLATE/devops_ticket.md b/.github/ISSUE_TEMPLATE/devops_ticket.md index 77355d1cf..115664911 100644 --- a/.github/ISSUE_TEMPLATE/devops_ticket.md +++ b/.github/ISSUE_TEMPLATE/devops_ticket.md @@ -1,24 +1,9 @@ --- -name: 💥 DevOps ticket -about: Help us manage our deployed App. +name: 💥 DevOps Ticket +about: Help us manage our deployed app. labels: devops title: 💥 [DevOps] --- -## 💥 DevOps ticket +## 💥 DevOps Ticket - -### Motive - - -### Related issues - - -### Implementation - - -### Validation - - -### Additional context - diff --git a/.github/ISSUE_TEMPLATE/epic.md b/.github/ISSUE_TEMPLATE/epic.md new file mode 100644 index 000000000..cf72cd673 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/epic.md @@ -0,0 +1,12 @@ +--- +name: 🌟 Epic +about: Define a big development step. +labels: epic +title: 🌟 [EPIC] +--- + + + +## 🌟 EPIC + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index ef3b30be2..beae80901 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,24 +1,9 @@ --- -name: 🚀 Feature request -about: Suggest an idea for this project +name: 🚀 Feature Request +about: Suggest an idea for this project. labels: feature title: 🚀 [Feature] --- -## :rocket: Feature +## :rocket: Feature Request - -### User Problem - - -### Implementation - - -### Design & Layout - - -### Validation - - -### Additional context - diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index 677258e6f..40e6e381b 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -8,5 +8,5 @@ title: 💬 [Question] -## :speech_balloon: Question +## 💬 Question diff --git a/.github/ISSUE_TEMPLATE/refactor_tickets.md b/.github/ISSUE_TEMPLATE/refactor_tickets.md index b595abd5d..d1841e35e 100644 --- a/.github/ISSUE_TEMPLATE/refactor_tickets.md +++ b/.github/ISSUE_TEMPLATE/refactor_tickets.md @@ -1,21 +1,10 @@ --- -name: 🔧 Refactor ticket +name: 🔧 Refactor about: Help us improve our code by refactoring it. labels: refactor title: 🔧 [Refactor] --- -## :zap: Refactor ticket +## 🔧 Refactor -### Motive - - -### Related issues - - -### Implementation - - -### Additional context - diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..c5433c921 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,179 @@ +version: 2 +updates: +- package-ecosystem: npm + directory: "/" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: cypress + versions: + - 6.3.0 + - 6.4.0 + - 6.5.0 + - 6.6.0 + - 6.7.1 + - 6.8.0 + - 7.0.0 + - 7.0.1 + - 7.1.0 + - dependency-name: cypress-cucumber-preprocessor + versions: + - 4.0.0 + - 4.0.1 + - 4.0.3 + - dependency-name: date-fns + versions: + - 2.16.1 + - 2.17.0 + - 2.18.0 + - 2.19.0 + - 2.20.0 + - 2.20.1 + - 2.20.2 + - 2.20.3 + - 2.21.0 + - dependency-name: cypress-file-upload + versions: + - 5.0.2 + - 5.0.3 + - 5.0.4 + - 5.0.5 + - dependency-name: neo4j-driver + versions: + - 4.2.2 +- package-ecosystem: npm + directory: "/backend" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: y18n + versions: + - 4.0.1 + - 4.0.2 + - dependency-name: metascraper-publisher + versions: + - 5.16.16 + - 5.18.1 + - 5.18.12 + - 5.18.2 + - 5.18.4 + - 5.18.5 + - 5.18.6 + - 5.18.9 + - 5.20.0 + - 5.21.0 + - 5.21.2 + - 5.21.3 + - 5.21.4 + - 5.21.5 + - dependency-name: metascraper-author + versions: + - 5.16.16 + - 5.18.1 + - 5.18.12 + - 5.18.2 + - 5.18.4 + - 5.18.5 + - 5.18.6 + - 5.18.9 + - 5.20.0 + - 5.21.0 + - 5.21.2 + - 5.21.3 + - 5.21.4 + - 5.21.5 + - dependency-name: neo4j-driver + versions: + - 4.2.2 + - dependency-name: neo4j-graphql-js + versions: + - 2.19.1 + - dependency-name: mustache + versions: + - 4.1.0 +- package-ecosystem: npm + directory: "/webapp" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: nuxt + versions: + - 2.14.12 + - 2.15.0 + - 2.15.1 + - 2.15.2 + - 2.15.3 + - dependency-name: v-tooltip + versions: + - 2.1.2 + - dependency-name: "@vue/server-test-utils" + versions: + - 1.1.2 + - 1.1.3 + - dependency-name: node-notifier + versions: + - 8.0.1 +- package-ecosystem: docker + directory: "/webapp" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: node + versions: + - ">= 15.5.a, < 15.6" + - dependency-name: node + versions: + - 15.10.0.pre.alpine3.10 + - 15.11.0.pre.alpine3.10 + - 15.12.0.pre.alpine3.10 + - 15.13.0.pre.alpine3.10 + - 15.7.0.pre.alpine3.10 + - 15.8.0.pre.alpine3.10 + - 15.9.0.pre.alpine3.10 +- package-ecosystem: docker + directory: "/backend" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: node + versions: + - ">= 15.4.a, < 15.5" + - dependency-name: node + versions: + - ">= 15.5.a, < 15.6" + - dependency-name: node + versions: + - 15.10.0.pre.alpine3.10 + - 15.11.0.pre.alpine3.10 + - 15.12.0.pre.alpine3.10 + - 15.13.0.pre.alpine3.10 + - 15.7.0.pre.alpine3.10 + - 15.8.0.pre.alpine3.10 + - 15.9.0.pre.alpine3.10 +- package-ecosystem: docker + directory: "/neo4j" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: neo4j + versions: + - 4.2.3 + - 4.2.4 +- package-ecosystem: docker + directory: "/deployment/legacy-migration/maintenance-worker" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 diff --git a/backend/package.json b/backend/package.json index 3b4d9f05f..76f0fb09d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -81,7 +81,7 @@ "languagedetect": "^2.0.0", "linkifyjs": "~2.1.8", "lodash": "~4.17.14", - "merge-graphql-schemas": "^1.7.7", + "merge-graphql-schemas": "^1.7.8", "metascraper": "^5.11.8", "metascraper-audio": "^5.14.26", "metascraper-author": "^5.14.22", @@ -134,7 +134,7 @@ "eslint-plugin-standard": "~4.0.1", "jest": "~25.3.0", "nodemon": "~2.0.2", - "prettier": "~2.2.0", + "prettier": "~2.3.2", "rosie": "^2.0.1", "supertest": "~4.0.2" }, diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js index 713a03142..7d9b5e954 100644 --- a/backend/src/db/seed.js +++ b/backend/src/db/seed.js @@ -137,100 +137,93 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] }), ]) - const [ - peterLustig, - bobDerBaumeister, - jennyRostock, - huey, - dewey, - louie, - dagobert, - ] = await Promise.all([ - Factory.build( - 'user', - { - id: 'u1', - name: 'Peter Lustig', - slug: 'peter-lustig', - role: 'admin', - }, - { - email: 'admin@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u2', - name: 'Bob der Baumeister', - slug: 'bob-der-baumeister', - role: 'moderator', - }, - { - email: 'moderator@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u3', - name: 'Jenny Rostock', - slug: 'jenny-rostock', - role: 'user', - }, - { - email: 'user@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u4', - name: 'Huey', - slug: 'huey', - role: 'user', - }, - { - email: 'huey@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u5', - name: 'Dewey', - slug: 'dewey', - role: 'user', - }, - { - email: 'dewey@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u6', - name: 'Louie', - slug: 'louie', - role: 'user', - }, - { - email: 'louie@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u7', - name: 'Dagobert', - slug: 'dagobert', - role: 'user', - }, - { - email: 'dagobert@example.org', - }, - ), - ]) + const [peterLustig, bobDerBaumeister, jennyRostock, huey, dewey, louie, dagobert] = + await Promise.all([ + Factory.build( + 'user', + { + id: 'u1', + name: 'Peter Lustig', + slug: 'peter-lustig', + role: 'admin', + }, + { + email: 'admin@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u2', + name: 'Bob der Baumeister', + slug: 'bob-der-baumeister', + role: 'moderator', + }, + { + email: 'moderator@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u3', + name: 'Jenny Rostock', + slug: 'jenny-rostock', + role: 'user', + }, + { + email: 'user@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u4', + name: 'Huey', + slug: 'huey', + role: 'user', + }, + { + email: 'huey@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u5', + name: 'Dewey', + slug: 'dewey', + role: 'user', + }, + { + email: 'dewey@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u6', + name: 'Louie', + slug: 'louie', + role: 'user', + }, + { + email: 'louie@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u7', + name: 'Dagobert', + slug: 'dagobert', + role: 'user', + }, + { + email: 'dagobert@example.org', + }, + ), + ]) await Promise.all([ peterLustig.relateTo(Berlin, 'isIn'), @@ -561,7 +554,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] const hashtagAndMention1 = 'The new physics of #QuantenFlussTheorie can explain #QuantumGravity! @peter-lustig got that already. ;-)' const createPostMutation = gql` - mutation($id: ID, $title: String!, $content: String!, $categoryIds: [ID]) { + mutation ($id: ID, $title: String!, $content: String!, $categoryIds: [ID]) { CreatePost(id: $id, title: $title, content: $content, categoryIds: $categoryIds) { id } @@ -618,7 +611,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] const mentionInComment2 = 'Did @peter-lustig tell you?' const createCommentMutation = gql` - mutation($id: ID, $postId: ID!, $content: String!) { + mutation ($id: ID, $postId: ID!, $content: String!) { CreateComment(id: $id, postId: $postId, content: $content) { id } diff --git a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js index be9039a6f..613bd6b62 100644 --- a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js +++ b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js @@ -13,7 +13,7 @@ const driver = getDriver() const neode = getNeode() const categoryIds = ['cat9'] const createPostMutation = gql` - mutation($id: ID, $title: String!, $postContent: String!, $categoryIds: [ID]!) { + mutation ($id: ID, $title: String!, $postContent: String!, $categoryIds: [ID]!) { CreatePost(id: $id, title: $title, content: $postContent, categoryIds: $categoryIds) { id title @@ -22,7 +22,7 @@ const createPostMutation = gql` } ` const updatePostMutation = gql` - mutation($id: ID!, $title: String!, $postContent: String!, $categoryIds: [ID]!) { + mutation ($id: ID!, $title: String!, $postContent: String!, $categoryIds: [ID]!) { UpdatePost(id: $id, content: $postContent, title: $title, categoryIds: $categoryIds) { title content @@ -95,7 +95,7 @@ describe('hashtags', () => {
` const postWithHastagsQuery = gql` - query($id: ID) { + query ($id: ID) { Post(id: $id) { tags { id diff --git a/backend/src/middleware/languages/languages.spec.js b/backend/src/middleware/languages/languages.spec.js index 1448e4e4b..9bba45c0c 100644 --- a/backend/src/middleware/languages/languages.spec.js +++ b/backend/src/middleware/languages/languages.spec.js @@ -29,7 +29,7 @@ afterAll(async () => { }) const createPostMutation = gql` - mutation($title: String!, $content: String!, $categoryIds: [ID]) { + mutation ($title: String!, $content: String!, $categoryIds: [ID]) { CreatePost(title: $title, content: $content, categoryIds: $categoryIds) { language } diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js index af4ed9693..7583a6727 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js @@ -10,7 +10,7 @@ const driver = getDriver() const neode = getNeode() const categoryIds = ['cat9'] const createPostMutation = gql` - mutation($id: ID, $title: String!, $postContent: String!, $categoryIds: [ID]!) { + mutation ($id: ID, $title: String!, $postContent: String!, $categoryIds: [ID]!) { CreatePost(id: $id, title: $title, content: $postContent, categoryIds: $categoryIds) { id title @@ -19,7 +19,7 @@ const createPostMutation = gql` } ` const updatePostMutation = gql` - mutation($id: ID!, $title: String!, $postContent: String!, $categoryIds: [ID]!) { + mutation ($id: ID!, $title: String!, $postContent: String!, $categoryIds: [ID]!) { UpdatePost(id: $id, content: $postContent, title: $title, categoryIds: $categoryIds) { title content @@ -27,7 +27,7 @@ const updatePostMutation = gql` } ` const createCommentMutation = gql` - mutation($id: ID, $postId: ID!, $commentContent: String!) { + mutation ($id: ID, $postId: ID!, $commentContent: String!) { CreateComment(id: $id, postId: $postId, content: $commentContent) { id content @@ -80,7 +80,7 @@ afterEach(async () => { describe('notifications', () => { const notificationQuery = gql` - query($read: Boolean) { + query ($read: Boolean) { notifications(read: $read, orderBy: updatedAt_desc) { read reason @@ -367,7 +367,7 @@ describe('notifications', () => { describe('if the notification was marked as read earlier', () => { const markAsReadAction = async () => { const mutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { markAsRead(id: $id) { read } diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js index 8f311e8c2..5fa4a8f01 100644 --- a/backend/src/middleware/permissionsMiddleware.spec.js +++ b/backend/src/middleware/permissionsMiddleware.spec.js @@ -80,7 +80,7 @@ describe('authorization', () => { describe('access email address', () => { const userQuery = gql` - query($name: String) { + query ($name: String) { User(name: $name) { email } @@ -165,7 +165,7 @@ describe('authorization', () => { describe('access Signup', () => { const signupMutation = gql` - mutation($email: String!, $inviteCode: String) { + mutation ($email: String!, $inviteCode: String) { Signup(email: $email, inviteCode: $inviteCode) { email } diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js index 97503851a..1f45c29df 100644 --- a/backend/src/middleware/slugifyMiddleware.spec.js +++ b/backend/src/middleware/slugifyMiddleware.spec.js @@ -54,7 +54,7 @@ describe('slugifyMiddleware', () => { describe('CreatePost', () => { const categoryIds = ['cat9'] const createPostMutation = gql` - mutation($title: String!, $content: String!, $categoryIds: [ID]!, $slug: String) { + mutation ($title: String!, $content: String!, $categoryIds: [ID]!, $slug: String) { CreatePost(title: $title, content: $content, categoryIds: $categoryIds, slug: $slug) { slug } @@ -164,7 +164,7 @@ describe('slugifyMiddleware', () => { describe('SignupVerification', () => { const mutation = gql` - mutation( + mutation ( $password: String! $email: String! $name: String! diff --git a/backend/src/middleware/userInteractions.spec.js b/backend/src/middleware/userInteractions.spec.js index 77c9fbd1d..27bee87c8 100644 --- a/backend/src/middleware/userInteractions.spec.js +++ b/backend/src/middleware/userInteractions.spec.js @@ -10,7 +10,7 @@ const driver = getDriver() const neode = getNeode() const postQuery = gql` - query($id: ID) { + query ($id: ID) { Post(id: $id) { clickedCount } diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js index c3d518256..530a80b1e 100644 --- a/backend/src/middleware/validation/validationMiddleware.spec.js +++ b/backend/src/middleware/validation/validationMiddleware.spec.js @@ -17,14 +17,14 @@ let authenticatedUser, commentingUser const createCommentMutation = gql` - mutation($id: ID, $postId: ID!, $content: String!) { + mutation ($id: ID, $postId: ID!, $content: String!) { CreateComment(id: $id, postId: $postId, content: $content) { id } } ` const updateCommentMutation = gql` - mutation($content: String!, $id: ID!) { + mutation ($content: String!, $id: ID!) { UpdateComment(content: $content, id: $id) { id } @@ -32,7 +32,7 @@ const updateCommentMutation = gql` ` const reportMutation = gql` - mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) { + mutation ($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) { fileReport( resourceId: $resourceId reasonCategory: $reasonCategory @@ -43,7 +43,7 @@ const reportMutation = gql` } ` const reviewMutation = gql` - mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) { + mutation ($resourceId: ID!, $disable: Boolean, $closed: Boolean) { review(resourceId: $resourceId, disable: $disable, closed: $closed) { createdAt updatedAt @@ -52,7 +52,7 @@ const reviewMutation = gql` ` const updateUserMutation = gql` - mutation($id: ID!, $name: String) { + mutation ($id: ID!, $name: String) { UpdateUser(id: $id, name: $name) { name } diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js index 9f633c8b0..63a5538d0 100644 --- a/backend/src/schema/resolvers/comments.spec.js +++ b/backend/src/schema/resolvers/comments.spec.js @@ -36,7 +36,7 @@ afterEach(async () => { }) const createCommentMutation = gql` - mutation($id: ID, $postId: ID!, $content: String!) { + mutation ($id: ID, $postId: ID!, $content: String!) { CreateComment(id: $id, postId: $postId, content: $content) { id content @@ -128,7 +128,7 @@ describe('CreateComment', () => { describe('UpdateComment', () => { const updateCommentMutation = gql` - mutation($content: String!, $id: ID!) { + mutation ($content: String!, $id: ID!) { UpdateComment(content: $content, id: $id) { id content @@ -220,7 +220,7 @@ describe('UpdateComment', () => { describe('DeleteComment', () => { const deleteCommentMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { DeleteComment(id: $id) { id content diff --git a/backend/src/schema/resolvers/donations.spec.js b/backend/src/schema/resolvers/donations.spec.js index ea5ee4e09..5bbbd60e0 100644 --- a/backend/src/schema/resolvers/donations.spec.js +++ b/backend/src/schema/resolvers/donations.spec.js @@ -9,7 +9,7 @@ const instance = getNeode() const driver = getDriver() const updateDonationsMutation = gql` - mutation($goal: Int, $progress: Int) { + mutation ($goal: Int, $progress: Int) { UpdateDonations(goal: $goal, progress: $progress) { id goal diff --git a/backend/src/schema/resolvers/emails.spec.js b/backend/src/schema/resolvers/emails.spec.js index 6b1e24d2b..c5596cc27 100644 --- a/backend/src/schema/resolvers/emails.spec.js +++ b/backend/src/schema/resolvers/emails.spec.js @@ -37,7 +37,7 @@ afterEach(async () => { describe('AddEmailAddress', () => { const mutation = gql` - mutation($email: String!) { + mutation ($email: String!) { AddEmailAddress(email: $email) { email verifiedAt @@ -142,7 +142,7 @@ describe('AddEmailAddress', () => { describe('VerifyEmailAddress', () => { const mutation = gql` - mutation($email: String!, $nonce: String!) { + mutation ($email: String!, $nonce: String!) { VerifyEmailAddress(email: $email, nonce: $nonce) { email createdAt @@ -309,7 +309,7 @@ describe('VerifyNonce', () => { }) const verifyNonceQuery = gql` - query($email: String!, $nonce: String!) { + query ($email: String!, $nonce: String!) { VerifyNonce(email: $email, nonce: $nonce) } ` diff --git a/backend/src/schema/resolvers/embeds.spec.js b/backend/src/schema/resolvers/embeds.spec.js index 6c034acf7..b7ce7ab63 100644 --- a/backend/src/schema/resolvers/embeds.spec.js +++ b/backend/src/schema/resolvers/embeds.spec.js @@ -37,8 +37,7 @@ const babyLovesCatEmbedResponse = new Response( thumbnail_height: 360, provider_url: 'https://www.youtube.com/', thumbnail_width: 480, - html: - '', + html: '', thumbnail_url: 'https://i.ytimg.com/vi/qkdXAtO40Fo/hqdefault.jpg', version: '1.0', author_name: 'Merkley Family', @@ -57,7 +56,7 @@ describe('Query', () => { }) const { query } = createTestClient(server) const embed = gql` - query($url: String!) { + query ($url: String!) { embed(url: $url) { type title @@ -204,8 +203,7 @@ Have all the information for the brand in separate config files. Set these defau video: null, lang: 'de', sources: ['resource', 'oembed'], - html: - '', + html: '', }, }, errors: undefined, diff --git a/backend/src/schema/resolvers/follow.spec.js b/backend/src/schema/resolvers/follow.spec.js index f35795991..6d8db982a 100644 --- a/backend/src/schema/resolvers/follow.spec.js +++ b/backend/src/schema/resolvers/follow.spec.js @@ -16,7 +16,7 @@ let user2 let variables const mutationFollowUser = gql` - mutation($id: ID!) { + mutation ($id: ID!) { followUser(id: $id) { name followedBy { @@ -29,7 +29,7 @@ const mutationFollowUser = gql` ` const mutationUnfollowUser = gql` - mutation($id: ID!) { + mutation ($id: ID!) { unfollowUser(id: $id) { name followedBy { @@ -42,7 +42,7 @@ const mutationUnfollowUser = gql` ` const userQuery = gql` - query($id: ID) { + query ($id: ID) { User(id: $id) { followedBy { id diff --git a/backend/src/schema/resolvers/inviteCodes.spec.js b/backend/src/schema/resolvers/inviteCodes.spec.js index 19f021437..940aa8403 100644 --- a/backend/src/schema/resolvers/inviteCodes.spec.js +++ b/backend/src/schema/resolvers/inviteCodes.spec.js @@ -11,7 +11,7 @@ let mutate const driver = getDriver() const generateInviteCodeMutation = gql` - mutation($expiresAt: String = null) { + mutation ($expiresAt: String = null) { GenerateInviteCode(expiresAt: $expiresAt) { code createdAt @@ -31,7 +31,7 @@ const myInviteCodesQuery = gql` ` const isValidInviteCodeQuery = gql` - query($code: ID!) { + query ($code: ID!) { isValidInviteCode(code: $code) } ` diff --git a/backend/src/schema/resolvers/locations.spec.js b/backend/src/schema/resolvers/locations.spec.js index 34d0f2e9d..fa562cbfd 100644 --- a/backend/src/schema/resolvers/locations.spec.js +++ b/backend/src/schema/resolvers/locations.spec.js @@ -31,7 +31,7 @@ describe('resolvers', () => { describe('custom mutation, not handled by neo4j-graphql-js', () => { let variables const updateUserMutation = gql` - mutation($id: ID!, $name: String) { + mutation ($id: ID!, $name: String) { UpdateUser(id: $id, name: $name) { name location { diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js index b62d35ee8..a579c62da 100644 --- a/backend/src/schema/resolvers/moderation.spec.js +++ b/backend/src/schema/resolvers/moderation.spec.js @@ -16,7 +16,7 @@ let mutate, closeReportVariables const reviewMutation = gql` - mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) { + mutation ($resourceId: ID!, $disable: Boolean, $closed: Boolean) { review(resourceId: $resourceId, disable: $disable, closed: $closed) { createdAt updatedAt diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js index 9d7795dd4..f600e7d1c 100644 --- a/backend/src/schema/resolvers/notifications.spec.js +++ b/backend/src/schema/resolvers/notifications.spec.js @@ -139,7 +139,7 @@ describe('given some notifications', () => { describe('notifications', () => { const notificationQuery = gql` - query($read: Boolean, $orderBy: NotificationOrdering) { + query ($read: Boolean, $orderBy: NotificationOrdering) { notifications(read: $read, orderBy: $orderBy) { from { __typename @@ -249,7 +249,7 @@ describe('given some notifications', () => { const deletePostAction = async () => { authenticatedUser = await author.toJson() const deletePostMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { DeletePost(id: $id) { id deleted @@ -284,7 +284,7 @@ describe('given some notifications', () => { describe('markAsRead', () => { const markAsReadMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { markAsRead(id: $id) { from { __typename diff --git a/backend/src/schema/resolvers/passwordReset.spec.js b/backend/src/schema/resolvers/passwordReset.spec.js index fd1395c57..40a18f5d9 100644 --- a/backend/src/schema/resolvers/passwordReset.spec.js +++ b/backend/src/schema/resolvers/passwordReset.spec.js @@ -55,7 +55,7 @@ describe('passwordReset', () => { describe('requestPasswordReset', () => { const mutation = gql` - mutation($email: String!) { + mutation ($email: String!) { requestPasswordReset(email: $email) } ` @@ -116,7 +116,7 @@ describe('resetPassword', () => { } const mutation = gql` - mutation($nonce: String!, $email: String!, $newPassword: String!) { + mutation ($nonce: String!, $email: String!, $newPassword: String!) { resetPassword(nonce: $nonce, email: $email, newPassword: $newPassword) } ` @@ -196,7 +196,7 @@ describe('resetPassword', () => { it('updates password of the user', async () => { await mutate({ mutation, variables }) const checkLoginMutation = gql` - mutation($email: String!, $password: String!) { + mutation ($email: String!, $password: String!) { login(email: $email, password: $password) } ` diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js index 1317d7c22..20dbecfb6 100644 --- a/backend/src/schema/resolvers/posts.spec.js +++ b/backend/src/schema/resolvers/posts.spec.js @@ -16,7 +16,7 @@ const categoryIds = ['cat9', 'cat4', 'cat15'] let variables const createPostMutation = gql` - mutation($id: ID, $title: String!, $content: String!, $language: String, $categoryIds: [ID]) { + mutation ($id: ID, $title: String!, $content: String!, $language: String, $categoryIds: [ID]) { CreatePost( id: $id title: $title @@ -323,7 +323,7 @@ describe('CreatePost', () => { describe('UpdatePost', () => { let author, newlyCreatedPost const updatePostMutation = gql` - mutation($id: ID!, $title: String!, $content: String!, $image: ImageInput) { + mutation ($id: ID!, $title: String!, $content: String!, $image: ImageInput) { UpdatePost(id: $id, title: $title, content: $content, image: $image) { id title @@ -497,7 +497,7 @@ describe('UpdatePost', () => { describe('pin posts', () => { let author const pinPostMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { pinPost(id: $id) { id title @@ -773,7 +773,7 @@ describe('pin posts', () => { it('pinned post appear first even when created before other posts', async () => { const postOrderingQuery = gql` - query($orderBy: [_PostOrdering]) { + query ($orderBy: [_PostOrdering]) { Post(orderBy: $orderBy) { id pinned @@ -816,7 +816,7 @@ describe('pin posts', () => { describe('unpin posts', () => { let pinnedPost const unpinPostMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { unpinPost(id: $id) { id title @@ -928,7 +928,7 @@ describe('unpin posts', () => { describe('DeletePost', () => { let author const deletePostMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { DeletePost(id: $id) { id deleted @@ -1052,14 +1052,14 @@ describe('DeletePost', () => { describe('emotions', () => { let author, postToEmote const PostsEmotionsCountQuery = gql` - query($id: ID!) { + query ($id: ID!) { Post(id: $id) { emotionsCount } } ` const PostsEmotionsQuery = gql` - query($id: ID!) { + query ($id: ID!) { Post(id: $id) { emotions { emotion @@ -1093,7 +1093,7 @@ describe('emotions', () => { describe('AddPostEmotions', () => { const addPostEmotionsMutation = gql` - mutation($to: _PostInput!, $data: _EMOTEDInput!) { + mutation ($to: _PostInput!, $data: _EMOTEDInput!) { AddPostEmotions(to: $to, data: $data) { from { id @@ -1210,7 +1210,7 @@ describe('emotions', () => { describe('RemovePostEmotions', () => { let removePostEmotionsVariables, postsEmotionsQueryVariables const removePostEmotionsMutation = gql` - mutation($to: _PostInput!, $data: _EMOTEDInput!) { + mutation ($to: _PostInput!, $data: _EMOTEDInput!) { RemovePostEmotions(to: $to, data: $data) { from { id @@ -1309,13 +1309,13 @@ describe('emotions', () => { let PostsEmotionsByCurrentUserVariables const PostsEmotionsCountByEmotionQuery = gql` - query($postId: ID!, $data: _EMOTEDInput!) { + query ($postId: ID!, $data: _EMOTEDInput!) { PostsEmotionsCountByEmotion(postId: $postId, data: $data) } ` const PostsEmotionsByCurrentUserQuery = gql` - query($postId: ID!) { + query ($postId: ID!) { PostsEmotionsByCurrentUser(postId: $postId) } ` diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js index c8b71deb9..25e8fd1c8 100644 --- a/backend/src/schema/resolvers/registration.spec.js +++ b/backend/src/schema/resolvers/registration.spec.js @@ -36,7 +36,7 @@ afterEach(async () => { describe('Signup', () => { const mutation = gql` - mutation($email: String!, $inviteCode: String) { + mutation ($email: String!, $inviteCode: String) { Signup(email: $email, inviteCode: $inviteCode) { email } @@ -145,7 +145,7 @@ describe('Signup', () => { describe('SignupVerification', () => { const mutation = gql` - mutation( + mutation ( $name: String! $password: String! $email: String! diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js index 2ecccfc23..1208db7fe 100644 --- a/backend/src/schema/resolvers/reports.spec.js +++ b/backend/src/schema/resolvers/reports.spec.js @@ -11,7 +11,7 @@ describe('file a report on a resource', () => { let authenticatedUser, currentUser, mutate, query, moderator, abusiveUser, otherReportingUser const categoryIds = ['cat9'] const fileReportMutation = gql` - mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) { + mutation ($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) { fileReport( resourceId: $resourceId reasonCategory: $reasonCategory @@ -42,7 +42,7 @@ describe('file a report on a resource', () => { reasonDescription: 'Violates code of conduct !!!', } const reportsQuery = gql` - query($closed: Boolean) { + query ($closed: Boolean) { reports(orderBy: createdAt_desc, closed: $closed) { id createdAt @@ -74,7 +74,7 @@ describe('file a report on a resource', () => { } ` const reviewMutation = gql` - mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) { + mutation ($resourceId: ID!, $disable: Boolean, $closed: Boolean) { review(resourceId: $resourceId, disable: $disable, closed: $closed) { createdAt resource { diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js index eaaa852ec..0f76e1ed1 100644 --- a/backend/src/schema/resolvers/rewards.spec.js +++ b/backend/src/schema/resolvers/rewards.spec.js @@ -76,7 +76,7 @@ describe('rewards', () => { describe('reward', () => { const rewardMutation = gql` - mutation($from: ID!, $to: ID!) { + mutation ($from: ID!, $to: ID!) { reward(badgeKey: $from, userId: $to) { id badges { @@ -266,7 +266,7 @@ describe('rewards', () => { } const unrewardMutation = gql` - mutation($from: ID!, $to: ID!) { + mutation ($from: ID!, $to: ID!) { unreward(badgeKey: $from, userId: $to) { id badges { diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js index a859bf296..ceb63304e 100644 --- a/backend/src/schema/resolvers/searches.spec.js +++ b/backend/src/schema/resolvers/searches.spec.js @@ -28,7 +28,7 @@ afterAll(async () => { }) const searchQuery = gql` - query($query: String!) { + query ($query: String!) { searchResults(query: $query, limit: 5) { __typename ... on Post { @@ -49,7 +49,7 @@ const searchQuery = gql` ` const searchPostQuery = gql` - query($query: String!, $firstPosts: Int, $postsOffset: Int) { + query ($query: String!, $firstPosts: Int, $postsOffset: Int) { searchPosts(query: $query, firstPosts: $firstPosts, postsOffset: $postsOffset) { postCount posts { diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js index 574907180..383bd83f0 100644 --- a/backend/src/schema/resolvers/shout.spec.js +++ b/backend/src/schema/resolvers/shout.spec.js @@ -9,17 +9,17 @@ const instance = getNeode() const driver = getDriver() const mutationShoutPost = gql` - mutation($id: ID!) { + mutation ($id: ID!) { shout(id: $id, type: Post) } ` const mutationUnshoutPost = gql` - mutation($id: ID!) { + mutation ($id: ID!) { unshout(id: $id, type: Post) } ` const queryPost = gql` - query($id: ID!) { + query ($id: ID!) { Post(id: $id) { id shoutedBy { diff --git a/backend/src/schema/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js index 898174199..cff20185b 100644 --- a/backend/src/schema/resolvers/socialMedia.spec.js +++ b/backend/src/schema/resolvers/socialMedia.spec.js @@ -70,7 +70,7 @@ describe('SocialMedia', () => { beforeEach(() => { mutation = gql` - mutation($url: String!) { + mutation ($url: String!) { CreateSocialMedia(url: $url) { id url @@ -131,7 +131,7 @@ describe('SocialMedia', () => { describe('ownedBy', () => { beforeEach(() => { mutation = gql` - mutation($url: String!) { + mutation ($url: String!) { CreateSocialMedia(url: $url) { url ownedBy { @@ -162,7 +162,7 @@ describe('SocialMedia', () => { const socialMedia = await setUpSocialMedia() mutation = gql` - mutation($id: ID!, $url: String!) { + mutation ($id: ID!, $url: String!) { UpdateSocialMedia(id: $id, url: $url) { id url @@ -225,7 +225,7 @@ describe('SocialMedia', () => { const socialMedia = await setUpSocialMedia() mutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { DeleteSocialMedia(id: $id) { id url diff --git a/backend/src/schema/resolvers/userData.spec.js b/backend/src/schema/resolvers/userData.spec.js index 972248d50..0a4e54295 100644 --- a/backend/src/schema/resolvers/userData.spec.js +++ b/backend/src/schema/resolvers/userData.spec.js @@ -39,7 +39,7 @@ afterAll(async () => { }) const userDataQuery = gql` - query($id: ID!) { + query ($id: ID!) { userData(id: $id) { user { id diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js index b434ea628..57fe4a7f4 100644 --- a/backend/src/schema/resolvers/user_management.spec.js +++ b/backend/src/schema/resolvers/user_management.spec.js @@ -171,7 +171,7 @@ describe('currentUser', () => { describe('login', () => { const loginMutation = gql` - mutation($email: String!, $password: String!) { + mutation ($email: String!, $password: String!) { login(email: $email, password: $password) } ` @@ -287,7 +287,7 @@ describe('login', () => { describe('change password', () => { const changePasswordMutation = gql` - mutation($oldPassword: String!, $newPassword: String!) { + mutation ($oldPassword: String!, $newPassword: String!) { changePassword(oldPassword: $oldPassword, newPassword: $newPassword) } ` diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js index e5e818040..6fd893240 100644 --- a/backend/src/schema/resolvers/users.spec.js +++ b/backend/src/schema/resolvers/users.spec.js @@ -17,7 +17,7 @@ const driver = getDriver() const neode = getNeode() const deleteUserMutation = gql` - mutation($id: ID!, $resource: [Deletable]) { + mutation ($id: ID!, $resource: [Deletable]) { DeleteUser(id: $id, resource: $resource) { id name @@ -46,7 +46,7 @@ const deleteUserMutation = gql` ` const switchUserRoleMutation = gql` - mutation($role: UserGroup!, $id: ID!) { + mutation ($role: UserGroup!, $id: ID!) { switchUserRole(role: $role, id: $id) { name role @@ -81,7 +81,7 @@ describe('User', () => { beforeEach(async () => { userQuery = gql` - query($email: String) { + query ($email: String) { User(email: $email) { name } @@ -144,7 +144,7 @@ describe('UpdateUser', () => { beforeEach(async () => { updateUserMutation = gql` - mutation( + mutation ( $id: ID! $name: String $termsAndConditionsAgreedVersion: String diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index 1ef427034..c966fe720 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -9,7 +9,7 @@ const driver = getDriver() let authenticatedUser, mutate, query, variables const updateUserMutation = gql` - mutation($id: ID!, $name: String!, $locationName: String) { + mutation ($id: ID!, $name: String!, $locationName: String) { UpdateUser(id: $id, name: $name, locationName: $locationName) { locationName } @@ -17,7 +17,7 @@ const updateUserMutation = gql` ` const queryLocations = gql` - query($place: String!, $lang: String!) { + query ($place: String!, $lang: String!) { queryLocations(place: $place, lang: $lang) { place_name id diff --git a/backend/src/schema/resolvers/users/mutedUsers.spec.js b/backend/src/schema/resolvers/users/mutedUsers.spec.js index 345b435f5..c86cf2eb1 100644 --- a/backend/src/schema/resolvers/users/mutedUsers.spec.js +++ b/backend/src/schema/resolvers/users/mutedUsers.spec.js @@ -93,7 +93,7 @@ describe('muteUser', () => { muteAction = (variables) => { const { mutate } = createTestClient(server) const muteUserMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { muteUser(id: $id) { id name @@ -310,7 +310,7 @@ describe('unmuteUser', () => { unmuteAction = (variables) => { const { mutate } = createTestClient(server) const unmuteUserMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { unmuteUser(id: $id) { id name diff --git a/backend/src/schema/resolvers/viewedTeaserCount.spec.js b/backend/src/schema/resolvers/viewedTeaserCount.spec.js index c81e272ec..ceb95c0ed 100644 --- a/backend/src/schema/resolvers/viewedTeaserCount.spec.js +++ b/backend/src/schema/resolvers/viewedTeaserCount.spec.js @@ -32,7 +32,7 @@ afterAll(async () => { describe('count post teaser views', () => { let aUser, bUser const markTeaserAsViewed = gql` - mutation($id: ID!) { + mutation ($id: ID!) { markTeaserAsViewed(id: $id) { id viewedTeaserCount diff --git a/backend/yarn.lock b/backend/yarn.lock index 7d6558da0..834275cba 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -910,6 +910,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.9.2": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" + integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" @@ -956,32 +963,32 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@graphql-toolkit/common@0.9.12": - version "0.9.12" - resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.9.12.tgz#a3bf91d00130100cfa0a72be718b16cc1011ab45" - integrity sha512-NjBVxeM1GB0bldiBm4UQoxKtbu/hjRfcqDEt1JPia+uXgFde3qTxtF5IZkworRFNCp+8KPSVrwcreQHSfFW63w== +"@graphql-toolkit/common@0.10.4": + version "0.10.4" + resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.10.4.tgz#7785f2a3f14559d0778859c49f4442078c196695" + integrity sha512-HQ3HaxCqX+UE8y/0h7LMDBBGSIKJxY/gaQesaksvE2Y+N4NpSWdiW6HpOcgXfC2HGf9yM0hEdsERzzL8z3mbHQ== dependencies: aggregate-error "3.0.1" camel-case "4.1.1" - graphql-tools-fork "9.0.1" + graphql-tools "5.0.0" lodash "4.17.15" -"@graphql-toolkit/file-loading@0.9.12": - version "0.9.12" - resolved "https://registry.yarnpkg.com/@graphql-toolkit/file-loading/-/file-loading-0.9.12.tgz#f7d5d7e042df59c4e6c8fe3417c67dd1cddf9043" - integrity sha512-xEmKkbWI5FXQARTN3dbPzshwcmduOJUvx1QGsfcuryVDdQJZynUEaPF7IxYaFpvQF7vwxGIRdff/jC/a5ypDrA== +"@graphql-toolkit/file-loading@0.10.4": + version "0.10.4" + resolved "https://registry.yarnpkg.com/@graphql-toolkit/file-loading/-/file-loading-0.10.4.tgz#50e8933e44b17853544c1fe63350df93f33a5e80" + integrity sha512-oUmy/sO3BJfax85pVKI7FZ6TWrViNuWXoJkRM293YV9bKGuYU9TgqZoHyM+oEqWO5ruXCL/nCdw3cIBau+rSNA== dependencies: globby "11.0.0" unixify "1.0.0" -"@graphql-toolkit/schema-merging@0.9.12": - version "0.9.12" - resolved "https://registry.yarnpkg.com/@graphql-toolkit/schema-merging/-/schema-merging-0.9.12.tgz#f058a7d256a4ed0e61e9874f90ae03326b81668e" - integrity sha512-ciqxLeMw7KPbJcq/xgnPbGyJGRO6bO1zQcdWCUSssyw8VDRHj5PFqEOAzT88eZQkEtg3qLN/wQEypeyFyNTHzw== +"@graphql-toolkit/schema-merging@0.10.4": + version "0.10.4" + resolved "https://registry.yarnpkg.com/@graphql-toolkit/schema-merging/-/schema-merging-0.10.4.tgz#2428590a531a33e9fe03be27cce9030f1c4c044b" + integrity sha512-naL6reYBuILLMrkMfKz0lOLL0kl6gGYnaaywnO/Dgp9F4NeAxDdAs5CV6Fy9NO5OzePFP58Dnc4sh2RyYrrFJg== dependencies: - "@graphql-toolkit/common" "0.9.12" + "@graphql-toolkit/common" "0.10.4" deepmerge "4.2.2" - graphql-tools-fork "9.0.1" + graphql-tools "5.0.0" tslib "1.11.1" "@hapi/address@2.x.x": @@ -2036,7 +2043,7 @@ apollo-link-context@~1.0.20: apollo-link "^1.2.14" tslib "^1.9.3" -apollo-link-http-common@^0.2.15, apollo-link-http-common@^0.2.16: +apollo-link-http-common@^0.2.14, apollo-link-http-common@^0.2.16: version "0.2.16" resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz#756749dafc732792c8ca0923f9a40564b7c59ecc" integrity sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg== @@ -2054,7 +2061,7 @@ apollo-link-http@~1.5.17: apollo-link-http-common "^0.2.16" tslib "^1.9.3" -apollo-link@^1.0.0, apollo-link@^1.2.13, apollo-link@^1.2.14: +apollo-link@^1.0.0, apollo-link@^1.2.12, apollo-link@^1.2.14: version "1.2.14" resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9" integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg== @@ -2211,6 +2218,16 @@ apollo-tracing@^0.12.0: apollo-server-env "^2.4.5" apollo-server-plugin-base "^0.10.2" +apollo-upload-client@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz#146d1ddd85d711fcac8ca97a72d3ca6787f2b71b" + integrity sha512-lJ9/bk1BH1lD15WhWRha2J3+LrXrPIX5LP5EwiOUHv8PCORp4EUrcujrA3rI5hZeZygrTX8bshcuMdpqpSrvtA== + dependencies: + "@babel/runtime" "^7.9.2" + apollo-link "^1.2.12" + apollo-link-http-common "^0.2.14" + extract-files "^8.0.0" + apollo-utilities@1.3.3, apollo-utilities@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.3.tgz#f1854715a7be80cd810bc3ac95df085815c0787c" @@ -4299,10 +4316,10 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-files@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-7.0.0.tgz#3dc7853320ff7876ec62d6e98f2f4e6f3e6282f6" - integrity sha512-3AUlT7TD+DbQXNe3t70QrgJU6Wgcp7rk1Zm0vqWz8OYnw4vxihgG0TgZ2SIGrVqScc4WfOu7B4a0BezGJ0YqvQ== +extract-files@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-8.1.0.tgz#46a0690d0fe77411a2e3804852adeaa65cd59288" + integrity sha512-PTGtfthZK79WUMk+avLmwx3NGdU8+iVFXC2NMGxKsn0MnihOG2lvumj+AZo8CTwTrwjXDgZ5tztbRlEdRjBonQ== extsprintf@1.3.0: version "1.3.0" @@ -4849,19 +4866,19 @@ graphql-tag@^2.9.2, graphql-tag@~2.10.3: resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.3.tgz#ea1baba5eb8fc6339e4c4cf049dabe522b0edf03" integrity sha512-4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA== -graphql-tools-fork@9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/graphql-tools-fork/-/graphql-tools-fork-9.0.1.tgz#fc8df40c108bdba3268999dea355cc614c765038" - integrity sha512-kM6mUNVekgnWKtVqLGQ9HvQqQ3zZVPZRg1esltBoohsbUMaChl+9QkjBjoMxnZPnbTGOOGGagopNBQALIBysNg== +graphql-tools@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-5.0.0.tgz#67281c834a0e29f458adba8018f424816fa627e9" + integrity sha512-5zn3vtn//382b7G3Wzz3d5q/sh+f7tVrnxeuhTMTJ7pWJijNqLxH7VEzv8VwXCq19zAzHYEosFHfXiK7qzvk7w== dependencies: - apollo-link "^1.2.13" - apollo-link-http-common "^0.2.15" + apollo-link "^1.2.14" + apollo-upload-client "^13.0.0" deprecated-decorator "^0.1.6" - extract-files "^7.0.0" form-data "^3.0.0" iterall "^1.3.0" node-fetch "^2.6.0" - uuid "^7.0.2" + tslib "^1.11.1" + uuid "^7.0.3" graphql-tools@^4.0.0, graphql-tools@^4.0.4, graphql-tools@^4.0.5: version "4.0.8" @@ -6606,13 +6623,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.7: - version "1.7.7" - resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.7.7.tgz#673898f97c384d88fd66e49359b2f604e5864441" - integrity sha512-3mjFHXpsF+bnsnSy/FlZiWCcNo7AULuG8kEBE+YVX8qbzNrEPJVhSg7ANr5LjQZbGtSlTz7fa3Wqw0bfbQ5R5Q== +merge-graphql-schemas@^1.7.8: + version "1.7.8" + resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.7.8.tgz#11a0a672a38a61d988c09ffdebe1bd4f8418de48" + integrity sha512-C3EJ1i86OjmbcCT524wVPRl17M5VZzgyh9kIGYAlYnAILX+7xfh8cCbMKfehh9n4opZg6CtcPogCiVZ6PB2NyQ== dependencies: - "@graphql-toolkit/file-loading" "0.9.12" - "@graphql-toolkit/schema-merging" "0.9.12" + "@graphql-toolkit/file-loading" "0.10.4" + "@graphql-toolkit/schema-merging" "0.10.4" tslib "1.11.1" merge-stream@^2.0.0: @@ -7816,10 +7833,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b" - integrity sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw== +prettier@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" + integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== pretty-format@^25.3.0: version "25.3.0" @@ -9406,15 +9423,15 @@ ts-invariant@^0.4.0: dependencies: tslib "^1.9.3" -tslib@1.11.1, tslib@^1.9.0: +tslib@1.11.1: version "1.11.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== -tslib@^1.10.0, tslib@^1.9.3: - version "1.13.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" - integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== +tslib@^1.10.0, tslib@^1.11.1, tslib@^1.9.0, tslib@^1.9.3: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tunnel-agent@^0.6.0: version "0.6.0" @@ -9689,7 +9706,7 @@ uuid@^3.1.0, uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^7.0.2: +uuid@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== diff --git a/package.json b/package.json index ca1429fce..7c95be953 100644 --- a/package.json +++ b/package.json @@ -49,5 +49,6 @@ }, "resolutions": { "set-value": "^2.0.1" - } + }, + "dependencies": {} } diff --git a/webapp/components/Editor/MenuBar.vue b/webapp/components/Editor/MenuBar.vue index 3756e1ae2..b64cf779e 100644 --- a/webapp/components/Editor/MenuBar.vue +++ b/webapp/components/Editor/MenuBar.vue @@ -59,6 +59,8 @@ :onClick="commands.horizontal_rule" icon="minus" /> + +