github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12658 from overleaf/bg-node-18-upgrade

Browse source 
Upgrade to node 18

GitOrigin-RevId: 1b25d20a8987950a72a7bf966a825794de4ad960
This commit is contained in:
Brian Gough 2023-04-19 10:01:25 +01:00 committed by Copybot
parent df300b5f24
commit ed0acd8e58
71 changed files with 132 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/access-token-encryptor/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
libraries/access-token-encryptor/buildscript.txt
View file

@ -4,6 +4,6 @@ access-token-encryptor
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--is-library=True --is-library=True
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

2
libraries/logger/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
libraries/logger/buildscript.txt
View file

@ -4,6 +4,6 @@ logger
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--is-library=True --is-library=True
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

2
libraries/metrics/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
libraries/metrics/buildscript.txt
View file

@ -4,6 +4,6 @@ metrics
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--is-library=True --is-library=True
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

2
libraries/o-error/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
libraries/o-error/buildscript.txt
View file

@ -4,6 +4,6 @@ o-error
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--is-library=True --is-library=True
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

2
libraries/object-persistor/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
libraries/object-persistor/buildscript.txt
View file

@ -4,6 +4,6 @@ object-persistor
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--is-library=True --is-library=True
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

2
libraries/overleaf-editor-core/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
libraries/overleaf-editor-core/buildscript.txt
View file

@ -4,6 +4,6 @@ overleaf-editor-core
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--is-library=True --is-library=True
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

2
libraries/redis-wrapper/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
libraries/redis-wrapper/buildscript.txt
View file

@ -4,6 +4,6 @@ redis-wrapper
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--is-library=True --is-library=True
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

2
libraries/settings/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
libraries/settings/buildscript.txt
View file

@ -4,6 +4,6 @@ settings
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--is-library=True --is-library=True
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

38
package-lock.json generated
View file

