From 0432d3277e5edb7df48bf16cc0774e23f09f5d8f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 15 Jun 2023 13:57:13 +0200 Subject: [PATCH 1/4] fixed why production didnt work --- backend/src/schema/resolvers/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/schema/resolvers/index.ts b/backend/src/schema/resolvers/index.ts index 57a29a05a..75d772391 100644 --- a/backend/src/schema/resolvers/index.ts +++ b/backend/src/schema/resolvers/index.ts @@ -1,5 +1,5 @@ import path from 'path' import { fileLoader, mergeResolvers } from 'merge-graphql-schemas' -const resolversArray = fileLoader(path.join(__dirname, './!(*.spec).ts')) +const resolversArray = fileLoader(path.join(__dirname, './!(*.spec).(ts|js)')) export default mergeResolvers(resolversArray) From 09ef532838e6cbfe749a094fca88f249a10fe571 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 15 Jun 2023 13:57:29 +0200 Subject: [PATCH 2/4] converted two more js files to ts --- backend/test/features/support/{steps.js => steps.ts} | 2 +- backend/test/features/{world.js => world.ts} | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) rename backend/test/features/support/{steps.js => steps.ts} (99%) rename backend/test/features/{world.js => world.ts} (94%) diff --git a/backend/test/features/support/steps.js b/backend/test/features/support/steps.ts similarity index 99% rename from backend/test/features/support/steps.js rename to backend/test/features/support/steps.ts index e15801f83..c62b286cd 100644 --- a/backend/test/features/support/steps.js +++ b/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) { diff --git a/backend/test/features/world.js b/backend/test/features/world.ts similarity index 94% rename from backend/test/features/world.js rename to backend/test/features/world.ts index be436b536..72e120dc7 100644 --- a/backend/test/features/world.js +++ b/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 = [] From 5dd4a1af80ac6ba8542d2fe0a44319ff9a811261 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 15 Jun 2023 13:58:26 +0200 Subject: [PATCH 3/4] comment to explain the bug --- backend/src/schema/resolvers/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/schema/resolvers/index.ts b/backend/src/schema/resolvers/index.ts index 75d772391..1aeadbea2 100644 --- a/backend/src/schema/resolvers/index.ts +++ b/backend/src/schema/resolvers/index.ts @@ -1,5 +1,6 @@ import path from 'path' import { fileLoader, mergeResolvers } from 'merge-graphql-schemas' +// 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) From c1669abac07004b8990f06b32fded01c4128baaf Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 15 Jun 2023 13:58:38 +0200 Subject: [PATCH 4/4] correct nodemon watch in dev:debug --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index d4c9cee56..f236338bd 100644 --- a/backend/package.json +++ b/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",