Merge pull request #6448 from Ocelot-Social-Community/typescript-fix

fix(backend): typescript fix

backend/package.json

@@ -13,7 +13,7 @@
     "start": "node build/",
     "build": "tsc && ./scripts/build.copy.files.sh",
     "dev": "nodemon --exec ts-node src/ -e js,ts,gql",
-    "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql",
+    "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,ts,gql",
     "lint": "eslint src --config .eslintrc.js",
     "test": "cross-env NODE_ENV=test NODE_OPTIONS=--max-old-space-size=8192 jest --runInBand --coverage --forceExit --detectOpenHandles",
     "db:clean": "ts-node src/db/clean.ts",

backend/src/schema/resolvers/index.ts

@@ -1,5 +1,6 @@
 import path from 'path'
 import { fileLoader, mergeResolvers } from 'merge-graphql-schemas'
 
-const resolversArray = fileLoader(path.join(__dirname, './!(*.spec).ts'))
+// the files must be correctly evaluated in built and dev state - therefore accept both js & ts files
+const resolversArray = fileLoader(path.join(__dirname, './!(*.spec).(ts|js)'))
 export default mergeResolvers(resolversArray)

backend/test/features/support/steps.ts

@@ -5,7 +5,7 @@ import { expect } from 'chai'
 import { GraphQLClient } from 'graphql-request'
 import Factory from '../../../src/db/factories'
 const debug = require('debug')('ea:test:steps')
-
+const host: any = null
 const client = new GraphQLClient(host)
 
 function createUser (slug) {

backend/test/features/world.ts

@@ -4,6 +4,11 @@ import request from 'request'
 const debug = require('debug')('ea:test:world')
 
 class CustomWorld {
+  lastResponses: any
+  lastContentType: any
+  lastInboxUrl: any
+  lastActivity: any
+  statusCode: any
   constructor () {
     // webFinger.feature
     this.lastResponses = []