Skip to content

Commit

Permalink
fix: update deps and fix mikro-orm db adapter with latest v6 snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
@darkbasic
darkbasic committed Dec 13, 2023
1 parent ddf9bfb commit fc8f6d8
Show file tree
Hide file tree
Showing 25 changed files with 787 additions and 784 deletions.
2 changes: 1 addition & 1 deletion examples/accounts-microservice/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@graphql-tools/wrap": "10.0.1",
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"graphql-yoga": "5.0.1",
"graphql-yoga": "5.0.2",
"lodash": "4.17.21",
"node-fetch": "2.7.0",
"tslib": "2.6.2"
Expand Down
16 changes: 8 additions & 8 deletions examples/graphql-server-mikro-orm-postgres/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
"@envelop/graphql-modules": "6.0.0",
"@graphql-tools/merge": "9.0.1",
"@graphql-tools/schema": "10.0.2",
"@mikro-orm/cli": "6.0.0-dev.234",
"@mikro-orm/core": "6.0.0-dev.234",
"@mikro-orm/entity-generator": "6.0.0-dev.234",
"@mikro-orm/knex": "6.0.0-dev.234",
"@mikro-orm/migrations": "6.0.0-dev.234",
"@mikro-orm/postgresql": "6.0.0-dev.234",
"@mikro-orm/reflection": "6.0.0-dev.234",
"@mikro-orm/cli": "6.0.0-dev.252",
"@mikro-orm/core": "6.0.0-dev.252",
"@mikro-orm/entity-generator": "6.0.0-dev.252",
"@mikro-orm/knex": "6.0.0-dev.252",
"@mikro-orm/migrations": "6.0.0-dev.252",
"@mikro-orm/postgresql": "6.0.0-dev.252",
"@mikro-orm/reflection": "6.0.0-dev.252",
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"graphql-yoga": "5.0.1",
"graphql-yoga": "5.0.2",
"tslib": "2.6.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/graphql-server-typeorm-postgres/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dotenv": "16.3.1",
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"graphql-yoga": "5.0.1",
"graphql-yoga": "5.0.2",
"pg": "8.11.3",
"tslib": "2.6.2",
"typeorm": "0.3.17"
Expand Down
2 changes: 1 addition & 1 deletion examples/graphql-server-typescript-apollo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"graphql-tag": "2.12.6",
"mongoose": "8.0.2",
"mongoose": "8.0.3",
"tslib": "2.6.2"
}
}
2 changes: 1 addition & 1 deletion examples/graphql-server-typescript-basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"graphql-http": "1.22.0",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"graphql-tag": "2.12.6",
"mongoose": "8.0.2",
"mongoose": "8.0.3",
"tslib": "2.6.2"
}
}
4 changes: 2 additions & 2 deletions examples/graphql-server-typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"graphql-tag": "2.12.6",
"graphql-yoga": "5.0.1",
"graphql-yoga": "5.0.2",
"helmet": "^7.1.0",
"mongoose": "8.0.2",
"mongoose": "8.0.3",
"tslib": "2.6.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/magic-link-server-typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@accounts/magic-link": "^0.1.1",
"@accounts/mongo": "^0.34.1",
"@accounts/server": "^0.33.1",
"mongoose": "8.0.2",
"mongoose": "8.0.3",
"tslib": "2.6.2"
}
}
14 changes: 7 additions & 7 deletions examples/react-graphql-typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@apollo/client": "3.8.8",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@mui/material": "5.14.20",
"@mui/styles": "5.14.20",
"@mui/material": "5.15.0",
"@mui/styles": "5.15.0",
"graphql": "16.8.1",
"graphql-tag": "2.12.6",
"qrcode.react": "3.1.0",
Expand All @@ -32,18 +32,18 @@
"devDependencies": {
"@levminer/speakeasy": "1.4.2",
"@types/qrcode.react": "1.0.5",
"@types/react": "^18.2.42",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.17",
"@types/react-router": "5.1.20",
"@types/react-router-dom": "5.3.3",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.55.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"typescript": "^5.3.2",
"vite": "^5.0.6",
"typescript": "^5.3.3",
"vite": "^5.0.8",
"web-vitals": "3.5.0"
}
}
18 changes: 9 additions & 9 deletions examples/react-rest-typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"@accounts/rest-client": "^0.33.1",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@mui/icons-material": "5.14.19",
"@mui/lab": "5.0.0-alpha.155",
"@mui/material": "5.14.20",
"@mui/styles": "5.14.20",
"@mui/icons-material": "5.15.0",
"@mui/lab": "5.0.0-alpha.156",
"@mui/material": "5.15.0",
"@mui/styles": "5.15.0",
"formik": "2.4.5",
"qrcode.react": "3.1.0",
"react": "^18.2.0",
Expand All @@ -32,18 +32,18 @@
"@accounts/types": "^0.33.2",
"@levminer/speakeasy": "1.4.2",
"@types/qrcode.react": "1.0.5",
"@types/react": "^18.2.42",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.17",
"@types/react-router": "5.1.20",
"@types/react-router-dom": "5.3.3",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.55.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"typescript": "^5.3.2",
"vite": "^5.0.6",
"typescript": "^5.3.3",
"vite": "^5.0.8",
"web-vitals": "3.5.0"
}
}
2 changes: 1 addition & 1 deletion examples/rest-express-typescript-without-modules/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"body-parser": "1.20.2",
"cors": "2.8.5",
"express": "4.18.2",
"mongoose": "8.0.2",
"mongoose": "8.0.3",
"tslib": "2.6.2"
}
}
2 changes: 1 addition & 1 deletion examples/rest-express-typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"body-parser": "1.20.2",
"cors": "2.8.5",
"express": "4.18.2",
"mongoose": "8.0.2",
"mongoose": "8.0.3",
"tslib": "2.6.2"
}
}
4 changes: 2 additions & 2 deletions modules/module-mikro-orm/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"@accounts/module-core": "^0.34.0",
"@accounts/server": "^0.33.1",
"@accounts/types": "^0.33.2",
"@mikro-orm/core": "6.0.0-dev.234",
"@mikro-orm/migrations": "6.0.0-dev.234",
"@mikro-orm/core": "6.0.0-dev.252",
"@mikro-orm/migrations": "6.0.0-dev.252",
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e"
}
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"@changesets/changelog-github": "0.5.0",
"@changesets/cli": "2.27.1",
"@types/jest": "29.5.11",
"@types/node": "20.10.3",
"@typescript-eslint/eslint-plugin": "6.13.2",
"@typescript-eslint/parser": "6.13.2",
"@types/node": "20.10.4",
"@typescript-eslint/eslint-plugin": "6.14.0",
"@typescript-eslint/parser": "6.14.0",
"eslint": "8.55.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-jest": "27.6.0",
Expand All @@ -76,11 +76,11 @@
"lerna": "8.0.0",
"lint-staged": "15.2.0",
"nodemon": "3.0.2",
"prettier": "3.1.0",
"prettier": "3.1.1",
"rimraf": "5.0.5",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"typescript": "5.3.2"
"ts-node": "10.9.2",
"typescript": "5.3.3"
},
"resolutions": {
"@types/express-serve-static-core": "4.17.38"
Expand Down
2 changes: 1 addition & 1 deletion packages/database-mikro-orm/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"devDependencies": {
"@accounts/types": "^0.33.2",
"@mikro-orm/core": "6.0.0-dev.234",
"@mikro-orm/core": "6.0.0-dev.252",
"@types/lodash": "4.14.202",
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e"
Expand Down
4 changes: 2 additions & 2 deletions packages/database-mikro-orm/src/entity/Email.ts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { type Reference, EntitySchema, ref } from '@mikro-orm/core';
import { type Ref, EntitySchema, ref } from '@mikro-orm/core';
import { type IUser, type UserCtor } from './User';

export class Email<CustomUser extends IUser<any, any, any>> {
id!: number;

user!: Reference<CustomUser> & { id: number };
user!: Ref<CustomUser>;

address: string;

Expand Down
4 changes: 2 additions & 2 deletions packages/database-mikro-orm/src/entity/Service.ts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { type Reference, EntitySchema, ref } from '@mikro-orm/core';
import { type Ref, EntitySchema, ref } from '@mikro-orm/core';
import { type IUser, type UserCtor } from './User';

export class Service<CustomUser extends IUser<any, any, any>> {
id!: number;

user!: Reference<CustomUser> & { id: number };
user!: Ref<CustomUser>;

name: string;

Expand Down
4 changes: 2 additions & 2 deletions packages/database-mikro-orm/src/entity/Session.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type Reference, EntitySchema, ref } from '@mikro-orm/core';
import { type Ref, EntitySchema, ref } from '@mikro-orm/core';
import { type IUser, type UserCtor } from './User';

export class Session<CustomUser extends IUser<any, any, any>> {
Expand All @@ -8,7 +8,7 @@ export class Session<CustomUser extends IUser<any, any, any>> {

updatedAt: Date = new Date();

user: Reference<CustomUser> & { id: number };
user: Ref<CustomUser>;

token: string;

Expand Down
4 changes: 2 additions & 2 deletions packages/e2e/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"jest-localstorage-mock": "2.4.26",
"mongoose": "8.0.2",
"mongoose": "8.0.3",
"node-fetch": "2.7.0",
"reflect-metadata": "0.1.13",
"reflect-metadata": "0.1.14",
"typeorm": "0.3.17"
}
}
2 changes: 1 addition & 1 deletion packages/magic-link/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"lodash.set": "4.3.2",
"reflect-metadata": "0.1.13"
"reflect-metadata": "0.1.14"
}
}
2 changes: 1 addition & 1 deletion packages/oauth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
"@accounts/types": "^0.33.1",
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"reflect-metadata": "0.1.13"
"reflect-metadata": "0.1.14"
}
}
2 changes: 1 addition & 1 deletion packages/password/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"lodash.set": "4.3.2",
"reflect-metadata": "0.1.13"
"reflect-metadata": "0.1.14"
}
}
2 changes: 1 addition & 1 deletion packages/rest-express/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@types/express": "4.17.21",
"@types/request-ip": "0.0.41",
"@types/supertest": "^2.0.16",
"reflect-metadata": "0.1.13",
"reflect-metadata": "0.1.14",
"supertest": "^6.3.3"
}
}
2 changes: 1 addition & 1 deletion packages/server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@
"@types/lodash.merge": "4.6.9",
"graphql": "16.8.1",
"graphql-modules": "3.0.0-alpha-20231106133212-0b04b56e",
"reflect-metadata": "0.1.13"
"reflect-metadata": "0.1.14"
}
}
4 changes: 2 additions & 2 deletions website/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
]
},
"devDependencies": {
"@types/react": "18.2.42",
"typescript": "5.3.2"
"@types/react": "18.2.45",
"typescript": "5.3.3"
}
}
Loading

0 comments on commit fc8f6d8

Please sign in to comment.