From c9caa5bf4c19d82e741774fc4edfb37eb48fd558 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Tue, 25 Feb 2020 13:16:48 +0100 Subject: [PATCH] Fix uuid deprecations --- backend/src/db/factories.js | 2 +- backend/src/models/Category.js | 2 +- backend/src/models/Comment.js | 2 +- backend/src/models/Donations.js | 2 +- backend/src/models/Post.js | 2 +- backend/src/models/Report.js | 2 +- backend/src/models/SocialMedia.js | 2 +- backend/src/models/User.js | 2 +- backend/src/schema/resolvers/comments.js | 2 +- backend/src/schema/resolvers/fileUpload/index.js | 2 +- backend/src/schema/resolvers/helpers/generateNonce.js | 2 +- backend/src/schema/resolvers/passwordReset.js | 2 +- backend/src/schema/resolvers/posts.js | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js index 754f84dec..159a71a62 100644 --- a/backend/src/db/factories.js +++ b/backend/src/db/factories.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' import faker from 'faker' import slugify from 'slug' import { hashSync } from 'bcryptjs' diff --git a/backend/src/models/Category.js b/backend/src/models/Category.js index 223bb4f87..ea617adc8 100644 --- a/backend/src/models/Category.js +++ b/backend/src/models/Category.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' export default { id: { type: 'string', primary: true, default: uuid }, diff --git a/backend/src/models/Comment.js b/backend/src/models/Comment.js index 773152541..f4548f0c2 100644 --- a/backend/src/models/Comment.js +++ b/backend/src/models/Comment.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' export default { id: { type: 'string', primary: true, default: uuid }, diff --git a/backend/src/models/Donations.js b/backend/src/models/Donations.js index 45d737f85..1409c85d4 100644 --- a/backend/src/models/Donations.js +++ b/backend/src/models/Donations.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' export default { id: { type: 'string', primary: true, default: uuid }, diff --git a/backend/src/models/Post.js b/backend/src/models/Post.js index 63a36d3a2..15eedbf64 100644 --- a/backend/src/models/Post.js +++ b/backend/src/models/Post.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' export default { id: { type: 'string', primary: true, default: uuid }, diff --git a/backend/src/models/Report.js b/backend/src/models/Report.js index 93876f404..3e001746b 100644 --- a/backend/src/models/Report.js +++ b/backend/src/models/Report.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' export default { id: { type: 'string', primary: true, default: uuid }, diff --git a/backend/src/models/SocialMedia.js b/backend/src/models/SocialMedia.js index abdb12b02..6010c97bb 100644 --- a/backend/src/models/SocialMedia.js +++ b/backend/src/models/SocialMedia.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' export default { id: { type: 'string', primary: true, default: uuid }, diff --git a/backend/src/models/User.js b/backend/src/models/User.js index 055cbfc83..d79fb79b9 100644 --- a/backend/src/models/User.js +++ b/backend/src/models/User.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' export default { id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js index 864d9412c..67a6675c9 100644 --- a/backend/src/schema/resolvers/comments.js +++ b/backend/src/schema/resolvers/comments.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' import Resolver from './helpers/Resolver' export default { diff --git a/backend/src/schema/resolvers/fileUpload/index.js b/backend/src/schema/resolvers/fileUpload/index.js index df0145057..3c41a5d11 100644 --- a/backend/src/schema/resolvers/fileUpload/index.js +++ b/backend/src/schema/resolvers/fileUpload/index.js @@ -1,7 +1,7 @@ import { createWriteStream } from 'fs' import path from 'path' import slug from 'slug' -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' const localFileUpload = async ({ createReadStream, uniqueFilename }) => { await new Promise((resolve, reject) => diff --git a/backend/src/schema/resolvers/helpers/generateNonce.js b/backend/src/schema/resolvers/helpers/generateNonce.js index 4dde1df04..e9b758774 100644 --- a/backend/src/schema/resolvers/helpers/generateNonce.js +++ b/backend/src/schema/resolvers/helpers/generateNonce.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' export default function generateNonce() { return uuid().substring(0, 6) } diff --git a/backend/src/schema/resolvers/passwordReset.js b/backend/src/schema/resolvers/passwordReset.js index 74c71e011..6f95f5a3c 100644 --- a/backend/src/schema/resolvers/passwordReset.js +++ b/backend/src/schema/resolvers/passwordReset.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' import bcrypt from 'bcryptjs' import createPasswordReset from './helpers/createPasswordReset' diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js index af8165997..1d4c4bfaa 100644 --- a/backend/src/schema/resolvers/posts.js +++ b/backend/src/schema/resolvers/posts.js @@ -1,4 +1,4 @@ -import uuid from 'uuid/v4' +import { v4 as uuid } from 'uuid' import { neo4jgraphql } from 'neo4j-graphql-js' import { isEmpty } from 'lodash' import { UserInputError } from 'apollo-server'