From 4919172d52b63df7cba59cc93502b63d9ae7bdbd Mon Sep 17 00:00:00 2001
From: andrew rumble <andrew.rumble@overleaf.com>
Date: Wed, 2 Oct 2024 16:00:49 +0100
Subject: [PATCH] Load settingsCheckModule regardless of module type

GitOrigin-RevId: 7afeb6d5bbe6b5db33c8d1a547009980e6e75c53
---
 services/web/app/src/infrastructure/Modules.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/services/web/app/src/infrastructure/Modules.js b/services/web/app/src/infrastructure/Modules.js
index 3f465cec81..e212eeeaf8 100644
--- a/services/web/app/src/infrastructure/Modules.js
+++ b/services/web/app/src/infrastructure/Modules.js
@@ -22,15 +22,21 @@ async function modules() {
 }
 
 async function loadModulesImpl() {
-  const settingsCheckModule = Path.join(
+  const settingsCheckModuleCjs = Path.join(
     MODULE_BASE_PATH,
     'settings-check',
     'index.js'
   )
-  if (fs.existsSync(settingsCheckModule)) {
-    await import(settingsCheckModule)
+  const settingsCheckModuleEsm = Path.join(
+    MODULE_BASE_PATH,
+    'settings-check',
+    'index.mjs'
+  )
+  if (fs.existsSync(settingsCheckModuleCjs)) {
+    await import(settingsCheckModuleCjs)
+  } else if (fs.existsSync(settingsCheckModuleEsm)) {
+    await import(settingsCheckModuleEsm)
   }
-
   for (const moduleName of Settings.moduleImportSequence || []) {
     let path
     if (fs.existsSync(Path.join(MODULE_BASE_PATH, moduleName, 'index.mjs'))) {