fix merge conflicts

topology-foundation · Jul 1, 2024 · ca07e06 · ca07e06
2 parents 6293356 + e636c3e
commit ca07e06
Show file tree

Hide file tree

Showing 14 changed files with 227 additions and 338 deletions.
diff --git a/examples/canvas/yarn.lock b/examples/canvas/yarn.lock
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ts-topology",
   "description": "The official TypeScript implementation of Topology Protocol",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "license": "MIT",
   "homepage": "https://topology.gg/",
   "repository": {

diff --git a/packages/crdt/package.json b/packages/crdt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@topology-foundation/crdt",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/crdt/src/builtins/2PSet/index.ts b/packages/crdt/src/builtins/2PSet/index.ts
@@ -1,4 +1,4 @@
-import { GSet } from "../GSet";
+import { GSet } from "../GSet/index.js";
 
 /// 2PSet with support for state and op changes
 export class TwoPSet<T> {

diff --git a/packages/crdt/src/builtins/PNCounter/index.ts b/packages/crdt/src/builtins/PNCounter/index.ts
@@ -1,4 +1,4 @@
-import { GCounter } from "../GCounter";
+import { GCounter } from "../GCounter/index.js";
 
 /// State-based PNCounter
 export class PNCounter {

diff --git a/packages/crdt/src/index.ts b/packages/crdt/src/index.ts
@@ -1,5 +1,5 @@
 // TODO dumb export logic, fix this
-export { IGCounter, GCounter } from "./builtins/GCounter";
-export { PNCounter } from "./builtins/PNCounter";
-export { GSet } from "./builtins/GSet";
-export { TwoPSet } from "./builtins/2PSet";
+export { IGCounter, GCounter } from "./builtins/GCounter/index.js";
+export { PNCounter } from "./builtins/PNCounter/index.js";
+export { GSet } from "./builtins/GSet/index.js";
+export { TwoPSet } from "./builtins/2PSet/index.js";
diff --git a/packages/network/package.json b/packages/network/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@topology-foundation/network",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/network/src/index.ts b/packages/network/src/index.ts
@@ -1,3 +1,3 @@
-export { TopologyNetworkNodeConfig, TopologyNetworkNode } from "./node";
-export { stringToStream, streamToString } from "./stream";
-export { createRelayNode } from "./relay";
+export { TopologyNetworkNodeConfig, TopologyNetworkNode } from "./node.js";
+export { stringToStream, streamToString } from "./stream.js";
+export { createRelayNode } from "./relay.js";
diff --git a/packages/network/src/node.ts b/packages/network/src/node.ts
@@ -14,7 +14,7 @@ import { webRTC, webRTCDirect } from "@libp2p/webrtc";
 import { webSockets } from "@libp2p/websockets";
 import { multiaddr } from "@multiformats/multiaddr";
 import { Libp2p, createLibp2p } from "libp2p";
-import { stringToStream } from "./stream";
+import { stringToStream } from "./stream.js";
 import { webTransport } from "@libp2p/webtransport";
 import { bootstrap } from "@libp2p/bootstrap";
 import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";

diff --git a/packages/network/src/relay.ts b/packages/network/src/relay.ts
@@ -8,7 +8,7 @@ import { pubsubPeerDiscovery } from "@libp2p/pubsub-peer-discovery";
 import { webSockets } from "@libp2p/websockets";
 import { createLibp2p } from "libp2p";
 
-import relayerJson from "./peer-id-relayer";
+import relayerJson from "./peer-id-relayer.js";
 import { autoNAT } from "@libp2p/autonat";
 
 // TODO:

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@topology-foundation/node",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -31,14 +31,15 @@
   },
   "devDependencies": {
     "@types/node": "^20.14.2",
+    "node-datachannel": "^0.9.2",
     "tsx": "^4.15.6",
     "typescript": "^5.4.5",
     "vitest": "^1.6.0"
   },
   "dependencies": {
     "@libp2p/dcutr": "^1.1.0",
-    "@topology-foundation/crdt": "0.0.7",
-    "@topology-foundation/network": "0.0.7",
-    "@topology-foundation/object": "0.0.7"
+    "@topology-foundation/crdt": "0.0.10",
+    "@topology-foundation/network": "0.0.10",
+    "@topology-foundation/object": "0.0.10"
   }
 }
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -6,7 +6,7 @@ import {
   streamToString,
 } from "@topology-foundation/network";
 import { TopologyObject } from "@topology-foundation/object";
-import { TopologyObjectStore } from "./store";
+import { TopologyObjectStore } from "./store.js";
 import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";
 import { toString as uint8ArrayToString } from "uint8arrays/to-string";
 

diff --git a/packages/object/package.json b/packages/object/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@topology-foundation/object",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/yarn.lock b/yarn.lock
@@ -3260,7 +3260,7 @@ node-abi@^3.3.0:
   dependencies:
     semver "^7.3.5"
 
-node-datachannel@^0.9.0:
+node-datachannel@^0.9.0, node-datachannel@^0.9.2:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/node-datachannel/-/node-datachannel-0.9.2.tgz#0cfccb9d95afff3a6ff01f0e75e99d9d6764d109"
   integrity sha512-sknq4EAJcSNHUMiK6Gru3vtwo8QICiFs5xJyaitJy/ZLSUbikaGrDORpIpdGp8++4AYQOYC5vr9VyA6i01KeJQ==