From e55fa377d16dd8b862ec32add26bda9b77ac9565 Mon Sep 17 00:00:00 2001 From: Andrew Rumble Date: Mon, 23 Jun 2025 15:05:31 +0100 Subject: [PATCH] Remove code that checks for index.js (now that we don't have any of these) GitOrigin-RevId: c7ece8f01d1e8318ffe461e9ebe2cf0ed1b040ac --- .../web/app/src/infrastructure/Modules.js | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/services/web/app/src/infrastructure/Modules.js b/services/web/app/src/infrastructure/Modules.js index f746519612..b1c134f1d6 100644 --- a/services/web/app/src/infrastructure/Modules.js +++ b/services/web/app/src/infrastructure/Modules.js @@ -26,29 +26,18 @@ async function modules() { } async function loadModulesImpl() { - const settingsCheckModuleCjs = Path.join( - MODULE_BASE_PATH, - 'settings-check', - 'index.js' - ) - const settingsCheckModuleEsm = Path.join( + const settingsCheckModule = Path.join( MODULE_BASE_PATH, 'settings-check', 'index.mjs' ) - if (fs.existsSync(settingsCheckModuleCjs)) { - await import(settingsCheckModuleCjs) - } else if (fs.existsSync(settingsCheckModuleEsm)) { - await import(settingsCheckModuleEsm) + if (fs.existsSync(settingsCheckModule)) { + await import(settingsCheckModule) } for (const moduleName of Settings.moduleImportSequence || []) { - let path - if (fs.existsSync(Path.join(MODULE_BASE_PATH, moduleName, 'index.mjs'))) { - path = Path.join(MODULE_BASE_PATH, moduleName, 'index.mjs') - } else { - path = Path.join(MODULE_BASE_PATH, moduleName, 'index.js') - } - const module = await import(path) + const module = await import( + Path.join(MODULE_BASE_PATH, moduleName, 'index.mjs') + ) const loadedModule = module.default || module loadedModule.name = moduleName