Skip to content

Commit

Permalink
Merge pull request #4561 from apollographql/main-removed-federation
Browse files Browse the repository at this point in the history
Relocate federation packages to new federation repository
  • Loading branch information
abernix authored Sep 11, 2020
2 parents 60d9742 + 85c70a4 commit 149f78e
Show file tree
Hide file tree
Showing 185 changed files with 42 additions and 30,813 deletions.
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# CHANGELOG

The version headers in this history reflect the versions of Apollo Server itself. Versions of other packages (e.g. which are not actual HTTP integrations; packages not prefixed with `apollo-server`) may use different versions. For more details, check the publish commit for that version in the Git history, or check the individual CHANGELOGs for specific packages which are maintained separately:
The version headers in this history reflect the versions of Apollo Server itself. Versions of other packages (e.g., those which are not actual HTTP integrations; packages not prefixed with "`apollo-server`", or just supporting packages) may use different versions.

- [__CHANGELOG for `@apollo/gateway`__](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-gateway/CHANGELOG.md)
- [__CHANGELOG for `@apollo/federation`__](https://github.com/apollographql/apollo-server/blob/main/packages/apollo-federation/CHANGELOG.md)
🆕 **Please Note!**: 🆕 **The `@apollo/federation` and `@apollo/gateway` packages now live in the [`apollographql/federation`](https://github.com/apollographql/federation) repository.**

- [`@apollo/gateway`](https://github.com/apollographql/federation/blob/HEAD/gateway-js/CHANGELOG.md)
- [`@apollo/federation`](https://github.com/apollographql/federation/blob/HEAD/federation-js/CHANGELOG.md)

## vNEXT

Expand Down
2 changes: 1 addition & 1 deletion jest.config.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
// We don't want to match `apollo-server-env` and
// `apollo-engine-reporting-protobuf`, because these don't depend on
// compilation but need to be initialized from as parto of `prepare`.
'^(?!apollo-server-env|apollo-engine-reporting-protobuf)(apollo-(?:federation|gateway|server|datasource|cache-control|tracing|engine)[^/]*|graphql-extensions)(?:/dist)?((?:/.*)|$)': '<rootDir>/../../packages/$1/src$2'
'^(?!apollo-server-env|apollo-engine-reporting-protobuf)(apollo-(?:server|datasource|cache-control|tracing|engine)[^/]*|graphql-extensions)(?:/dist)?((?:/.*)|$)': '<rootDir>/../../packages/$1/src$2'
},
clearMocks: true,
globals: {
Expand Down
628 changes: 36 additions & 592 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
"watch": "tsc --build tsconfig.build.json --watch",
"release:version-bump": "lerna version",
"release:version-bump:server": "npm run release:version-bump -- --force-publish=apollo-server,apollo-server-core,apollo-server-azure-functions,apollo-server-cloud-functions,apollo-server-cloudflare,apollo-server-express,apollo-server-fastify,apollo-server-hapi,apollo-server-koa,apollo-server-lambda,apollo-server-micro,apollo-server-integration-testsuite,apollo-server-testing",
"release:version-bump:federation": "npm run release:version-bump -- --force-publish=@apollo/federation,@apollo/gateway,apollo-federation-integration-testsuite",
"release:version-bump:server-and-federation": "npm run release:version-bump -- --force-publish=@apollo/federation,@apollo/gateway,apollo-federation-integration-testsuite,apollo-server,apollo-server-core,apollo-server-azure-functions,apollo-server-cloud-functions,apollo-server-cloudflare,apollo-server-express,apollo-server-fastify,apollo-server-hapi,apollo-server-koa,apollo-server-lambda,apollo-server-micro,apollo-server-integration-testsuite,apollo-server-testing",
"release:start-ci-publish": "node -p '`Publish (dist-tag:${process.env.APOLLO_DIST_TAG || \"latest\"})`' | git tag -F - \"publish/$(date -u '+%Y%m%d%H%M%S')\" && git push origin \"$(git describe --match='publish/*' --tags --exact-match HEAD)\"",
"postinstall": "lerna run prepare && npm run compile",
"test": "jest --verbose",
Expand All @@ -27,14 +25,11 @@
},
"dependencies": {
"@apollographql/apollo-tools": "0.4.8",
"@apollo/federation": "file:packages/apollo-federation",
"@apollo/gateway": "file:packages/apollo-gateway",
"apollo-cache-control": "file:packages/apollo-cache-control",
"apollo-datasource": "file:packages/apollo-datasource",
"apollo-datasource-rest": "file:packages/apollo-datasource-rest",
"apollo-engine-reporting": "file:packages/apollo-engine-reporting",
"apollo-engine-reporting-protobuf": "file:packages/apollo-engine-reporting-protobuf",
"apollo-federation-integration-testsuite": "file:packages/apollo-federation-integration-testsuite",
"apollo-server": "file:packages/apollo-server",
"apollo-server-azure-functions": "file:packages/apollo-server-azure-functions",
"apollo-server-cache-memcached": "file:packages/apollo-server-cache-memcached",
Expand Down
6 changes: 0 additions & 6 deletions packages/apollo-federation-integration-testsuite/.npmignore

This file was deleted.

27 changes: 0 additions & 27 deletions packages/apollo-federation-integration-testsuite/package.json

This file was deleted.

This file was deleted.

129 changes: 0 additions & 129 deletions packages/apollo-federation-integration-testsuite/src/fixtures/books.ts

This file was deleted.

Loading

0 comments on commit 149f78e

Please sign in to comment.