Compare commits

...
2 Commits
Author SHA1 Message Date
ejo090 76fcd79203 fix: Fix markdown line breaks
Closes #257
2022-06-06 17:37:43 +05:00
Maksim Eltyshev 3ce1bc0419 fix: Fix dependencies installation 2022-05-21 23:52:12 +05:00
5 changed files with 31 additions and 9 deletions
+2 -6
View File
@@ -16,13 +16,9 @@ WORKDIR /app
COPY server/.npmrc server/package.json server/package-lock.json ./ COPY server/.npmrc server/package.json server/package-lock.json ./
RUN apk add \ RUN npm install npm@latest --global \
g++ make python3 \
--virtual node-pre-gyp-dependencies \
--no-cache \
&& npm install npm@latest --global \
&& npm install --production \ && npm install --production \
&& apk del node-pre-gyp-dependencies --purge && apk del vips-dependencies --purge
COPY docker-start.sh start.sh COPY docker-start.sh start.sh
COPY server . COPY server .
+1 -2
View File
@@ -24,5 +24,4 @@ RUN apk -U upgrade \
&& ./configure \ && ./configure \
&& make \ && make \
&& make install-strip \ && make install-strip \
&& rm -rf /tmp/vips-${VIPS_VERSION} \ && rm -rf /tmp/vips-${VIPS_VERSION}
&& apk del vips-dependencies --purge
+25
View File
@@ -34,6 +34,7 @@
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"redux-orm": "^0.16.2", "redux-orm": "^0.16.2",
"redux-saga": "^1.1.3", "redux-saga": "^1.1.3",
"remark-breaks": "^3.0.2",
"remark-gfm": "^3.0.1", "remark-gfm": "^3.0.1",
"reselect": "^4.1.5", "reselect": "^4.1.5",
"sails.io.js": "^1.2.1", "sails.io.js": "^1.2.1",
@@ -18824,6 +18825,20 @@
"node": ">= 0.10" "node": ">= 0.10"
} }
}, },
"node_modules/remark-breaks": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/remark-breaks/-/remark-breaks-3.0.2.tgz",
"integrity": "sha512-x96YDJ9X+Ry0/JNZFKfr1hpcAKvGYWfUTszxY9RbxKEqq6uzPPoLCuHdZsLPZZUdAv3nCROyc7FPrQLWr2rxyw==",
"dependencies": {
"@types/mdast": "^3.0.0",
"unified": "^10.0.0",
"unist-util-visit": "^4.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
"node_modules/remark-gfm": { "node_modules/remark-gfm": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz", "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz",
@@ -36761,6 +36776,16 @@
"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
"integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
}, },
"remark-breaks": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/remark-breaks/-/remark-breaks-3.0.2.tgz",
"integrity": "sha512-x96YDJ9X+Ry0/JNZFKfr1hpcAKvGYWfUTszxY9RbxKEqq6uzPPoLCuHdZsLPZZUdAv3nCROyc7FPrQLWr2rxyw==",
"requires": {
"@types/mdast": "^3.0.0",
"unified": "^10.0.0",
"unist-util-visit": "^4.0.0"
}
},
"remark-gfm": { "remark-gfm": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz", "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz",
+1
View File
@@ -91,6 +91,7 @@
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"redux-orm": "^0.16.2", "redux-orm": "^0.16.2",
"redux-saga": "^1.1.3", "redux-saga": "^1.1.3",
"remark-breaks": "^3.0.2",
"remark-gfm": "^3.0.1", "remark-gfm": "^3.0.1",
"reselect": "^4.1.5", "reselect": "^4.1.5",
"sails.io.js": "^1.2.1", "sails.io.js": "^1.2.1",
@@ -2,6 +2,7 @@ import React, { useCallback } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ReactMarkdown from 'react-markdown'; import ReactMarkdown from 'react-markdown';
import remarkGfm from 'remark-gfm'; import remarkGfm from 'remark-gfm';
import remarkBreaks from 'remark-breaks';
import './Markdown.module.scss'; // FIXME: import as styles? import './Markdown.module.scss'; // FIXME: import as styles?
@@ -35,7 +36,7 @@ const Markdown = React.memo(({ linkStopPropagation, ...props }) => {
<ReactMarkdown <ReactMarkdown
{...props} {...props}
components={components} components={components}
remarkPlugins={[remarkGfm]} remarkPlugins={[remarkGfm, remarkBreaks]}
className="markdown-body" className="markdown-body"
/> />
/* eslint-enable react/jsx-props-no-spreading */ /* eslint-enable react/jsx-props-no-spreading */