ep_webrtc 0.1.91 → 0.1.92

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

@@ -1,6 +1,3 @@
-# You need to change lines 38 and 46 in case the plugin's name on npmjs.com is different
-# from the repository name
-
 name: "Backend tests"
 
 # any branch is useful for testing before a PR is submitted
@@ -17,6 +14,10 @@ jobs:
     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
@@ -32,19 +33,29 @@ jobs:
     - name: Install all dependencies and symlink for ep_etherpad-lite
       run: src/bin/installDeps.sh
 
-    # clone this repository into node_modules/ep_plugin-name
     - name: Checkout plugin repository
       uses: actions/checkout@v2
       with:
-        path: ./node_modules/${{github.event.repository.name}}
+        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/${{github.event.repository.name}}
+        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
-
-##ETHERPAD_NPM_V=2
-## NPM configuration automatically created using src/bin/plugins/updateAllPluginsScript.sh

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

@@ -19,22 +19,42 @@ jobs:
       with:
         node-version: 12
 
-    - name: Install Etherpad core
+    - name: Check out Etherpad core
       uses: actions/checkout@v2
       with:
         repository: ether/etherpad-lite
 
-    - name: Install ${{github.event.repository.name}}
+    - name: Check out the plugin
       uses: actions/checkout@v2
       with:
-        path: ./node_modules/${{github.event.repository.name}}
+        path: ./node_modules/__tmp
 
-    - name: Install ${{github.event.repository.name}} dependencies
+    - 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: |
-        cd node_modules/${{github.event.repository.name}}
+        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 installing the plugins, otherwise npm will try to
+    # 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
@@ -44,10 +64,6 @@ jobs:
     - name: Install Etherpad core dependencies
       run: src/bin/installDeps.sh
 
-    - name: export GIT_HASH to env
-      id: environment
-      run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
-
     - name: Create settings.json
       run: cp settings.json.template settings.json
 

package/.github/workflows/npmpublish.yml

@@ -56,15 +56,22 @@ jobs:
     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/
-      - run: git config user.name 'github-actions[bot]'
-      - run: git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
-      - run: npm ci
-      - run: npm version patch
-      - run: git push --follow-tags
+      - 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
@@ -78,6 +85,3 @@ jobs:
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-
-##ETHERPAD_NPM_V=2
-## NPM configuration automatically created using src/bin/plugins/updateAllPluginsScript.sh

package/package.json

@@ -5,28 +5,28 @@
     "url": "git@github.com:ether/ep_webrtc.git",
     "type": "git"
   },
-  "version": "0.1.91",
+  "version": "0.1.92",
   "description": "WebRTC based audio/video chat to Etherpad",
   "author": "John McLear <john@mclear.co.uk>",
   "contributors": [],
   "engines": {
-    "node": ">=10.13.0"
+    "node": ">=12.13.0"
   },
   "dependencies": {},
   "funding": {
     "type": "individual",
-    "url": "http://etherpad.org/"
+    "url": "https://etherpad.org/"
   },
   "devDependencies": {
-    "eslint": "^7.22.0",
-    "eslint-config-etherpad": "^1.0.26",
-    "eslint-plugin-cypress": "^2.11.2",
+    "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": "^8.1.0",
+    "eslint-plugin-mocha": "^9.0.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-you-dont-need-lodash-underscore": "^6.11.0"
+    "eslint-plugin-promise": "^5.1.1",
+    "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0"
   },
   "eslintConfig": {
     "ignorePatterns": [