From dec40d9c903f4e2448be5fc616176af0545846c9 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Fri, 14 Jun 2024 12:45:26 +0200
Subject: [PATCH] Merge pull request #18808 from overleaf/rd-ejs-upgrade

Upgrading ejs package version from 3.1.8 to 3.1.10

GitOrigin-RevId: 2e2ad7c3d74a2c6e929a030ddbc8735235346804
---
 package-lock.json         | 16 ++++++++++------
 services/web/package.json |  4 ++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 87103ea211..a9f9b51945 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20322,9 +20322,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/ejs": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
-      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -42748,6 +42748,7 @@
     "services/idp": {
       "name": "@overleaf/idp",
       "dependencies": {
+        "ejs": "^3.1.10",
         "express": "^4.19.2",
         "samlp": "^7.0.2"
       },
@@ -44627,6 +44628,7 @@
         "csv": "^6.2.5",
         "dateformat": "1.0.4-1.2.3",
         "east": "^2.0.2",
+        "ejs": "^3.1.10",
         "email-addresses": "^5.0.0",
         "express": "^4.19.2",
         "express-bearer-token": "^2.4.0",
@@ -52455,6 +52457,7 @@
       "requires": {
         "chai": "^4.3.6",
         "chai-as-promised": "^7.1.1",
+        "ejs": "^3.1.10",
         "express": "^4.19.2",
         "mocha": "^10.2.0",
         "samlp": "^7.0.2",
@@ -53283,6 +53286,7 @@
         "diff": "^5.1.0",
         "downshift": "^6.1.0",
         "east": "^2.0.2",
+        "ejs": "^3.1.10",
         "email-addresses": "^5.0.0",
         "es6-promise": "^4.2.8",
         "escodegen": "^2.0.0",
@@ -63477,9 +63481,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "ejs": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
-      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "requires": {
         "jake": "^10.8.5"
       }
diff --git a/services/web/package.json b/services/web/package.json
index 697bc17ee9..d1df083192 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -107,6 +107,7 @@
     "csv": "^6.2.5",
     "dateformat": "1.0.4-1.2.3",
     "east": "^2.0.2",
+    "ejs": "^3.1.10",
     "email-addresses": "^5.0.0",
     "express": "^4.19.2",
     "express-bearer-token": "^2.4.0",
@@ -363,5 +364,8 @@
     "webpack-merge": "^5.10.0",
     "worker-loader": "^3.0.8",
     "yup": "^0.32.11"
+  },
+  "overrides": {
+    "ejs": "$ejs"
   }
 }