Merge pull request #28273 from overleaf/ac-some-web-esm-migration

[web] Convert some Features files to ES modules (part 1)

GitOrigin-RevId: d19b024efad315143e022143e2a2683df8071744

services/web/app/src/Features/Captcha/CaptchaMiddleware.mjs

@@ -1,12 +1,12 @@
-const { fetchJson } = require('@overleaf/fetch-utils')
-const logger = require('@overleaf/logger')
-const Settings = require('@overleaf/settings')
-const Metrics = require('@overleaf/metrics')
-const OError = require('@overleaf/o-error')
-const DeviceHistory = require('./DeviceHistory')
-const AuthenticationController = require('../Authentication/AuthenticationController')
-const { expressify } = require('@overleaf/promise-utils')
-const EmailsHelper = require('../Helpers/EmailHelper')
+import { fetchJson } from '@overleaf/fetch-utils'
+import logger from '@overleaf/logger'
+import Settings from '@overleaf/settings'
+import Metrics from '@overleaf/metrics'
+import OError from '@overleaf/o-error'
+import DeviceHistory from './DeviceHistory.js'
+import AuthenticationController from '../Authentication/AuthenticationController.js'
+import { expressify } from '@overleaf/promise-utils'
+import EmailsHelper from '../Helpers/EmailHelper.js'
 
 function respondInvalidCaptcha(req, res) {
   res.status(400).json({
@@ -114,7 +114,7 @@ function validateCaptcha(action) {
   })
 }
 
-module.exports = {
+export default {
   respondInvalidCaptcha,
   validateCaptcha,
   canSkipCaptcha: expressify(canSkipCaptcha),

services/web/app/src/Features/Chat/ChatController.mjs

@@ -1,11 +1,11 @@
-const { expressify } = require('@overleaf/promise-utils')
-const Modules = require('../../infrastructure/Modules')
-const ChatApiHandler = require('./ChatApiHandler')
-const EditorRealTimeController = require('../Editor/EditorRealTimeController')
-const SessionManager = require('../Authentication/SessionManager')
-const UserInfoManager = require('../User/UserInfoManager')
-const UserInfoController = require('../User/UserInfoController')
-const ChatManager = require('./ChatManager')
+import { expressify } from '@overleaf/promise-utils'
+import Modules from '../../infrastructure/Modules.js'
+import ChatApiHandler from './ChatApiHandler.js'
+import EditorRealTimeController from '../Editor/EditorRealTimeController.js'
+import SessionManager from '../Authentication/SessionManager.js'
+import UserInfoManager from '../User/UserInfoManager.js'
+import UserInfoController from '../User/UserInfoController.js'
+import ChatManager from './ChatManager.js'
 
 async function sendMessage(req, res) {
   const { project_id: projectId } = req.params
@@ -48,7 +48,7 @@ async function getMessages(req, res) {
   res.json(messages)
 }
 
-module.exports = {
+export default {
   sendMessage: expressify(sendMessage),
   getMessages: expressify(getMessages),
 }

services/web/app/src/Features/Collaborators/CollaboratorsController.mjs

@@ -3,7 +3,7 @@ import HttpErrorHandler from '../../Features/Errors/HttpErrorHandler.js'
 import mongodb from 'mongodb-legacy'
 import CollaboratorsHandler from './CollaboratorsHandler.js'
 import CollaboratorsGetter from './CollaboratorsGetter.js'
-import OwnershipTransferHandler from './OwnershipTransferHandler.js'
+import OwnershipTransferHandler from './OwnershipTransferHandler.mjs'
 import SessionManager from '../Authentication/SessionManager.js'
 import EditorRealTimeController from '../Editor/EditorRealTimeController.js'
 import TagsHandler from '../Tags/TagsHandler.js'

services/web/app/src/Features/Collaborators/CollaboratorsGetter.js

@@ -12,42 +12,6 @@ const ProjectEditorHandler = require('../Project/ProjectEditorHandler')
 const Sources = require('../Authorization/Sources')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 
-module.exports = {
-  getMemberIdsWithPrivilegeLevels: callbackify(getMemberIdsWithPrivilegeLevels),
-  getMemberIds: callbackify(getMemberIds),
-  getInvitedMemberIds: callbackify(getInvitedMemberIds),
-  getInvitedMembersWithPrivilegeLevelsFromFields: callbackify(
-    getInvitedMembersWithPrivilegeLevelsFromFields
-  ),
-  getMemberIdPrivilegeLevel: callbackify(getMemberIdPrivilegeLevel),
-  getProjectsUserIsMemberOf: callbackify(getProjectsUserIsMemberOf),
-  dangerouslyGetAllProjectsUserIsMemberOf: callbackify(
-    dangerouslyGetAllProjectsUserIsMemberOf
-  ),
-  isUserInvitedMemberOfProject: callbackify(isUserInvitedMemberOfProject),
-  getPublicShareTokens: callbackify(getPublicShareTokens),
-  userIsTokenMember: callbackify(userIsTokenMember),
-  getAllInvitedMembers: callbackify(getAllInvitedMembers),
-  promises: {
-    getProjectAccess,
-    getMemberIdsWithPrivilegeLevels,
-    getMemberIds,
-    getInvitedMemberIds,
-    getInvitedMembersWithPrivilegeLevelsFromFields,
-    getMemberIdPrivilegeLevel,
-    getInvitedEditCollaboratorCount,
-    getInvitedPendingEditorCount,
-    getProjectsUserIsMemberOf,
-    dangerouslyGetAllProjectsUserIsMemberOf,
-    isUserInvitedMemberOfProject,
-    isUserInvitedReadWriteMemberOfProject,
-    getPublicShareTokens,
-    userIsTokenMember,
-    userIsReadWriteTokenMember,
-    getAllInvitedMembers,
-  },
-}
-
 /**
  * @typedef ProjectMember
  * @property {string} id
@@ -241,8 +205,6 @@ class ProjectAccess {
   }
 }
 
-module.exports.ProjectAccess = ProjectAccess
-
 async function getProjectAccess(projectId) {
   const project = await ProjectGetter.promises.getProject(projectId, {
     owner_ref: 1,
@@ -577,3 +539,40 @@ async function _loadMembers(members) {
     })
     .filter(r => r != null)
 }
+
+module.exports = {
+  getMemberIdsWithPrivilegeLevels: callbackify(getMemberIdsWithPrivilegeLevels),
+  getMemberIds: callbackify(getMemberIds),
+  getInvitedMemberIds: callbackify(getInvitedMemberIds),
+  getInvitedMembersWithPrivilegeLevelsFromFields: callbackify(
+    getInvitedMembersWithPrivilegeLevelsFromFields
+  ),
+  getMemberIdPrivilegeLevel: callbackify(getMemberIdPrivilegeLevel),
+  getProjectsUserIsMemberOf: callbackify(getProjectsUserIsMemberOf),
+  dangerouslyGetAllProjectsUserIsMemberOf: callbackify(
+    dangerouslyGetAllProjectsUserIsMemberOf
+  ),
+  isUserInvitedMemberOfProject: callbackify(isUserInvitedMemberOfProject),
+  getPublicShareTokens: callbackify(getPublicShareTokens),
+  userIsTokenMember: callbackify(userIsTokenMember),
+  getAllInvitedMembers: callbackify(getAllInvitedMembers),
+  promises: {
+    getProjectAccess,
+    getMemberIdsWithPrivilegeLevels,
+    getMemberIds,
+    getInvitedMemberIds,
+    getInvitedMembersWithPrivilegeLevelsFromFields,
+    getMemberIdPrivilegeLevel,
+    getInvitedEditCollaboratorCount,
+    getInvitedPendingEditorCount,
+    getProjectsUserIsMemberOf,
+    dangerouslyGetAllProjectsUserIsMemberOf,
+    isUserInvitedMemberOfProject,
+    isUserInvitedReadWriteMemberOfProject,
+    getPublicShareTokens,
+    userIsTokenMember,
+    userIsReadWriteTokenMember,
+    getAllInvitedMembers,
+  },
+  ProjectAccess,
+}

services/web/app/src/Features/Collaborators/CollaboratorsRouter.mjs

@@ -5,7 +5,7 @@ import PrivilegeLevels from '../Authorization/PrivilegeLevels.js'
 import CollaboratorsInviteController from './CollaboratorsInviteController.mjs'
 import { RateLimiter } from '../../infrastructure/RateLimiter.js'
 import RateLimiterMiddleware from '../Security/RateLimiterMiddleware.js'
-import CaptchaMiddleware from '../Captcha/CaptchaMiddleware.js'
+import CaptchaMiddleware from '../Captcha/CaptchaMiddleware.mjs'
 import AnalyticsRegistrationSourceMiddleware from '../Analytics/AnalyticsRegistrationSourceMiddleware.js'
 import { Joi, validate } from '../../infrastructure/Validation.js'
 

services/web/app/src/Features/Collaborators/OwnershipTransferHandler.mjs

@@ -1,19 +1,19 @@
-const logger = require('@overleaf/logger')
-const { Project } = require('../../models/Project')
-const ProjectGetter = require('../Project/ProjectGetter')
-const UserGetter = require('../User/UserGetter')
-const CollaboratorsHandler = require('./CollaboratorsHandler')
-const EmailHandler = require('../Email/EmailHandler')
-const Errors = require('../Errors/Errors')
-const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
-const TpdsProjectFlusher = require('../ThirdPartyDataStore/TpdsProjectFlusher')
-const ProjectAuditLogHandler = require('../Project/ProjectAuditLogHandler')
-const AnalyticsManager = require('../Analytics/AnalyticsManager')
-const OError = require('@overleaf/o-error')
-const TagsHandler = require('../Tags/TagsHandler')
-const { promiseMapWithLimit } = require('@overleaf/promise-utils')
+import logger from '@overleaf/logger'
+import { Project } from '../../models/Project.js'
+import ProjectGetter from '../Project/ProjectGetter.js'
+import UserGetter from '../User/UserGetter.js'
+import CollaboratorsHandler from './CollaboratorsHandler.js'
+import EmailHandler from '../Email/EmailHandler.js'
+import Errors from '../Errors/Errors.js'
+import PrivilegeLevels from '../Authorization/PrivilegeLevels.js'
+import TpdsProjectFlusher from '../ThirdPartyDataStore/TpdsProjectFlusher.js'
+import ProjectAuditLogHandler from '../Project/ProjectAuditLogHandler.js'
+import AnalyticsManager from '../Analytics/AnalyticsManager.js'
+import OError from '@overleaf/o-error'
+import TagsHandler from '../Tags/TagsHandler.js'
+import { promiseMapWithLimit } from '@overleaf/promise-utils'
 
-module.exports = {
+export default {
   promises: {
     transferOwnership,
     transferAllProjectsToUser,

services/web/app/src/Features/Compile/ClsiCacheController.mjs

@@ -1,18 +1,18 @@
-const { NotFoundError, ResourceGoneError } = require('../Errors/Errors')
-const {
+import { NotFoundError, ResourceGoneError } from '../Errors/Errors.js'
+import {
   fetchStreamWithResponse,
   RequestFailedError,
-} = require('@overleaf/fetch-utils')
-const Path = require('path')
-const { pipeline } = require('stream/promises')
-const logger = require('@overleaf/logger')
-const ClsiCacheManager = require('./ClsiCacheManager')
-const CompileController = require('./CompileController')
-const { expressify } = require('@overleaf/promise-utils')
-const ClsiCacheHandler = require('./ClsiCacheHandler')
-const ProjectGetter = require('../Project/ProjectGetter')
-const { MeteredStream } = require('@overleaf/stream-utils')
-const Metrics = require('@overleaf/metrics')
+} from '@overleaf/fetch-utils'
+import Path from 'node:path'
+import { pipeline } from 'node:stream/promises'
+import logger from '@overleaf/logger'
+import ClsiCacheManager from './ClsiCacheManager.js'
+import CompileController from './CompileController.js'
+import { expressify } from '@overleaf/promise-utils'
+import ClsiCacheHandler from './ClsiCacheHandler.js'
+import ProjectGetter from '../Project/ProjectGetter.js'
+import { MeteredStream } from '@overleaf/stream-utils'
+import Metrics from '@overleaf/metrics'
 
 /**
  * Download a file from a specific build on the clsi-cache.
@@ -150,7 +150,7 @@ async function getLatestBuildFromCache(req, res) {
   }
 }
 
-module.exports = {
+export default {
   downloadFromCache: expressify(downloadFromCache),
   getLatestBuildFromCache: expressify(getLatestBuildFromCache),
 }

services/web/app/src/Features/Editor/EditorHttpController.mjs

@@ -1,18 +1,20 @@
-const ProjectDeleter = require('../Project/ProjectDeleter')
-const EditorController = require('./EditorController')
-const ProjectGetter = require('../Project/ProjectGetter')
-const AuthorizationManager = require('../Authorization/AuthorizationManager')
-const ProjectEditorHandler = require('../Project/ProjectEditorHandler')
-const Metrics = require('@overleaf/metrics')
-const CollaboratorsInviteGetter = require('../Collaborators/CollaboratorsInviteGetter')
-const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
-const SessionManager = require('../Authentication/SessionManager')
-const Errors = require('../Errors/Errors')
-const { expressify } = require('@overleaf/promise-utils')
-const Settings = require('@overleaf/settings')
-const { ProjectAccess } = require('../Collaborators/CollaboratorsGetter')
+import ProjectDeleter from '../Project/ProjectDeleter.js'
+import EditorController from './EditorController.js'
+import ProjectGetter from '../Project/ProjectGetter.js'
+import AuthorizationManager from '../Authorization/AuthorizationManager.js'
+import ProjectEditorHandler from '../Project/ProjectEditorHandler.js'
+import Metrics from '@overleaf/metrics'
+import CollaboratorsInviteGetter from '../Collaborators/CollaboratorsInviteGetter.js'
+import PrivilegeLevels from '../Authorization/PrivilegeLevels.js'
+import SessionManager from '../Authentication/SessionManager.js'
+import Errors from '../Errors/Errors.js'
+import { expressify } from '@overleaf/promise-utils'
+import Settings from '@overleaf/settings'
+import CollaboratorsGetter from '../Collaborators/CollaboratorsGetter.js'
 
-module.exports = {
+const ProjectAccess = CollaboratorsGetter.ProjectAccess
+
+export default {
   joinProject: expressify(joinProject),
   addDoc: expressify(addDoc),
   addFolder: expressify(addFolder),

services/web/app/src/Features/Editor/EditorRouter.mjs

@@ -1,4 +1,4 @@
-import EditorHttpController from './EditorHttpController.js'
+import EditorHttpController from './EditorHttpController.mjs'
 import AuthenticationController from '../Authentication/AuthenticationController.js'
 import AuthorizationMiddleware from '../Authorization/AuthorizationMiddleware.js'
 import { RateLimiter } from '../../infrastructure/RateLimiter.js'

services/web/app/src/Features/Errors/ErrorController.mjs

@@ -1,10 +1,10 @@
-const { isZodErrorLike, fromZodError } = require('zod-validation-error')
-const Errors = require('./Errors')
-const SessionManager = require('../Authentication/SessionManager')
-const SamlLogHandler = require('../SamlLog/SamlLogHandler')
-const HttpErrorHandler = require('./HttpErrorHandler')
-const { plainTextResponse } = require('../../infrastructure/Response')
-const { expressifyErrorHandler } = require('@overleaf/promise-utils')
+import { isZodErrorLike, fromZodError } from 'zod-validation-error'
+import Errors from './Errors.js'
+import SessionManager from '../Authentication/SessionManager.js'
+import SamlLogHandler from '../SamlLog/SamlLogHandler.js'
+import HttpErrorHandler from './HttpErrorHandler.js'
+import { plainTextResponse } from '../../infrastructure/Response.js'
+import { expressifyErrorHandler } from '@overleaf/promise-utils'
 
 function notFound(req, res) {
   res.status(404)
@@ -135,7 +135,7 @@ function handleApiError(err, req, res, next) {
   }
 }
 
-module.exports = {
+export default {
   notFound,
   forbidden,
   serverError,

services/web/app/src/Features/GlobalMetrics/GlobalMetricsManager.mjs

@@ -1,4 +1,4 @@
-const { GlobalMetric } = require('../../models/GlobalMetric')
+import { GlobalMetric } from '../../models/GlobalMetric.js'
 /**
  * A Generic collection used to track metrics shared across the entirety of the application
  * examples:
@@ -31,7 +31,7 @@ async function incrementMetric(key, value = 1) {
   )
 }
 
-module.exports = {
+export default {
   getMetric,
   setMetric,
   incrementMetric,

services/web/app/src/Features/History/HistoryController.mjs

@@ -1,28 +1,30 @@
 // @ts-check
 
-const { setTimeout } = require('timers/promises')
-const { pipeline } = require('stream/promises')
-const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
-const { expressify } = require('@overleaf/promise-utils')
-const {
+import { setTimeout } from 'node:timers/promises'
+import { pipeline } from 'node:stream/promises'
+import OError from '@overleaf/o-error'
+import logger from '@overleaf/logger'
+import { expressify } from '@overleaf/promise-utils'
+
+import {
   fetchStream,
   fetchStreamWithResponse,
   fetchJson,
   fetchNothing,
   RequestFailedError,
-} = require('@overleaf/fetch-utils')
-const settings = require('@overleaf/settings')
-const SessionManager = require('../Authentication/SessionManager')
-const UserGetter = require('../User/UserGetter')
-const ProjectGetter = require('../Project/ProjectGetter')
-const Errors = require('../Errors/Errors')
-const HistoryManager = require('./HistoryManager')
-const ProjectDetailsHandler = require('../Project/ProjectDetailsHandler')
-const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler')
-const RestoreManager = require('./RestoreManager')
-const { prepareZipAttachment } = require('../../infrastructure/Response')
-const Features = require('../../infrastructure/Features')
+} from '@overleaf/fetch-utils'
+
+import settings from '@overleaf/settings'
+import SessionManager from '../Authentication/SessionManager.js'
+import UserGetter from '../User/UserGetter.js'
+import ProjectGetter from '../Project/ProjectGetter.js'
+import Errors from '../Errors/Errors.js'
+import HistoryManager from './HistoryManager.js'
+import ProjectDetailsHandler from '../Project/ProjectDetailsHandler.js'
+import ProjectEntityUpdateHandler from '../Project/ProjectEntityUpdateHandler.js'
+import RestoreManager from './RestoreManager.js'
+import { prepareZipAttachment } from '../../infrastructure/Response.js'
+import Features from '../../infrastructure/Features.js'
 
 // Number of seconds after which the browser should send a request to revalidate
 // blobs
@@ -508,7 +510,7 @@ function isPrematureClose(err) {
   )
 }
 
-module.exports = {
+export default {
   getBlob: expressify(getBlob),
   headBlob: expressify(headBlob),
   proxyToHistoryApi: expressify(proxyToHistoryApi),

services/web/app/src/Features/History/HistoryRouter.mjs

@@ -6,7 +6,7 @@ import { RateLimiter } from '../../infrastructure/RateLimiter.js'
 import AuthenticationController from '../Authentication/AuthenticationController.js'
 import AuthorizationMiddleware from '../Authorization/AuthorizationMiddleware.js'
 import RateLimiterMiddleware from '../Security/RateLimiterMiddleware.js'
-import HistoryController from './HistoryController.js'
+import HistoryController from './HistoryController.mjs'
 
 const rateLimiters = {
   downloadProjectRevision: new RateLimiter('download-project-revision', {

services/web/app/src/Features/LinkedFiles/LinkedFilesController.mjs

@@ -41,7 +41,7 @@ import ReferencesHandler from '../References/ReferencesHandler.mjs'
 import EditorRealTimeController from '../Editor/EditorRealTimeController.js'
 import { expressify } from '@overleaf/promise-utils'
 import ProjectOutputFileAgent from './ProjectOutputFileAgent.mjs'
-import ProjectFileAgent from './ProjectFileAgent.js'
+import ProjectFileAgent from './ProjectFileAgent.mjs'
 import UrlAgent from './UrlAgent.mjs'
 
 let LinkedFilesController

services/web/app/src/Features/LinkedFiles/ProjectFileAgent.mjs

@@ -10,23 +10,26 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-let ProjectFileAgent
-const AuthorizationManager = require('../Authorization/AuthorizationManager')
-const ProjectLocator = require('../Project/ProjectLocator')
-const DocstoreManager = require('../Docstore/DocstoreManager')
-const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
-const _ = require('lodash')
-const LinkedFilesHandler = require('./LinkedFilesHandler')
-const {
+import AuthorizationManager from '../Authorization/AuthorizationManager.js'
+import ProjectLocator from '../Project/ProjectLocator.js'
+import DocstoreManager from '../Docstore/DocstoreManager.js'
+import DocumentUpdaterHandler from '../DocumentUpdater/DocumentUpdaterHandler.js'
+import _ from 'lodash'
+import LinkedFilesHandler from './LinkedFilesHandler.js'
+
+import {
   BadDataError,
   AccessDeniedError,
   BadEntityTypeError,
   SourceFileNotFoundError,
-} = require('./LinkedFilesErrors')
-const { promisify } = require('@overleaf/promise-utils')
-const HistoryManager = require('../History/HistoryManager')
+} from './LinkedFilesErrors.js'
 
-module.exports = ProjectFileAgent = {
+import { promisify } from '@overleaf/promise-utils'
+import HistoryManager from '../History/HistoryManager.js'
+
+let ProjectFileAgent
+
+export default ProjectFileAgent = {
   createLinkedFile(
     projectId,
     linkedFileData,

services/web/app/src/Features/LinkedFiles/ProjectOutputFileAgent.mjs

@@ -1,7 +1,7 @@
 import AuthorizationManager from '../Authorization/AuthorizationManager.js'
 import CompileManager from '../Compile/CompileManager.js'
 import ClsiManager from '../Compile/ClsiManager.js'
-import ProjectFileAgent from './ProjectFileAgent.js'
+import ProjectFileAgent from './ProjectFileAgent.mjs'
 import _ from 'lodash'
 import {
   CompileFailedError,

services/web/app/src/Features/PasswordReset/PasswordResetRouter.mjs

@@ -1,6 +1,6 @@
 import PasswordResetController from './PasswordResetController.mjs'
 import AuthenticationController from '../Authentication/AuthenticationController.js'
-import CaptchaMiddleware from '../../Features/Captcha/CaptchaMiddleware.js'
+import CaptchaMiddleware from '../../Features/Captcha/CaptchaMiddleware.mjs'
 import { RateLimiter } from '../../infrastructure/RateLimiter.js'
 import RateLimiterMiddleware from '../Security/RateLimiterMiddleware.js'
 import { Joi, validate } from '../../infrastructure/Validation.js'

services/web/app/src/Features/Project/ProjectCollabratecDetailsHandler.mjs

@@ -1,6 +1,9 @@
-const { ObjectId } = require('mongodb-legacy')
-const { Project } = require('../../models/Project')
-const { callbackifyAll } = require('@overleaf/promise-utils')
+import mongodb from 'mongodb-legacy'
+
+import { Project } from '../../models/Project.js'
+import { callbackifyAll } from '@overleaf/promise-utils'
+
+const { ObjectId } = mongodb
 
 const ProjectCollabratecDetailsHandler = {
   async initializeCollabratecProject(
@@ -94,7 +97,7 @@ const ProjectCollabratecDetailsHandler = {
   },
 }
 
-module.exports = {
+export default {
   ...callbackifyAll(ProjectCollabratecDetailsHandler),
   promises: ProjectCollabratecDetailsHandler,
 }

services/web/app/src/Features/StaticPages/HomeController.mjs

@@ -2,7 +2,7 @@ import Features from '../../infrastructure/Features.js'
 import AnalyticsManager from '../Analytics/AnalyticsManager.js'
 import Path from 'node:path'
 import fs from 'node:fs'
-import ErrorController from '../Errors/ErrorController.js'
+import ErrorController from '../Errors/ErrorController.mjs'
 import SessionManager from '../Authentication/SessionManager.js'
 import { expressify } from '@overleaf/promise-utils'
 import logger from '@overleaf/logger'

services/web/app/src/Features/Subscription/TeamInvitesController.mjs

@@ -5,7 +5,7 @@ import TeamInvitesHandler from './TeamInvitesHandler.js'
 import SessionManager from '../Authentication/SessionManager.js'
 import SubscriptionLocator from './SubscriptionLocator.js'
 import SubscriptionHelper from './SubscriptionHelper.js'
-import ErrorController from '../Errors/ErrorController.js'
+import ErrorController from '../Errors/ErrorController.mjs'
 import EmailHelper from '../Helpers/EmailHelper.js'
 import UserGetter from '../User/UserGetter.js'
 import { expressify } from '@overleaf/promise-utils'

services/web/app/src/infrastructure/Server.mjs

@@ -25,7 +25,7 @@ import RedirectManager from './RedirectManager.js'
 import translations from './Translations.js'
 import Views from './Views.js'
 import Features from './Features.js'
-import ErrorController from '../Features/Errors/ErrorController.js'
+import ErrorController from '../Features/Errors/ErrorController.mjs'
 import HttpErrorHandler from '../Features/Errors/HttpErrorHandler.js'
 import UserSessionsManager from '../Features/User/UserSessionsManager.js'
 import AuthenticationController from '../Features/Authentication/AuthenticationController.js'

services/web/app/src/router.mjs

@@ -1,5 +1,5 @@
 import AdminController from './Features/ServerAdmin/AdminController.js'
-import ErrorController from './Features/Errors/ErrorController.js'
+import ErrorController from './Features/Errors/ErrorController.mjs'
 import Features from './infrastructure/Features.js'
 import ProjectController from './Features/Project/ProjectController.js'
 import ProjectApiController from './Features/Project/ProjectApiController.mjs'
@@ -34,7 +34,7 @@ import HistoryRouter from './Features/History/HistoryRouter.mjs'
 import ExportsController from './Features/Exports/ExportsController.mjs'
 import PasswordResetRouter from './Features/PasswordReset/PasswordResetRouter.mjs'
 import StaticPagesRouter from './Features/StaticPages/StaticPagesRouter.mjs'
-import ChatController from './Features/Chat/ChatController.js'
+import ChatController from './Features/Chat/ChatController.mjs'
 import Modules from './infrastructure/Modules.js'
 import {
   RateLimiter,
@@ -57,7 +57,7 @@ import UserMembershipRouter from './Features/UserMembership/UserMembershipRouter
 import SystemMessageController from './Features/SystemMessages/SystemMessageController.js'
 import AnalyticsRegistrationSourceMiddleware from './Features/Analytics/AnalyticsRegistrationSourceMiddleware.js'
 import AnalyticsUTMTrackingMiddleware from './Features/Analytics/AnalyticsUTMTrackingMiddleware.mjs'
-import CaptchaMiddleware from './Features/Captcha/CaptchaMiddleware.js'
+import CaptchaMiddleware from './Features/Captcha/CaptchaMiddleware.mjs'
 import { Joi, validate } from './infrastructure/Validation.js'
 import UnsupportedBrowserMiddleware from './infrastructure/UnsupportedBrowserMiddleware.js'
 import logger from '@overleaf/logger'
@@ -65,7 +65,7 @@ import _ from 'lodash'
 import { plainTextResponse } from './infrastructure/Response.js'
 import PublicAccessLevels from './Features/Authorization/PublicAccessLevels.js'
 import SocketDiagnostics from './Features/SocketDiagnostics/SocketDiagnostics.mjs'
-import ClsiCacheController from './Features/Compile/ClsiCacheController.js'
+import ClsiCacheController from './Features/Compile/ClsiCacheController.mjs'
 import AsyncLocalStorage from './infrastructure/AsyncLocalStorage.js'
 
 const { renderUnsupportedBrowserPage, unsupportedBrowserMiddleware } =