diff --git a/packages/backend/package.json b/packages/backend/package.json index f8a3d6b..5215c3e 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -17,10 +17,8 @@ "author": "cudr", "license": "MIT", "scripts": { - "prepublishOnly": "yarn run build:module", - "build:module": "yarn run build:types && yarn run build:js", - "build:types": "tsc --emitDeclarationOnly", - "build:js": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline", + "prepublishOnly": "yarn run build:js", + "build:js": "./node_modules/typescript/bin/tsc -p ./tsconfig.json", "watch": "yarn build:js -w" }, "dependencies": { diff --git a/packages/backend/src/AutomergeCollaboration.ts b/packages/backend/src/AutomergeCollaboration.ts index aee1273..153aeaa 100644 --- a/packages/backend/src/AutomergeCollaboration.ts +++ b/packages/backend/src/AutomergeCollaboration.ts @@ -94,13 +94,13 @@ export default class AutomergeCollaboration { /** * Construct error data and call onError callback */ - private handleError(socket: SocketIO.Socket, err: Error, data: any = {}) { + private handleError(socket: SocketIO.Socket, err: unknown, data: any = {}) { const { id } = socket const { name: docId } = socket.nsp if (this.options.onError) { const document = this.backend.getDocument(docId) - this.options.onError(err, { + this.options.onError(err as Error, { user: this.userMap[id], docId, automergeDocument: document ? Automerge.save(document) : null, diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index f25625d..ce86a92 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -1,3 +1,6 @@ -import AutomergeCollaboration from './AutomergeCollaboration' +import AutomergeCollaboration, { + IAutomergeMetaData +} from './AutomergeCollaboration' +import getActiveConnections from 'utils/getActiveConnections' -export { AutomergeCollaboration } +export { AutomergeCollaboration, IAutomergeMetaData, getActiveConnections } diff --git a/packages/backend/tsconfig.json b/packages/backend/tsconfig.json index 76f8c0f..504b502 100644 --- a/packages/backend/tsconfig.json +++ b/packages/backend/tsconfig.json @@ -6,6 +6,8 @@ "baseUrl": "./src", "outDir": "./lib", "composite": true, + "declaration": true, + "declarationMap": true, "paths": { "@hiveteams/collab-bridge": ["../../collab-bridge"] }