Przeglądaj źródła

Merge pull request #14902 from overleaf/jpa-node-18-18-0

[misc] upgrade Node.js to latest LTS 18.18.0

GitOrigin-RevId: 96c7171065ceb8797c28efa4ab331d86a84868d2
Jakob Ackermann 3 lat temu
rodzic
commit
a2cf7b459c
88 zmienionych plików z 98 dodań i 123 usunięć
  1. 1 1
      libraries/access-token-encryptor/.nvmrc
  2. 1 1
      libraries/access-token-encryptor/buildscript.txt
  3. 1 1
      libraries/fetch-utils/.nvmrc
  4. 1 1
      libraries/fetch-utils/buildscript.txt
  5. 1 1
      libraries/logger/.nvmrc
  6. 1 1
      libraries/logger/buildscript.txt
  7. 1 1
      libraries/metrics/.nvmrc
  8. 1 1
      libraries/metrics/buildscript.txt
  9. 1 1
      libraries/o-error/.nvmrc
  10. 1 1
      libraries/o-error/buildscript.txt
  11. 1 1
      libraries/object-persistor/.nvmrc
  12. 1 1
      libraries/object-persistor/buildscript.txt
  13. 1 1
      libraries/overleaf-editor-core/.nvmrc
  14. 1 1
      libraries/overleaf-editor-core/buildscript.txt
  15. 1 1
      libraries/ranges-tracker/.nvmrc
  16. 1 1
      libraries/ranges-tracker/buildscript.txt
  17. 1 1
      libraries/redis-wrapper/.nvmrc
  18. 1 1
      libraries/redis-wrapper/buildscript.txt
  19. 1 1
      libraries/settings/.nvmrc
  20. 1 1
      libraries/settings/buildscript.txt
  21. 1 1
      libraries/stream-utils/.nvmrc
  22. 1 1
      libraries/stream-utils/buildscript.txt
  23. 1 1
      services/chat/.nvmrc
  24. 1 1
      services/chat/Dockerfile
  25. 1 1
      services/chat/Makefile
  26. 1 1
      services/chat/buildscript.txt
  27. 2 2
      services/chat/docker-compose.yml
  28. 1 1
      services/clsi/.nvmrc
  29. 1 1
      services/clsi/Dockerfile
  30. 1 1
      services/clsi/Makefile
  31. 1 1
      services/clsi/buildscript.txt
  32. 1 1
      services/contacts/.nvmrc
  33. 1 1
      services/contacts/Dockerfile
  34. 1 1
      services/contacts/Makefile
  35. 1 1
      services/contacts/buildscript.txt
  36. 2 2
      services/contacts/docker-compose.yml
  37. 1 1
      services/docstore/.nvmrc
  38. 1 1
      services/docstore/Dockerfile
  39. 1 1
      services/docstore/Makefile
  40. 1 1
      services/docstore/buildscript.txt
  41. 2 2
      services/docstore/docker-compose.yml
  42. 1 1
      services/document-updater/.nvmrc
  43. 1 1
      services/document-updater/Dockerfile
  44. 1 1
      services/document-updater/Makefile
  45. 1 1
      services/document-updater/buildscript.txt
  46. 2 2
      services/document-updater/docker-compose.yml
  47. 1 1
      services/filestore/.nvmrc
  48. 1 1
      services/filestore/Dockerfile
  49. 1 1
      services/filestore/Makefile
  50. 1 1
      services/filestore/buildscript.txt
  51. 1 1
      services/history-v1/.nvmrc
  52. 1 1
      services/history-v1/Dockerfile
  53. 1 1
      services/history-v1/Makefile
  54. 1 1
      services/history-v1/buildscript.txt
  55. 2 2
      services/history-v1/docker-compose.yml
  56. 1 1
      services/notifications/.nvmrc
  57. 1 1
      services/notifications/Dockerfile
  58. 1 1
      services/notifications/Makefile
  59. 1 1
      services/notifications/buildscript.txt
  60. 2 2
      services/notifications/docker-compose.yml
  61. 1 1
      services/project-history/.nvmrc
  62. 1 1
      services/project-history/Dockerfile
  63. 1 1
      services/project-history/Makefile
  64. 1 1
      services/project-history/buildscript.txt
  65. 2 2
      services/project-history/docker-compose.yml
  66. 1 1
      services/real-time/.nvmrc
  67. 1 1
      services/real-time/Dockerfile
  68. 1 1
      services/real-time/Makefile
  69. 1 1
      services/real-time/buildscript.txt
  70. 2 2
      services/real-time/docker-compose.yml
  71. 1 1
      services/spelling/.nvmrc
  72. 1 1
      services/spelling/Dockerfile
  73. 1 1
      services/spelling/Makefile
  74. 1 1
      services/spelling/buildscript.txt
  75. 1 1
      services/track-changes/.nvmrc
  76. 1 1
      services/track-changes/Dockerfile
  77. 1 1
      services/track-changes/Makefile
  78. 1 1
      services/track-changes/buildscript.txt
  79. 2 2
      services/track-changes/docker-compose.yml
  80. 1 1
      services/web/.nvmrc
  81. 1 1
      services/web/Dockerfile
  82. 1 1
      services/web/Dockerfile.frontend
  83. 1 9
      services/web/app/src/infrastructure/Server.js
  84. 1 1
      services/web/docker-compose.common.env
  85. 2 2
      services/web/docker-compose.yml
  86. 1 1
      services/web/scripts/translations/Dockerfile
  87. 1 10
      services/web/test/acceptance/src/LinkedFilesTests.js
  88. 1 9
      services/web/test/acceptance/src/mocks/AbstractMockApi.js

+ 1 - 1
libraries/access-token-encryptor/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/fetch-utils/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/logger/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/metrics/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/o-error/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/object-persistor/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/overleaf-editor-core/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/ranges-tracker/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/redis-wrapper/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/settings/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
libraries/stream-utils/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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

+ 1 - 1
services/chat/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/clsi/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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/

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
services/contacts/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/docstore/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/document-updater/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/filestore/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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/

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
services/history-v1/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/notifications/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/project-history/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/real-time/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/spelling/.nvmrc

@@ -1 +1 @@
-18.17.1-buster
+18.18.0-buster

+ 1 - 1
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/

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
services/track-changes/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/web/.nvmrc

@@ -1 +1 @@
-18.17.1
+18.18.0

+ 1 - 1
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
 

+ 1 - 1
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 -

+ 1 - 9
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')) {

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/web/scripts/translations/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.17.1
+FROM node:18.18.0
 
 WORKDIR /app/scripts/translations
 

+ 1 - 10
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)

+ 1 - 9
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)