diff --git a/libraries/access-token-encryptor/.nvmrc b/libraries/access-token-encryptor/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/access-token-encryptor/.nvmrc +++ b/libraries/access-token-encryptor/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/access-token-encryptor/buildscript.txt b/libraries/access-token-encryptor/buildscript.txt index f70d252ccb..e4dc9b4dc7 100644 --- a/libraries/access-token-encryptor/buildscript.txt +++ b/libraries/access-token-encryptor/buildscript.txt @@ -6,6 +6,6 @@ access-token-encryptor --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/fetch-utils/.nvmrc b/libraries/fetch-utils/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/fetch-utils/.nvmrc +++ b/libraries/fetch-utils/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/fetch-utils/buildscript.txt b/libraries/fetch-utils/buildscript.txt index 0259eb80e7..2db01f30ca 100644 --- a/libraries/fetch-utils/buildscript.txt +++ b/libraries/fetch-utils/buildscript.txt @@ -6,6 +6,6 @@ fetch-utils --esmock-loader=False --has-custom-nodemon=True --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/logger/.nvmrc b/libraries/logger/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/logger/.nvmrc +++ b/libraries/logger/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/logger/buildscript.txt b/libraries/logger/buildscript.txt index 06ddd7fe2c..230ab6c9c3 100644 --- a/libraries/logger/buildscript.txt +++ b/libraries/logger/buildscript.txt @@ -6,6 +6,6 @@ logger --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/metrics/.nvmrc b/libraries/metrics/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/metrics/.nvmrc +++ b/libraries/metrics/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/metrics/buildscript.txt b/libraries/metrics/buildscript.txt index 6ea23b8055..8b399cba2e 100644 --- a/libraries/metrics/buildscript.txt +++ b/libraries/metrics/buildscript.txt @@ -6,6 +6,6 @@ metrics --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/o-error/.nvmrc b/libraries/o-error/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/o-error/.nvmrc +++ b/libraries/o-error/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/o-error/buildscript.txt b/libraries/o-error/buildscript.txt index 6b626d25f3..dfb3410cd4 100644 --- a/libraries/o-error/buildscript.txt +++ b/libraries/o-error/buildscript.txt @@ -6,6 +6,6 @@ o-error --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/object-persistor/.nvmrc b/libraries/object-persistor/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/object-persistor/.nvmrc +++ b/libraries/object-persistor/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/object-persistor/buildscript.txt b/libraries/object-persistor/buildscript.txt index 2e0fb880f9..b22c3498be 100644 --- a/libraries/object-persistor/buildscript.txt +++ b/libraries/object-persistor/buildscript.txt @@ -6,6 +6,6 @@ object-persistor --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/overleaf-editor-core/.nvmrc b/libraries/overleaf-editor-core/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/overleaf-editor-core/.nvmrc +++ b/libraries/overleaf-editor-core/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/overleaf-editor-core/buildscript.txt b/libraries/overleaf-editor-core/buildscript.txt index 4ab0264e33..5d91717efd 100644 --- a/libraries/overleaf-editor-core/buildscript.txt +++ b/libraries/overleaf-editor-core/buildscript.txt @@ -6,6 +6,6 @@ overleaf-editor-core --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/ranges-tracker/.nvmrc b/libraries/ranges-tracker/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/ranges-tracker/.nvmrc +++ b/libraries/ranges-tracker/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/ranges-tracker/buildscript.txt b/libraries/ranges-tracker/buildscript.txt index c382932a2c..bda2936c40 100644 --- a/libraries/ranges-tracker/buildscript.txt +++ b/libraries/ranges-tracker/buildscript.txt @@ -6,6 +6,6 @@ ranges-tracker --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/redis-wrapper/.nvmrc b/libraries/redis-wrapper/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/redis-wrapper/.nvmrc +++ b/libraries/redis-wrapper/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/redis-wrapper/buildscript.txt b/libraries/redis-wrapper/buildscript.txt index 98bc57ab9c..c0e455dce2 100644 --- a/libraries/redis-wrapper/buildscript.txt +++ b/libraries/redis-wrapper/buildscript.txt @@ -6,6 +6,6 @@ redis-wrapper --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/settings/.nvmrc b/libraries/settings/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/settings/.nvmrc +++ b/libraries/settings/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/settings/buildscript.txt b/libraries/settings/buildscript.txt index df610e2094..a820537935 100644 --- a/libraries/settings/buildscript.txt +++ b/libraries/settings/buildscript.txt @@ -6,6 +6,6 @@ settings --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/libraries/stream-utils/.nvmrc b/libraries/stream-utils/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/libraries/stream-utils/.nvmrc +++ b/libraries/stream-utils/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/libraries/stream-utils/buildscript.txt b/libraries/stream-utils/buildscript.txt index 7a06e07169..982551b2bb 100644 --- a/libraries/stream-utils/buildscript.txt +++ b/libraries/stream-utils/buildscript.txt @@ -6,6 +6,6 @@ stream-utils --esmock-loader=False --has-custom-nodemon=False --is-library=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/services/chat/.nvmrc b/services/chat/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/chat/.nvmrc +++ b/services/chat/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/chat/Dockerfile b/services/chat/Dockerfile index e7ac968057..ee913b1f56 100644 --- a/services/chat/Dockerfile +++ b/services/chat/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/chat diff --git a/services/chat/Makefile b/services/chat/Makefile index e2d547c1f7..d745cfc985 100644 --- a/services/chat/Makefile +++ b/services/chat/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index 14c4f43d48..7323bb4d41 100644 --- a/services/chat/buildscript.txt +++ b/services/chat/buildscript.txt @@ -5,6 +5,6 @@ chat --env-pass-through= --esmock-loader=False --has-custom-nodemon=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml index 56c85523e6..be1943490a 100644 --- a/services/chat/docker-compose.yml +++ b/services/chat/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/chat - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/chat - ../../node_modules:/overleaf/node_modules diff --git a/services/clsi/.nvmrc b/services/clsi/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/clsi/.nvmrc +++ b/services/clsi/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/clsi/Dockerfile b/services/clsi/Dockerfile index 3486f83ab8..2d0f018ea5 100644 --- a/services/clsi/Dockerfile +++ b/services/clsi/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/clsi COPY services/clsi/install_deps.sh /overleaf/services/clsi/ diff --git a/services/clsi/Makefile b/services/clsi/Makefile index 53155b2f10..ff541ce1aa 100644 --- a/services/clsi/Makefile +++ b/services/clsi/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt index 1b9f91fbe7..41b6da553a 100644 --- a/services/clsi/buildscript.txt +++ b/services/clsi/buildscript.txt @@ -7,6 +7,6 @@ clsi --esmock-loader=False --has-custom-cloudbuild=True --has-custom-nodemon=False ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=True --script-version=4.3.0 diff --git a/services/contacts/.nvmrc b/services/contacts/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/contacts/.nvmrc +++ b/services/contacts/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/contacts/Dockerfile b/services/contacts/Dockerfile index 37481880c6..480f380639 100644 --- a/services/contacts/Dockerfile +++ b/services/contacts/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/contacts diff --git a/services/contacts/Makefile b/services/contacts/Makefile index 1609f12294..0ab272019c 100644 --- a/services/contacts/Makefile +++ b/services/contacts/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt index 82c965891f..a210eb3924 100644 --- a/services/contacts/buildscript.txt +++ b/services/contacts/buildscript.txt @@ -5,6 +5,6 @@ contacts --env-pass-through= --esmock-loader=True --has-custom-nodemon=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml index 35a97cbaa6..2c7b6874fc 100644 --- a/services/contacts/docker-compose.yml +++ b/services/contacts/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/contacts - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/contacts - ../../node_modules:/overleaf/node_modules diff --git a/services/docstore/.nvmrc b/services/docstore/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/docstore/.nvmrc +++ b/services/docstore/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/docstore/Dockerfile b/services/docstore/Dockerfile index 6b6e29fdc6..0e36741461 100644 --- a/services/docstore/Dockerfile +++ b/services/docstore/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/docstore diff --git a/services/docstore/Makefile b/services/docstore/Makefile index 03f28ce154..6b730e2240 100644 --- a/services/docstore/Makefile +++ b/services/docstore/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index 17af98974b..c7c7b0c3b0 100644 --- a/services/docstore/buildscript.txt +++ b/services/docstore/buildscript.txt @@ -5,6 +5,6 @@ docstore --env-pass-through= --esmock-loader=False --has-custom-nodemon=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=True --script-version=4.3.0 diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml index 33cf24b749..e1f610b377 100644 --- a/services/docstore/docker-compose.yml +++ b/services/docstore/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/docstore - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/docstore - ../../node_modules:/overleaf/node_modules diff --git a/services/document-updater/.nvmrc b/services/document-updater/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/document-updater/.nvmrc +++ b/services/document-updater/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/document-updater/Dockerfile b/services/document-updater/Dockerfile index 7ef1cc272b..5220c4939c 100644 --- a/services/document-updater/Dockerfile +++ b/services/document-updater/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/document-updater diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile index c63c8b7bf4..17e6fcbdf1 100644 --- a/services/document-updater/Makefile +++ b/services/document-updater/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt index 9d523c8afc..df00a6d713 100644 --- a/services/document-updater/buildscript.txt +++ b/services/document-updater/buildscript.txt @@ -5,6 +5,6 @@ document-updater --env-pass-through= --esmock-loader=False --has-custom-nodemon=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=True --script-version=4.3.0 diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml index eb6d17a93c..6f77cc8f1a 100644 --- a/services/document-updater/docker-compose.yml +++ b/services/document-updater/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/document-updater - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/document-updater - ../../node_modules:/overleaf/node_modules diff --git a/services/filestore/.nvmrc b/services/filestore/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/filestore/.nvmrc +++ b/services/filestore/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/filestore/Dockerfile b/services/filestore/Dockerfile index b1dfffb4e6..880695c54b 100644 --- a/services/filestore/Dockerfile +++ b/services/filestore/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/filestore COPY services/filestore/install_deps.sh /overleaf/services/filestore/ diff --git a/services/filestore/Makefile b/services/filestore/Makefile index ff1e988685..3bcdfc07d4 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index 6ab138d730..ea15c3423a 100644 --- a/services/filestore/buildscript.txt +++ b/services/filestore/buildscript.txt @@ -6,6 +6,6 @@ filestore --env-pass-through= --esmock-loader=False --has-custom-nodemon=False ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=True --script-version=4.3.0 diff --git a/services/history-v1/.nvmrc b/services/history-v1/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/history-v1/.nvmrc +++ b/services/history-v1/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/history-v1/Dockerfile b/services/history-v1/Dockerfile index d42f067f16..76c923b5be 100644 --- a/services/history-v1/Dockerfile +++ b/services/history-v1/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/history-v1 diff --git a/services/history-v1/Makefile b/services/history-v1/Makefile index 60a248a7a7..b588bacc68 100644 --- a/services/history-v1/Makefile +++ b/services/history-v1/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/history-v1/buildscript.txt b/services/history-v1/buildscript.txt index 014bd29e96..3062ff8f18 100644 --- a/services/history-v1/buildscript.txt +++ b/services/history-v1/buildscript.txt @@ -5,6 +5,6 @@ history-v1 --env-pass-through= --esmock-loader=False --has-custom-nodemon=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml index b4f1011a1d..34afd7bd53 100644 --- a/services/history-v1/docker-compose.yml +++ b/services/history-v1/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/history-v1 - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/history-v1 - ../../node_modules:/overleaf/node_modules diff --git a/services/notifications/.nvmrc b/services/notifications/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/notifications/.nvmrc +++ b/services/notifications/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index b85235a8b7..00e52fd262 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/notifications diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 5bbb187f55..42ae03c156 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index 9d166078e2..c39beac861 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -5,6 +5,6 @@ notifications --env-pass-through= --esmock-loader=False --has-custom-nodemon=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=True --script-version=4.3.0 diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index ea6450cdd4..e569c07062 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/notifications - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/notifications - ../../node_modules:/overleaf/node_modules diff --git a/services/project-history/.nvmrc b/services/project-history/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/project-history/.nvmrc +++ b/services/project-history/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/project-history/Dockerfile b/services/project-history/Dockerfile index d29cb3522a..bb730b4fd1 100644 --- a/services/project-history/Dockerfile +++ b/services/project-history/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/project-history diff --git a/services/project-history/Makefile b/services/project-history/Makefile index 97a5188c37..50b31df6ed 100644 --- a/services/project-history/Makefile +++ b/services/project-history/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/project-history/buildscript.txt b/services/project-history/buildscript.txt index fd912d55ce..8761d9e27b 100644 --- a/services/project-history/buildscript.txt +++ b/services/project-history/buildscript.txt @@ -5,6 +5,6 @@ project-history --env-pass-through= --esmock-loader=True --has-custom-nodemon=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/services/project-history/docker-compose.yml b/services/project-history/docker-compose.yml index 7e1616edcf..22b8321c65 100644 --- a/services/project-history/docker-compose.yml +++ b/services/project-history/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/project-history - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/project-history - ../../node_modules:/overleaf/node_modules diff --git a/services/real-time/.nvmrc b/services/real-time/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/real-time/.nvmrc +++ b/services/real-time/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index d5952a5871..ca2ff9361f 100644 --- a/services/real-time/Dockerfile +++ b/services/real-time/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/real-time diff --git a/services/real-time/Makefile b/services/real-time/Makefile index 6fc32f75f3..c04b5f0f4d 100644 --- a/services/real-time/Makefile +++ b/services/real-time/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 2712fee227..6489eee1bf 100644 --- a/services/real-time/buildscript.txt +++ b/services/real-time/buildscript.txt @@ -5,6 +5,6 @@ real-time --env-pass-through= --esmock-loader=False --has-custom-nodemon=False ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=False --script-version=4.3.0 diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml index 22a8dc97a1..74492df17f 100644 --- a/services/real-time/docker-compose.yml +++ b/services/real-time/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/real-time - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/real-time - ../../node_modules:/overleaf/node_modules diff --git a/services/spelling/.nvmrc b/services/spelling/.nvmrc index b6c973d68b..4844a4887b 100644 --- a/services/spelling/.nvmrc +++ b/services/spelling/.nvmrc @@ -1 +1 @@ -18.17.1-buster +18.18.0-buster diff --git a/services/spelling/Dockerfile b/services/spelling/Dockerfile index b3f713806c..c2d3c13c37 100644 --- a/services/spelling/Dockerfile +++ b/services/spelling/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1-buster as base +FROM node:18.18.0-buster as base WORKDIR /overleaf/services/spelling COPY services/spelling/install_deps.sh /overleaf/services/spelling/ diff --git a/services/spelling/Makefile b/services/spelling/Makefile index 4fda790533..82867466ad 100644 --- a/services/spelling/Makefile +++ b/services/spelling/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1-buster npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0-buster npm run --silent format: $(RUN_LINTING) format diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt index b15c36df5f..c7fd9f4263 100644 --- a/services/spelling/buildscript.txt +++ b/services/spelling/buildscript.txt @@ -6,6 +6,6 @@ spelling --env-pass-through= --esmock-loader=True --has-custom-nodemon=False ---node-version=18.17.1-buster +--node-version=18.18.0-buster --public-repo=False --script-version=4.3.0 diff --git a/services/track-changes/.nvmrc b/services/track-changes/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/track-changes/.nvmrc +++ b/services/track-changes/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/track-changes/Dockerfile b/services/track-changes/Dockerfile index ab0a10f9fc..4c316f41cd 100644 --- a/services/track-changes/Dockerfile +++ b/services/track-changes/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/track-changes diff --git a/services/track-changes/Makefile b/services/track-changes/Makefile index 2d878e7988..9874879e60 100644 --- a/services/track-changes/Makefile +++ b/services/track-changes/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:18.18.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/track-changes/buildscript.txt b/services/track-changes/buildscript.txt index 97b5ed477b..7198f81142 100644 --- a/services/track-changes/buildscript.txt +++ b/services/track-changes/buildscript.txt @@ -5,6 +5,6 @@ track-changes --env-pass-through= --esmock-loader=False --has-custom-nodemon=True ---node-version=18.17.1 +--node-version=18.18.0 --public-repo=True --script-version=4.3.0 diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml index 25e1b51329..9913424da9 100644 --- a/services/track-changes/docker-compose.yml +++ b/services/track-changes/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/track-changes - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/track-changes - ../../node_modules:/overleaf/node_modules diff --git a/services/web/.nvmrc b/services/web/.nvmrc index 4a1f488b6c..02c8b485ed 100644 --- a/services/web/.nvmrc +++ b/services/web/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.0 diff --git a/services/web/Dockerfile b/services/web/Dockerfile index 2ebba53cc4..861978bdf6 100644 --- a/services/web/Dockerfile +++ b/services/web/Dockerfile @@ -1,6 +1,6 @@ # the base image is suitable for running web with /overleaf/services/web bind # mounted -FROM node:18.17.1 as base +FROM node:18.18.0 as base WORKDIR /overleaf/services/web diff --git a/services/web/Dockerfile.frontend b/services/web/Dockerfile.frontend index d2f8239eea..b24bd7e0f0 100644 --- a/services/web/Dockerfile.frontend +++ b/services/web/Dockerfile.frontend @@ -1,4 +1,4 @@ -FROM node:18.17.1 +FROM node:18.18.0 # Install Google Chrome RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - diff --git a/services/web/app/src/infrastructure/Server.js b/services/web/app/src/infrastructure/Server.js index c28d26a684..5768113ed4 100644 --- a/services/web/app/src/infrastructure/Server.js +++ b/services/web/app/src/infrastructure/Server.js @@ -303,15 +303,7 @@ if (Settings.csp && Settings.csp.enabled) { } logger.debug('creating HTTP server'.yellow) -const server = require('http').createServer( - process.env.NODE_ENV === 'test' - ? { - // Workaround broken detection of idle connections in CI. - connectionsCheckingInterval: 30 * 60 * 1000, - } - : {}, - app -) +const server = require('http').createServer(app) // provide settings for separate web and api processes if (Settings.enabledServices.includes('api')) { diff --git a/services/web/docker-compose.common.env b/services/web/docker-compose.common.env index b09dc42191..9ca6e40c84 100644 --- a/services/web/docker-compose.common.env +++ b/services/web/docker-compose.common.env @@ -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== # DEVICE_HISTORY_SECRET has been generated using: # NOTE: crypto.generateKeySync was added in v15, v16 is the next LTS release. -# $ docker run --rm node:18.17.1 --print 'require("crypto").generateKeySync("aes", { length: 256 }).export().toString("hex")' +# $ docker run --rm node:18.18.0 --print 'require("crypto").generateKeySync("aes", { length: 256 }).export().toString("hex")' DEVICE_HISTORY_SECRET=1b46e6cdf72db02845da06c9517c9cfbbfa0d87357479f4e1df3ce160bd54807 diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index a8a746fde3..7149907c34 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -6,7 +6,7 @@ volumes: services: test_unit: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/web - ../../node_modules:/overleaf/node_modules @@ -21,7 +21,7 @@ services: user: node test_acceptance: - image: node:18.17.1 + image: node:18.18.0 volumes: - .:/overleaf/services/web - ../../node_modules:/overleaf/node_modules diff --git a/services/web/scripts/translations/Dockerfile b/services/web/scripts/translations/Dockerfile index 93208d1aa0..ad3b8c1fec 100644 --- a/services/web/scripts/translations/Dockerfile +++ b/services/web/scripts/translations/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.17.1 +FROM node:18.18.0 WORKDIR /app/scripts/translations diff --git a/services/web/test/acceptance/src/LinkedFilesTests.js b/services/web/test/acceptance/src/LinkedFilesTests.js index a4e22e30c6..642389f6f1 100644 --- a/services/web/test/acceptance/src/LinkedFilesTests.js +++ b/services/web/test/acceptance/src/LinkedFilesTests.js @@ -9,7 +9,6 @@ const express = require('express') const { plainTextResponse, } = require('../../../app/src/infrastructure/Response') -const http = require('http') const LinkedUrlProxy = express() LinkedUrlProxy.get('/', (req, res, next) => { if (req.query.url === 'http://example.com/foo') { @@ -32,15 +31,7 @@ describe('LinkedFiles', function () { let server before(function (done) { - server = http - .createServer( - { - // Workaround broken detection of idle connections in CI. - connectionsCheckingInterval: 30 * 60 * 1000, - }, - LinkedUrlProxy - ) - .listen(6543, done) + server = LinkedUrlProxy.listen(6543, done) }) after(function (done) { server.close(done) diff --git a/services/web/test/acceptance/src/mocks/AbstractMockApi.js b/services/web/test/acceptance/src/mocks/AbstractMockApi.js index b77d69857f..780a49bb5f 100644 --- a/services/web/test/acceptance/src/mocks/AbstractMockApi.js +++ b/services/web/test/acceptance/src/mocks/AbstractMockApi.js @@ -1,7 +1,6 @@ const OError = require('@overleaf/o-error') const express = require('express') const bodyParser = require('body-parser') -const http = require('http') /** * Abstract class for running a mock API via Express. Handles setting up of @@ -140,14 +139,7 @@ class AbstractMockApi { // eslint-disable-next-line no-console console.log('Starting mock on port', this.constructor.name, this.port) } - this.server = http - .createServer( - { - // Workaround broken detection of idle connections in CI. - connectionsCheckingInterval: 30 * 60 * 1000, - }, - this.app - ) + this.server = this.app .listen(this.port, err => { if (err) { return reject(err)