only use types from ws, v0.1.3

replit · Sep 15, 2023 · 20ef4e6 · 20ef4e6
1 parent 84f8ea0
commit 20ef4e6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@replit/river",
   "description": "It's like tRPC but... with JSON Schema Support, duplex streaming and support for service multiplexing. Transport agnostic!",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,6 +10,7 @@
   ],
   "dependencies": {
     "@sinclair/typebox": "^0.31.8",
+    "isomorphic-ws": "^5.0.0",
     "it-pushable": "^3.2.1",
     "nanoid": "^4.0.2",
     "ws": "^8.13.0"

diff --git a/router/builder.ts b/router/builder.ts
@@ -1,5 +1,5 @@
 import { TObject, Static, Type } from '@sinclair/typebox';
-import { Pushable } from 'it-pushable';
+import type { Pushable } from 'it-pushable';
 import { TransportMessage } from '../transport/message';
 
 export type ValidProcType = 'stream' | 'rpc';

diff --git a/router/client.ts b/router/client.ts
@@ -1,6 +1,7 @@
 import { Transport } from '../transport/types';
 import { ProcInput, ProcOutput, ProcType, Service } from './builder';
-import { Pushable, pushable } from 'it-pushable';
+import { pushable } from 'it-pushable';
+import type { Pushable } from 'it-pushable';
 import { Server } from './server';
 import { OpaqueTransportMessage, msg } from '../transport/message';
 import { Static } from '@sinclair/typebox';

diff --git a/router/server.ts b/router/server.ts
@@ -1,8 +1,9 @@
-import { Static, TObject } from '@sinclair/typebox';
+import { TObject } from '@sinclair/typebox';
 import { Transport } from '../transport/types';
 import { Procedure, Service, ValidProcType } from './builder';
 import { Value } from '@sinclair/typebox/value';
-import { Pushable, pushable } from 'it-pushable';
+import { pushable } from 'it-pushable';
+import type { Pushable } from 'it-pushable';
 import { OpaqueTransportMessage, TransportMessage } from '../transport/message';
 
 export interface Server<Services> {

diff --git a/router/server.util.ts b/router/server.util.ts
@@ -1,7 +1,8 @@
 import { Static, TObject } from '@sinclair/typebox';
 import { Procedure, ValidProcType } from './builder';
 import { TransportMessage, payloadToTransportMessage } from '../transport/message';
-import { Pushable, pushable } from 'it-pushable';
+import { pushable } from 'it-pushable';
+import type { Pushable } from 'it-pushable';
 
 export function asClientRpc<State extends object | unknown, I extends TObject, O extends TObject>(
   state: State,