Commit graph

8410 commits

Author SHA1 Message Date
SamTV12345
60ae55d8e3 Remove cd into src 2023-12-19 22:33:39 +01:00
SamTV12345
d2ebb0689c Remove ls statement from runner. 2023-12-18 22:00:14 +01:00
SamTV12345
02b826cc76 Updated jQuery. 2023-12-18 22:00:14 +01:00
SamTV12345
e046524ce7 Added backend tests as script. 2023-12-18 22:00:14 +01:00
SamTV12345
df9dd77a0b Modified windows deployment. 2023-12-18 22:00:14 +01:00
SamTV12345
d6a3395e67 Modified windows deployment. 2023-12-18 22:00:14 +01:00
SamTV12345
368a0a2bd1 Updated to package-lock.json v3 2023-12-18 22:00:14 +01:00
SamTV12345
c2439738e6 Use development version. 2023-12-18 22:00:14 +01:00
SamTV12345
9abc5a59a6 Use node env development. 2023-12-18 22:00:14 +01:00
SamTV12345
25b4ece39c Use development. 2023-12-18 22:00:14 +01:00
SamTV12345
97f0ef7ea8 Don't delete supertest. 2023-12-18 22:00:14 +01:00
SamTV12345
6ed7cba23f Use npx mocha for starting tests. 2023-12-18 22:00:14 +01:00
SamTV12345
943e6e6613 Updated dependencies. 2023-12-18 22:00:14 +01:00
SamTV12345
52cf3189d6 Removed fix for npm@6 2023-12-18 22:00:14 +01:00
SamTV12345
92e86d4517 updated package-lock.json. 2023-12-18 22:00:11 +01:00
SamTV12345
6bb0c2a38c updated package-lock.json. 2023-12-18 21:58:48 +01:00
webzwo0i
9f2e8c985c admin/plugins: fix test 2023-12-18 21:58:48 +01:00
webzwo0i
81646b1705 admin/plugins: Fix UI in case of missed finished:uninstall event 2023-12-18 21:58:48 +01:00
webzwo0i
a95c8e3442 plugin uninstall: Remove unnecessary code 2023-12-18 21:58:48 +01:00
webzwo0i
811e0b8bea debug 2023-12-18 21:58:48 +01:00
webzwo0i
4239d8504b debug 2023-12-18 21:58:48 +01:00
webzwo0i
864c6f1092 temporary: no mocha bin link 2023-12-18 21:58:48 +01:00
webzwo0i
c835c2ac46 remove npm i - is this still needed? 2023-12-18 21:58:48 +01:00
webzwo0i
5df101fa47 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-12-18 21:58:48 +01:00
webzwo0i
519aba44c8 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-12-18 21:58:46 +01:00
webzwo0i
23ce7bd654 JSON.stringify error for debugging 2023-12-18 21:58:44 +01:00
webzwo0i
c1a28b7458 admin/plugins: explicitly call npm with a plugin version 2023-12-18 21:58:44 +01:00
webzwo0i
a44f6116b4 Frontend tests: longer timeout in language.js test to make tests for
resilient.
2023-12-18 21:58:44 +01:00
webzwo0i
740af6a090 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-12-18 21:58:44 +01:00
webzwo0i
688ca7381e admin tests: refactor 2023-12-18 21:58:44 +01:00
webzwo0i
1f9b927d47 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-12-18 21:58:40 +01:00
dependabot[bot]
83246cd070
build(deps): bump rate-limiter-flexible from 3.0.6 to 4.0.0 in /src (#6078)
Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 3.0.6 to 4.0.0.
- [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases)
- [Commits](https://github.com/animir/node-rate-limiter-flexible/compare/v3.0.6...v4.0.0)

---
updated-dependencies:
- dependency-name: rate-limiter-flexible
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-18 17:20:00 +01:00
dependabot[bot]
9b462c97f5
build(deps-dev): bump eslint from 8.55.0 to 8.56.0 in /src (#6079)
Bumps [eslint](https://github.com/eslint/eslint) from 8.55.0 to 8.56.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.55.0...v8.56.0)

---
updated-dependencies:
- dependency-name: eslint
  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-12-18 17:19:51 +01:00
dependabot[bot]
641ca06abc
build(deps): bump actions/download-artifact from 3 to 4 (#6071)
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-18 17:19:32 +01:00
dependabot[bot]
37935c78af
build(deps): bump actions/upload-artifact from 3 to 4 (#6070)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-18 17:05:48 +01:00
XSpielinbox
fdd1750ac9
Correct Node.js install instructions (#6077) 2023-12-18 17:05:40 +01:00
SamTV12345
51def0eba6
fix: The log level is now respected again. (#6076) 2023-12-17 22:13:13 +01:00
Stefan
d12119d3be
Handle exception during loading of plugins (#6074) 2023-12-17 11:05:32 +00:00
SamTV12345
bfa55e6523 Always install npm@6 for correct package-lock.json version. 2023-12-15 21:43:11 +01:00
dependabot[bot]
315f25f496
build(deps): bump marked from 11.0.1 to 11.1.0 in /src/bin/doc (#6066)
Bumps [marked](https://github.com/markedjs/marked) from 11.0.1 to 11.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/v11.0.1...v11.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-12-14 18:19:48 +01:00
dependabot[bot]
6882df385d
build(deps): bump github/codeql-action from 2 to 3 (#6069)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-14 18:19:39 +01:00
Stefan
f154a4cd52
Update required node.js version in README (#6067) (#6068) 2023-12-12 21:54:24 +00:00
SamTV12345
a33a55b26f Merge branch 'master' into develop 2023-12-11 20:16:59 +01:00
SamTV12345
84ac439c9b Merge branch 'develop' 2023-12-11 20:16:59 +01:00
SamTV12345
85c5b9167c bump version 2023-12-11 20:16:58 +01:00
SamTV12345
4c663dfe73 Also cleanup v$TAG. 2023-12-11 20:16:43 +01:00
SamTV12345
165257dfef Added changelog, bumped windows bundled NodeJS version.
Added necessary git tag when executing the release script.
2023-12-11 20:09:45 +01:00
dependabot[bot]
d273af9eab
build(deps): bump rate-limiter-flexible from 3.0.4 to 3.0.6 in /src (#6065)
Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 3.0.4 to 3.0.6.
- [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases)
- [Commits](https://github.com/animir/node-rate-limiter-flexible/commits/v3.0.6)

---
updated-dependencies:
- dependency-name: rate-limiter-flexible
  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-12-11 19:37:46 +01:00
dependabot[bot]
7f6b633801
build(deps): bump marked from 11.0.0 to 11.0.1 in /src/bin/doc (#6064)
Bumps [marked](https://github.com/markedjs/marked) from 11.0.0 to 11.0.1.
- [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/v11.0.0...v11.0.1)

---
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-12-10 11:01:18 +01:00
dependabot[bot]
bbaa6a7e8d
build(deps): bump terser from 5.25.0 to 5.26.0 in /src (#6062)
Bumps [terser](https://github.com/terser/terser) from 5.25.0 to 5.26.0.
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v5.25.0...v5.26.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-12-07 17:30:56 +01:00