@ -15550,13 +15550,13 @@
"dev": true "dev": true
}, },
"node_modules/eslint-plugin-mocha": { "node_modules/eslint-plugin-mocha": {
"version": "10.0.4", "version": "10.1.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.0.4.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz",
"integrity": "sha512-8wzAeepVY027oBHz/TmBmUr7vhVqoC1KTFeDybFLhbaWKx+aQ7fJJVuUsqcUy+L+G+XvgQBJY+cbAf7hl5DF7Q==", "integrity": "sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"ramda": "^0.28.0" "rambda": "^7.1.0"
}, },
"engines": { "engines": {
"node": ">=14.0.0" "node": ">=14.0.0"
@ -27042,15 +27042,11 @@
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/ramda": { "node_modules/rambda": {
"version": "0.28.0", "version": "7.5.0",
"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz", "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.5.0.tgz",
"integrity": "sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==", "integrity": "sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==",
"dev": true, "dev": true
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/ramda"
}
}, },
"node_modules/random-bytes": { "node_modules/random-bytes": {
"version": "1.0.0", "version": "1.0.0",
@ -53039,13 +53035,13 @@
} }
}, },
"eslint-plugin-mocha": { "eslint-plugin-mocha": {
"version": "10.0.4", "version": "10.1.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.0.4.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz",
"integrity": "sha512-8wzAeepVY027oBHz/TmBmUr7vhVqoC1KTFeDybFLhbaWKx+aQ7fJJVuUsqcUy+L+G+XvgQBJY+cbAf7hl5DF7Q==", "integrity": "sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw==",
"dev": true, "dev": true,
"requires": { "requires": {
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"ramda": "^0.28.0" "rambda": "^7.1.0"
}, },
"dependencies": { "dependencies": {
"eslint-utils": { "eslint-utils": {
@ -62174,10 +62170,10 @@
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
"integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=" "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g="
}, },
"ramda": { "rambda": {
"version": "0.28.0", "version": "7.5.0",
"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz", "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.5.0.tgz",
"integrity": "sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==", "integrity": "sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==",
"dev": true "dev": true
}, },
"random-bytes": { "random-bytes": {

2
services/chat/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/chat/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/chat WORKDIR /overleaf/services/chat

2
services/chat/buildscript.txt
View file

@ -3,6 +3,6 @@ chat
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

4
services/chat/docker-compose.yml
View file

@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/chat - .:/overleaf/services/chat
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/chat - .:/overleaf/services/chat
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/clsi/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/clsi/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/clsi WORKDIR /overleaf/services/clsi
COPY services/clsi/install_deps.sh /overleaf/services/clsi/ COPY services/clsi/install_deps.sh /overleaf/services/clsi/

2
services/clsi/buildscript.txt
View file

@ -5,6 +5,6 @@ clsi
--env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true" --env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true"
--env-pass-through=TEXLIVE_IMAGE --env-pass-through=TEXLIVE_IMAGE
--has-custom-cloudbuild=True --has-custom-cloudbuild=True
--node-version=16.17.1 --node-version=18.16.0
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0

2
services/contacts/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/contacts/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/contacts WORKDIR /overleaf/services/contacts

2
services/contacts/buildscript.txt
View file

@ -3,6 +3,6 @@ contacts
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

4
services/contacts/docker-compose.yml
View file

@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/contacts - .:/overleaf/services/contacts
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/contacts - .:/overleaf/services/contacts
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/docstore/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/docstore/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/docstore WORKDIR /overleaf/services/docstore

2
services/docstore/buildscript.txt
View file

@ -3,6 +3,6 @@ docstore
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0

4
services/docstore/docker-compose.yml
View file

@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/docstore - .:/overleaf/services/docstore
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/docstore - .:/overleaf/services/docstore
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/document-updater/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/document-updater/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/document-updater WORKDIR /overleaf/services/document-updater

2
services/document-updater/buildscript.txt
View file

@ -3,6 +3,6 @@ document-updater
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0

4
services/document-updater/docker-compose.yml
View file

@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/document-updater - .:/overleaf/services/document-updater
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/document-updater - .:/overleaf/services/document-updater
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/filestore/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/filestore/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/filestore WORKDIR /overleaf/services/filestore
COPY services/filestore/install_deps.sh /overleaf/services/filestore/ COPY services/filestore/install_deps.sh /overleaf/services/filestore/

2
services/filestore/buildscript.txt
View file

@ -4,6 +4,6 @@ filestore
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add=ENABLE_CONVERSIONS="true",USE_PROM_METRICS="true",AWS_S3_USER_FILES_BUCKET_NAME=fake_user_files,AWS_S3_TEMPLATE_FILES_BUCKET_NAME=fake_template_files,AWS_S3_PUBLIC_FILES_BUCKET_NAME=fake_public_files,GCS_USER_FILES_BUCKET_NAME=fake_userfiles,GCS_TEMPLATE_FILES_BUCKET_NAME=fake_templatefiles,GCS_PUBLIC_FILES_BUCKET_NAME=fake_publicfiles --env-add=ENABLE_CONVERSIONS="true",USE_PROM_METRICS="true",AWS_S3_USER_FILES_BUCKET_NAME=fake_user_files,AWS_S3_TEMPLATE_FILES_BUCKET_NAME=fake_template_files,AWS_S3_PUBLIC_FILES_BUCKET_NAME=fake_public_files,GCS_USER_FILES_BUCKET_NAME=fake_userfiles,GCS_TEMPLATE_FILES_BUCKET_NAME=fake_templatefiles,GCS_PUBLIC_FILES_BUCKET_NAME=fake_publicfiles
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0

29
services/filestore/test/acceptance/js/FilestoreTests.js
View file

@ -13,11 +13,9 @@ const streamifier = require('streamifier')
chai.use(require('chai-as-promised')) chai.use(require('chai-as-promised'))
const { ObjectId } = require('mongodb') const { ObjectId } = require('mongodb')
const tk = require('timekeeper') const tk = require('timekeeper')
const ChildProcess = require('child_process')
const fsWriteFile = promisify(fs.writeFile) const fsWriteFile = promisify(fs.writeFile)
const fsStat = promisify(fs.stat) const fsStat = promisify(fs.stat)
const exec = promisify(ChildProcess.exec)
const msleep = promisify(setTimeout) const msleep = promisify(setTimeout)
if (!process.env.AWS_ACCESS_KEY_ID) { if (!process.env.AWS_ACCESS_KEY_ID) {
@ -42,19 +40,24 @@ describe('Filestore', function () {
async function expectNoSockets() { async function expectNoSockets() {
try { try {
await msleep(1000) await msleep(1000)
const { stdout } = await exec('ss -tnH') const stdout = await fs.promises.readFile('/proc/net/tcp', 'utf8')
const badSockets = [] const badSockets = []
for (const socket of stdout.split('\n')) { const lines = stdout.split('\n').map(line => line.trim().split(/\s+/))
const fields = socket.split(' ').filter(part => part !== '') const header = lines.shift()
if ( if (header[4] === 'tx_queue' && header[5] === 'rx_queue') {
fields.length > 2 && for (const socket of lines) {
parseInt(fields[1]) && if (
!seenSockets.includes(socket) socket.length > 5 &&
) { socket[4] !== '00000000:00000000' && // ensure the socket queues are empty
badSockets.push(socket) !seenSockets.includes(socket)
seenSockets.push(socket) ) {
console.log('socket still has data', socket)
badSockets.push(socket)
seenSockets.push(socket)
}
} }
} else {
throw new Error('unexpected format in /proc/net/tcp')
} }
if (badSockets.length) { if (badSockets.length) {

2
services/history-v1/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/history-v1/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/history-v1 WORKDIR /overleaf/services/history-v1

2
services/history-v1/buildscript.txt
View file

@ -3,6 +3,6 @@ history-v1
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

4
services/history-v1/docker-compose.yml
View file

@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/history-v1 - .:/overleaf/services/history-v1
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/history-v1 - .:/overleaf/services/history-v1
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/notifications/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/notifications/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/notifications WORKDIR /overleaf/services/notifications

2
services/notifications/buildscript.txt
View file

@ -3,6 +3,6 @@ notifications
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0

4
services/notifications/docker-compose.yml
View file

@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/notifications - .:/overleaf/services/notifications
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/notifications - .:/overleaf/services/notifications
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/project-history/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/project-history/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/project-history WORKDIR /overleaf/services/project-history

2
services/project-history/buildscript.txt
View file

@ -3,6 +3,6 @@ project-history
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

4
services/project-history/docker-compose.yml
View file

@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/project-history - .:/overleaf/services/project-history
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/project-history - .:/overleaf/services/project-history
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/real-time/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/real-time/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/real-time WORKDIR /overleaf/services/real-time

2
services/real-time/buildscript.txt
View file

@ -3,6 +3,6 @@ real-time
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0

4
services/real-time/docker-compose.yml
View file

@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/real-time - .:/overleaf/services/real-time
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/real-time - .:/overleaf/services/real-time
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/spelling/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/spelling/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/spelling WORKDIR /overleaf/services/spelling
COPY services/spelling/install_deps.sh /overleaf/services/spelling/ COPY services/spelling/install_deps.sh /overleaf/services/spelling/

2
services/spelling/buildscript.txt
View file

@ -4,6 +4,6 @@ spelling
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0

10
services/spelling/install_deps.sh
View file

@ -3,7 +3,7 @@
set -ex set -ex
# Prefer Debian packages over Ubuntu packages # Prefer Debian packages over Ubuntu packages
echo 'APT::Default-Release "buster";' >/etc/apt/apt.conf.d/default-release echo 'APT::Default-Release "bullseye";' >/etc/apt/apt.conf.d/default-release
# The following aspell packages exist in Ubuntu but not Debian: # The following aspell packages exist in Ubuntu but not Debian:
# aspell-af, aspell-id, aspell-nr, aspell-ns, aspell-st, aspell-tn, aspell-ts, aspell-xh # aspell-af, aspell-id, aspell-nr, aspell-ns, aspell-st, aspell-tn, aspell-ts, aspell-xh
@ -11,11 +11,5 @@ echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main universe" >
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main universe" > /etc/apt/sources.list.d/focal-ports-arm.list echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main universe" > /etc/apt/sources.list.d/focal-ports-arm.list
apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
# aspell-pt-pt is broken in buster, we'll obtain it from bullseye
echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
apt-get update apt-get update
apt-get install -y aspell aspell-en aspell-af aspell-ar aspell-ar-large aspell-bg aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-1901 aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-hr aspell-hsb aspell-id aspell-it aspell-kk aspell-ku aspell-lt aspell-lv aspell-nl aspell-no aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-xh apt-get install -y aspell aspell-en aspell-af aspell-ar aspell-ar-large aspell-bg aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-1901 aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-hr aspell-hsb aspell-id aspell-it aspell-kk aspell-ku aspell-lt aspell-lv aspell-nl aspell-no aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt-br aspell-pt-pt aspell-ro aspell-ru aspell-sk aspell-sl aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-xh
# aspell-pt-pt is broken in buster. Install it from bullseye
apt-get install -y -t bullseye aspell-pt-pt

21
services/spelling/test/acceptance/js/CheckTest.js
View file

@ -27,7 +27,26 @@ describe('checking words', function () {
it('should return the list of misspellings', async function () { it('should return the list of misspellings', async function () {
const body = JSON.parse(response.body) const body = JSON.parse(response.body)
expect(body).to.deep.equal({ expect(body).to.deep.equal({
misspellings: [{ index: 0, suggestions: ['anther', 'another'] }], misspellings: [
{
index: 0,
suggestions: [
'anther',
'another',
'anthers',
'panther',
'anathema',
'anthem',
'nether',
"anther's",
'ante',
'neither',
'norther',
'ether',
'other',
],
},
],
}) })
}) })
}) })

2
services/track-changes/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/track-changes/Dockerfile
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/track-changes WORKDIR /overleaf/services/track-changes

2
services/track-changes/buildscript.txt
View file

@ -3,6 +3,6 @@ track-changes
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add=AWS_BUCKET=bucket --env-add=AWS_BUCKET=bucket
--env-pass-through= --env-pass-through=
--node-version=16.17.1 --node-version=18.16.0
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0

4
services/track-changes/docker-compose.yml
View file

@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/track-changes - .:/overleaf/services/track-changes
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/track-changes - .:/overleaf/services/track-changes
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/web/.nvmrc
View file

@ -1 +1 @@
16.17.1 18.16.0

2
services/web/Dockerfile
View file

@ -1,6 +1,6 @@
# the base image is suitable for running web with /overleaf/services/web bind # the base image is suitable for running web with /overleaf/services/web bind
# mounted # mounted
FROM node:16.17.1 as base FROM node:18.16.0 as base
WORKDIR /overleaf/services/web WORKDIR /overleaf/services/web

2
services/web/Dockerfile.frontend
View file

@ -1,4 +1,4 @@
FROM node:16.17.1 FROM node:18.16.0
# Install Google Chrome # Install Google Chrome
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -

2
services/web/docker-compose.common.env
View file

@ -41,5 +41,5 @@ SHARELATEX_SAML_UPDATE_USER_DETAILS_ON_LOGIN=true
SHARELATEX_SAML_CERT=MIIDXTCCAkWgAwIBAgIJAOvOeQ4xFTzsMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMTYxMTE1MTQxMjU5WhcNMjYxMTE1MTQxMjU5WjBFMQswCQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCT6MBe5G9VoLU8MfztOEbUhnwLp17ak8eFUqxqeXkkqtWB0b/cmIBU3xoQoO3dIF8PBzfqehqfYVhrNt/TFgcmDfmJnPJRL1RJWMW3VmiP5odJ3LwlkKbZpkeT3wZ8HEJIR1+zbpxiBNkbd2GbdR1iumcsHzMYX1A2CBj+ZMV5VijC+K4P0e9c05VsDEUtLmfeAasJAiumQoVVgAe/BpiXjICGGewa6EPFI7mKkifIRKOGxdRESwZZjxP30bI31oDN0cgKqIgSJtJ9nfCn9jgBMBkQHu42WMuaWD4jrGd7+vYdX+oIfArs9aKgAH5kUGhGdew2R9SpBefrhbNxG8QIDAQABo1AwTjAdBgNVHQ4EFgQU+aSojSyyLChP/IpZcafvSdhj7KkwHwYDVR0jBBgwFoAU+aSojSyyLChP/IpZcafvSdhj7KkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEABl3+OOVLBWMKs6PjA8lPuloWDNzSr3v76oUcHqAb+cfbucjXrOVsS9RJ0X9yxvCQyfM9FfY43DbspnN3izYhdvbJD8kKLNf0LA5st+ZxLfy0ACyL2iyAwICaqndqxAjQYplFAHmpUiu1DiHckyBPekokDJd+ze95urHMOsaGS5RWPoKJVE0bkaAeZCmEu0NNpXRSBiuxXSTeSAJfv6kyE/rkdhzUKyUl/cGQFrsVYfAFQVA+W6CKOh74ErSEzSHQQYndl7nD33snD/YqdU1ROxV6aJzLKCg+sdj+wRXSP2u/UHnM4jW9TGJfhO42jzL6WVuEvr9q4l7zWzUQKKKhtQ== SHARELATEX_SAML_CERT=MIIDXTCCAkWgAwIBAgIJAOvOeQ4xFTzsMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMTYxMTE1MTQxMjU5WhcNMjYxMTE1MTQxMjU5WjBFMQswCQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCT6MBe5G9VoLU8MfztOEbUhnwLp17ak8eFUqxqeXkkqtWB0b/cmIBU3xoQoO3dIF8PBzfqehqfYVhrNt/TFgcmDfmJnPJRL1RJWMW3VmiP5odJ3LwlkKbZpkeT3wZ8HEJIR1+zbpxiBNkbd2GbdR1iumcsHzMYX1A2CBj+ZMV5VijC+K4P0e9c05VsDEUtLmfeAasJAiumQoVVgAe/BpiXjICGGewa6EPFI7mKkifIRKOGxdRESwZZjxP30bI31oDN0cgKqIgSJtJ9nfCn9jgBMBkQHu42WMuaWD4jrGd7+vYdX+oIfArs9aKgAH5kUGhGdew2R9SpBefrhbNxG8QIDAQABo1AwTjAdBgNVHQ4EFgQU+aSojSyyLChP/IpZcafvSdhj7KkwHwYDVR0jBBgwFoAU+aSojSyyLChP/IpZcafvSdhj7KkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEABl3+OOVLBWMKs6PjA8lPuloWDNzSr3v76oUcHqAb+cfbucjXrOVsS9RJ0X9yxvCQyfM9FfY43DbspnN3izYhdvbJD8kKLNf0LA5st+ZxLfy0ACyL2iyAwICaqndqxAjQYplFAHmpUiu1DiHckyBPekokDJd+ze95urHMOsaGS5RWPoKJVE0bkaAeZCmEu0NNpXRSBiuxXSTeSAJfv6kyE/rkdhzUKyUl/cGQFrsVYfAFQVA+W6CKOh74ErSEzSHQQYndl7nD33snD/YqdU1ROxV6aJzLKCg+sdj+wRXSP2u/UHnM4jW9TGJfhO42jzL6WVuEvr9q4l7zWzUQKKKhtQ==
# DEVICE_HISTORY_SECRET has been generated using: # DEVICE_HISTORY_SECRET has been generated using:
# NOTE: crypto.generateKeySync was added in v15, v16 is the next LTS release. # NOTE: crypto.generateKeySync was added in v15, v16 is the next LTS release.
# $ docker run --rm node:16 --print 'require("crypto").generateKeySync("aes", { length: 256 }).export().toString("hex")' # $ docker run --rm node:18 --print 'require("crypto").generateKeySync("aes", { length: 256 }).export().toString("hex")'
DEVICE_HISTORY_SECRET=1b46e6cdf72db02845da06c9517c9cfbbfa0d87357479f4e1df3ce160bd54807 DEVICE_HISTORY_SECRET=1b46e6cdf72db02845da06c9517c9cfbbfa0d87357479f4e1df3ce160bd54807

4
services/web/docker-compose.yml
View file

@ -6,7 +6,7 @@ volumes:
services: services:
test_unit: test_unit:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/web - .:/overleaf/services/web
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@ -21,7 +21,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: node:16.17.1 image: node:18.16.0
volumes: volumes:
- .:/overleaf/services/web - .:/overleaf/services/web
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules

2
services/web/scripts/translations/Dockerfile
View file

@ -1,4 +1,4 @@
FROM node:16.17.1 FROM node:18.16.0
WORKDIR /app/scripts/translations WORKDIR /app/scripts/translations