ep_markdown 11.0.19 → 12.0.1

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

@@ -33,7 +33,7 @@ jobs:
       - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
-          version: 10
+          package_json_file: ./etherpad-lite/package.json
           run_install: false
       - name: Get pnpm store directory
         shell: bash

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

@@ -23,7 +23,7 @@ jobs:
       - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
-          version: 10
+          package_json_file: ./etherpad-lite/package.json
           run_install: false
       - name: Get pnpm store directory
         shell: bash

package/.github/workflows/npmpublish.yml

@@ -34,7 +34,6 @@ jobs:
       - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
-          version: 10
           run_install: false
       - name: Get pnpm store directory
         shell: bash
@@ -53,10 +52,21 @@ jobs:
           fetch-depth: 0
       -
         name: Bump version (patch)
+        id: bump
         run: |
           LATEST_TAG=$(git describe --tags --abbrev=0) || exit 1
           NEW_COMMITS=$(git rev-list --count "${LATEST_TAG}"..) || exit 1
-          [ "${NEW_COMMITS}" -gt 0 ] || exit 0
+          # No new commits since the last tag → nothing to publish.
+          # Setting `bumped=false` lets the publish step below skip
+          # itself instead of trying to republish the existing version
+          # (which fails with "cannot publish over previously published
+          # versions"). Only manual `gh workflow run` invocations on a
+          # tag-current branch hit this path; on:push always sees ≥1
+          # new commit because the push event is what triggered us.
+          if [ "${NEW_COMMITS}" -le 0 ]; then
+            echo "bumped=false" >> "${GITHUB_OUTPUT}"
+            exit 0
+          fi
           git config user.name 'github-actions[bot]'
           git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
           pnpm i --frozen-lockfile
@@ -84,9 +94,11 @@ jobs:
           # rejects the tag push too, and the next workflow tick can retry
           # cleanly against the up-to-date refs.
           git push --atomic origin "${GITHUB_REF_NAME}" "${NEW_TAG}"
+          echo "bumped=true" >> "${GITHUB_OUTPUT}"
       # This is required if the package has a prepare script that uses something
       # in dependencies or devDependencies.
       -
+        if: steps.bump.outputs.bumped == 'true'
         run: pnpm i
       # `npm publish` must come after `git push` otherwise there is a race
       # condition: If two PRs are merged back-to-back then master/main will be
@@ -104,4 +116,5 @@ jobs:
       # whichever `npm` is on PATH; calling `npm` directly avoids any shim
       # ambiguity.
       - name: Publish to npm via OIDC
+        if: steps.bump.outputs.bumped == 'true'
         run: npm publish --provenance --access public

package/CONTRIBUTING.md

