ep_author_neat2 2.0.2 → 2.0.9

package/.eslintrc.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require('eslint-config-etherpad/patch/modern-module-resolution');
+
+module.exports = {
+  root: true,
+  extends: 'etherpad/plugin',
+};

package/.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    versioning-strategy: "increase"

package/.github/workflows/codeql.yml

@@ -0,0 +1,16 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: "48 0 * * 2"
+
+
+jobs:
+  analyze:
+        uses: ether/ether-pipelines/.github/workflows/codeql-plugins.yml@main
+        secrets: inherit
+

package/.github/workflows/test-and-release.yml

@@ -0,0 +1,7 @@
+name: Node.js Package
+on: [push]
+
+jobs:
+  backend:
+    uses: ether/ether-pipelines/.github/workflows/test-and-release-plugins.yml@main
+    secrets: inherit

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "ep_author_neat2",
-  "version": "2.0.2",
+  "version": "2.0.9",
   "description": "Etherpad plugin that uses colored underlines instead of colored backgrounds to indicate authorship.",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ether/ep_author_neat2.git"
+    "url": "https://github.com/ether/ether-plugins.git"
   },
   "keywords": [
     "ep",
@@ -13,36 +13,23 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/ether/ep_author_neat2/issues"
+    "url": "https://github.com/ether/ether-plugins/issues"
   },
-  "homepage": "https://github.com/ether/ep_author_neat2#readme",
+  "homepage": "https://github.com/ether/ether-plugins/tree/main/ep_author_neat2#readme",
   "funding": {
     "type": "individual",
     "url": "https://etherpad.org/"
   },
   "devDependencies": {
-    "eslint": "^7.32.0",
-    "eslint-config-etherpad": "^2.0.2",
-    "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-mocha": "^9.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-promise": "^5.1.1",
-    "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0"
-  },
-  "peerDependencies": {
-    "ep_etherpad-lite": ">=1.8.6"
+    "eslint": "^9.24.0",
+    "eslint-config-etherpad": "^4.0.4",
+    "typescript": "^5.4.3"
   },
   "engines": {
-    "node": ">=12.13.0"
-  },
-  "eslintConfig": {
-    "root": true,
-    "extends": "etherpad/plugin"
+    "node": ">=20.0.0"
   },
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint --fix ."
   }
-}
+}

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

@@ -1,61 +0,0 @@
-name: "Backend tests"
-
-# any branch is useful for testing before a PR is submitted
-on: [push, pull_request]
-
-jobs:
-  withplugins:
-    # run on pushes to any branch
-    # run on PRs from external forks
-    if: |
-         (github.event_name != 'pull_request')
-         || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: with Plugins
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/setup-node@v2
-      with:
-        node-version: 12
-
-    - name: Install libreoffice
-      run: |
-        sudo add-apt-repository -y ppa:libreoffice/ppa
-        sudo apt update
-        sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
-
-    # clone etherpad-lite
-    - name: Install etherpad core
-      uses: actions/checkout@v2
-      with:
-        repository: ether/etherpad-lite
-
-    - name: Install all dependencies and symlink for ep_etherpad-lite
-      run: src/bin/installDeps.sh
-
-    - name: Checkout plugin repository
-      uses: actions/checkout@v2
-      with:
-        path: ./node_modules/__tmp
-
-    - name: Determine plugin name
-      id: plugin_name
-      run: |
-        cd ./node_modules/__tmp
-        npx -c 'printf %s\\n "::set-output name=plugin_name::${npm_package_name}"'
-
-    - name: Rename plugin directory
-      run: |
-        mv ./node_modules/__tmp ./node_modules/"${PLUGIN_NAME}"
-      env:
-        PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-
-    - name: Install plugin dependencies
-      run: |
-        cd ./node_modules/"${PLUGIN_NAME}"
-        npm ci
-      env:
-        PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-
-    - name: Run the backend tests
-      run: cd src && npm test

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

