fix(client): env-var loading (prisma#7669)

Andrew-Colman · Aug 7, 2021 · 881800b · 881800b
1 parent c52aeaf
commit 881800b
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/src/packages/client/src/generation/TSClient/TSClient.ts b/src/packages/client/src/generation/TSClient/TSClient.ts
@@ -43,23 +43,17 @@ export class TSClient implements Generatable {
     this.dmmf = new DMMFClass(klona(options.document))
   }
   public toJS(): string {
-    const {
-      generator,
-      sqliteDatasourceOverrides,
-      outputDir,
-      schemaDir,
-      projectRoot,
-    } = this.options
+    const { generator, sqliteDatasourceOverrides, outputDir, schemaDir } =
+      this.options
     const schemaPath = path.join(schemaDir, 'prisma.schema')
-    const envPaths = getEnvPaths(schemaPath, { cwd: projectRoot })
+    const envPaths = getEnvPaths(schemaPath, { cwd: outputDir })
 
     const relativeEnvPaths = {
       rootEnvPath:
-        envPaths.rootEnvPath &&
-        path.relative(projectRoot, envPaths.rootEnvPath),
+        envPaths.rootEnvPath && path.relative(outputDir, envPaths.rootEnvPath),
       schemaEnvPath:
         envPaths.schemaEnvPath &&
-        path.relative(projectRoot, envPaths.schemaEnvPath),
+        path.relative(outputDir, envPaths.schemaEnvPath),
     }
 
     const config: Omit<GetPrismaClientOptions, 'document' | 'dirname'> = {
@@ -148,8 +142,8 @@ config.dirname = dirname
  * loading of env variable occurs in getPrismaClient
  */
 const envPaths = {
-  rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(process.cwd(), config.relativeEnvPaths.rootEnvPath),
-  schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(process.cwd(), config.relativeEnvPaths.schemaEnvPath)
+  rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(dirname, config.relativeEnvPaths.rootEnvPath),
+  schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(dirname, config.relativeEnvPaths.schemaEnvPath)
 }
 warnEnvConflicts(envPaths)