Skip to content

Commit d10471c

Browse files
authored
Merge pull request #18 from jsonjoy-com/cleanup
Cleanup
2 parents 388f755 + ddc9a46 commit d10471c

File tree

94 files changed

+289
-9973
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+289
-9973
lines changed

package.json

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,50 +66,36 @@
6666
"publish-coverage-and-typedocs": "yarn typedoc && yarn coverage && yarn build:pages && yarn deploy:pages"
6767
},
6868
"peerDependencies": {
69-
"browser-level": "*",
7069
"rxjs": "7",
7170
"tslib": "2"
7271
},
7372
"peerDependenciesMeta": {
7473
"rxjs": {
7574
"optional": true
76-
},
77-
"browser-level": {
78-
"optional": true
7975
}
8076
},
8177
"dependencies": {
8278
"@jsonjoy.com/jit-router": "^1.0.1",
8379
"@jsonjoy.com/json-pack": "^1.1.0",
84-
"@jsonjoy.com/util": "^1.3.0",
80+
"@jsonjoy.com/util": "^1.4.0",
8581
"abstract-level": "^2.0.0",
8682
"fs-zoo": "^1.1.0",
87-
"json-joy": "^16.25.0",
88-
"memfs": "^4.11.0",
8983
"memory-level": "^1.0.0",
9084
"rx-use": "^1.8.1",
9185
"sonic-forest": "^1.0.3",
92-
"thingies": "^2.1.0"
86+
"thingies": "^2.4.0",
87+
"classic-level": "^1.4.1"
9388
},
9489
"devDependencies": {
90+
"json-joy": "^17.0.0",
9591
"@biomejs/biome": "^1.9.3",
9692
"@types/benchmark": "^2.1.5",
9793
"@types/jest": "^29.5.12",
9894
"@types/react": "^18.3.8",
9995
"@types/react-dom": "^18.3.0",
10096
"@types/ws": "^8.5.10",
10197
"benchmark": "^2.1.4",
102-
"browser-level": "^1.0.1",
103-
"classic-level": "^1.4.1",
104-
"clickable-json": "^1.15.0",
105-
"collaborative-editor": "^2.8.0",
106-
"collaborative-input": "^1.6.1",
107-
"html-webpack-plugin": "^5.6.0",
10898
"jest": "^29.7.0",
109-
"nano-theme": "^1.4.2",
110-
"nice-ui": "^1.9.2",
111-
"react": "^18.3.1",
112-
"react-dom": "^18.3.1",
11399
"rimraf": "^5.0.5",
114100
"rxjs": "^7.8.1",
115101
"ts-jest": "^29.1.2",
@@ -120,9 +106,6 @@
120106
"typescript": "^5.4.5",
121107
"uWebSockets.js": "uNetworking/uWebSockets.js#v20.44.0",
122108
"webpack": "^5.94.0",
123-
"webpack-bundle-analyzer": "^4.10.2",
124-
"webpack-cli": "^5.1.4",
125-
"webpack-dev-server": "^5.1.0",
126109
"websocket": "^1.0.34",
127110
"ws": "^8.16.0"
128111
},

src/__demos__/json-crdt-server/routes/block/methods/get.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type {ResolveType} from 'json-joy/lib/json-type';
1+
import type {ResolveType} from '@jsonjoy.com/json-type';
22
import {BlockIdRef, BlockRef} from '../schema';
33
import type {RouteDeps, Router, RouterBase} from '../../types';
44

src/__demos__/json-crdt-server/routes/block/methods/upd.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type {ResolveType} from 'json-joy/lib/json-type';
1+
import type {ResolveType} from '@jsonjoy.com/json-type';
22
import {
33
BlockBatchPartialRef,
44
BlockBatchPartialReturnRef,

src/__demos__/json-crdt-server/routes/block/methods/view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type {ResolveType} from 'json-joy/lib/json-type';
1+
import type {ResolveType} from '@jsonjoy.com/json-type';
22
import {BlockIdRef} from '../schema';
33
import type {RouteDeps, Router, RouterBase} from '../../types';
44

src/__demos__/json-crdt-server/routes/block/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {t} from '../system';
2-
import type {ResolveType} from 'json-joy/lib/json-type';
2+
import type {ResolveType} from '@jsonjoy.com/json-type';
33

44
export const BlockId = t.str.options({
55
title: 'Block ID',

src/__demos__/json-crdt-server/routes/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {RpcError} from '../../../common/rpc/caller';
33
import {RpcValue} from '../../../common/messages/Value';
44
import {ObjectValueCaller} from '../../../common/rpc/caller/ObjectValueCaller';
55
import {system} from './system';
6-
import {ObjectValue} from 'json-joy/lib/json-type-value/ObjectValue';
6+
import {ObjectValue} from '@jsonjoy.com/json-type/lib/value/ObjectValue';
77
import {Services} from '../services/Services';
88
import {MemoryStore} from '../services/blocks/store/MemoryStore';
99
import {LevelStore} from '../services/blocks/store/level/LevelStore';

src/__demos__/json-crdt-server/routes/presence/methods/update.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type {ResolveType} from 'json-joy/lib/json-type';
1+
import type {ResolveType} from '@jsonjoy.com/json-type';
22
import type {PresenceEntry} from '../schema';
33
import type {RouteDeps, Router, RouterBase} from '../../types';
44

src/__demos__/json-crdt-server/routes/presence/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type {ResolveType} from 'json-joy/lib/json-type';
1+
import type {ResolveType} from '@jsonjoy.com/json-type';
22
import {t} from '../system';
33

44
export const PresenceEntry = t.Object(

src/__demos__/json-crdt-server/routes/routes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {pubsub} from './pubsub';
33
import {presence} from './presence';
44
import {block} from './block';
55
import type {RouteDeps} from './types';
6-
import type {ObjectValue} from 'json-joy/lib/json-type-value/ObjectValue';
7-
import type {ObjectType} from 'json-joy/lib/json-type';
6+
import type {ObjectValue} from '@jsonjoy.com/json-type/lib/value/ObjectValue';
7+
import type {ObjectType} from '@jsonjoy.com/json-type';
88

99
// biome-ignore format: each on its own line
1010
export const routes = (d: RouteDeps) => <R extends ObjectType<any>>(r: ObjectValue<R>) =>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {TypeSystem} from 'json-joy/lib/json-type';
1+
import {TypeSystem} from '@jsonjoy.com/json-type';
22

33
export const system = new TypeSystem();
44
export const t = system.t;

0 commit comments

Comments
 (0)