diff --git a/package-lock.json b/package-lock.json index 2e5ca6145ce..716748f9916 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,7 +104,7 @@ "supertest": "6.2.4", "test-listen": "1.1.0", "ts-jest": "28.0.8", - "typescript": "4.7.4" + "typescript": "4.8.3" }, "engines": { "node": ">=12", @@ -20074,9 +20074,9 @@ } }, "node_modules/typescript": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", - "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz", + "integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -36350,9 +36350,9 @@ } }, "typescript": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", - "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz", + "integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==", "dev": true }, "ua-parser-js": { diff --git a/package.json b/package.json index 8aeed67d9ba..9455aa6096e 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "supertest": "6.2.4", "test-listen": "1.1.0", "ts-jest": "28.0.8", - "typescript": "4.7.4" + "typescript": "4.8.3" }, "jest": { "projects": [ diff --git a/packages/apollo-server-core/src/plugin/usageReporting/plugin.ts b/packages/apollo-server-core/src/plugin/usageReporting/plugin.ts index 7d644fbf3af..b00a9199d5c 100644 --- a/packages/apollo-server-core/src/plugin/usageReporting/plugin.ts +++ b/packages/apollo-server-core/src/plugin/usageReporting/plugin.ts @@ -13,6 +13,7 @@ import { GraphQLServiceContext, GraphQLRequestContextDidResolveOperation, GraphQLRequestContextWillSendResponse, + BaseContext, } from 'apollo-server-types'; import { createOperationDerivedDataCache, @@ -63,7 +64,7 @@ class ReportData { } } -export function ApolloServerPluginUsageReporting( +export function ApolloServerPluginUsageReporting( options: ApolloServerPluginUsageReportingOptions = Object.create( null, ), diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index ab6ded805ef..1df8b9a3b90 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -37,6 +37,7 @@ import type { GraphQLExecutor, GraphQLExecutionResult, ValidationRule, + BaseContext, } from 'apollo-server-types'; import type { ApolloServerPlugin, @@ -117,7 +118,7 @@ function isBadUserInputGraphQLError(error: GraphQLError): Boolean { ); } -export async function processGraphQLRequest( +export async function processGraphQLRequest( config: GraphQLRequestPipelineConfig, requestContext: Mutable>, ): Promise { diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts index 8a52fae0457..60f6a34d073 100644 --- a/packages/apollo-server-core/src/runHttpQuery.ts +++ b/packages/apollo-server-core/src/runHttpQuery.ts @@ -2,6 +2,7 @@ import { Headers, Request } from 'apollo-server-env'; import { ApolloError, formatApolloErrors } from 'apollo-server-errors'; import type { ApolloServerPlugin } from 'apollo-server-plugin-base'; import type { + BaseContext, GraphQLExecutionResult, ValueOrPromise, WithRequired, @@ -290,7 +291,7 @@ export async function runHttpQuery( return processHTTPRequest(config, request); } -export async function processHTTPRequest( +export async function processHTTPRequest( options: WithRequired, 'cache' | 'plugins'> & { context: TContext; }, diff --git a/packages/apollo-server-core/src/utils/pluginTestHarness.ts b/packages/apollo-server-core/src/utils/pluginTestHarness.ts index 24b0ea90060..2eb175b3d9e 100644 --- a/packages/apollo-server-core/src/utils/pluginTestHarness.ts +++ b/packages/apollo-server-core/src/utils/pluginTestHarness.ts @@ -11,6 +11,7 @@ import type { GraphQLRequestContextParsingDidStart, GraphQLRequestContextValidationDidStart, SchemaHash, + BaseContext, } from 'apollo-server-types'; import type { Logger } from '@apollo/utils.logger'; import { GraphQLSchema, GraphQLObjectType, GraphQLString } from 'graphql/type'; @@ -35,7 +36,7 @@ type IPluginTestHarnessExecutionDidStart = request: IPluginTestHarnessGraphqlRequest; }; -export default async function pluginTestHarness({ +export default async function pluginTestHarness({ pluginInstance, schema, logger, diff --git a/renovate.json5 b/renovate.json5 index 7f8a4ba25ff..b195021209c 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -168,13 +168,6 @@ matchPackageNames: ["jest", "jest-config", "ts-jest", "@types/jest", ], matchBaseBranches: ["main"], allowedVersions: "28.x" - }, - { - // typescript@4.8 breaks the build on main; since AS4 is imminent, pinning - // seems better than fixing. - matchPackageNames: ["typescript"], - matchBaseBranches: ["main"], - allowedVersions: "4.7.x", - }, + } ] }