diff options
-rw-r--r-- | package.json | 4 | ||||
-rw-r--r-- | server/initializers/checker-before-init.ts | 4 | ||||
-rw-r--r-- | support/doc/dependencies.md | 8 | ||||
-rw-r--r-- | support/doc/tools.md | 3 | ||||
-rw-r--r-- | support/docker/production/Dockerfile.buster | 2 | ||||
-rw-r--r-- | yarn.lock | 8 |
6 files changed, 14 insertions, 15 deletions
diff --git a/package.json b/package.json index 44f8be4b8..ba5fb3a65 100644 --- a/package.json +++ b/package.json | |||
@@ -5,7 +5,7 @@ | |||
5 | "private": true, | 5 | "private": true, |
6 | "licence": "AGPL-3.0", | 6 | "licence": "AGPL-3.0", |
7 | "engines": { | 7 | "engines": { |
8 | "node": ">=10.x <13", | 8 | "node": ">=10.x <=15", |
9 | "yarn": ">=1.x", | 9 | "yarn": ">=1.x", |
10 | "postgres": ">=9.6", | 10 | "postgres": ">=9.6", |
11 | "redis-server": ">=2.8.18", | 11 | "redis-server": ">=2.8.18", |
@@ -87,7 +87,7 @@ | |||
87 | "http-signature": "1.3.5" | 87 | "http-signature": "1.3.5" |
88 | }, | 88 | }, |
89 | "dependencies": { | 89 | "dependencies": { |
90 | "apicache": "^1.4.0", | 90 | "apicache": "1.5.2", |
91 | "async": "^3.0.1", | 91 | "async": "^3.0.1", |
92 | "async-lru": "^1.1.1", | 92 | "async-lru": "^1.1.1", |
93 | "bcrypt": "5.0.0", | 93 | "bcrypt": "5.0.0", |
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 7cc073603..cac24f0b6 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts | |||
@@ -107,8 +107,8 @@ function checkNodeVersion () { | |||
107 | 107 | ||
108 | logger.debug('Checking NodeJS version %s.', v) | 108 | logger.debug('Checking NodeJS version %s.', v) |
109 | 109 | ||
110 | if (major < 10) { | 110 | if (major <= 10) { |
111 | logger.warn('Your NodeJS version %s is deprecated. Please use Node 10.', v) | 111 | logger.warn('Your NodeJS version %s is deprecated. Please upgrade.', v) |
112 | } | 112 | } |
113 | } | 113 | } |
114 | 114 | ||
diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md index 350a7c4a0..1faf46c63 100644 --- a/support/doc/dependencies.md +++ b/support/doc/dependencies.md | |||
@@ -30,7 +30,7 @@ _note_: only **LTS** versions of external dependencies are supported. If no LTS | |||
30 | 30 | ||
31 | 2. It would be wise to disable root access and to continue this tutorial with a user with sudoers group access | 31 | 2. It would be wise to disable root access and to continue this tutorial with a user with sudoers group access |
32 | 32 | ||
33 | 3. Install NodeJS 10.x: | 33 | 3. Install NodeJS 12.x: |
34 | [https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions) | 34 | [https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions) |
35 | 4. Install yarn, and be sure to have [a recent version](https://github.com/yarnpkg/yarn/releases/latest): | 35 | 4. Install yarn, and be sure to have [a recent version](https://github.com/yarnpkg/yarn/releases/latest): |
36 | [https://yarnpkg.com/en/docs/install#linux-tab](https://yarnpkg.com/en/docs/install#linux-tab) | 36 | [https://yarnpkg.com/en/docs/install#linux-tab](https://yarnpkg.com/en/docs/install#linux-tab) |
@@ -66,7 +66,7 @@ sudo systemctl start redis postgresql | |||
66 | 66 | ||
67 | ## CentOS 7 | 67 | ## CentOS 7 |
68 | 68 | ||
69 | 1. Install NodeJS 10.x: | 69 | 1. Install NodeJS 12.x: |
70 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) | 70 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) |
71 | 71 | ||
72 | 2. Install yarn: | 72 | 2. Install yarn: |
@@ -113,7 +113,7 @@ sudo systemctl enable --now postgresql | |||
113 | 113 | ||
114 | ## Centos 8 | 114 | ## Centos 8 |
115 | 115 | ||
116 | 1. Install NodeJS 10.x: | 116 | 1. Install NodeJS 12.x: |
117 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) | 117 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) |
118 | 118 | ||
119 | 2. Install yarn: | 119 | 2. Install yarn: |
@@ -172,7 +172,7 @@ su my-peertube-user | |||
172 | 3. (Optional) Install certbot (choose instructions for your distribution): | 172 | 3. (Optional) Install certbot (choose instructions for your distribution): |
173 | [https://certbot.eff.org/all-instructions](https://certbot.eff.org/all-instructions) | 173 | [https://certbot.eff.org/all-instructions](https://certbot.eff.org/all-instructions) |
174 | 174 | ||
175 | 4. Install NodeJS 10.x: | 175 | 4. Install NodeJS 12.x: |
176 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) | 176 | [https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) |
177 | 177 | ||
178 | 5. Install yarn: | 178 | 5. Install yarn: |
diff --git a/support/doc/tools.md b/support/doc/tools.md index 62ba52111..e6c4c2010 100644 --- a/support/doc/tools.md +++ b/support/doc/tools.md | |||
@@ -39,7 +39,6 @@ You need to follow all the following steps even if you are on a PeerTube server | |||
39 | ### Dependencies | 39 | ### Dependencies |
40 | 40 | ||
41 | Install the [PeerTube dependencies](dependencies.md) except PostgreSQL and Redis. | 41 | Install the [PeerTube dependencies](dependencies.md) except PostgreSQL and Redis. |
42 | PeerTube supports NodeJS 12. | ||
43 | 42 | ||
44 | ### Installation | 43 | ### Installation |
45 | 44 | ||
@@ -348,7 +347,7 @@ $ cd /var/www/peertube/peertube-latest | |||
348 | $ sudo -u peertube NODE_CONFIG_DIR=/var/www/peertube/config NODE_ENV=production npm run plugin:uninstall -- --npm-name peertube-plugin-myplugin | 347 | $ sudo -u peertube NODE_CONFIG_DIR=/var/www/peertube/config NODE_ENV=production npm run plugin:uninstall -- --npm-name peertube-plugin-myplugin |
349 | ``` | 348 | ``` |
350 | 349 | ||
351 | ### REPL ([Read Eval Print Loop](https://nodejs.org/docs/latest-v10.x/api/repl.html)) | 350 | ### REPL (Read Eval Print Loop) |
352 | 351 | ||
353 | If you want to interact with the application libraries and objects even when PeerTube is not running, there is a REPL for that. | 352 | If you want to interact with the application libraries and objects even when PeerTube is not running, there is a REPL for that. |
354 | 353 | ||
diff --git a/support/docker/production/Dockerfile.buster b/support/docker/production/Dockerfile.buster index 457936090..f06a22c00 100644 --- a/support/docker/production/Dockerfile.buster +++ b/support/docker/production/Dockerfile.buster | |||
@@ -1,4 +1,4 @@ | |||
1 | FROM node:10-buster-slim | 1 | FROM node:12-buster-slim |
2 | 2 | ||
3 | # Allow to pass extra options to the npm run build | 3 | # Allow to pass extra options to the npm run build |
4 | # eg: --light --light-fr to not build all client languages | 4 | # eg: --light --light-fr to not build all client languages |
@@ -1118,10 +1118,10 @@ anymatch@~3.1.1: | |||
1118 | normalize-path "^3.0.0" | 1118 | normalize-path "^3.0.0" |
1119 | picomatch "^2.0.4" | 1119 | picomatch "^2.0.4" |
1120 | 1120 | ||
1121 | apicache@^1.4.0: | 1121 | apicache@1.5.2: |
1122 | version "1.5.3" | 1122 | version "1.5.2" |
1123 | resolved "https://registry.yarnpkg.com/apicache/-/apicache-1.5.3.tgz#8977b358bf7d579d55fe3d183c907ae5dbcfb357" | 1123 | resolved "https://registry.yarnpkg.com/apicache/-/apicache-1.5.2.tgz#2cb0697d9b1b612b505b1a44face66d48b1d1404" |
1124 | integrity sha512-n1h39Bt7tMiJMV0u0tFlhigig8Uo/wJmKoj6WE/OwvZ+WbFchn7jnXleotZOzZTUBtr0Tg9iJshHnJDAGQbAEQ== | 1124 | integrity sha512-jO8ie/Zqmr3MxLQSVNsHiQo5R1tbbP1TnpI6xOnRJv9wUOSP+YnZkULWmdo3fE7PHBSxIQzgIsEHGa6H5hKH9Q== |
1125 | 1125 | ||
1126 | append-field@^1.0.0: | 1126 | append-field@^1.0.0: |
1127 | version "1.0.0" | 1127 | version "1.0.0" |