Switch to dreamit graphql-server-base

dreamit-de · May 15, 2023 · 9e3d70c · 9e3d70c
1 parent d9dd2b4
commit 9e3d70c
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dreamit/graphql-server",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "A GraphQL server written in NodeJS/Typescript.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -30,12 +30,12 @@
     "@sgohlke/ts-base-dependencies": "1.0.9",
     "@types/content-type": "1.1.5",
     "@types/express": "4.17.17",
-    "cross-fetch": "3.1.5",
+    "cross-fetch": "3.1.6",
     "express": "4.18.2",
     "jest-html-reporters": "3.1.4"
   },
   "peerDependencies": {
     "graphql": "^16.0.0",
-    "@sgohlke/graphql-server-base": "^2.0.0"
+    "@dreamit/graphql-server-base": "^2.1.4"
   }
 }
diff --git a/src/error/DetermineGraphQLOrFetchError.ts b/src/error/DetermineGraphQLOrFetchError.ts
@@ -1,7 +1,7 @@
 import {
     FETCH_ERROR,
     GRAPHQL_ERROR
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 /**
  * Determines if an error is a GraphQLError or

diff --git a/src/error/DetermineValidationOrIntrospectionDisabledError.ts b/src/error/DetermineValidationOrIntrospectionDisabledError.ts
@@ -1,7 +1,7 @@
 import {
     INTROSPECTION_DISABLED_ERROR,
     VALIDATION_ERROR
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 /**
  * Determines if an error is a ValidationError or

diff --git a/src/logger/JsonLogger.ts b/src/logger/JsonLogger.ts
@@ -5,7 +5,7 @@ import {
     createLogEntry
 } from '..'
 import {Console} from 'node:console'
-import {Logger} from '@sgohlke/graphql-server-base'
+import {Logger} from '@dreamit/graphql-server-base'
 
 const loggerConsole: Console = new Console(process.stdout, process.stderr, false)
 

diff --git a/src/logger/TextLogger.ts b/src/logger/TextLogger.ts
@@ -4,7 +4,7 @@ import {
     LogLevel,
     createLogEntry,
 } from '..'
-import {Logger} from '@sgohlke/graphql-server-base'
+import {Logger} from '@dreamit/graphql-server-base'
 
 /**
  * Logger implementation that outputs log entries as text to console.

diff --git a/src/metrics/NoMetricsClient.ts b/src/metrics/NoMetricsClient.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import { MetricsClient } from '@sgohlke/graphql-server-base'
+import { MetricsClient } from '@dreamit/graphql-server-base'
 
 /**
  * Metrics client that does not collect any metrics.

diff --git a/src/metrics/SimpleMetricsClient.ts b/src/metrics/SimpleMetricsClient.ts
@@ -9,7 +9,7 @@ import {
     SCHEMA_VALIDATION_ERROR,
     SYNTAX_ERROR,
     VALIDATION_ERROR
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 /**
  * Simple metrics client.

diff --git a/src/request/ExtractInformationFromRequest.ts b/src/request/ExtractInformationFromRequest.ts
@@ -2,7 +2,7 @@ import {
     ContentType,
     GraphQLRequestInfo,
     GraphQLServerRequest
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 import {Buffer} from 'node:buffer'
 import {GraphQLError} from 'graphql'
 import {URLSearchParams} from 'node:url'

diff --git a/src/request/GetContentType.ts b/src/request/GetContentType.ts
@@ -1,4 +1,4 @@
-import { ContentType } from '@sgohlke/graphql-server-base'
+import { ContentType } from '@dreamit/graphql-server-base'
 
 export function getContentType(contentType?: string): ContentType {
     if (contentType) {

diff --git a/src/response/GraphQLExecutionResult.ts b/src/response/GraphQLExecutionResult.ts
@@ -1,7 +1,7 @@
 import {
     GraphQLError
 } from 'graphql'
-import {GraphQLExecutionResult} from '@sgohlke/graphql-server-base'
+import {GraphQLExecutionResult} from '@dreamit/graphql-server-base'
 
 export function getFirstErrorFromExecutionResult(result: GraphQLExecutionResult)
     : GraphQLError {

diff --git a/src/response/SendResponse.ts b/src/response/SendResponse.ts
@@ -1,5 +1,5 @@
 import {Buffer} from 'node:buffer'
-import { ResponseParameters } from '@sgohlke/graphql-server-base'
+import { ResponseParameters } from '@dreamit/graphql-server-base'
 
 /**
  * Default implementation of sendResponse function

diff --git a/src/server/DefaultGraphQLServerOptions.ts b/src/server/DefaultGraphQLServerOptions.ts
@@ -17,7 +17,7 @@ import {
     Logger,
     MetricsClient,
     ResponseParameters
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 import {
     GraphQLFieldResolver,
     GraphQLTypeResolver

diff --git a/src/server/GraphQLServer.ts b/src/server/GraphQLServer.ts
@@ -29,7 +29,7 @@ import {
     SCHEMA_VALIDATION_ERROR,
     SYNTAX_ERROR,
     isGraphQLServerRequest,
-}  from '@sgohlke/graphql-server-base'
+}  from '@dreamit/graphql-server-base'
 
 const requestCouldNotBeProcessed = 'Request could not be processed: '
 const defaultOptions = new DefaultGraphQLServerOptions()
@@ -107,7 +107,7 @@ export class GraphQLServer {
 
     // Gets the metrics for use in the response body.
     async getMetrics(): Promise<string> {
-        return this.options.metricsClient.getMetrics()
+        return await this.options.metricsClient.getMetrics()
     }
 
     /**

diff --git a/src/server/GraphQLServerOptions.ts b/src/server/GraphQLServerOptions.ts
@@ -16,7 +16,7 @@ import {
     Logger,
     MetricsClient,
     ResponseParameters
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 import {
     GraphQLFieldResolver,
     GraphQLTypeResolver

diff --git a/tests/ExampleSchemas.ts b/tests/ExampleSchemas.ts
@@ -6,7 +6,7 @@ import {
 import {
     AggregateError,
 } from '~/src'
-import {GraphQLRequestInfo} from '@sgohlke/graphql-server-base'
+import {GraphQLRequestInfo} from '@dreamit/graphql-server-base'
 
 // Contains example schemas and data that can be used across tests
 

diff --git a/tests/TestHelpers.ts b/tests/TestHelpers.ts
@@ -11,7 +11,7 @@ import {
     userSchemaResolvers
 } from './ExampleSchemas'
 import {Console} from 'node:console'
-import { GraphQLRequestInfo } from '@sgohlke/graphql-server-base'
+import { GraphQLRequestInfo } from '@dreamit/graphql-server-base'
 import fetch from 'cross-fetch'
 
 export class NoStacktraceJsonLogger extends JsonLogger {

diff --git a/tests/metrics/MetricsClients.integration.test.ts b/tests/metrics/MetricsClients.integration.test.ts
@@ -8,7 +8,7 @@ import {
     SCHEMA_VALIDATION_ERROR,
     SYNTAX_ERROR,
     VALIDATION_ERROR,
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 import {
     GRAPHQL_SERVER_PORT,
     LOGGER,

diff --git a/tests/response/CustomSendResponse.integration.test.ts b/tests/response/CustomSendResponse.integration.test.ts
@@ -20,7 +20,7 @@ import {
 
 
 import {Buffer} from 'node:buffer'
-import { ResponseParameters } from '@sgohlke/graphql-server-base'
+import { ResponseParameters } from '@dreamit/graphql-server-base'
 import {Server} from 'node:http'
 import bodyParser from 'body-parser'
 

diff --git a/tests/server/GraphQLServer.test.ts b/tests/server/GraphQLServer.test.ts
@@ -21,7 +21,7 @@ import {
     userTwo,
     usersQuery
 } from '../ExampleSchemas'
-import {GraphQLExecutionResult} from '@sgohlke/graphql-server-base'
+import {GraphQLExecutionResult} from '@dreamit/graphql-server-base'
 import {TEXT_LOGGER} from '~/tests/TestHelpers'