Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/meteor/app/2fa/server/code/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import crypto from 'crypto';
import crypto from 'node:crypto';

import type { IUser, IMethodConnection } from '@rocket.chat/core-typings';
import { Users } from '@rocket.chat/models';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/api/server/definition.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IncomingMessage } from 'http';
import type { IncomingMessage } from 'node:http';

import type { IUser, LicenseModule, RequiredField } from '@rocket.chat/core-typings';
import type { Logger } from '@rocket.chat/logger';
Expand Down
10 changes: 5 additions & 5 deletions apps/meteor/app/api/server/lib/MultipartUploadHandler.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import fs from 'fs';
import { IncomingMessage } from 'http';
import type { Stream, Transform } from 'stream';
import { Readable } from 'stream';
import { pipeline } from 'stream/promises';
import fs from 'node:fs';
import { IncomingMessage } from 'node:http';
import type { Stream, Transform } from 'node:stream';
import { Readable } from 'node:stream';
import { pipeline } from 'node:stream/promises';

import { MeteorError } from '@rocket.chat/core-services';
import { Random } from '@rocket.chat/random';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/api/server/lib/getUploadFormData.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Readable } from 'stream';
import { ReadableStream } from 'stream/web';
import { Readable } from 'node:stream';
import { ReadableStream } from 'node:stream/web';

import { MeteorError } from '@rocket.chat/core-services';
import type { ValidateFunction } from 'ajv';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IncomingMessage } from 'http';
import type { IncomingMessage } from 'node:http';

import type { Context, MiddlewareHandler } from 'hono';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/api/server/v1/misc.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import crypto from 'crypto';
import crypto from 'node:crypto';

import type { IDirectoryChannelResult, IDirectoryUserResult, IRoom, IUser } from '@rocket.chat/core-typings';
import { Settings, Users, WorkspaceCredentials } from '@rocket.chat/models';
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/app/apps/server/bridges/listeners.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import crypto from 'crypto';
import fs from 'fs';
import path from 'path';
import crypto from 'node:crypto';
import fs from 'node:fs';
import path from 'node:path';

import type { IAppServerOrchestrator, IAppsRoom, IAppsLivechatRoom, IAppsMessage } from '@rocket.chat/apps';
import type { IPreEmailSentContext } from '@rocket.chat/apps-engine/definition/email';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/apps/server/bridges/oauthApps.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { randomUUID } from 'crypto';
import { randomUUID } from 'node:crypto';

import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import { OAuthAppsBridge } from '@rocket.chat/apps/dist/server/bridges/OAuthAppsBridge';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/assets/server/assets.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import crypto from 'crypto';
import type { ServerResponse, IncomingMessage } from 'http';
import crypto from 'node:crypto';
import type { ServerResponse, IncomingMessage } from 'node:http';

import type { IRocketChatAssets, IRocketChatAsset, ISetting } from '@rocket.chat/core-typings';
import { Settings } from '@rocket.chat/models';
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/app/cors/server/cors.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type http from 'http';
import type { UrlWithParsedQuery } from 'url';
import url from 'url';
import type http from 'node:http';
import type { UrlWithParsedQuery } from 'node:url';
import url from 'node:url';

import { Logger } from '@rocket.chat/logger';
import { Meteor } from 'meteor/meteor';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/emoji-emojione/lib/generateEmojiIndex.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// before using this script make sure to run: npm i --no-save node-sprite-generator

// node --experimental-modules generateEmojiIndex.mjs
import fs from 'fs';
import fs from 'node:fs';
import nsg from 'node-sprite-generator';
import _ from 'underscore';
import gm from 'gm'; // lgtm[js/unused-local-variable]
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/file-upload/lib/FileUploadBase.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import path from 'path';
import path from 'node:path';

import { UploadFS } from '../../../server/ufs';

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/file-upload/server/config/AmazonS3.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import http from 'http';
import https from 'https';
import http from 'node:http';
import https from 'node:https';

import _ from 'underscore';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/file-upload/server/config/FileSystem.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import fsp from 'fs/promises';
import fsp from 'node:fs/promises';

import { getContentDisposition } from './helper';
import { UploadFS } from '../../../../server/ufs';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/file-upload/server/config/GoogleStorage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import http from 'http';
import https from 'https';
import http from 'node:http';
import https from 'node:https';

