diff --git a/.github/workflows/deployment-e2e.yml b/.github/workflows/deployment-e2e.yml index 133f32a19bb..8e5d02bb568 100644 --- a/.github/workflows/deployment-e2e.yml +++ b/.github/workflows/deployment-e2e.yml @@ -9,15 +9,7 @@ jobs: strategy: fail-fast: false matrix: - plan: - [ - 'aws-lambda', - 'azure-function', - 'cloudflare-workers', - 'cloudflare-modules', - 'deno', - 'bun', - ] + plan: ['aws-lambda', 'azure-function', 'cloudflare-workers', 'cloudflare-modules', 'deno'] # TODO: Add vercel name: e2e / ${{ matrix.plan }} @@ -41,10 +33,6 @@ jobs: with: deno-version: vx.x.x - - name: Use Bun - if: matrix.plan == 'bun' - uses: oven-sh/setup-bun@v2 - - name: Cache Node Modules uses: actions/cache@v4 id: node-modules-cache-deployment-e2e diff --git a/e2e/bun/CHANGELOG.md b/e2e/bun/CHANGELOG.md deleted file mode 100644 index 3817e712061..00000000000 --- a/e2e/bun/CHANGELOG.md +++ /dev/null @@ -1,813 +0,0 @@ -# @e2e/bun - -## 0.0.116 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.116 - -## 0.0.115 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.115 - -## 0.0.114 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.114 - -## 0.0.113 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.113 - -## 0.0.112 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.112 - -## 0.0.111 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.111 - -## 0.0.110 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.110 - -## 0.0.109 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.109 - -## 0.0.108 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.108 - -## 0.0.107 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.107 - -## 0.0.106 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.106 - -## 0.0.105 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.105 - -## 0.0.104 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.104 - -## 0.0.103 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.103 - -## 0.0.102 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.102 - -## 0.0.101 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.101 - -## 0.0.100 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.100 - -## 0.0.99 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.99 - -## 0.0.98 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.98 - -## 0.0.97 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.97 - -## 0.0.96 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.96 - -## 0.0.95 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.95 - -## 0.0.94 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.94 - -## 0.0.93 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.93 - -## 0.0.92 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.92 - -## 0.0.91 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.91 - -## 0.0.90 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.90 - -## 0.0.89 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.89 - -## 0.0.88 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.88 - -## 0.0.87 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.87 - -## 0.0.86 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.86 - -## 0.0.85 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.85 - -## 0.0.84 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.84 - -## 0.0.83 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.83 - -## 0.0.82 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.82 - -## 0.0.81 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.81 - -## 0.0.80 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.80 - -## 0.0.79 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.79 - -## 0.0.78 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.78 - -## 0.0.77 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.77 - -## 0.0.76 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.76 - -## 0.0.75 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.75 - -## 0.0.74 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.74 - -## 0.0.73 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.73 - -## 0.0.72 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.72 - -## 0.0.71 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.71 - -## 0.0.70 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.70 - -## 0.0.69 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.69 - -## 0.0.68 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.68 - -## 0.0.67 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.67 - -## 0.0.66 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.66 - -## 0.0.65 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.65 - -## 0.0.64 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.64 - -## 0.0.63 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.63 - -## 0.0.62 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.62 - -## 0.0.61 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.61 - -## 0.0.60 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.60 - -## 0.0.59 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.59 - -## 0.0.58 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.58 - -## 0.0.57 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.57 - -## 0.0.56 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.56 - -## 0.0.55 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.55 - -## 0.0.54 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.54 - -## 0.0.53 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.53 - -## 0.0.52 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.52 - -## 0.0.51 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.51 - -## 0.0.50 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.50 - -## 0.0.49 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.49 - -## 0.0.48 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.48 - -## 0.0.47 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.47 - -## 0.0.46 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.46 - -## 0.0.45 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.45 - -## 0.0.44 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.44 - -## 0.0.43 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.43 - -## 0.0.42 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.42 - -## 0.0.41 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.41 - -## 0.0.40 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.40 - -## 0.0.39 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.39 - -## 0.0.38 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.38 - -## 0.0.37 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.37 - -## 0.0.36 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.36 - -## 0.0.35 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.35 - -## 0.0.34 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.34 - -## 0.0.33 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.33 - -## 0.0.32 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.32 - -## 0.0.31 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.31 - -## 0.0.30 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.30 - -## 0.0.29 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.29 - -## 0.0.28 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.28 - -## 0.0.27 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.27 - -## 0.0.26 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.26 - -## 0.0.25 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.25 - -## 0.0.24 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.24 - -## 0.0.23 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.23 - -## 0.0.22 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.22 - -## 0.0.21 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.21 - -## 0.0.20 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.20 - -## 0.0.19 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.19 - -## 0.0.18 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.18 - -## 0.0.17 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.17 - -## 0.0.16 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.16 - -## 0.0.15 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.15 - -## 0.0.14 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.14 - -## 0.0.13 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.13 - -## 0.0.12 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.12 - -## 0.0.11 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.11 - -## 0.0.10 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.10 - -## 0.0.9 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.9 - -## 0.0.8 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.8 - -## 0.0.7 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.7 - -## 0.0.6 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.6 - -## 0.0.5 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.5 - -## 0.0.4 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.4 - -## 0.0.3 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.3 - -## 0.0.2 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.2 - -## 0.0.1 - -### Patch Changes - -- Updated dependencies []: - - @e2e/shared-server@0.0.1 diff --git a/e2e/bun/package.json b/e2e/bun/package.json deleted file mode 100644 index a4d72d0d99a..00000000000 --- a/e2e/bun/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "@e2e/bun", - "version": "0.0.116", - "private": true, - "scripts": { - "e2e": "bun test", - "start": "bun src/index.ts" - }, - "dependencies": { - "@e2e/shared-server": "0.0.116", - "@types/node": "22.9.0", - "bun-types": "1.1.34" - }, - "devDependencies": { - "typescript": "5.6.3" - } -} diff --git a/e2e/bun/src/index.ts b/e2e/bun/src/index.ts deleted file mode 100644 index c2bc3beafa8..00000000000 --- a/e2e/bun/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { createTestServerAdapter } from '../../shared-server/src/index'; - -Bun.serve(createTestServerAdapter()); diff --git a/e2e/bun/tests/bun.spec.ts b/e2e/bun/tests/bun.spec.ts deleted file mode 100644 index 10728e7ef22..00000000000 --- a/e2e/bun/tests/bun.spec.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { createServer } from 'http'; -import { afterEach, describe, expect, it } from 'bun:test'; -import { createServerAdapter } from '@whatwg-node/server'; -import { assertDeployedEndpoint } from '../../shared-scripts/src/index'; -import { createTestServerAdapter } from '../../shared-server/src/index'; - -describe('Bun', () => { - let stopServer: () => void; - afterEach(() => stopServer?.()); - it('works', async () => { - const server = Bun.serve({ - fetch: createTestServerAdapter(), - port: 3000, - }); - stopServer = () => server.stop(true); - try { - await assertDeployedEndpoint(`http://localhost:3000/graphql`); - } catch (e) { - expect(e).toBeUndefined(); - } - }); - it('should have unique contexts for each request', async () => { - const contexts = new Set(); - const adapter = createServerAdapter((_, ctx) => { - contexts.add(ctx); - return new Response(null, { - status: 204, - }); - }); - const server = Bun.serve({ - fetch: adapter, - port: 3000, - }); - stopServer = () => server.stop(true); - for (let i = 0; i < 10; i++) { - await fetch(`http://localhost:3000/graphql`); - } - expect(contexts.size).toBe(10); - }); - it('works with Node compat mode', async () => { - const server = createServer(createTestServerAdapter()); - stopServer = () => server.close(); - await new Promise(resolve => server.listen(3000, resolve)); - try { - await assertDeployedEndpoint(`http://localhost:3000/graphql`); - } catch (e) { - expect(e).toBeUndefined(); - } - }); -}); diff --git a/e2e/bun/tsconfig.json b/e2e/bun/tsconfig.json deleted file mode 100644 index c624dbc33df..00000000000 --- a/e2e/bun/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "lib": ["ESNext"], - "module": "esnext", - "moduleResolution": "node", - "target": "esnext", - // "bun-types" is the important part - "types": ["bun-types"] - }, - "files": ["src/index.ts", "tests/bun.spec.ts"] -} diff --git a/packages/server/test/test-server.ts b/packages/server/test/test-server.ts index 02602c6a159..f428da7f7fc 100644 --- a/packages/server/test/test-server.ts +++ b/packages/server/test/test-server.ts @@ -77,7 +77,9 @@ export function createNodeHttpTestServer(): Promise { }); } -export const serverImplMap: Record Promise> = {}; +export const serverImplMap: Record Promise> = { + 'node:http': createNodeHttpTestServer, +}; if ((globalThis as any)['createUWS']) { serverImplMap.uWebSockets = createUWSTestServer; @@ -85,8 +87,6 @@ if ((globalThis as any)['createUWS']) { if (globalThis.Bun) { serverImplMap.Bun = createBunServer; -} else { - serverImplMap['node:http'] = createNodeHttpTestServer; } export function runTestsForEachServerImpl(