Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump up Yorkie to v0.4.11 #288

Merged
merged 1 commit into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Real-time markdown editor for interviews, meetings & more...
## Developing CodePair
For building CodePair, You'll first need Node.js installed(Node.js version 16+ and npm version 7.10+ are required).

CodePair requires local applications such as Envoy, Yorkie and MongoDB. To start them:
CodePair requires local applications such as Yorkie and MongoDB. To start them:

```
docker-compose -f docker/docker-compose.yml up --build -d
Expand Down
25 changes: 3 additions & 22 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,13 @@
version: '3.3'

services:
envoy:
build:
context: ./
dockerfile: ./envoy.Dockerfile
image: 'grpcweb:envoy'
container_name: 'envoy'
restart: always
ports:
- '8080:8080'
- '9901:9901'
depends_on:
- yorkie
# If you're using Mac or Windows, this special domain name("host.docker.internal" which makes containers able to connect to the host)
# is supported by default.
# But if you're using Linux and want an envoy container to communicate with the host,
# it may help to define "host.docker.internal" in extra_hosts.
# (Actually, other hostnames are available, but in that case you should update clusters[].host configurations of envoy.yaml)
# extra_hosts:
# - "host.docker.internal:host-gateway"
yorkie:
image: 'yorkieteam/yorkie:0.4.6'
image: 'yorkieteam/yorkie:0.4.11'
container_name: 'yorkie'
command: [
'server',
]
restart: always
ports:
- '11101:11101'
- '11102:11102'
- '8080:8080'
- '9901:9901'
5 changes: 0 additions & 5 deletions docker/envoy.Dockerfile

This file was deleted.

59 changes: 0 additions & 59 deletions docker/envoy.yaml

This file was deleted.

44 changes: 19 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"remark-toc": "^8.0.1",
"tss-react": "^4.8.2",
"unique-names-generator": "^4.7.1",
"yorkie-js-sdk": "yorkie-team/yorkie-js-sdk#main"
"yorkie-js-sdk": "^0.4.11"
},
"devDependencies": {
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
Expand Down
4 changes: 4 additions & 0 deletions src/components/Editor/mime/text/md/CodeEditor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,13 @@ export default function CodeEditor() {

editor.on('change', () => {
dispatch(updateHeadings());
// TODO(hackerwins): Remove ignore after fixing the type.
// @ts-ignore
dispatch(updateLinkNameWithHeading({ docKey: doc.getKey() }));
dispatch(
addRecentPage({
// TODO(hackerwins): Remove ignore after fixing the type.
// @ts-ignore
docKey: doc.getKey(),
page: {
name: `${getTableOfContents(1)[0]?.text}`,
Expand Down
2 changes: 2 additions & 0 deletions src/components/NavBar/NetworkButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ function NetworkConnect() {
export default function NetworkButton() {
const status = useSelector((state: AppState) => state.docState.status);
const hasLocalChanges = useSelector((state: AppState) => {
// TODO(hackerwins): Remove ignore after fixing the type.
// @ts-ignore
return state.docState.doc ? state.docState.doc.hasLocalChanges() : false;
});

Expand Down
Loading