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

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

GitOrigin-RevId: f64000ae31d298b075a8722dfc51f294c71bc021
This commit is contained in:
Andrew Rumble
2025-11-18 09:04:56 +00:00
committed by Copybot
parent f3d0c6920f
commit 394c60f2cf
203 changed files with 893 additions and 902 deletions
@@ -1,9 +1,7 @@
import { vi, expect } from 'vitest'
import sinon from 'sinon'
import mongodb from 'mongodb-legacy'
import indirectlyImportModels from '../helpers/indirectlyImportModels.js'
const { UserAuditLogEntry } = indirectlyImportModels(['UserAuditLogEntry'])
import { UserAuditLogEntry } from '../../../../app/src/models/UserAuditLogEntry.mjs'
const { ObjectId } = mongodb
@@ -4,9 +4,8 @@ import tk from 'timekeeper'
import moment from 'moment'
import Errors from '../../../../app/src/Features/Errors/Errors.js'
import mongoose from 'mongoose'
import indirectlyImportModels from '../helpers/indirectlyImportModels.js'
const { User, DeletedUser } = indirectlyImportModels(['User', 'DeletedUser'])
import { DeletedUser } from '../../../../app/src/models/DeletedUser.mjs'
import { User } from '../../../../app/src/models/User.mjs'
const ObjectId = mongoose.Types.ObjectId
@@ -10,7 +10,7 @@ import { vi, expect } from 'vitest'
import sinon from 'sinon'
import Errors from '../../../../app/src/Features/Errors/Errors.js'
import EmailHelper from '../../../../app/src/Features/Helpers/EmailHelper.js'
import EmailHelper from '../../../../app/src/Features/Helpers/EmailHelper.mjs'
const modulePath =
'../../../../app/src/Features/User/UserEmailsConfirmationHandler'
@@ -1,7 +1,7 @@
import { vi, expect } from 'vitest'
import assert from 'assert'
import sinon from 'sinon'
import EmailHelper from '../../../../app/src/Features/Helpers/EmailHelper.js'
import EmailHelper from '../../../../app/src/Features/Helpers/EmailHelper.mjs'
const modulePath = '../../../../app/src/Features/User/UserRegistrationHandler'