diff --git a/plugins/passkeys/server/auth/passkeys.ts b/plugins/passkeys/server/auth/passkeys.ts index f56a8d91a4..398c01b755 100644 --- a/plugins/passkeys/server/auth/passkeys.ts +++ b/plugins/passkeys/server/auth/passkeys.ts @@ -7,7 +7,7 @@ import { import { isoBase64URL } from "@simplewebauthn/server/helpers"; import type { AuthenticatorTransportFuture } from "@simplewebauthn/server"; import Router from "koa-router"; -import { randomBytes } from "crypto"; +import { randomBytes } from "node:crypto"; import { User, UserPasskey, Team } from "@server/models"; import auth from "@server/middlewares/authentication"; import validate from "@server/middlewares/validate"; diff --git a/plugins/slack/server/slack.ts b/plugins/slack/server/slack.ts index 9d4d87e7b7..d4f2a9ced5 100644 --- a/plugins/slack/server/slack.ts +++ b/plugins/slack/server/slack.ts @@ -1,4 +1,4 @@ -import querystring from "querystring"; +import querystring from "node:querystring"; import { InvalidRequestError } from "@server/errors"; import fetch from "@server/utils/fetch"; import { SlackUtils } from "../shared/SlackUtils"; diff --git a/plugins/storage/server/api/files.test.ts b/plugins/storage/server/api/files.test.ts index e8daed34c5..ce8d3047aa 100644 --- a/plugins/storage/server/api/files.test.ts +++ b/plugins/storage/server/api/files.test.ts @@ -1,6 +1,6 @@ -import { existsSync, copyFileSync } from "fs"; -import { readFile } from "fs/promises"; -import path from "path"; +import { existsSync, copyFileSync } from "node:fs"; +import { readFile } from "node:fs/promises"; +import path from "node:path"; import FormData from "form-data"; import { ensureDirSync } from "fs-extra"; import { FileOperationState, FileOperationType } from "@shared/types"; @@ -15,7 +15,7 @@ import { buildUser, } from "@server/test/factories"; import { getTestServer } from "@server/test/support"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; const server = getTestServer(); diff --git a/plugins/storage/server/index.ts b/plugins/storage/server/index.ts index f7f7aecf40..f428f3a899 100644 --- a/plugins/storage/server/index.ts +++ b/plugins/storage/server/index.ts @@ -1,4 +1,4 @@ -import { existsSync, mkdirSync } from "fs"; +import { existsSync, mkdirSync } from "node:fs"; import env from "@server/env"; import Logger from "@server/logging/Logger"; import { diff --git a/server/commands/accountProvisioner.test.ts b/server/commands/accountProvisioner.test.ts index b9cbcab2f7..a3f637da69 100644 --- a/server/commands/accountProvisioner.test.ts +++ b/server/commands/accountProvisioner.test.ts @@ -1,5 +1,5 @@ import { faker } from "@faker-js/faker"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import WelcomeEmail from "@server/emails/templates/WelcomeEmail"; import { TeamDomain } from "@server/models"; import Collection from "@server/models/Collection"; diff --git a/server/commands/accountProvisioner.ts b/server/commands/accountProvisioner.ts index 36bda9f17b..eef23d12d0 100644 --- a/server/commands/accountProvisioner.ts +++ b/server/commands/accountProvisioner.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import { readFile } from "fs-extra"; import invariant from "invariant"; import { CollectionPermission, UserRole } from "@shared/types"; diff --git a/server/commands/attachmentCreator.ts b/server/commands/attachmentCreator.ts index 78e1c908b9..192e29e780 100644 --- a/server/commands/attachmentCreator.ts +++ b/server/commands/attachmentCreator.ts @@ -1,4 +1,4 @@ -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import type { AttachmentPreset } from "@shared/types"; import type { User } from "@server/models"; import { Attachment } from "@server/models"; diff --git a/server/commands/collectionExporter.ts b/server/commands/collectionExporter.ts index 83a1e7fb35..652de23453 100644 --- a/server/commands/collectionExporter.ts +++ b/server/commands/collectionExporter.ts @@ -1,4 +1,4 @@ -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { FileOperationFormat, FileOperationType, diff --git a/server/commands/documentImporter.test.ts b/server/commands/documentImporter.test.ts index 974697790e..2c00570eb8 100644 --- a/server/commands/documentImporter.test.ts +++ b/server/commands/documentImporter.test.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import fs from "fs-extra"; import { createContext } from "@server/context"; import Attachment from "@server/models/Attachment"; diff --git a/server/commands/documentUpdater.test.ts b/server/commands/documentUpdater.test.ts index d1d97c6b9e..c5cc38983d 100644 --- a/server/commands/documentUpdater.test.ts +++ b/server/commands/documentUpdater.test.ts @@ -1,4 +1,4 @@ -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import * as Y from "yjs"; import { TextEditMode } from "@shared/types"; import { APIUpdateExtension } from "@server/collaboration/APIUpdateExtension"; diff --git a/server/commands/userProvisioner.test.ts b/server/commands/userProvisioner.test.ts index 0d14463c75..fab6c2b7ae 100644 --- a/server/commands/userProvisioner.test.ts +++ b/server/commands/userProvisioner.test.ts @@ -1,5 +1,5 @@ import { faker } from "@faker-js/faker"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { UserRole } from "@shared/types"; import { AuthenticationProvider, TeamDomain } from "@server/models"; import { randomString } from "@shared/random"; diff --git a/server/env.ts b/server/env.ts index 2c52de1def..9e39773edd 100644 --- a/server/env.ts +++ b/server/env.ts @@ -1,7 +1,7 @@ /* oxlint-disable no-console */ // oxlint-disable-next-line import/order import environment from "./utils/environment"; -import os from "os"; +import os from "node:os"; import wellKnownServices from "nodemailer/lib/well-known/services.json"; import { validate, diff --git a/server/index.ts b/server/index.ts index 85e60f1c9c..426b9f4d55 100644 --- a/server/index.ts +++ b/server/index.ts @@ -4,14 +4,14 @@ import env from "./env"; import "./logging/tracer"; // must come before importing any instrumented module -import http from "http"; -import https from "https"; +import http from "node:http"; +import https from "node:https"; import type { Context } from "koa"; import Koa from "koa"; import helmet from "koa-helmet"; import logger from "koa-logger"; import Router from "koa-router"; -import type { AddressInfo } from "net"; +import type { AddressInfo } from "node:net"; import stoppable from "stoppable"; import throng from "throng"; import escape from "lodash/escape"; diff --git a/server/logging/Logger.ts b/server/logging/Logger.ts index 483bf4afa7..a0a2b720cd 100644 --- a/server/logging/Logger.ts +++ b/server/logging/Logger.ts @@ -1,5 +1,5 @@ /* oxlint-disable no-console */ -import type { IncomingMessage } from "http"; +import type { IncomingMessage } from "node:http"; import { styleText } from "node:util"; import isArray from "lodash/isArray"; import isEmpty from "lodash/isEmpty"; diff --git a/server/middlewares/csp.ts b/server/middlewares/csp.ts index 522dd1a503..e32fada556 100644 --- a/server/middlewares/csp.ts +++ b/server/middlewares/csp.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import type { Context, Next } from "koa"; import { contentSecurityPolicy } from "koa-helmet"; import uniq from "lodash/uniq"; diff --git a/server/middlewares/validateWebhook.ts b/server/middlewares/validateWebhook.ts index 5dbb89196e..aab49976a2 100644 --- a/server/middlewares/validateWebhook.ts +++ b/server/middlewares/validateWebhook.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import type { Next } from "koa"; import type { APIContext } from "@server/types"; import { safeEqual } from "@server/utils/crypto"; diff --git a/server/models/Attachment.ts b/server/models/Attachment.ts index 7b682ee596..224428d243 100644 --- a/server/models/Attachment.ts +++ b/server/models/Attachment.ts @@ -1,5 +1,5 @@ -import { createReadStream } from "fs"; -import path from "path"; +import { createReadStream } from "node:fs"; +import path from "node:path"; import type { File } from "formidable"; import type { InferAttributes, diff --git a/server/models/Collection.test.ts b/server/models/Collection.test.ts index c793b64071..9d8c99f216 100644 --- a/server/models/Collection.test.ts +++ b/server/models/Collection.test.ts @@ -1,4 +1,4 @@ -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { randomString } from "@shared/random"; import slugify from "@shared/utils/slugify"; import { diff --git a/server/models/Notification.ts b/server/models/Notification.ts index 84e8ff16f5..658794f1b6 100644 --- a/server/models/Notification.ts +++ b/server/models/Notification.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import type { InferAttributes, InferCreationAttributes, diff --git a/server/models/Team.ts b/server/models/Team.ts index 5a732e9d79..4d9e7e6708 100644 --- a/server/models/Team.ts +++ b/server/models/Team.ts @@ -1,5 +1,5 @@ -import crypto from "crypto"; -import { URL } from "url"; +import crypto from "node:crypto"; +import { URL } from "node:url"; import { subMinutes } from "date-fns"; import type { InferAttributes, InferCreationAttributes } from "sequelize"; import { type SaveOptions } from "sequelize"; diff --git a/server/models/User.ts b/server/models/User.ts index cdd1016faf..1541dab39d 100644 --- a/server/models/User.ts +++ b/server/models/User.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import { addHours, addMinutes, subMinutes } from "date-fns"; import JWT from "jsonwebtoken"; import type { Context } from "koa"; diff --git a/server/models/WebhookSubscription.ts b/server/models/WebhookSubscription.ts index 20181068c8..7ee820aab5 100644 --- a/server/models/WebhookSubscription.ts +++ b/server/models/WebhookSubscription.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import isNil from "lodash/isNil"; import type { InferAttributes, diff --git a/server/models/base/Model.test.ts b/server/models/base/Model.test.ts index dae789d483..0201204cbd 100644 --- a/server/models/base/Model.test.ts +++ b/server/models/base/Model.test.ts @@ -1,5 +1,5 @@ import { faker } from "@faker-js/faker"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { TeamPreference } from "@shared/types"; import { buildDocument, buildTeam } from "@server/test/factories"; import User from "../User"; diff --git a/server/models/helpers/NotificationSettingsHelper.ts b/server/models/helpers/NotificationSettingsHelper.ts index 3e87de5b49..4100fe4960 100644 --- a/server/models/helpers/NotificationSettingsHelper.ts +++ b/server/models/helpers/NotificationSettingsHelper.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import type { NotificationEventType } from "@shared/types"; import { NotificationEventDefaults } from "@shared/types"; import env from "@server/env"; diff --git a/server/models/helpers/SubscriptionHelper.test.ts b/server/models/helpers/SubscriptionHelper.test.ts index 6f5f283d81..8e458af437 100644 --- a/server/models/helpers/SubscriptionHelper.test.ts +++ b/server/models/helpers/SubscriptionHelper.test.ts @@ -1,4 +1,4 @@ -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import env from "@server/env"; import SubscriptionHelper from "./SubscriptionHelper"; diff --git a/server/models/helpers/SubscriptionHelper.ts b/server/models/helpers/SubscriptionHelper.ts index e099eded31..28b09a34ad 100644 --- a/server/models/helpers/SubscriptionHelper.ts +++ b/server/models/helpers/SubscriptionHelper.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import queryString from "query-string"; import env from "@server/env"; diff --git a/server/onerror.ts b/server/onerror.ts index e2ce326145..20ea44f8cf 100644 --- a/server/onerror.ts +++ b/server/onerror.ts @@ -1,6 +1,6 @@ -import fs from "fs"; -import http from "http"; -import path from "path"; +import fs from "node:fs"; +import http from "node:http"; +import path from "node:path"; import formidable from "formidable"; import type Koa from "koa"; import escape from "lodash/escape"; diff --git a/server/presenters/fileOperation.ts b/server/presenters/fileOperation.ts index 5436159bdf..0c624e0e2a 100644 --- a/server/presenters/fileOperation.ts +++ b/server/presenters/fileOperation.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import type { FileOperation } from "@server/models"; import { presentUser } from "."; diff --git a/server/queues/processors/ImportsProcessor.ts b/server/queues/processors/ImportsProcessor.ts index 75441d8530..615b954ff0 100644 --- a/server/queues/processors/ImportsProcessor.ts +++ b/server/queues/processors/ImportsProcessor.ts @@ -5,7 +5,7 @@ import truncate from "lodash/truncate"; import { Fragment, Node } from "prosemirror-model"; import type { CreateOptions, CreationAttributes, Transaction } from "sequelize"; import { UniqueConstraintError } from "sequelize"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { randomElement } from "@shared/random"; import type { ImportInput, ImportTaskInput } from "@shared/schema"; import type { diff --git a/server/queues/tasks/APIImportTask.ts b/server/queues/tasks/APIImportTask.ts index 19aa41c738..cb481417cf 100644 --- a/server/queues/tasks/APIImportTask.ts +++ b/server/queues/tasks/APIImportTask.ts @@ -5,7 +5,7 @@ import uniqBy from "lodash/uniqBy"; import { Fragment, Node } from "prosemirror-model"; import type { WhereOptions } from "sequelize"; import { Transaction } from "sequelize"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import type { ImportTaskInput, ImportTaskOutput } from "@shared/schema"; import type { ImportableIntegrationService, diff --git a/server/queues/tasks/ExportDocumentTreeTask.ts b/server/queues/tasks/ExportDocumentTreeTask.ts index b92c32156a..8d0f9d637f 100644 --- a/server/queues/tasks/ExportDocumentTreeTask.ts +++ b/server/queues/tasks/ExportDocumentTreeTask.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import type JSZip from "jszip"; import escapeRegExp from "lodash/escapeRegExp"; import type { NavigationNode } from "@shared/types"; diff --git a/server/queues/tasks/ImportJSONTask.test.ts b/server/queues/tasks/ImportJSONTask.test.ts index de768ef202..936bd823c8 100644 --- a/server/queues/tasks/ImportJSONTask.test.ts +++ b/server/queues/tasks/ImportJSONTask.test.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import { FileOperation } from "@server/models"; import { buildFileOperation } from "@server/test/factories"; import ImportJSONTask from "./ImportJSONTask"; diff --git a/server/queues/tasks/ImportJSONTask.ts b/server/queues/tasks/ImportJSONTask.ts index 96cf55a5af..4d7251ba36 100644 --- a/server/queues/tasks/ImportJSONTask.ts +++ b/server/queues/tasks/ImportJSONTask.ts @@ -1,9 +1,9 @@ -import path from "path"; +import path from "node:path"; import fs from "fs-extra"; import find from "lodash/find"; import mime from "mime-types"; import { Fragment, Node } from "prosemirror-model"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import type { ProsemirrorData } from "@shared/types"; import { schema, serializer } from "@server/editor"; import Logger from "@server/logging/Logger"; diff --git a/server/queues/tasks/ImportMarkdownZipTask.test.ts b/server/queues/tasks/ImportMarkdownZipTask.test.ts index 9b6787612e..8d010cdd80 100644 --- a/server/queues/tasks/ImportMarkdownZipTask.test.ts +++ b/server/queues/tasks/ImportMarkdownZipTask.test.ts @@ -1,5 +1,5 @@ /* oxlint-disable @typescript-eslint/no-empty-function */ -import path from "path"; +import path from "node:path"; import { FileOperation } from "@server/models"; import { buildFileOperation } from "@server/test/factories"; import ImportMarkdownZipTask from "./ImportMarkdownZipTask"; diff --git a/server/queues/tasks/ImportMarkdownZipTask.ts b/server/queues/tasks/ImportMarkdownZipTask.ts index 7c8dd3b196..c9b5c54d1d 100644 --- a/server/queues/tasks/ImportMarkdownZipTask.ts +++ b/server/queues/tasks/ImportMarkdownZipTask.ts @@ -1,8 +1,8 @@ -import path from "path"; +import path from "node:path"; import fs from "fs-extra"; import escapeRegExp from "lodash/escapeRegExp"; import mime from "mime-types"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import documentImporter from "@server/commands/documentImporter"; import { createContext } from "@server/context"; import Logger from "@server/logging/Logger"; diff --git a/server/queues/tasks/ImportTask.ts b/server/queues/tasks/ImportTask.ts index 10afa1f5bd..8a0b85d1ba 100644 --- a/server/queues/tasks/ImportTask.ts +++ b/server/queues/tasks/ImportTask.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import fs from "fs-extra"; import chunk from "lodash/chunk"; import truncate from "lodash/truncate"; diff --git a/server/queues/tasks/UpdateDocumentsPopularityScoreTask.ts b/server/queues/tasks/UpdateDocumentsPopularityScoreTask.ts index 893b952e8f..009afbd102 100644 --- a/server/queues/tasks/UpdateDocumentsPopularityScoreTask.ts +++ b/server/queues/tasks/UpdateDocumentsPopularityScoreTask.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import { subWeeks } from "date-fns"; import { QueryTypes } from "sequelize"; import { Minute } from "@shared/utils/time"; diff --git a/server/queues/tasks/UploadUserAvatarTask.ts b/server/queues/tasks/UploadUserAvatarTask.ts index ec40b45f37..40e182e8ba 100644 --- a/server/queues/tasks/UploadUserAvatarTask.ts +++ b/server/queues/tasks/UploadUserAvatarTask.ts @@ -1,4 +1,4 @@ -import { createHash } from "crypto"; +import { createHash } from "node:crypto"; import { AttachmentPreset } from "@shared/types"; import attachmentCreator from "@server/commands/attachmentCreator"; import { createContext } from "@server/context"; diff --git a/server/routes/api/attachments/attachments.test.ts b/server/routes/api/attachments/attachments.test.ts index 585020361a..46eef4b489 100644 --- a/server/routes/api/attachments/attachments.test.ts +++ b/server/routes/api/attachments/attachments.test.ts @@ -1,4 +1,4 @@ -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { AttachmentPreset, CollectionPermission } from "@shared/types"; import { UserMembership } from "@server/models"; import Attachment from "@server/models/Attachment"; diff --git a/server/routes/api/attachments/attachments.ts b/server/routes/api/attachments/attachments.ts index 6a96ebf8b4..e1b1477f0a 100644 --- a/server/routes/api/attachments/attachments.ts +++ b/server/routes/api/attachments/attachments.ts @@ -1,6 +1,6 @@ import Router from "koa-router"; import type { WhereOptions } from "sequelize"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { AttachmentPreset } from "@shared/types"; import { bytesToHumanReadable, getFileNameFromUrl } from "@shared/utils/files"; import { AttachmentValidation } from "@shared/validations"; diff --git a/server/routes/api/auth/auth.test.ts b/server/routes/api/auth/auth.test.ts index e37fcdf482..f63633da84 100644 --- a/server/routes/api/auth/auth.test.ts +++ b/server/routes/api/auth/auth.test.ts @@ -1,5 +1,5 @@ import { faker } from "@faker-js/faker"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { buildUser, buildTeam } from "@server/test/factories"; import { getTestServer, setSelfHosted } from "@server/test/support"; diff --git a/server/routes/api/authenticationProviders/authenticationProviders.test.ts b/server/routes/api/authenticationProviders/authenticationProviders.test.ts index 1fb671f90d..b18fbcc755 100644 --- a/server/routes/api/authenticationProviders/authenticationProviders.test.ts +++ b/server/routes/api/authenticationProviders/authenticationProviders.test.ts @@ -1,4 +1,4 @@ -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { buildUser, buildAdmin, buildTeam } from "@server/test/factories"; import { getTestServer, setSelfHosted } from "@server/test/support"; diff --git a/server/routes/api/documents/documents.ts b/server/routes/api/documents/documents.ts index 2d08fc7c63..fd470a5084 100644 --- a/server/routes/api/documents/documents.ts +++ b/server/routes/api/documents/documents.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import fractionalIndex from "fractional-index"; import fs from "fs-extra"; import invariant from "invariant"; @@ -12,7 +12,7 @@ import uniq from "lodash/uniq"; import mime from "mime-types"; import type { Order, ScopeOptions, WhereOptions } from "sequelize"; import { Op, Sequelize } from "sequelize"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import type { NavigationNode } from "@shared/types"; import { FileOperationFormat, diff --git a/server/routes/api/middlewares/apiResponse.ts b/server/routes/api/middlewares/apiResponse.ts index 717bf96491..9ab5fe88ed 100644 --- a/server/routes/api/middlewares/apiResponse.ts +++ b/server/routes/api/middlewares/apiResponse.ts @@ -1,4 +1,4 @@ -import stream from "stream"; +import stream from "node:stream"; import type { Context, Next } from "koa"; import { Readable } from "readable-stream"; diff --git a/server/routes/api/middlewares/pagination.ts b/server/routes/api/middlewares/pagination.ts index 27a3beb3ab..49a11ab8f8 100644 --- a/server/routes/api/middlewares/pagination.ts +++ b/server/routes/api/middlewares/pagination.ts @@ -1,4 +1,4 @@ -import querystring from "querystring"; +import querystring from "node:querystring"; import type { Next } from "koa"; import { Pagination } from "@shared/constants"; import { InvalidRequestError } from "@server/errors"; diff --git a/server/routes/api/notifications/notifications.test.ts b/server/routes/api/notifications/notifications.test.ts index ea7406d468..e9e6ee4c46 100644 --- a/server/routes/api/notifications/notifications.test.ts +++ b/server/routes/api/notifications/notifications.test.ts @@ -1,5 +1,5 @@ import queryString from "query-string"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { randomElement } from "@shared/random"; import { NotificationEventType } from "@shared/types"; import NotificationSettingsHelper from "@server/models/helpers/NotificationSettingsHelper"; diff --git a/server/routes/api/revisions/revisions.ts b/server/routes/api/revisions/revisions.ts index 06cc6d2ddb..1db267d318 100644 --- a/server/routes/api/revisions/revisions.ts +++ b/server/routes/api/revisions/revisions.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import Router from "koa-router"; import contentDisposition from "content-disposition"; import JSZip from "jszip"; diff --git a/server/routes/api/urls/urls.ts b/server/routes/api/urls/urls.ts index 736aadc476..25b2324f85 100644 --- a/server/routes/api/urls/urls.ts +++ b/server/routes/api/urls/urls.ts @@ -1,4 +1,4 @@ -import dns from "dns"; +import dns from "node:dns"; import Router from "koa-router"; import { traceFunction } from "@server/logging/tracing"; import { MentionType, UnfurlResourceType } from "@shared/types"; diff --git a/server/routes/app.ts b/server/routes/app.ts index d5a1e88298..0a214b60a3 100644 --- a/server/routes/app.ts +++ b/server/routes/app.ts @@ -1,6 +1,6 @@ -import fs from "fs"; -import path from "path"; -import util from "util"; +import fs from "node:fs"; +import path from "node:path"; +import util from "node:util"; import type { Context, Next } from "koa"; import escape from "lodash/escape"; import { Sequelize } from "sequelize"; diff --git a/server/routes/index.ts b/server/routes/index.ts index 41f74b2f0f..ca7a185bed 100644 --- a/server/routes/index.ts +++ b/server/routes/index.ts @@ -1,5 +1,5 @@ -import crypto from "crypto"; -import path from "path"; +import crypto from "node:crypto"; +import path from "node:path"; import { formatRFC7231 } from "date-fns"; import Koa from "koa"; import Router from "koa-router"; diff --git a/server/routes/oauth/index.test.ts b/server/routes/oauth/index.test.ts index fbde594d14..fb07fb9f1b 100644 --- a/server/routes/oauth/index.test.ts +++ b/server/routes/oauth/index.test.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import { Scope } from "@shared/types"; import { OAuthAuthentication, OAuthAuthorizationCode } from "@server/models"; import { diff --git a/server/scripts/reset-encrypted-data.ts b/server/scripts/reset-encrypted-data.ts index e2519541b0..681ea1f3dc 100644 --- a/server/scripts/reset-encrypted-data.ts +++ b/server/scripts/reset-encrypted-data.ts @@ -1,5 +1,5 @@ import "./bootstrap"; -import * as readline from "readline"; +import * as readline from "node:readline"; import { Transaction } from "sequelize"; import { diff --git a/server/services/collaboration.ts b/server/services/collaboration.ts index 5dd71eeb65..f58928c775 100644 --- a/server/services/collaboration.ts +++ b/server/services/collaboration.ts @@ -1,7 +1,7 @@ -import type { IncomingMessage } from "http"; -import type http from "http"; -import type { Duplex } from "stream"; -import url from "url"; +import type { IncomingMessage } from "node:http"; +import type http from "node:http"; +import type { Duplex } from "node:stream"; +import url from "node:url"; import { Redis } from "@hocuspocus/extension-redis"; import { Throttle } from "@hocuspocus/extension-throttle"; import { Server } from "@hocuspocus/server"; diff --git a/server/services/web.ts b/server/services/web.ts index 4360d367bf..af4159e7be 100644 --- a/server/services/web.ts +++ b/server/services/web.ts @@ -1,5 +1,5 @@ /* oxlint-disable @typescript-eslint/no-var-requires */ -import type { Server } from "https"; +import type { Server } from "node:https"; import type { BaseContext } from "koa"; import Koa from "koa"; import compress from "koa-compress"; diff --git a/server/services/websockets.ts b/server/services/websockets.ts index 0d6c6c6650..d9cf4c7efd 100644 --- a/server/services/websockets.ts +++ b/server/services/websockets.ts @@ -1,6 +1,6 @@ -import type { IncomingMessage } from "http"; -import type http from "http"; -import type { Duplex } from "stream"; +import type { IncomingMessage } from "node:http"; +import type http from "node:http"; +import type { Duplex } from "node:stream"; import cookie from "cookie"; import type Koa from "koa"; import IO from "socket.io"; diff --git a/server/storage/database.ts b/server/storage/database.ts index 5fa4035f89..1b405fc410 100644 --- a/server/storage/database.ts +++ b/server/storage/database.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import type { InferAttributes, InferCreationAttributes } from "sequelize"; import sequelizeStrictAttributes from "sequelize-strict-attributes"; import type { SequelizeOptions } from "sequelize-typescript"; diff --git a/server/storage/files/BaseStorage.ts b/server/storage/files/BaseStorage.ts index 980cb872d9..ae4fc02c18 100644 --- a/server/storage/files/BaseStorage.ts +++ b/server/storage/files/BaseStorage.ts @@ -1,5 +1,5 @@ -import type { Blob } from "buffer"; -import type { Readable } from "stream"; +import type { Blob } from "node:buffer"; +import type { Readable } from "node:stream"; import type { PresignedPost } from "@aws-sdk/s3-presigned-post"; import omit from "lodash/omit"; import FileHelper from "@shared/editor/lib/FileHelper"; diff --git a/server/storage/files/LocalStorage.ts b/server/storage/files/LocalStorage.ts index aa9aef5fc3..2ddeb23396 100644 --- a/server/storage/files/LocalStorage.ts +++ b/server/storage/files/LocalStorage.ts @@ -1,7 +1,7 @@ -import { Blob } from "buffer"; -import { mkdir, unlink, rmdir } from "fs/promises"; -import path from "path"; -import { Readable } from "stream"; +import { Blob } from "node:buffer"; +import { mkdir, unlink, rmdir } from "node:fs/promises"; +import path from "node:path"; +import { Readable } from "node:stream"; import type { PresignedPost } from "@aws-sdk/s3-presigned-post"; import fs from "fs-extra"; import invariant from "invariant"; diff --git a/server/storage/files/S3Storage.ts b/server/storage/files/S3Storage.ts index 4ca014147e..d805c63b91 100644 --- a/server/storage/files/S3Storage.ts +++ b/server/storage/files/S3Storage.ts @@ -1,5 +1,5 @@ -import path from "path"; -import type { Readable } from "stream"; +import path from "node:path"; +import type { Readable } from "node:stream"; import type { ObjectCannedACL } from "@aws-sdk/client-s3"; import { S3Client, diff --git a/server/test/TestServer.ts b/server/test/TestServer.ts index 9736f0c818..55445ffb87 100644 --- a/server/test/TestServer.ts +++ b/server/test/TestServer.ts @@ -1,5 +1,5 @@ -import http from "http"; -import type { AddressInfo } from "net"; +import http from "node:http"; +import type { AddressInfo } from "node:net"; import type Koa from "koa"; // oxlint-disable-next-line no-restricted-imports import nodeFetch from "node-fetch"; diff --git a/server/test/factories.ts b/server/test/factories.ts index 953508903f..35b7605e72 100644 --- a/server/test/factories.ts +++ b/server/test/factories.ts @@ -4,7 +4,7 @@ import isNull from "lodash/isNull"; import { Node } from "prosemirror-model"; import type { InferCreationAttributes } from "sequelize"; import type { DeepPartial } from "utility-types"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { randomString } from "@shared/random"; import type { ProsemirrorData, ReactionSummary } from "@shared/types"; import { diff --git a/server/test/setup.ts b/server/test/setup.ts index 40e96a79f9..20f60b1265 100644 --- a/server/test/setup.ts +++ b/server/test/setup.ts @@ -1,7 +1,7 @@ import "reflect-metadata"; import sharedEnv from "@shared/env"; import env from "@server/env"; -import { EventEmitter } from "events"; +import { EventEmitter } from "node:events"; // Increase the default max listeners for EventEmitter to prevent warnings in tests // This needs to be done before any modules that use EventEmitter are loaded diff --git a/server/typings/outlinewiki__koa-passport.d.ts b/server/typings/outlinewiki__koa-passport.d.ts index 49b2020ea5..75976d1adb 100644 --- a/server/typings/outlinewiki__koa-passport.d.ts +++ b/server/typings/outlinewiki__koa-passport.d.ts @@ -11,7 +11,7 @@ declare module "@outlinewiki/koa-passport" { // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 - import { IncomingMessage } from "http"; + import { IncomingMessage } from "node:http"; // oxlint-disable-next-line import Express from "express"; import { Request } from "koa"; diff --git a/server/typings/tunnel-agent.d.ts b/server/typings/tunnel-agent.d.ts index 4e4b8409da..2bd6e0375a 100644 --- a/server/typings/tunnel-agent.d.ts +++ b/server/typings/tunnel-agent.d.ts @@ -1,6 +1,6 @@ declare module "tunnel-agent" { - import { Agent as HttpAgent } from "http"; - import { Agent as HttpsAgent } from "https"; + import { Agent as HttpAgent } from "node:http"; + import { Agent as HttpsAgent } from "node:https"; interface TunnelOptions { proxy: { diff --git a/server/utils/ImportHelper.test.ts b/server/utils/ImportHelper.test.ts index 50bc654236..9e26f27115 100644 --- a/server/utils/ImportHelper.test.ts +++ b/server/utils/ImportHelper.test.ts @@ -1,6 +1,6 @@ -import path from "path"; +import path from "node:path"; import fs from "fs-extra"; -import { tmpdir } from "os"; +import { tmpdir } from "node:os"; import ImportHelper from "./ImportHelper"; describe("ImportHelper", () => { diff --git a/server/utils/ImportHelper.ts b/server/utils/ImportHelper.ts index 117188435f..b9f44583c6 100644 --- a/server/utils/ImportHelper.ts +++ b/server/utils/ImportHelper.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import fs from "fs-extra"; import { deserializeFilename } from "./fs"; diff --git a/server/utils/PluginManager.ts b/server/utils/PluginManager.ts index f9c755d527..fafdc5a38e 100644 --- a/server/utils/PluginManager.ts +++ b/server/utils/PluginManager.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import { glob } from "glob"; import type Router from "koa-router"; import isArray from "lodash/isArray"; diff --git a/server/utils/VerificationCode.ts b/server/utils/VerificationCode.ts index 733beb3fb0..b03f7bc6bc 100644 --- a/server/utils/VerificationCode.ts +++ b/server/utils/VerificationCode.ts @@ -1,4 +1,4 @@ -import { randomInt } from "crypto"; +import { randomInt } from "node:crypto"; import { Minute } from "@shared/utils/time"; import Redis from "@server/storage/redis"; import { safeEqual } from "./crypto"; diff --git a/server/utils/ZipHelper.ts b/server/utils/ZipHelper.ts index 6346682e2b..d835e8326f 100644 --- a/server/utils/ZipHelper.ts +++ b/server/utils/ZipHelper.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import fs from "fs-extra"; import type JSZip from "jszip"; import tmp from "tmp"; diff --git a/server/utils/authentication.ts b/server/utils/authentication.ts index 2e69f92262..c6e8a93aa8 100644 --- a/server/utils/authentication.ts +++ b/server/utils/authentication.ts @@ -1,4 +1,4 @@ -import querystring from "querystring"; +import querystring from "node:querystring"; import { addMonths } from "date-fns"; import type { Context } from "koa"; import pick from "lodash/pick"; diff --git a/server/utils/crypto.ts b/server/utils/crypto.ts index 59187f4da5..569bf0981b 100644 --- a/server/utils/crypto.ts +++ b/server/utils/crypto.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; /** * Compare two strings in constant time to prevent timing attacks. diff --git a/server/utils/csrf.ts b/server/utils/csrf.ts index bee25bbaf5..5ab700385e 100644 --- a/server/utils/csrf.ts +++ b/server/utils/csrf.ts @@ -1,4 +1,4 @@ -import { randomBytes, createHmac } from "crypto"; +import { randomBytes, createHmac } from "node:crypto"; import { safeEqual } from "./crypto"; /** diff --git a/server/utils/environment.ts b/server/utils/environment.ts index 940f7d9ae5..cc020cee7a 100644 --- a/server/utils/environment.ts +++ b/server/utils/environment.ts @@ -1,5 +1,5 @@ -import fs from "fs"; -import path from "path"; +import fs from "node:fs"; +import path from "node:path"; import dotenv from "@dotenvx/dotenvx"; let environment: Record = {}; diff --git a/server/utils/fetch.ts b/server/utils/fetch.ts index 2a002ee706..289e655581 100644 --- a/server/utils/fetch.ts +++ b/server/utils/fetch.ts @@ -1,6 +1,6 @@ /* oxlint-disable no-restricted-imports, react/rules-of-hooks */ -import type http from "http"; -import type https from "https"; +import type http from "node:http"; +import type https from "node:https"; import nodeFetch, { type RequestInit, type Response } from "node-fetch"; import { getProxyForUrl } from "proxy-from-env"; import tunnelAgent, { type TunnelAgent } from "tunnel-agent"; diff --git a/server/utils/fs.ts b/server/utils/fs.ts index 4a439ab147..f7d856a0e7 100644 --- a/server/utils/fs.ts +++ b/server/utils/fs.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import fs from "fs-extra"; /** diff --git a/server/utils/i18n.ts b/server/utils/i18n.ts index a6dd362e69..b929855156 100644 --- a/server/utils/i18n.ts +++ b/server/utils/i18n.ts @@ -1,4 +1,4 @@ -import path from "path"; +import path from "node:path"; import i18n from "i18next"; import backend from "i18next-fs-backend"; import { languages } from "@shared/i18n"; diff --git a/server/utils/oauth/OAuthInterface.test.ts b/server/utils/oauth/OAuthInterface.test.ts index 231f6812a5..e1a8648adf 100644 --- a/server/utils/oauth/OAuthInterface.test.ts +++ b/server/utils/oauth/OAuthInterface.test.ts @@ -1,4 +1,4 @@ -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { Scope } from "@shared/types"; import { OAuthInterface } from "./OAuthInterface"; import { diff --git a/server/utils/oauth/OAuthInterface.ts b/server/utils/oauth/OAuthInterface.ts index 3885c35f05..c6b3dbb950 100644 --- a/server/utils/oauth/OAuthInterface.ts +++ b/server/utils/oauth/OAuthInterface.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import type { RefreshTokenModel, AuthorizationCodeModel, diff --git a/server/utils/parseAttachmentIds.test.ts b/server/utils/parseAttachmentIds.test.ts index ab2d38956a..6508bb6ec1 100644 --- a/server/utils/parseAttachmentIds.test.ts +++ b/server/utils/parseAttachmentIds.test.ts @@ -1,5 +1,5 @@ import { expect } from "@jest/globals"; -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import env from "@server/env"; import parseAttachmentIds from "./parseAttachmentIds"; diff --git a/server/utils/passport.ts b/server/utils/passport.ts index 807674741e..734c13baaf 100644 --- a/server/utils/passport.ts +++ b/server/utils/passport.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import { addMinutes, subMinutes } from "date-fns"; import type { Context } from "koa"; import type { diff --git a/server/utils/readManifestFile.ts b/server/utils/readManifestFile.ts index 6b21f85f67..9b5ee41bd4 100644 --- a/server/utils/readManifestFile.ts +++ b/server/utils/readManifestFile.ts @@ -1,5 +1,5 @@ -import fs from "fs"; -import path from "path"; +import fs from "node:fs"; +import path from "node:path"; import Logger from "@server/logging/Logger"; export type Chunk = { diff --git a/server/utils/ssl.ts b/server/utils/ssl.ts index 8d9bb172b6..f38ab62d98 100644 --- a/server/utils/ssl.ts +++ b/server/utils/ssl.ts @@ -1,5 +1,5 @@ -import fs from "fs"; -import path from "path"; +import fs from "node:fs"; +import path from "node:path"; import env from "../env"; /** diff --git a/server/utils/updates.ts b/server/utils/updates.ts index fa83385c44..65b5044181 100644 --- a/server/utils/updates.ts +++ b/server/utils/updates.ts @@ -1,4 +1,4 @@ -import crypto from "crypto"; +import crypto from "node:crypto"; import env from "@server/env"; import Collection from "@server/models/Collection"; import Document from "@server/models/Document"; diff --git a/server/validation.test.ts b/server/validation.test.ts index 97a61ac12e..eba2d83123 100644 --- a/server/validation.test.ts +++ b/server/validation.test.ts @@ -1,4 +1,4 @@ -import { randomUUID } from "crypto"; +import { randomUUID } from "node:crypto"; import { Buckets } from "./models/helpers/AttachmentHelper"; import { ValidateKey } from "./validation"; diff --git a/vite.config.ts b/vite.config.ts index 6edbe9af23..9de1584343 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,5 +1,5 @@ -import fs from "fs"; -import path from "path"; +import fs from "node:fs"; +import path from "node:path"; import react from "@vitejs/plugin-react-oxc"; import browserslistToEsbuild from "browserslist-to-esbuild"; import webpackStats from "rollup-plugin-webpack-stats";