From 75d7ad4a3c7d4d24f9f3c30684d28dee80b8d8bb Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 6 Jun 2023 12:50:19 +0200 Subject: [PATCH 1/5] types for random-bigint --- backend/@types/random-bigint/index.d.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 backend/@types/random-bigint/index.d.ts diff --git a/backend/@types/random-bigint/index.d.ts b/backend/@types/random-bigint/index.d.ts new file mode 100644 index 000000000..e76cf8e1f --- /dev/null +++ b/backend/@types/random-bigint/index.d.ts @@ -0,0 +1,5 @@ +/* eslint-disable @typescript-eslint/ban-types */ +declare module 'random-bigint' { + export function random(bits: number, cb?: (err: Error, num: BigInt) => void): BigInt + export = random +} From c2a32088491d7d10f0123df7fd31cecf53911b62 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 6 Jun 2023 12:50:33 +0200 Subject: [PATCH 2/5] import random-biginto properly --- backend/src/graphql/resolver/UserResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index cbfd9b5c5..59a6e3cbc 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -70,13 +70,13 @@ import { communityDbUser } from '@/util/communityUser' import { hasElopageBuys } from '@/util/hasElopageBuys' import { getTimeDurationObject, printTimeDuration } from '@/util/time' +import { random } from 'random-bigint' + import { FULL_CREATION_AVAILABLE } from './const/const' import { getUserCreations } from './util/creations' import { findUserByIdentifier } from './util/findUserByIdentifier' import { validateAlias } from './util/validateAlias' -// eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs -const random = require('random-bigint') // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs const sodium = require('sodium-native') From 68f77e4d1fb05528f7764f6cbda263e8a5b4630b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 6 Jun 2023 12:50:53 +0200 Subject: [PATCH 3/5] ignore random-bigint inport-relative rule --- backend/.eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js index 78ac9e41e..0007fd125 100644 --- a/backend/.eslintrc.js +++ b/backend/.eslintrc.js @@ -58,7 +58,7 @@ module.exports = { 'import/no-dynamic-require': 'error', 'import/no-internal-modules': 'off', 'import/no-relative-packages': 'error', - 'import/no-relative-parent-imports': ['error', { ignore: ['@/*'] }], + 'import/no-relative-parent-imports': ['error', { ignore: ['@/*', 'random-bigint'] }], 'import/no-self-import': 'error', 'import/no-unresolved': 'error', 'import/no-useless-path-segments': 'error', From 18a4829ea67419b6e5eb1801698fc5f53045ae72 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 6 Jun 2023 13:02:21 +0200 Subject: [PATCH 4/5] try with default export --- backend/@types/random-bigint/index.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/@types/random-bigint/index.d.ts b/backend/@types/random-bigint/index.d.ts index e76cf8e1f..afaa832d9 100644 --- a/backend/@types/random-bigint/index.d.ts +++ b/backend/@types/random-bigint/index.d.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/ban-types */ declare module 'random-bigint' { export function random(bits: number, cb?: (err: Error, num: BigInt) => void): BigInt - export = random + // eslint-disable-next-line import/no-default-export + export default random } From 8545b2b9c55bd35dbf91ff0566e76e9825ff7ede Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 6 Jun 2023 13:06:24 +0200 Subject: [PATCH 5/5] fix import properly --- backend/@types/random-bigint/index.d.ts | 5 ++--- backend/src/graphql/resolver/UserResolver.ts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/@types/random-bigint/index.d.ts b/backend/@types/random-bigint/index.d.ts index afaa832d9..0f685e722 100644 --- a/backend/@types/random-bigint/index.d.ts +++ b/backend/@types/random-bigint/index.d.ts @@ -1,6 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ declare module 'random-bigint' { - export function random(bits: number, cb?: (err: Error, num: BigInt) => void): BigInt - // eslint-disable-next-line import/no-default-export - export default random + function random(bits: number, cb?: (err: Error, num: BigInt) => void): BigInt + export = random } diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 59a6e3cbc..9934c93de 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -70,7 +70,7 @@ import { communityDbUser } from '@/util/communityUser' import { hasElopageBuys } from '@/util/hasElopageBuys' import { getTimeDurationObject, printTimeDuration } from '@/util/time' -import { random } from 'random-bigint' +import random from 'random-bigint' import { FULL_CREATION_AVAILABLE } from './const/const' import { getUserCreations } from './util/creations'