diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/setupVim.js b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/setupVim.js new file mode 100644 index 000000000..a1104b6fa --- /dev/null +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/setupVim.js @@ -0,0 +1,12 @@ +'use strict'; +Object.defineProperty(exports, '__esModule', { value: true }); +const setupVim = (CodeMirror) => { + CodeMirror.Vim.defineAction('swapLineDown', CodeMirror.commands.swapLineDown); + CodeMirror.Vim.mapCommand('', 'action', 'swapLineDown', {}, { context: 'normal', isEdit: true }); + CodeMirror.Vim.defineAction('swapLineUp', CodeMirror.commands.swapLineUp); + CodeMirror.Vim.mapCommand('', 'action', 'swapLineUp', {}, { context: 'normal', isEdit: true }); + CodeMirror.Vim.defineAction('insertListElement', CodeMirror.commands.vimInsertListElement); + CodeMirror.Vim.mapCommand('o', 'action', 'insertListElement', { after: true }, { context: 'normal', isEdit: true, interlaceInsertRepeat: true }); +}; +exports.default = setupVim; +// # sourceMappingURL=setupVim.js.map diff --git a/packages/renderer/pathUtils.js b/packages/renderer/pathUtils.js new file mode 100644 index 000000000..5a5e6a583 --- /dev/null +++ b/packages/renderer/pathUtils.js @@ -0,0 +1,37 @@ +'use strict'; +Object.defineProperty(exports, '__esModule', { value: true }); +exports.toForwardSlashes = exports.fileExtension = exports.filename = exports.basename = exports.dirname = void 0; +function dirname(path) { + if (!path) { throw new Error('Path is empty'); } + const s = path.split(/\/|\\/); + s.pop(); + return s.join('/'); +} +exports.dirname = dirname; +function basename(path) { + if (!path) { throw new Error('Path is empty'); } + const s = path.split(/\/|\\/); + return s[s.length - 1]; +} +exports.basename = basename; +function filename(path, includeDir = false) { + if (!path) { throw new Error('Path is empty'); } + const output = includeDir ? path : basename(path); + if (output.indexOf('.') < 0) { return output; } + const splitted = output.split('.'); + splitted.pop(); + return splitted.join('.'); +} +exports.filename = filename; +function fileExtension(path) { + if (!path) { throw new Error('Path is empty'); } + const output = path.split('.'); + if (output.length <= 1) { return ''; } + return output[output.length - 1]; +} +exports.fileExtension = fileExtension; +function toForwardSlashes(path) { + return path.replace(/\\/g, '/'); +} +exports.toForwardSlashes = toForwardSlashes; +// # sourceMappingURL=pathUtils.js.map diff --git a/packages/server/package.json b/packages/server/package.json index c40be70cb..b357696fb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/server", - "version": "2.14.1", + "version": "2.14.2", "private": true, "scripts": { "start-dev": "yarn run build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev", diff --git a/readme/about/changelog/server.md b/readme/about/changelog/server.md index 5191a9b6a..39c23a091 100644 --- a/readme/about/changelog/server.md +++ b/readme/about/changelog/server.md @@ -1,5 +1,13 @@ # Joplin Server Changelog +## [server-v2.14.2](https://github.com/laurent22/joplin/releases/tag/server-v2.14.2) - 2024-01-18T17:22:42Z + +- Improved: Check Postgres required version before starting the server (#9695) +- Improved: Display correct date and time on published notes (f38abc5) +- Improved: Optimise synchronisation by making delta call return whole items (5341501) +- Improved: Revert to Formidable v2 to avoid random crashes (be94939) +- Improved: Updated packages fs-extra (v11.2.0), knex (v3.1.0), ldapts (v7.0.7), rate-limiter-flexible (v3.0.6), react, sharp (v0.33.1), style-to-js (v1.1.10), tesseract.js (v5.0.3) + ## [server-v2.14.1](https://github.com/laurent22/joplin/releases/tag/server-v2.14.1) - 2023-12-17T15:07:52Z - Improved: Support including items with delta call to optimise sync (67a6870)