diff --git a/packages/crdt/tests/RGA.test.ts b/packages/crdt/tests/RGA.test.ts index c0f7085f..9c2dae8b 100644 --- a/packages/crdt/tests/RGA.test.ts +++ b/packages/crdt/tests/RGA.test.ts @@ -88,5 +88,4 @@ describe("Replicable Growable Array Tests", () => { peerRGA.merge(rga); expect(peerRGA.getArray()).toEqual(rga.getArray()); }); ->>>>>>> main }); diff --git a/packages/crdt/tsconfig.json b/packages/crdt/tsconfig.json index 3e8b28b1..60de52e0 100644 --- a/packages/crdt/tsconfig.json +++ b/packages/crdt/tsconfig.json @@ -3,11 +3,6 @@ "compilerOptions": { "outDir": "dist" }, - "references": [ - { - "path": "../object" - } - ], "include": ["src/**/*.ts"], "exclude": ["src/**/*.asc.ts"] } diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index 79fe75de..9cc8b37c 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -1,18 +1,7 @@ { - "extends": "../../tsconfig.json", - "compilerOptions": { - "outDir": "dist" - }, - "references": [ - { - "path": "../crdt" - }, - { - "path": "../network" - }, - { - "path": "../object" - } - ], - "include": ["src/**/*.ts"] + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src/**/*.ts"] } diff --git a/tsconfig.json b/tsconfig.json index dd7b98d0..031a4b9c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,19 +1,22 @@ { - "compilerOptions": { - "strict": true, - "allowJs": true, - "target": "ES2022", - "module": "NodeNext", + "compilerOptions": { + "strict": true, + "allowJs": true, + "target": "ES2022", + "module": "NodeNext", - "esModuleInterop": true, - "moduleResolution": "NodeNext", + "esModuleInterop": true, + "moduleResolution": "NodeNext", - "declaration": true, - "declarationMap": true, - "composite": true, + "declaration": true, + "declarationMap": true, + "composite": true, - "skipLibCheck": true, - "stripInternal": true, - "resolveJsonModule": true - } + "skipLibCheck": true, + "stripInternal": true, + "resolveJsonModule": true, + "paths": { + "@topology-foundation/*": ["./packages/*"] + } + } }