Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a bundle of dependency issues #6393

Merged
merged 1 commit into from
May 5, 2022
Merged

Fix a bundle of dependency issues #6393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The version headers in this history reflect the versions of Apollo Server itself

## vNEXT

- _Nothing yet! Stay tuned._
- Add a few missing dependencies to packages. [PR #6393](https://github.com/apollographql/apollo-server/pull/6393)

## v3.7.0

Expand Down
11 changes: 7 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/apollo-datasource-rest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"apollo-server-errors": "file:../apollo-server-errors",
"http-cache-semantics": "^4.1.0"
},
"devDependencies": {
"apollo-server-types": "file:../apollo-server-types"
"peerDependencies": {
"graphql": "^15.3.0 || ^16.0.0"
}
}
3 changes: 1 addition & 2 deletions packages/apollo-datasource-rest/src/RESTDataSource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import {
fetch,
} from 'apollo-server-env';

import type { ValueOrPromise } from 'apollo-server-types';

import { DataSource, DataSourceConfig } from 'apollo-datasource';

import { HTTPCache } from './HTTPCache';
Expand All @@ -22,6 +20,7 @@ import {
ForbiddenError,
} from 'apollo-server-errors';

type ValueOrPromise<T> = T | Promise<T>;
declare module 'apollo-server-env/dist/fetch' {
interface RequestInit {
cacheOptions?:
Expand Down
1 change: 0 additions & 1 deletion packages/apollo-datasource-rest/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@
{ "path": "../apollo-datasource" },
{ "path": "../apollo-server-caching" },
{ "path": "../apollo-server-errors" },
{ "path": "../apollo-server-types" },
]
}
1 change: 1 addition & 0 deletions packages/apollo-server-types/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"node": ">=12.0"
},
"dependencies": {
"@apollo/utils.logger": "^1.0.0",
"apollo-reporting-protobuf": "file:../apollo-reporting-protobuf",
"apollo-server-caching": "file:../apollo-server-caching",
"apollo-server-env": "file:../apollo-server-env"
Expand Down
1 change: 1 addition & 0 deletions packages/apollo-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
},
"homepage": "https://github.com/apollographql/apollo-server#readme",
"dependencies": {
"@types/express": "4.17.13",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it need to be pinned? ):

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's pinned like this in apollo-server-express so I figured doing the same thing was reasonable.

We've had a lot of challenges with the Express DefinitelyTyped packages before. They factored out a huge part of the types from @types/express into @types/express-serve-static-core but the dependency of the former on the latter doesn't declare a specific version, so it's easy to accidentally install a pair of versions that don't work together. So unfortunately trying to pin more precisely does seem helpful. If they get behind we're happy to update everything...

"apollo-server-core": "file:../apollo-server-core",
"apollo-server-express": "file:../apollo-server-express",
"express": "^4.17.1"
Expand Down