attempting a prerelease without tagging as next

apollographql · Apr 11, 2024 · 2a405fb · 2a405fb
1 parent 22defef
commit 2a405fb
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 27 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,17 @@
+{
+  "mode": "pre",
+  "tag": "testing",
+  "initialVersions": {
+    "@apollo/composition": "2.7.2",
+    "apollo-federation-integration-testsuite": "2.7.2",
+    "@apollo/gateway": "2.7.2",
+    "@apollo/federation-internals": "2.7.2",
+    "@apollo/query-graphs": "2.7.2",
+    "@apollo/query-planner": "2.7.2",
+    "@apollo/subgraph": "2.7.2"
+  },
+  "changesets": [
+    "invalid-reused-fragment",
+    "six-shoes-fly"
+  ]
+}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Install Dependencies
         run: npm i
-        
+
       - name: Set env
         run: echo "FEDERATION_VERSION=$(npm --prefix ./internals-js version --json |jq -r '.["@apollo/federation-internals"]')" >> $GITHUB_ENV
 
@@ -41,7 +41,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      
+
       - name: Sleep for 20 seconds (arbitrary, give NPM time to populate new `latest` versions)
         if: steps.changesets.outputs.published == 'true'
         run: sleep 20
@@ -58,15 +58,15 @@ jobs:
               repo: 'federation-rs',
               workflow_id: '.github/workflows/release.yml',
               ref: 'main',
-              inputs: { 
+              inputs: {
                 version: "${{ env.FEDERATION_VERSION }}"
               }
             })
-      - name: Write token to the NPM rc file (login)
-        if: steps.changesets.outputs.published == 'true'
-        # write token to the NPM rc file (npm login)
-        run: echo //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} > ~/.npmrc
-        
-      - name: Update next tags if appropriate
-        if: steps.changesets.outputs.published == 'true'
-        run: node scripts/update-next-tags.mjs
+      # - name: Write token to the NPM rc file (login)
+      #   if: steps.changesets.outputs.published == 'true'
+      #   # write token to the NPM rc file (npm login)
+      #   run: echo //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} > ~/.npmrc
+
+      # - name: Update next tags if appropriate
+      #   if: steps.changesets.outputs.published == 'true'
+      #   run: node scripts/update-next-tags.mjs
diff --git a/composition-js/CHANGELOG.md b/composition-js/CHANGELOG.md
@@ -1,5 +1,15 @@
 # CHANGELOG for `@apollo/composition`
 
+## 2.7.3-testing.0
+
+### Patch Changes
+
+- Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](https://github.com/apollographql/federation/issues/2952)) ([#2963](https://github.com/apollographql/federation/pull/2963))
+
+- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]:
+  - @apollo/federation-internals@2.7.3-testing.0
+  - @apollo/query-graphs@2.7.3-testing.0
+
 ## 2.7.2
 
 ### Patch Changes

diff --git a/composition-js/package.json b/composition-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/composition",
-  "version": "2.7.2",
+  "version": "2.7.3-testing.0",
   "description": "Apollo Federation composition utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,8 +27,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/federation-internals": "2.7.2",
-    "@apollo/query-graphs": "2.7.2"
+    "@apollo/federation-internals": "2.7.3-testing.0",
+    "@apollo/query-graphs": "2.7.3-testing.0"
   },
   "peerDependencies": {
     "graphql": "^16.5.0"

diff --git a/federation-integration-testsuite-js/CHANGELOG.md b/federation-integration-testsuite-js/CHANGELOG.md
@@ -1,5 +1,7 @@
 # CHANGELOG for `federation-integration-testsuite-js`
 
+## 2.7.3-testing.0
+
 ## 2.7.2
 
 ### Patch Changes

diff --git a/federation-integration-testsuite-js/package.json b/federation-integration-testsuite-js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-federation-integration-testsuite",
   "private": true,
-  "version": "2.7.2",
+  "version": "2.7.3-testing.0",
   "description": "Apollo Federation Integrations / Test Fixtures",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/gateway-js/CHANGELOG.md b/gateway-js/CHANGELOG.md
@@ -1,5 +1,14 @@
 # CHANGELOG for `@apollo/gateway`
 
+## 2.7.3-testing.0
+
+### Patch Changes
+
+- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]:
+  - @apollo/query-planner@2.7.3-testing.0
+  - @apollo/composition@2.7.3-testing.0
+  - @apollo/federation-internals@2.7.3-testing.0
+
 ## 2.7.2
 
 ### Patch Changes

diff --git a/gateway-js/package.json b/gateway-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "2.7.2",
+  "version": "2.7.3-testing.0",
   "description": "Apollo Gateway",
   "author": "Apollo <[email protected]>",
   "main": "dist/index.js",
