From 0ffa6fbe89e48d0c181194b737091be70bfeafa3 Mon Sep 17 00:00:00 2001 From: forehalo Date: Tue, 6 May 2025 11:36:30 +0000 Subject: [PATCH] chore(server): hoist deps (#12145) ## Summary by CodeRabbit - **Chores** - Updated workflow to move the node_modules directory during the build process. - Adjusted Prisma client output directory for improved file organization. - Removed unused properties from backend server package configuration. - **Refactor** - Simplified type annotations for improved code clarity in test utilities. --- .github/workflows/build-images.yml | 3 +++ packages/backend/server/package.json | 4 ---- packages/backend/server/schema.prisma | 2 +- tests/kit/src/utils/cloud.ts | 8 ++------ 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 32b6b88f4e..010de791df 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -253,6 +253,9 @@ jobs: - name: Generate Prisma client run: yarn workspace @affine/server prisma generate + - name: Mv node_modules + run: mv ./node_modules ./packages/backend/server + - name: Setup Version id: version uses: ./.github/actions/setup-version diff --git a/packages/backend/server/package.json b/packages/backend/server/package.json index 8f73579c65..ccd3c8ad58 100644 --- a/packages/backend/server/package.json +++ b/packages/backend/server/package.json @@ -177,9 +177,5 @@ "**/*.spec.ts", "**/*.e2e.ts" ] - }, - "stableVersion": "0.5.3", - "installConfig": { - "hoistingLimits": "workspaces" } } diff --git a/packages/backend/server/schema.prisma b/packages/backend/server/schema.prisma index 873e29cf74..e0cc426de8 100644 --- a/packages/backend/server/schema.prisma +++ b/packages/backend/server/schema.prisma @@ -1,6 +1,6 @@ generator client { provider = "prisma-client-js" - output = "./node_modules/.prisma/client" + output = "../../../node_modules/.prisma/client" binaryTargets = ["native", "debian-openssl-3.0.x", "linux-arm64-openssl-3.0.x"] previewFeatures = ["metrics", "relationJoins", "nativeDistinct", "postgresqlExtensions"] } diff --git a/tests/kit/src/utils/cloud.ts b/tests/kit/src/utils/cloud.ts index ecd4cfec58..c1a388fc5f 100644 --- a/tests/kit/src/utils/cloud.ts +++ b/tests/kit/src/utils/cloud.ts @@ -12,6 +12,7 @@ import { faker } from '@faker-js/faker'; import { hash } from '@node-rs/argon2'; import type { BrowserContext, Cookie, Page } from '@playwright/test'; import { expect } from '@playwright/test'; +import { type PrismaClient } from '@prisma/client'; import type { Assertions } from 'ava'; import { z } from 'zod'; @@ -57,12 +58,7 @@ const server = new Package('@affine/server'); const require = createRequire(server.srcPath.join('index.ts').toFileUrl()); export const runPrisma = async ( - cb: ( - prisma: InstanceType< - // oxlint-disable-next-line @typescript-eslint/consistent-type-imports - typeof import('../../../../packages/backend/server/node_modules/@prisma/client').PrismaClient - > - ) => Promise + cb: (prisma: PrismaClient) => Promise ): Promise => { const { PrismaClient } = require('@prisma/client'); const client = new PrismaClient({