mirror of
https://github.com/docmost/docmost.git
synced 2026-05-19 07:54:05 +08:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a750744f1e | |||
| cb10cf155f | |||
| 9fc5f36bc2 | |||
| 974089c9f6 | |||
| 20aa40a9fd | |||
| a40b90d0d9 | |||
| 8cdfba7281 | |||
| 5739a0e260 | |||
| 9ec0f46eb6 | |||
| 8282403ee8 |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "client",
|
"name": "client",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.25.0-beta.1",
|
"version": "0.24.1",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "tsc && vite build",
|
"build": "tsc && vite build",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "server",
|
"name": "server",
|
||||||
"version": "0.25.0-beta.1",
|
"version": "0.24.1",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
@@ -37,8 +37,7 @@ async function bootstrap() {
|
|||||||
const logger = new Logger('CollabServer');
|
const logger = new Logger('CollabServer');
|
||||||
|
|
||||||
const port = process.env.COLLAB_PORT || 3001;
|
const port = process.env.COLLAB_PORT || 3001;
|
||||||
const host = process.env.HOST || '0.0.0.0';
|
await app.listen(port, '0.0.0.0', () => {
|
||||||
await app.listen(port, host, () => {
|
|
||||||
logger.log(`Listening on http://127.0.0.1:${port}`);
|
logger.log(`Listening on http://127.0.0.1:${port}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
Submodule apps/server/src/ee updated: 6d3eb76d4e...b363767b69
@@ -104,8 +104,7 @@ async function bootstrap() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const port = process.env.PORT || 3000;
|
const port = process.env.PORT || 3000;
|
||||||
const host = process.env.HOST || '0.0.0.0';
|
await app.listen(port, '0.0.0.0', () => {
|
||||||
await app.listen(port, host, () => {
|
|
||||||
logger.log(
|
logger.log(
|
||||||
`Listening on http://127.0.0.1:${port} / ${process.env.APP_URL}`,
|
`Listening on http://127.0.0.1:${port} / ${process.env.APP_URL}`,
|
||||||
);
|
);
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "docmost",
|
"name": "docmost",
|
||||||
"homepage": "https://docmost.com",
|
"homepage": "https://docmost.com",
|
||||||
"version": "0.25.0-beta.1",
|
"version": "0.24.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "nx run-many -t build",
|
"build": "nx run-many -t build",
|
||||||
|
|||||||
@@ -197,15 +197,11 @@ const replace = (
|
|||||||
});
|
});
|
||||||
|
|
||||||
const marks = Array.from(marksSet);
|
const marks = Array.from(marksSet);
|
||||||
|
|
||||||
// Delete the old text
|
|
||||||
tr.delete(from, to);
|
|
||||||
|
|
||||||
// Only insert new text if replaceTerm is not empty (allows for deletion when replaceTerm is empty)
|
// Delete the old text and insert new text with preserved marks
|
||||||
if (replaceTerm) {
|
tr.delete(from, to);
|
||||||
tr.insert(from, state.schema.text(replaceTerm, marks));
|
tr.insert(from, state.schema.text(replaceTerm, marks));
|
||||||
}
|
|
||||||
|
|
||||||
dispatch(tr);
|
dispatch(tr);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -232,14 +228,10 @@ const replaceAll = (
|
|||||||
});
|
});
|
||||||
|
|
||||||
const marks = Array.from(marksSet);
|
const marks = Array.from(marksSet);
|
||||||
|
|
||||||
// Delete the old text
|
|
||||||
tr.delete(from, to);
|
|
||||||
|
|
||||||
// Only insert new text if replaceTerm is not empty (allows for deletion when replaceTerm is empty)
|
// Delete and insert with preserved marks
|
||||||
if (replaceTerm) {
|
tr.delete(from, to);
|
||||||
tr.insert(from, tr.doc.type.schema.text(replaceTerm, marks));
|
tr.insert(from, tr.doc.type.schema.text(replaceTerm, marks));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dispatch(tr);
|
dispatch(tr);
|
||||||
|
|||||||
Reference in New Issue
Block a user