@@ -25,9 +25,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/composition": "2.7.2",
-    "@apollo/federation-internals": "2.7.2",
-    "@apollo/query-planner": "2.7.2",
+    "@apollo/composition": "2.7.3-testing.0",
+    "@apollo/federation-internals": "2.7.3-testing.0",
+    "@apollo/query-planner": "2.7.3-testing.0",
     "@apollo/server-gateway-interface": "^1.1.0",
     "@apollo/usage-reporting-protobuf": "^4.1.0",
     "@apollo/utils.createhash": "^2.0.0",

diff --git a/internals-js/CHANGELOG.md b/internals-js/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG for `@apollo/federation-internals`
 
+## 2.7.3-testing.0
+
+### Patch Changes
+
+- Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](https://github.com/apollographql/federation/issues/2952)) ([#2963](https://github.com/apollographql/federation/pull/2963))
+
+- Fixed query planner to pass the directives from original query to subgraph operations (#2961) ([#2967](https://github.com/apollographql/federation/pull/2967))
+
 ## 2.7.2
 
 ### Patch Changes

diff --git a/internals-js/package.json b/internals-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/federation-internals",
-  "version": "2.7.2",
+  "version": "2.7.3-testing.0",
   "description": "Apollo Federation internal utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/query-graphs-js/CHANGELOG.md b/query-graphs-js/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG for `@apollo/query-graphs`
 
+## 2.7.3-testing.0
+
+### Patch Changes
+
+- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]:
+  - @apollo/federation-internals@2.7.3-testing.0
+
 ## 2.7.2
 
 ### Patch Changes

diff --git a/query-graphs-js/package.json b/query-graphs-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/query-graphs",
-  "version": "2.7.2",
+  "version": "2.7.3-testing.0",
   "description": "Apollo Federation library to work with 'query graphs'",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,7 +23,7 @@
     "node": ">=14.15.0"
   },
   "dependencies": {
-    "@apollo/federation-internals": "2.7.2",
+    "@apollo/federation-internals": "2.7.3-testing.0",
     "deep-equal": "^2.0.5",
     "ts-graphviz": "^1.5.4",
     "uuid": "^9.0.0"

diff --git a/query-planner-js/CHANGELOG.md b/query-planner-js/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG for `@apollo/query-planner`
 
+## 2.7.3-testing.0
+
+### Patch Changes
+
+- Fix a query planning bug where invalid subgraph queries are generated with `reuseQueryFragments` set true. ([#2952](https://github.com/apollographql/federation/issues/2952)) ([#2963](https://github.com/apollographql/federation/pull/2963))
+
+- Fixed query planner to pass the directives from original query to subgraph operations (#2961) ([#2967](https://github.com/apollographql/federation/pull/2967))
+
+- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]:
+  - @apollo/federation-internals@2.7.3-testing.0
+  - @apollo/query-graphs@2.7.3-testing.0
+
 ## 2.7.2
 
 ### Patch Changes

diff --git a/query-planner-js/package.json b/query-planner-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/query-planner",
-  "version": "2.7.2",
+  "version": "2.7.3-testing.0",
   "description": "Apollo Query Planner",
   "author": "Apollo <[email protected]>",
   "main": "dist/index.js",
@@ -25,8 +25,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/federation-internals": "2.7.2",
-    "@apollo/query-graphs": "2.7.2",
+    "@apollo/federation-internals": "2.7.3-testing.0",
+    "@apollo/query-graphs": "2.7.3-testing.0",
     "@apollo/utils.keyvaluecache": "^2.1.0",
     "chalk": "^4.1.0",
     "deep-equal": "^2.0.5",

diff --git a/subgraph-js/CHANGELOG.md b/subgraph-js/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG for `@apollo/subgraph`
 
+## 2.7.3-testing.0
+
+### Patch Changes
+
+- Updated dependencies [[`ec04c50b4fb832bfd281ecf9c0c2dd7656431b96`](https://github.com/apollographql/federation/commit/ec04c50b4fb832bfd281ecf9c0c2dd7656431b96), [`a494631918156f0431ceace74281c076cf1d5d51`](https://github.com/apollographql/federation/commit/a494631918156f0431ceace74281c076cf1d5d51)]:
+  - @apollo/federation-internals@2.7.3-testing.0
+
 ## 2.7.2
 
 ### Patch Changes

diff --git a/subgraph-js/package.json b/subgraph-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/subgraph",
-  "version": "2.7.2",
+  "version": "2.7.3-testing.0",
   "description": "Apollo Subgraph Utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@apollo/cache-control-types": "^1.0.2",
-    "@apollo/federation-internals": "2.7.2"
+    "@apollo/federation-internals": "2.7.3-testing.0"
   },
   "peerDependencies": {
     "graphql": "^16.5.0"