Skip to content

Commit

Permalink
Chore: Bump deps (#25624)
Browse files Browse the repository at this point in the history
  • Loading branch information
ggazzo authored Jul 2, 2022
1 parent aa6a80b commit c551240
Show file tree
Hide file tree
Showing 27 changed files with 2,078 additions and 956 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import moment from 'moment';
import moment from 'moment-timezone';
import type { ILivechatBusinessHour, ILivechatDepartment } from '@rocket.chat/core-typings';
import type { ILivechatBusinessHoursModel, IUsersModel } from '@rocket.chat/model-typings';
import { LivechatBusinessHours, Users } from '@rocket.chat/models';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/livechat/server/business-hour/Default.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import moment from 'moment';
import moment from 'moment-timezone';
import { ILivechatBusinessHour, LivechatBusinessHourTypes } from '@rocket.chat/core-typings';

import { AbstractBusinessHourType, IBusinessHourType } from './AbstractBusinessHour';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/livechat/server/lib/Analytics.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import moment from 'moment';
import moment from 'moment-timezone';
import { LivechatRooms as LivechatRoomsRaw } from '@rocket.chat/models';

import { LivechatRooms } from '../../../models/server';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/livestream/server/functions/livestream.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import google from 'googleapis';
import { google } from 'googleapis';

const { OAuth2 } = google.auth;

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/livestream/server/routes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import google from 'googleapis';
import { google } from 'googleapis';

import { settings } from '../../settings/server';
import { Users } from '../../models/server';
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/markdown/lib/parser/marked/marked.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Random } from 'meteor/random';
import _ from 'underscore';
import _marked from 'marked';
import { marked as _marked } from 'marked';
import createDOMPurify from 'dompurify';
import { unescapeHTML, escapeHTML } from '@rocket.chat/string-helpers';

Expand Down Expand Up @@ -87,7 +87,7 @@ export const marked = (message, { marked: { gfm, tables, breaks, pedantic, smart
message.tokens = [];
}

message.html = _marked(unescapeHTML(message.html), {
message.html = _marked.parse(unescapeHTML(message.html), {
gfm,
tables,
breaks,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import xmldom from 'xmldom';
import xmldom from '@xmldom/xmldom';

import { SAMLUtils } from '../Utils';
import { IServiceProviderOptions } from '../../definition/IServiceProviderOptions';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import xmldom from 'xmldom';
import xmldom from '@xmldom/xmldom';

import { SAMLUtils } from '../Utils';
import { IServiceProviderOptions } from '../../definition/IServiceProviderOptions';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import xmldom from 'xmldom';
import xmldom from '@xmldom/xmldom';
import xmlenc from 'xml-encryption';
import xmlCrypto from 'xml-crypto';

Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/app/smarsh-connector/server/settings.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import moment from 'moment';
import moment from 'moment-timezone';

import { settingsRegistry } from '../../settings/server';
import 'moment-timezone';

settingsRegistry.addGroup('Smarsh', function addSettings() {
this.add('Smarsh_Enabled', false, {
Expand Down
10 changes: 6 additions & 4 deletions apps/meteor/client/components/MarkdownText.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box } from '@rocket.chat/fuselage';
import dompurify from 'dompurify';
import marked from 'marked';
import { marked } from 'marked';
import React, { ComponentProps, FC, useMemo } from 'react';

import { renderMessageEmoji } from '../lib/utils/renderMessageEmoji';
Expand All @@ -17,8 +17,8 @@ const documentRenderer = new marked.Renderer();
const inlineRenderer = new marked.Renderer();
const inlineWithoutBreaks = new marked.Renderer();

marked.InlineLexer.rules.gfm = {
...marked.InlineLexer.rules.gfm,
marked.Lexer.rules.gfm = {
...marked.Lexer.rules.gfm,
strong: /^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,
em: /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/,
};
Expand Down Expand Up @@ -94,7 +94,9 @@ const MarkdownText: FC<Partial<MarkdownTextParams>> = ({
const __html = useMemo(() => {
const html = ((): any => {
if (content && typeof content === 'string') {
const markedHtml = marked(new Option(content).innerHTML, markedOptions);
const markedHtml = /inline/.test(variant)
? marked.parseInline(new Option(content).innerHTML, markedOptions)
: marked.parse(new Option(content).innerHTML, markedOptions);

if (parseEmoji) {
// We are using the old emoji parser here. This could come
Expand Down
26 changes: 13 additions & 13 deletions apps/meteor/ee/server/services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
"author": "Rocket.Chat",
"license": "MIT",
"dependencies": {
"@rocket.chat/apps-engine": "^1.31.0",
"@rocket.chat/apps-engine": "^1.32.0",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.9",
"@rocket.chat/emitter": "~0.31.13",
"@rocket.chat/message-parser": "~0.32.0-dev.5",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "~0.31.9",
"@rocket.chat/ui-kit": "~0.31.9",
"@rocket.chat/string-helpers": "~0.31.13",
"@rocket.chat/ui-kit": "~0.31.13",
"ajv": "^8.11.0",
"bcrypt": "^5.0.1",
"body-parser": "^1.20.0",
"colorette": "^2.0.16",
"colorette": "^2.0.19",
"cookie": "^0.5.0",
"cookie-parser": "^1.4.6",
"ejson": "^2.2.2",
Expand All @@ -43,30 +43,30 @@
"fibers": "^5.0.1",
"jaeger-client": "^3.19.0",
"mem": "^8.1.1",
"moleculer": "^0.14.20",
"mongodb": "^3.6.10",
"moleculer": "^0.14.21",
"mongodb": "^3.7.3",
"nats": "^2.6.1",
"pino": "^7.10.0",
"pino": "^7.11.0",
"sodium-native": "^3.3.0",
"sodium-plus": "^0.9.0",
"underscore.string": "^3.3.6",
"uuid": "^8.3.2",
"ws": "^8.5.0"
"ws": "^8.8.0"
},
"devDependencies": {
"@rocket.chat/icons": "^0.31.0",
"@rocket.chat/icons": "^0.31.13",
"@types/agenda": "^2.0.9",
"@types/cookie": "^0.5.1",
"@types/cookie-parser": "^1.4.2",
"@types/cookie-parser": "^1.4.3",
"@types/ejson": "^2.2.0",
"@types/express": "^4.17.13",
"@types/fibers": "^3.1.1",
"@types/mongodb": "^3.6.20",
"@types/node": "^14.18.15",
"@types/node": "^14.18.21",
"@types/ws": "^8.5.3",
"pino-pretty": "^7.6.1",
"pm2": "^5.2.0",
"ts-node": "^10.7.0",
"ts-node": "^10.8.1",
"typescript": "~4.5.5"
},
"volta": {
Expand Down
Loading

0 comments on commit c551240

Please sign in to comment.