ep_markdown 11.0.13 → 11.0.15

package/.github/workflows/backend-tests.yml

@@ -22,11 +22,11 @@ jobs:
           version: 1.0
       -
         name: Install etherpad core
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: ether/etherpad-lite
           path: etherpad-lite
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
           version: 10
@@ -35,7 +35,7 @@ jobs:
         shell: bash
         run: |
           echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         name: Setup pnpm cache
         with:
           path: ${{ env.STORE_PATH }}
@@ -44,7 +44,7 @@ jobs:
             ${{ runner.os }}-pnpm-store-
       -
         name: Checkout plugin repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: plugin
       - name: Remove tests

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

@@ -12,10 +12,10 @@ jobs:
     steps:
       -
         name: Check out Etherpad core
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: ether/etherpad-lite
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
           version: 10
@@ -24,7 +24,7 @@ jobs:
         shell: bash
         run: |
           echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         name: Setup pnpm cache
         with:
           path: ${{ env.STORE_PATH }}
@@ -33,7 +33,7 @@ jobs:
             ${{ runner.os }}-pnpm-store-
       -
         name: Check out the plugin
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: ./node_modules/__tmp
       -

package/.github/workflows/npmpublish.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           repository: ether/etherpad-lite
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
           version: 10
@@ -59,12 +59,20 @@ jobs:
           [ "${NEW_COMMITS}" -gt 0 ] || exit 0
           git config user.name 'github-actions[bot]'
           git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
-          pnpm i
+          pnpm i --frozen-lockfile
           # `pnpm version patch` bumps package.json, makes a commit, and creates
           # a `v<new-version>` tag. Capture the new tag name from package.json
           # rather than parsing pnpm's output, which has historically varied.
-          pnpm version patch
-          NEW_TAG="v$(node -p "require('./package.json').version")"
+          # Bump the patch component directly with Node. pnpm/action-setup@v6
+          # sometimes installs pnpm 11 pre-releases even when version: 10.x is
+          # requested (pnpm/action-setup#225); those pre-releases either skip
+          # the git commit/tag or reject --no-git-tag-version as unknown.
+          # Doing the bump in Node sidesteps both failure modes.
+          NEW_VERSION=$(node -e "const fs=require('fs');const p=require('./package.json');const v=p.version.split('.');v[2]=String(Number(v[2])+1);p.version=v.join('.');fs.writeFileSync('./package.json',JSON.stringify(p,null,2)+'\n');console.log(p.version);")
+          NEW_TAG="v${NEW_VERSION}"
+          git add package.json
+          git commit -m "${NEW_TAG}"
+          git tag -a "${NEW_TAG}" -m "${NEW_TAG}"
           # CRITICAL: use --atomic so the branch update and the tag update
           # succeed (or fail) as a single transaction on the server. The old
           # `git push --follow-tags` was non-atomic per ref: if a concurrent

package/README.md

@@ -40,3 +40,20 @@ Requirements
 ============
 
 Etherpad 1.8.1
+
+## Installation
+
+Install from the Etherpad admin UI (**Admin → Manage Plugins**,
+search for `ep_markdown` and click *Install*), or from the Etherpad
+root directory:
+
+```sh
+pnpm run plugins install ep_markdown
+```
+
+> ⚠️ Don't run `npm i` / `npm install` yourself from the Etherpad
+> source tree — Etherpad tracks installed plugins through its own
+> plugin-manager, and hand-editing `package.json` can leave the
+> server unable to start.
+
+After installing, restart Etherpad.

package/exportMarkdown.ts

@@ -218,9 +218,27 @@ const getMarkdownFromAtext = (pad, atext) => {
         const url = urlData[1];
         const urlLength = url.length;
         processNextChars(startIndex - idx);
+        // Close any currently-open inline format tags (bold, italic, etc.)
+        // before writing the URL. If we don't, processing the URL's chars
+        // re-emits `**` / `*` markers *inside* the Markdown link token,
+        // producing broken output like `[url](**https://example.com**)`
+        // (regression for #156).
+        const reopen = [...openTags];
+        const tags2close = [...openTags];
+        orderdCloseTags(tags2close);
+        for (let i = 0; i < propVals.length; i++) { propVals[i] = false; }
         assem.append(`[${url}](`);
-        processNextChars(urlLength);
+        // Emit the URL's chars as raw text — links in Markdown never
+        // contain inline formatting markers.
+        assem.append(taker.take(urlLength));
+        idx += urlLength;
         assem.append(')');
+        // Restore the formatting tags so any trailing same-line text picks
+        // them back up.
+        for (const i of reopen.slice().reverse()) {
+          emitOpenTag(i);
+          propVals[i] = true;
+        }
       });
     }
 
@@ -229,8 +247,15 @@ const getMarkdownFromAtext = (pad, atext) => {
     // replace &, _
     assem = assem.toString();
     assem = assem.replace(/&/g, '\\&');
-    // this breaks Markdown math mode: $\sum_i^j$ becomes $\sum\_i^j$
-    assem = assem.replace(/_/g, '\\_');
+    // Only escape underscores OUTSIDE code spans / code blocks. On a line
+    // with the `heading: 'code'` attribute (rendered with the 4-space
+    // block-code prefix) underscores should be preserved verbatim,
+    // otherwise `myVar_name` comes out as `myVar\_name` in the exported
+    // Markdown rendering (regression for #156). Math-mode ($...$) still
+    // has no special handling here — that is a separate concern.
+    if (heading !== headingtags[6]) {
+      assem = assem.replace(/_/g, '\\_');
+    }
 
     return assem;
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ep_markdown",
   "description": "Edit and Export as Markdown in Etherpad",
-  "version": "11.0.13",
+  "version": "11.0.15",
   "author": {
     "name": "John McLear",
     "email": "john@mclear.co.uk",
@@ -24,8 +24,8 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^25.6.0",
     "eslint": "^8.57.1",
-    "eslint-config-etherpad": "^4.0.4",
-    "typescript": "^6.0.2"
+    "eslint-config-etherpad": "^4.0.5",
+    "typescript": "^6.0.3"
   },
   "scripts": {
     "lint": "eslint .",