Merge pull request #5705 from overleaf/jpa-node-14

[misc] upgrade node version from 12 to 14 GitOrigin-RevId: 15c465c7bb5e42b0c71e2dedb09cf4fe9f1d8ec6
2024-11-21 20:47:08 -05:00 · 2021-11-18 14:43:07 +01:00 · 2021-11-18 14:43:07 +01:00 · 2261e761f4
commit 2261e761f4
parent d8f4780679
57 changed files with 67 additions and 64 deletions
--- a/libraries/access-token-encryptor/.nvmrc
+++ b/libraries/access-token-encryptor/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/libraries/access-token-encryptor/buildscript.txt
+++ b/libraries/access-token-encryptor/buildscript.txt
@ -4,6 +4,6 @@ access-token-encryptor
 --env-add=
 --env-pass-through=
 --is-library=True
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/libraries/logger/.nvmrc
+++ b/libraries/logger/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/libraries/logger/buildscript.txt
+++ b/libraries/logger/buildscript.txt
@ -4,6 +4,6 @@ logger
 --env-add=
 --env-pass-through=
 --is-library=True
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/libraries/metrics/.nvmrc
+++ b/libraries/metrics/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/libraries/metrics/buildscript.txt
+++ b/libraries/metrics/buildscript.txt
@ -4,6 +4,6 @@ metrics
 --env-add=
 --env-pass-through=
 --is-library=True
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/libraries/o-error/.nvmrc
+++ b/libraries/o-error/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/libraries/o-error/buildscript.txt
+++ b/libraries/o-error/buildscript.txt
@ -4,6 +4,6 @@ o-error
 --env-add=
 --env-pass-through=
 --is-library=True
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/libraries/object-persistor/.nvmrc
+++ b/libraries/object-persistor/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/libraries/object-persistor/buildscript.txt
+++ b/libraries/object-persistor/buildscript.txt
@ -4,6 +4,6 @@ object-persistor
 --env-add=
 --env-pass-through=
 --is-library=True
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/libraries/redis-wrapper/.nvmrc
+++ b/libraries/redis-wrapper/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/libraries/redis-wrapper/buildscript.txt
+++ b/libraries/redis-wrapper/buildscript.txt
@ -4,6 +4,6 @@ redis-wrapper
 --env-add=
 --env-pass-through=
 --is-library=True
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/libraries/settings/.nvmrc
+++ b/libraries/settings/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/libraries/settings/buildscript.txt
+++ b/libraries/settings/buildscript.txt
@ -4,6 +4,6 @@ settings
 --env-add=
 --env-pass-through=
 --is-library=True
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/server-ce/Dockerfile-base
+++ b/server-ce/Dockerfile-base
@ -17,8 +17,8 @@ RUN apt-get update \
      qpdf \
      aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-nr aspell-ns  aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-ss aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu \
    \
-# install Node.JS 12
-&&  curl -sSL https://deb.nodesource.com/setup_12.x | bash - \
+# install Node.JS 14
+&&  curl -sSL https://deb.nodesource.com/setup_14.x | bash - \
 &&  apt-get install -y nodejs \
    \
 &&  rm -rf \
--- a/services/chat/.nvmrc
+++ b/services/chat/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/chat/Dockerfile
+++ b/services/chat/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app

--- a/services/chat/buildscript.txt
+++ b/services/chat/buildscript.txt
@ -3,6 +3,6 @@ chat
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/services/chat/docker-compose.yml
+++ b/services/chat/docker-compose.yml
@ -6,7 +6,7 @@ version: "2.3"

 services:
  test_unit:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
@ -18,7 +18,7 @@ services:
    user: node

  test_acceptance:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
--- a/services/clsi/.nvmrc
+++ b/services/clsi/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/clsi/Dockerfile
+++ b/services/clsi/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app
 COPY install_deps.sh /app
--- a/services/clsi/buildscript.txt
+++ b/services/clsi/buildscript.txt
@ -5,6 +5,6 @@ clsi
 --env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true"
 --env-pass-through=TEXLIVE_IMAGE
 --has-custom-cloudbuild=True
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=True
 --script-version=3.11.0
--- a/services/contacts/.nvmrc
+++ b/services/contacts/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/contacts/Dockerfile
+++ b/services/contacts/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app

--- a/services/contacts/buildscript.txt
+++ b/services/contacts/buildscript.txt
@ -3,6 +3,6 @@ contacts
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/services/contacts/docker-compose.yml
+++ b/services/contacts/docker-compose.yml
@ -6,7 +6,7 @@ version: "2.3"

 services:
  test_unit:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
@ -18,7 +18,7 @@ services:
    user: node

  test_acceptance:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
--- a/services/docstore/.nvmrc
+++ b/services/docstore/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/docstore/Dockerfile
+++ b/services/docstore/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app

--- a/services/docstore/buildscript.txt
+++ b/services/docstore/buildscript.txt
@ -3,6 +3,6 @@ docstore
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=True
 --script-version=3.11.0