import _ from 'underscore';

Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/app/file-upload/server/config/GridFS.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type * as http from 'http';
import type { TransformCallback, TransformOptions } from 'stream';
import stream from 'stream';
import zlib from 'zlib';
import type * as http from 'node:http';
import type { TransformCallback, TransformOptions } from 'node:stream';
import stream from 'node:stream';
import zlib from 'node:zlib';

import type { IUpload } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/file-upload/server/config/helper.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type http from 'http';
import URL from 'url';
import type http from 'node:http';
import URL from 'node:url';

export const forceDownload = (req: http.IncomingMessage): boolean => {
const { query } = URL.parse(req.url || '', true);
Expand Down
20 changes: 10 additions & 10 deletions apps/meteor/app/file-upload/server/lib/FileUpload.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Buffer } from 'buffer';
import type { WriteStream } from 'fs';
import fs from 'fs';
import { unlink, rename, writeFile } from 'fs/promises';
import type * as http from 'http';
import type * as https from 'https';
import stream from 'stream';
import { finished } from 'stream/promises';
import URL from 'url';
import { isArrayBufferView } from 'util/types';
import { Buffer } from 'node:buffer';
import type { WriteStream } from 'node:fs';
import fs from 'node:fs';
import { unlink, rename, writeFile } from 'node:fs/promises';
import type * as http from 'node:http';
import type * as https from 'node:https';
import stream from 'node:stream';
import { finished } from 'node:stream/promises';
import URL from 'node:url';
import { isArrayBufferView } from 'node:util/types';

import { hashLoginToken } from '@rocket.chat/account-utils';
import { Apps, AppEvents } from '@rocket.chat/apps';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/file-upload/server/lib/ranges.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type http from 'http';
import type http from 'node:http';

import type { IUpload } from '@rocket.chat/core-typings';

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/file-upload/server/lib/requests.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IncomingMessage } from 'http';
import type { IncomingMessage } from 'node:http';

import { Uploads } from '@rocket.chat/models';
import { WebApp } from 'meteor/webapp';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/file-upload/ufs/AmazonS3/server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import stream from 'stream';
import stream from 'node:stream';

import {
DeleteObjectCommand,
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/file-upload/ufs/Webdav/server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import stream from 'stream';
import stream from 'node:stream';

import type { IUpload } from '@rocket.chat/core-typings';
import { Random } from '@rocket.chat/random';
Expand Down
10 changes: 5 additions & 5 deletions apps/meteor/app/file/server/file.server.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ReadStream } from 'fs';
import fs from 'fs';
import fsp from 'fs/promises';
import path from 'path';
import { Readable } from 'stream';
import type { ReadStream } from 'node:fs';
import fs from 'node:fs';
import fsp from 'node:fs/promises';
import path from 'node:path';
import { Readable } from 'node:stream';

import type { ObjectId } from 'bson';
import { MongoInternals } from 'meteor/mongo';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/file/server/functions/sanitizeFileName.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import path from 'path';
import path from 'node:path';

export function sanitizeFileName(fileName: string) {
const base = path.basename(fileName);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import http from 'http';
import https from 'https';
import http from 'node:http';
import https from 'node:https';

import { api } from '@rocket.chat/core-services';
import type { IImport, MessageAttachment, IUpload, IImporterShortSelection } from '@rocket.chat/core-typings';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import fs from 'fs';
import fs from 'node:fs';

import type { IImport, IImportUser } from '@rocket.chat/core-typings';
import { Settings } from '@rocket.chat/models';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from 'fs';
import http from 'http';
import https from 'https';
import fs from 'node:fs';
import http from 'node:http';
import https from 'node:https';

import { Import } from '@rocket.chat/core-services';
import type { IUser } from '@rocket.chat/core-typings';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/importer/server/methods/getImportFileData.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs';
import path from 'path';
import fs from 'node:fs';
import path from 'node:path';

import type { IImportProgress, IImporterSelection } from '@rocket.chat/core-typings';
import type { ServerMethods } from '@rocket.chat/ddp-client';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventEmitter } from 'events';
import { EventEmitter } from 'node:events';

import { serverFetch as fetch, Response } from '@rocket.chat/server-fetch';
import ivm, { type Context } from 'isolated-vm';
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/app/irc/server/servers/RFC2813/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EventEmitter } from 'events';
import net from 'net';
import util from 'util';
import { EventEmitter } from 'node:events';
import net from 'node:net';
import util from 'node:util';

import { Logger } from '@rocket.chat/logger';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import crypto from 'crypto';
import crypto from 'node:crypto';

