Merge pull request #29656 from overleaf/revert-29521-ar-models-es-conversion

Revert "[web] Convert models and self-referential test files to ESM "

GitOrigin-RevId: 5455cccbb513bd9ca36ce526ff1553065f83d233
This commit is contained in:
Andrew Rumble
2025-11-13 09:06:36 +00:00
committed by Copybot
parent e7cc70baf7
commit ae6dec9dcb
202 changed files with 846 additions and 804 deletions
@@ -6,7 +6,7 @@ import logger from '@overleaf/logger'
import UserRegistrationHandler from '../../../../app/src/Features/User/UserRegistrationHandler.mjs'
import EmailHandler from '../../../../app/src/Features/Email/EmailHandler.mjs'
import UserGetter from '../../../../app/src/Features/User/UserGetter.mjs'
import { User } from '../../../../app/src/models/User.mjs'
import { User } from '../../../../app/src/models/User.js'
import AuthenticationManager from '../../../../app/src/Features/Authentication/AuthenticationManager.mjs'
import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.mjs'
import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.mjs'
@@ -52,7 +52,7 @@ describe('LaunchpadController', function () {
}),
}))
vi.doMock('../../../../../app/src/models/User.mjs', () => ({
vi.doMock('../../../../../app/src/models/User.js', () => ({
User: ctx.User,
}))
@@ -11,8 +11,8 @@ import mongodb from '../../../app/src/infrastructure/mongodb.js'
import DocumentUpdaterHandler from '../../../app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js'
import ProjectZipStreamManager from '../../../app/src/Features/Downloads/ProjectZipStreamManager.js'
import logger from 'logger-sharelatex'
import { Project } from '../../../app/src/models/Project.mjs'
import { User } from '../../../app/src/models/User.mjs'
import { Project } from '../../../app/src/models/Project.js'
import { User } from '../../../app/src/models/User.js'
import readline from 'readline'
function parseArgs() {
@@ -12,8 +12,8 @@ import ProjectZipStreamManager from '../../../app/src/Features/Downloads/Project
import logger from '@overleaf/logger'
import { promisify } from '@overleaf/promise-utils'
import { gracefulShutdown } from '../../../app/src/infrastructure/GracefulShutdown.js'
import { Project } from '../../../app/src/models/Project.mjs'
import { User } from '../../../app/src/models/User.mjs'
import { Project } from '../../../app/src/models/Project.js'
import { User } from '../../../app/src/models/User.js'
import readline from 'readline'
function parseArgs() {
@@ -14,12 +14,11 @@ import minimist from 'minimist'
import os from 'os'
import fs from 'fs'
import * as csv from 'csv/sync'
import EmailHelper from '../../../app/src/Features/Helpers/EmailHelper.mjs'
import { parseEmail } from '../../../app/src/Features/Helpers/EmailHelper.js'
import UserGetter from '../../../app/src/Features/User/UserGetter.mjs'
import UserUpdater from '../../../app/src/Features/User/UserUpdater.mjs'
import UserSessionsManager from '../../../app/src/Features/User/UserSessionsManager.mjs'
const { parseEmail } = EmailHelper
const hostname = os.hostname()
const scriptTimestamp = new Date().toISOString()
@@ -2,7 +2,7 @@ import { ObjectId } from '../../../app/src/infrastructure/mongodb.js'
import minimist from 'minimist'
import OwnershipTransferHandler from '../../../app/src/Features/Collaborators/OwnershipTransferHandler.mjs'
import UserGetter from '../../../app/src/Features/User/UserGetter.mjs'
import EmailHelper from '../../../app/src/Features/Helpers/EmailHelper.mjs'
import EmailHelper from '../../../app/src/Features/Helpers/EmailHelper.js'
const args = minimist(process.argv.slice(2), {
string: ['from-user', 'to-user'],