Updating npm

.github/workflows/backend-tests.yml

@@ -38,7 +38,7 @@ jobs:
           sudo apt update
           sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
       -
-        name: Install all dependencies and symlink for ep_etherpad-lite
+        name: Install the ep_etherpad-lite package from ./src
         run: src/bin/installDeps.sh
       -
         name: Run the backend tests
@@ -74,12 +74,13 @@ jobs:
           sudo add-apt-repository -y ppa:libreoffice/ppa
           sudo apt update
           sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
+      -
+        name: Install the ep_etherpad-lite package from ./src
+        run: src/bin/installDeps.sh
       -
         name: Install Etherpad plugins
-        # The --legacy-peer-deps flag is required to work around a bug in npm v7:
-        # https://github.com/npm/cli/issues/2199
         run: >
-          npm install --no-save --legacy-peer-deps
+          npm install
           ep_align
           ep_author_hover
           ep_cursortrace
@@ -93,18 +94,6 @@ jobs:
           ep_spellcheck
           ep_subscript_and_superscript
           ep_table_of_contents
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, 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 all dependencies and symlink for ep_etherpad-lite
-        run: src/bin/installDeps.sh
       -
         name: Run the backend tests
         run: cd src && npm test
@@ -129,17 +118,22 @@ jobs:
           cache-dependency-path: |
             src/package-lock.json
             src/bin/doc/package-lock.json
+      - name: Install dependencies
+        run: cd src && npm i --legacy-peer-deps
       -
-        name: Install all dependencies and symlink for ep_etherpad-lite
-        run: src/bin/installOnWindows.bat
+        name: Install the ep_etherpad-lite package from ./src
+        run: cd src && ./bin/installOnWindows.bat
+          #      -
+          #        name: Run npm i once to make bin files available - why is this needed at all?
+          #        run: npm i
       -
         name:  Fix up the settings.json
         run: |
           powershell -Command "(gc settings.json.template) -replace '\"max\": 10', '\"max\": 10000' | Out-File -encoding ASCII settings.json.holder"
           powershell -Command "(gc settings.json.holder) -replace '\"points\": 10', '\"points\": 1000' | Out-File -encoding ASCII settings.json"
       -
         name: Run the backend tests
-        run: cd src && npm test
+        run: cd src && npm run test-on-windows
 
   withpluginsWindows:
     # run on pushes to any branch
@@ -162,12 +156,16 @@ jobs:
           cache-dependency-path: |
             src/package-lock.json
             src/bin/doc/package-lock.json
+      -
+        name: Install the ep_etherpad-lite package from ./src
+        run: src/bin/installOnWindows.bat
+          #      -
+          #        name: Run npm i once to make bin files available - why is this needed at all?
+          #        run: npm i
       -
         name: Install Etherpad plugins
-        # The --legacy-peer-deps flag is required to work around a bug in npm
-        # v7: https://github.com/npm/cli/issues/2199
         run: >
-          npm install --no-save --legacy-peer-deps
+          npm install
           ep_align
           ep_author_hover
           ep_cursortrace
@@ -181,23 +179,11 @@ jobs:
           ep_spellcheck
           ep_subscript_and_superscript
           ep_table_of_contents
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, 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 all dependencies and symlink for ep_etherpad-lite
-        run: src/bin/installOnWindows.bat
       -
         name:  Fix up the settings.json
         run: |
           powershell -Command "(gc settings.json.template) -replace '\"max\": 10', '\"max\": 10000' | Out-File -encoding ASCII settings.json.holder"
           powershell -Command "(gc settings.json.holder) -replace '\"points\": 10', '\"points\": 1000' | Out-File -encoding ASCII settings.json"
       -
         name: Run the backend tests
-        run: cd src && npm test
+        run: cd src && npm run test-on-windows

.github/workflows/docker.yml

@@ -46,7 +46,7 @@ jobs:
       -
         name: Test
         run: |
-          docker run --rm -d -p 9001:9001 --name test ${{ env.TEST_TAG }}
+          docker run -e NODE_ENV=development  --rm -d -p 9001:9001 --name test ${{ env.TEST_TAG }}
           docker logs -f test &
           ./src/bin/installDeps.sh
           while true; do
@@ -58,7 +58,7 @@ jobs:
               *) printf %s\\n "unexpected status: ${status}" >&2; exit 1;;
             esac
           done
-          (cd src && npm run test-container)
+          (npm run test-container)
           git clean -dxf .
       -
         name: Docker meta

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

