Skip to content

Commit

Permalink
Merge pull request #1652 from TryQuiet/jest/use-commonjs-libs
Browse files Browse the repository at this point in the history 
Jest/use commonjs libs
  • Loading branch information
@vinkabuki
vinkabuki authored Aug 29, 2023
2 parents 144bd9c + e27ca2d commit 89fb553
Show file tree
Hide file tree
Showing 15 changed files with 46,697 additions and 46,243 deletions.
4 changes: 1 addition & 3 deletions packages/backend/src/nest/libp2p/libp2p.service.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ describe('Libp2pService', () => {

it('creates libp2p address with proper ws type (%s)', async () => {
const libp2pAddress = libp2pService.createLibp2pAddress(params.localAddress, params.peerId.toString())
expect(libp2pAddress).toStrictEqual(
`/dns4/${params.localAddress}.onion/tcp/80/wss/p2p/${params.peerId.toString()}`
)
expect(libp2pAddress).toStrictEqual(`/dns4/${params.localAddress}.onion/tcp/80/wss/p2p/${params.peerId.toString()}`)
})

it('creates libp2p listen address', async () => {
Expand Down
Binary file modified ...src/renderer/components/Channel/Channel.regression.cy.tsx/after launch-base.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...src/renderer/components/Channel/Channel.regression.cy.tsx/after pageup-base.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
768 changes: 649 additions & 119 deletions packages/desktop/package-lock.json
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion packages/desktop/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@
"get-port": "^5.1.1",
"keymirror": "0.1.1",
"pkijs": "^3.0.8",
"react-markdown": "^6.0.3",
"react-qr-code": "^2.0.11",
"remark-gfm": "^1.0.0",
"socket.io-client": "4.6.0"
},
"devDependencies": {
Expand Down Expand Up @@ -297,4 +299,4 @@
"node": "18.12.1",
"npm": "8.19.2"
}
}
}
19 changes: 15 additions & 4 deletions packages/desktop/src/renderer/components/MathMessage/MathMessageComponent.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ describe('MathMessageComponent', () => {
<body>
<div>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-1-0"
>
It is
Expand Down Expand Up @@ -187,7 +187,7 @@ describe('MathMessageComponent', () => {
</mjx-container>
</span>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-1-2"
>
and
Expand Down Expand Up @@ -484,10 +484,21 @@ describe('MathMessageComponent', () => {
</mjx-container>
</span>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-1-1"
>
- look
<ul
class="TextMessageul"
depth="0"
>
<li>
look
</li>
</ul>
</span>
</div>
</body>
Expand Down
14 changes: 7 additions & 7 deletions packages/desktop/src/renderer/components/widgets/channels/BasicMessage.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ describe('BasicMessage', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-0"
>
message0
Expand Down Expand Up @@ -165,7 +165,7 @@ describe('BasicMessage', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-0"
>
message0
Expand All @@ -175,7 +175,7 @@ describe('BasicMessage', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-1"
>
message1
Expand Down Expand Up @@ -261,7 +261,7 @@ describe('BasicMessage', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-0"
>
message0
Expand All @@ -271,7 +271,7 @@ describe('BasicMessage', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-1"
>
message1
Expand Down Expand Up @@ -355,7 +355,7 @@ describe('BasicMessage', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-0"
>
message0
Expand All @@ -365,7 +365,7 @@ describe('BasicMessage', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-0"
>
message0
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/src/renderer/components/widgets/channels/ChannelMessages.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ describe('ChannelMessages', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-string"
>
string
Expand Down
6 changes: 3 additions & 3 deletions packages/desktop/src/renderer/components/widgets/channels/NestedMessageContent.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('NestedMessageContent', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-0"
>
message0
Expand All @@ -40,7 +40,7 @@ describe('NestedMessageContent', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage TextMessagepending css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage TextMessagepending css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-0"
>
message0
Expand Down Expand Up @@ -97,7 +97,7 @@ describe('NestedMessageContent', () => {
class="MuiGrid-root MuiGrid-item css-15myz84-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 TextMessagemessage TextMessagepending css-mg0tit-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 TextMessagemessage TextMessagepending css-1vefsqk-MuiTypography-root"
data-testid="messagesGroupContent-0"
>
message0
Expand Down
119 changes: 117 additions & 2 deletions packages/desktop/src/renderer/components/widgets/channels/TextMessage.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
import { Typography, styled } from '@mui/material'
import classNames from 'classnames'
import React, { ReactNode } from 'react'
import Linkify from 'react-linkify'
import ReactMarkdown from 'react-markdown'
import remarkGfm from 'remark-gfm'
import theme from '../../../theme'

const PREFIX = 'TextMessage'

const classes = {
message: `${PREFIX}message`,
pending: `${PREFIX}pending`,
blockquote: `${PREFIX}blockquote`,
code: `${PREFIX}code`,
pre: `${PREFIX}pre`,
hr: `${PREFIX}hr`,
link: `${PREFIX}link`,
ol: `${PREFIX}list`,
ul: `${PREFIX}ul`,
table: `${PREFIX}table`,
tableHeaderCell: `${PREFIX}tableHeaderCell`,
tableRowCell: `${PREFIX}tableRowCell`,
}

const StyledTypography = styled(Typography)(() => ({
Expand All @@ -24,13 +34,69 @@ const StyledTypography = styled(Typography)(() => ({
color: theme.palette.colors.lightGray,
},

[`& .${classes.blockquote}`]: {
lineHeight: '1em',
whiteSpace: 'normal',
marginInlineStart: 0,
marginBlockStart: '.5em',
marginBlockEnd: '.5em',
paddingTop: '.5em',
paddingBottom: '.5em',
paddingLeft: '1em',
borderLeft: 'solid',
borderLeftWidth: '3px',
borderColor: theme.palette.colors.lightGray,
color: theme.palette.colors.lightGray,
},

[`& .${classes.code}`]: {
backgroundColor: theme.palette.colors.veryLightGray,
padding: '.25em',
},

[`& .${classes.pre}`]: {
backgroundColor: theme.palette.colors.veryLightGray,
padding: '.25em',
},

[`& .${classes.hr}`]: {
marginTop: '2em',
},

[`& .${classes.link}`]: {
color: theme.palette.colors.lushSky,
cursor: 'pointer',
textDecoration: 'none',
'&:hover': {
textDecoration: 'underline',
},
},

[`& .${classes.ol}`]: {
paddingInlineStart: '15px',
whiteSpace: 'normal',
},

[`& .${classes.ul}`]: {
paddingInlineStart: '15px',
whiteSpace: 'normal',
listStyleType: 'disc',
},

[`& .${classes.table}`]: {
width: '100%',
},

[`& .${classes.tableHeaderCell}`]: {
borderBottom: 'solid',
borderBottomWidth: 1,
borderColor: theme.palette.colors.veryLightGray,
textAlign: 'center',
},

[`& .${classes.tableRowCell}`]: {
textAlign: 'center',
},
})) as typeof Typography

export interface TextMessageComponentProps {
Expand Down Expand Up @@ -64,7 +130,56 @@ export const TextMessageComponent: React.FC<TextMessageComponentProps> = ({ mess
})}
data-testid={`messagesGroupContent-${messageId}`}
>
<Linkify componentDecorator={componentDecorator}>{message}</Linkify>
<ReactMarkdown
remarkPlugins={[[remarkGfm, { singleTilde: false }]]}
children={message}
components={{
a: ({ node, ...props }) => (
<a
onClick={e => {
e.preventDefault()
if (props.href) openUrl(props.href)
}}
className={classNames({ [classes.link]: true })}
{...props}
/>
),
// Not working in older ReactMarkdown version we use because of ESM
// blockquote: ({ node, ...props }) => (
// <blockquote className={classNames({ [classes.blockquote]: true })} {...props} />
// ),
code: ({ node, ...props }) => <code className={classNames({ [classes.code]: true })} {...props} />,
pre: ({ node, ...props }) => <pre className={classNames({ [classes.pre]: true })} {...props} />,
hr: ({ node, ...props }) => <hr className={classNames({ [classes.hr]: true })} {...props} />,
img: ({ node, ...props }) => (
<p>
![{props.alt}](
<a
onClick={e => {
e.preventDefault()
if (props.src) openUrl(props.src)
}}
className={classNames({ [classes.link]: true })}
href={props.src}
>
{props.src}
</a>
)
</p>
),
p: React.Fragment,
ol: ({ node, ...props }) => <ol className={classNames({ [classes.ol]: true })} {...props} />,
ul: ({ node, ...props }) => <ul className={classNames({ [classes.ul]: true })} {...props} />,
table: ({ node, ...props }) => <table className={classNames({ [classes.table]: true })} {...props} />,
// Not working in older ReactMarkdown version we use because of ESM
// th: ({ node, ...props }) => (
// <th className={classNames({ [classes.tableHeaderCell]: props.isHeader })} {...props} />
// ),
// td: ({ node, ...props }) => (
// <td className={classNames({ [classes.tableRowCell]: true })} {...props} />
// )
}}
/>
</StyledTypography>
)
}
Loading

0 comments on commit 89fb553

Please sign in to comment.