Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf(backend): Update GraphQL Upload to 17.0.0 & Drizzle 0.34.1 #550

Merged
merged 2 commits into from
Oct 9, 2024
Merged

perf(backend): Update GraphQL Upload to 17.0.0 & Drizzle 0.34.1 #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a176670
perf(backend): Update GraphQL Upload to 17.0.0
aXenDeveloper Oct 9, 2024
db6ff98
chore: Update packages
aXenDeveloper Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions apps/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,41 @@
"@nestjs/schedule": "^4.1.1",
"@nestjs/serve-static": "^4.0.2",
"pg": "^8.13.0",
"react": "19.0.0-rc-1460d67c-20241003",
"react-dom": "19.0.0-rc-1460d67c-20241003",
"react": "19.0.0-rc-d5bba18b-20241009",
"react-dom": "19.0.0-rc-d5bba18b-20241009",
"reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1",
"vitnode-backend": "workspace:*",
"vitnode-backend-email-resend": "workspace:*",
"vitnode-backend-email-smtp": "workspace:*",
"vitnode-backend-ai-google": "workspace:*",
"vitnode-backend-ai-open-ai": "workspace:*"
"vitnode-backend-ai-open-ai": "workspace:*",
"vitnode-backend-email-resend": "workspace:*",
"vitnode-backend-email-smtp": "workspace:*"
},
"devDependencies": {
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/typescript": "^4.0.9",
"@graphql-codegen/typescript-document-nodes": "^4.0.9",
"@graphql-codegen/typescript-operations": "^4.2.3",
"@graphql-codegen/cli": "^5.0.3",
"@graphql-codegen/typescript": "^4.1.0",
"@graphql-codegen/typescript-document-nodes": "^4.0.10",
"@graphql-codegen/typescript-operations": "^4.3.0",
"@nestjs/cli": "^10.4.5",
"@nestjs/schematics": "^10.1.4",
"@react-email/components": "^0.0.25",
"@swc/cli": "^0.4.0",
"@swc/core": "^1.7.28",
"@types/express": "^4.17.21",
"@types/node": "^22.7.4",
"@types/node": "^22.7.5",
"@types/pg": "^8.11.10",
"@types/react": "^18.3.10",
"@types/react": "^18.3.11",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"cross-env": "^7.0.3",
"drizzle-kit": "^0.24.2",
"drizzle-orm": "^0.33.0",
"drizzle-kit": "^0.25.0",
"drizzle-orm": "^0.34.1",
"eslint-config-typescript-vitnode": "workspace:*",
"object-path": "^0.11.8",
"source-map-support": "^0.5.21",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
14 changes: 7 additions & 7 deletions apps/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,25 @@
},
"dependencies": {
"geist": "^1.3.1",
"lucide-react": "^0.446.0",
"next": "15.0.0-canary.179",
"lucide-react": "^0.451.0",
"next": "15.0.0-canary.181",
"next-intl": "3.21.0-canary.0",
"react": "19.0.0-rc-1460d67c-20241003",
"react-dom": "19.0.0-rc-1460d67c-20241003",
"react": "19.0.0-rc-d5bba18b-20241009",
"react-dom": "19.0.0-rc-d5bba18b-20241009",
"react-hook-form": "^7.53.0",
"sonner": "^1.5.0",
"vitnode-frontend": "workspace:*",
"zod": "^3.23.8"
},
"devDependencies": {
"@types/node": "^22.7.4",
"@types/react": "^18.3.10",
"@types/node": "^22.7.5",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"autoprefixer": "^10.4.20",
"eslint-config-typescript-vitnode": "workspace:*",
"graphql-tag": "^2.12.6",
"postcss": "^8.4.47",
"tailwindcss": "^3.4.13",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
6 changes: 3 additions & 3 deletions packages/backend-ai-google/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"devDependencies": {
"@swc/cli": "^0.4.0",
"@swc/core": "^1.7.28",
"@types/node": "^22.7.4",
"@types/node": "^22.7.5",
"ai": "^3.4.9",
"concurrently": "^9.0.1",
"eslint-config-typescript-vitnode": "workspace:*",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"dependencies": {
"@ai-sdk/google": "^0.0.48"
"@ai-sdk/google": "^0.0.51"
}
}
6 changes: 3 additions & 3 deletions packages/backend-ai-open-ai/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"devDependencies": {
"@swc/cli": "^0.4.0",
"@swc/core": "^1.7.28",
"@types/node": "^22.7.4",
"@types/node": "^22.7.5",
"ai": "^3.4.9",
"concurrently": "^9.0.1",
"eslint-config-typescript-vitnode": "workspace:*",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"dependencies": {
"@ai-sdk/openai": "^0.0.61"
"@ai-sdk/openai": "^0.0.66"
}
}
4 changes: 2 additions & 2 deletions packages/backend-email-resend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"devDependencies": {
"@swc/cli": "^0.4.0",
"@swc/core": "^1.7.28",
"@types/node": "^22.7.4",
"@types/node": "^22.7.5",
"concurrently": "^9.0.1",
"eslint-config-typescript-vitnode": "workspace:*",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"dependencies": {
"resend": "^4.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/backend-email-smtp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"devDependencies": {
"@swc/cli": "^0.4.0",
"@swc/core": "^1.7.28",
"@types/node": "^22.7.4",
"@types/node": "^22.7.5",
"@types/nodemailer": "^6.4.16",
"concurrently": "^9.0.1",
"eslint-config-typescript-vitnode": "workspace:*",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"dependencies": {
"nodemailer": "^6.9.15"
Expand Down
26 changes: 13 additions & 13 deletions packages/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
"dependencies": {
"@apollo/server": "^4.11.0",
"@graphql-codegen/near-operation-file-preset": "^3.0.0",
"@graphql-codegen/typescript": "^4.0.9",
"@graphql-codegen/typescript-document-nodes": "^4.0.9",
"@graphql-codegen/typescript-operations": "^4.2.3",
"@graphql-codegen/typescript": "^4.1.0",
"@graphql-codegen/typescript-document-nodes": "^4.0.10",
"@graphql-codegen/typescript-operations": "^4.3.0",
"@nestjs/apollo": "^12.2.0",
"@nestjs/config": "^3.2.3",
"@nestjs/jwt": "^10.2.0",
Expand All @@ -68,7 +68,7 @@
"@swc/core": "^1.7.28",
"ai": "^3.4.9",
"busboy": "^1.6.0",
"cookie-parser": "^1.4.6",
"cookie-parser": "^1.4.7",
"helmet": "^8.0.0",
"http-errors": "^2.0.0",
"object-path": "^0.11.8",
Expand All @@ -77,7 +77,7 @@
"ua-parser-js": "2.0.0-beta.3"
},
"devDependencies": {
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/cli": "^5.0.3",
"@nestjs/common": "^10.4.4",
"@nestjs/core": "^10.4.4",
"@nestjs/graphql": "^12.2.0",
Expand All @@ -88,24 +88,24 @@
"@types/cookie-parser": "^1.4.7",
"@types/express": "^4.17.21",
"@types/http-errors": "^2.0.4",
"@types/node": "^22.7.4",
"@types/node": "^22.7.5",
"@types/object-path": "^0.11.4",
"@types/pg": "^8.11.10",
"@types/react": "^18.3.10",
"@types/react": "^18.3.11",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"concurrently": "^9.0.1",
"dotenv": "^16.4.5",
"drizzle-kit": "^0.24.2",
"drizzle-orm": "^0.33.0",
"drizzle-kit": "^0.25.0",
"drizzle-orm": "^0.34.1",
"eslint-config-typescript-vitnode": "workspace:*",
"express": "^4.21.0",
"express": "^4.21.1",
"graphql": "^16.9.0",
"pg": "^8.13.0",
"react": "19.0.0-rc-1460d67c-20241003",
"react-dom": "19.0.0-rc-1460d67c-20241003",
"react": "19.0.0-rc-d5bba18b-20241009",
"react-dom": "19.0.0-rc-d5bba18b-20241009",
"ts-node": "^10.9.2",
"tsup": "^8.3.0",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
9 changes: 1 addition & 8 deletions packages/backend/scripts/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const init = async () => {
console.log(`${initConsole} [4/6] Generating the manifest files...`);
generateManifest();

const database = createClientDatabase({
const database = await createClientDatabase({
config: DATABASE_ENVS,
schemaDatabase: coreSchemaDatabase,
});
Expand All @@ -69,7 +69,6 @@ const init = async () => {
console.log(`${initConsole} [6/6] Updating plugins...`);
await updatePlugins({ pluginsPath, db: database.db });

await database.poolDB.end();
console.log(`${initConsole} ✅ Project setup complete.`);
process.exit(0);
};
Expand All @@ -78,17 +77,11 @@ const db = async () => {
console.log(`${initConsole} [1/2] Generating database migrations...`);
await generateDatabaseMigrations();

const database = createClientDatabase({
config: DATABASE_ENVS,
schemaDatabase: coreSchemaDatabase,
});

console.log(
`${initConsole} [2/2] Create tables in database using migrations...`,
);
await runMigrations();

await database.poolDB.end();
console.log(`${initConsole} ✅ Project setup complete.`);
process.exit(0);
};
Expand Down
49 changes: 21 additions & 28 deletions packages/backend/src/database/schema/admins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,26 @@
import { relations } from 'drizzle-orm';
import {
boolean,
index,
integer,
jsonb,
pgTable,
serial,
timestamp,
varchar,
} from 'drizzle-orm/pg-core';
import { index, pgTable } from 'drizzle-orm/pg-core';

import { core_groups } from './groups';
import { core_sessions_known_devices } from './sessions';
import { core_users } from './users';

export const core_admin_permissions = pgTable(
'core_admin_permissions',
{
id: serial('id').primaryKey(),
group_id: integer('group_id').references(() => core_groups.id, {
t => ({
id: t.serial().primaryKey(),
group_id: t.integer().references(() => core_groups.id, {
onDelete: 'cascade',
}),
user_id: integer('user_id').references(() => core_users.id, {
user_id: t.integer().references(() => core_users.id, {
onDelete: 'cascade',
}),
unrestricted: boolean('unrestricted').notNull().default(false),
created: timestamp('created').notNull().defaultNow(),
updated: timestamp('updated').notNull().defaultNow(),
protected: boolean('protected').notNull().default(false),
permissions: jsonb('permissions').default('{}'),
},
unrestricted: t.boolean().notNull().default(false),
created: t.timestamp().notNull().defaultNow(),
updated: t.timestamp().notNull().defaultNow(),
protected: t.boolean().notNull().default(false),
permissions: t.jsonb().default('{}'),
}),
table => ({
group_id_idx: index('core_admin_permissions_group_id_idx').on(
table.group_id,
Expand All @@ -54,22 +45,24 @@ export const core_admin_permissions_relations = relations(

export const core_admin_sessions = pgTable(
'core_admin_sessions',
{
login_token: varchar('login_token', { length: 255 }).primaryKey(),
user_id: integer('user_id')
t => ({
login_token: t.varchar({ length: 255 }).primaryKey(),
user_id: t
.integer()
.notNull()
.references(() => core_users.id, {
onDelete: 'cascade',
}),
created: timestamp('created').notNull().defaultNow(),
last_seen: timestamp('last_seen').notNull().defaultNow(),
expires: timestamp('expires').notNull(),
device_id: integer('device_id')
created: t.timestamp().notNull().defaultNow(),
last_seen: t.timestamp().notNull().defaultNow(),
expires: t.timestamp().notNull(),
device_id: t
.integer()
.references(() => core_sessions_known_devices.id, {
onDelete: 'cascade',
})
.notNull(),
},
}),
table => ({
login_token_idx: index('core_admin_sessions_login_token_idx').on(
table.login_token,
Expand Down
Loading
Loading