From ce868bbb2d10d9c6750f7240a0b0d76e5b100e68 Mon Sep 17 00:00:00 2001 From: Andrew Rumble Date: Thu, 16 Oct 2025 09:14:37 +0100 Subject: [PATCH] Rename features files GitOrigin-RevId: fc4ce037343b02d002fa07b7cdc283f2d7d4f89b --- .../{ClsiCookieManager.js => ClsiCookieManager.mjs} | 0 .../{ClsiFormatChecker.js => ClsiFormatChecker.mjs} | 0 .../web/app/src/Features/Compile/ClsiManager.mjs | 6 +++--- .../{ClsiStateManager.js => ClsiStateManager.mjs} | 0 .../app/src/Features/Compile/CompileController.mjs | 2 +- ...{InstitutionsGetter.js => InstitutionsGetter.mjs} | 0 ...nstitutionsManager.js => InstitutionsManager.mjs} | 0 .../app/src/Features/Project/ProjectController.mjs | 2 +- .../Features/Subscription/RecurlyEventHandler.mjs | 2 +- ...nEmailBuilder.js => SubscriptionEmailBuilder.mjs} | 6 +++--- ...nEmailHandler.js => SubscriptionEmailHandler.mjs} | 12 ++++++------ ...ptionFormatters.js => SubscriptionFormatters.mjs} | 6 +++--- .../Subscription/SubscriptionViewModelBuilder.mjs | 6 +++--- services/web/scripts/check_institution_users.mjs | 2 +- .../web/scripts/clear_institution_notifications.mjs | 2 +- services/web/scripts/refresh_institution_users.mjs | 2 +- ...kieManagerTests.js => ClsiCookieManager.test.mjs} | 0 ...matCheckerTests.js => ClsiFormatChecker.test.mjs} | 0 ...tateManagerTests.js => ClsiStateManager.test.mjs} | 0 ...onsGetterTests.js => InstitutionsGetter.test.mjs} | 0 ...sManagerTests.js => InstitutionsManager.test.mjs} | 0 ...lerTests.js => SubscriptionEmailHandler.test.mjs} | 0 ...ttersTests.js => SubscriptionFormatters.test.mjs} | 0 23 files changed, 24 insertions(+), 24 deletions(-) rename services/web/app/src/Features/Compile/{ClsiCookieManager.js => ClsiCookieManager.mjs} (100%) rename services/web/app/src/Features/Compile/{ClsiFormatChecker.js => ClsiFormatChecker.mjs} (100%) rename services/web/app/src/Features/Compile/{ClsiStateManager.js => ClsiStateManager.mjs} (100%) rename services/web/app/src/Features/Institutions/{InstitutionsGetter.js => InstitutionsGetter.mjs} (100%) rename services/web/app/src/Features/Institutions/{InstitutionsManager.js => InstitutionsManager.mjs} (100%) rename services/web/app/src/Features/Subscription/{SubscriptionEmailBuilder.js => SubscriptionEmailBuilder.mjs} (98%) rename services/web/app/src/Features/Subscription/{SubscriptionEmailHandler.js => SubscriptionEmailHandler.mjs} (68%) rename services/web/app/src/Features/Subscription/{SubscriptionFormatters.js => SubscriptionFormatters.mjs} (81%) rename services/web/test/unit/src/Compile/{ClsiCookieManagerTests.js => ClsiCookieManager.test.mjs} (100%) rename services/web/test/unit/src/Compile/{ClsiFormatCheckerTests.js => ClsiFormatChecker.test.mjs} (100%) rename services/web/test/unit/src/Compile/{ClsiStateManagerTests.js => ClsiStateManager.test.mjs} (100%) rename services/web/test/unit/src/Institutions/{InstitutionsGetterTests.js => InstitutionsGetter.test.mjs} (100%) rename services/web/test/unit/src/Institutions/{InstitutionsManagerTests.js => InstitutionsManager.test.mjs} (100%) rename services/web/test/unit/src/Subscription/{SubscriptionEmailHandlerTests.js => SubscriptionEmailHandler.test.mjs} (100%) rename services/web/test/unit/src/Subscription/{SubscriptionFormattersTests.js => SubscriptionFormatters.test.mjs} (100%) diff --git a/services/web/app/src/Features/Compile/ClsiCookieManager.js b/services/web/app/src/Features/Compile/ClsiCookieManager.mjs similarity index 100% rename from services/web/app/src/Features/Compile/ClsiCookieManager.js rename to services/web/app/src/Features/Compile/ClsiCookieManager.mjs diff --git a/services/web/app/src/Features/Compile/ClsiFormatChecker.js b/services/web/app/src/Features/Compile/ClsiFormatChecker.mjs similarity index 100% rename from services/web/app/src/Features/Compile/ClsiFormatChecker.js rename to services/web/app/src/Features/Compile/ClsiFormatChecker.mjs diff --git a/services/web/app/src/Features/Compile/ClsiManager.mjs b/services/web/app/src/Features/Compile/ClsiManager.mjs index 6ac2de7969..fc01c37433 100644 --- a/services/web/app/src/Features/Compile/ClsiManager.mjs +++ b/services/web/app/src/Features/Compile/ClsiManager.mjs @@ -12,10 +12,10 @@ import ProjectEntityHandler from '../Project/ProjectEntityHandler.js' import logger from '@overleaf/logger' import OError from '@overleaf/o-error' import { Cookie } from 'tough-cookie' -import ClsiCookieManagerFactory from './ClsiCookieManager.js' -import ClsiStateManager from './ClsiStateManager.js' +import ClsiCookieManagerFactory from './ClsiCookieManager.mjs' +import ClsiStateManager from './ClsiStateManager.mjs' import _ from 'lodash' -import ClsiFormatChecker from './ClsiFormatChecker.js' +import ClsiFormatChecker from './ClsiFormatChecker.mjs' import DocumentUpdaterHandler from '../DocumentUpdater/DocumentUpdaterHandler.js' import Metrics from '@overleaf/metrics' import Errors from '../Errors/Errors.js' diff --git a/services/web/app/src/Features/Compile/ClsiStateManager.js b/services/web/app/src/Features/Compile/ClsiStateManager.mjs similarity index 100% rename from services/web/app/src/Features/Compile/ClsiStateManager.js rename to services/web/app/src/Features/Compile/ClsiStateManager.mjs diff --git a/services/web/app/src/Features/Compile/CompileController.mjs b/services/web/app/src/Features/Compile/CompileController.mjs index 58ce47c25b..56674feaec 100644 --- a/services/web/app/src/Features/Compile/CompileController.mjs +++ b/services/web/app/src/Features/Compile/CompileController.mjs @@ -12,7 +12,7 @@ import Errors from '../Errors/Errors.js' import SessionManager from '../Authentication/SessionManager.js' import { RateLimiter } from '../../infrastructure/RateLimiter.js' import Validation from '../../infrastructure/Validation.js' -import ClsiCookieManagerFactory from './ClsiCookieManager.js' +import ClsiCookieManagerFactory from './ClsiCookieManager.mjs' import Path from 'node:path' import AnalyticsManager from '../Analytics/AnalyticsManager.js' import SplitTestHandler from '../SplitTests/SplitTestHandler.js' diff --git a/services/web/app/src/Features/Institutions/InstitutionsGetter.js b/services/web/app/src/Features/Institutions/InstitutionsGetter.mjs similarity index 100% rename from services/web/app/src/Features/Institutions/InstitutionsGetter.js rename to services/web/app/src/Features/Institutions/InstitutionsGetter.mjs diff --git a/services/web/app/src/Features/Institutions/InstitutionsManager.js b/services/web/app/src/Features/Institutions/InstitutionsManager.mjs similarity index 100% rename from services/web/app/src/Features/Institutions/InstitutionsManager.js rename to services/web/app/src/Features/Institutions/InstitutionsManager.mjs diff --git a/services/web/app/src/Features/Project/ProjectController.mjs b/services/web/app/src/Features/Project/ProjectController.mjs index 4d9adf4151..b4a834e3e8 100644 --- a/services/web/app/src/Features/Project/ProjectController.mjs +++ b/services/web/app/src/Features/Project/ProjectController.mjs @@ -38,7 +38,7 @@ import FeaturesUpdater from '../Subscription/FeaturesUpdater.js' import SpellingHandler from '../Spelling/SpellingHandler.mjs' import { hasAdminAccess } from '../Helpers/AdminAuthorizationHelper.js' import InstitutionsFeatures from '../Institutions/InstitutionsFeatures.js' -import InstitutionsGetter from '../Institutions/InstitutionsGetter.js' +import InstitutionsGetter from '../Institutions/InstitutionsGetter.mjs' import ProjectAuditLogHandler from './ProjectAuditLogHandler.mjs' import PublicAccessLevels from '../Authorization/PublicAccessLevels.js' import TagsHandler from '../Tags/TagsHandler.js' diff --git a/services/web/app/src/Features/Subscription/RecurlyEventHandler.mjs b/services/web/app/src/Features/Subscription/RecurlyEventHandler.mjs index 9f90ff4905..91f61e6d11 100644 --- a/services/web/app/src/Features/Subscription/RecurlyEventHandler.mjs +++ b/services/web/app/src/Features/Subscription/RecurlyEventHandler.mjs @@ -1,6 +1,6 @@ import SplitTestHandler from '../SplitTests/SplitTestHandler.js' import AnalyticsManager from '../Analytics/AnalyticsManager.js' -import SubscriptionEmailHandler from './SubscriptionEmailHandler.js' +import SubscriptionEmailHandler from './SubscriptionEmailHandler.mjs' import { AI_ADD_ON_CODE } from './AiHelper.js' import mongodb from 'mongodb-legacy' diff --git a/services/web/app/src/Features/Subscription/SubscriptionEmailBuilder.js b/services/web/app/src/Features/Subscription/SubscriptionEmailBuilder.mjs similarity index 98% rename from services/web/app/src/Features/Subscription/SubscriptionEmailBuilder.js rename to services/web/app/src/Features/Subscription/SubscriptionEmailBuilder.mjs index bafdee408b..a07b210a32 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionEmailBuilder.js +++ b/services/web/app/src/Features/Subscription/SubscriptionEmailBuilder.mjs @@ -1,6 +1,6 @@ -const EmailBuilder = require('../Email/EmailBuilder') -const EmailMessageHelper = require('../Email/EmailMessageHelper') -const settings = require('@overleaf/settings') +import EmailBuilder from '../Email/EmailBuilder.js' +import EmailMessageHelper from '../Email/EmailMessageHelper.js' +import settings from '@overleaf/settings' EmailBuilder.templates.trialOnboarding = EmailBuilder.NoCTAEmailTemplate({ subject(opts) { diff --git a/services/web/app/src/Features/Subscription/SubscriptionEmailHandler.js b/services/web/app/src/Features/Subscription/SubscriptionEmailHandler.mjs similarity index 68% rename from services/web/app/src/Features/Subscription/SubscriptionEmailHandler.js rename to services/web/app/src/Features/Subscription/SubscriptionEmailHandler.mjs index c0b32d76bd..8002845c8e 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionEmailHandler.js +++ b/services/web/app/src/Features/Subscription/SubscriptionEmailHandler.mjs @@ -1,8 +1,8 @@ -const EmailHandler = require('../Email/EmailHandler') -const UserGetter = require('../User/UserGetter') -require('./SubscriptionEmailBuilder') -const PlansLocator = require('./PlansLocator') -const Settings = require('@overleaf/settings') +import EmailHandler from '../Email/EmailHandler.js' +import UserGetter from '../User/UserGetter.js' +import './SubscriptionEmailBuilder.js' +import PlansLocator from './PlansLocator.js' +import Settings from '@overleaf/settings' const SubscriptionEmailHandler = { async sendTrialOnboardingEmail(userId, planCode) { @@ -26,4 +26,4 @@ const SubscriptionEmailHandler = { }, } -module.exports = SubscriptionEmailHandler +export default SubscriptionEmailHandler diff --git a/services/web/app/src/Features/Subscription/SubscriptionFormatters.js b/services/web/app/src/Features/Subscription/SubscriptionFormatters.mjs similarity index 81% rename from services/web/app/src/Features/Subscription/SubscriptionFormatters.js rename to services/web/app/src/Features/Subscription/SubscriptionFormatters.mjs index 1953f337fa..b4c7b902c1 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionFormatters.js +++ b/services/web/app/src/Features/Subscription/SubscriptionFormatters.mjs @@ -1,4 +1,4 @@ -const dateformat = require('dateformat') +import dateformat from 'dateformat'; function formatDateTime(date) { if (!date) { @@ -14,7 +14,7 @@ function formatDate(date) { return dateformat(date, 'mmmm dS, yyyy', true) } -module.exports = { +export default { formatDateTime, formatDate, -} +}; diff --git a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.mjs b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.mjs index 3199e1241e..0ab8d7edf2 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.mjs +++ b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.mjs @@ -4,10 +4,10 @@ import Settings from '@overleaf/settings' import PlansLocator from './PlansLocator.js' import { isStandaloneAiAddOnPlanCode } from './AiHelper.js' import { MEMBERS_LIMIT_ADD_ON_CODE } from './PaymentProviderEntities.js' -import SubscriptionFormatters from './SubscriptionFormatters.js' +import SubscriptionFormatters from './SubscriptionFormatters.mjs' import SubscriptionLocator from './SubscriptionLocator.js' -import InstitutionsGetter from '../Institutions/InstitutionsGetter.js' -import InstitutionsManager from '../Institutions/InstitutionsManager.js' +import InstitutionsGetter from '../Institutions/InstitutionsGetter.mjs' +import InstitutionsManager from '../Institutions/InstitutionsManager.mjs' import PublishersGetter from '../Publishers/PublishersGetter.js' import sanitizeHtml from 'sanitize-html' import _ from 'lodash' diff --git a/services/web/scripts/check_institution_users.mjs b/services/web/scripts/check_institution_users.mjs index e571ecaa47..7b37f9c6f1 100644 --- a/services/web/scripts/check_institution_users.mjs +++ b/services/web/scripts/check_institution_users.mjs @@ -1,4 +1,4 @@ -import InstitutionsManager from '../app/src/Features/Institutions/InstitutionsManager.js' +import InstitutionsManager from '../app/src/Features/Institutions/InstitutionsManager.mjs' import { ensureRunningOnMongoSecondaryWithTimeout } from './helpers/env_variable_helper.mjs' // ScriptRunner can not be used when using this assertion diff --git a/services/web/scripts/clear_institution_notifications.mjs b/services/web/scripts/clear_institution_notifications.mjs index 29a77de5db..ed7490b73a 100644 --- a/services/web/scripts/clear_institution_notifications.mjs +++ b/services/web/scripts/clear_institution_notifications.mjs @@ -1,5 +1,5 @@ import { promisify } from 'node:util' -import InstitutionsManager from '../app/src/Features/Institutions/InstitutionsManager.js' +import InstitutionsManager from '../app/src/Features/Institutions/InstitutionsManager.mjs' import { fileURLToPath } from 'node:url' import { scriptRunner } from './lib/ScriptRunner.mjs' const sleep = promisify(setTimeout) diff --git a/services/web/scripts/refresh_institution_users.mjs b/services/web/scripts/refresh_institution_users.mjs index e67bd3c346..a77fdf5201 100644 --- a/services/web/scripts/refresh_institution_users.mjs +++ b/services/web/scripts/refresh_institution_users.mjs @@ -1,5 +1,5 @@ import minimist from 'minimist' -import InstitutionsManager from '../app/src/Features/Institutions/InstitutionsManager.js' +import InstitutionsManager from '../app/src/Features/Institutions/InstitutionsManager.mjs' import { scriptRunner } from './lib/ScriptRunner.mjs' const institutionId = parseInt(process.argv[2]) diff --git a/services/web/test/unit/src/Compile/ClsiCookieManagerTests.js b/services/web/test/unit/src/Compile/ClsiCookieManager.test.mjs similarity index 100% rename from services/web/test/unit/src/Compile/ClsiCookieManagerTests.js rename to services/web/test/unit/src/Compile/ClsiCookieManager.test.mjs diff --git a/services/web/test/unit/src/Compile/ClsiFormatCheckerTests.js b/services/web/test/unit/src/Compile/ClsiFormatChecker.test.mjs similarity index 100% rename from services/web/test/unit/src/Compile/ClsiFormatCheckerTests.js rename to services/web/test/unit/src/Compile/ClsiFormatChecker.test.mjs diff --git a/services/web/test/unit/src/Compile/ClsiStateManagerTests.js b/services/web/test/unit/src/Compile/ClsiStateManager.test.mjs similarity index 100% rename from services/web/test/unit/src/Compile/ClsiStateManagerTests.js rename to services/web/test/unit/src/Compile/ClsiStateManager.test.mjs diff --git a/services/web/test/unit/src/Institutions/InstitutionsGetterTests.js b/services/web/test/unit/src/Institutions/InstitutionsGetter.test.mjs similarity index 100% rename from services/web/test/unit/src/Institutions/InstitutionsGetterTests.js rename to services/web/test/unit/src/Institutions/InstitutionsGetter.test.mjs diff --git a/services/web/test/unit/src/Institutions/InstitutionsManagerTests.js b/services/web/test/unit/src/Institutions/InstitutionsManager.test.mjs similarity index 100% rename from services/web/test/unit/src/Institutions/InstitutionsManagerTests.js rename to services/web/test/unit/src/Institutions/InstitutionsManager.test.mjs diff --git a/services/web/test/unit/src/Subscription/SubscriptionEmailHandlerTests.js b/services/web/test/unit/src/Subscription/SubscriptionEmailHandler.test.mjs similarity index 100% rename from services/web/test/unit/src/Subscription/SubscriptionEmailHandlerTests.js rename to services/web/test/unit/src/Subscription/SubscriptionEmailHandler.test.mjs diff --git a/services/web/test/unit/src/Subscription/SubscriptionFormattersTests.js b/services/web/test/unit/src/Subscription/SubscriptionFormatters.test.mjs similarity index 100% rename from services/web/test/unit/src/Subscription/SubscriptionFormattersTests.js rename to services/web/test/unit/src/Subscription/SubscriptionFormatters.test.mjs