Fix build command

prisma-labs · Mar 11, 2019 · c5cad75 · c5cad75
1 parent ace42c5
commit c5cad75
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 26 deletions.
diff --git a/packages/yoga/src/cli/commands/build/index.ts b/packages/yoga/src/cli/commands/build/index.ts
@@ -35,9 +35,8 @@ export default () => {
     tsConfigPath,
   )
   const config = fixConfig(inputConfig, info.projectDir)
-  const rootNames = getRootNames(info)
 
-  compile(rootNames, config.options)
+  compile(config.fileNames, config.options)
 
   if (!info.yogaConfig.ejectFilePath) {
     const ejectFilePath = path.join(
@@ -69,25 +68,6 @@ function compile(rootNames: string[], options: ts.CompilerOptions) {
   }
 }
 
-function getRootNames(info: ConfigWithInfo) {
-  const rootNames = findFileByExtension(info.yogaConfig.resolversPath, '.ts')
-
-  if (info.yogaConfig.contextPath) {
-    rootNames.push(info.yogaConfig.contextPath)
-  }
-
-  if (info.yogaConfig.ejectFilePath) {
-    rootNames.push(info.yogaConfig.ejectFilePath)
-  }
-
-  if (info.yogaConfig.prisma) {
-    rootNames.push(...findFileByExtension(info.prismaClientDir!, '.ts'))
-    rootNames.push(...findFileByExtension(info.datamodelInfoDir!, '.ts'))
-  }
-
-  return rootNames
-}
-
 /**
  * Do post-processing on config options to support `ts-node`.
  */

diff --git a/packages/yoga/src/config.ts b/packages/yoga/src/config.ts
@@ -63,7 +63,7 @@ function getDatamodelInfoDir(
   }
 
   if (inputConfig.prisma && inputConfig.prisma.datamodelInfoPath) {
-    return inputConfig.prisma.datamodelInfoPath
+    return path.join(projectDir, inputConfig.prisma.datamodelInfoPath)
   }
 
   return path.join(projectDir, DEFAULT_META_SCHEMA_DIR)

diff --git a/packages/yoga/src/index.ts b/packages/yoga/src/index.ts
@@ -2,7 +2,7 @@ import * as ApolloServer from 'apollo-server-express'
 import { ExpressContext } from 'apollo-server-express/dist/ApolloServer'
 import express from 'express'
 import * as Http from 'http'
-import { InputConfig as YogaConfig, Yoga, MaybePromise } from './types'
+import { InputConfig as YogaConfig, MaybePromise, Yoga } from './types'
 
 export * from 'nexus'
 export * from 'nexus-prisma'

diff --git a/packages/yoga/src/server.ts b/packages/yoga/src/server.ts
@@ -195,11 +195,9 @@ function getYogaServer(info: ConfigWithInfo): Yoga {
           config.contextPath,
           config.expressPath,
         )
-        const allTypes: any[] = [types]
-
         const makeSchemaOptions = makeSchemaDefaults(
           config,
-          allTypes,
+          types,
           info.prismaClientDir,
         )
         const schema = config.prisma