Commit Graph

8282 Commits (b7e71a84be8610813e14f316c1b745b478587937)

Author SHA1 Message Date
webzwo0i b7e71a84be temporary: no mocha bin link 2023-10-08 20:15:36 +02:00
webzwo0i ea550a651d remove npm i - is this still needed? 2023-10-08 20:15:36 +02:00
webzwo0i c1086d5645 adminplugins; Fix reloading admin/plugins
In some cases, when the server is restarting and the beforeEach hook
tries to reload the admin/plugins page, it could fail.
2023-10-08 20:15:36 +02:00
webzwo0i 510f0daae3 Remove etherpad-cli-client devDependency.
We use this package when testing rate limiting. We already install it in
Docker, when running the Github workflow, so there is no need to install it by default.

In contrast to other devDependencies this is not required in case you
want to run the backend tests or check the code with eslint etc.
2023-10-08 20:15:34 +02:00
webzwo0i 2e9f39ec01 JSON.stringify error for debugging 2023-10-08 20:15:08 +02:00
webzwo0i 2656f37e30 admin/plugins: explicitly call npm with a plugin version 2023-10-08 20:15:08 +02:00
webzwo0i 10c7871ace Frontend tests: longer timeout in language.js test to make tests for
resilient.
2023-10-08 20:15:08 +02:00
webzwo0i bf34a94190 Add symlinks in ./src/node_modules for backwards compatibility.
See "Note for plugin authors" section in Changelog.

Some packages that are in use by plugins got a symlink in
./src/node_modules so that they still work after updating Etherpad. In
the future don't require('etherpad_ep-lite/node_modules/dependency')
anymore, but change this to require('dependency') and add the dependency
to your plugin's package.json
2023-10-08 20:15:08 +02:00
webzwo0i 1777684cf2 admin tests: refactor 2023-10-08 20:14:56 +02:00
webzwo0i 2f39a7b4bb Use `npm link` to install ep_etherpad-lite. This places a package.json
file in the root directory that references ./src directory as the file
source for `ep_etherpad-lite`.

Remove --legacy-peer-deps and --no-save when invoking npm. There is no
need for them anymore, as we are bumping npm now to v8.

./src/package.json contains all dependencies of Etherpad core
(package name ep_etherpad-lite) as before. The root directory's
package.json file references ep_etherpad-lite and also contains
references to any installed plugins.

Remove npm from package.json as we depend on a recent version now; PATH is still updated as before, so in the future we may install a custom npm version again

lint package-lock: update exception for sqlite3

remove node_modules and package.json during installDeps.sh

update Dockerfile

adapt minify

windows build

Fixed installOnWindows.bat

remove node_modules from git

bump minimal node/npm version in src/bin/functions.sh

add changelog notes

update installdeps

fix dockerfile

docker: test npm prefix set to the etherpad directory

workflow: upgrade-from-latest-release needs to be adapted until next release is out

Revert "docker: test npm prefix set to the etherpad directory"

This reverts commit b856a2488c9dbfb2acf35309cd1ee83016b631ad.

use npm link --bin-links=false to prevent it from copying bin files

temp fix for scripts as they are not installed to bin directory anymore

adjust bin paths in Dockerfile

Dockerfile

add hint for npm link, dockerfile

update dockerfile

Revert "Fixed installOnWindows.bat"

This reverts commit 70d0716bbedc4c0c1043155fcc5d157f01775c61.

try installOnWindows; still TODO: no difference between production and development; no warning like in installDeps.sh before update - it just removes package* and node_modules so admins must be aware of the plugins they want to reinstall later

update installOnWindows.bat

update package-lock.json

Dockerfile

Dockerfile

add file: scheme for lint check - needed as long as we have the plugin compatibility symlinks in ./src/node_modules

fix installOnWindows

upgrade-from-latest-release workflow: adapt cypress installation

src/package.json: test-container fix path to _mocha; maybe revert this in case we enable bin-links again

src/package.json: add test-on-windows script

another try with test-on-windows, without using bin-links

use bin-links on windows

Revert "use bin-links on windows"

This reverts commit f50ec2a9fabe3098d48e8f412b73c01edbe2140e.

invoke mocha binary on windows

run npm i once on windows, to make bin files available - why?

remove supertest on windows production builds

add symlink for mocha

debug

Revert "debug"

This reverts commit 8916a0515ca2897c57ca65fef49fd0b3610d2989.

Revert "add symlink for mocha"

This reverts commit 3c60bef77d2a120d24fce14421fe638598cd849d.

windows workflow: adapt cypress path