--- a/services/docstore/docker-compose.yml
+++ b/services/docstore/docker-compose.yml
@ -6,7 +6,7 @@ version: "2.3"

 services:
  test_unit:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
@ -18,7 +18,7 @@ services:
    user: node

  test_acceptance:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
--- a/services/document-updater/.nvmrc
+++ b/services/document-updater/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/document-updater/Dockerfile
+++ b/services/document-updater/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app

--- a/services/document-updater/buildscript.txt
+++ b/services/document-updater/buildscript.txt
@ -3,6 +3,6 @@ document-updater
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=True
 --script-version=3.11.0
--- 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:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
@ -18,7 +18,7 @@ services:
    user: node

  test_acceptance:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
--- a/services/filestore/.nvmrc
+++ b/services/filestore/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/filestore/Dockerfile
+++ b/services/filestore/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app
 COPY install_deps.sh /app
--- a/services/filestore/app/js/FileHandler.js
+++ b/services/filestore/app/js/FileHandler.js
@ -143,6 +143,9 @@ async function _getConvertedFileAndCache(bucket, key, convertedKey, opts) {
  // S3 provides eventual consistency for read-after-write.""
  // https://docs.aws.amazon.com/AmazonS3/latest/dev/Introduction.html#ConsistencyModel
  const readStream = fs.createReadStream(convertedFsPath)
+  readStream.on('error', function () {
+    LocalFileWriter.deleteFile(convertedFsPath, function () {})
+  })
  readStream.on('end', function () {
    LocalFileWriter.deleteFile(convertedFsPath, function () {})
  })
--- a/services/filestore/buildscript.txt
+++ b/services/filestore/buildscript.txt
@ -4,6 +4,6 @@ filestore
 --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-pass-through=
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=True
 --script-version=3.11.0
--- a/services/notifications/.nvmrc
+++ b/services/notifications/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/notifications/Dockerfile
+++ b/services/notifications/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app

--- a/services/notifications/buildscript.txt
+++ b/services/notifications/buildscript.txt
@ -3,6 +3,6 @@ notifications
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=True
 --script-version=3.11.0
--- a/services/notifications/docker-compose.yml
+++ b/services/notifications/docker-compose.yml
@ -6,7 +6,7 @@ version: "2.3"

 services:
  test_unit:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
@ -18,7 +18,7 @@ services:
    user: node

  test_acceptance:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
--- a/services/real-time/.nvmrc
+++ b/services/real-time/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/real-time/Dockerfile
+++ b/services/real-time/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app

--- a/services/real-time/buildscript.txt
+++ b/services/real-time/buildscript.txt
@ -3,6 +3,6 @@ real-time
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=True
 --script-version=3.11.0
--- 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:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
@ -18,7 +18,7 @@ services:
    user: node

  test_acceptance:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
--- a/services/spelling/.nvmrc
+++ b/services/spelling/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/spelling/Dockerfile
+++ b/services/spelling/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app
 COPY install_deps.sh /app
--- a/services/spelling/buildscript.txt
+++ b/services/spelling/buildscript.txt
@ -4,6 +4,6 @@ spelling
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=False
 --script-version=3.11.0
--- a/services/track-changes/.nvmrc
+++ b/services/track-changes/.nvmrc
@ -1 +1 @@
-12.22.7
+14.18.1
--- a/services/track-changes/Dockerfile
+++ b/services/track-changes/Dockerfile
@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment

-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app

--- a/services/track-changes/buildscript.txt
+++ b/services/track-changes/buildscript.txt
@ -3,6 +3,6 @@ track-changes
 --docker-repos=gcr.io/overleaf-ops
 --env-add=AWS_BUCKET=bucket
 --env-pass-through=
--node-version=12.22.7
+--node-version=14.18.1
 --public-repo=True
 --script-version=3.11.0
--- 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:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
@ -18,7 +18,7 @@ services:
    user: node

  test_acceptance:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
--- a/services/web/Dockerfile
+++ b/services/web/Dockerfile
@ -1,5 +1,5 @@
 # the base image is suitable for running web with /app bind mounted
-FROM node:12.22.7 as base
+FROM node:14.18.1 as base

 WORKDIR /app

--- a/services/web/Dockerfile.frontend
+++ b/services/web/Dockerfile.frontend
@ -1,4 +1,4 @@
-FROM node:12.22.7
+FROM node:14.18.1

 # Install Google Chrome
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
--- a/services/web/docker-compose.yml
+++ b/services/web/docker-compose.yml
@ -21,7 +21,7 @@ services:
    user: node

  test_acceptance:
-    image: node:12.22.7
+    image: node:14.18.1
    volumes:
      - .:/app
    working_dir: /app
--- a/services/web/scripts/translations/Dockerfile
+++ b/services/web/scripts/translations/Dockerfile
@ -1,4 +1,4 @@
-FROM node:12.22.7
+FROM node:14.18.1

 WORKDIR /app/scripts/translations
 @ -1 +1 @@
 .22.7
 .18.1