From 4e024d84a63f2f8a11b7a3dadd20bdcc8814d8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Belli?= Date: Wed, 22 Nov 2023 20:23:52 +0100 Subject: [PATCH] feat: remove unused dependencies --- examples/accounts-microservice/package.json | 4 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../graphql-server-typescript/package.json | 2 +- modules/module-core/package.json | 20 +- modules/module-magic-link/package.json | 17 +- modules/module-mikro-orm/package.json | 35 +-- modules/module-mongo/package.json | 30 +-- modules/module-password/package.json | 18 +- modules/module-typeorm/package.json | 28 +-- packages/apollo-link-accounts/package.json | 9 +- packages/client-magic-link/package.json | 5 +- packages/client-password/package.json | 5 +- packages/client/package.json | 12 +- packages/database-mikro-orm/package.json | 32 +-- .../database-mongo-magic-link/package.json | 5 +- packages/database-mongo-password/package.json | 5 +- packages/database-mongo-sessions/package.json | 5 +- .../__tests__/database-tests.ts | 12 +- packages/database-mongo/package.json | 17 +- packages/database-redis/package.json | 9 +- packages/database-redis/src/redis.ts | 4 +- packages/database-tests/package.json | 6 +- packages/database-typeorm/package.json | 22 +- packages/e2e/package.json | 14 +- packages/error/package.json | 5 +- packages/express-session/package.json | 19 +- packages/express-session/src/index.ts | 4 +- .../src/utils/get-user-agent.ts | 4 +- packages/graphql-client/package.json | 9 +- packages/magic-link/package.json | 11 +- packages/oauth-instagram/package.json | 5 +- packages/oauth-twitter/package.json | 5 +- .../src/accounts-oauth-twitter.ts | 4 +- packages/oauth/package.json | 13 +- packages/password/package.json | 13 +- packages/rest-client/package.json | 10 +- packages/rest-express/package.json | 5 +- .../rest-express/src/express-middleware.ts | 4 +- packages/server/package.json | 9 +- packages/two-factor/package.json | 7 +- packages/types/package.json | 9 +- yarn.lock | 235 ++++-------------- 44 files changed, 187 insertions(+), 506 deletions(-) diff --git a/examples/accounts-microservice/package.json b/examples/accounts-microservice/package.json index 9098c0e22..5ad579488 100644 --- a/examples/accounts-microservice/package.json +++ b/examples/accounts-microservice/package.json @@ -22,9 +22,9 @@ "@envelop/graphql-modules": "6.0.0", "@graphql-tools/delegate": "10.0.3", "@graphql-tools/merge": "9.0.0", - "@graphql-tools/schema": "10.0.0", + "@graphql-tools/schema": "10.0.1", "@graphql-tools/stitch": "9.0.3", - "@graphql-tools/utils": "10.0.8", + "@graphql-tools/utils": "10.0.9", "@graphql-tools/wrap": "10.0.1", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", diff --git a/examples/graphql-server-mikro-orm-postgres/package.json b/examples/graphql-server-mikro-orm-postgres/package.json index 5e710a502..770c3f108 100755 --- a/examples/graphql-server-mikro-orm-postgres/package.json +++ b/examples/graphql-server-mikro-orm-postgres/package.json @@ -28,7 +28,7 @@ "@envelop/core": "5.0.0", "@envelop/graphql-modules": "6.0.0", "@graphql-tools/merge": "9.0.0", - "@graphql-tools/schema": "10.0.0", + "@graphql-tools/schema": "10.0.1", "@mikro-orm/cli": "6.0.0-dev.195", "@mikro-orm/core": "6.0.0-dev.195", "@mikro-orm/entity-generator": "6.0.0-dev.195", diff --git a/examples/graphql-server-typescript-apollo/package.json b/examples/graphql-server-typescript-apollo/package.json index 04627abe3..5797a03f5 100644 --- a/examples/graphql-server-typescript-apollo/package.json +++ b/examples/graphql-server-typescript-apollo/package.json @@ -18,7 +18,7 @@ "@apollo/server": "4.9.5", "@apollo/server-plugin-landing-page-graphql-playground": "4.0.1", "@graphql-tools/merge": "9.0.0", - "@graphql-tools/schema": "10.0.0", + "@graphql-tools/schema": "10.0.1", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", "graphql-tag": "2.12.6", diff --git a/examples/graphql-server-typescript-basic/package.json b/examples/graphql-server-typescript-basic/package.json index 516e59bcc..00ba0e01b 100644 --- a/examples/graphql-server-typescript-basic/package.json +++ b/examples/graphql-server-typescript-basic/package.json @@ -16,7 +16,7 @@ "@accounts/password": "^0.32.2", "@accounts/server": "^0.33.1", "@graphql-tools/merge": "9.0.0", - "@graphql-tools/schema": "10.0.0", + "@graphql-tools/schema": "10.0.1", "graphql": "16.8.1", "graphql-http": "1.22.0", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", diff --git a/examples/graphql-server-typescript/package.json b/examples/graphql-server-typescript/package.json index f17f7c883..ee6a1694b 100644 --- a/examples/graphql-server-typescript/package.json +++ b/examples/graphql-server-typescript/package.json @@ -18,7 +18,7 @@ "@envelop/core": "5.0.0", "@envelop/graphql-modules": "6.0.0", "@graphql-tools/merge": "9.0.0", - "@graphql-tools/schema": "10.0.0", + "@graphql-tools/schema": "10.0.1", "express": "^4.18.2", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", diff --git a/modules/module-core/package.json b/modules/module-core/package.json index bf0e528ef..2db1ab738 100644 --- a/modules/module-core/package.json +++ b/modules/module-core/package.json @@ -33,18 +33,16 @@ }, "homepage": "https://github.com/js-accounts/accounts", "peerDependencies": { - "@accounts/server": "^0.32.0 || ^0.33.0", - "@accounts/types": "^0.32.0 || ^0.33.0", - "@graphql-tools/schema": "^10.0.0", - "graphql": "^16.0.0", - "graphql-modules": "^3.0.0", - "graphql-tag": "^2.10.0" + "@accounts/server": "^0.33.0", + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", + "graphql-modules": "^3.0.0" }, "dependencies": { "@graphql-tools/merge": "9.0.0", - "@graphql-tools/utils": "10.0.8", - "request-ip": "3.3.0", - "tslib": "2.6.2" + "@graphql-tools/schema": "10.0.1", + "@graphql-tools/utils": "10.0.9", + "graphql-tag": "2.12.6", + "request-ip": "3.3.0" }, "devDependencies": { "@accounts/server": "^0.33.1", @@ -56,11 +54,9 @@ "@graphql-codegen/typescript-operations": "4.0.1", "@graphql-codegen/typescript-resolvers": "4.0.1", "@graphql-codegen/typescript-type-graphql": "3.0.0", - "@graphql-tools/schema": "10.0.0", "@types/request-ip": "0.0.41", "graphql": "16.8.1", "graphql-http": "1.22.0", - "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", - "graphql-tag": "2.12.6" + "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e" } } diff --git a/modules/module-magic-link/package.json b/modules/module-magic-link/package.json index 0265c02ca..09428e260 100644 --- a/modules/module-magic-link/package.json +++ b/modules/module-magic-link/package.json @@ -35,23 +35,16 @@ "peerDependencies": { "@accounts/magic-link": "^0.1.0", "@accounts/module-core": "^0.34.0", - "@accounts/server": "^0.32.0 || ^0.33.0", - "@accounts/types": "^0.32.0 || ^0.33.0", - "graphql": "^16.0.0", - "graphql-modules": "^3.0.0", - "graphql-tag": "^2.10.0" + "@accounts/server": "^0.33.0", + "graphql-modules": "^3.0.0" }, "dependencies": { - "@graphql-tools/merge": "9.0.0", - "@graphql-tools/utils": "10.0.8", - "request-ip": "3.3.0", - "tslib": "2.6.2" + "graphql-tag": "2.12.6" }, "devDependencies": { "@accounts/magic-link": "^0.1.1", "@accounts/module-core": "^0.34.0", "@accounts/server": "^0.33.1", - "@accounts/types": "^0.33.2", "@graphql-codegen/add": "5.0.0", "@graphql-codegen/cli": "5.0.0", "@graphql-codegen/introspection": "4.0.0", @@ -59,9 +52,7 @@ "@graphql-codegen/typescript-operations": "4.0.1", "@graphql-codegen/typescript-resolvers": "4.0.1", "@graphql-codegen/typescript-type-graphql": "3.0.0", - "@types/request-ip": "0.0.41", "graphql": "16.8.1", - "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", - "graphql-tag": "2.12.6" + "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e" } } diff --git a/modules/module-mikro-orm/package.json b/modules/module-mikro-orm/package.json index 0020785c9..7cb0933b6 100644 --- a/modules/module-mikro-orm/package.json +++ b/modules/module-mikro-orm/package.json @@ -32,48 +32,21 @@ }, "homepage": "https://github.com/js-accounts/accounts", "peerDependencies": { - "@accounts/magic-link": "^0.1.0", "@accounts/mikro-orm": "^0.34.0", "@accounts/module-core": "^0.34.0", - "@accounts/password": "^0.32.0", - "@accounts/server": "^0.32.0 || ^0.33.0", - "@accounts/types": "^0.32.0 || ^0.33.0", + "@accounts/server": "^0.33.0", "@mikro-orm/core": "^6.0.0", - "graphql": "^16.0.0", - "graphql-modules": "^3.0.0", - "graphql-tag": "^2.10.0" - }, - "dependencies": { - "@graphql-tools/merge": "9.0.0", - "@graphql-tools/utils": "10.0.8", - "request-ip": "3.3.0", - "tslib": "2.6.2" + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", + "graphql-modules": "^3.0.0" }, "devDependencies": { - "@accounts/magic-link": "^0.1.1", "@accounts/mikro-orm": "^0.34.0", "@accounts/module-core": "^0.34.0", - "@accounts/password": "^0.32.1", "@accounts/server": "^0.33.1", "@accounts/types": "^0.33.2", - "@graphql-codegen/add": "5.0.0", - "@graphql-codegen/cli": "5.0.0", - "@graphql-codegen/introspection": "4.0.0", - "@graphql-codegen/typescript": "4.0.1", - "@graphql-codegen/typescript-operations": "4.0.1", - "@graphql-codegen/typescript-resolvers": "4.0.1", - "@graphql-codegen/typescript-type-graphql": "3.0.0", - "@mikro-orm/cli": "6.0.0-dev.195", "@mikro-orm/core": "6.0.0-dev.195", - "@mikro-orm/entity-generator": "6.0.0-dev.195", - "@mikro-orm/knex": "6.0.0-dev.195", "@mikro-orm/migrations": "6.0.0-dev.195", - "@mikro-orm/postgresql": "6.0.0-dev.195", - "@mikro-orm/reflection": "6.0.0-dev.195", - "@types/request-ip": "0.0.41", "graphql": "16.8.1", - "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", - "graphql-tag": "2.12.6", - "reflect-metadata": "0.1.13" + "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e" } } diff --git a/modules/module-mongo/package.json b/modules/module-mongo/package.json index 36afd1e6c..61fd46b9e 100644 --- a/modules/module-mongo/package.json +++ b/modules/module-mongo/package.json @@ -32,39 +32,19 @@ }, "homepage": "https://github.com/js-accounts/accounts", "peerDependencies": { - "@accounts/magic-link": "^0.1.0", "@accounts/mongo": "^0.34.0", - "@accounts/password": "^0.32.0", - "@accounts/server": "^0.32.0 || ^0.33.0", - "@accounts/types": "^0.32.0 || ^0.33.0", - "graphql": "^16.0.0", + "@accounts/server": "^0.33.0", + "@accounts/types": "^0.33.0", + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", "graphql-modules": "^3.0.0", - "graphql-tag": "^2.10.0" - }, - "dependencies": { - "@graphql-tools/merge": "9.0.0", - "@graphql-tools/utils": "10.0.8", - "request-ip": "3.3.0", - "tslib": "2.6.2" + "mongodb": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" }, "devDependencies": { - "@accounts/magic-link": "^0.1.1", "@accounts/mongo": "^0.34.0", - "@accounts/password": "^0.32.1", "@accounts/server": "^0.33.1", "@accounts/types": "^0.33.2", - "@graphql-codegen/add": "5.0.0", - "@graphql-codegen/cli": "5.0.0", - "@graphql-codegen/introspection": "4.0.0", - "@graphql-codegen/typescript": "4.0.1", - "@graphql-codegen/typescript-operations": "4.0.1", - "@graphql-codegen/typescript-resolvers": "4.0.1", - "@graphql-codegen/typescript-type-graphql": "3.0.0", - "@types/request-ip": "0.0.41", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", - "graphql-tag": "2.12.6", - "mongodb": "6.3.0", - "reflect-metadata": "0.1.13" + "mongodb": "6.3.0" } } diff --git a/modules/module-password/package.json b/modules/module-password/package.json index 17f727eb8..f07e3ba49 100644 --- a/modules/module-password/package.json +++ b/modules/module-password/package.json @@ -33,19 +33,13 @@ }, "homepage": "https://github.com/js-accounts/accounts", "peerDependencies": { - "@accounts/module-core": "^0.34.0", "@accounts/password": "^0.32.0", - "@accounts/server": "^0.32.0 || ^0.33.0", - "@accounts/types": "^0.32.0 || ^0.33.0", - "graphql": "^16.0.0", - "graphql-modules": "^3.0.0", - "graphql-tag": "^2.10.0" + "@accounts/server": "^0.33.0", + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", + "graphql-modules": "^3.0.0" }, "dependencies": { - "@graphql-tools/merge": "9.0.0", - "@graphql-tools/utils": "10.0.8", - "request-ip": "3.3.0", - "tslib": "2.6.2" + "graphql-tag": "2.12.6" }, "devDependencies": { "@accounts/module-core": "^0.34.0", @@ -59,9 +53,7 @@ "@graphql-codegen/typescript-operations": "4.0.1", "@graphql-codegen/typescript-resolvers": "4.0.1", "@graphql-codegen/typescript-type-graphql": "3.0.0", - "@types/request-ip": "0.0.41", "graphql": "16.8.1", - "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", - "graphql-tag": "2.12.6" + "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e" } } diff --git a/modules/module-typeorm/package.json b/modules/module-typeorm/package.json index 8392accc6..449c3bc13 100644 --- a/modules/module-typeorm/package.json +++ b/modules/module-typeorm/package.json @@ -32,42 +32,18 @@ }, "homepage": "https://github.com/js-accounts/accounts", "peerDependencies": { - "@accounts/magic-link": "^0.1.0", - "@accounts/module-core": "^0.34.0", - "@accounts/password": "^0.32.0", - "@accounts/server": "^0.32.0 || ^0.33.0", + "@accounts/server": "^0.33.0", "@accounts/typeorm": "^0.33.1", - "@accounts/types": "^0.32.0 || ^0.33.0", - "graphql": "^16.0.0", + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", "graphql-modules": "^3.0.0", - "graphql-tag": "^2.10.0", "typeorm": "^0.3.0" }, - "dependencies": { - "@graphql-tools/merge": "9.0.0", - "@graphql-tools/utils": "10.0.8", - "request-ip": "3.3.0", - "tslib": "2.6.2" - }, "devDependencies": { - "@accounts/magic-link": "^0.1.1", - "@accounts/module-core": "^0.34.0", - "@accounts/password": "^0.32.1", "@accounts/server": "^0.33.1", "@accounts/typeorm": "^0.33.1", "@accounts/types": "^0.33.2", - "@graphql-codegen/add": "5.0.0", - "@graphql-codegen/cli": "5.0.0", - "@graphql-codegen/introspection": "4.0.0", - "@graphql-codegen/typescript": "4.0.1", - "@graphql-codegen/typescript-operations": "4.0.1", - "@graphql-codegen/typescript-resolvers": "4.0.1", - "@graphql-codegen/typescript-type-graphql": "3.0.0", - "@types/request-ip": "0.0.41", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", - "graphql-tag": "2.12.6", - "reflect-metadata": "0.1.13", "typeorm": "0.3.17" } } diff --git a/packages/apollo-link-accounts/package.json b/packages/apollo-link-accounts/package.json index fd1634350..af1b630a4 100644 --- a/packages/apollo-link-accounts/package.json +++ b/packages/apollo-link-accounts/package.json @@ -24,15 +24,12 @@ }, "license": "MIT", "peerDependencies": { - "@apollo/client": "^3.0.0" - }, - "dependencies": { - "tslib": "2.6.2" + "@apollo/client": "^3.0.0", + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0" }, "devDependencies": { "@accounts/client": "^0.33.1", "@apollo/client": "3.8.7", - "graphql": "16.8.1", - "rimraf": "5.0.5" + "graphql": "16.8.1" } } diff --git a/packages/client-magic-link/package.json b/packages/client-magic-link/package.json index 537885a64..8406f693d 100644 --- a/packages/client-magic-link/package.json +++ b/packages/client-magic-link/package.json @@ -32,9 +32,8 @@ }, "author": "Leo Pradel", "license": "MIT", - "dependencies": { + "devDependencies": { "@accounts/client": "^0.33.1", - "@accounts/types": "^0.33.1", - "tslib": "2.6.2" + "@accounts/types": "^0.33.1" } } diff --git a/packages/client-password/package.json b/packages/client-password/package.json index dcba98d2e..3d9bb79d2 100644 --- a/packages/client-password/package.json +++ b/packages/client-password/package.json @@ -32,9 +32,8 @@ }, "author": "Leo Pradel", "license": "MIT", - "dependencies": { + "devDependencies": { "@accounts/client": "^0.33.1", - "@accounts/types": "^0.33.1", - "tslib": "2.6.2" + "@accounts/types": "^0.33.1" } } diff --git a/packages/client/package.json b/packages/client/package.json index 25bd2dbeb..70ee528ff 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -46,15 +46,11 @@ ], "author": "Tim Mikeladze", "license": "MIT", - "devDependencies": { - "@types/jsonwebtoken": "9.0.5", - "jest-localstorage-mock": "2.4.26", - "jsonwebtoken": "9.0.2", - "localstorage-polyfill": "1.0.1" - }, "dependencies": { + "jwt-decode": "3.1.2" + }, + "devDependencies": { "@accounts/types": "^0.33.1", - "jwt-decode": "3.1.2", - "tslib": "2.6.2" + "jest-localstorage-mock": "2.4.26" } } diff --git a/packages/database-mikro-orm/package.json b/packages/database-mikro-orm/package.json index 3749a9337..b0d660e14 100644 --- a/packages/database-mikro-orm/package.json +++ b/packages/database-mikro-orm/package.json @@ -25,33 +25,19 @@ }, "author": "Niccolò Belli ", "license": "MIT", + "peerDependencies": { + "@mikro-orm/core": "^6.0.0", + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", + "graphql-modules": "^3.0.0" + }, + "dependencies": { + "lodash": "^4.17.21" + }, "devDependencies": { - "@accounts/database-tests": "^0.32.2", - "@accounts/server": "^0.33.1", - "@mikro-orm/cli": "6.0.0-dev.195", + "@accounts/types": "^0.33.2", "@mikro-orm/core": "6.0.0-dev.195", - "@mikro-orm/entity-generator": "6.0.0-dev.195", - "@mikro-orm/knex": "6.0.0-dev.195", - "@mikro-orm/migrations": "6.0.0-dev.195", - "@mikro-orm/postgresql": "6.0.0-dev.195", - "@mikro-orm/reflection": "6.0.0-dev.195", "@types/lodash": "4.14.202", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e" - }, - "dependencies": { - "@accounts/types": "^0.33.2", - "lodash": "^4.17.21", - "tslib": "2.6.2" - }, - "peerDependencies": { - "@mikro-orm/cli": "^6.0.0", - "@mikro-orm/core": "^6.0.0", - "@mikro-orm/entity-generator": "^6.0.0", - "@mikro-orm/knex": "^6.0.0", - "@mikro-orm/migrations": "^6.0.0", - "@mikro-orm/postgresql": "^6.0.0", - "@mikro-orm/reflection": "^6.0.0", - "graphql-modules": "^3.0.0" } } diff --git a/packages/database-mongo-magic-link/package.json b/packages/database-mongo-magic-link/package.json index 92793e0b4..51ce0a208 100644 --- a/packages/database-mongo-magic-link/package.json +++ b/packages/database-mongo-magic-link/package.json @@ -33,12 +33,9 @@ "peerDependencies": { "mongodb": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" }, - "dependencies": { - "@accounts/types": "^0.33.1", - "tslib": "2.6.2" - }, "devDependencies": { "@accounts/mongo-password": "^0.33.0", + "@accounts/types": "^0.33.1", "mongodb": "6.3.0" } } diff --git a/packages/database-mongo-password/package.json b/packages/database-mongo-password/package.json index 42806bac1..562c095ba 100644 --- a/packages/database-mongo-password/package.json +++ b/packages/database-mongo-password/package.json @@ -33,11 +33,8 @@ "peerDependencies": { "mongodb": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" }, - "dependencies": { - "@accounts/types": "^0.33.2", - "tslib": "2.6.2" - }, "devDependencies": { + "@accounts/types": "^0.33.2", "mongodb": "6.3.0" } } diff --git a/packages/database-mongo-sessions/package.json b/packages/database-mongo-sessions/package.json index fc9ac9f99..20b1ef7c0 100644 --- a/packages/database-mongo-sessions/package.json +++ b/packages/database-mongo-sessions/package.json @@ -33,11 +33,8 @@ "peerDependencies": { "mongodb": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" }, - "dependencies": { - "@accounts/types": "^0.33.1", - "tslib": "2.6.2" - }, "devDependencies": { + "@accounts/types": "^0.33.1", "mongodb": "6.3.0" } } diff --git a/packages/database-mongo/__tests__/database-tests.ts b/packages/database-mongo/__tests__/database-tests.ts index b75238d89..d0a102b0e 100644 --- a/packages/database-mongo/__tests__/database-tests.ts +++ b/packages/database-mongo/__tests__/database-tests.ts @@ -1,12 +1,12 @@ import 'reflect-metadata'; -import * as mongodb from 'mongodb'; +import { type Db, MongoClient, ObjectId } from 'mongodb'; import { runDatabaseTests } from '@accounts/database-tests'; import { Mongo } from '../src'; export class DatabaseTests { public database!: Mongo; - public db!: mongodb.Db; - public client!: mongodb.MongoClient; + public db!: Db; + public client!: MongoClient; private options: any; constructor(options?: any) { @@ -28,7 +28,7 @@ export class DatabaseTests { public createConnection = async () => { const url = 'mongodb://localhost:27017'; - this.client = await mongodb.MongoClient.connect(url); + this.client = await MongoClient.connect(url); this.db = this.client.db('accounts-mongo-tests'); this.database = new Mongo(this.db, this.options); }; @@ -45,8 +45,8 @@ export class DatabaseTests { runDatabaseTests( new DatabaseTests({ convertUserIdToMongoObjectId: false, - idProvider: () => new mongodb.ObjectId().toString(), + idProvider: () => new ObjectId().toString(), convertSessionIdToMongoObjectId: false, - idSessionProvider: () => new mongodb.ObjectId().toString(), + idSessionProvider: () => new ObjectId().toString(), }) ); diff --git a/packages/database-mongo/package.json b/packages/database-mongo/package.json index a4d67de4e..a341883ff 100644 --- a/packages/database-mongo/package.json +++ b/packages/database-mongo/package.json @@ -28,20 +28,21 @@ }, "author": "Leo Pradel", "license": "MIT", + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", + "graphql-modules": "^3.0.0", + "mongodb": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" + }, "dependencies": { "@accounts/mongo-magic-link": "^0.1.1", "@accounts/mongo-password": "^0.33.0", - "@accounts/mongo-sessions": "^0.34.0", - "@accounts/types": "^0.33.1", - "mongodb": "6.3.0", - "tslib": "2.6.2" + "@accounts/mongo-sessions": "^0.34.0" }, "devDependencies": { "@accounts/database-tests": "^0.32.2", + "@accounts/types": "^0.33.1", "graphql": "16.8.1", - "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e" - }, - "peerDependencies": { - "graphql-modules": "^3.0.0" + "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", + "mongodb": "6.3.0" } } diff --git a/packages/database-redis/package.json b/packages/database-redis/package.json index fa339bac0..89d6e8458 100644 --- a/packages/database-redis/package.json +++ b/packages/database-redis/package.json @@ -32,14 +32,13 @@ "author": "Leo Pradel", "license": "MIT", "dependencies": { - "@accounts/types": "^0.33.1", - "ioredis": "5.3.2", - "shortid": "2.2.16", - "tslib": "2.6.2" + "shortid": "2.2.16" }, "devDependencies": { "@accounts/database-tests": "^0.32.2", + "@accounts/types": "^0.33.1", "@types/ioredis": "5.0.0", - "@types/shortid": "0.0.32" + "@types/shortid": "0.0.32", + "ioredis": "5.3.2" } } diff --git a/packages/database-redis/src/redis.ts b/packages/database-redis/src/redis.ts index 8ed4b3c6b..efb05fe83 100644 --- a/packages/database-redis/src/redis.ts +++ b/packages/database-redis/src/redis.ts @@ -1,5 +1,5 @@ import { type Redis } from 'ioredis'; -import * as shortid from 'shortid'; +import { generate } from 'shortid'; import { type Session, type DatabaseInterfaceSessions, @@ -14,7 +14,7 @@ const defaultOptions = { createdAt: 'createdAt', updatedAt: 'updatedAt', }, - idProvider: () => shortid.generate(), + idProvider: () => generate(), dateProvider: (date?: Date) => (date ? date.getTime() : Date.now()), }; diff --git a/packages/database-tests/package.json b/packages/database-tests/package.json index 365dbd137..f647e832b 100644 --- a/packages/database-tests/package.json +++ b/packages/database-tests/package.json @@ -20,9 +20,5 @@ "preset": "ts-jest" }, "author": "Leo Pradel", - "license": "MIT", - "dependencies": { - "@accounts/types": "^0.33.1", - "tslib": "2.6.2" - } + "license": "MIT" } diff --git a/packages/database-typeorm/package.json b/packages/database-typeorm/package.json index 67ea092f3..12ccc396d 100644 --- a/packages/database-typeorm/package.json +++ b/packages/database-typeorm/package.json @@ -28,23 +28,19 @@ }, "author": "Birkir Gudjonsson ", "license": "MIT", + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", + "graphql-modules": "^3.0.0", + "typeorm": "^0.3.0" + }, + "dependencies": { + "lodash": "4.17.21" + }, "devDependencies": { - "@accounts/database-tests": "^0.32.2", + "@accounts/types": "^0.33.1", "@types/lodash": "4.14.202", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", - "pg": "8.11.3", "typeorm": "0.3.17" - }, - "dependencies": { - "@accounts/types": "^0.33.1", - "lodash": "4.17.21", - "reflect-metadata": "0.1.13", - "tslib": "2.6.2" - }, - "peerDependencies": { - "graphql": "^16.0.0", - "graphql-modules": "^3.0.0", - "typeorm": "^0.3.0" } } diff --git a/packages/e2e/package.json b/packages/e2e/package.json index be260c12e..941eb8f68 100644 --- a/packages/e2e/package.json +++ b/packages/e2e/package.json @@ -25,13 +25,6 @@ "author": "Leo Pradel", "license": "MIT", "devDependencies": { - "@types/body-parser": "1.19.5", - "@types/express": "4.17.21", - "@types/node-fetch": "2.6.9", - "jest-localstorage-mock": "2.4.26", - "reflect-metadata": "0.1.13" - }, - "dependencies": { "@accounts/client": "^0.33.1", "@accounts/client-password": "^0.32.2", "@accounts/graphql-client": "^0.33.1", @@ -48,14 +41,17 @@ "@accounts/types": "^0.33.2", "@apollo/client": "3.8.7", "@apollo/server": "4.9.5", + "@types/body-parser": "1.19.5", + "@types/express": "4.17.21", + "@types/node-fetch": "2.6.9", "body-parser": "1.20.2", - "core-js": "3.33.3", "express": "4.18.2", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", + "jest-localstorage-mock": "2.4.26", "mongoose": "8.0.1", "node-fetch": "2.7.0", - "tslib": "2.6.2", + "reflect-metadata": "0.1.13", "typeorm": "0.3.17" } } diff --git a/packages/error/package.json b/packages/error/package.json index 5f31aead0..d3f0dc9ed 100644 --- a/packages/error/package.json +++ b/packages/error/package.json @@ -42,8 +42,5 @@ "oauth" ], "author": "Elies Lou (Aetherall)", - "license": "MIT", - "dependencies": { - "tslib": "2.6.2" - } + "license": "MIT" } diff --git a/packages/express-session/package.json b/packages/express-session/package.json index c2c28801d..1ea56455c 100644 --- a/packages/express-session/package.json +++ b/packages/express-session/package.json @@ -37,24 +37,21 @@ ], "author": "Kamil Kisiela", "license": "MIT", + "peerDependencies": { + "express-session": "^1.15.6" + }, + "dependencies": { + "lodash": "4.17.21", + "request-ip": "3.3.0" + }, "devDependencies": { "@accounts/server": "^0.33.1", + "@accounts/types": "^0.33.1", "@types/express": "4.17.21", "@types/express-session": "1.17.10", "@types/lodash": "4.14.202", "@types/request-ip": "0.0.41", "express": "4.18.2", "express-session": "1.17.3" - }, - "peerDependencies": { - "@accounts/server": "^0.32.0 || ^0.33.0", - "express": "^4.16.3", - "express-session": "^1.15.6" - }, - "dependencies": { - "@accounts/types": "^0.33.1", - "lodash": "4.17.21", - "request-ip": "3.3.0", - "tslib": "2.6.2" } } diff --git a/packages/express-session/src/index.ts b/packages/express-session/src/index.ts index 6bb4bd620..e7880a654 100644 --- a/packages/express-session/src/index.ts +++ b/packages/express-session/src/index.ts @@ -1,7 +1,7 @@ import { type AccountsServer } from '@accounts/server'; import { type Tokens, type User, type LoginResult } from '@accounts/types'; import { type Request, type Response, type NextFunction } from 'express'; -import * as requestIp from 'request-ip'; +import { getClientIp } from 'request-ip'; import { merge } from 'lodash'; import 'express-session'; import { getUserAgent } from './utils/get-user-agent'; @@ -92,7 +92,7 @@ export class AccountsSession { const result = await this.accountsServer.refreshTokens( tokens.accessToken, tokens.refreshToken, - { ip: requestIp.getClientIp(req), userAgent: getUserAgent(req) } + { ip: getClientIp(req), userAgent: getUserAgent(req) } ); this.set(req, result.tokens); diff --git a/packages/express-session/src/utils/get-user-agent.ts b/packages/express-session/src/utils/get-user-agent.ts index 3399bfc83..5906ae889 100644 --- a/packages/express-session/src/utils/get-user-agent.ts +++ b/packages/express-session/src/utils/get-user-agent.ts @@ -1,6 +1,6 @@ -import type * as express from 'express'; +import type { Request } from 'express'; -export const getUserAgent = (req: express.Request) => { +export const getUserAgent = (req: Request) => { let userAgent: string = (req.headers['user-agent'] as string) || ''; if (req.headers['x-ucbrowser-ua']) { // special case of UC Browser diff --git a/packages/graphql-client/package.json b/packages/graphql-client/package.json index bccb77928..ed3a242a9 100644 --- a/packages/graphql-client/package.json +++ b/packages/graphql-client/package.json @@ -30,20 +30,17 @@ }, "homepage": "https://github.com/js-accounts/graphql#readme", "peerDependencies": { - "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0" }, - "dependencies": { + "devDependencies": { "@accounts/client": "^0.33.1", "@accounts/types": "^0.33.1", - "@graphql-typed-document-node/core": "3.2.0", - "tslib": "2.6.2" - }, - "devDependencies": { "@graphql-codegen/add": "5.0.0", "@graphql-codegen/cli": "5.0.0", "@graphql-codegen/typed-document-node": "5.0.1", "@graphql-codegen/typescript": "4.0.1", "@graphql-codegen/typescript-operations": "4.0.1", + "@graphql-typed-document-node/core": "3.2.0", "graphql": "16.8.1" } } diff --git a/packages/magic-link/package.json b/packages/magic-link/package.json index fb4dcd52c..e7a354fd3 100644 --- a/packages/magic-link/package.json +++ b/packages/magic-link/package.json @@ -24,22 +24,17 @@ "testEnvironment": "node", "preset": "ts-jest" }, - "dependencies": { - "bcryptjs": "2.4.3", - "tslib": "2.6.2" + "peerDependencies": { + "@accounts/server": "^0.33.0", + "graphql-modules": "^3.0.0" }, "devDependencies": { "@accounts/server": "^0.33.1", "@accounts/types": "^0.33.1", - "@types/bcryptjs": "2.4.6", "@types/lodash.set": "4.3.9", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", "lodash.set": "4.3.2", "reflect-metadata": "0.1.13" - }, - "peerDependencies": { - "@accounts/server": "^0.32.0 || ^0.33.0", - "graphql-modules": "^3.0.0" } } diff --git a/packages/oauth-instagram/package.json b/packages/oauth-instagram/package.json index f1dd98999..d806b56d4 100644 --- a/packages/oauth-instagram/package.json +++ b/packages/oauth-instagram/package.json @@ -22,12 +22,11 @@ "preset": "ts-jest" }, "dependencies": { - "@accounts/oauth": "^0.32.2", "request": "2.88.2", - "request-promise": "4.2.6", - "tslib": "2.6.2" + "request-promise": "4.2.6" }, "devDependencies": { + "@accounts/oauth": "^0.32.2", "@types/request-promise": "4.1.51" } } diff --git a/packages/oauth-twitter/package.json b/packages/oauth-twitter/package.json index 2bf245d62..865e383a0 100644 --- a/packages/oauth-twitter/package.json +++ b/packages/oauth-twitter/package.json @@ -22,11 +22,10 @@ "preset": "ts-jest" }, "dependencies": { - "@accounts/oauth": "^0.32.2", - "oauth": "^0.10.0", - "tslib": "2.6.2" + "oauth": "^0.10.0" }, "devDependencies": { + "@accounts/oauth": "^0.32.2", "@types/oauth": "0.9.4" } } diff --git a/packages/oauth-twitter/src/accounts-oauth-twitter.ts b/packages/oauth-twitter/src/accounts-oauth-twitter.ts index 8a5592730..059ea9216 100644 --- a/packages/oauth-twitter/src/accounts-oauth-twitter.ts +++ b/packages/oauth-twitter/src/accounts-oauth-twitter.ts @@ -1,4 +1,4 @@ -import * as oauth from 'oauth'; +import { OAuth } from 'oauth'; import { type Configuration } from './types/configuration'; import { type OAuthProvider, type OAuthUser } from '@accounts/oauth'; @@ -11,7 +11,7 @@ export class AccountsOAuthTwitter implements OAuthProvider { constructor(config: Configuration) { this.config = config; - this.oauth = new oauth.OAuth( + this.oauth = new OAuth( 'https://twitter.com/oauth/request_token', 'https://twitter.com/oauth/access_token', this.config.key, diff --git a/packages/oauth/package.json b/packages/oauth/package.json index 054f5e88f..576b122e5 100644 --- a/packages/oauth/package.json +++ b/packages/oauth/package.json @@ -21,19 +21,16 @@ "testEnvironment": "node", "preset": "ts-jest" }, - "dependencies": { - "@accounts/types": "^0.33.1", - "tslib": "2.6.2" + "peerDependencies": { + "@accounts/server": "^0.33.0", + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", + "graphql-modules": "^3.0.0" }, "devDependencies": { "@accounts/server": "^0.33.1", + "@accounts/types": "^0.33.1", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", "reflect-metadata": "0.1.13" - }, - "peerDependencies": { - "@accounts/server": "^0.32.0 || ^0.33.0", - "graphql": "^16.0.0", - "graphql-modules": "^3.0.0" } } diff --git a/packages/password/package.json b/packages/password/package.json index 44303ff8d..85e4d0836 100644 --- a/packages/password/package.json +++ b/packages/password/package.json @@ -21,11 +21,15 @@ "testEnvironment": "node", "preset": "ts-jest" }, + "peerDependencies": { + "@accounts/server": "^0.33.0", + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", + "graphql-modules": "^3.0.0" + }, "dependencies": { "@accounts/two-factor": "^0.32.4", "bcryptjs": "2.4.3", - "express-validator": "^7.0.1", - "tslib": "2.6.2" + "express-validator": "^7.0.1" }, "devDependencies": { "@accounts/server": "^0.33.1", @@ -37,10 +41,5 @@ "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", "lodash.set": "4.3.2", "reflect-metadata": "0.1.13" - }, - "peerDependencies": { - "@accounts/server": "^0.32.0 || ^0.33.0", - "graphql": "^16.0.0", - "graphql-modules": "^3.0.0" } } diff --git a/packages/rest-client/package.json b/packages/rest-client/package.json index 17ecce0c2..a944147bd 100644 --- a/packages/rest-client/package.json +++ b/packages/rest-client/package.json @@ -41,16 +41,10 @@ ], "author": "Tim Mikeladze", "license": "MIT", - "peerDependencies": { - "@accounts/client": "^0.32.0 || ^0.33.0" - }, - "dependencies": { - "@accounts/types": "^0.33.1", - "@types/node-fetch": "2.6.9", - "tslib": "2.6.2" - }, "devDependencies": { "@accounts/client": "^0.33.1", + "@accounts/types": "^0.33.1", + "@types/node-fetch": "2.6.9", "node-fetch": "2.7.0" } } diff --git a/packages/rest-express/package.json b/packages/rest-express/package.json index a57016234..bd8ae114b 100644 --- a/packages/rest-express/package.json +++ b/packages/rest-express/package.json @@ -44,16 +44,15 @@ "@accounts/server": "^0.32.0 || ^0.33.0" }, "dependencies": { - "@accounts/types": "^0.33.1", "express": "4.18.2", "express-validator": "^7.0.1", - "request-ip": "3.3.0", - "tslib": "2.6.2" + "request-ip": "3.3.0" }, "devDependencies": { "@accounts/magic-link": "^0.1.1", "@accounts/password": "^0.32.1", "@accounts/server": "^0.33.1", + "@accounts/types": "^0.33.1", "@types/express": "4.17.21", "@types/request-ip": "0.0.41", "@types/supertest": "^2.0.16", diff --git a/packages/rest-express/src/express-middleware.ts b/packages/rest-express/src/express-middleware.ts index e70182360..8232f11b4 100644 --- a/packages/rest-express/src/express-middleware.ts +++ b/packages/rest-express/src/express-middleware.ts @@ -2,7 +2,7 @@ import { providerCallback } from './endpoints/oauth/provider-callback'; import { resetPassword, sendResetPasswordEmail } from './endpoints/password/reset'; import { verifyEmail, sendVerificationEmail } from './endpoints/password/verify-email'; import * as express from 'express'; -import * as requestIp from 'request-ip'; +import { getClientIp } from 'request-ip'; import { type AccountsServer } from '@accounts/server'; import { refreshAccessToken } from './endpoints/refresh-access-token'; import { getUser } from './endpoints/get-user'; @@ -42,7 +42,7 @@ const accountsExpress = ( */ router.use((req, _, next) => { const userAgent = getUserAgent(req); - const ip = requestIp.getClientIp(req)!; + const ip = getClientIp(req)!; req.infos = { userAgent, ip, diff --git a/packages/server/package.json b/packages/server/package.json index 9fdf18c92..2d5dbc289 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -44,19 +44,18 @@ "author": "Tim Mikeladze", "license": "MIT", "peerDependencies": { - "graphql": "^16.0.0", + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", "graphql-modules": "^3.0.0" }, "dependencies": { - "@accounts/types": "^0.33.1", - "@types/jsonwebtoken": "9.0.5", "emittery": "0.13.1", "jsonwebtoken": "9.0.2", "jwt-decode": "3.1.2", - "lodash.merge": "4.6.2", - "tslib": "2.6.2" + "lodash.merge": "4.6.2" }, "devDependencies": { + "@accounts/types": "^0.33.1", + "@types/jsonwebtoken": "9.0.5", "@types/lodash.merge": "4.6.9", "graphql": "16.8.1", "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e", diff --git a/packages/two-factor/package.json b/packages/two-factor/package.json index f4361865a..d43393078 100644 --- a/packages/two-factor/package.json +++ b/packages/two-factor/package.json @@ -26,8 +26,9 @@ "preset": "ts-jest" }, "dependencies": { - "@accounts/types": "^0.33.2", - "@levminer/speakeasy": "1.4.2", - "tslib": "2.6.2" + "@levminer/speakeasy": "1.4.2" + }, + "devDependencies": { + "@accounts/types": "^0.33.2" } } diff --git a/packages/types/package.json b/packages/types/package.json index 3de71558c..dbe5b8410 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -42,12 +42,5 @@ "oauth" ], "author": "Elies Lou (Aetherall)", - "license": "MIT", - "dependencies": { - "tslib": "2.6.2" - }, - "devDependencies": { - "graphql": "16.8.1", - "graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e" - } + "license": "MIT" } diff --git a/yarn.lock b/yarn.lock index 196d35983..a76afcd2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,10 +19,9 @@ __metadata: "@accounts/client": "npm:^0.33.1" "@apollo/client": "npm:3.8.7" graphql: "npm:16.8.1" - rimraf: "npm:5.0.5" - tslib: "npm:2.6.2" peerDependencies: "@apollo/client": ^3.0.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 languageName: unknown linkType: soft @@ -32,7 +31,6 @@ __metadata: dependencies: "@accounts/client": "npm:^0.33.1" "@accounts/types": "npm:^0.33.1" - tslib: "npm:2.6.2" languageName: unknown linkType: soft @@ -42,7 +40,6 @@ __metadata: dependencies: "@accounts/client": "npm:^0.33.1" "@accounts/types": "npm:^0.33.1" - tslib: "npm:2.6.2" languageName: unknown linkType: soft @@ -51,21 +48,14 @@ __metadata: resolution: "@accounts/client@workspace:packages/client" dependencies: "@accounts/types": "npm:^0.33.1" - "@types/jsonwebtoken": "npm:9.0.5" jest-localstorage-mock: "npm:2.4.26" - jsonwebtoken: "npm:9.0.2" jwt-decode: "npm:3.1.2" - localstorage-polyfill: "npm:1.0.1" - tslib: "npm:2.6.2" languageName: unknown linkType: soft "@accounts/database-tests@npm:^0.32.2, @accounts/database-tests@workspace:packages/database-tests": version: 0.0.0-use.local resolution: "@accounts/database-tests@workspace:packages/database-tests" - dependencies: - "@accounts/types": "npm:^0.33.1" - tslib: "npm:2.6.2" languageName: unknown linkType: soft @@ -93,7 +83,6 @@ __metadata: "@types/express": "npm:4.17.21" "@types/node-fetch": "npm:2.6.9" body-parser: "npm:1.20.2" - core-js: "npm:3.33.3" express: "npm:4.18.2" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" @@ -101,7 +90,6 @@ __metadata: mongoose: "npm:8.0.1" node-fetch: "npm:2.7.0" reflect-metadata: "npm:0.1.13" - tslib: "npm:2.6.2" typeorm: "npm:0.3.17" languageName: unknown linkType: soft @@ -109,8 +97,6 @@ __metadata: "@accounts/error@workspace:packages/error": version: 0.0.0-use.local resolution: "@accounts/error@workspace:packages/error" - dependencies: - tslib: "npm:2.6.2" languageName: unknown linkType: soft @@ -128,10 +114,7 @@ __metadata: express-session: "npm:1.17.3" lodash: "npm:4.17.21" request-ip: "npm:3.3.0" - tslib: "npm:2.6.2" peerDependencies: - "@accounts/server": ^0.32.0 || ^0.33.0 - express: ^4.16.3 express-session: ^1.15.6 languageName: unknown linkType: soft @@ -149,9 +132,8 @@ __metadata: "@graphql-codegen/typescript-operations": "npm:4.0.1" "@graphql-typed-document-node/core": "npm:3.2.0" graphql: "npm:16.8.1" - tslib: "npm:2.6.2" peerDependencies: - graphql: ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 languageName: unknown linkType: soft @@ -161,16 +143,13 @@ __metadata: dependencies: "@accounts/server": "npm:^0.33.1" "@accounts/types": "npm:^0.33.1" - "@types/bcryptjs": "npm:2.4.6" "@types/lodash.set": "npm:4.3.9" - bcryptjs: "npm:2.4.3" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" lodash.set: "npm:4.3.2" reflect-metadata: "npm:0.1.13" - tslib: "npm:2.6.2" peerDependencies: - "@accounts/server": ^0.32.0 || ^0.33.0 + "@accounts/server": ^0.33.0 graphql-modules: ^3.0.0 languageName: unknown linkType: soft @@ -179,29 +158,15 @@ __metadata: version: 0.0.0-use.local resolution: "@accounts/mikro-orm@workspace:packages/database-mikro-orm" dependencies: - "@accounts/database-tests": "npm:^0.32.2" - "@accounts/server": "npm:^0.33.1" "@accounts/types": "npm:^0.33.2" - "@mikro-orm/cli": "npm:6.0.0-dev.195" "@mikro-orm/core": "npm:6.0.0-dev.195" - "@mikro-orm/entity-generator": "npm:6.0.0-dev.195" - "@mikro-orm/knex": "npm:6.0.0-dev.195" - "@mikro-orm/migrations": "npm:6.0.0-dev.195" - "@mikro-orm/postgresql": "npm:6.0.0-dev.195" - "@mikro-orm/reflection": "npm:6.0.0-dev.195" "@types/lodash": "npm:4.14.202" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" lodash: "npm:^4.17.21" - tslib: "npm:2.6.2" peerDependencies: - "@mikro-orm/cli": ^6.0.0 "@mikro-orm/core": ^6.0.0 - "@mikro-orm/entity-generator": ^6.0.0 - "@mikro-orm/knex": ^6.0.0 - "@mikro-orm/migrations": ^6.0.0 - "@mikro-orm/postgresql": ^6.0.0 - "@mikro-orm/reflection": ^6.0.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 languageName: unknown linkType: soft @@ -220,22 +185,18 @@ __metadata: "@graphql-codegen/typescript-resolvers": "npm:4.0.1" "@graphql-codegen/typescript-type-graphql": "npm:3.0.0" "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/schema": "npm:10.0.0" - "@graphql-tools/utils": "npm:10.0.8" + "@graphql-tools/schema": "npm:10.0.1" + "@graphql-tools/utils": "npm:10.0.9" "@types/request-ip": "npm:0.0.41" graphql: "npm:16.8.1" graphql-http: "npm:1.22.0" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" graphql-tag: "npm:2.12.6" request-ip: "npm:3.3.0" - tslib: "npm:2.6.2" peerDependencies: - "@accounts/server": ^0.32.0 || ^0.33.0 - "@accounts/types": ^0.32.0 || ^0.33.0 - "@graphql-tools/schema": ^10.0.0 - graphql: ^16.0.0 + "@accounts/server": ^0.33.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 - graphql-tag: ^2.10.0 languageName: unknown linkType: soft @@ -246,7 +207,6 @@ __metadata: "@accounts/magic-link": "npm:^0.1.1" "@accounts/module-core": "npm:^0.34.0" "@accounts/server": "npm:^0.33.1" - "@accounts/types": "npm:^0.33.2" "@graphql-codegen/add": "npm:5.0.0" "@graphql-codegen/cli": "npm:5.0.0" "@graphql-codegen/introspection": "npm:4.0.0" @@ -254,22 +214,14 @@ __metadata: "@graphql-codegen/typescript-operations": "npm:4.0.1" "@graphql-codegen/typescript-resolvers": "npm:4.0.1" "@graphql-codegen/typescript-type-graphql": "npm:3.0.0" - "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/utils": "npm:10.0.8" - "@types/request-ip": "npm:0.0.41" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" graphql-tag: "npm:2.12.6" - request-ip: "npm:3.3.0" - tslib: "npm:2.6.2" peerDependencies: "@accounts/magic-link": ^0.1.0 "@accounts/module-core": ^0.34.0 - "@accounts/server": ^0.32.0 || ^0.33.0 - "@accounts/types": ^0.32.0 || ^0.33.0 - graphql: ^16.0.0 + "@accounts/server": ^0.33.0 graphql-modules: ^3.0.0 - graphql-tag: ^2.10.0 languageName: unknown linkType: soft @@ -277,46 +229,21 @@ __metadata: version: 0.0.0-use.local resolution: "@accounts/module-mikro-orm@workspace:modules/module-mikro-orm" dependencies: - "@accounts/magic-link": "npm:^0.1.1" "@accounts/mikro-orm": "npm:^0.34.0" "@accounts/module-core": "npm:^0.34.0" - "@accounts/password": "npm:^0.32.1" "@accounts/server": "npm:^0.33.1" "@accounts/types": "npm:^0.33.2" - "@graphql-codegen/add": "npm:5.0.0" - "@graphql-codegen/cli": "npm:5.0.0" - "@graphql-codegen/introspection": "npm:4.0.0" - "@graphql-codegen/typescript": "npm:4.0.1" - "@graphql-codegen/typescript-operations": "npm:4.0.1" - "@graphql-codegen/typescript-resolvers": "npm:4.0.1" - "@graphql-codegen/typescript-type-graphql": "npm:3.0.0" - "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/utils": "npm:10.0.8" - "@mikro-orm/cli": "npm:6.0.0-dev.195" "@mikro-orm/core": "npm:6.0.0-dev.195" - "@mikro-orm/entity-generator": "npm:6.0.0-dev.195" - "@mikro-orm/knex": "npm:6.0.0-dev.195" "@mikro-orm/migrations": "npm:6.0.0-dev.195" - "@mikro-orm/postgresql": "npm:6.0.0-dev.195" - "@mikro-orm/reflection": "npm:6.0.0-dev.195" - "@types/request-ip": "npm:0.0.41" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" - graphql-tag: "npm:2.12.6" - reflect-metadata: "npm:0.1.13" - request-ip: "npm:3.3.0" - tslib: "npm:2.6.2" peerDependencies: - "@accounts/magic-link": ^0.1.0 "@accounts/mikro-orm": ^0.34.0 "@accounts/module-core": ^0.34.0 - "@accounts/password": ^0.32.0 - "@accounts/server": ^0.32.0 || ^0.33.0 - "@accounts/types": ^0.32.0 || ^0.33.0 + "@accounts/server": ^0.33.0 "@mikro-orm/core": ^6.0.0 - graphql: ^16.0.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 - graphql-tag: ^2.10.0 languageName: unknown linkType: soft @@ -324,37 +251,19 @@ __metadata: version: 0.0.0-use.local resolution: "@accounts/module-mongo@workspace:modules/module-mongo" dependencies: - "@accounts/magic-link": "npm:^0.1.1" "@accounts/mongo": "npm:^0.34.0" - "@accounts/password": "npm:^0.32.1" "@accounts/server": "npm:^0.33.1" "@accounts/types": "npm:^0.33.2" - "@graphql-codegen/add": "npm:5.0.0" - "@graphql-codegen/cli": "npm:5.0.0" - "@graphql-codegen/introspection": "npm:4.0.0" - "@graphql-codegen/typescript": "npm:4.0.1" - "@graphql-codegen/typescript-operations": "npm:4.0.1" - "@graphql-codegen/typescript-resolvers": "npm:4.0.1" - "@graphql-codegen/typescript-type-graphql": "npm:3.0.0" - "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/utils": "npm:10.0.8" - "@types/request-ip": "npm:0.0.41" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" - graphql-tag: "npm:2.12.6" mongodb: "npm:6.3.0" - reflect-metadata: "npm:0.1.13" - request-ip: "npm:3.3.0" - tslib: "npm:2.6.2" peerDependencies: - "@accounts/magic-link": ^0.1.0 "@accounts/mongo": ^0.34.0 - "@accounts/password": ^0.32.0 - "@accounts/server": ^0.32.0 || ^0.33.0 - "@accounts/types": ^0.32.0 || ^0.33.0 - graphql: ^16.0.0 + "@accounts/server": ^0.33.0 + "@accounts/types": ^0.33.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 - graphql-tag: ^2.10.0 + mongodb: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 languageName: unknown linkType: soft @@ -373,22 +282,14 @@ __metadata: "@graphql-codegen/typescript-operations": "npm:4.0.1" "@graphql-codegen/typescript-resolvers": "npm:4.0.1" "@graphql-codegen/typescript-type-graphql": "npm:3.0.0" - "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/utils": "npm:10.0.8" - "@types/request-ip": "npm:0.0.41" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" graphql-tag: "npm:2.12.6" - request-ip: "npm:3.3.0" - tslib: "npm:2.6.2" peerDependencies: - "@accounts/module-core": ^0.34.0 "@accounts/password": ^0.32.0 - "@accounts/server": ^0.32.0 || ^0.33.0 - "@accounts/types": ^0.32.0 || ^0.33.0 - graphql: ^16.0.0 + "@accounts/server": ^0.33.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 - graphql-tag: ^2.10.0 languageName: unknown linkType: soft @@ -396,39 +297,17 @@ __metadata: version: 0.0.0-use.local resolution: "@accounts/module-typeorm@workspace:modules/module-typeorm" dependencies: - "@accounts/magic-link": "npm:^0.1.1" - "@accounts/module-core": "npm:^0.34.0" - "@accounts/password": "npm:^0.32.1" "@accounts/server": "npm:^0.33.1" "@accounts/typeorm": "npm:^0.33.1" "@accounts/types": "npm:^0.33.2" - "@graphql-codegen/add": "npm:5.0.0" - "@graphql-codegen/cli": "npm:5.0.0" - "@graphql-codegen/introspection": "npm:4.0.0" - "@graphql-codegen/typescript": "npm:4.0.1" - "@graphql-codegen/typescript-operations": "npm:4.0.1" - "@graphql-codegen/typescript-resolvers": "npm:4.0.1" - "@graphql-codegen/typescript-type-graphql": "npm:3.0.0" - "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/utils": "npm:10.0.8" - "@types/request-ip": "npm:0.0.41" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" - graphql-tag: "npm:2.12.6" - reflect-metadata: "npm:0.1.13" - request-ip: "npm:3.3.0" - tslib: "npm:2.6.2" typeorm: "npm:0.3.17" peerDependencies: - "@accounts/magic-link": ^0.1.0 - "@accounts/module-core": ^0.34.0 - "@accounts/password": ^0.32.0 - "@accounts/server": ^0.32.0 || ^0.33.0 + "@accounts/server": ^0.33.0 "@accounts/typeorm": ^0.33.1 - "@accounts/types": ^0.32.0 || ^0.33.0 - graphql: ^16.0.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 - graphql-tag: ^2.10.0 typeorm: ^0.3.0 languageName: unknown linkType: soft @@ -440,7 +319,6 @@ __metadata: "@accounts/mongo-password": "npm:^0.33.0" "@accounts/types": "npm:^0.33.1" mongodb: "npm:6.3.0" - tslib: "npm:2.6.2" peerDependencies: mongodb: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 languageName: unknown @@ -452,7 +330,6 @@ __metadata: dependencies: "@accounts/types": "npm:^0.33.2" mongodb: "npm:6.3.0" - tslib: "npm:2.6.2" peerDependencies: mongodb: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 languageName: unknown @@ -464,7 +341,6 @@ __metadata: dependencies: "@accounts/types": "npm:^0.33.1" mongodb: "npm:6.3.0" - tslib: "npm:2.6.2" peerDependencies: mongodb: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 languageName: unknown @@ -482,9 +358,10 @@ __metadata: graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" mongodb: "npm:6.3.0" - tslib: "npm:2.6.2" peerDependencies: + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 + mongodb: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 languageName: unknown linkType: soft @@ -496,7 +373,6 @@ __metadata: "@types/request-promise": "npm:4.1.51" request: "npm:2.88.2" request-promise: "npm:4.2.6" - tslib: "npm:2.6.2" languageName: unknown linkType: soft @@ -507,7 +383,6 @@ __metadata: "@accounts/oauth": "npm:^0.32.2" "@types/oauth": "npm:0.9.4" oauth: "npm:^0.10.0" - tslib: "npm:2.6.2" languageName: unknown linkType: soft @@ -520,10 +395,9 @@ __metadata: graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" reflect-metadata: "npm:0.1.13" - tslib: "npm:2.6.2" peerDependencies: - "@accounts/server": ^0.32.0 || ^0.33.0 - graphql: ^16.0.0 + "@accounts/server": ^0.33.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 languageName: unknown linkType: soft @@ -544,10 +418,9 @@ __metadata: graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" lodash.set: "npm:4.3.2" reflect-metadata: "npm:0.1.13" - tslib: "npm:2.6.2" peerDependencies: - "@accounts/server": ^0.32.0 || ^0.33.0 - graphql: ^16.0.0 + "@accounts/server": ^0.33.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 languageName: unknown linkType: soft @@ -562,7 +435,6 @@ __metadata: "@types/shortid": "npm:0.0.32" ioredis: "npm:5.3.2" shortid: "npm:2.2.16" - tslib: "npm:2.6.2" languageName: unknown linkType: soft @@ -574,9 +446,6 @@ __metadata: "@accounts/types": "npm:^0.33.1" "@types/node-fetch": "npm:2.6.9" node-fetch: "npm:2.7.0" - tslib: "npm:2.6.2" - peerDependencies: - "@accounts/client": ^0.32.0 || ^0.33.0 languageName: unknown linkType: soft @@ -596,7 +465,6 @@ __metadata: reflect-metadata: "npm:0.1.13" request-ip: "npm:3.3.0" supertest: "npm:^6.3.3" - tslib: "npm:2.6.2" peerDependencies: "@accounts/magic-link": ^0.1.0 "@accounts/password": ^0.32.0 @@ -618,9 +486,8 @@ __metadata: jwt-decode: "npm:3.1.2" lodash.merge: "npm:4.6.2" reflect-metadata: "npm:0.1.13" - tslib: "npm:2.6.2" peerDependencies: - graphql: ^16.0.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 languageName: unknown linkType: soft @@ -631,7 +498,6 @@ __metadata: dependencies: "@accounts/types": "npm:^0.33.2" "@levminer/speakeasy": "npm:1.4.2" - tslib: "npm:2.6.2" languageName: unknown linkType: soft @@ -639,18 +505,14 @@ __metadata: version: 0.0.0-use.local resolution: "@accounts/typeorm@workspace:packages/database-typeorm" dependencies: - "@accounts/database-tests": "npm:^0.32.2" "@accounts/types": "npm:^0.33.1" "@types/lodash": "npm:4.14.202" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" lodash: "npm:4.17.21" - pg: "npm:8.11.3" - reflect-metadata: "npm:0.1.13" - tslib: "npm:2.6.2" typeorm: "npm:0.3.17" peerDependencies: - graphql: ^16.0.0 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 graphql-modules: ^3.0.0 typeorm: ^0.3.0 languageName: unknown @@ -659,10 +521,6 @@ __metadata: "@accounts/types@npm:^0.33.1, @accounts/types@npm:^0.33.2, @accounts/types@workspace:packages/types": version: 0.0.0-use.local resolution: "@accounts/types@workspace:packages/types" - dependencies: - graphql: "npm:16.8.1" - graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" - tslib: "npm:2.6.2" languageName: unknown linkType: soft @@ -4050,9 +3908,9 @@ __metadata: "@envelop/graphql-modules": "npm:6.0.0" "@graphql-tools/delegate": "npm:10.0.3" "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/schema": "npm:10.0.0" + "@graphql-tools/schema": "npm:10.0.1" "@graphql-tools/stitch": "npm:9.0.3" - "@graphql-tools/utils": "npm:10.0.8" + "@graphql-tools/utils": "npm:10.0.9" "@graphql-tools/wrap": "npm:10.0.1" "@types/lodash": "npm:4.14.202" graphql: "npm:16.8.1" @@ -4078,7 +3936,7 @@ __metadata: "@envelop/core": "npm:5.0.0" "@envelop/graphql-modules": "npm:6.0.0" "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/schema": "npm:10.0.0" + "@graphql-tools/schema": "npm:10.0.1" "@mikro-orm/cli": "npm:6.0.0-dev.195" "@mikro-orm/core": "npm:6.0.0-dev.195" "@mikro-orm/entity-generator": "npm:6.0.0-dev.195" @@ -4105,7 +3963,7 @@ __metadata: "@apollo/server": "npm:4.9.5" "@apollo/server-plugin-landing-page-graphql-playground": "npm:4.0.1" "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/schema": "npm:10.0.0" + "@graphql-tools/schema": "npm:10.0.1" graphql: "npm:16.8.1" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" graphql-tag: "npm:2.12.6" @@ -4124,7 +3982,7 @@ __metadata: "@accounts/password": "npm:^0.32.2" "@accounts/server": "npm:^0.33.1" "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/schema": "npm:10.0.0" + "@graphql-tools/schema": "npm:10.0.1" graphql: "npm:16.8.1" graphql-http: "npm:1.22.0" graphql-modules: "npm:3.0.0-alpha-20231106133212-0b04b56e" @@ -4146,7 +4004,7 @@ __metadata: "@envelop/core": "npm:5.0.0" "@envelop/graphql-modules": "npm:6.0.0" "@graphql-tools/merge": "npm:9.0.0" - "@graphql-tools/schema": "npm:10.0.0" + "@graphql-tools/schema": "npm:10.0.1" "@types/express": "npm:^4.17.21" express: "npm:^4.18.2" graphql: "npm:16.8.1" @@ -4982,17 +4840,17 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/schema@npm:10.0.0, @graphql-tools/schema@npm:^10.0.0": - version: 10.0.0 - resolution: "@graphql-tools/schema@npm:10.0.0" +"@graphql-tools/schema@npm:10.0.1, @graphql-tools/schema@npm:^10.0.0": + version: 10.0.1 + resolution: "@graphql-tools/schema@npm:10.0.1" dependencies: "@graphql-tools/merge": "npm:^9.0.0" - "@graphql-tools/utils": "npm:^10.0.0" + "@graphql-tools/utils": "npm:^10.0.9" tslib: "npm:^2.4.0" value-or-promise: "npm:^1.0.12" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: b746c69cefb3b89fad13d56f0abb9e764efe1569836ea9ae5e5c510a6f0bce6e08f324b28aebcb5b2c11ba2ea1c308f18c204e322a188e254e2c7e426d3ccecb + checksum: 1392c82fa121c98b18b2ee38bdfe01fedb65c0a363d18a2151a5f758f1fa71f8fa5d914ce866ac10980cb36246101462001fb99bc896cc01f1ac131b3afdf4a7 languageName: node linkType: hard @@ -5052,9 +4910,9 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/utils@npm:10.0.8, @graphql-tools/utils@npm:^10.0.0, @graphql-tools/utils@npm:^10.0.2, @graphql-tools/utils@npm:^10.0.5, @graphql-tools/utils@npm:^10.0.8": - version: 10.0.8 - resolution: "@graphql-tools/utils@npm:10.0.8" +"@graphql-tools/utils@npm:10.0.9, @graphql-tools/utils@npm:^10.0.0, @graphql-tools/utils@npm:^10.0.2, @graphql-tools/utils@npm:^10.0.5, @graphql-tools/utils@npm:^10.0.8, @graphql-tools/utils@npm:^10.0.9": + version: 10.0.9 + resolution: "@graphql-tools/utils@npm:10.0.9" dependencies: "@graphql-typed-document-node/core": "npm:^3.1.1" cross-inspect: "npm:1.0.0" @@ -5062,7 +4920,7 @@ __metadata: tslib: "npm:^2.4.0" peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: ea0dfa4535ba360d27a1eb501d48a114a9ebb6224d178b89e3d978b19bd30d98fc1622cbeb31b2198b3e06cb9f717edb70933530958509bfcf0458842618a1b0 + checksum: 165c383ef11b684b83d5de450caace63ca6f916090355de208bb21a2ef081e1e35e5f6a60b17461d87f0812f4ad18bfc011044f1a9f7a979442adfb37652d5f6 languageName: node linkType: hard @@ -11860,7 +11718,7 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.33.3, core-js@npm:^3.19.2, core-js@npm:^3.31.1": +"core-js@npm:^3.19.2, core-js@npm:^3.31.1": version: 3.33.3 resolution: "core-js@npm:3.33.3" checksum: 08abdc9470c8228b9d09f61e62ab312738681202c4c34e9638889125b304b235f34c4fe22e9d41c20906ac0fcc807dca57c5ff7d6b90021bf64e8fe23461d9ab @@ -19367,13 +19225,6 @@ __metadata: languageName: node linkType: hard -"localstorage-polyfill@npm:1.0.1": - version: 1.0.1 - resolution: "localstorage-polyfill@npm:1.0.1" - checksum: 63332c5a029da4d5ebe06b819e04428b6ce201bf04474b01220e50ccb7d79507536552f9de71ca382dc2bb5e4339a946ab7580434580b10cf0663bb14b55e4be - languageName: node - linkType: hard - "locate-path@npm:^2.0.0": version: 2.0.0 resolution: "locate-path@npm:2.0.0"