fix(sdk,client): introduce isCustomOutput

src/packages/client/src/generation/generateClient.ts

@@ -113,17 +113,16 @@ export async function generateClient({
   clientVersion,
   engineVersion,
 }: GenerateClientOptions): Promise<BuildClientResult | undefined> {
-  const isInNodeModules = outputDir.includes(
-    `${path.sep}node_modules${path.sep}`,
-  )
   runtimePath =
-    runtimePath || (isInNodeModules ? '@prisma/client/runtime' : './runtime')
+    runtimePath ||
+    (generator?.isCustomOutput ? './runtime' : '@prisma/client/runtime')
 
   debug(`outputDir: ${outputDir}`)
   const dotPrismaDir = path.join(outputDir, '../../.prisma/client')
 
   // Cheap check, if people use custom dir
-  const finalOutputDir = isInNodeModules || testMode ? dotPrismaDir : outputDir
+  const finalOutputDir =
+    !generator?.isCustomOutput || testMode ? dotPrismaDir : outputDir
 
   const { prismaClientDmmf, fileMap } = await buildClient({
     datamodel,

src/packages/generator-helper/src/types.ts

@@ -164,6 +164,7 @@ export type Dictionary<T> = { [key: string]: T }
 export interface GeneratorConfig {
   name: string
   output: string | null
+  isCustomOutput?: boolean
   provider: string
   config: Dictionary<string>
   binaryTargets: string[] // check if new commit is there

src/packages/sdk/src/getGenerators.ts

@@ -150,6 +150,7 @@ export async function getGenerators({
         // resolve output path
         if (generator.output) {
           generator.output = path.resolve(baseDir, generator.output)
+          generator.isCustomOutput = true
           debug(`Resolving based on generator.output to ${generator.output}`)
         } else if (paths) {
           generator.output = paths.outputPath