frontend admin tests
2023-10-08 20:13:17 +02:00
dependabot[bot] ab85331083
build(deps): bump ansi-regex in /src (#5967)
Bumps  and [ansi-regex](https://github.com/chalk/ansi-regex). These dependencies needed to be updated together.

Updates `ansi-regex` from 3.0.0 to 5.0.1
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v3.0.0...v5.0.1)

Updates `ansi-regex` from 4.1.0 to 5.0.1
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v3.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-07 12:14:55 +02:00
dependabot[bot] eb5970779f
build(deps-dev): bump sinon from 16.0.0 to 16.1.0 in /src (#5966)
Bumps [sinon](https://github.com/sinonjs/sinon) from 16.0.0 to 16.1.0.
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v16.0.0...v16.1.0)

---
updated-dependencies:
- dependency-name: sinon
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-06 17:57:04 +02:00
dependabot[bot] 5095ff5e1b
build(deps): bump marked from 9.0.3 to 9.1.0 in /src/bin/doc (#5965)
Bumps [marked](https://github.com/markedjs/marked) from 9.0.3 to 9.1.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.0.3...v9.1.0)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-06 17:56:58 +02:00
dependabot[bot] a89da8569d
build(deps): bump express-rate-limit from 7.0.2 to 7.1.0 in /src (#5964)
Bumps [express-rate-limit](https://github.com/express-rate-limit/express-rate-limit) from 7.0.2 to 7.1.0.
- [Release notes](https://github.com/express-rate-limit/express-rate-limit/releases)
- [Changelog](https://github.com/express-rate-limit/express-rate-limit/blob/main/changelog.md)
- [Commits](https://github.com/express-rate-limit/express-rate-limit/compare/v7.0.2...v7.1.0)

---
updated-dependencies:
- dependency-name: express-rate-limit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-05 13:30:28 +02:00
dependabot[bot] 7a67cf8aad
build(deps): bump openapi-backend from 5.9.2 to 5.10.0 in /src (#5960)
Bumps [openapi-backend](https://github.com/anttiviljami/openapi-backend) from 5.9.2 to 5.10.0.
- [Commits](https://github.com/anttiviljami/openapi-backend/compare/5.9.2...5.10.0)

---
updated-dependencies:
- dependency-name: openapi-backend
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-04 12:48:03 +02:00
dependabot[bot] df59cceac7
build(deps): bump terser from 5.20.0 to 5.21.0 in /src (#5961)
Bumps [terser](https://github.com/terser/terser) from 5.20.0 to 5.21.0.
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v5.20.0...v5.21.0)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-04 12:47:40 +02:00
SamTV12345 8b5264db41 Updated ueberdb version. 2023-10-02 22:57:51 +02:00
dependabot[bot] 3dedadd3bf
build(deps): bump ueberdb2 from 4.2.13 to 4.2.14 in /src (#5956)
Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.13 to 4.2.14.
- [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ether/ueberDB/compare/v4.2.13...v4.2.14)

---
updated-dependencies:
- dependency-name: ueberdb2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-02 19:30:30 +02:00
dependabot[bot] b6ce8c7377
build(deps): bump express-rate-limit from 7.0.1 to 7.0.2 in /src (#5952)
Bumps [express-rate-limit](https://github.com/express-rate-limit/express-rate-limit) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/express-rate-limit/express-rate-limit/releases)
- [Changelog](https://github.com/express-rate-limit/express-rate-limit/blob/main/changelog.md)
- [Commits](https://github.com/express-rate-limit/express-rate-limit/compare/v7.0.1...v7.0.2)

---
updated-dependencies:
- dependency-name: express-rate-limit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-28 15:47:39 +02:00
dependabot[bot] 22283b513c
build(deps): bump axios from 1.5.0 to 1.5.1 in /src (#5951)
Bumps [axios](https://github.com/axios/axios) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.5.0...v1.5.1)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-27 21:12:42 +02:00
dependabot[bot] 18d3a761c7
build(deps-dev): bump selenium-webdriver from 4.12.0 to 4.13.0 in /src (#5950)
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.12.0 to 4.13.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.12.0...selenium-4.13.0)

---
updated-dependencies:
- dependency-name: selenium-webdriver
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-27 21:12:34 +02:00
dependabot[bot] 86c5db7a2c
build(deps): bump ueberdb2 from 4.2.12 to 4.2.13 in /src (#5949)
Bumps [ueberdb2](https://github.com/ether/ueberDB) from 4.2.12 to 4.2.13.
- [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ether/ueberDB/compare/v4.2.12...v4.2.13)

---
updated-dependencies:
- dependency-name: ueberdb2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-27 21:12:27 +02:00
dependabot[bot] e823014a04
build(deps): bump ueberdb2 from 4.2.11 to 4.2.12 in /src (#5947) 2023-09-26 07:17:44 +02:00
dependabot[bot] 8d9c6a4582
build(deps-dev): bump eslint from 8.49.0 to 8.50.0 in /src (#5946) 2023-09-26 07:17:33 +02:00
Stefan f9a3a6aaae
Improve update check (#5945)
* Send etherpad version in update check request
* Cache etherpad informations for one hour
* Change format of User-Agent
* Improve exception handling
2023-09-25 13:05:33 +02:00
SamTV12345 f2faa3fa84
Only react to tags starting with v. 2023-09-24 14:06:03 +02:00
SamTV12345 beab8e767f Merge branch 'master' into develop 2023-09-23 14:58:47 +02:00
SamTV12345 293bd64522 Merge branch 'develop' 2023-09-23 14:58:46 +02:00
SamTV12345 75183e737d bump version 2023-09-23 14:58:45 +02:00
SamTV12345 eb7ce6ccf6 Bumped package lock json. 2023-09-23 12:10:30 +02:00
SamTV12345 d13e17c266 Reset version. 2023-09-23 12:10:05 +02:00
SamTV12345 f993bf1073 Merge branch 'master' into develop 2023-09-23 12:04:33 +02:00
SamTV12345 20f8f756f5 bump version 2023-09-23 12:04:32 +02:00
SamTV12345 01ddcde0a9 Merge branch 'develop' 2023-09-23 12:04:32 +02:00
SamTV12345 392e5b10b0 Added changelog for 1.9.3 2023-09-23 11:58:05 +02:00
Denys Halenok 53ef77a24d
Add ability to specify configuration file as a build arg (#5944) 2023-09-23 11:46:14 +02:00
Denys Halenok bc302538c0
Don't access jQuery through `parent.parent` (#5943) 2023-09-22 20:53:24 +02:00
dependabot[bot] 5384edc7c9
build(deps): bump ueberdb2 from 4.2.9 to 4.2.11 in /src (#5941) 2023-09-21 13:25:02 +02:00
dependabot[bot] 3d05616fe7
build(deps): bump terser from 5.19.4 to 5.20.0 in /src (#5942)
Bumps [terser](https://github.com/terser/terser) from 5.19.4 to 5.20.0.
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v5.19.4...v5.20.0)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-20 22:53:45 +02:00
SamTV12345 7acc82af63 Fixed mongodb database connection. 2023-09-20 12:30:26 +02:00
dependabot[bot] e2c4328b44
build(deps): bump marked from 9.0.2 to 9.0.3 in /src/bin/doc (#5940)
Bumps [marked](https://github.com/markedjs/marked) from 9.0.2 to 9.0.3.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.0.2...v9.0.3)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-20 10:56:58 +02:00
dependabot[bot] c8a36518d4
build(deps): bump express-rate-limit from 7.0.0 to 7.0.1 in /src (#5937)
Bumps [express-rate-limit](https://github.com/express-rate-limit/express-rate-limit) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/express-rate-limit/express-rate-limit/releases)
- [Changelog](https://github.com/express-rate-limit/express-rate-limit/blob/main/changelog.md)
- [Commits](https://github.com/express-rate-limit/express-rate-limit/compare/v7.0.0...v7.0.1)

---
updated-dependencies:
- dependency-name: express-rate-limit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-18 22:55:50 +02:00
dependabot[bot] cd17ba3b83
build(deps): bump resolve from 1.22.5 to 1.22.6 in /src (#5938)
Bumps [resolve](https://github.com/browserify/resolve) from 1.22.5 to 1.22.6.
- [Commits](https://github.com/browserify/resolve/compare/v1.22.5...v1.22.6)

---
updated-dependencies:
- dependency-name: resolve
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-18 22:55:35 +02:00
dependabot[bot] 35a454efd9
build(deps): bump marked from 9.0.0 to 9.0.2 in /src/bin/doc (#5939)
Bumps [marked](https://github.com/markedjs/marked) from 9.0.0 to 9.0.2.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.0.0...v9.0.2)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-18 22:55:25 +02:00
SamTV12345 9df8a01463 Updated ueberdb 2023-09-16 20:44:33 +02:00
SamTV12345 5bcca29cf9 Bumoed package-lock.json 2023-09-15 23:17:17 +02:00
SamTV12345 cb89c99261 Bumped ueberdb2. 2023-09-15 23:15:46 +02:00
SamTV12345 7759e26ce2
Fix/frontend admin tests (#5935)
* Add missing awaits.

* Remove rate limiter.

* Readded maxHttpBuffersize.

* Revert "Add missing awaits."

This reverts commit d5a8979841.

* Increased timeout.

* Increased timeout further.

* Toggled down timeout.

* Add importExportRateLimit.
2023-09-15 23:08:58 +02:00
SamTV12345 4dfdee941c
Fix/admin test (#5936)
* Add missing awaits.

* Remove rate limiter.

* Readded maxHttpBuffersize.

* Revert "Add missing awaits."

This reverts commit d5a8979841.

* Increased timeout.

* Increased timeout further.

* Toggled down timeout.
2023-09-15 23:06:53 +02:00
SamTV12345 79e1075e88
Fix/admin test (#5934)
* Add missing awaits.

* Remove rate limiter.

* Readded maxHttpBuffersize.

* Revert "Add missing awaits."

This reverts commit d5a8979841.
2023-09-15 22:01:09 +02:00