Merge branch 'develop'

Author: SamTV12345

.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

.github/workflows/frontend-admin-tests.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [19, 20]
+        node: [19, 20, 21]
 
     steps:
       -
@@ -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/[email protected].5
+        uses: saucelabs/[email protected].6
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

.github/workflows/frontend-tests.yml

@@ -45,7 +45,7 @@ jobs:
         run: |
           sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 100000000/' -i settings.json
       -
-        uses: saucelabs/[email protected].5
+        uses: saucelabs/[email protected].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/[email protected].5
+        uses: saucelabs/[email protected].6
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

.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

.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

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

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`

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

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

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}" ./*