@@ -1,2 +1,74 @@
-# Auto publishing
-To publish a new version of this plugin to NPM just bump the version number in package.json and travis will auto publish for you.
+# Contributing to ep_markdown
+
+Thanks for helping improve `ep_markdown` — a plugin for [Etherpad](https://etherpad.org/). LLM/Agent contributions are explicitly welcome, provided they follow the rules below.
+
+For shared rules that apply to all Etherpad code (linear commits, deprecation policy, feature flags, stability guarantees), please read [ether/etherpad's CONTRIBUTING.md](https://github.com/ether/etherpad/blob/develop/CONTRIBUTING.md). This document only covers what's specific to plugin work.
+
+## Plugin-specific rules
+
+* **Target branch:** PRs go to `main` on this repo. Plugin repos do not use git-flow's `develop` branch.
+* **Linear commits, no merge commits.** Rebase if needed.
+* **Every bug fix must include a regression test in the same commit.**
+* **Internationalization (i18n):** every user-facing string lives in `locales/<lang>.json` and is referenced via `data-l10n-id` in templates or `html10n.get(key)` in code. No hardcoded English in markup.
+* **Accessibility (a11y):** no nested interactive elements (no `<button>` inside `<a>`); every interactive control has an accessible name; keyboard focus order matches visual order. Note that on icon-only controls you should rely on Etherpad's html10n to populate `aria-label` from the `data-l10n-id` translation — adding a hardcoded English `aria-label` blocks that and leaves the control untranslated.
+
+## Local development
+
+`ep_markdown` is a plugin, so you develop it inside a checkout of [ether/etherpad](https://github.com/ether/etherpad).
+
+```bash
+# Once: clone etherpad alongside this repo
+git clone https://github.com/ether/etherpad.git
+cd etherpad
+pnpm install
+
+# Install ep_markdown from your local clone
+pnpm run plugins i --path ../ep_markdown
+
+# Start the dev server (port 9001)
+pnpm --filter ep_etherpad-lite run dev
+```
+
+Edits in `../ep_markdown/` are picked up after a server restart.
+
+## Tests
+
+Tests live inside this repo and are executed by Etherpad's test harness:
+
+* Backend (Mocha): `static/tests/backend/specs/`
+* Playwright (frontend E2E): `static/tests/frontend-new/specs/`
+
+Run them from the etherpad checkout:
+
+```bash
+# Backend (no separate server needed, harness boots one)
+pnpm --filter ep_etherpad-lite run test
+
+# Playwright (requires `pnpm run dev` in another terminal)
+pnpm --filter ep_etherpad-lite run test-ui
+```
+
+Lint locally before pushing:
+
+```bash
+pnpm run lint
+```
+
+## Coding style
+
+* JS/CSS/HTML: 2 spaces, no tabs.
+* `pnpm run lint` must pass (configured via `eslint-config-etherpad`).
+* Avoid breaking changes to public hooks, the line-attribute storage shape, or HTML export output. The backend export spec enforces a stable shape.
+
+## Bug reports
+
+Please include:
+
+* Etherpad version, ep_markdown version, browser + OS
+* Steps to reproduce
+* What you expected, what actually happened
+* Server log excerpt (set `"loglevel": "DEBUG"` in `settings.json` for verbose output)
+
+## AI agents
+
+If you are an LLM/agent contributor, also read [`AGENTS.md`](AGENTS.md) — it documents the file layout, helper usage, and standing rules for autonomous edits.

package/ep.json

@@ -4,13 +4,17 @@
       "name": "markdown",
       "hooks":{
         "expressCreateServer": "ep_markdown/express",
+        "loadSettings": "ep_markdown/index",
+        "clientVars": "ep_markdown/index",
         "eejsBlock_exportColumn": "ep_markdown/index",
         "eejsBlock_mySettings": "ep_markdown/index",
+        "eejsBlock_padSettings": "ep_markdown/index",
         "import": "ep_markdown/index"
       },
       "client_hooks": {
         "aceEditorCSS": "ep_markdown/static/js/markdown",
-        "postAceInit": "ep_markdown/static/js/markdown"
+        "postAceInit": "ep_markdown/static/js/markdown",
+        "handleClientMessage_CLIENT_MESSAGE": "ep_markdown/static/js/markdown:handleClientMessage_CLIENT_MESSAGE"
       }
     }
   ]

package/index.ts

@@ -1,10 +1,25 @@
 'use strict';
 
 const eejs = require('ep_etherpad-lite/node/eejs');
-import settings from 'ep_etherpad-lite/node/utils/Settings';
+const {padToggle} = require('ep_plugin_helpers/pad-toggle-server');
 import {promises} from 'fs';
 const fsp = promises
 
+// Parallel User Settings + Pad Wide Settings checkboxes for "Show Markdown".
+// Helper owns storage, broadcast, enforce, and i18n wiring.
+const markdownToggle = padToggle({
+  pluginName: 'ep_markdown',
+  settingId: 'markdown',
+  l10nId: 'ep_markdown.showMarkdown',
+  defaultLabel: 'Show Markdown',
+  defaultEnabled: false,
+});
+
+exports.loadSettings = markdownToggle.loadSettings;
+exports.clientVars = markdownToggle.clientVars;
+exports.eejsBlock_mySettings = markdownToggle.eejsBlock_mySettings;
+exports.eejsBlock_padSettings = markdownToggle.eejsBlock_padSettings;
+
 exports.eejsBlock_exportColumn = (hookName, context) => {
   context.content += eejs.require('./templates/exportcolumn.html', {}, module);
 };
@@ -13,17 +28,6 @@ exports.eejsBlock_styles = (hookName, context) => {
   context.content += eejs.require('./templates/styles.html', {}, module);
 };
 
-exports.eejsBlock_mySettings = (hookName, context) => {
-  let checkedState = 'unchecked';
-  if (!settings.ep_markdown_default) {
-    checkedState = 'unchecked';
-  } else if (settings.ep_markdown_default === true) {
-    checkedState = 'checked';
-  }
-  context.content +=
-      eejs.require('./templates/markdown_entry.ejs', {checked: checkedState}, module);
-};
-
 exports.import = async (hookName, {destFile, fileEnding, srcFile}) => {
   if (fileEnding !== '.md') return;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ep_markdown",
   "description": "Edit and Export as Markdown in Etherpad",
-  "version": "11.0.19",
+  "version": "12.0.1",
   "author": {
     "name": "John McLear",
     "email": "john@mclear.co.uk",
@@ -12,6 +12,7 @@
     "url": "https://github.com/ether/ep_markdown.git"
   },
   "dependencies": {
+    "ep_plugin_helpers": "^0.3.2",
     "showdown": "^2.1.0"
   },
   "contributors": [],
@@ -22,7 +23,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "@types/node": "^25.6.0",
+    "@types/node": "^25.6.2",
     "eslint": "^8.57.1",
     "eslint-config-etherpad": "^4.0.5",
     "typescript": "^6.0.3"

package/static/js/markdown.js

@@ -1,5 +1,26 @@
 'use strict';
 
+// Sub-path import keeps the client bundle clean. Importing the top-level
+// `ep_plugin_helpers` index pulls in every helper's getters; `settings` and
+// `toggle` reach server-only modules (eejs, Settings) which esbuild can't
+// resolve for the browser.
+const {padToggle} = require('ep_plugin_helpers/pad-toggle');
+
+// Same config as the server-side instance — must agree on pluginName,
+// settingId, l10nId, and defaultLabel for the checkbox ids and clientVars
+// lookup to line up.
+const markdownToggle = padToggle({
+  pluginName: 'ep_markdown',
+  settingId: 'markdown',
+  l10nId: 'ep_markdown.showMarkdown',
+  defaultLabel: 'Show Markdown',
+  defaultEnabled: false,
+});
+
+// Re-export so the helper sees pad-wide broadcasts and refreshes our state
+// when another user toggles the pad-wide checkbox.
+exports.handleClientMessage_CLIENT_MESSAGE = markdownToggle.handleClientMessage_CLIENT_MESSAGE;
+
 exports.postAceInit = (hookName, context) => {
   const padRootPath = new RegExp(/.*\/p\/[^/]+/)
       .exec(document.location.pathname) || clientVars.padId;
@@ -20,19 +41,8 @@ exports.postAceInit = (hookName, context) => {
     $('#strikethrough').removeAttr('style');
   };
 
-  /* init */
-  if ($('#options-markdown').is(':checked')) {
-    enable();
-  } else {
-    disable();
-  }
-  /* on click */
-  $('#options-markdown').on('click', () => {
-    if ($('#options-markdown').is(':checked')) {
-      enable();
-    } else {
-      disable();
-    }
+  markdownToggle.init({
+    onChange: (enabled) => { enabled ? enable() : disable(); },
   });
 };
 

package/templates/markdown_entry.ejs

@@ -1,4 +0,0 @@
-<p>
-  <input type="checkbox" id="options-markdown" <%= checked %>></input> 
-  <label for="options-markdown" data-l10n-id="ep_markdown.showMarkdown">Show markdown</label>
-</p>