From c7cb2e663c22cad6db36a0528c0c0516469e894e Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sun, 29 Oct 2023 08:55:54 +0100 Subject: [PATCH 01/54] Fixed documentation of Cli.js --- src/node/utils/Cli.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/utils/Cli.js b/src/node/utils/Cli.js index a5cdee83a..1579dd3ce 100644 --- a/src/node/utils/Cli.js +++ b/src/node/utils/Cli.js @@ -45,7 +45,7 @@ for (let i = 0; i < argv.length; i++) { exports.argv.sessionkey = arg; } - // Override location of settings.json file + // Override location of APIKEY.txt file if (prevArg === '--apikey') { exports.argv.apikey = arg; } From 85c5b46cc627498e01b10584281ed87287014e25 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 30 Oct 2023 13:05:51 +0100 Subject: [PATCH 02/54] Localisation updates from https://translatewiki.net. --- src/locales/ast.json | 2 +- src/locales/sco.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/locales/ast.json b/src/locales/ast.json index 2f79be81c..b46964bf4 100644 --- a/src/locales/ast.json +++ b/src/locales/ast.json @@ -28,7 +28,7 @@ "pad.colorpicker.save": "Guardar", "pad.colorpicker.cancel": "Zarrar", "pad.loading": "Cargando...", - "pad.noCookie": "Nun pudo alcontrase la cookie. ¡Por favor, permite les cookies nel navegador! La sesión y preferencies nun se guarden ente visites. Esto pué debese a qu'Etherpad inclúyese nun iFrame en dalgunos restoladores. Asegúrate de qu'Etherpad tea nel mesmu subdominiu/dominiu que la iFrame padre", + "pad.noCookie": "Nun pudo alcontrase la cookie. ¡Por favor, permite les cookies nel navegador! La sesión y preferencies nun se guarden ente visites. Esto pue debese a qu'Etherpad inclúyese nun iFrame en dalgunos restoladores. Asegúrate de qu'Etherpad tea nel mesmu subdominiu/dominiu que l'iFrame padre", "pad.permissionDenied": "Nun tienes permisu pa entrar a esti bloc", "pad.settings.padSettings": "Configuración del bloc", "pad.settings.myView": "la mio vista", diff --git a/src/locales/sco.json b/src/locales/sco.json index eb67d6eb4..5fdeedf5b 100644 --- a/src/locales/sco.json +++ b/src/locales/sco.json @@ -2,6 +2,7 @@ "@metadata": { "authors": [ "AmaryllisGardener", + "CiphriusKane", "John Reid", "Nintendofan885" ] @@ -50,7 +51,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Ye can yinly import fae plain tex or HTML formats. Fer mair advanced import features please install abiword.", + "pad.importExport.abiword.innerHTML": "Ye can anely import fae plain tex or HTML formats. Fur mair advanced import features please install abiword.", "pad.modals.connected": "Connected.", "pad.modals.reconnecting": "Reconnectin til yer pad..", "pad.modals.forcereconnect": "Force reconnect", @@ -76,7 +77,7 @@ "pad.modals.disconnected.explanation": "The connection til the server wis loast", "pad.modals.disconnected.cause": "The server micht be onavailable. Please notify the service admeenistrater gif this continues tae happen.", "pad.share": "Share this pad", - "pad.share.readonly": "Read yinly", + "pad.share.readonly": "Read anely", "pad.share.link": "Airtin", "pad.share.emebdcode": "Embed URL", "pad.chat": "Chait", From 7f6c342660bca377b428cbdcb1e0f7510e314446 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:32:43 +0100 Subject: [PATCH 03/54] build(deps): bump terser from 5.22.0 to 5.23.0 in /src (#6008) Bumps [terser](https://github.com/terser/terser) from 5.22.0 to 5.23.0. - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/compare/v5.22.0...v5.23.0) --- updated-dependencies: - dependency-name: terser dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 12 ++++++------ src/package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index e2316f20b..517d44532 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -170,9 +170,9 @@ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" }, "@jridgewell/trace-mapping": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", - "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "requires": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -7822,9 +7822,9 @@ "dev": true }, "terser": { - "version": "5.22.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz", - "integrity": "sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw==", + "version": "5.23.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.23.0.tgz", + "integrity": "sha512-Iyy83LN0uX9ZZLCX4Qbu5JiHiWjOCTwrmM9InWOzVeM++KNWEsqV4YgN9U9E8AlohQ6Gs42ztczlWOG/lwDAMA==", "requires": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", diff --git a/src/package.json b/src/package.json index 38c6c5f73..39c0dc367 100644 --- a/src/package.json +++ b/src/package.json @@ -64,7 +64,7 @@ "semver": "^7.5.4", "socket.io": "^2.5.0", "superagent": "^8.1.2", - "terser": "^5.22.0", + "terser": "^5.23.0", "threads": "^1.7.0", "tinycon": "0.6.8", "ueberdb2": "^4.2.32", From 7bec67d3cfe69fd6b74a035661a65a23299704eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:32:57 +0100 Subject: [PATCH 04/54] build(deps): bump ueberdb2 from 4.2.32 to 4.2.34 in /src (#6010) Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.32 to 4.2.34. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v4.2.32...v4.2.34) --- updated-dependencies: - dependency-name: ueberdb2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 517d44532..04ce7b6a7 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8047,9 +8047,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.32", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.32.tgz", - "integrity": "sha512-Ob+jsHtAW/9RVrjKSNJuNudYQ60FRICeXx2CZvuaobi5J1eXXRnfv/SzOWhYEf07kd3stCu9qy2YtAxLDdgY4Q==" + "version": "4.2.34", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.34.tgz", + "integrity": "sha512-LacNmgE/PXvl3bC0wtLj3bj/lzvc/islfBbu3Kr7jMP5YQq7db1KPtF8DvEi99GorsLGENoleoOUiEDgNnjF/Q==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index 39c0dc367..c9de10f7c 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.23.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.32", + "ueberdb2": "^4.2.34", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From c4a7098ef968e988e859625b9cffe1894525a5dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:33:17 +0100 Subject: [PATCH 05/54] build(deps): bump rate-limiter-flexible from 3.0.2 to 3.0.3 in /src (#6009) Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases) - [Commits](https://github.com/animir/node-rate-limiter-flexible/commits) --- updated-dependencies: - dependency-name: rate-limiter-flexible dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 04ce7b6a7..50f3b2e35 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7141,9 +7141,9 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "rate-limiter-flexible": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-3.0.2.tgz", - "integrity": "sha512-5kQnZBfQ025dBL7cjqLxrCk0ud8DWEMZJH06VJyhch+Es0gQ/lny9yiIRf6mcbBj8aMTSCn2Xp9KDDao3Raq6g==" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-3.0.3.tgz", + "integrity": "sha512-Wn9STZy2bKaWin9U54opnHvX14NNAlfLD+eiOTNNQnsIOd2A7Rnmt9msHWbUBloSEz2Nk1YTQ4CBa30TdlAgag==" }, "raw-body": { "version": "2.5.1", diff --git a/src/package.json b/src/package.json index c9de10f7c..75ac1d1ce 100644 --- a/src/package.json +++ b/src/package.json @@ -56,7 +56,7 @@ "npm": "^6.14.18", "openapi-backend": "^5.10.5", "proxy-addr": "^2.0.7", - "rate-limiter-flexible": "^3.0.2", + "rate-limiter-flexible": "^3.0.3", "rehype": "^13.0.1", "rehype-minify-whitespace": "^6.0.0", "resolve": "1.22.8", From b3e5d49a1a8f72b6aa2527da6c305497f2f200c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 18:14:26 +0100 Subject: [PATCH 06/54] build(deps): bump marked from 9.1.2 to 9.1.3 in /src/bin/doc (#6011) Bumps [marked](https://github.com/markedjs/marked) from 9.1.2 to 9.1.3. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v9.1.2...v9.1.3) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/bin/doc/package-lock.json | 6 +++--- src/bin/doc/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/doc/package-lock.json b/src/bin/doc/package-lock.json index b5712af0e..aa04ba508 100644 --- a/src/bin/doc/package-lock.json +++ b/src/bin/doc/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "marked": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.2.tgz", - "integrity": "sha512-qoKMJqK0w6vkLk8+KnKZAH6neUZSNaQqVZ/h2yZ9S7CbLuFHyS2viB0jnqcWF9UKjwsAbMrQtnQhdmdvOVOw9w==" + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.3.tgz", + "integrity": "sha512-XPU/J7GzU/n4voCSw1VYggtr3W5C2OeGkwEbe5PIQdA8thaie2Qw+fig6iNidKNDokTNcyR4OE9fMK14P6rqPg==" } } } diff --git a/src/bin/doc/package.json b/src/bin/doc/package.json index a8d9dcb5a..649ca18d4 100644 --- a/src/bin/doc/package.json +++ b/src/bin/doc/package.json @@ -7,7 +7,7 @@ "node": ">=12.17.0" }, "dependencies": { - "marked": "^9.1.2" + "marked": "^9.1.3" }, "devDependencies": {}, "optionalDependencies": {}, From 71b4cda48b5dd42f38f8e4fe9065969271313d33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:29:51 +0100 Subject: [PATCH 07/54] build(deps): bump marked from 9.1.3 to 9.1.4 in /src/bin/doc (#6015) Bumps [marked](https://github.com/markedjs/marked) from 9.1.3 to 9.1.4. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v9.1.3...v9.1.4) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/bin/doc/package-lock.json | 6 +++--- src/bin/doc/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/doc/package-lock.json b/src/bin/doc/package-lock.json index aa04ba508..a39a3d4f0 100644 --- a/src/bin/doc/package-lock.json +++ b/src/bin/doc/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "marked": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.3.tgz", - "integrity": "sha512-XPU/J7GzU/n4voCSw1VYggtr3W5C2OeGkwEbe5PIQdA8thaie2Qw+fig6iNidKNDokTNcyR4OE9fMK14P6rqPg==" + "version": "9.1.4", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.4.tgz", + "integrity": "sha512-Mq83CCaClhXqhf8sLQ57c1unNelHEuFadK36ga+GeXR4FeT/5ssaC5PaCRVqMA74VYorzYRqdAaxxteIanh3Kw==" } } } diff --git a/src/bin/doc/package.json b/src/bin/doc/package.json index 649ca18d4..025d11d2d 100644 --- a/src/bin/doc/package.json +++ b/src/bin/doc/package.json @@ -7,7 +7,7 @@ "node": ">=12.17.0" }, "dependencies": { - "marked": "^9.1.3" + "marked": "^9.1.4" }, "devDependencies": {}, "optionalDependencies": {}, From 6286ef3918742e6bb8963da8c1df042210bdea38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:30:01 +0100 Subject: [PATCH 08/54] build(deps): bump ueberdb2 from 4.2.34 to 4.2.35 in /src (#6013) Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.34 to 4.2.35. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v4.2.34...v4.2.35) --- updated-dependencies: - dependency-name: ueberdb2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 50f3b2e35..cd1d6385a 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8047,9 +8047,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.34", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.34.tgz", - "integrity": "sha512-LacNmgE/PXvl3bC0wtLj3bj/lzvc/islfBbu3Kr7jMP5YQq7db1KPtF8DvEi99GorsLGENoleoOUiEDgNnjF/Q==" + "version": "4.2.35", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.35.tgz", + "integrity": "sha512-LUIgeiK0pJB88lFS2FEWCybTn6Hm0UwhbPmM6DYRsV9d75+05HI33KDe/nPaFLMjAFk/8/XavWBOlOw4sC4OIg==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index 75ac1d1ce..baa53113c 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.23.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.34", + "ueberdb2": "^4.2.35", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From fddefc0409c6cd6fa02509190d981232551f827b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:30:22 +0100 Subject: [PATCH 09/54] build(deps): bump terser from 5.23.0 to 5.24.0 in /src (#6014) Bumps [terser](https://github.com/terser/terser) from 5.23.0 to 5.24.0. - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/compare/v5.23.0...v5.24.0) --- updated-dependencies: - dependency-name: terser dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index cd1d6385a..802bae60e 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7822,9 +7822,9 @@ "dev": true }, "terser": { - "version": "5.23.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.23.0.tgz", - "integrity": "sha512-Iyy83LN0uX9ZZLCX4Qbu5JiHiWjOCTwrmM9InWOzVeM++KNWEsqV4YgN9U9E8AlohQ6Gs42ztczlWOG/lwDAMA==", + "version": "5.24.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz", + "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==", "requires": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", diff --git a/src/package.json b/src/package.json index baa53113c..c25acb1a3 100644 --- a/src/package.json +++ b/src/package.json @@ -64,7 +64,7 @@ "semver": "^7.5.4", "socket.io": "^2.5.0", "superagent": "^8.1.2", - "terser": "^5.23.0", + "terser": "^5.24.0", "threads": "^1.7.0", "tinycon": "0.6.8", "ueberdb2": "^4.2.35", From 36d5778be68e7941074e17e9dfd3ac697e67d225 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:30:37 +0100 Subject: [PATCH 10/54] build(deps-dev): bump selenium-webdriver from 4.14.0 to 4.15.0 in /src (#6019) Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.14.0 to 4.15.0. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.14.0...selenium-4.15.0) --- updated-dependencies: - dependency-name: selenium-webdriver dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 90 +++++++++++++++++++++++-------------------- src/package.json | 2 +- 2 files changed, 50 insertions(+), 42 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 802bae60e..3520cb1d9 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -3042,44 +3042,6 @@ "pako": "~1.0.2", "readable-stream": "~2.3.6", "setimmediate": "^1.0.5" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true - }, - "readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } } }, "just-extend": { @@ -7156,6 +7118,35 @@ "unpipe": "1.0.0" } }, + "readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -7341,9 +7332,9 @@ "integrity": "sha512-5qfoAgfRWS1sUn+fUJtdbbqM1BD/LoQGa+smPTDjf9OqHyuJqi6ewtbYL0+V1S1RaU6OCOCMWGZocIfz2YK4uw==" }, "selenium-webdriver": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.14.0.tgz", - "integrity": "sha512-637rs8anqMKHbWxcBZpyG3Gcs+rBUtAUiqk0O/knUqH4Paj3MFUZrz88/pVGOLNryEVy2z92fZomT8p1ENl1gA==", + "version": "4.15.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.15.0.tgz", + "integrity": "sha512-BNG1bq+KWiBGHcJ/wULi0eKY0yaDqFIbEmtbsYJmfaEghdCkXBsx1akgOorhNwjBipOr0uwpvNXqT6/nzl+zjg==", "dev": true, "requires": { "jszip": "^3.10.1", @@ -7695,6 +7686,23 @@ "es-abstract": "^1.22.1" } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, "stringify-entities": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz", diff --git a/src/package.json b/src/package.json index c25acb1a3..f4b6ac2ba 100644 --- a/src/package.json +++ b/src/package.json @@ -85,7 +85,7 @@ "mocha-froth": "^0.2.10", "nodeify": "^1.0.1", "openapi-schema-validation": "^0.4.2", - "selenium-webdriver": "^4.14.0", + "selenium-webdriver": "^4.15.0", "set-cookie-parser": "^2.6.0", "sinon": "^17.0.0", "split-grid": "^1.0.11", From 71fdca9f685cd2163d1da5067fc38a14c218e1ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:30:55 +0100 Subject: [PATCH 11/54] build(deps-dev): bump sinon from 17.0.0 to 17.0.1 in /src (#6020) Bumps [sinon](https://github.com/sinonjs/sinon) from 17.0.0 to 17.0.1. - [Release notes](https://github.com/sinonjs/sinon/releases) - [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md) - [Commits](https://github.com/sinonjs/sinon/compare/v17.0.0...v17.0.1) --- updated-dependencies: - dependency-name: sinon dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 3520cb1d9..96a9c2ac6 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7449,9 +7449,9 @@ } }, "sinon": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-17.0.0.tgz", - "integrity": "sha512-p4lJiYKBoOEVUxxVIC9H1MM2znG1/c8gud++I2BauJA5hsz7hHsst35eurNWXTusBsIq66FzOQbZ/uMdpvbPIQ==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-17.0.1.tgz", + "integrity": "sha512-wmwE19Lie0MLT+ZYNpDymasPHUKTaZHUH/pKEubRXIzySv9Atnlw+BUMGCzWgV7b7wO+Hw6f1TEOr0IUnmU8/g==", "dev": true, "requires": { "@sinonjs/commons": "^3.0.0", diff --git a/src/package.json b/src/package.json index f4b6ac2ba..c609d6291 100644 --- a/src/package.json +++ b/src/package.json @@ -87,7 +87,7 @@ "openapi-schema-validation": "^0.4.2", "selenium-webdriver": "^4.15.0", "set-cookie-parser": "^2.6.0", - "sinon": "^17.0.0", + "sinon": "^17.0.1", "split-grid": "^1.0.11", "supertest": "^6.3.3", "typescript": "^4.9.5" From 61b06d17fe2e7ccd921f4da171a1b411cf61eff2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 19:12:24 +0100 Subject: [PATCH 12/54] build(deps): bump marked from 9.1.4 to 9.1.5 in /src/bin/doc (#6022) Bumps [marked](https://github.com/markedjs/marked) from 9.1.4 to 9.1.5. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v9.1.4...v9.1.5) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/bin/doc/package-lock.json | 6 +++--- src/bin/doc/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/doc/package-lock.json b/src/bin/doc/package-lock.json index a39a3d4f0..e58d8abe6 100644 --- a/src/bin/doc/package-lock.json +++ b/src/bin/doc/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "marked": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.4.tgz", - "integrity": "sha512-Mq83CCaClhXqhf8sLQ57c1unNelHEuFadK36ga+GeXR4FeT/5ssaC5PaCRVqMA74VYorzYRqdAaxxteIanh3Kw==" + "version": "9.1.5", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.5.tgz", + "integrity": "sha512-14QG3shv8Kg/xc0Yh6TNkMj90wXH9mmldi5941I2OevfJ/FQAFLEwtwU2/FfgSAOMlWHrEukWSGQf8MiVYNG2A==" } } } diff --git a/src/bin/doc/package.json b/src/bin/doc/package.json index 025d11d2d..efbe6d4d0 100644 --- a/src/bin/doc/package.json +++ b/src/bin/doc/package.json @@ -7,7 +7,7 @@ "node": ">=12.17.0" }, "dependencies": { - "marked": "^9.1.4" + "marked": "^9.1.5" }, "devDependencies": {}, "optionalDependencies": {}, From 19f237be497da354ca2b406a86fd869dd7e4e0c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 19:12:49 +0100 Subject: [PATCH 13/54] build(deps): bump saucelabs/sauce-connect-action from 2.3.5 to 2.3.6 (#6023) Bumps [saucelabs/sauce-connect-action](https://github.com/saucelabs/sauce-connect-action) from 2.3.5 to 2.3.6. - [Release notes](https://github.com/saucelabs/sauce-connect-action/releases) - [Changelog](https://github.com/saucelabs/sauce-connect-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/saucelabs/sauce-connect-action/compare/v2.3.5...v2.3.6) --- updated-dependencies: - dependency-name: saucelabs/sauce-connect-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/frontend-admin-tests.yml | 2 +- .github/workflows/frontend-tests.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml index 937451d96..403023779 100644 --- a/.github/workflows/frontend-admin-tests.yml +++ b/.github/workflows/frontend-admin-tests.yml @@ -78,7 +78,7 @@ jobs: name: Remove standard frontend test files, so only admin tests are run run: mv src/tests/frontend/specs/* /tmp && mv /tmp/admin*.js src/tests/frontend/specs - - uses: saucelabs/sauce-connect-action@v2.3.5 + uses: saucelabs/sauce-connect-action@v2.3.6 with: username: ${{ secrets.SAUCE_USERNAME }} accessKey: ${{ secrets.SAUCE_ACCESS_KEY }} diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index 935c99a2b..e1524d732 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -45,7 +45,7 @@ jobs: run: | sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 100000000/' -i settings.json - - uses: saucelabs/sauce-connect-action@v2.3.5 + uses: saucelabs/sauce-connect-action@v2.3.6 with: username: ${{ secrets.SAUCE_USERNAME }} accessKey: ${{ secrets.SAUCE_ACCESS_KEY }} @@ -133,7 +133,7 @@ jobs: name: Remove standard frontend test files, so only plugin tests are run run: rm src/tests/frontend/specs/* - - uses: saucelabs/sauce-connect-action@v2.3.5 + uses: saucelabs/sauce-connect-action@v2.3.6 with: username: ${{ secrets.SAUCE_USERNAME }} accessKey: ${{ secrets.SAUCE_ACCESS_KEY }} From 89462e58fac39e5abe778f02b3f02da03e5731c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 19:13:01 +0100 Subject: [PATCH 14/54] build(deps): bump ueberdb2 from 4.2.35 to 4.2.36 in /src (#6025) Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.35 to 4.2.36. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v4.2.35...v4.2.36) --- updated-dependencies: - dependency-name: ueberdb2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 96a9c2ac6..3738ff073 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8055,9 +8055,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.35", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.35.tgz", - "integrity": "sha512-LUIgeiK0pJB88lFS2FEWCybTn6Hm0UwhbPmM6DYRsV9d75+05HI33KDe/nPaFLMjAFk/8/XavWBOlOw4sC4OIg==" + "version": "4.2.36", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.36.tgz", + "integrity": "sha512-uBcmgn1+OMFyt02YN1VJYTHw0JaDKWwnw3iWHp6C3yLUQoS7GbNMeNG3SzMpUfps0mOIVHleIxbAwhk2vJn11A==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index c609d6291..748f58d20 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.24.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.35", + "ueberdb2": "^4.2.36", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From 5b45e0c7e213a0dff9a1b98baeca4f5906936480 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 6 Nov 2023 13:06:31 +0100 Subject: [PATCH 15/54] Localisation updates from https://translatewiki.net. --- src/locales/sco.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/sco.json b/src/locales/sco.json index 5fdeedf5b..decd4acee 100644 --- a/src/locales/sco.json +++ b/src/locales/sco.json @@ -71,7 +71,7 @@ "pad.modals.badChangeset.cause": "This coud be cause o ae wrang server confeeguration or some ither onexpected behavior. Please contact the service admeenistrator, gif ye feel that this is ae mistak. Try tae reconnect in order tae continue editing.", "pad.modals.corruptPad.explanation": "The pad ye'r trying te access is mingin.", "pad.modals.corruptPad.cause": "This micht be cause o ae wrang server confeeguration or some ither onexpected behavior. Please contact the service admeenistrater.", - "pad.modals.deleted": "Delytit.", + "pad.modals.deleted": "Deletit.", "pad.modals.deleted.explanation": "This pad has been hif't.", "pad.modals.disconnected": "Ye'v been disconnected.", "pad.modals.disconnected.explanation": "The connection til the server wis loast", From e9aa789e1464c5458144042660eccf4bb1ef1eb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 22:50:27 +0100 Subject: [PATCH 16/54] build(deps-dev): bump eslint from 8.52.0 to 8.53.0 in /src (#6028) Bumps [eslint](https://github.com/eslint/eslint) from 8.52.0 to 8.53.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.52.0...v8.53.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 22 +++++++++++----------- src/package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 3738ff073..8ee2978b0 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -38,9 +38,9 @@ "dev": true }, "@eslint/eslintrc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", - "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", + "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -90,9 +90,9 @@ } }, "@eslint/js": { - "version": "8.52.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", - "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", + "version": "8.53.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", + "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", "dev": true }, "@humanwhocodes/config-array": { @@ -1430,15 +1430,15 @@ } }, "eslint": { - "version": "8.52.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", - "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", + "version": "8.53.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", + "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.52.0", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.53.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", diff --git a/src/package.json b/src/package.json index 748f58d20..57cb3cf69 100644 --- a/src/package.json +++ b/src/package.json @@ -78,7 +78,7 @@ "etherpad-lite": "node/server.js" }, "devDependencies": { - "eslint": "^8.52.0", + "eslint": "^8.53.0", "eslint-config-etherpad": "^3.0.22", "etherpad-cli-client": "^2.0.2", "mocha": "^10.0.0", From a5ebd56711c864fb3e0152cb6be252b303ebbb1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 22:50:34 +0100 Subject: [PATCH 17/54] build(deps): bump async from 3.2.4 to 3.2.5 in /src (#6026) Bumps [async](https://github.com/caolan/async) from 3.2.4 to 3.2.5. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v3.2.4...v3.2.5) --- updated-dependencies: - dependency-name: async dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 8ee2978b0..6837aa196 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -724,9 +724,9 @@ "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==" }, "async": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", - "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==" }, "asynckit": { "version": "0.4.0", diff --git a/src/package.json b/src/package.json index 57cb3cf69..dc8b983b3 100644 --- a/src/package.json +++ b/src/package.json @@ -30,7 +30,7 @@ } ], "dependencies": { - "async": "^3.2.4", + "async": "^3.2.5", "axios": "^1.6.0", "clean-css": "^5.3.2", "cookie-parser": "^1.4.6", From ff942de93005bf9e77b0a700838ec6acbc6f2382 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 22:50:42 +0100 Subject: [PATCH 18/54] build(deps): bump ueberdb2 from 4.2.36 to 4.2.37 in /src (#6027) Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.36 to 4.2.37. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v4.2.36...v4.2.37) --- updated-dependencies: - dependency-name: ueberdb2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 6837aa196..70ee3b44a 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8055,9 +8055,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.36", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.36.tgz", - "integrity": "sha512-uBcmgn1+OMFyt02YN1VJYTHw0JaDKWwnw3iWHp6C3yLUQoS7GbNMeNG3SzMpUfps0mOIVHleIxbAwhk2vJn11A==" + "version": "4.2.37", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.37.tgz", + "integrity": "sha512-RNXWzAADzHeaGqlXbKvGKU51GtSqnbou3xhL40YXjZkXJwoZKv407FOkXnX7oOvX0OwX3maJKAY2rxXfSInZXQ==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index dc8b983b3..10dc93e59 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.24.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.36", + "ueberdb2": "^4.2.37", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From e37681d0b8c730b41b90ac6eb89d647464633309 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 20:45:12 +0100 Subject: [PATCH 19/54] build(deps): bump ueberdb2 from 4.2.37 to 4.2.38 in /src (#6032) Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.37 to 4.2.38. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v4.2.37...v4.2.38) --- updated-dependencies: - dependency-name: ueberdb2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 70ee3b44a..1307ade5c 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8055,9 +8055,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.37", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.37.tgz", - "integrity": "sha512-RNXWzAADzHeaGqlXbKvGKU51GtSqnbou3xhL40YXjZkXJwoZKv407FOkXnX7oOvX0OwX3maJKAY2rxXfSInZXQ==" + "version": "4.2.38", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.38.tgz", + "integrity": "sha512-OvN40DVKpKWU7YDTItnUEgM5xCoFH/zNCXdRFW3QLOzKLwFT0Rmn9+pJjqB3BzZ1rjVm5KzTnSK8tZd4cvXjoQ==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index 10dc93e59..c25ee0cbf 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.24.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.37", + "ueberdb2": "^4.2.38", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From 1e50360d7807abe90d953077a19cd3241693d587 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 20:45:18 +0100 Subject: [PATCH 20/54] build(deps): bump axios from 1.6.0 to 1.6.1 in /src (#6031) Bumps [axios](https://github.com/axios/axios) from 1.6.0 to 1.6.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.6.0...v1.6.1) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 1307ade5c..aed3c34f4 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -740,9 +740,9 @@ "dev": true }, "axios": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", - "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz", + "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==", "requires": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", diff --git a/src/package.json b/src/package.json index c25ee0cbf..864bfd4c1 100644 --- a/src/package.json +++ b/src/package.json @@ -31,7 +31,7 @@ ], "dependencies": { "async": "^3.2.5", - "axios": "^1.6.0", + "axios": "^1.6.1", "clean-css": "^5.3.2", "cookie-parser": "^1.4.6", "cross-spawn": "^7.0.3", From 055594712e4b12b83a6ea0a6dd83bf20adab8853 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 20:45:25 +0100 Subject: [PATCH 21/54] build(deps): bump express-rate-limit from 7.1.3 to 7.1.4 in /src (#6029) Bumps [express-rate-limit](https://github.com/express-rate-limit/express-rate-limit) from 7.1.3 to 7.1.4. - [Release notes](https://github.com/express-rate-limit/express-rate-limit/releases) - [Changelog](https://github.com/express-rate-limit/express-rate-limit/blob/main/changelog.md) - [Commits](https://github.com/express-rate-limit/express-rate-limit/compare/v7.1.3...v7.1.4) --- updated-dependencies: - dependency-name: express-rate-limit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index aed3c34f4..0456721e6 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -1990,9 +1990,9 @@ } }, "express-rate-limit": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.1.3.tgz", - "integrity": "sha512-BDes6WeNYSGRRGQU8QDNwUnwqaBro28HN/TTweM3RlxXRHDld8RLoH7tbfCxAc0hamQyn6aL0KrfR45+ZxknYg==" + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.1.4.tgz", + "integrity": "sha512-mv/6z+EwnWpr+MjGVavMGvM4Tl8S/tHmpl9ZsDfrQeHpYy4Hfr0UYdKEf9OOTe280oIr70yPxLRmQ6MfINfJDw==" }, "express-session": { "version": "npm:@etherpad/express-session@1.18.2", diff --git a/src/package.json b/src/package.json index 864bfd4c1..ea069c8a0 100644 --- a/src/package.json +++ b/src/package.json @@ -39,7 +39,7 @@ "etherpad-require-kernel": "^1.0.15", "etherpad-yajsml": "0.0.12", "express": "4.18.2", - "express-rate-limit": "^7.1.3", + "express-rate-limit": "^7.1.4", "express-session": "npm:@etherpad/express-session@^1.18.2", "fast-deep-equal": "^3.1.3", "find-root": "1.1.0", From 9fa5e5560bba33c533de639a1f0e629d4d4e9772 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Nov 2023 15:07:37 +0100 Subject: [PATCH 22/54] build(deps): bump marked from 9.1.5 to 9.1.6 in /src/bin/doc (#6033) Bumps [marked](https://github.com/markedjs/marked) from 9.1.5 to 9.1.6. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v9.1.5...v9.1.6) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/bin/doc/package-lock.json | 6 +++--- src/bin/doc/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/doc/package-lock.json b/src/bin/doc/package-lock.json index e58d8abe6..f59cff5c6 100644 --- a/src/bin/doc/package-lock.json +++ b/src/bin/doc/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "marked": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.5.tgz", - "integrity": "sha512-14QG3shv8Kg/xc0Yh6TNkMj90wXH9mmldi5941I2OevfJ/FQAFLEwtwU2/FfgSAOMlWHrEukWSGQf8MiVYNG2A==" + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.6.tgz", + "integrity": "sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==" } } } diff --git a/src/bin/doc/package.json b/src/bin/doc/package.json index efbe6d4d0..effd42110 100644 --- a/src/bin/doc/package.json +++ b/src/bin/doc/package.json @@ -7,7 +7,7 @@ "node": ">=12.17.0" }, "dependencies": { - "marked": "^9.1.5" + "marked": "^9.1.6" }, "devDependencies": {}, "optionalDependencies": {}, From e7356c1bb0e3ad66a215fbe572a1147471447a21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 19:15:49 +0100 Subject: [PATCH 23/54] build(deps): bump ueberdb2 from 4.2.38 to 4.2.39 in /src (#6035) Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.38 to 4.2.39. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v4.2.38...v4.2.39) --- updated-dependencies: - dependency-name: ueberdb2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 0456721e6..479040186 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8055,9 +8055,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.38", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.38.tgz", - "integrity": "sha512-OvN40DVKpKWU7YDTItnUEgM5xCoFH/zNCXdRFW3QLOzKLwFT0Rmn9+pJjqB3BzZ1rjVm5KzTnSK8tZd4cvXjoQ==" + "version": "4.2.39", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.39.tgz", + "integrity": "sha512-fXKCKZeED70J63H99m8pWSCyOlb53WFeb4UDrr4SCg4Jt98TTWvhWhnX504Iiifs7NFHkEHYt0TWvXtRqNKitg==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index ea069c8a0..fe2ff2879 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.24.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.38", + "ueberdb2": "^4.2.39", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From c75ee88e8b489a545bac0ffc874346680d47c42e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 19:15:56 +0100 Subject: [PATCH 24/54] build(deps): bump rate-limiter-flexible from 3.0.3 to 3.0.4 in /src (#6036) Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 3.0.3 to 3.0.4. - [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases) - [Commits](https://github.com/animir/node-rate-limiter-flexible/commits) --- updated-dependencies: - dependency-name: rate-limiter-flexible dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 479040186..65b042383 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7103,9 +7103,9 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "rate-limiter-flexible": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-3.0.3.tgz", - "integrity": "sha512-Wn9STZy2bKaWin9U54opnHvX14NNAlfLD+eiOTNNQnsIOd2A7Rnmt9msHWbUBloSEz2Nk1YTQ4CBa30TdlAgag==" + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-3.0.4.tgz", + "integrity": "sha512-LFrdT9Pl/TRxG143frHBPyESXHvS2tstLfAUM6shBbJ3M6YssT2cIUWFwAWVAU9Vl4Z2gUN7ZE7tSdQh/0aqcA==" }, "raw-body": { "version": "2.5.1", diff --git a/src/package.json b/src/package.json index fe2ff2879..7ce3f091b 100644 --- a/src/package.json +++ b/src/package.json @@ -56,7 +56,7 @@ "npm": "^6.14.18", "openapi-backend": "^5.10.5", "proxy-addr": "^2.0.7", - "rate-limiter-flexible": "^3.0.3", + "rate-limiter-flexible": "^3.0.4", "rehype": "^13.0.1", "rehype-minify-whitespace": "^6.0.0", "resolve": "1.22.8", From cc2919612c98318d1414b4a84e617a1b1c8c8f96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 19:16:05 +0100 Subject: [PATCH 25/54] build(deps): bump marked from 9.1.6 to 10.0.0 in /src/bin/doc (#6037) Bumps [marked](https://github.com/markedjs/marked) from 9.1.6 to 10.0.0. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v9.1.6...v10.0.0) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/bin/doc/package-lock.json | 6 +++--- src/bin/doc/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/doc/package-lock.json b/src/bin/doc/package-lock.json index f59cff5c6..5633e4ec0 100644 --- a/src/bin/doc/package-lock.json +++ b/src/bin/doc/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "marked": { - "version": "9.1.6", - "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.6.tgz", - "integrity": "sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-10.0.0.tgz", + "integrity": "sha512-YiGcYcWj50YrwBgNzFoYhQ1hT6GmQbFG8SksnYJX1z4BXTHSOrz1GB5/Jm2yQvMg4nN1FHP4M6r03R10KrVUiA==" } } } diff --git a/src/bin/doc/package.json b/src/bin/doc/package.json index effd42110..7c878c0e6 100644 --- a/src/bin/doc/package.json +++ b/src/bin/doc/package.json @@ -7,7 +7,7 @@ "node": ">=12.17.0" }, "dependencies": { - "marked": "^9.1.6" + "marked": "^10.0.0" }, "devDependencies": {}, "optionalDependencies": {}, From 8d014fb7e953360e6ada5c294c8ea93f0ed8dee0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:24:55 +0100 Subject: [PATCH 26/54] build(deps): bump axios from 1.6.1 to 1.6.2 in /src (#6038) Bumps [axios](https://github.com/axios/axios) from 1.6.1 to 1.6.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.6.1...v1.6.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 65b042383..0241f66dc 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -740,9 +740,9 @@ "dev": true }, "axios": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz", - "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", "requires": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", diff --git a/src/package.json b/src/package.json index 7ce3f091b..80c73420d 100644 --- a/src/package.json +++ b/src/package.json @@ -31,7 +31,7 @@ ], "dependencies": { "async": "^3.2.5", - "axios": "^1.6.1", + "axios": "^1.6.2", "clean-css": "^5.3.2", "cookie-parser": "^1.4.6", "cross-spawn": "^7.0.3", From d5fc94870570b655d008f2cf74eb8510b3bc86e7 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+SamTV12345@users.noreply.github.com> Date: Wed, 15 Nov 2023 19:27:34 +0100 Subject: [PATCH 27/54] Removed tidy html. (#6039) --- doc/docker.adoc | 4 -- settings.json.docker | 8 ---- settings.json.template | 8 ---- src/node/handler/ExportHandler.js | 3 -- src/node/utils/Settings.js | 5 --- src/node/utils/TidyHtml.js | 43 -------------------- src/tests/backend/specs/api/tidy.js | 61 ----------------------------- 7 files changed, 132 deletions(-) delete mode 100644 src/node/utils/TidyHtml.js delete mode 100644 src/tests/backend/specs/api/tidy.js diff --git a/doc/docker.adoc b/doc/docker.adoc index d49c46510..5f4b78120 100644 --- a/doc/docker.adoc +++ b/doc/docker.adoc @@ -441,10 +441,6 @@ For the editor container, you can also make it full width by adding `full-width- | This is the absolute path to the soffice executable. LibreOffice can be used in lieu of Abiword to export pads. Setting it to null disables LibreOffice exporting. | `null` -| `TIDY_HTML` -| Path to the Tidy executable. Tidy is used to improve the quality of exported pads. Setting it to null disables Tidy. -| `null` - | `ALLOW_UNKNOWN_FILE_ENDS` | Allow import of file types other than the supported ones: txt, doc, docx, rtf, odt, html & htm | `true` diff --git a/settings.json.docker b/settings.json.docker index dbe6bebee..79f72f05e 100644 --- a/settings.json.docker +++ b/settings.json.docker @@ -322,14 +322,6 @@ */ "soffice": "${SOFFICE:null}", - /* - * Path to the Tidy executable. - * - * Tidy is used to improve the quality of exported pads. - * Setting it to null disables Tidy. - */ - "tidyHtml": "${TIDY_HTML:null}", - /* * Allow import of file types other than the supported ones: * txt, doc, docx, rtf, odt, html & htm diff --git a/settings.json.template b/settings.json.template index ea8f41812..735b9d5e7 100644 --- a/settings.json.template +++ b/settings.json.template @@ -323,14 +323,6 @@ */ "soffice": null, - /* - * Path to the Tidy executable. - * - * Tidy is used to improve the quality of exported pads. - * Setting it to null disables Tidy. - */ - "tidyHtml": null, - /* * Allow import of file types other than the supported ones: * txt, doc, docx, rtf, odt, html & htm diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js index e0a89e6d0..250221d18 100644 --- a/src/node/handler/ExportHandler.js +++ b/src/node/handler/ExportHandler.js @@ -27,7 +27,6 @@ const fs = require('fs'); const settings = require('../utils/Settings'); const os = require('os'); const hooks = require('../../static/js/pluginfw/hooks'); -const TidyHtml = require('../utils/TidyHtml'); const util = require('util'); const { checkValidRev } = require('../utils/checkValidRev'); @@ -93,10 +92,8 @@ exports.doExport = async (req, res, padId, readOnlyId, type) => { const srcFile = `${tempDirectory}/etherpad_export_${randNum}.html`; await fsp_writeFile(srcFile, html); - // Tidy up the exported HTML // ensure html can be collected by the garbage collector html = null; - await TidyHtml.tidy(srcFile); // send the convert job to the converter (abiword, libreoffice, ..) const destFile = `${tempDirectory}/etherpad_export_${randNum}.${type}`; diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index c9a85daea..9646c1f89 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -260,11 +260,6 @@ exports.abiword = null; */ exports.soffice = null; -/** - * The path of the tidy executable - */ -exports.tidyHtml = null; - /** * Should we support none natively supported file types on import? */ diff --git a/src/node/utils/TidyHtml.js b/src/node/utils/TidyHtml.js deleted file mode 100644 index 5b48cdbad..000000000 --- a/src/node/utils/TidyHtml.js +++ /dev/null @@ -1,43 +0,0 @@ -'use strict'; -/** - * Tidy up the HTML in a given file - */ - -const log4js = require('log4js'); -const settings = require('./Settings'); -const spawn = require('child_process').spawn; - -exports.tidy = (srcFile) => { - const logger = log4js.getLogger('TidyHtml'); - - return new Promise((resolve, reject) => { - // Don't do anything if Tidy hasn't been enabled - if (!settings.tidyHtml) { - logger.debug('tidyHtml has not been configured yet, ignoring tidy request'); - return resolve(null); - } - - let errMessage = ''; - - // Spawn a new tidy instance that cleans up the file inline - logger.debug(`Tidying ${srcFile}`); - const tidy = spawn(settings.tidyHtml, ['-modify', srcFile]); - - // Keep track of any error messages - tidy.stderr.on('data', (data) => { - errMessage += data.toString(); - }); - - tidy.on('close', (code) => { - // Tidy returns a 0 when no errors occur and a 1 exit code when - // the file could be tidied but a few warnings were generated - if (code === 0 || code === 1) { - logger.debug(`Tidied ${srcFile} successfully`); - resolve(null); - } else { - logger.error(`Failed to tidy ${srcFile}\n${errMessage}`); - reject(`Tidy died with exit code ${code}`); - } - }); - }); -}; diff --git a/src/tests/backend/specs/api/tidy.js b/src/tests/backend/specs/api/tidy.js deleted file mode 100644 index 6a8bd6a2a..000000000 --- a/src/tests/backend/specs/api/tidy.js +++ /dev/null @@ -1,61 +0,0 @@ -'use strict'; - -const Settings = require('../../../../node/utils/Settings'); -const TidyHtml = require('../../../../node/utils/TidyHtml'); -const assert = require('assert'); -const os = require('os'); -const fs = require('fs'); -const path = require('path'); -const nodeify = require('nodeify'); - -describe(__filename, function () { - describe('tidyHtml', function () { - const tidy = (file, callback) => nodeify(TidyHtml.tidy(file), callback); - - it('Tidies HTML', function (done) { - // If the user hasn't configured Tidy, we skip this tests as it's required for this test - if (!Settings.tidyHtml) { - this.skip(); - } - - // Try to tidy up a bad HTML file - const tmpDir = os.tmpdir(); - - const tmpFile = path.join(tmpDir, `tmp_${Math.floor(Math.random() * 1000000)}.html`); - fs.writeFileSync(tmpFile, '

