Skip to content

Commit

Permalink
Fix typos (#5705)
Browse files Browse the repository at this point in the history
  • Loading branch information
frankie303 authored Sep 21, 2021
1 parent 89dc338 commit 52744b6
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 29 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ Certain undersupported and underused Apollo Server features have been removed in
> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/2da65ef9204027e43baedf9ce385bb3794fd0c9b)
- `apollo-server-testing`: Ensure that user-provided context is cloned when using `createTestClient`, per the instructions in the [intergration testing]() section of the Apollo Server documentation. [Issue #4170](https://github.com/apollographql/apollo-server/issues/4170) [PR #4175](https://github.com/apollographql/apollo-server/pull/4175)
- `apollo-server-testing`: Ensure that user-provided context is cloned when using `createTestClient`, per the instructions in the [integration testing]() section of the Apollo Server documentation. [Issue #4170](https://github.com/apollographql/apollo-server/issues/4170) [PR #4175](https://github.com/apollographql/apollo-server/pull/4175)
## v2.14.0
Expand Down Expand Up @@ -401,7 +401,7 @@ Certain undersupported and underused Apollo Server features have been removed in
- Allow passing a `WebSocket.Server` to `ApolloServer.installSubscriptionHandlers`. [PR #2314](https://github.com/apollographql/apollo-server/pull/2314)
- `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926)
- `apollo-engine-reporting`: Fix inadvertant conditional formatting which prevented automated persisted query (APQ) hits and misses from being reported to Apollo Graph Manager. [PR #3986](https://github.com/apollographql/apollo-server/pull/3986)
- `apollo-engine-reporting`: Fix inadvertent conditional formatting which prevented automated persisted query (APQ) hits and misses from being reported to Apollo Graph Manager. [PR #3986](https://github.com/apollographql/apollo-server/pull/3986)
- `apollo-engine-reporting`: Deprecate the `ENGINE_API_KEY` environment variable in favor of its new name, `APOLLO_KEY`. Continued use of `ENGINE_API_KEY` will result in deprecation warnings and support for it will be removed in a future major version. [#3923](https://github.com/apollographql/apollo-server/pull/3923)
- `apollo-engine-reporting`: Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. Similarly, within the `engine` configuration object, the `schemaTag` property has been renamed `graphVariant`. The functionality remains otherwise unchanged, but their new names mirror the name used within Apollo Graph Manager. Continued use of the now-deprecated names will result in deprecation warnings and support will be dropped completely in the next "major" update. To avoid misconfiguration, a runtime error will be thrown if _both_ new and deprecated names are set. [PR #3855](https://github.com/apollographql/apollo-server/pull/3855)
- `apollo-engine-reporting-protobuf`: __(This is a breaking change only if you directly depend on `apollo-engine-reporting-protobuf`.)__ Drop legacy fields that were never used by `apollo-engine-reporting`. Added new fields `StatsContext` to allow `apollo-server` to send summary stats instead of full traces, and renamed `FullTracesReport` to `Report` and `Traces` to `TracesAndStats` since reports now can include stats as well as traces.
Expand All @@ -421,7 +421,7 @@ Certain undersupported and underused Apollo Server features have been removed in

> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/056f083ddaf116633e6f759a2b3d69248bb18f66)
- The range of accepted `peerDepedencies` versions for `graphql` has been widened to include `graphql@^15.0.0-rc.2` so as to accommodate the latest release-candidate of the `graphql@15` package, and an intention to support it when it is finally released on the `latest` npm tag. While this change will subdue peer dependency warnings for Apollo Server packages, many dependencies from outside of this repository will continue to raise similar warnings until those packages own `peerDependencies` are updated. It is unlikely that all of those packages will update their ranges prior to the final version of `graphql@15` being released, but if everything is working as expected, the warnings can be safely ignored. [PR #3825](https://github.com/apollographql/apollo-server/pull/3825)
- The range of accepted `peerDependencies` versions for `graphql` has been widened to include `graphql@^15.0.0-rc.2` so as to accommodate the latest release-candidate of the `graphql@15` package, and an intention to support it when it is finally released on the `latest` npm tag. While this change will subdue peer dependency warnings for Apollo Server packages, many dependencies from outside of this repository will continue to raise similar warnings until those packages own `peerDependencies` are updated. It is unlikely that all of those packages will update their ranges prior to the final version of `graphql@15` being released, but if everything is working as expected, the warnings can be safely ignored. [PR #3825](https://github.com/apollographql/apollo-server/pull/3825)

## v2.10.1

Expand Down Expand Up @@ -725,7 +725,7 @@ Certain undersupported and underused Apollo Server features have been removed in

- `apollo-server-lambda`: Fix typings which triggered "Module has no default export" errors. [PR #2230](https://github.com/apollographql/apollo-server/pull/2230)
- `apollo-server-koa`: Support OPTIONS requests [PR #2288](https://github.com/apollographql/apollo-server/pull/2288)
- Add `req` and `res` typings to the `ContextFunction` argument for apollo-server and apollo-server-express. Update `ContextFunction` return type to allow returning a value syncronously. [PR #2330](https://github.com/apollographql/apollo-server/pull/2330)
- Add `req` and `res` typings to the `ContextFunction` argument for apollo-server and apollo-server-express. Update `ContextFunction` return type to allow returning a value synchronously. [PR #2330](https://github.com/apollographql/apollo-server/pull/2330)
- Type the `formatError` function to accept an GraphQLError as an argument and return a GraphQLFormattedError [PR #2343](https://github.com/apollographql/apollo-server/pull/2343)

## v2.4.2
Expand Down Expand Up @@ -905,7 +905,7 @@ the query extensions' `clientInfo` values will be used. [PR #1960](https://githu

- enable engine reporting from lambda [#1313](https://github.com/apollographql/apollo-server/pull/1313)
- remove flattening of errors [#1288](https://github.com/apollographql/apollo-server/pull/1288)
- dynamic url in datasourece ([#1277](https://github.com/apollographql/apollo-server/pull/1277))
- dynamic url in datasource ([#1277](https://github.com/apollographql/apollo-server/pull/1277))

## v2.0.0-rc.6

Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ DEBUG=lerna NPM_CONFIG_USERCONFIG="$HOME/.npmrc-apollo-bot" npx lerna publish fr

While it would be ideal to have this baked into the Git tag, it's not possible to do this in previous steps since we need to reference the commit hash that is created in Step 2's version bumping.

Therefore, after publishing, add an entry to the CHANGELOG that was published which references the "Release" commit in order to provide easier visibility into what was in that that release. It should be in the following format, where `COMMIT_HASH` is replaced with the Git reference for the most `Release` commmit found in `git log` and should immediately follow the `### vX.Y.Z` header of the version just published:
Therefore, after publishing, add an entry to the CHANGELOG that was published which references the "Release" commit in order to provide easier visibility into what was in that that release. It should be in the following format, where `COMMIT_HASH` is replaced with the Git reference for the most `Release` commit found in `git log` and should immediately follow the `### vX.Y.Z` header of the version just published:

```
> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/COMMIT_HASH)
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-datasource-rest/src/HTTPCache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export class HTTPCache {
let ttlOverride = cacheOptions?.ttl;

if (
// With a TTL override, only cache succesful responses but otherwise ignore method and response headers
// With a TTL override, only cache successful responses but otherwise ignore method and response headers
!(ttlOverride && policy._status >= 200 && policy._status <= 299) &&
// Without an override, we only cache GET requests and respect standard HTTP cache semantics
!(request.method === 'GET' && policy.storable())
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-datasource-rest/src/RESTDataSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export abstract class RESTDataSource<TContext = any> extends DataSource {
// You can override this to remove query parameters or compute a cache key in any way that makes sense.
// For example, you could use this to take Vary header fields into account.
// Although we do validate header fields and don't serve responses from cache when they don't match,
// new reponses overwrite old ones with different vary header fields.
// new responses overwrite old ones with different vary header fields.
protected cacheKeyFor(request: Request): string {
return request.url;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-core/src/ApolloServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ export class ApolloServerBase<
// requested with `accept: text/html`. If no landing page is defined by any
// plugin, returns null. (Specifically null and not undefined; some serverless
// integrations rely on this to tell the difference between "haven't called
// renderLandingPage yet" and "there is no landingß page").
// renderLandingPage yet" and "there is no landing page").
protected getLandingPage(): LandingPage | null {
this.assertStarted('getLandingPage');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface ApolloServerPluginCacheControlOptions {
* All root fields and fields returning objects or interfaces have this value
* for `maxAge` unless they set a cache hint with a non-undefined `maxAge`
* using `@cacheControl` or `setCacheHint`. The default is 0, which means "not
* cachable". (That is: if you don't set `defaultMaxAge`, then every root
* cacheable". (That is: if you don't set `defaultMaxAge`, then every root
* field in your operation and every field with sub-fields must have a cache
* hint or the overall operation will not be cacheable.)
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-core/src/requestPipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ export async function processGraphQLRequest<TContext>(
// The first thing that execution does is coerce the request's variables
// to the types declared in the operation, which can lead to errors if
// they are of the wrong type. It also makes sure that all non-null
// variables are required and get non-null values. If any of these thingss
// variables are required and get non-null values. If any of these things
// lead to errors, we change them into UserInputError so that their code
// doesn't end up being INTERNAL_SERVER_ERROR, since these are client
// errors.
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-errors/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export function formatApolloErrors(
const enrichedErrors = errors.map((error) => enrichError(error, debug));
const makePrintable = (error: GraphQLFormattedError) => {
if (error instanceof Error) {
// Error defines its `message` and other fields as non-enumerable, meaning JSON.stringigfy does not print them.
// Error defines its `message` and other fields as non-enumerable, meaning JSON.stringify does not print them.
const graphQLError = error as GraphQLFormattedError;
return {
message: graphQLError.message,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ describe('apollo-server-express', () => {
expect(e.extensions.exception.stacktrace).toBeDefined();
});

it('propogates error codes in dev mode', async () => {
it('propagates error codes in dev mode', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -312,7 +312,7 @@ describe('apollo-server-express', () => {
expect(result.errors[0].extensions.exception.stacktrace).toBeDefined();
});

it('propogates error codes in production', async () => {
it('propagates error codes in production', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -341,7 +341,7 @@ describe('apollo-server-express', () => {
expect(result.errors[0].extensions.exception).toBeUndefined();
});

it('propogates error codes with null response in production', async () => {
it('propagates error codes with null response in production', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ describe('apollo-server-fastify', () => {
expect(e.extensions.exception.stacktrace).toBeDefined();
});

it('propogates error codes in dev mode', async () => {
it('propagates error codes in dev mode', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -330,7 +330,7 @@ describe('apollo-server-fastify', () => {
expect(result.errors[0].extensions.exception.stacktrace).toBeDefined();
});

it('propogates error codes in production', async () => {
it('propagates error codes in production', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -359,7 +359,7 @@ describe('apollo-server-fastify', () => {
expect(result.errors[0].extensions.exception).toBeUndefined();
});

it('propogates error codes with null response in production', async () => {
it('propagates error codes with null response in production', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -456,7 +456,7 @@ describe('apollo-server-fastify', () => {
expect(result.data).toEqual({ cooks: books });
});

it('contains no cacheControl Headers when uncachable', async () => {
it('contains no cacheControl Headers when uncacheable', async () => {
const { url: uri } = await createServer({ typeDefs, resolvers });

const apolloFetch = createApolloFetch({ uri }).useAfter(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ describe('non-integration tests', () => {
expect(e.extensions.exception.stacktrace).toBeDefined();
});

it('propogates error codes in dev mode', async () => {
it('propagates error codes in dev mode', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -335,7 +335,7 @@ describe('non-integration tests', () => {
expect(result.errors[0].extensions.exception.stacktrace).toBeDefined();
});

it('propogates error codes in production', async () => {
it('propagates error codes in production', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -364,7 +364,7 @@ describe('non-integration tests', () => {
expect(result.errors[0].extensions.exception).toBeUndefined();
});

it('propogates error codes with null response in production', async () => {
it('propagates error codes with null response in production', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down
8 changes: 4 additions & 4 deletions packages/apollo-server-koa/src/__tests__/ApolloServer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ describe('apollo-server-koa', () => {
expect(e.extensions.exception.stacktrace).toBeDefined();
});

it('propogates error codes in dev mode', async () => {
it('propagates error codes in dev mode', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -301,7 +301,7 @@ describe('apollo-server-koa', () => {
expect(result.errors[0].extensions.exception.stacktrace).toBeDefined();
});

it('propogates error codes in production', async () => {
it('propagates error codes in production', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -330,7 +330,7 @@ describe('apollo-server-koa', () => {
expect(result.errors[0].extensions.exception).toBeUndefined();
});

it('propogates error codes with null response in production', async () => {
it('propagates error codes with null response in production', async () => {
const { url: uri } = await createServer({
typeDefs: gql`
type Query {
Expand Down Expand Up @@ -427,7 +427,7 @@ describe('apollo-server-koa', () => {
expect(result.data).toEqual({ cooks: books });
});

it('contains no cacheControl Headers when uncachable', async () => {
it('contains no cacheControl Headers when uncacheable', async () => {
const { url: uri } = await createServer({ typeDefs, resolvers });

const apolloFetch = createApolloFetch({ uri }).useAfter(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ declare module 'make-fetch-happen' {
| boolean
| number
| {
// The maximum amount of times to retry the operation. Default is 10. Seting this to 1 means do it once, then retry it once
// The maximum amount of times to retry the operation. Default is 10. Setting this to 1 means do it once, then retry it once
retries?: number;
// The exponential factor to use. Default is 2.
factor?: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ interface Options<TContext = Record<string, any>> {
// This should return a session ID if the user is "logged in", or null if
// there is no "logged in" user.
//
// If a cachable response has any PRIVATE nodes, then:
// If a cacheable response has any PRIVATE nodes, then:
// - If this hook is not defined, a warning will be logged and it will not be cached.
// - Else if this hook returns null, it will not be cached.
// - Else it will be cached under a cache key tagged with the session ID and
// mode "private".
//
// If a cachable response has no PRIVATE nodes, then:
// If a cacheable response has no PRIVATE nodes, then:
// - If this hook is not defined or returns null, it will be cached under a cache
// key tagged with the mode "no session".
// - Else it will be cached under a cache key tagged with the mode
Expand Down

0 comments on commit 52744b6

Please sign in to comment.