diff --git a/.changeset/config.json b/.changeset/config.json index 166a2892328..aab46dbe887 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -6,8 +6,8 @@ ], "commit": false, "fixed": [["@apollo/server", "@apollo/server-integration-testsuite"]], - "access": "restricted", - "baseBranch": "main", + "access": "public", + "baseBranch": "version-4", "updateInternalDependencies": "patch", "ignore": [] } diff --git a/.changeset/great-hats-rhyme.md b/.changeset/great-hats-rhyme.md deleted file mode 100644 index 9c6181ed8da..00000000000 --- a/.changeset/great-hats-rhyme.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@apollo/server": major -"@apollo/usage-reporting-protobuf": major ---- - -AS4(TODO): fill this out with real, extensive CHANGELOG entry diff --git a/.changeset/pre.json b/.changeset/pre.json index c153225cb0d..4c5e31fc528 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -2,8 +2,12 @@ "mode": "pre", "tag": "alpha", "initialVersions": { + "@apollo/server-integration-testsuite": "3.6.7", + "@apollo/server-plugin-response-cache": "3.6.7", "@apollo/server": "3.6.7", "@apollo/usage-reporting-protobuf": "3.3.1" }, - "changesets": [] + "changesets": [ + "small-cycles-hammer" + ] } diff --git a/.changeset/small-cycles-hammer.md b/.changeset/small-cycles-hammer.md new file mode 100644 index 00000000000..802374306d2 --- /dev/null +++ b/.changeset/small-cycles-hammer.md @@ -0,0 +1,8 @@ +--- +"@apollo/server-integration-testsuite": major +"@apollo/server-plugin-response-cache": major +"@apollo/server": major +"@apollo/usage-reporting-protobuf": major +--- + +Initial Apollo Server 4 release diff --git a/.envrc b/.envrc index 4d42e2101a9..eeb93def65b 100644 --- a/.envrc +++ b/.envrc @@ -10,5 +10,11 @@ if ! [ -f "$VOLTA_HOME/bin/volta" ]; then CURL_CA_BUNDLE=.cacert.pem bash -c 'curl https://get.volta.sh/ | bash' fi +# Lets you add more environment variables if you want. (For example, GITHUB_TOKEN +# for changesets.) +if [ -f .env ]; then + dotenv .env +fi + # Allow you to run jest and other things in node_modules/.bin without npx. layout node diff --git a/.gitignore b/.gitignore index 15e57d44649..2987228e475 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,6 @@ smoke-test/generated # This file is written by postinstall scripts. packages/server/src/generated/packageVersion.ts + +# Lets you add more env vars. +.env diff --git a/package-lock.json b/package-lock.json index 832f8014a47..39c6e4ae66a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12547,11 +12547,11 @@ }, "packages/integration-testsuite": { "name": "@apollo/server-integration-testsuite", - "version": "3.6.7", + "version": "4.0.0-alpha.0", "license": "MIT", "dependencies": { "@apollo/client": "^3.6.9", - "@apollo/usage-reporting-protobuf": "^3.3.1", + "@apollo/usage-reporting-protobuf": "^4.0.0-alpha.0", "@apollo/utils.createhash": "^1.1.0", "@apollo/utils.keyvaluecache": "^1.0.1", "@josephg/resolvable": "^1.0.1", @@ -12566,7 +12566,7 @@ "node": ">=14.0" }, "peerDependencies": { - "@apollo/server": "^3.6.7", + "@apollo/server": "^4.0.0-alpha.0", "@jest/globals": "28.x", "graphql": "^16.5.0", "jest": "28.x" @@ -12574,7 +12574,7 @@ }, "packages/plugin-response-cache": { "name": "@apollo/server-plugin-response-cache", - "version": "3.6.7", + "version": "4.0.0-alpha.0", "license": "MIT", "dependencies": { "@apollo/utils.createhash": "^1.1.0", @@ -12584,16 +12584,16 @@ "node": ">=14.0" }, "peerDependencies": { - "@apollo/server": "^3.6.7", + "@apollo/server": "^4.0.0-alpha.0", "graphql": "^16.0.0" } }, "packages/server": { "name": "@apollo/server", - "version": "3.6.7", + "version": "4.0.0-alpha.0", "license": "MIT", "dependencies": { - "@apollo/usage-reporting-protobuf": "^3.3.0", + "@apollo/usage-reporting-protobuf": "^4.0.0-alpha.0", "@apollo/utils.createhash": "^1.1.0", "@apollo/utils.fetcher": "^1.0.0", "@apollo/utils.isnodelike": "^1.1.0", @@ -12634,7 +12634,7 @@ }, "packages/usage-reporting-protobuf": { "name": "@apollo/usage-reporting-protobuf", - "version": "3.3.1", + "version": "4.0.0-alpha.0", "license": "MIT", "dependencies": { "@apollo/protobufjs": "1.2.4" @@ -12719,7 +12719,7 @@ "@apollo/server": { "version": "file:packages/server", "requires": { - "@apollo/usage-reporting-protobuf": "^3.3.0", + "@apollo/usage-reporting-protobuf": "^4.0.0-alpha.0", "@apollo/utils.createhash": "^1.1.0", "@apollo/utils.fetcher": "^1.0.0", "@apollo/utils.isnodelike": "^1.1.0", @@ -12754,7 +12754,7 @@ "version": "file:packages/integration-testsuite", "requires": { "@apollo/client": "^3.6.9", - "@apollo/usage-reporting-protobuf": "^3.3.1", + "@apollo/usage-reporting-protobuf": "^4.0.0-alpha.0", "@apollo/utils.createhash": "^1.1.0", "@apollo/utils.keyvaluecache": "^1.0.1", "@josephg/resolvable": "^1.0.1", diff --git a/packages/integration-testsuite/CHANGELOG.md b/packages/integration-testsuite/CHANGELOG.md new file mode 100644 index 00000000000..fd8d407d776 --- /dev/null +++ b/packages/integration-testsuite/CHANGELOG.md @@ -0,0 +1,13 @@ +# @apollo/server-integration-testsuite + +## 4.0.0-alpha.0 + +### Major Changes + +- [`f39d9eec7`](https://github.com/apollographql/apollo-server/commit/f39d9eec7ab72d0f471a0bb0646dd42ad81c56cf) Thanks [@glasser](https://github.com/glasser)! - Initial Apollo Server 4 release + +### Patch Changes + +- Updated dependencies [[`f39d9eec7`](https://github.com/apollographql/apollo-server/commit/f39d9eec7ab72d0f471a0bb0646dd42ad81c56cf)]: + - @apollo/server@4.0.0-alpha.0 + - @apollo/usage-reporting-protobuf@4.0.0-alpha.0 diff --git a/packages/integration-testsuite/package.json b/packages/integration-testsuite/package.json index ad01c1d259d..efbf3f25b40 100644 --- a/packages/integration-testsuite/package.json +++ b/packages/integration-testsuite/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/server-integration-testsuite", - "version": "3.6.7", + "version": "4.0.0-alpha.0", "description": "Test suite for Apollo Server integrations", "type": "module", "main": "dist/index.js", @@ -30,7 +30,7 @@ "@apollo/client": "^3.6.9", "@apollo/utils.keyvaluecache": "^1.0.1", "@apollo/utils.createhash": "^1.1.0", - "@apollo/usage-reporting-protobuf": "^3.3.1", + "@apollo/usage-reporting-protobuf": "^4.0.0-alpha.0", "@josephg/resolvable": "^1.0.1", "body-parser": "^1.20.0", "express": "^4.18.1", @@ -40,7 +40,7 @@ "supertest": "^6.2.3" }, "peerDependencies": { - "@apollo/server": "^3.6.7", + "@apollo/server": "^4.0.0-alpha.0", "@jest/globals": "28.x", "graphql": "^16.5.0", "jest": "28.x" diff --git a/packages/plugin-response-cache/CHANGELOG.md b/packages/plugin-response-cache/CHANGELOG.md new file mode 100644 index 00000000000..ec9b81d32de --- /dev/null +++ b/packages/plugin-response-cache/CHANGELOG.md @@ -0,0 +1,12 @@ +# @apollo/server-plugin-response-cache + +## 4.0.0-alpha.0 + +### Major Changes + +- [`f39d9eec7`](https://github.com/apollographql/apollo-server/commit/f39d9eec7ab72d0f471a0bb0646dd42ad81c56cf) Thanks [@glasser](https://github.com/glasser)! - Initial Apollo Server 4 release + +### Patch Changes + +- Updated dependencies [[`f39d9eec7`](https://github.com/apollographql/apollo-server/commit/f39d9eec7ab72d0f471a0bb0646dd42ad81c56cf)]: + - @apollo/server@4.0.0-alpha.0 diff --git a/packages/plugin-response-cache/package.json b/packages/plugin-response-cache/package.json index 83a8761f8a5..120ad0c11f9 100644 --- a/packages/plugin-response-cache/package.json +++ b/packages/plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/server-plugin-response-cache", - "version": "3.6.7", + "version": "4.0.0-alpha.0", "description": "Apollo Server full query response cache", "type": "module", "main": "dist/cjs/index.js", @@ -33,7 +33,7 @@ "@apollo/utils.keyvaluecache": "^1.0.1" }, "peerDependencies": { - "@apollo/server": "^3.6.7", + "@apollo/server": "^4.0.0-alpha.0", "graphql": "^16.0.0" } } diff --git a/packages/server/CHANGELOG.md b/packages/server/CHANGELOG.md new file mode 100644 index 00000000000..29d892087ef --- /dev/null +++ b/packages/server/CHANGELOG.md @@ -0,0 +1,12 @@ +# @apollo/server + +## 4.0.0-alpha.0 + +### Major Changes + +- [`f39d9eec7`](https://github.com/apollographql/apollo-server/commit/f39d9eec7ab72d0f471a0bb0646dd42ad81c56cf) Thanks [@glasser](https://github.com/glasser)! - Initial Apollo Server 4 release + +### Patch Changes + +- Updated dependencies [[`f39d9eec7`](https://github.com/apollographql/apollo-server/commit/f39d9eec7ab72d0f471a0bb0646dd42ad81c56cf)]: + - @apollo/usage-reporting-protobuf@4.0.0-alpha.0 diff --git a/packages/server/package.json b/packages/server/package.json index 2015bec1a27..f08cad3a934 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/server", - "version": "3.6.7", + "version": "4.0.0-alpha.0", "description": "Core engine for Apollo GraphQL server", "type": "module", "main": "dist/cjs/index.js", @@ -84,7 +84,7 @@ "node": ">=12.0" }, "dependencies": { - "@apollo/usage-reporting-protobuf": "^3.3.0", + "@apollo/usage-reporting-protobuf": "^4.0.0-alpha.0", "@apollo/utils.createhash": "^1.1.0", "@apollo/utils.fetcher": "^1.0.0", "@apollo/utils.isnodelike": "^1.1.0", diff --git a/packages/usage-reporting-protobuf/CHANGELOG.md b/packages/usage-reporting-protobuf/CHANGELOG.md new file mode 100644 index 00000000000..a30a0283857 --- /dev/null +++ b/packages/usage-reporting-protobuf/CHANGELOG.md @@ -0,0 +1,7 @@ +# @apollo/usage-reporting-protobuf + +## 4.0.0-alpha.0 + +### Major Changes + +- [`f39d9eec7`](https://github.com/apollographql/apollo-server/commit/f39d9eec7ab72d0f471a0bb0646dd42ad81c56cf) Thanks [@glasser](https://github.com/glasser)! - Initial Apollo Server 4 release diff --git a/packages/usage-reporting-protobuf/package.json b/packages/usage-reporting-protobuf/package.json index 58f9e401d27..e1791b1ee11 100644 --- a/packages/usage-reporting-protobuf/package.json +++ b/packages/usage-reporting-protobuf/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/usage-reporting-protobuf", - "version": "3.3.1", + "version": "4.0.0-alpha.0", "description": "Protobuf format for Apollo usage reporting", "type": "module", "exports": {