a paragraph

  • List without outer UL
  • trailing closing p

    '); - tidy(tmpFile, (err) => { - assert.ok(!err); - - // Read the file again - const cleanedHtml = fs.readFileSync(tmpFile).toString(); - - const expectedHtml = [ - '', - '', - '', - '

    a paragraph

    ', - '
      ', - '
    • List without outer UL
    • ', - '
    • trailing closing p
    • ', - '
    ', - '', - '', - ].join('\n'); - assert.notStrictEqual(cleanedHtml.indexOf(expectedHtml), -1); - done(); - }); - }); - - it('can deal with errors', function (done) { - // If the user hasn't configured Tidy, we skip this tests as it's required for this test - if (!Settings.tidyHtml) { - this.skip(); - } - - tidy('/some/none/existing/file.html', (err) => { - assert.ok(err); - done(); - }); - }); - }); -}); From f1fea377818ec966a8b6e3c2a11786bb9dfb9133 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Nov 2023 20:24:14 +0100 Subject: [PATCH 28/54] build(deps): bump ueberdb2 from 4.2.39 to 4.2.40 in /src (#6041) Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.39 to 4.2.40. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v4.2.39...v4.2.40) --- updated-dependencies: - dependency-name: ueberdb2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 0241f66dc..a0c0c65df 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8055,9 +8055,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.39", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.39.tgz", - "integrity": "sha512-fXKCKZeED70J63H99m8pWSCyOlb53WFeb4UDrr4SCg4Jt98TTWvhWhnX504Iiifs7NFHkEHYt0TWvXtRqNKitg==" + "version": "4.2.40", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.40.tgz", + "integrity": "sha512-YLIXrvsx6VulA6I9BGT3xhdCGVQjxUMTEeY0nS/RU1QPFaSqxkU2+9s2s5bEG2iIHnksPIm5ocsUQ0HrImBh5A==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index 80c73420d..49cc14675 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.24.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.39", + "ueberdb2": "^4.2.40", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From de491d42faac29d414b7b6027f102493d79d057d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:30:28 +0100 Subject: [PATCH 29/54] build(deps-dev): bump eslint from 8.53.0 to 8.54.0 in /src (#6044) Bumps [eslint](https://github.com/eslint/eslint) from 8.53.0 to 8.54.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.53.0...v8.54.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 20 ++++++++++---------- src/package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index a0c0c65df..9be04951c 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -90,9 +90,9 @@ } }, "@eslint/js": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", - "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true }, "@humanwhocodes/config-array": { @@ -1430,15 +1430,15 @@ } }, "eslint": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", - "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.53.0", + "@eslint/js": "8.54.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -2148,9 +2148,9 @@ "dev": true }, "flat-cache": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", - "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, "requires": { "flatted": "^3.2.9", diff --git a/src/package.json b/src/package.json index 49cc14675..e7dfb5124 100644 --- a/src/package.json +++ b/src/package.json @@ -78,7 +78,7 @@ "etherpad-lite": "node/server.js" }, "devDependencies": { - "eslint": "^8.53.0", + "eslint": "^8.54.0", "eslint-config-etherpad": "^3.0.22", "etherpad-cli-client": "^2.0.2", "mocha": "^10.0.0", From 9cde610c4557067a264db7711099de7b6f35501d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:30:34 +0100 Subject: [PATCH 30/54] build(deps): bump ueberdb2 from 4.2.40 to 4.2.42 in /src (#6043) Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.40 to 4.2.42. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v4.2.40...v4.2.42) --- updated-dependencies: - dependency-name: ueberdb2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 9be04951c..722c5a319 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8055,9 +8055,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.40", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.40.tgz", - "integrity": "sha512-YLIXrvsx6VulA6I9BGT3xhdCGVQjxUMTEeY0nS/RU1QPFaSqxkU2+9s2s5bEG2iIHnksPIm5ocsUQ0HrImBh5A==" + "version": "4.2.42", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.42.tgz", + "integrity": "sha512-KIScl9lthh8MjGJbUf182vArpYt7YF0fpwJsXyavOWRnrIAhNjpoKnVIeZa47EfhM+ZWR2VrzBBN1AmLmcSwHg==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index e7dfb5124..ba4b6d384 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.24.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.40", + "ueberdb2": "^4.2.42", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From 0aed9b1e6865f84d9a31fe1a28efda993bf6f9ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:46:00 +0100 Subject: [PATCH 31/54] build(deps-dev): bump typescript from 4.9.5 to 5.2.2 in /src (#6042) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.9.5 to 5.2.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.9.5...v5.2.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 722c5a319..bbc2eab95 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8049,9 +8049,9 @@ } }, "typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true }, "ueberdb2": { diff --git a/src/package.json b/src/package.json index ba4b6d384..f2519642e 100644 --- a/src/package.json +++ b/src/package.json @@ -90,7 +90,7 @@ "sinon": "^17.0.1", "split-grid": "^1.0.11", "supertest": "^6.3.3", - "typescript": "^4.9.5" + "typescript": "^5.2.2" }, "engines": { "node": ">=16.20.1", From ddf8ec3bac230fd5b57743f4242583334df61ef7 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 23 Nov 2023 13:05:57 +0100 Subject: [PATCH 32/54] Localisation updates from https://translatewiki.net. --- src/locales/mnw.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/locales/mnw.json b/src/locales/mnw.json index d3fb8bf18..db7dfa56e 100644 --- a/src/locales/mnw.json +++ b/src/locales/mnw.json @@ -1,9 +1,11 @@ { "@metadata": { "authors": [ - "Aue Nai" + "Aue Nai", + "咽頭べさ" ] }, + "admin_plugins.description": "တၚ်ထမံက်ထ္ၜး", "index.newPad": "တၞးတၟိ", "pad.toolbar.bold.title": "လ္စံက် (Ctrl+B)", "pad.toolbar.italic.title": "ဒစေၚ် (Ctrl+I)", From 69d6dccdfc0fe66b9447ae75ef253666c954428f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:15:27 +0100 Subject: [PATCH 33/54] build(deps-dev): bump typescript from 5.2.2 to 5.3.2 in /src (#6046) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.2.2 to 5.3.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.2.2...v5.3.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index bbc2eab95..a8e1b2ec0 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8049,9 +8049,9 @@ } }, "typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", + "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", "dev": true }, "ueberdb2": { diff --git a/src/package.json b/src/package.json index f2519642e..9834b8945 100644 --- a/src/package.json +++ b/src/package.json @@ -90,7 +90,7 @@ "sinon": "^17.0.1", "split-grid": "^1.0.11", "supertest": "^6.3.3", - "typescript": "^5.2.2" + "typescript": "^5.3.2" }, "engines": { "node": ">=16.20.1", From 774948e113765f40d849d9ee2e46d7f125e791a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:15:45 +0100 Subject: [PATCH 34/54] build(deps): bump ueberdb2 from 4.2.42 to 4.2.43 in /src (#6047) Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.42 to 4.2.43. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v4.2.42...v4.2.43) --- updated-dependencies: - dependency-name: ueberdb2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index a8e1b2ec0..383f23b5f 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8055,9 +8055,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.42", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.42.tgz", - "integrity": "sha512-KIScl9lthh8MjGJbUf182vArpYt7YF0fpwJsXyavOWRnrIAhNjpoKnVIeZa47EfhM+ZWR2VrzBBN1AmLmcSwHg==" + "version": "4.2.43", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.43.tgz", + "integrity": "sha512-kngAIoP8ceFJB++qxvmHk1yoUdzyvK1Pn4seyeaBcN7YjvM37g9KjcRpJVXwuplWjtyLSA9N3OnKLo3fUzOEcQ==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index 9834b8945..fd0896fdb 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.24.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.42", + "ueberdb2": "^4.2.43", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From 1723f5f0443836f614f14abe4a2bcb5854a0adeb Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 27 Nov 2023 13:04:52 +0100 Subject: [PATCH 35/54] Localisation updates from https://translatewiki.net. --- src/locales/sco.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/sco.json b/src/locales/sco.json index decd4acee..b67e587b4 100644 --- a/src/locales/sco.json +++ b/src/locales/sco.json @@ -92,8 +92,8 @@ "timeslider.version": "Version {{version}}", "timeslider.saved": "Saved {{day}} {{month}}, {{year}}", "timeslider.playPause": "Playback / Pause Pad Contents", - "timeslider.backRevision": "Gae back a reveesion in this Pad", - "timeslider.forwardRevision": "Gae forwart a reveesion in this Pad", + "timeslider.backRevision": "Gang back ae revision in this Pad", + "timeslider.forwardRevision": "Gang forrit ae revision in this pad", "timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}", "timeslider.month.january": "Januair", "timeslider.month.february": "Febuair", From 30a81b7ce8b032ab8c134d1adc1a1d41d07ed441 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 17:46:04 +0100 Subject: [PATCH 36/54] build(deps): bump ueberdb2 from 4.2.43 to 4.2.44 in /src (#6049) --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 383f23b5f..bca3fd54e 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -8055,9 +8055,9 @@ "dev": true }, "ueberdb2": { - "version": "4.2.43", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.43.tgz", - "integrity": "sha512-kngAIoP8ceFJB++qxvmHk1yoUdzyvK1Pn4seyeaBcN7YjvM37g9KjcRpJVXwuplWjtyLSA9N3OnKLo3fUzOEcQ==" + "version": "4.2.44", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-4.2.44.tgz", + "integrity": "sha512-OeVKUtchoRg1O4/sza9PqU1igOfpifqaDyGNuotmG1J6q0uG+0BnUtGNeaOfgoYbDjlI0iPShy792Px6BHr1rw==" }, "uid-safe": { "version": "2.1.5", diff --git a/src/package.json b/src/package.json index fd0896fdb..ac48508a5 100644 --- a/src/package.json +++ b/src/package.json @@ -67,7 +67,7 @@ "terser": "^5.24.0", "threads": "^1.7.0", "tinycon": "0.6.8", - "ueberdb2": "^4.2.43", + "ueberdb2": "^4.2.44", "underscore": "1.13.6", "unorm": "1.6.0", "wtfnode": "^0.9.1" From 1c2af941e5e84c0b00ad8304f4240330ab313435 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 17:46:50 +0100 Subject: [PATCH 37/54] build(deps): bump jsdom from 20.0.3 to 23.0.0 in /src (#6050) --- src/package-lock.json | 217 ++++++++++++++++-------------------------- src/package.json | 2 +- 2 files changed, 83 insertions(+), 136 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index bca3fd54e..bed58ad50 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -261,11 +261,6 @@ "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", "dev": true }, - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==" - }, "@types/hast": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.1.tgz", @@ -507,11 +502,6 @@ "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" }, - "abab": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", - "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==" - }, "accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -526,37 +516,23 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==" }, - "acorn-globals": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", - "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", - "requires": { - "acorn": "^8.1.0", - "acorn-walk": "^8.0.2" - } - }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true }, - "acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==" - }, "after": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", "integrity": "sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==" }, "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", + "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", "requires": { - "debug": "4" + "debug": "^4.3.4" }, "dependencies": { "debug": { @@ -1050,34 +1026,21 @@ "which": "^2.0.1" } }, - "cssom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", - "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==" - }, "cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz", + "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==", "requires": { - "cssom": "~0.3.6" - }, - "dependencies": { - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" - } + "rrweb-cssom": "^0.6.0" } }, "data-urls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", - "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", + "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", "requires": { - "abab": "^2.0.6", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0" + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0" } }, "date-format": { @@ -1198,14 +1161,6 @@ "esutils": "^2.0.2" } }, - "domexception": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", - "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", - "requires": { - "webidl-conversions": "^7.0.0" - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -1418,17 +1373,6 @@ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true }, - "escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "requires": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "source-map": "~0.6.1" - } - }, "eslint": { "version": "8.54.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", @@ -1808,11 +1752,6 @@ "eslint-visitor-keys": "^3.4.1" } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" - }, "esquery": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", @@ -1834,12 +1773,14 @@ "estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true }, "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true }, "etag": { "version": "1.8.1", @@ -2576,11 +2517,11 @@ "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==" }, "html-encoding-sniffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", - "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", + "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", "requires": { - "whatwg-encoding": "^2.0.0" + "whatwg-encoding": "^3.1.1" } }, "html-void-elements": { @@ -2601,13 +2542,12 @@ } }, "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", + "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" + "agent-base": "^7.1.0", + "debug": "^4.3.4" }, "dependencies": { "debug": { @@ -2626,11 +2566,11 @@ } }, "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", + "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", "requires": { - "agent-base": "6", + "agent-base": "^7.0.2", "debug": "4" }, "dependencies": { @@ -2949,36 +2889,31 @@ } }, "jsdom": { - "version": "20.0.3", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz", - "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==", + "version": "23.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.0.tgz", + "integrity": "sha512-cbL/UCtohJguhFC7c2/hgW6BeZCNvP7URQGnx9tSJRYKCdnfbfWOrtuLTMfiB2VxKsx5wPHVsh/J0aBy9lIIhQ==", "requires": { - "abab": "^2.0.6", - "acorn": "^8.8.1", - "acorn-globals": "^7.0.0", - "cssom": "^0.5.0", - "cssstyle": "^2.3.0", - "data-urls": "^3.0.2", - "decimal.js": "^10.4.2", - "domexception": "^4.0.0", - "escodegen": "^2.0.0", + "cssstyle": "^3.0.0", + "data-urls": "^5.0.0", + "decimal.js": "^10.4.3", "form-data": "^4.0.0", - "html-encoding-sniffer": "^3.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.1", + "html-encoding-sniffer": "^4.0.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.2", "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.2", - "parse5": "^7.1.1", + "nwsapi": "^2.2.7", + "parse5": "^7.1.2", + "rrweb-cssom": "^0.6.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^4.1.2", - "w3c-xmlserializer": "^4.0.0", + "tough-cookie": "^4.1.3", + "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0", - "ws": "^8.11.0", - "xml-name-validator": "^4.0.0" + "whatwg-encoding": "^3.1.1", + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0", + "ws": "^8.14.2", + "xml-name-validator": "^5.0.0" } }, "json-buffer": { @@ -7268,6 +7203,11 @@ "glob": "^7.1.3" } }, + "rrweb-cssom": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", + "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==" + }, "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -7927,11 +7867,18 @@ } }, "tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz", + "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==", "requires": { - "punycode": "^2.1.1" + "punycode": "^2.3.1" + }, + "dependencies": { + "punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" + } } }, "trim-lines": { @@ -8218,11 +8165,11 @@ } }, "w3c-xmlserializer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", - "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", + "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", "requires": { - "xml-name-validator": "^4.0.0" + "xml-name-validator": "^5.0.0" } }, "web-namespaces": { @@ -8236,9 +8183,9 @@ "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==" }, "whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", "requires": { "iconv-lite": "0.6.3" }, @@ -8254,16 +8201,16 @@ } }, "whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" }, "whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz", + "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==", "requires": { - "tr46": "^3.0.0", + "tr46": "^5.0.0", "webidl-conversions": "^7.0.0" } }, @@ -8334,9 +8281,9 @@ "integrity": "sha512-Ip6C2KeQPl/F3aP1EfOnPoQk14Udd9lffpoqWDNH3Xt78svxPbv53ngtmtfI0q2Te3oTq79XKTnRNXVIn/GsPA==" }, "xml-name-validator": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", - "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==" }, "xmlchars": { "version": "2.2.0", diff --git a/src/package.json b/src/package.json index ac48508a5..f8b1b2b6c 100644 --- a/src/package.json +++ b/src/package.json @@ -46,7 +46,7 @@ "formidable": "^3.5.1", "http-errors": "^2.0.0", "js-cookie": "^3.0.5", - "jsdom": "^20.0.0", + "jsdom": "^23.0.0", "jsonminify": "0.4.2", "languages4translatewiki": "0.1.3", "lodash.clonedeep": "4.5.0", From d6f54f31fb17183cb8c89b4ea9a35f6b3d5782bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:53:58 +0100 Subject: [PATCH 38/54] build(deps): bump express-rate-limit from 7.1.4 to 7.1.5 in /src (#6052) Bumps [express-rate-limit](https://github.com/express-rate-limit/express-rate-limit) from 7.1.4 to 7.1.5. - [Release notes](https://github.com/express-rate-limit/express-rate-limit/releases) - [Commits](https://github.com/express-rate-limit/express-rate-limit/compare/v7.1.4...v7.1.5) --- updated-dependencies: - dependency-name: express-rate-limit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index bed58ad50..a35615eec 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -1931,9 +1931,9 @@ } }, "express-rate-limit": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.1.4.tgz", - "integrity": "sha512-mv/6z+EwnWpr+MjGVavMGvM4Tl8S/tHmpl9ZsDfrQeHpYy4Hfr0UYdKEf9OOTe280oIr70yPxLRmQ6MfINfJDw==" + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.1.5.tgz", + "integrity": "sha512-/iVogxu7ueadrepw1bS0X0kaRC/U0afwiYRSLg68Ts+p4Dc85Q5QKsOnPS/QUjPMHvOJQtBDrZgvkOzf8ejUYw==" }, "express-session": { "version": "npm:@etherpad/express-session@1.18.2", diff --git a/src/package.json b/src/package.json index f8b1b2b6c..4813a41dc 100644 --- a/src/package.json +++ b/src/package.json @@ -39,7 +39,7 @@ "etherpad-require-kernel": "^1.0.15", "etherpad-yajsml": "0.0.12", "express": "4.18.2", - "express-rate-limit": "^7.1.4", + "express-rate-limit": "^7.1.5", "express-session": "npm:@etherpad/express-session@^1.18.2", "fast-deep-equal": "^3.1.3", "find-root": "1.1.0", From 3f45287f9fc102a5a4081fad74142e38f8a024df Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+SamTV12345@users.noreply.github.com> Date: Wed, 29 Nov 2023 14:23:14 +0100 Subject: [PATCH 39/54] Deprecated Node 16, added Node 21. (#6051) * Deprecated Node 16, added Node 21. * Added Node 21 to frontend. --- .github/workflows/backend-tests.yml | 4 ++-- .github/workflows/frontend-admin-tests.yml | 2 +- .github/workflows/upgrade-from-latest-release.yml | 2 +- src/package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml index 3640b94ca..000d98ef4 100644 --- a/.github/workflows/backend-tests.yml +++ b/.github/workflows/backend-tests.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - node: [16, 18, 20] + node: [18, 20, 21] steps: - name: Checkout repository @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - node: [16, 18, 20] + node: [18, 20, 21] steps: - name: Checkout repository diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml index 403023779..f3876816b 100644 --- a/.github/workflows/frontend-admin-tests.yml +++ b/.github/workflows/frontend-admin-tests.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - node: [19, 20] + node: [19, 20, 21] steps: - diff --git a/.github/workflows/upgrade-from-latest-release.yml b/.github/workflows/upgrade-from-latest-release.yml index 82e4af6f1..cdd6d20b3 100644 --- a/.github/workflows/upgrade-from-latest-release.yml +++ b/.github/workflows/upgrade-from-latest-release.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - node: [16, 18, 20] + node: [18, 20, 21] steps: - name: Check out latest release diff --git a/src/package.json b/src/package.json index 4813a41dc..49c9856f1 100644 --- a/src/package.json +++ b/src/package.json @@ -93,7 +93,7 @@ "typescript": "^5.3.2" }, "engines": { - "node": ">=16.20.1", + "node": ">=18.18.2", "npm": ">=6.14.0" }, "repository": { From bf5e2dabddc7be2ccb7fa96c439d6c2e7bc6b308 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 30 Nov 2023 13:04:53 +0100 Subject: [PATCH 40/54] Localisation updates from https://translatewiki.net. --- src/locales/ja.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/locales/ja.json b/src/locales/ja.json index 145ebbc84..fb1cc6a46 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -3,11 +3,32 @@ "authors": [ "Aefgh39622", "Afaz", + "Chqaz", "Omotecho", "Shirayuki", "Torinky" ] }, + "admin.page-title": "管理者ダッシュボード - Etherpad", + "admin_plugins": "プラグインマネージャー", + "admin_plugins.available": "利用可能なプラグイン", + "admin_plugins.available_not-found": "プラグインが見つかりません。", + "admin_plugins.available_fetching": "読み込み中…", + "admin_plugins.available_install.value": "インストール", + "admin_plugins.available_search.placeholder": "インストールするプラグインを検索する", + "admin_plugins.description": "説明", + "admin_plugins.installed": "インストール済みプラグイン", + "admin_plugins.installed_fetching": "インストール済みのプラグインを読み込んでいます…", + "admin_plugins.installed_nothing": "まだプラグインをインストールしていません。", + "admin_plugins.installed_uninstall.value": "アンインストール", + "admin_plugins.last-update": "最終更新", + "admin_plugins.name": "名前", + "admin_plugins.page-title": "プラグインマネージャー - Etherpad", + "admin_plugins.version": "バージョン", + "admin_plugins_info": "トラブルシューティングの情報", + "admin_plugins_info.hooks": "インストール済みフック", + "admin_plugins_info.hooks_client": "クライアント側のフック", + "admin_plugins_info.hooks_server": "サーバー側のフック", "index.newPad": "新規作成", "index.createOpenPad": "または作成/編集するパッド名を入力:", "index.openPad": "次の名称の既存の Pad を開く:", From b7ed9d604731a831f9bbc4fff9138ace17053a2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:32:22 +0100 Subject: [PATCH 41/54] build(deps): bump marked from 10.0.0 to 11.0.0 in /src/bin/doc (#6054) Bumps [marked](https://github.com/markedjs/marked) from 10.0.0 to 11.0.0. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v10.0.0...v11.0.0) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/bin/doc/package-lock.json | 6 +++--- src/bin/doc/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/doc/package-lock.json b/src/bin/doc/package-lock.json index 5633e4ec0..ae77a1775 100644 --- a/src/bin/doc/package-lock.json +++ b/src/bin/doc/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "marked": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-10.0.0.tgz", - "integrity": "sha512-YiGcYcWj50YrwBgNzFoYhQ1hT6GmQbFG8SksnYJX1z4BXTHSOrz1GB5/Jm2yQvMg4nN1FHP4M6r03R10KrVUiA==" + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-11.0.0.tgz", + "integrity": "sha512-2GsW34uXaFEGTQ/+3rCnNC6vUYTAgFuDLGl70v/aWinA5mIJtTrrFAmfbLOfVvgPyxXuDVL9He/7reCK+6j3Sw==" } } } diff --git a/src/bin/doc/package.json b/src/bin/doc/package.json index 7c878c0e6..92bb420ce 100644 --- a/src/bin/doc/package.json +++ b/src/bin/doc/package.json @@ -7,7 +7,7 @@ "node": ">=12.17.0" }, "dependencies": { - "marked": "^10.0.0" + "marked": "^11.0.0" }, "devDependencies": {}, "optionalDependencies": {}, From 2141c425afc9235f075dc9c721bf034232639b44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:56:35 +0100 Subject: [PATCH 42/54] build(deps): bump clean-css from 5.3.2 to 5.3.3 in /src (#6055) Bumps [clean-css](https://github.com/clean-css/clean-css) from 5.3.2 to 5.3.3. - [Changelog](https://github.com/clean-css/clean-css/blob/master/History.md) - [Commits](https://github.com/clean-css/clean-css/compare/v5.3.2...v5.3.3) --- updated-dependencies: - dependency-name: clean-css dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index a35615eec..c77a6bf07 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -904,9 +904,9 @@ } }, "clean-css": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", - "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz", + "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==", "requires": { "source-map": "~0.6.0" } diff --git a/src/package.json b/src/package.json index 49c9856f1..4f5398d38 100644 --- a/src/package.json +++ b/src/package.json @@ -32,7 +32,7 @@ "dependencies": { "async": "^3.2.5", "axios": "^1.6.2", - "clean-css": "^5.3.2", + "clean-css": "^5.3.3", "cookie-parser": "^1.4.6", "cross-spawn": "^7.0.3", "ejs": "^3.1.9", From 706be9f7efd363dee3f569600cdcf5c22285ad66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:56:47 +0100 Subject: [PATCH 43/54] build(deps): bump jsdom from 23.0.0 to 23.0.1 in /src (#6056) Bumps [jsdom](https://github.com/jsdom/jsdom) from 23.0.0 to 23.0.1. - [Release notes](https://github.com/jsdom/jsdom/releases) - [Changelog](https://github.com/jsdom/jsdom/blob/main/Changelog.md) - [Commits](https://github.com/jsdom/jsdom/compare/23.0.0...23.0.1) --- updated-dependencies: - dependency-name: jsdom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index c77a6bf07..7e1ecdd74 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -2889,9 +2889,9 @@ } }, "jsdom": { - "version": "23.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.0.tgz", - "integrity": "sha512-cbL/UCtohJguhFC7c2/hgW6BeZCNvP7URQGnx9tSJRYKCdnfbfWOrtuLTMfiB2VxKsx5wPHVsh/J0aBy9lIIhQ==", + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.1.tgz", + "integrity": "sha512-2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==", "requires": { "cssstyle": "^3.0.0", "data-urls": "^5.0.0", diff --git a/src/package.json b/src/package.json index 4f5398d38..f93073388 100644 --- a/src/package.json +++ b/src/package.json @@ -46,7 +46,7 @@ "formidable": "^3.5.1", "http-errors": "^2.0.0", "js-cookie": "^3.0.5", - "jsdom": "^23.0.0", + "jsdom": "^23.0.1", "jsonminify": "0.4.2", "languages4translatewiki": "0.1.3", "lodash.clonedeep": "4.5.0", From 3a637005c0cefcb6ae59d91c7f1d5c1aa52d11e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:29:40 +0100 Subject: [PATCH 44/54] build(deps): bump terser from 5.24.0 to 5.25.0 in /src (#6058) Bumps [terser](https://github.com/terser/terser) from 5.24.0 to 5.25.0. - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/compare/v5.24.0...v5.25.0) --- updated-dependencies: - dependency-name: terser dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 7e1ecdd74..98faa40fe 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7770,9 +7770,9 @@ "dev": true }, "terser": { - "version": "5.24.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz", - "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==", + "version": "5.25.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.25.0.tgz", + "integrity": "sha512-we0I9SIsfvNUMP77zC9HG+MylwYYsGFSBG8qm+13oud2Yh+O104y614FRbyjpxys16jZwot72Fpi827YvGzuqg==", "requires": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", diff --git a/src/package.json b/src/package.json index f93073388..7263d0807 100644 --- a/src/package.json +++ b/src/package.json @@ -64,7 +64,7 @@ "semver": "^7.5.4", "socket.io": "^2.5.0", "superagent": "^8.1.2", - "terser": "^5.24.0", + "terser": "^5.25.0", "threads": "^1.7.0", "tinycon": "0.6.8", "ueberdb2": "^4.2.44", From da028e672296150efb4c7acfe406b0342620c138 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:29:48 +0100 Subject: [PATCH 45/54] build(deps-dev): bump eslint from 8.54.0 to 8.55.0 in /src (#6057) Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.55.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.54.0...v8.55.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 22 +++++++++++----------- src/package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 98faa40fe..0eb7f4759 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -38,9 +38,9 @@ "dev": true }, "@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -90,9 +90,9 @@ } }, "@eslint/js": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", - "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", + "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", "dev": true }, "@humanwhocodes/config-array": { @@ -1374,15 +1374,15 @@ "dev": true }, "eslint": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", - "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", + "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.54.0", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.55.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", diff --git a/src/package.json b/src/package.json index 7263d0807..e5a00e4b2 100644 --- a/src/package.json +++ b/src/package.json @@ -78,7 +78,7 @@ "etherpad-lite": "node/server.js" }, "devDependencies": { - "eslint": "^8.54.0", + "eslint": "^8.55.0", "eslint-config-etherpad": "^3.0.22", "etherpad-cli-client": "^2.0.2", "mocha": "^10.0.0", From 207b8ed723813c0fe719d20677b11f3f5113ed9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 15:10:39 +0100 Subject: [PATCH 46/54] build(deps-dev): bump selenium-webdriver from 4.15.0 to 4.16.0 in /src (#6059) Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.15.0 to 4.16.0. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.15.0...selenium-4.16.0) --- updated-dependencies: - dependency-name: selenium-webdriver dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 0eb7f4759..d81f2e852 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7272,9 +7272,9 @@ "integrity": "sha512-5qfoAgfRWS1sUn+fUJtdbbqM1BD/LoQGa+smPTDjf9OqHyuJqi6ewtbYL0+V1S1RaU6OCOCMWGZocIfz2YK4uw==" }, "selenium-webdriver": { - "version": "4.15.0", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.15.0.tgz", - "integrity": "sha512-BNG1bq+KWiBGHcJ/wULi0eKY0yaDqFIbEmtbsYJmfaEghdCkXBsx1akgOorhNwjBipOr0uwpvNXqT6/nzl+zjg==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.16.0.tgz", + "integrity": "sha512-IbqpRpfGE7JDGgXHJeWuCqT/tUqnLvZ14csSwt+S8o4nJo3RtQoE9VR4jB47tP/A8ArkYsh/THuMY6kyRP6kuA==", "dev": true, "requires": { "jszip": "^3.10.1", diff --git a/src/package.json b/src/package.json index e5a00e4b2..b0e86d2a8 100644 --- a/src/package.json +++ b/src/package.json @@ -85,7 +85,7 @@ "mocha-froth": "^0.2.10", "nodeify": "^1.0.1", "openapi-schema-validation": "^0.4.2", - "selenium-webdriver": "^4.15.0", + "selenium-webdriver": "^4.16.0", "set-cookie-parser": "^2.6.0", "sinon": "^17.0.1", "split-grid": "^1.0.11", From cbdf152238b66fc2a26c8f8e9382e6749b699bda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 17:02:22 +0100 Subject: [PATCH 47/54] build(deps-dev): bump typescript from 5.3.2 to 5.3.3 in /src (#6061) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.3.2 to 5.3.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.2...v5.3.3) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index d81f2e852..0cb57cb0f 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7996,9 +7996,9 @@ } }, "typescript": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", - "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true }, "ueberdb2": { diff --git a/src/package.json b/src/package.json index b0e86d2a8..bfba36672 100644 --- a/src/package.json +++ b/src/package.json @@ -90,7 +90,7 @@ "sinon": "^17.0.1", "split-grid": "^1.0.11", "supertest": "^6.3.3", - "typescript": "^5.3.2" + "typescript": "^5.3.3" }, "engines": { "node": ">=18.18.2", From 75eba32e821501906ee5cceca9607500d919efd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 17:30:47 +0100 Subject: [PATCH 48/54] build(deps): bump actions/stale from 8 to 9 (#6060) Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v8...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index cc87ea90c..60249bb15 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: close-issue-label: wontfix close-pr-label: wontfix From bbaa6a7e8dee3223dfed7a73397d599e3194c9a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 17:30:56 +0100 Subject: [PATCH 49/54] build(deps): bump terser from 5.25.0 to 5.26.0 in /src (#6062) Bumps [terser](https://github.com/terser/terser) from 5.25.0 to 5.26.0. - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/compare/v5.25.0...v5.26.0) --- updated-dependencies: - dependency-name: terser dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 0cb57cb0f..e6b8d0a24 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7770,9 +7770,9 @@ "dev": true }, "terser": { - "version": "5.25.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.25.0.tgz", - "integrity": "sha512-we0I9SIsfvNUMP77zC9HG+MylwYYsGFSBG8qm+13oud2Yh+O104y614FRbyjpxys16jZwot72Fpi827YvGzuqg==", + "version": "5.26.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.26.0.tgz", + "integrity": "sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==", "requires": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", diff --git a/src/package.json b/src/package.json index bfba36672..e0379b209 100644 --- a/src/package.json +++ b/src/package.json @@ -64,7 +64,7 @@ "semver": "^7.5.4", "socket.io": "^2.5.0", "superagent": "^8.1.2", - "terser": "^5.25.0", + "terser": "^5.26.0", "threads": "^1.7.0", "tinycon": "0.6.8", "ueberdb2": "^4.2.44", From 7f6b6338017734eabc40b9d697db5b24c6a8bd0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 Dec 2023 11:01:18 +0100 Subject: [PATCH 50/54] build(deps): bump marked from 11.0.0 to 11.0.1 in /src/bin/doc (#6064) Bumps [marked](https://github.com/markedjs/marked) from 11.0.0 to 11.0.1. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v11.0.0...v11.0.1) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/bin/doc/package-lock.json | 6 +++--- src/bin/doc/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/doc/package-lock.json b/src/bin/doc/package-lock.json index ae77a1775..f4bf5c4e7 100644 --- a/src/bin/doc/package-lock.json +++ b/src/bin/doc/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "marked": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-11.0.0.tgz", - "integrity": "sha512-2GsW34uXaFEGTQ/+3rCnNC6vUYTAgFuDLGl70v/aWinA5mIJtTrrFAmfbLOfVvgPyxXuDVL9He/7reCK+6j3Sw==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/marked/-/marked-11.0.1.tgz", + "integrity": "sha512-P4kDhFEMlvLePBPRwOcMOv6+lYUbhfbSxJFs3Jb4Qx7v6K7l+k8Dxh9CEGfRvK71tL+qIFz5y7Pe4uzt4+/A3A==" } } } diff --git a/src/bin/doc/package.json b/src/bin/doc/package.json index 92bb420ce..eed10e225 100644 --- a/src/bin/doc/package.json +++ b/src/bin/doc/package.json @@ -7,7 +7,7 @@ "node": ">=12.17.0" }, "dependencies": { - "marked": "^11.0.0" + "marked": "^11.0.1" }, "devDependencies": {}, "optionalDependencies": {}, From d273af9eab6ef131b4327e45b7e195a9b994e5d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:37:46 +0100 Subject: [PATCH 51/54] build(deps): bump rate-limiter-flexible from 3.0.4 to 3.0.6 in /src (#6065) Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 3.0.4 to 3.0.6. - [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases) - [Commits](https://github.com/animir/node-rate-limiter-flexible/commits/v3.0.6) --- updated-dependencies: - dependency-name: rate-limiter-flexible dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/package-lock.json | 6 +++--- src/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index e6b8d0a24..ba77ae5f6 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -7038,9 +7038,9 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "rate-limiter-flexible": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-3.0.4.tgz", - "integrity": "sha512-LFrdT9Pl/TRxG143frHBPyESXHvS2tstLfAUM6shBbJ3M6YssT2cIUWFwAWVAU9Vl4Z2gUN7ZE7tSdQh/0aqcA==" + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-3.0.6.tgz", + "integrity": "sha512-tlvbee6lyse/XTWmsuBDS4MT8N65FyM151bPmQlFyfhv9+RIHs7d3rSTXoz0j35H910dM01mH0yTIeWYo8+aAw==" }, "raw-body": { "version": "2.5.1", diff --git a/src/package.json b/src/package.json index e0379b209..565998922 100644 --- a/src/package.json +++ b/src/package.json @@ -56,7 +56,7 @@ "npm": "^6.14.18", "openapi-backend": "^5.10.5", "proxy-addr": "^2.0.7", - "rate-limiter-flexible": "^3.0.4", + "rate-limiter-flexible": "^3.0.6", "rehype": "^13.0.1", "rehype-minify-whitespace": "^6.0.0", "resolve": "1.22.8", From 165257dfef514ed764e8ae232511d6f525a76cb0 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Mon, 11 Dec 2023 20:09:45 +0100 Subject: [PATCH 52/54] Added changelog, bumped windows bundled NodeJS version. Added necessary git tag when executing the release script. --- CHANGELOG.md | 12 ++++++++++++ src/bin/buildForWindows.sh | 2 +- src/bin/release.js | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1042c4880..15a526784 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# 1.9.5 + +### Compability changes + +* This version deprecates NodeJS16 as it reached its end of life and won't receive any updates. So to get started with Etherpad v1.9.5 you need NodeJS 18 and above. +* The bundled windows NodeJS version has been bumped to the current LTS version 20. + +### Notable enhancements and fixes + +* The support for the tidy program to tidy up HTML files has been removed. This decision was made because it hasn't been updated for years and also caused an incompability when exporting a pad with Abiword. + + # 1.9.4 ### Compability changes diff --git a/src/bin/buildForWindows.sh b/src/bin/buildForWindows.sh index 6093e03b5..ef4512305 100755 --- a/src/bin/buildForWindows.sh +++ b/src/bin/buildForWindows.sh @@ -54,7 +54,7 @@ try rm -rf node_modules try mv node_modules_resolved node_modules log "download windows node..." -try wget "https://nodejs.org/dist/latest-v16.x/win-x64/node.exe" -O node.exe +try wget "https://nodejs.org/dist/latest-v20.x/win-x64/node.exe" -O node.exe log "create the zip..." try zip -9 -r "${OUTPUT}" ./* diff --git a/src/bin/release.js b/src/bin/release.js index b9c719beb..284b85ac3 100644 --- a/src/bin/release.js +++ b/src/bin/release.js @@ -160,6 +160,7 @@ try { run('git merge --no-ff --no-edit develop'); console.log(`Creating ${newVersion} tag...`); run(`git tag -s '${newVersion}' -m '${newVersion}'`); + run(`git tag -s 'v${newVersion}' -m 'v${newVersion}'`); console.log('Switching back to develop...'); run('git checkout develop'); console.log('Merging master into develop...'); From 4c663dfe732aa91d7a269af65a6fe91270116f51 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Mon, 11 Dec 2023 20:16:43 +0100 Subject: [PATCH 53/54] Also cleanup v$TAG. --- src/bin/release.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/release.js b/src/bin/release.js index 284b85ac3..d6cc3a97b 100644 --- a/src/bin/release.js +++ b/src/bin/release.js @@ -177,6 +177,8 @@ try { console.warn(`Deleting ${newVersion} tag...`); run(`git rev-parse -q --verify refs/tags/'${newVersion}' >/dev/null || exit 0; ` + `git tag -d '${newVersion}'`); + run(`git rev-parse -q --verify refs/tags/'v${newVersion}' >/dev/null || exit 0; ` + + `git tag -d 'v${newVersion}'`); throw err; } From 85c5b9167c2249a45026afe3a15258053e835336 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Mon, 11 Dec 2023 20:16:58 +0100 Subject: [PATCH 54/54] bump version --- src/package-lock.json | 2 +- src/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index ba77ae5f6..54474c1cd 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -1,6 +1,6 @@ { "name": "ep_etherpad-lite", - "version": "1.9.4", + "version": "1.9.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/package.json b/src/package.json index 565998922..34b9e5954 100644 --- a/src/package.json +++ b/src/package.json @@ -105,6 +105,6 @@ "test": "mocha --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs", "test-container": "mocha --timeout 5000 tests/container/specs/api" }, - "version": "1.9.4", + "version": "1.9.5", "license": "Apache-2.0" }