ep_font_family 0.5.76 → 0.5.78

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

@@ -26,7 +26,7 @@ jobs:
         with:
           repository: ether/etherpad-lite
           path: etherpad-lite
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
           version: 10

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

@@ -15,7 +15,7 @@ jobs:
         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

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

@@ -1,4 +1,4 @@
-![Publish Status](https://github.com/ether/ep_font_family/workflows/Node.js%20Package/badge.svg) [![Backend Tests Status](https://github.com/ether/ep_font_family/actions/workflows/test-and-release.yml/badge.svg)](https://github.com/ether/ep_font_family/actions/workflows/test-and-release.yml)
+![Demo](demo.gif) [![Backend Tests Status](https://github.com/ether/ep_font_family/actions/workflows/test-and-release.yml/badge.svg)](https://github.com/ether/ep_font_family/actions/workflows/test-and-release.yml)
 
 [![Travis (.org)](https://api.travis-ci.org/JohnMcLear/ep_font_family.git.svg?branch=develop)](https://travis-ci.org/github/JohnMcLear/ep_font_family.git)
 

package/index.js

@@ -3,8 +3,10 @@
 const fonts = require('./fonts');
 const {template} = require('ep_plugin_helpers');
 
-exports.eejsBlock_editbarMenuLeft = template('ep_font_family/templates/editbarButtons.ejs');
-exports.eejsBlock_dd_format = template('ep_font_family/templates/fileMenu.ejs');
+exports.eejsBlock_editbarMenuLeft = template(
+    'ep_font_family/templates/editbarButtons.ejs', {vars: () => ({fonts})});
+exports.eejsBlock_dd_format = template(
+    'ep_font_family/templates/fileMenu.ejs', {vars: () => ({fonts})});
 
 // Server-side aceAttribClasses — maps font names to tag: prefix.
 // This must match the client-side mapping exactly.

package/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Add support for different Fonts",
   "name": "ep_font_family",
-  "version": "0.5.76",
+  "version": "0.5.78",
   "license": "Apache-2.0",
   "author": {
     "name": "John McLear",
@@ -23,8 +23,8 @@
   },
   "devDependencies": {
     "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 .",

package/static/js/index.js

@@ -10,14 +10,12 @@ exports.aceRegisterBlockElements = fontFamily.aceRegisterBlockElements;
 exports.aceAttribClasses = fontFamily.aceAttribClasses;
 
 exports.postAceInit = (hook, context) => {
+  // Font options are rendered server-side by the editbarButtons.ejs and
+  // fileMenu.ejs templates (from ./fonts.js). Previously this hook
+  // appended them after Etherpad had already wrapped the <select> in
+  // niceSelect, so the File menu dropdown showed only the placeholder
+  // (#28). We just bind the change handler here.
   const select = $('select.family-selection');
-  for (const font of fonts) {
-    const name = font.substring(4);
-    let label = name.charAt(0).toUpperCase() + name.slice(1);
-    label = label.split('-').join(' ');
-    select.append($('<option>').attr('value', font).text(label));
-  }
-  select.niceSelect('update');
   select.on('change', function () {
     const value = $(this).val();
     context.ace.callWithAce((ace) => {

package/static/tests/backend/specs/filemenu_options.js

@@ -0,0 +1,32 @@
+'use strict';
+
+const assert = require('assert').strict;
+const fs = require('fs');
+const path = require('path');
+const ejs = require('ep_etherpad-lite/node_modules/ejs');
+const fonts = require('../../../..' + '/fonts');
+
+const fileMenuTmpl = path.resolve(
+    __dirname, '..', '..', '..', '..', 'templates', 'fileMenu.ejs');
+const editbarTmpl = path.resolve(
+    __dirname, '..', '..', '..', '..', 'templates', 'editbarButtons.ejs');
+
+const render = (p) => ejs.render(fs.readFileSync(p, 'utf8'), {fonts});
+
+describe(__filename, function () {
+  it('fileMenu.ejs renders an <option> per font (#28)', function () {
+    const html = render(fileMenuTmpl);
+    for (const font of fonts) {
+      assert(html.includes(`value="${font}"`),
+          `file menu template should render an option for font ${font}; got:\n${html}`);
+    }
+  });
+
+  it('editbarButtons.ejs renders an <option> per font (#28)', function () {
+    const html = render(editbarTmpl);
+    for (const font of fonts) {
+      assert(html.includes(`value="${font}"`),
+          `editbar template should render an option for font ${font}; got:\n${html}`);
+    }
+  });
+});

package/templates/editbarButtons.ejs

@@ -6,5 +6,10 @@
             data-l10n-id="ep_font_family.font"
             data-l10n-attr="aria-label">
         <option value="dummy" selected data-l10n-id="ep_font_family.family">Font</option>
+<% fonts.forEach((font) => {
+     const name = font.substring(4);
+     const label = (name.charAt(0).toUpperCase() + name.slice(1)).split('-').join(' '); %>
+        <option value="<%= font %>"><%= label %></option>
+<% }); %>
     </select>
 </li>

package/templates/fileMenu.ejs

@@ -2,6 +2,11 @@
   <ul class="submenu">
     <select class="family-selection">
       <option value="dummy" selected data-l10n-id="ep_font_family.family">family</option>
+<% fonts.forEach((font) => {
+     const name = font.substring(4);
+     const label = (name.charAt(0).toUpperCase() + name.slice(1)).split('-').join(' '); %>
+      <option value="<%= font %>"><%= label %></option>
+<% }); %>
     </select>
   </ul>
 </li>