Merge branch 'develop'

Author: SamTV12345

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

@@ -49,6 +49,13 @@ jobs:
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
+      - name: Cache playwright binaries
+        uses: actions/cache@v3
+        id: playwright-cache
+        with:
+          path: |
+            ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
       - name: Only install direct dependencies
         run: pnpm config set auto-install-peers false
       #-

.github/workflows/frontend-tests.yml

@@ -56,6 +56,13 @@ jobs:
       -
         name: Create settings.json
         run: cp ./src/tests/settings.json settings.json
+      - name: Cache playwright binaries
+        uses: actions/cache@v3
+        id: playwright-cache
+        with:
+          path: |
+            ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
       - name: Run the frontend tests
         shell: bash
         run: |
@@ -119,6 +126,13 @@ jobs:
         run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
       - name: Create settings.json
         run: cp ./src/tests/settings.json settings.json
+      - name: Cache playwright binaries
+        uses: actions/cache@v3
+        id: playwright-cache
+        with:
+          path: |
+            ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
       - name: Run the frontend tests
         shell: bash
         run: |
@@ -160,6 +174,13 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 22
+      - name: Cache playwright binaries
+        uses: actions/cache@v3
+        id: playwright-cache
+        with:
+          path: |
+            ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:

.github/workflows/windows.yml

@@ -60,10 +60,11 @@ jobs:
       -
         name: Run the backend tests
         shell: msys2 {0}
-        run: cd src && pnpm test
+        working-directory: src
+        run: pnpm test
       -
         name: Run Etherpad
-        working-directory: etherpad/src
+        working-directory: src
         run: |
           pnpm i
           pnpm exec playwright install --with-deps
@@ -72,16 +73,10 @@ jobs:
           pnpm exec playwright install chromium  --with-deps
           pnpm run test-ui --project=chromium
       # On release, create release
-      -
-        name: Rename to etherpad-lite-win.zip
-        shell: powershell
-        run: mv etherpad-win.zip etherpad-lite-win.zip
       - name: Generate Changelog
         if: ${{startsWith(github.ref, 'refs/tags/v') }}
         working-directory: bin
         run: pnpm run generateChangelog ${{ github.ref }} > ${{ github.workspace }}-CHANGELOG.txt
-        with:
-          tag: ${{ github.ref }}
       - name: Release
         uses: softprops/action-gh-release@v2
         if: ${{startsWith(github.ref, 'refs/tags/v') }}

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 2.2.0
+# 2.2.1
 
 ### Notable enhancements and fixes
 

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "2.2.0",
+  "version": "2.2.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

bin/generateReleaseNotes.ts

@@ -14,8 +14,6 @@ if (!tagVar) {
   process.exit(1)
 }
 
-console.log("Tag",tagVar)
-
 tagVar = tagVar.replace("refs/tags/v", "")
 
 let startNum = -1
@@ -38,4 +36,4 @@ for (const line of changelogLines) {
 }
 
 let currentReleaseNotes = changelogLines.slice(startNum, endline).join('\n')
-console.log("Generated changelog",currentReleaseNotes)
+console.log(currentReleaseNotes)

bin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bin",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "",
   "main": "checkAllPads.js",
   "directories": {

package.json

@@ -49,6 +49,6 @@
     "type": "git",
     "url": "https://github.com/ether/etherpad-lite.git"
   },
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "Apache-2.0"
 }

src/node/hooks/express/specialpages.ts

@@ -107,7 +107,7 @@ const convertTypescript = (content: string) => {
 
   return  {
     output,
-    hash: outputRaw.outputFiles[0].hash.replaceAll('/','2')
+    hash: outputRaw.outputFiles[0].hash.replaceAll('/','2').replaceAll("+",'5').replaceAll("^","7")
   }
 }
 
@@ -238,7 +238,7 @@ const convertTypescriptWatched = (content: string, cb: (output:string, hash: str
   }).then((outputRaw) => {
     cb(
       outputRaw.outputFiles[0].text,
-      outputRaw.outputFiles[0].hash.replaceAll('/','2')
+      outputRaw.outputFiles[0].hash.replaceAll('/','2').replaceAll("+",'5').replaceAll("^","7")
     )
   })
 }

src/package.json

@@ -134,6 +134,6 @@
     "test-admin:ui": "cross-env NODE_ENV=production npx playwright test tests/frontend-new/admin-spec --ui --workers 1",
     "debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts"
   },
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "Apache-2.0"
 }