From adec1b719bd05b2f07a59fe8242a3dbfff1e0689 Mon Sep 17 00:00:00 2001 From: Eric Maciel Date: Tue, 27 Oct 2020 14:41:32 -0400 Subject: [PATCH] chore: change to hiveteams package --- README.md | 14 ++++++++------ packages/backend/package.json | 4 ++-- packages/backend/src/AutomergeBackend.ts | 2 +- packages/backend/src/SocketIOConnection.ts | 2 +- packages/backend/tsconfig.json | 8 +++----- packages/bridge/package.json | 2 +- packages/client/package.json | 4 ++-- packages/client/src/automerge-editor.ts | 2 +- packages/client/src/useCursor.ts | 2 +- packages/client/src/withAutomerge.ts | 2 +- packages/client/src/withSocketIO.ts | 2 +- packages/client/tsconfig.json | 6 ++---- packages/example/package.json | 6 +++--- packages/example/server.js | 2 +- packages/example/src/Client.tsx | 2 +- packages/example/tsconfig.extend.json | 11 ++++------- 16 files changed, 33 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 7f3ea71..704e899 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # slate-collaborative. Check [demo](https://slate-collaborative.herokuapp.com/) + slatejs collaborative plugin & microservice ![screencast2019-10-2820-06-10](https://user-images.githubusercontent.com/23132107/67700384-ebff7280-f9be-11e9-9005-6ddadcafec47.gif) @@ -14,7 +15,7 @@ Based on idea of https://github.com/humandx/slate-automerge Use it as a simple slatejs plugin ```ts -import { withIOCollaboration } from '@slate-collaborative/client' +import { withIOCollaboration } from '@hiveteams/collab-client' const collaborationEditor = withIOCollaboration(editor, options) ``` @@ -22,6 +23,7 @@ const collaborationEditor = withIOCollaboration(editor, options) Check [detailed example](https://github.com/cudr/slate-collaborative/blob/master/packages/example/src/Client.tsx) ### Options: + ```ts { docId?: // document id @@ -38,21 +40,21 @@ Check [detailed example](https://github.com/cudr/slate-collaborative/blob/master You need to attach the useCursor decorator to provide custom cursor data in renderLeaf function ```ts -import { useCursor } from '@slate-collaborative/client' +import { useCursor } from '@hiveteams/collab-client' const decorator = useCursor(editor) ``` - - ## Backend + ```ts -const { SocketIOConnection } = require('@slate-collaborative/backend') +const { SocketIOConnection } = require('@hiveteams/collab-backend') const connection = new SocketIOConnection(options) ``` ### options: + ```ts { entry: Server // or specify port to start io server @@ -75,8 +77,8 @@ const connection = new SocketIOConnection(options) You welcome to contribute! start it ease: + ``` yarn yarn dev ``` - diff --git a/packages/backend/package.json b/packages/backend/package.json index 0be74e2..adad280 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,5 +1,5 @@ { - "name": "@slate-collaborative/backend", + "name": "@hiveteams/collab-backend", "version": "0.7.1", "files": [ "lib" @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/runtime": "^7.6.3", - "@slate-collaborative/bridge": "^0.7.1", + "@hiveteams/collab-bridge": "^0.7.1", "@types/lodash": "^4.14.150", "@types/socket.io": "^2.1.4", "automerge": "0.14.0", diff --git a/packages/backend/src/AutomergeBackend.ts b/packages/backend/src/AutomergeBackend.ts index 5302c29..4482429 100644 --- a/packages/backend/src/AutomergeBackend.ts +++ b/packages/backend/src/AutomergeBackend.ts @@ -7,7 +7,7 @@ import { toSync, SyncDoc, CollabAction -} from '@slate-collaborative/bridge' +} from '@hiveteams/collab-bridge' export interface Connections { [key: string]: Automerge.Connection diff --git a/packages/backend/src/SocketIOConnection.ts b/packages/backend/src/SocketIOConnection.ts index cb76507..3b5d677 100644 --- a/packages/backend/src/SocketIOConnection.ts +++ b/packages/backend/src/SocketIOConnection.ts @@ -5,7 +5,7 @@ import { Server } from 'http' import throttle from 'lodash/throttle' -import { SyncDoc, CollabAction, toJS } from '@slate-collaborative/bridge' +import { SyncDoc, CollabAction, toJS } from '@hiveteams/collab-bridge' import { getClients } from './utils' diff --git a/packages/backend/tsconfig.json b/packages/backend/tsconfig.json index 36db2ed..3f968f9 100644 --- a/packages/backend/tsconfig.json +++ b/packages/backend/tsconfig.json @@ -7,10 +7,8 @@ "outDir": "./lib", "composite": true, "paths": { - "@slate-collaborative/bridge": ["../../bridge"] + "@hiveteams/collab-bridge": ["../../bridge"] } }, - "references": [ - { "path": "../bridge" } - ] -} \ No newline at end of file + "references": [{ "path": "../bridge" }] +} diff --git a/packages/bridge/package.json b/packages/bridge/package.json index 53eac33..34920a7 100644 --- a/packages/bridge/package.json +++ b/packages/bridge/package.json @@ -1,5 +1,5 @@ { - "name": "@slate-collaborative/bridge", + "name": "@hiveteams/collab-bridge", "version": "0.7.1", "files": [ "lib" diff --git a/packages/client/package.json b/packages/client/package.json index 360b621..bb829d7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,5 +1,5 @@ { - "name": "@slate-collaborative/client", + "name": "@hiveteams/collab-client", "version": "0.7.1", "files": [ "lib" @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/preset-react": "^7.0.0", - "@slate-collaborative/bridge": "^0.7.1", + "@hiveteams/collab-bridge": "^0.7.1", "automerge": "0.14.0", "slate": "0.58.3", "slate-history": "0.58.3", diff --git a/packages/client/src/automerge-editor.ts b/packages/client/src/automerge-editor.ts index c15c671..e296409 100644 --- a/packages/client/src/automerge-editor.ts +++ b/packages/client/src/automerge-editor.ts @@ -12,7 +12,7 @@ import { setCursor, toSlateOp, CursorData -} from '@slate-collaborative/bridge' +} from '@hiveteams/collab-bridge' export interface AutomergeEditor extends Editor { clientId: string diff --git a/packages/client/src/useCursor.ts b/packages/client/src/useCursor.ts index 17009e8..6801d03 100644 --- a/packages/client/src/useCursor.ts +++ b/packages/client/src/useCursor.ts @@ -2,7 +2,7 @@ import { useState, useCallback, useEffect, useMemo } from 'react' import { Text, Range, Path, NodeEntry } from 'slate' -import { toJS, Cursor, Cursors } from '@slate-collaborative/bridge' +import { toJS, Cursor, Cursors } from '"@hiveteams/collab-bridge' import { AutomergeEditor } from './automerge-editor' diff --git a/packages/client/src/withAutomerge.ts b/packages/client/src/withAutomerge.ts index fe3bbaf..c470d28 100644 --- a/packages/client/src/withAutomerge.ts +++ b/packages/client/src/withAutomerge.ts @@ -4,7 +4,7 @@ import { Editor } from 'slate' import { AutomergeEditor } from './automerge-editor' -import { CursorData, CollabAction } from '@slate-collaborative/bridge' +import { CursorData, CollabAction } from '"@hiveteams/collab-bridge' export interface AutomergeOptions { docId: string diff --git a/packages/client/src/withSocketIO.ts b/packages/client/src/withSocketIO.ts index 03c861a..7f03705 100644 --- a/packages/client/src/withSocketIO.ts +++ b/packages/client/src/withSocketIO.ts @@ -2,7 +2,7 @@ import io from 'socket.io-client' import { AutomergeEditor } from './automerge-editor' -import { CollabAction } from '@slate-collaborative/bridge' +import { CollabAction } from '"@hiveteams/collab-bridge' export interface SocketIOPluginOptions { url: string diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json index f9e898b..3f968f9 100644 --- a/packages/client/tsconfig.json +++ b/packages/client/tsconfig.json @@ -7,10 +7,8 @@ "outDir": "./lib", "composite": true, "paths": { - "@slate-collaborative/bridge": ["../../bridge"] + "@hiveteams/collab-bridge": ["../../bridge"] } }, - "references": [ - { "path": "../bridge" } - ] + "references": [{ "path": "../bridge" }] } diff --git a/packages/example/package.json b/packages/example/package.json index c694131..3183c7b 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -1,12 +1,12 @@ { - "name": "@slate-collaborative/example", + "name": "@hiveteams/collab-example", "version": "0.7.1", "private": true, "dependencies": { "@emotion/core": "^10.0.17", "@emotion/styled": "^10.0.17", - "@slate-collaborative/backend": "^0.7.1", - "@slate-collaborative/client": "^0.7.1", + "@hiveteams/collab-backend": "^0.7.1", + "@hiveteams/collab-client": "^0.7.1", "@types/faker": "^4.1.5", "@types/is-url": "^1.2.28", "@types/jest": "24.0.18", diff --git a/packages/example/server.js b/packages/example/server.js index 9cca1b6..898dafb 100644 --- a/packages/example/server.js +++ b/packages/example/server.js @@ -1,4 +1,4 @@ -const { SocketIOConnection } = require('@slate-collaborative/backend') +const { SocketIOConnection } = require('@hiveteams/collab-backend') const express = require('express') const defaultValue = [ diff --git a/packages/example/src/Client.tsx b/packages/example/src/Client.tsx index ade9614..92434ca 100644 --- a/packages/example/src/Client.tsx +++ b/packages/example/src/Client.tsx @@ -8,7 +8,7 @@ import randomColor from 'randomcolor' import styled from '@emotion/styled' -import { withIOCollaboration, useCursor } from '@slate-collaborative/client' +import { withIOCollaboration, useCursor } from '@hiveteams/collab-client' import { Instance, Title, H4, Button } from './Components' diff --git a/packages/example/tsconfig.extend.json b/packages/example/tsconfig.extend.json index 89561c0..e173fa3 100644 --- a/packages/example/tsconfig.extend.json +++ b/packages/example/tsconfig.extend.json @@ -3,12 +3,9 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "@slate-collaborative/bridge": ["../../bridge"], - "@slate-collaborative/client": ["../../client"] + "@hiveteams/collab-bridge": ["../../bridge"], + "@hiveteams/collab-client": ["../../client"] } }, - "references": [ - { "path": "../client" }, - { "path": "../backend" } - ] -} \ No newline at end of file + "references": [{ "path": "../client" }, { "path": "../backend" }] +}