From a160a1683d7ae26c3a3dd8f6b38e9832c90a93ed Mon Sep 17 00:00:00 2001 From: Hugo FOYART <11079152+foyarash@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:21:03 +0100 Subject: [PATCH] fix path --- apps/example/package.json | 3 ++- packages/generator-prisma/src/index.ts | 11 +++++++---- turbo.json | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/example/package.json b/apps/example/package.json index 9868cb07..374e3565 100644 --- a/apps/example/package.json +++ b/apps/example/package.json @@ -4,11 +4,12 @@ "private": true, "scripts": { "dev": "next dev", - "build": "next build", + "build": "prisma generate && next build", "start": "next start", "lint": "next lint", "database": "prisma migrate dev && prisma db seed", "generate": "prisma generate", + "generate:client-only": "prisma generate --generator client", "reset-database": "prisma migrate reset --force && prisma migrate dev && prisma db seed", "prisma:migrate:dev": "prisma migrate dev", "vercel-build": "prisma generate && prisma migrate deploy && next build", diff --git a/packages/generator-prisma/src/index.ts b/packages/generator-prisma/src/index.ts index c803b9ee..0a06e48f 100755 --- a/packages/generator-prisma/src/index.ts +++ b/packages/generator-prisma/src/index.ts @@ -3,18 +3,21 @@ import { generatorHandler } from "@prisma/generator-helper"; import { parseEnvValue } from "@prisma/internals"; import path from "path"; import fs from "fs/promises"; -import { execSync } from "node:child_process"; // @ts-expect-error import { transformDMMF } from "prisma-json-schema-generator/dist/generator/transformDMMF"; import { insertDmmfData } from "./dmmf"; generatorHandler({ onManifest: () => { - const nodeModulesRoot = execSync("npm root").toString("utf8"); - return { defaultOutput: path.resolve( - path.join(nodeModulesRoot.trim(), ".next-admin") + path.join( + require.resolve("@premieroctet/next-admin"), + "..", + "..", + "node_modules", + ".next-admin" + ) ), prettyName: "Next Admin JSON Schema Generator", }; diff --git a/turbo.json b/turbo.json index e1d93c98..cf475ae0 100644 --- a/turbo.json +++ b/turbo.json @@ -11,9 +11,9 @@ "tasks": { "start": {}, "@premieroctet/next-admin#build": { - "dependsOn": ["example#generate"] + "dependsOn": ["example#generate:client-only"] }, - "example#generate": { + "example#generate:client-only": { "dependsOn": ["@premieroctet/next-admin-generator-prisma#build"] }, "build": {