diff --git a/package.json b/package.json index dc7c2ea..147c6cb 100644 --- a/package.json +++ b/package.json @@ -88,8 +88,8 @@ }, "devDependencies": { "@cloudflare/workers-types": "^4.20241011.0", - "@deno/types": "^0.0.1", "@types/bun": "^1.1.11", + "@types/deno": "^2.0.0", "@types/eventsource": "^1.1.15", "@types/node": "^22.7.6", "@types/web": "^0.0.173", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bf4598b..5a2f221 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,12 +18,12 @@ importers: '@cloudflare/workers-types': specifier: ^4.20241011.0 version: 4.20241011.0 - '@deno/types': - specifier: ^0.0.1 - version: 0.0.1 '@types/bun': specifier: ^1.1.11 version: 1.1.11 + '@types/deno': + specifier: ^2.0.0 + version: 2.0.0 '@types/eventsource': specifier: ^1.1.15 version: 1.1.15 @@ -251,9 +251,6 @@ packages: resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} engines: {node: '>=12'} - '@deno/types@0.0.1': - resolution: {integrity: sha512-KTB6Blr05Iw7k7aMzPWlJX0kv08xXZ5Mu7fxSp0M1HnaOHDRnFC956I4PxYdOtN27+b2723Id2G2oofxLvA35A==} - '@esbuild-plugins/node-globals-polyfill@0.2.3': resolution: {integrity: sha512-r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw==} peerDependencies: @@ -1149,6 +1146,9 @@ packages: '@types/bun@1.1.11': resolution: {integrity: sha512-0N7D/H/8sbf9JMkaG5F3+I/cB4TlhKTkO9EskEWP8XDr8aVcDe4EywSnU4cnyZy6tar1dq70NeFNkqMEUigthw==} + '@types/deno@2.0.0': + resolution: {integrity: sha512-O9/jRVlq93kqfkl4sYR5N7+Pz4ukzXVIbMnE/VgvpauNHsvjQ9iBVnJ3X0gAvMa2khcoFD8DSO7mQVCuiuDMPg==} + '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} @@ -1167,9 +1167,6 @@ packages: '@types/node@20.12.14': resolution: {integrity: sha512-scnD59RpYD91xngrQQLGkE+6UrHUPzeKZWhhjBSa3HSkwjbQc38+q3RoIVEwxQGRw3M+j5hpNAM+lgV3cVormg==} - '@types/node@22.7.4': - resolution: {integrity: sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==} - '@types/node@22.7.6': resolution: {integrity: sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw==} @@ -3396,8 +3393,6 @@ snapshots: dependencies: '@jridgewell/trace-mapping': 0.3.9 - '@deno/types@0.0.1': {} - '@esbuild-plugins/node-globals-polyfill@0.2.3(esbuild@0.17.19)': dependencies: esbuild: 0.17.19 @@ -3951,6 +3946,8 @@ snapshots: dependencies: bun-types: 1.1.30 + '@types/deno@2.0.0': {} + '@types/estree@1.0.6': {} '@types/eventsource@1.1.15': {} @@ -3963,16 +3960,12 @@ snapshots: '@types/node-forge@1.3.11': dependencies: - '@types/node': 22.7.4 + '@types/node': 22.7.6 '@types/node@20.12.14': dependencies: undici-types: 5.26.5 - '@types/node@22.7.4': - dependencies: - undici-types: 6.19.8 - '@types/node@22.7.6': dependencies: undici-types: 6.19.8 @@ -3987,7 +3980,7 @@ snapshots: '@types/ws@8.5.12': dependencies: - '@types/node': 22.7.4 + '@types/node': 22.7.6 '@typescript-eslint/eslint-plugin@8.10.0(@typescript-eslint/parser@8.10.0(eslint@9.12.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.12.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: @@ -5227,8 +5220,8 @@ snapshots: magicast@0.3.5: dependencies: - '@babel/parser': 7.25.7 - '@babel/types': 7.25.7 + '@babel/parser': 7.25.8 + '@babel/types': 7.25.8 source-map-js: 1.2.1 make-dir@4.0.0: diff --git a/src/adapters/deno.ts b/src/adapters/deno.ts index 6662517..0fd1160 100644 --- a/src/adapters/deno.ts +++ b/src/adapters/deno.ts @@ -14,11 +14,7 @@ export interface DenoAdapter extends AdapterInstance { export interface DenoOptions extends AdapterOptions {} -declare global { - const Deno: typeof import("@deno/types").Deno; -} - -type WebSocketUpgrade = import("@deno/types").Deno.WebSocketUpgrade; +type WebSocketUpgrade = Deno.WebSocketUpgrade; type ServeHandlerInfo = { remoteAddr?: { transport: string; hostname: string; port: number }; }; diff --git a/test/fixture/deno.ts b/test/fixture/deno.ts index bf18628..e3ad1e1 100644 --- a/test/fixture/deno.ts +++ b/test/fixture/deno.ts @@ -2,9 +2,6 @@ import denoAdapter from "../../src/adapters/deno.ts"; -// @ts-ignore -import type * as _Deno from "../types/lib.deno.d.ts"; - import { createDemo, getIndexHTML, handleDemoRoutes } from "./_shared.ts"; const ws = createDemo(denoAdapter); diff --git a/tsconfig.json b/tsconfig.json index 7136288..c78b29f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,7 +8,7 @@ "strict": true, "allowImportingTsExtensions": true, "noEmit": true, - "types": ["node", "@cloudflare/workers-types"] + "types": ["node", "@cloudflare/workers-types", "deno"] }, - "include": ["src", "test"], + "include": ["src", "test"] }