diff --git a/app/components/CollectionIcon.tsx b/app/components/CollectionIcon.tsx index f01551548..5e259e52e 100644 --- a/app/components/CollectionIcon.tsx +++ b/app/components/CollectionIcon.tsx @@ -5,7 +5,7 @@ import * as React from "react"; import Collection from "~/models/Collection"; import { icons } from "~/components/IconPicker"; import useStores from "~/hooks/useStores"; -import Logger from "~/utils/logger"; +import Logger from "~/utils/Logger"; type Props = { collection: Collection; diff --git a/app/components/ErrorBoundary.tsx b/app/components/ErrorBoundary.tsx index f8de23288..2a4c1472a 100644 --- a/app/components/ErrorBoundary.tsx +++ b/app/components/ErrorBoundary.tsx @@ -9,8 +9,8 @@ import CenteredContent from "~/components/CenteredContent"; import PageTitle from "~/components/PageTitle"; import Text from "~/components/Text"; import env from "~/env"; +import Logger from "~/utils/Logger"; import isCloudHosted from "~/utils/isCloudHosted"; -import Logger from "~/utils/logger"; type Props = WithTranslation & { reloadOnChunkMissing?: boolean; diff --git a/app/editor/index.tsx b/app/editor/index.tsx index 9e1cbb8d7..aa9f23e1f 100644 --- a/app/editor/index.tsx +++ b/app/editor/index.tsx @@ -28,7 +28,7 @@ import { EmbedDescriptor, EventType } from "@shared/editor/types"; import EventEmitter from "@shared/utils/events"; import Flex from "~/components/Flex"; import { Dictionary } from "~/hooks/useDictionary"; -import Logger from "~/utils/logger"; +import Logger from "~/utils/Logger"; import BlockMenu from "./components/BlockMenu"; import ComponentView from "./components/ComponentView"; import EditorContext from "./components/EditorContext"; diff --git a/app/hooks/usePersistedState.ts b/app/hooks/usePersistedState.ts index f79c9061a..8619e2bef 100644 --- a/app/hooks/usePersistedState.ts +++ b/app/hooks/usePersistedState.ts @@ -1,7 +1,7 @@ import * as React from "react"; import { Primitive } from "utility-types"; +import Logger from "~/utils/Logger"; import Storage from "~/utils/Storage"; -import Logger from "~/utils/logger"; import useEventListener from "./useEventListener"; /** diff --git a/app/index.tsx b/app/index.tsx index b9681bf88..8252a4c91 100644 --- a/app/index.tsx +++ b/app/index.tsx @@ -16,8 +16,8 @@ import Theme from "~/components/Theme"; import Toasts from "~/components/Toasts"; import env from "~/env"; import Routes from "./routes"; +import Logger from "./utils/Logger"; import history from "./utils/history"; -import Logger from "./utils/logger"; import { initSentry } from "./utils/sentry"; initI18n(); diff --git a/app/scenes/Document/components/MultiplayerEditor.tsx b/app/scenes/Document/components/MultiplayerEditor.tsx index 0a04a0b1f..130f41b6c 100644 --- a/app/scenes/Document/components/MultiplayerEditor.tsx +++ b/app/scenes/Document/components/MultiplayerEditor.tsx @@ -15,8 +15,8 @@ import usePageVisibility from "~/hooks/usePageVisibility"; import useStores from "~/hooks/useStores"; import useToasts from "~/hooks/useToasts"; import MultiplayerExtension from "~/multiplayer/MultiplayerExtension"; +import Logger from "~/utils/Logger"; import { supportsPassiveListener } from "~/utils/browser"; -import Logger from "~/utils/logger"; import { homePath } from "~/utils/routeHelpers"; type Props = EditorProps & { diff --git a/app/scenes/Search/Search.tsx b/app/scenes/Search/Search.tsx index e75182763..1fd205c74 100644 --- a/app/scenes/Search/Search.tsx +++ b/app/scenes/Search/Search.tsx @@ -23,7 +23,7 @@ import RegisterKeyDown from "~/components/RegisterKeyDown"; import Scene from "~/components/Scene"; import Text from "~/components/Text"; import withStores from "~/components/withStores"; -import Logger from "~/utils/logger"; +import Logger from "~/utils/Logger"; import { searchPath } from "~/utils/routeHelpers"; import { decodeURIComponentSafe } from "~/utils/urls"; import CollectionFilter from "./components/CollectionFilter"; diff --git a/app/utils/logger.ts b/app/utils/Logger.ts similarity index 100% rename from app/utils/logger.ts rename to app/utils/Logger.ts diff --git a/app/utils/files.ts b/app/utils/files.ts index 62f0274b2..cc9864be8 100644 --- a/app/utils/files.ts +++ b/app/utils/files.ts @@ -1,6 +1,6 @@ import invariant from "invariant"; import { client } from "./ApiClient"; -import Logger from "./logger"; +import Logger from "./Logger"; type UploadOptions = { /** The user facing name of the file */ diff --git a/server/collaboration/LoggerExtension.ts b/server/collaboration/LoggerExtension.ts index bf1ce94cd..6b381e161 100644 --- a/server/collaboration/LoggerExtension.ts +++ b/server/collaboration/LoggerExtension.ts @@ -4,7 +4,7 @@ import { onLoadDocumentPayload, Extension, } from "@hocuspocus/server"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; export default class LoggerExtension implements Extension { async onLoadDocument(data: onLoadDocumentPayload) { diff --git a/server/collaboration/PersistenceExtension.ts b/server/collaboration/PersistenceExtension.ts index 5cdc3f416..644f6061c 100644 --- a/server/collaboration/PersistenceExtension.ts +++ b/server/collaboration/PersistenceExtension.ts @@ -6,7 +6,7 @@ import { import invariant from "invariant"; import * as Y from "yjs"; import { sequelize } from "@server/database/sequelize"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { APM } from "@server/logging/tracing"; import Document from "@server/models/Document"; import documentCollaborativeUpdater from "../commands/documentCollaborativeUpdater"; diff --git a/server/commands/documentPermanentDeleter.ts b/server/commands/documentPermanentDeleter.ts index 8e2b92c38..f712a1a10 100644 --- a/server/commands/documentPermanentDeleter.ts +++ b/server/commands/documentPermanentDeleter.ts @@ -1,6 +1,6 @@ import { QueryTypes } from "sequelize"; import { sequelize } from "@server/database/sequelize"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { Document, Attachment } from "@server/models"; import parseAttachmentIds from "@server/utils/parseAttachmentIds"; diff --git a/server/commands/teamCreator.ts b/server/commands/teamCreator.ts index 9dc9c9f85..691459c6e 100644 --- a/server/commands/teamCreator.ts +++ b/server/commands/teamCreator.ts @@ -1,7 +1,7 @@ import invariant from "invariant"; import env from "@server/env"; import { DomainNotAllowedError, MaximumTeamsError } from "@server/errors"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { APM } from "@server/logging/tracing"; import { Team, AuthenticationProvider } from "@server/models"; import { generateAvatarUrl } from "@server/utils/avatars"; diff --git a/server/commands/teamPermanentDeleter.ts b/server/commands/teamPermanentDeleter.ts index 039415bef..c6edc34e5 100644 --- a/server/commands/teamPermanentDeleter.ts +++ b/server/commands/teamPermanentDeleter.ts @@ -1,6 +1,6 @@ import { Transaction } from "sequelize"; import { sequelize } from "@server/database/sequelize"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { APM } from "@server/logging/tracing"; import { ApiKey, diff --git a/server/commands/userInviter.ts b/server/commands/userInviter.ts index c70c87856..e4c740ece 100644 --- a/server/commands/userInviter.ts +++ b/server/commands/userInviter.ts @@ -3,7 +3,7 @@ import { uniqBy } from "lodash"; import { Role } from "@shared/types"; import InviteEmail from "@server/emails/templates/InviteEmail"; import env from "@server/env"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { User, Event, Team } from "@server/models"; import { UserFlag } from "@server/models/User"; diff --git a/server/database/sequelize.ts b/server/database/sequelize.ts index d29929f7f..c2d52724a 100644 --- a/server/database/sequelize.ts +++ b/server/database/sequelize.ts @@ -1,6 +1,6 @@ import { Sequelize } from "sequelize-typescript"; import env from "@server/env"; -import Logger from "../logging/logger"; +import Logger from "../logging/Logger"; import * as models from "../models"; const isProduction = env.ENVIRONMENT === "production"; diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx index df53fdf4d..b13e29dd5 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx @@ -2,7 +2,7 @@ import nodemailer, { Transporter } from "nodemailer"; import Oy from "oy-vey"; import * as React from "react"; import env from "@server/env"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { APM } from "@server/logging/tracing"; import { baseStyles } from "./templates/components/EmailLayout"; diff --git a/server/emails/templates/SigninEmail.tsx b/server/emails/templates/SigninEmail.tsx index eda385730..e49a2857f 100644 --- a/server/emails/templates/SigninEmail.tsx +++ b/server/emails/templates/SigninEmail.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import env from "@server/env"; -import logger from "@server/logging/logger"; +import logger from "@server/logging/Logger"; import BaseEmail from "./BaseEmail"; import Body from "./components/Body"; import Button from "./components/Button"; diff --git a/server/index.ts b/server/index.ts index ad1541d91..58b29d270 100644 --- a/server/index.ts +++ b/server/index.ts @@ -15,7 +15,7 @@ import { uniq } from "lodash"; import { AddressInfo } from "net"; import stoppable from "stoppable"; import throng from "throng"; -import Logger from "./logging/logger"; +import Logger from "./logging/Logger"; import { requestErrorHandler } from "./logging/sentry"; import services from "./services"; import { getArg } from "./utils/args"; diff --git a/server/logging/logger.ts b/server/logging/Logger.ts similarity index 100% rename from server/logging/logger.ts rename to server/logging/Logger.ts diff --git a/server/middlewares/passport.ts b/server/middlewares/passport.ts index b99aaecea..3549d0600 100644 --- a/server/middlewares/passport.ts +++ b/server/middlewares/passport.ts @@ -1,7 +1,7 @@ import passport from "@outlinewiki/koa-passport"; import { Context } from "koa"; import env from "@server/env"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { signIn } from "@server/utils/authentication"; import { AccountProvisionerResult } from "../commands/accountProvisioner"; diff --git a/server/models/Team.ts b/server/models/Team.ts index 5370efd7a..69331063c 100644 --- a/server/models/Team.ts +++ b/server/models/Team.ts @@ -21,7 +21,7 @@ import { import { v4 as uuidv4 } from "uuid"; import { stripSubdomain, RESERVED_SUBDOMAINS } from "@shared/utils/domains"; import env from "@server/env"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { generateAvatarUrl } from "@server/utils/avatars"; import { publicS3Endpoint, uploadToS3FromUrl } from "@server/utils/s3"; import AuthenticationProvider from "./AuthenticationProvider"; diff --git a/server/models/User.ts b/server/models/User.ts index 3f439755d..027529b71 100644 --- a/server/models/User.ts +++ b/server/models/User.ts @@ -24,7 +24,7 @@ import { v4 as uuidv4 } from "uuid"; import { languages } from "@shared/i18n"; import { stringToColor } from "@shared/utils/color"; import env from "@server/env"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { publicS3Endpoint, uploadToS3FromUrl } from "@server/utils/s3"; import { ValidationError } from "../errors"; import ApiKey from "./ApiKey"; diff --git a/server/models/decorators/Encrypted.ts b/server/models/decorators/Encrypted.ts index a005c6a45..8f996ade1 100644 --- a/server/models/decorators/Encrypted.ts +++ b/server/models/decorators/Encrypted.ts @@ -1,5 +1,5 @@ import vaults from "@server/database/vaults"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; const key = "sequelize:vault"; diff --git a/server/queues/processors/NotificationsProcessor.ts b/server/queues/processors/NotificationsProcessor.ts index 175757541..5b9484f22 100644 --- a/server/queues/processors/NotificationsProcessor.ts +++ b/server/queues/processors/NotificationsProcessor.ts @@ -1,7 +1,7 @@ import { Op } from "sequelize"; import CollectionNotificationEmail from "@server/emails/templates/CollectionNotificationEmail"; import DocumentNotificationEmail from "@server/emails/templates/DocumentNotificationEmail"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { View, Document, diff --git a/server/queues/tasks/CleanupDeletedDocumentsTask.ts b/server/queues/tasks/CleanupDeletedDocumentsTask.ts index fcf65a429..6416dfec9 100644 --- a/server/queues/tasks/CleanupDeletedDocumentsTask.ts +++ b/server/queues/tasks/CleanupDeletedDocumentsTask.ts @@ -1,7 +1,7 @@ import { subDays } from "date-fns"; import { Op } from "sequelize"; import documentPermanentDeleter from "@server/commands/documentPermanentDeleter"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { Document } from "@server/models"; import BaseTask, { TaskPriority } from "./BaseTask"; diff --git a/server/queues/tasks/CleanupDeletedTeamsTask.ts b/server/queues/tasks/CleanupDeletedTeamsTask.ts index 063f7123d..04a25b54a 100644 --- a/server/queues/tasks/CleanupDeletedTeamsTask.ts +++ b/server/queues/tasks/CleanupDeletedTeamsTask.ts @@ -1,7 +1,7 @@ import { subDays } from "date-fns"; import { Op } from "sequelize"; import teamPermanentDeleter from "@server/commands/teamPermanentDeleter"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { Team } from "@server/models"; import BaseTask, { TaskPriority } from "./BaseTask"; diff --git a/server/queues/tasks/CleanupExpiredFileOperationsTask.ts b/server/queues/tasks/CleanupExpiredFileOperationsTask.ts index af31daac5..0710a7d83 100644 --- a/server/queues/tasks/CleanupExpiredFileOperationsTask.ts +++ b/server/queues/tasks/CleanupExpiredFileOperationsTask.ts @@ -1,6 +1,6 @@ import { subDays } from "date-fns"; import { Op } from "sequelize"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { FileOperation } from "@server/models"; import { FileOperationState, diff --git a/server/queues/tasks/ExportMarkdownZipTask.ts b/server/queues/tasks/ExportMarkdownZipTask.ts index 288f5c2ef..c66d3d670 100644 --- a/server/queues/tasks/ExportMarkdownZipTask.ts +++ b/server/queues/tasks/ExportMarkdownZipTask.ts @@ -3,7 +3,7 @@ import invariant from "invariant"; import { truncate } from "lodash"; import ExportFailureEmail from "@server/emails/templates/ExportFailureEmail"; import ExportSuccessEmail from "@server/emails/templates/ExportSuccessEmail"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { Collection, Event, FileOperation, Team, User } from "@server/models"; import { FileOperationState } from "@server/models/FileOperation"; import fileOperationPresenter from "@server/presenters/fileOperation"; diff --git a/server/queues/tasks/ImportMarkdownZipTask.ts b/server/queues/tasks/ImportMarkdownZipTask.ts index 7582ac3ad..819591884 100644 --- a/server/queues/tasks/ImportMarkdownZipTask.ts +++ b/server/queues/tasks/ImportMarkdownZipTask.ts @@ -3,7 +3,7 @@ import { escapeRegExp } from "lodash"; import mime from "mime-types"; import { v4 as uuidv4 } from "uuid"; import documentImporter from "@server/commands/documentImporter"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { FileOperation, User } from "@server/models"; import { zipAsFileTree, FileTreeNode } from "@server/utils/zip"; import ImportTask, { StructuredImportData } from "./ImportTask"; diff --git a/server/queues/tasks/ImportNotionTask.ts b/server/queues/tasks/ImportNotionTask.ts index be85c6b8b..0dccf8b56 100644 --- a/server/queues/tasks/ImportNotionTask.ts +++ b/server/queues/tasks/ImportNotionTask.ts @@ -4,7 +4,7 @@ import { compact, escapeRegExp } from "lodash"; import mime from "mime-types"; import { v4 as uuidv4 } from "uuid"; import documentImporter from "@server/commands/documentImporter"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { FileOperation, User } from "@server/models"; import { zipAsFileTree, FileTreeNode } from "@server/utils/zip"; import ImportTask, { StructuredImportData } from "./ImportTask"; diff --git a/server/queues/tasks/ImportTask.ts b/server/queues/tasks/ImportTask.ts index 2a7f97c4e..63dcfccb1 100644 --- a/server/queues/tasks/ImportTask.ts +++ b/server/queues/tasks/ImportTask.ts @@ -4,7 +4,7 @@ import attachmentCreator from "@server/commands/attachmentCreator"; import documentCreator from "@server/commands/documentCreator"; import { sequelize } from "@server/database/sequelize"; import { ValidationError } from "@server/errors"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { User, Event, diff --git a/server/redis.ts b/server/redis.ts index 634cbc8ee..fa15f9df5 100644 --- a/server/redis.ts +++ b/server/redis.ts @@ -1,7 +1,7 @@ import Redis from "ioredis"; import { defaults } from "lodash"; import env from "@server/env"; -import Logger from "./logging/logger"; +import Logger from "@server/logging/Logger"; const defaultOptions = { maxRetriesPerRequest: 20, diff --git a/server/routes/api/hooks.ts b/server/routes/api/hooks.ts index 8b1c4cdd4..3151e7015 100644 --- a/server/routes/api/hooks.ts +++ b/server/routes/api/hooks.ts @@ -3,7 +3,7 @@ import Router from "koa-router"; import { escapeRegExp } from "lodash"; import env from "@server/env"; import { AuthenticationError, InvalidRequestError } from "@server/errors"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { UserAuthentication, AuthenticationProvider, diff --git a/server/routes/api/users.ts b/server/routes/api/users.ts index 65def8e4b..493dcde8e 100644 --- a/server/routes/api/users.ts +++ b/server/routes/api/users.ts @@ -7,7 +7,7 @@ import { sequelize } from "@server/database/sequelize"; import InviteEmail from "@server/emails/templates/InviteEmail"; import env from "@server/env"; import { ValidationError } from "@server/errors"; -import logger from "@server/logging/logger"; +import logger from "@server/logging/Logger"; import auth from "@server/middlewares/authentication"; import { Event, User, Team } from "@server/models"; import { UserFlag } from "@server/models/User"; diff --git a/server/services/web.ts b/server/services/web.ts index 0ab4d524d..a32c343bf 100644 --- a/server/services/web.ts +++ b/server/services/web.ts @@ -8,7 +8,7 @@ import { import mount from "koa-mount"; import enforceHttps from "koa-sslify"; import env from "@server/env"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import routes from "../routes"; import api from "../routes/api"; import auth from "../routes/auth"; diff --git a/server/services/websockets.ts b/server/services/websockets.ts index 5839a68ea..5be7fe8e6 100644 --- a/server/services/websockets.ts +++ b/server/services/websockets.ts @@ -4,7 +4,7 @@ import Koa from "koa"; import IO from "socket.io"; import socketRedisAdapter from "socket.io-redis"; import SocketAuth from "socketio-auth"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import Metrics from "@server/logging/metrics"; import { Document, Collection, View } from "@server/models"; import { can } from "@server/policies"; diff --git a/server/services/worker.ts b/server/services/worker.ts index 41659892c..5c0018556 100644 --- a/server/services/worker.ts +++ b/server/services/worker.ts @@ -1,4 +1,4 @@ -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import * as Tracing from "@server/logging/tracing"; import { APM } from "@server/logging/tracing"; import { diff --git a/server/utils/authentication.ts b/server/utils/authentication.ts index 049470192..6417b02a6 100644 --- a/server/utils/authentication.ts +++ b/server/utils/authentication.ts @@ -3,7 +3,7 @@ import { addMonths } from "date-fns"; import { Context } from "koa"; import { pick } from "lodash"; import env from "@server/env"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import { User, Event, Team, Collection, View } from "@server/models"; import { getCookieDomain } from "@server/utils/domains"; diff --git a/server/utils/s3.ts b/server/utils/s3.ts index d0592be08..65da8f9d9 100644 --- a/server/utils/s3.ts +++ b/server/utils/s3.ts @@ -4,7 +4,7 @@ import AWS from "aws-sdk"; import { addHours, format } from "date-fns"; import fetch from "fetch-with-proxy"; import { v4 as uuidv4 } from "uuid"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; const AWS_S3_ACCELERATE_URL = process.env.AWS_S3_ACCELERATE_URL; const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY; diff --git a/server/utils/startup.ts b/server/utils/startup.ts index 6ec279222..fb6e0993b 100644 --- a/server/utils/startup.ts +++ b/server/utils/startup.ts @@ -1,6 +1,6 @@ import chalk from "chalk"; import env from "@server/env"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import AuthenticationProvider from "@server/models/AuthenticationProvider"; import Team from "@server/models/Team"; diff --git a/server/utils/zip.ts b/server/utils/zip.ts index dc69e0b68..1aa710d42 100644 --- a/server/utils/zip.ts +++ b/server/utils/zip.ts @@ -3,7 +3,7 @@ import path from "path"; import JSZip, { JSZipObject } from "jszip"; import { find } from "lodash"; import tmp from "tmp"; -import Logger from "@server/logging/logger"; +import Logger from "@server/logging/Logger"; import Attachment from "@server/models/Attachment"; import Collection from "@server/models/Collection"; import Document from "@server/models/Document"; diff --git a/shared/utils/events.ts b/shared/utils/events.ts index b3fc7b9c8..9cfc2c78f 100644 --- a/shared/utils/events.ts +++ b/shared/utils/events.ts @@ -2,9 +2,9 @@ * A tiny EventEmitter implementation for the browser. */ export default class EventEmitter { - private listeners: { [name: string]: ((data: any) => unknown)[] } = {}; + private listeners: { [name: string]: ((data: unknown) => unknown)[] } = {}; - public addListener(name: string, callback: (data: any) => unknown) { + public addListener(name: string, callback: (data: unknown) => unknown) { if (!this.listeners[name]) { this.listeners[name] = []; } @@ -12,7 +12,7 @@ export default class EventEmitter { this.listeners[name].push(callback); } - public removeListener(name: string, callback: (data: any) => unknown) { + public removeListener(name: string, callback: (data: unknown) => unknown) { this.listeners[name] = this.listeners[name]?.filter( (cb) => cb !== callback ); @@ -21,7 +21,7 @@ export default class EventEmitter { public on = this.addListener; public off = this.removeListener; - public emit(name: string, data?: any) { + public emit(name: string, data?: unknown) { this.listeners[name]?.forEach((callback) => { callback(data); });