@@ -1,92 +0,0 @@
-# Publicly credit Sauce Labs because they generously support open source
-# projects.
-name: "frontend tests powered by Sauce Labs"
-
-on: [push]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Generate Sauce Labs strings
-      id: sauce_strings
-      run: |
-        printf %s\\n '::set-output name=name::${{github.event.repository.name}} ${{ github.workflow }} - ${{ github.job }}'
-        printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
-
-    - uses: actions/setup-node@v2
-      with:
-        node-version: 12
-
-    - name: Check out Etherpad core
-      uses: actions/checkout@v2
-      with:
-        repository: ether/etherpad-lite
-
-    - name: Check out the plugin
-      uses: actions/checkout@v2
-      with:
-        path: ./node_modules/__tmp
-
-    - name: export GIT_HASH to env
-      id: environment
-      run: |
-        cd ./node_modules/__tmp
-        echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
-
-    - name: Determine plugin name
-      id: plugin_name
-      run: |
-        cd ./node_modules/__tmp
-        npx -c 'printf %s\\n "::set-output name=plugin_name::${npm_package_name}"'
-
-    - name: Rename plugin directory
-      env:
-        PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-      run: |
-        mv ./node_modules/__tmp ./node_modules/"${PLUGIN_NAME}"
-
-    - name: Install plugin dependencies
-      env:
-        PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-      run: |
-        cd ./node_modules/"${PLUGIN_NAME}"
-        npm ci
-
-    # This must be run after setting up the plugin, otherwise npm will try to
-    # hoist common dependencies by removing them from src/node_modules and
-    # installing them in the top-level node_modules. As of v6.14.10, npm's hoist
-    # logic appears to be buggy, because it sometimes removes dependencies from
-    # src/node_modules but fails to add them to the top-level node_modules. Even
-    # if npm correctly hoists the dependencies, the hoisting seems to confuse
-    # tools such as `npm outdated`, `npm update`, and some ESLint rules.
-    - name: Install Etherpad core dependencies
-      run: src/bin/installDeps.sh
-
-    - name: Create settings.json
-      run: cp settings.json.template settings.json
-
-    - name: Disable import/export rate limiting
-      run: |
-        sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
-
-    - name: Remove standard frontend test files
-      run: rm -rf src/tests/frontend/specs
-
-    - uses: saucelabs/sauce-connect-action@v1
-      with:
-        username: ${{ secrets.SAUCE_USERNAME }}
-        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-        tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
-
-    - name: Run the frontend tests
-      shell: bash
-      env:
-        SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-        SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        SAUCE_NAME: ${{ steps.sauce_strings.outputs.name }}
-        TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
-        GIT_HASH: ${{ steps.environment.outputs.sha_short }}
-      run: |
-        src/tests/frontend/travis/runner.sh

package/.github/workflows/npmpublish.yml

@@ -1,87 +0,0 @@
-# This workflow will run tests using node and then publish a package to the npm registry when a release is created
-# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
-name: Node.js Package
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - master
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      # Clone ether/etherpad-lite to ../etherpad-lite so that ep_etherpad-lite
-      # can be "installed" in this plugin's node_modules. The checkout v2 action
-      # doesn't support cloning outside of $GITHUB_WORKSPACE (see
-      # https://github.com/actions/checkout/issues/197), so the repo is first
-      # cloned to etherpad-lite then moved to ../etherpad-lite. To avoid
-      # conflicts with this plugin's clone, etherpad-lite must be cloned and
-      # moved out before this plugin's repo is cloned to $GITHUB_WORKSPACE.
-      - uses: actions/checkout@v2
-        with:
-          repository: ether/etherpad-lite
-          path: etherpad-lite
-      - run: mv etherpad-lite ..
-      # etherpad-lite has been moved outside of $GITHUB_WORKSPACE, so it is now
-      # safe to clone this plugin's repo to $GITHUB_WORKSPACE.
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-      # All of ep_etherpad-lite's devDependencies are installed because the
-      # plugin might do `require('ep_etherpad-lite/node_modules/${devDep}')`.
-      # Eventually it would be nice to create an ESLint plugin that prohibits
-      # Etherpad plugins from piggybacking off of ep_etherpad-lite's
-      # devDependencies. If we had that, we could change this line to only
-      # install production dependencies.
-      - run: cd ../etherpad-lite/src && npm ci
-      - run: npm ci
-      # This runs some sanity checks and creates a symlink at
-      # node_modules/ep_etherpad-lite that points to ../../etherpad-lite/src.
-      # This step must be done after `npm ci` installs the plugin's dependencies
-      # because npm "helpfully" cleans up such symlinks. :( Installing
-      # ep_etherpad-lite in the plugin's node_modules prevents lint errors and
-      # unit test failures if the plugin does `require('ep_etherpad-lite/foo')`.
-      - run: npm install --no-save ep_etherpad-lite@file:../etherpad-lite/src
-      - run: npm test
-      - run: npm run lint
-
-  publish-npm:
-    if: github.event_name == 'push'
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-          registry-url: https://registry.npmjs.org/
-      - name: Bump version (patch)
-        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
-          git config user.name 'github-actions[bot]'
-          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
-          npm ci
-          npm version patch
-          git push --follow-tags
-      # `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
-      # updated with the commits from the second PR before the first PR's
-      # workflow has a chance to push the commit generated by `npm version
-      # patch`. This causes the first PR's `git push` step to fail after the
-      # package has already been published, which in turn will cause all future
-      # workflow runs to fail because they will all attempt to use the same
-      # already-used version number. By running `npm publish` after `git push`,
-      # back-to-back merges will cause the first merge's workflow to fail but
-      # the second's will succeed.
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}