chore(deps): update dependency @whatwg-node/server to v0.9.60

.github/workflows/tests.yml

@@ -123,7 +123,7 @@ jobs:
           command: yarn test:leak
 
   integration:
-    needs: [typecheck, unit]
+    needs: [typecheck]
     name: integration / node ${{matrix.node-version}}
     timeout-minutes: 60
     runs-on: ubuntu-latest
@@ -324,7 +324,7 @@ jobs:
           command: yarn bob check
 
   e2e:
-    needs: [unit]
+    needs: [typecheck]
     name: e2e / node v${{matrix.node-version}}
     runs-on: ubuntu-latest
     strategy:
@@ -360,7 +360,7 @@ jobs:
         run: |
           yarn test:e2e --detectOpenHandles --forceExit
   apollo-federation-compatibility:
-    needs: [unit]
+    needs: [typecheck]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository

e2e/utils/leftoverStack.ts

@@ -20,10 +20,9 @@ if (typeof afterAll === 'function') {
   afterAll(() => {
     try {
       const disposeRes$ = leftoverStack.disposeAsync();
+      leftoverStack = new AsyncDisposableStack();
       if (disposeRes$?.catch) {
-        return disposeRes$.catch(handleSuppressedError).finally(() => {
-          leftoverStack = new AsyncDisposableStack();
-        });
+        disposeRes$.catch(handleSuppressedError);
       }
     } catch (e) {
       handleSuppressedError(e);

e2e/utils/tenv.ts

@@ -5,9 +5,7 @@ import type { AddressInfo } from 'net';
 import os from 'os';
 import path, { isAbsolute } from 'path';
 import type { Readable } from 'stream';
-import { setTimeout } from 'timers/promises';
 import Dockerode from 'dockerode';
-import { glob } from 'glob';
 import type { ExecutionResult } from 'graphql';
 import {
   IntrospectAndCompose,
@@ -543,14 +541,17 @@ export function createTenv(cwd: string): Tenv {
       leftoverStack.use(container);
 
       // verify that the container has started
-      await setTimeout(interval);
-      try {
-        await ctr.inspect();
-      } catch (err) {
-        if (Object(err).statusCode === 404) {
-          throw new DockerError('Container was not started', container);
+      const startTimeout = AbortSignal.timeout(interval * 2);
+      while (!startTimeout.aborted) {
+        try {
+          await ctr.inspect({ abortSignal: ctrl.signal });
+          break;
+        } catch (err) {
+          if (Object(err).statusCode === 404) {
+            throw new DockerError('Container was not started', container);
+          }
+          throw err;
         }
-        throw err;
       }
 
       // wait for healthy
@@ -581,7 +582,7 @@ export function createTenv(cwd: string): Tenv {
           } else if (status === 'healthy') {
             break;
           } else if (status === 'starting') {
-            await setTimeout(interval);
+            continue;
           } else {
             throw new DockerError(`Unknown health status "${status}"`, container);
           }
@@ -759,7 +760,6 @@ async function waitForPort(port: number, signal: AbortSignal) {
     }
     // no need to track retries, jest will time out aborting the signal
     signal.throwIfAborted();
-    await setTimeout(interval);
   }
 }
 

package.json

@@ -59,7 +59,7 @@
     "prettier:check": "prettier --check .",
     "release": "yarn build && changeset publish",
     "test": "cross-env \"JEST=1\" jest --detectOpenHandles --no-watchman",
-    "test:e2e": "cross-env \"JEST=1\" \"E2E_TEST=true\" jest --no-watchman",
+    "test:e2e": "cross-env \"JEST=1\" \"E2E_TEST=true\" jest --no-watchman --forceExit",
     "test:integration": "cross-env \"JEST=1\" \"INTEGRATION_TEST=true\" jest --forceExit --no-watchman --runInBand",
     "test:integration:leak": "cross-env \"JEST=1\" \"LEAK_TEST=1\" \"INTEGRATION_TEST=true\" jest --detectOpenHandles --detectLeaks --no-watchman --runInBand",
     "test:leak": "cross-env \"JEST=1\" \"LEAK_TEST=1\" jest --detectOpenHandles --detectLeaks --no-watchman --runInBand",
@@ -113,7 +113,7 @@
     "@opentelemetry/resources": "1.28.0",
     "@whatwg-node/fetch": "0.10.1",
     "@whatwg-node/node-fetch": "0.7.4",
-    "@whatwg-node/server": "0.9.56",
+    "@whatwg-node/server": "0.9.60",
     "es5-ext": "0.10.64",
     "esbuild": "^0.24.0",
     "graphql": "16.9.0",

yarn.lock

@@ -14198,13 +14198,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@whatwg-node/server@npm:0.9.56":
-  version: 0.9.56
-  resolution: "@whatwg-node/server@npm:0.9.56"
+"@whatwg-node/server@npm:0.9.60":
+  version: 0.9.60
+  resolution: "@whatwg-node/server@npm:0.9.60"
   dependencies:
+    "@whatwg-node/disposablestack": "npm:^0.0.5"
     "@whatwg-node/fetch": "npm:^0.10.0"
     tslib: "npm:^2.6.3"
-  checksum: 10c0/3de6bea3ef5821a3543f23ea487cedd2c919c84187c9737f3f69bb239db80c8e98553f02d744834242fb1f88dde47a527889d6f37ccba5e8d01297593afa9cd6
+  checksum: 10c0/455bded356d3d442ec74881d1d5470653fb0b3c0207b6c4fddb9ca2d912587be1c5e790412b4084de7d83347bd771a3f72f274542346b1c537e874abd4162fab
   languageName: node
   linkType: hard