import type { IUser } from '@rocket.chat/core-typings';
import type { Updater } from '@rocket.chat/model-typings';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/lib/server/lib/validateEmailDomain.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import dns from 'dns';
import util from 'util';
import dns from 'node:dns';
import util from 'node:util';

import { validateEmail } from '@rocket.chat/tools';
import { Meteor } from 'meteor/meteor';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/lib/server/oauth/facebook.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import crypto from 'crypto';
import crypto from 'node:crypto';

import { serverFetch as fetch } from '@rocket.chat/server-fetch';
import { Match, check } from 'meteor/check';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/livechat/server/lib/messages.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import dns from 'dns';
import * as util from 'util';
import dns from 'node:dns';
import * as util from 'node:util';

import type { ILivechatVisitor, AtLeast, IMessage, IUser, IOmnichannelRoomInfo, SelectedAgent } from '@rocket.chat/core-typings';
import { LivechatDepartment, Messages } from '@rocket.chat/models';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/livechat/server/livechat.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import url from 'url';
import url from 'node:url';

import jsdom from 'jsdom';
import mem from 'mem';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ServerResponse } from 'http';
import type { ServerResponse } from 'node:http';

import type { IUser, IIncomingMessage, IPersonalAccessToken, IRole } from '@rocket.chat/core-typings';
import { CredentialTokens, Rooms, Users, Roles } from '@rocket.chat/models';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import crypto from 'crypto';
import querystring from 'querystring';
import util from 'util';
import zlib from 'zlib';
import crypto from 'node:crypto';
import querystring from 'node:querystring';
import util from 'node:util';
import zlib from 'node:zlib';

import { Meteor } from 'meteor/meteor';

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventEmitter } from 'events';
import zlib from 'zlib';
import { EventEmitter } from 'node:events';
import zlib from 'node:zlib';

import type { Logger } from '@rocket.chat/logger';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import crypto from 'crypto';
import crypto from 'node:crypto';

import type { SAMLRedirectEnvelope } from '../../definition/SAMLEnvelope';
import { SAMLUtils } from '../Utils';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/meteor-accounts-saml/server/listener.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IncomingMessage, ServerResponse } from 'http';
import type { IncomingMessage, ServerResponse } from 'node:http';

import bodyParser from 'body-parser';
import express from 'express';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/metrics/server/lib/collectMetrics.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import http from 'http';
import http from 'node:http';

import { Statistics } from '@rocket.chat/models';
import { tracerSpan } from '@rocket.chat/tracing';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/slackbridge/server/RocketAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* eslint-disable @typescript-eslint/naming-convention */
/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
// @ts-nocheck
import util from 'util';
import util from 'node:util';

import { Messages, Rooms, Users } from '@rocket.chat/models';
import { Random } from '@rocket.chat/random';
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/app/slackbridge/server/SlackAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
/* eslint-disable @typescript-eslint/naming-convention */
/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
// @ts-nocheck
import http from 'http';
import https from 'https';
import url from 'url';
import http from 'node:http';
import https from 'node:https';
import url from 'node:url';

import { Message } from '@rocket.chat/core-services';
import { Messages, Rooms, Users } from '@rocket.chat/models';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/statistics/server/lib/statistics.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { log } from 'console';
import os from 'os';
import os from 'node:os';

import { Analytics, Team, VideoConf, Presence } from '@rocket.chat/core-services';
import type { IRoom, IStats, ISetting } from '@rocket.chat/core-typings';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/theme/server/server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import crypto from 'crypto';
import crypto from 'node:crypto';

import { Settings } from '@rocket.chat/models';
import { Meteor } from 'meteor/meteor';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/ui-master/server/inject.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import crypto from 'crypto';
import crypto from 'node:crypto';

import type { NextHandleFunction } from 'connect';
import { Inject } from 'meteor/meteorhacks:inject-initial';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/utils/server/functions/isDocker.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import fs from 'fs';
import fs from 'node:fs';

function hasDockerEnv(): boolean {
try {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import os from 'os';
import os from 'node:os';

import { Settings } from '@rocket.chat/models';
import { serverFetch as fetch } from '@rocket.chat/server-fetch';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/webdav/server/lib/webdavClientAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import stream from 'stream';
import type { Readable, Writable } from 'stream';
import stream from 'node:stream';
import type { Readable, Writable } from 'node:stream';

import type { WebDAVClient, FileStat, ResponseDataDetailed, WebDAVClientOptions } from 'webdav';
import { createClient } from 'webdav';
Expand Down
Loading
Loading