mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-20 23:46:14 -04:00
deps: Drop support for Node.js < 12.13.0
This commit is contained in:
parent
66ee9c5ef9
commit
ef1ba21104
15 changed files with 19 additions and 27 deletions
4
.github/workflows/backend-tests.yml
vendored
4
.github/workflows/backend-tests.yml
vendored
|
@ -16,7 +16,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
node: [10, 12, 14, 15]
|
node: [12, 14, 15]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
|
@ -50,7 +50,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
node: [10, 12, 14, 15]
|
node: [12, 14, 15]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
|
|
2
.github/workflows/frontend-admin-tests.yml
vendored
2
.github/workflows/frontend-admin-tests.yml
vendored
|
@ -11,7 +11,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
node: [10, 12, 14, 15]
|
node: [12, 14, 15]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Generate Sauce Labs strings
|
- name: Generate Sauce Labs strings
|
||||||
|
|
|
@ -16,7 +16,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
node: [10, 12, 14, 15]
|
node: [12, 14, 15]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out latest release
|
- name: Check out latest release
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
### Compatibility changes
|
### Compatibility changes
|
||||||
|
|
||||||
|
* Node.js v12.13.0 or later is now required.
|
||||||
* The `favicon` setting is now interpreted as a pathname to a favicon file, not
|
* The `favicon` setting is now interpreted as a pathname to a favicon file, not
|
||||||
a URL. Please see the documentation comment in `settings.json.template`.
|
a URL. Please see the documentation comment in `settings.json.template`.
|
||||||
* The undocumented `faviconPad` and `faviconTimeslider` settings have been
|
* The undocumented `faviconPad` and `faviconTimeslider` settings have been
|
||||||
|
|
|
@ -32,7 +32,7 @@ Etherpad is extremely flexible providing you the means to modify it to solve wha
|
||||||
# Installation
|
# Installation
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
- `nodejs` >= **10.17.0**.
|
- [Node.js](https://nodejs.org/) >= **12.13.0**.
|
||||||
|
|
||||||
## GNU/Linux and other UNIX-like systems
|
## GNU/Linux and other UNIX-like systems
|
||||||
|
|
||||||
|
@ -46,7 +46,8 @@ src/bin/run.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
### Manual install
|
### Manual install
|
||||||
You'll need git and [node.js](https://nodejs.org) installed (minimum required Node version: **10.17.0**).
|
|
||||||
|
You'll need Git and [Node.js](https://nodejs.org/) installed.
|
||||||
|
|
||||||
**As any user (we recommend creating a separate user called etherpad):**
|
**As any user (we recommend creating a separate user called etherpad):**
|
||||||
|
|
||||||
|
|
|
@ -225,7 +225,7 @@ publish your plugin.
|
||||||
"author": "USERNAME (REAL NAME) <MAIL@EXAMPLE.COM>",
|
"author": "USERNAME (REAL NAME) <MAIL@EXAMPLE.COM>",
|
||||||
"contributors": [],
|
"contributors": [],
|
||||||
"dependencies": {"MODULE": "0.3.20"},
|
"dependencies": {"MODULE": "0.3.20"},
|
||||||
"engines": { "node": "^10.17.0 || >=11.14.0"}
|
"engines": {"node": ">=12.13.0"}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -36,4 +36,4 @@ src/bin/installDeps.sh "$@" || exit 1
|
||||||
#Move to the node folder and start
|
#Move to the node folder and start
|
||||||
echo "Starting Etherpad..."
|
echo "Starting Etherpad..."
|
||||||
|
|
||||||
exec node $(compute_node_args) src/node/server.js "$@"
|
exec node src/node/server.js "$@"
|
||||||
|
|
|
@ -16,4 +16,4 @@ echo "Open 'chrome://inspect' on Chrome to start debugging."
|
||||||
|
|
||||||
# Use 0.0.0.0 to allow external connections to the debugger
|
# Use 0.0.0.0 to allow external connections to the debugger
|
||||||
# (ex: running Etherpad on a docker container). Use default port # (9229)
|
# (ex: running Etherpad on a docker container). Use default port # (9229)
|
||||||
exec node $(compute_node_args) --inspect=0.0.0.0:9229 src/node/server.js "$@"
|
exec node --inspect=0.0.0.0:9229 src/node/server.js "$@"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"description": "Internal tool for generating Node.js API docs",
|
"description": "Internal tool for generating Node.js API docs",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.17.0"
|
"node": ">=12.13.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"marked": "^2.0.0"
|
"marked": "^2.0.0"
|
||||||
|
|
|
@ -19,4 +19,4 @@ cd "${MY_DIR}/../.." || exit 1
|
||||||
echo "Running directly, without checking/installing dependencies"
|
echo "Running directly, without checking/installing dependencies"
|
||||||
|
|
||||||
# run Etherpad main class
|
# run Etherpad main class
|
||||||
exec node $(compute_node_args) src/node/server.js "$@"
|
exec node src/node/server.js "$@"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# minimum required node version
|
# minimum required node version
|
||||||
REQUIRED_NODE_MAJOR=10
|
REQUIRED_NODE_MAJOR=12
|
||||||
REQUIRED_NODE_MINOR=13
|
REQUIRED_NODE_MINOR=13
|
||||||
|
|
||||||
# minimum required npm version
|
# minimum required npm version
|
||||||
|
@ -50,16 +50,6 @@ get_program_version() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
compute_node_args() {
|
|
||||||
ARGS=""
|
|
||||||
|
|
||||||
NODE_MAJOR=$(get_program_version "node" "major")
|
|
||||||
[ "$NODE_MAJOR" -eq "10" ] && ARGS="$ARGS --experimental-worker"
|
|
||||||
|
|
||||||
echo $ARGS
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
require_minimal_version() {
|
require_minimal_version() {
|
||||||
PROGRAM_LABEL="$1"
|
PROGRAM_LABEL="$1"
|
||||||
VERSION="$2"
|
VERSION="$2"
|
||||||
|
|
|
@ -263,7 +263,7 @@ fs.readdir(pluginPath, (err, rootFiles) => {
|
||||||
console.warn('No engines or node engine in package.json');
|
console.warn('No engines or node engine in package.json');
|
||||||
if (autoFix) {
|
if (autoFix) {
|
||||||
const engines = {
|
const engines = {
|
||||||
node: '^10.17.0 || >=11.14.0',
|
node: '>=12.13.0',
|
||||||
};
|
};
|
||||||
parsedPackageJSON.engines = engines;
|
parsedPackageJSON.engines = engines;
|
||||||
writePackageJson(parsedPackageJSON);
|
writePackageJson(parsedPackageJSON);
|
||||||
|
|
|
@ -32,4 +32,4 @@ src/bin/installDeps.sh "$@" || exit 1
|
||||||
# Move to the node folder and start
|
# Move to the node folder and start
|
||||||
log "Starting Etherpad..."
|
log "Starting Etherpad..."
|
||||||
|
|
||||||
exec node $(compute_node_args) src/node/server.js "$@"
|
exec node src/node/server.js "$@"
|
||||||
|
|
|
@ -41,8 +41,8 @@ if (settings.dumpOnUncleanExit) {
|
||||||
* any modules that require newer versions of NodeJS
|
* any modules that require newer versions of NodeJS
|
||||||
*/
|
*/
|
||||||
const NodeVersion = require('./utils/NodeVersion');
|
const NodeVersion = require('./utils/NodeVersion');
|
||||||
NodeVersion.enforceMinNodeVersion('10.17.0');
|
NodeVersion.enforceMinNodeVersion('12.13.0');
|
||||||
NodeVersion.checkDeprecationStatus('10.17.0', '1.8.8');
|
NodeVersion.checkDeprecationStatus('12.13.0', '1.8.14');
|
||||||
|
|
||||||
const UpdateCheck = require('./utils/UpdateCheck');
|
const UpdateCheck = require('./utils/UpdateCheck');
|
||||||
const db = require('./db/DB');
|
const db = require('./db/DB');
|
||||||
|
|
|
@ -235,7 +235,7 @@
|
||||||
"root": true
|
"root": true
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^10.17.0 || >=11.14.0",
|
"node": ">=12.13.0",
|
||||||
"npm": ">=5.5.1"
|
"npm": ">=5.5.1"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue