Commit graph

145 commits

Author SHA1 Message Date
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
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]
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]
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]
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
dependabot[bot]
cea68ef99a
build(deps): bump marked from 8.0.1 to 9.0.0 in /src/bin/doc (#5922)
Bumps [marked](https://github.com/markedjs/marked) from 8.0.1 to 9.0.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/v8.0.1...v9.0.0)

---
updated-dependencies:
- dependency-name: marked
  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-09-13 20:03:25 +02:00
dependabot[bot]
331aeacf42
build(deps): bump marked from 8.0.0 to 8.0.1 in /src/bin/doc (#5918) 2023-09-07 17:38:29 +02:00
dependabot[bot]
0e5b2575c9
build(deps): bump marked from 7.0.5 to 8.0.0 in /src/bin/doc (#5909)
Bumps [marked](https://github.com/markedjs/marked) from 7.0.5 to 8.0.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/v7.0.5...v8.0.0)

---
updated-dependencies:
- dependency-name: marked
  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-09-05 15:36:15 +02:00
SamTV12345
8fb0ee8c7f Updated release workflow with complete automation. 2023-09-04 21:58:15 +02:00
dependabot[bot]
a54b1c22c2
build(deps): bump marked from 7.0.4 to 7.0.5 in /src/bin/doc (#5890)
Bumps [marked](https://github.com/markedjs/marked) from 7.0.4 to 7.0.5.
- [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/v7.0.4...v7.0.5)

---
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-08-28 21:39:00 +02:00
dependabot[bot]
1c6aba1cc6
build(deps): bump marked from 7.0.3 to 7.0.4 in /src/bin/doc (#5880)
Bumps [marked](https://github.com/markedjs/marked) from 7.0.3 to 7.0.4.
- [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/v7.0.3...v7.0.4)

---
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-08-21 19:59:43 +02:00
dependabot[bot]
f1ad26dd64
build(deps): bump marked from 7.0.2 to 7.0.3 in /src/bin/doc (#5874)
Bumps [marked](https://github.com/markedjs/marked) from 7.0.2 to 7.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/v7.0.2...v7.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-08-16 15:09:12 +02:00
dependabot[bot]
a84fc880f9
build(deps): bump marked from 7.0.1 to 7.0.2 in /src/bin/doc (#5871)
Bumps [marked](https://github.com/markedjs/marked) from 7.0.1 to 7.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/v7.0.1...v7.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-08-10 20:56:28 +02:00
dependabot[bot]
361353c699
build(deps): bump marked from 7.0.0 to 7.0.1 in /src/bin/doc (#5867)
Bumps [marked](https://github.com/markedjs/marked) from 7.0.0 to 7.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/v7.0.0...v7.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-08-09 16:02:03 +02:00
SamTV12345
2f5b6b80e1
Fix/windows build (#5861)
* Use updated env var.

* Show bin and src bin.

* Use native link.

* Use link.

* Check file link.

* Use existing installation on github runner.

* Use -P.

* Use git checkout for copying the data to temp directory.

* Use rsync to copy data.

* Remove package from src.

* Use simple copy to copy the dependencies.

* Copy src folder only.
2023-08-08 16:22:25 +02:00
dependabot[bot]
5bbaeabccb
build(deps): bump marked from 6.0.0 to 7.0.0 in /src/bin/doc (#5863)
Bumps [marked](https://github.com/markedjs/marked) from 6.0.0 to 7.0.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/v6.0.0...v7.0.0)

---
updated-dependencies:
- dependency-name: marked
  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-08-07 21:14:01 +02:00
dependabot[bot]
f0ad176de9
build(deps): bump marked from 5.1.2 to 6.0.0 in /src/bin/doc (#5854)
Bumps [marked](https://github.com/markedjs/marked) from 5.1.2 to 6.0.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/v5.1.2...v6.0.0)

---
updated-dependencies:
- dependency-name: marked
  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-08-02 23:32:00 +02:00
dependabot[bot]
2434ae32a1
build(deps): bump marked from 5.1.1 to 5.1.2 in /src/bin/doc (#5847)
Bumps [marked](https://github.com/markedjs/marked) from 5.1.1 to 5.1.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/v5.1.1...v5.1.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-07-29 16:04:29 +02:00
dependabot[bot]
13330c45f8
build(deps): bump marked from 5.1.0 to 5.1.1 in /src/bin/doc (#5819)
Bumps [marked](https://github.com/markedjs/marked) from 5.1.0 to 5.1.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/v5.1.0...v5.1.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-07-07 19:18:39 +02:00
SamTV12345
9a679aca56
Optimize/docker container (#5800)
* Bumped ueberdb2 to 4.1.1

* Install only production ready dependencies.

* Added optimized Dockerfile.

* Fixed variable detection.

* Move to own variable for detecting production build.

* Use shell syntax for parameter expansion.

* Use shell as default.
2023-07-01 19:23:17 +02:00
SamTV12345
049231e4af
Feature/axios (#5776)
* Move from deprecated request package to axios.

* Fixed package.json

* Another check.

* Fixing npm - hopefully the last.

* Remove double parsing of JSON.

* Bump bundled npm to also get rid of request in the bundled npm.

* Revert "Bump bundled npm to also get rid of request in the bundled npm."

This reverts commit b60fa4f435.
2023-06-27 21:20:53 +02:00
John McLear
04826edd3b
github action fix for windows build (#5737)
* github action fix for windows build

* cypress pathing
2023-06-22 01:45:11 +01:00
dependabot[bot]
81932a3942 build(deps): bump marked from 4.2.12 to 5.1.0 in /src/bin/doc
Bumps [marked](https://github.com/markedjs/marked) from 4.2.12 to 5.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/v4.2.12...v5.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-21 13:17:13 +01:00
SamTV12345
dc0db68515
Added docs as asciidoctor with cross platform support. (#5733)
* Added docs as asciidoctor with cross platform support.

* Fixed release script with new doc building mechanism.
2023-06-21 13:13:31 +01:00
SamTV12345
08c93244ef
Remove package-lock lockfileVersion check. 2023-06-20 16:44:40 +02:00
dependabot[bot]
bfe3214c61 build(deps): bump marked from 4.0.15 to 4.2.12 in /src/bin/doc
Bumps [marked](https://github.com/markedjs/marked) from 4.0.15 to 4.2.12.
- [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/v4.0.15...v4.2.12)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-20 13:39:23 +01:00
Richard Hansen
7e4931cf25 Windows build: Switch to 64-bit Node.js executable 2022-05-14 18:25:29 -04:00
Richard Hansen
2d56838792 Windows build: Upgrade bundled Node.js to v16 2022-05-14 18:25:29 -04:00
Richard Hansen
b1d48bb333 Windows build: Extract .zip outside repo clone 2022-05-14 17:50:46 -04:00
Richard Hansen
d70dcc3415 Windows build: Install to $PROGRAMFILES 2022-05-14 17:46:32 -04:00
Richard Hansen
52dd6a26bc Windows build: Rename the .exe for consistency 2022-05-14 17:46:32 -04:00
Richard Hansen
8a2ef69873 Windows build: Move NSIS installer script to this repo 2022-05-14 17:46:32 -04:00
Richard Hansen
d62cc8d62c Windows build: Don't exclude var 2022-05-14 17:46:32 -04:00
Richard Hansen
e3da5b5bb3 Windows build: Delete unnecessary cd 2022-05-14 17:46:32 -04:00
Richard Hansen
752054899f Windows build: Use git archive to copy files 2022-05-14 17:46:27 -04:00
Richard Hansen
188ca8a3b1 Windows build: Remove obsolete file removals 2022-05-14 17:45:36 -04:00
Richard Hansen
1dc3c4bde9 Windows build: Clean up after abnormal exits 2022-05-14 17:45:36 -04:00
Richard Hansen
e71f69ec72 Windows build: Rename zip to etherpad-win.zip 2022-05-14 17:45:30 -04:00
Richard Hansen
77edcebc99 Windows build: Factor out output zip filename 2022-05-13 18:14:56 -04:00
Richard Hansen
5788c1958d Windows build: Use Git to get Etherpad root dir 2022-05-13 18:14:56 -04:00
Richard Hansen
54019a24c3 Windows build: Factor out command checking 2022-05-13 18:14:56 -04:00
Richard Hansen
05e54b198f Windows build: Improve error handling 2022-05-13 18:14:56 -04:00
Richard Hansen
f19f3833f3 Windows build: Exit on simple error 2022-05-13 18:14:56 -04:00
Richard Hansen
9b87007278 lint: Bump ESLint dependencies 2022-05-02 21:16:24 -04:00
dependabot[bot]
0b5ee334d1
build(deps): bump marked from 4.0.14 to 4.0.15 in /src/bin/doc
Bumps [marked](https://github.com/markedjs/marked) from 4.0.14 to 4.0.15.
- [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/v4.0.14...v4.0.15)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-02 15:36:41 +00:00
dependabot[bot]
bfefdb4f20 build(deps): bump marked from 4.0.13 to 4.0.14 in /src/bin/doc
Bumps [marked](https://github.com/markedjs/marked) from 4.0.13 to 4.0.14.
- [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/v4.0.13...v4.0.14)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-11 12:31:06 -04:00
dependabot[bot]
df5e4b02fa build(deps): bump marked from 4.0.12 to 4.0.13 in /src/bin/doc
Bumps [marked](https://github.com/markedjs/marked) from 4.0.12 to 4.0.13.
- [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/v4.0.12...v4.0.13)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-08 21:43:23 -04:00
Richard Hansen
4535641ebd lint: Bump ESLint dependencies again, update plugins 2022-03-21 18:40:36 -04:00
Tom Kunze
49c7a4ba82 extractPadData: Fix wrong DB get function 2022-03-21 04:57:04 -04:00
Richard Hansen
d0d3290019 lint: Bump ESLint deps 2022-03-01 18:01:52 -05:00