@@ -37,23 +37,11 @@ jobs:
             src/package-lock.json
             src/bin/doc/package-lock.json
       -
-        name: Install etherpad plugins
-        # We intentionally install an old ep_align version to test upgrades to
-        # the minor version number. The --legacy-peer-deps flag is required to
-        # work around a bug in npm v7: https://github.com/npm/cli/issues/2199
-        run: npm install --no-save --legacy-peer-deps ep_align@0.2.27
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, 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 all dependencies and symlink for ep_etherpad-lite
+        name: Install the ep_etherpad-lite package from ./src
         run: src/bin/installDeps.sh
+      -
+        name: Install etherpad plugins
+        run: npm install ep_align@0.2.27
       -
         name: Install etherpad plugins
         run: rm -Rf node_modules/ep_align/static/tests/*

.github/workflows/frontend-tests.yml

@@ -31,7 +31,7 @@ jobs:
             src/package-lock.json
             src/bin/doc/package-lock.json
       -
-        name: Install all dependencies and symlink for ep_etherpad-lite
+        name: Install the ep_etherpad-lite package from ./src
         run: src/bin/installDeps.sh
       -
         name: export GIT_HASH to env
@@ -85,12 +85,13 @@ jobs:
           cache-dependency-path: |
             src/package-lock.json
             src/bin/doc/package-lock.json
+      -
+        name: Install the ep_etherpad-lite package from ./src
+        run: src/bin/installDeps.sh
       -
         name: Install Etherpad plugins
-        # The --legacy-peer-deps flag is required to work around a bug in npm v7:
-        # https://github.com/npm/cli/issues/2199
         run: >
-          npm install --no-save --legacy-peer-deps
+          npm install
           ep_align
           ep_author_hover
           ep_cursortrace
@@ -105,18 +106,6 @@ jobs:
           ep_spellcheck
           ep_subscript_and_superscript
           ep_table_of_contents
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, 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.20.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 all dependencies and symlink for ep_etherpad-lite
-        run: src/bin/installDeps.sh
       -
         name: export GIT_HASH to env
         id: environment

.github/workflows/lint-package-lock.yml

@@ -38,4 +38,6 @@ jobs:
           --allowed-hosts npm
           --allowed-schemes https:
           --allowed-schemes github:
-          --allowed-urls github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a
+          --allowed-schemes git+ssh:
+          --allowed-schemes file:
+          --allowed-urls git+ssh://git@github.com/mapbox/node-sqlite3.git#593c9d498be2510d286349134537e3bf89401c4a

.github/workflows/load-test.yml

@@ -28,7 +28,7 @@ jobs:
             src/package-lock.json
             src/bin/doc/package-lock.json
       -
-        name: Install all dependencies and symlink for ep_etherpad-lite
+        name: Install the ep_etherpad-lite package from ./src
         run: src/bin/installDeps.sh
       -
         name: Install etherpad-load-test
@@ -57,15 +57,16 @@ jobs:
           cache-dependency-path: |
             src/package-lock.json
             src/bin/doc/package-lock.json
+      -
+        name: Install the ep_etherpad-lite package from ./src
+        run: src/bin/installDeps.sh
       -
         name: Install etherpad-load-test
         run: sudo npm install -g etherpad-load-test
       -
         name: Install etherpad plugins
-        # The --legacy-peer-deps flag is required to work around a bug in npm v7:
-        # https://github.com/npm/cli/issues/2199
         run: >
-          npm install --no-save --legacy-peer-deps
+          npm install
           ep_align
           ep_author_hover
           ep_cursortrace
@@ -78,18 +79,6 @@ jobs:
           ep_spellcheck
           ep_subscript_and_superscript
           ep_table_of_contents
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, 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 all dependencies and symlink for ep_etherpad-lite
-        run: src/bin/installDeps.sh
       -
         name: Run load test
         run: src/tests/frontend/travis/runnerLoadTest.sh 25 50
@@ -115,7 +104,7 @@ jobs:
             src/package-lock.json
             src/bin/doc/package-lock.json
       -
-        name: Install all dependencies and symlink for ep_etherpad-lite
+        name: Install the ep_etherpad-lite package from ./src
         run: src/bin/installDeps.sh
       -
         name: Install etherpad-load-test

.github/workflows/rate-limit.yml

@@ -45,6 +45,9 @@ jobs:
       -
         name: install dependencies and create symlink for ep_etherpad-lite
         run: src/bin/installDeps.sh
+      -
+        name: Install etherpad-cli-client
+        run: npm i etherpad-cli-client
       -
         name: run rate limit test
         run: |

.github/workflows/upgrade-from-latest-release.yml

@@ -33,12 +33,12 @@ jobs:
           cache-dependency-path: |
             src/package-lock.json
             src/bin/doc/package-lock.json
+      # FIXME after 1.9.2
+      # After 1.9.2 is released, we need to remove '--legacy-peer-deps --no-save'
       -
         name: Install Etherpad plugins
-        # The --legacy-peer-deps flag is required to work around a bug in npm
-        # v7: https://github.com/npm/cli/issues/2199
         run: >
-          npm install --no-save --legacy-peer-deps
+          npm install --legacy-peer-deps --no-save
           ep_align
           ep_author_hover
           ep_cursortrace
@@ -52,15 +52,6 @@ jobs:
           ep_spellcheck
           ep_subscript_and_superscript
           ep_table_of_contents
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, 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 all dependencies and symlink for ep_etherpad-lite
         run: src/bin/installDeps.sh
@@ -83,17 +74,37 @@ jobs:
         # commit that merges the PR's source branch to its destination branch.
         run: git checkout "${GITHUB_SHA}"
       -
-        name: Install all dependencies and symlink for ep_etherpad-lite
+        name: Temporary remove ./node_modules; Remove this after 1.9.2 release
+        run: rm -rf ./node_modules
+      -
+        name: Install the ep_etherpad-lite package from ./src
         run: src/bin/installDeps.sh
+      -
+        name: Install Etherpad plugins again; Remove this after 1.9.2 release
+        run: >
+          npm install
+          ep_align
+          ep_author_hover
+          ep_cursortrace
+          ep_font_size
+          ep_hash_auth
+          ep_headings2
+          ep_image_upload
+          ep_markdown
+          ep_readonly_guest
+          ep_set_title_on_pad
+          ep_spellcheck
+          ep_subscript_and_superscript
+          ep_table_of_contents
       -
         name: Run the backend tests
         run: cd src && npm test
       -
         name: Install Cypress
-        run: cd src && npm install cypress --legacy-peer-deps
+        run: npm install cypress
       -
         name: Run Etherpad & Test Frontend
         run: |
           node src/node/server.js &
           curl --connect-timeout 10 --max-time 20 --retry 5 --retry-delay 10 --retry-max-time 60 --retry-connrefused http://127.0.0.1:9001/p/test
-          ./src/node_modules/cypress/bin/cypress run --config-file src/tests/frontend/cypress/cypress.config.js
+          ./node_modules/cypress/bin/cypress run --config-file src/tests/frontend/cypress/cypress.config.js

.github/workflows/windows.yml

@@ -34,13 +34,16 @@ jobs:
             src/package-lock.json
             src/bin/doc/package-lock.json
       -
-        name: Install all dependencies and symlink for ep_etherpad-lite
+        name: Install the ep_etherpad-lite package from ./src
         shell: msys2 {0}
         run: src/bin/installDeps.sh
+#      -
+#        name: Run npm i once to make bin files available - why is this needed at all?
+#        run: npm i
       -
         name: Run the backend tests
         shell: msys2 {0}
-        run: cd src && npm test
+        run: cd src && npm run test-on-windows
       -
         name: Build the .zip
         shell: msys2 {0}
@@ -115,14 +118,14 @@ jobs:
             etherpad/src/bin/doc/package-lock.json
       -
         name: Install Cypress
-        run: cd etherpad && cd src && npm install cypress --legacy-peer-deps
+        run: cd etherpad && npm install cypress
       -
         name: Run Etherpad
         run: |
           cd etherpad
           node node_modules\ep_etherpad-lite\node\server.js &
           curl --connect-timeout 10 --max-time 20 --retry 5 --retry-delay 10 --retry-max-time 60 --retry-connrefused http://127.0.0.1:9001/p/test
-          src\node_modules\cypress\bin\cypress run --config-file src\tests\frontendcypress\cypress.config.js
+          node_modules\cypress\bin\cypress run --config-file src\tests\frontendcypress\cypress.config.js
       # On release, upload windows zip to GitHub release tab
       -
         name: Rename to etherpad-lite-win.zip

.gitignore

@@ -21,3 +21,4 @@ out/
 /src/bin/convertSettings.json
 /src/bin/etherpad-1.deb
 /src/bin/node.exe
+/package.json