From cb10911906895f17f6ed9d28d351563c66f86832 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 13 Feb 2025 22:18:10 +0100 Subject: [PATCH 1/3] fix(vite): allow hostnames used for hmr via docker-dev Signed-off-by: Max --- vite.config.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vite.config.ts b/vite.config.ts index 0a568b1a2f9..32fa1376c20 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -77,6 +77,9 @@ const config = createAppConfig({ } }, }, + server: { + allowedHosts: ['host.docker.internal', 'localhost', 'nextcloud.local'], + }, }, }) From 4eaae6d587bf4dfae7c4215b87a38f07b75b58cc Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 24 Feb 2025 13:49:37 +0100 Subject: [PATCH 2/3] fix(smart-picker): Add content on next line Fixes #6871 Signed-off-by: Max --- src/plugins/currentLineMenu.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/currentLineMenu.js b/src/plugins/currentLineMenu.js index 65cf1d61857..f89daa93b5c 100644 --- a/src/plugins/currentLineMenu.js +++ b/src/plugins/currentLineMenu.js @@ -157,12 +157,12 @@ function menuForCurrentParagraph(editor) { const { selection } = editor.state const { textContent } = selection.$anchor.parent const eol = selection.$anchor.end() - const contentToInsert = textContent.match(/(^| )$/) ? '/' : ' /' - editor.chain() - .focus() - .setTextSelection(eol) - .insertContent(contentToInsert) - .run() + const chain = editor.chain().focus().setTextSelection(eol) + if (textContent.trim() === '') { + chain.insertContent('/').run() + } else { + chain.splitBlock().insertContent('/').run() + } }) return menu.$el } From c86e121abdf9cfcde006d0ba44627944d5ec6097 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 27 Feb 2025 10:51:35 +0100 Subject: [PATCH 3/3] chore(deps): update vite to fix linter `server.allowedHosts` is a valid config setting. Signed-off-by: Max --- package-lock.json | 45 ++++++++++++++++++++++++++++++++------------- package.json | 2 +- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7d325cde63..97846eca26e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,7 +78,6 @@ "proxy-polyfill": "^0.3.2", "slug": "^10.0.0", "tippy.js": "^6.3.7", - "typedoc": "^0.27.7", "uuid": "^11.0.5", "vue": "^2.7.16", "vue-click-outside": "^1.1.0", @@ -112,7 +111,7 @@ "raw-loader": "^4.0.2", "rollup-plugin-webpack-stats": "^1.2.3", "typescript": "^5.7.2", - "vite": "^5.4.11", + "vite": "^5.4.14", "vite-plugin-commonjs": "^0.10.4", "vitest": "^2.1.8", "vue-demi": "^0.14.10", @@ -2947,6 +2946,7 @@ "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-1.27.2.tgz", "integrity": "sha512-GeWyHz8ao2gBiUW4OJnQDxXQnFgZQwwQk05t/CVVgNBN7/rK8XZ7xY6YhLVv9tH3VppWWmr9DCl3MwemB/i+Og==", "license": "MIT", + "peer": true, "dependencies": { "@shikijs/engine-oniguruma": "^1.27.2", "@shikijs/types": "^1.27.2", @@ -4672,6 +4672,7 @@ "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.29.2.tgz", "integrity": "sha512-7iiOx3SG8+g1MnlzZVDYiaeHe7Ez2Kf2HrJzdmGwkRisT7r4rak0e655AcM/tF9JG/kg5fMNYlLLKglbN7gBqA==", "license": "MIT", + "peer": true, "dependencies": { "@shikijs/types": "1.29.2", "@shikijs/vscode-textmate": "^10.0.1" @@ -4682,6 +4683,7 @@ "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.29.2.tgz", "integrity": "sha512-VJjK0eIijTZf0QSTODEXCqinjBn0joAHQ+aPSBzrv4O2d/QSbsMw+ZeSRx03kV34Hy7NzUvV/7NqfYGRLrASmw==", "license": "MIT", + "peer": true, "dependencies": { "@shikijs/vscode-textmate": "^10.0.1", "@types/hast": "^3.0.4" @@ -4692,6 +4694,7 @@ "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==", "license": "MIT", + "peer": true, "dependencies": { "@types/unist": "*" } @@ -4700,7 +4703,8 @@ "version": "10.0.1", "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.1.tgz", "integrity": "sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@sideway/address": { "version": "4.1.5", @@ -13979,7 +13983,8 @@ "version": "2.3.9", "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/magic-string": { "version": "0.30.12", @@ -23500,6 +23505,7 @@ "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.27.7.tgz", "integrity": "sha512-K/JaUPX18+61W3VXek1cWC5gwmuLvYTOXJzBvD9W7jFvbPnefRnCHQCEPw7MSNrP/Hj7JJrhZtDDLKdcYm6ucg==", "license": "Apache-2.0", + "peer": true, "dependencies": { "@gerrit0/mini-shiki": "^1.24.0", "lunr": "^2.3.9", @@ -23531,6 +23537,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "license": "MIT", + "peer": true, "dependencies": { "balanced-match": "^1.0.0" } @@ -23540,6 +23547,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "license": "ISC", + "peer": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -24025,9 +24033,9 @@ } }, "node_modules/vite": { - "version": "5.4.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", - "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "dev": true, "license": "MIT", "dependencies": { @@ -25666,6 +25674,7 @@ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", "license": "ISC", + "peer": true, "bin": { "yaml": "bin.mjs" }, @@ -27614,6 +27623,7 @@ "version": "1.27.2", "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-1.27.2.tgz", "integrity": "sha512-GeWyHz8ao2gBiUW4OJnQDxXQnFgZQwwQk05t/CVVgNBN7/rK8XZ7xY6YhLVv9tH3VppWWmr9DCl3MwemB/i+Og==", + "peer": true, "requires": { "@shikijs/engine-oniguruma": "^1.27.2", "@shikijs/types": "^1.27.2", @@ -28825,6 +28835,7 @@ "version": "1.29.2", "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.29.2.tgz", "integrity": "sha512-7iiOx3SG8+g1MnlzZVDYiaeHe7Ez2Kf2HrJzdmGwkRisT7r4rak0e655AcM/tF9JG/kg5fMNYlLLKglbN7gBqA==", + "peer": true, "requires": { "@shikijs/types": "1.29.2", "@shikijs/vscode-textmate": "^10.0.1" @@ -28834,6 +28845,7 @@ "version": "1.29.2", "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.29.2.tgz", "integrity": "sha512-VJjK0eIijTZf0QSTODEXCqinjBn0joAHQ+aPSBzrv4O2d/QSbsMw+ZeSRx03kV34Hy7NzUvV/7NqfYGRLrASmw==", + "peer": true, "requires": { "@shikijs/vscode-textmate": "^10.0.1", "@types/hast": "^3.0.4" @@ -28843,6 +28855,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==", + "peer": true, "requires": { "@types/unist": "*" } @@ -28852,7 +28865,8 @@ "@shikijs/vscode-textmate": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.1.tgz", - "integrity": "sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==" + "integrity": "sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==", + "peer": true }, "@sideway/address": { "version": "4.1.5", @@ -35641,7 +35655,8 @@ "lunr": { "version": "2.3.9", "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", - "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==" + "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", + "peer": true }, "magic-string": { "version": "0.30.12", @@ -41790,6 +41805,7 @@ "version": "0.27.7", "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.27.7.tgz", "integrity": "sha512-K/JaUPX18+61W3VXek1cWC5gwmuLvYTOXJzBvD9W7jFvbPnefRnCHQCEPw7MSNrP/Hj7JJrhZtDDLKdcYm6ucg==", + "peer": true, "requires": { "@gerrit0/mini-shiki": "^1.24.0", "lunr": "^2.3.9", @@ -41802,6 +41818,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "peer": true, "requires": { "balanced-match": "^1.0.0" } @@ -41810,6 +41827,7 @@ "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "peer": true, "requires": { "brace-expansion": "^2.0.1" } @@ -42160,9 +42178,9 @@ } }, "vite": { - "version": "5.4.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", - "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "dev": true, "requires": { "esbuild": "^0.21.3", @@ -43149,7 +43167,8 @@ "yaml": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", - "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==" + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", + "peer": true }, "yargs": { "version": "17.7.2", diff --git a/package.json b/package.json index e1dc497b5c5..02996ff1691 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "raw-loader": "^4.0.2", "rollup-plugin-webpack-stats": "^1.2.3", "typescript": "^5.7.2", - "vite": "^5.4.11", + "vite": "^5.4.14", "vite-plugin-commonjs": "^0.10.4", "vitest": "^2.1.8", "vue-demi": "^0.14.10",