Skip to content

Commit eb2d1f1

Browse files
committed
remove deprecated package
1 parent 1c1ddee commit eb2d1f1

File tree

6 files changed

+695
-83
lines changed

6 files changed

+695
-83
lines changed

client/config/webpack.config.dev.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ module.exports = {
5959
},
6060
{
6161
test: /\.md$/,
62-
loader: 'frontmatter-markdown-loader',
63-
options: {mode: ['react-component']},
62+
loader: 'raw-loader',
6463
},
6564
{
6665
test: [/\.woff2$/],

client/config/webpack.config.prod.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ module.exports = {
7979
},
8080
{
8181
test: /\.md$/,
82-
loader: 'frontmatter-markdown-loader',
83-
options: {mode: ['react-component']},
82+
loader: 'raw-loader',
8483
},
8584
{
8685
test: [/\.woff2$/],

client/src/javascript/components/modals/settings-modal/AboutTab.tsx

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,25 @@
1-
import {ComponentType, FC, lazy, Suspense} from 'react';
1+
import {FC, Suspense} from 'react';
2+
3+
import Markdown from 'react-markdown';
24

35
import packageJSON from '../../../../../../package.json';
46

5-
const AboutMarkdown = lazy<ComponentType<{FloodVersion: unknown; CommitBadge: unknown}>>(() =>
6-
import(/* webpackChunkName: 'about' */ '../../../../ABOUT.md').then((module) => ({default: module.react})),
7-
);
7+
import AboutMarkdown from '../../../../ABOUT.md';
88

99
const FLOOD_PROJECT_URL = 'https://github.com/jesec/flood';
1010

11+
const versioned = AboutMarkdown.replaceAll('<FloodVersion />', packageJSON.version).replaceAll(
12+
'<CommitBadge />',
13+
packageJSON.version.length > 8
14+
? // If user is on a rolling build, display latest version of rolling build.
15+
`![${FLOOD_PROJECT_URL}]("https://img.shields.io/npm/v/@jesec/flood?label=HEAD" "Latest version of rolling build")`
16+
: // If user is on a released build, display commits to project made since user's version.
17+
`![${FLOOD_PROJECT_URL}](https://img.shields.io/github/commits-since/jesec/flood/v${packageJSON.version} "Commits since user's version")`,
18+
);
19+
1120
const AboutTab: FC = () => (
1221
<Suspense fallback={null}>
13-
<AboutMarkdown
14-
FloodVersion={() => packageJSON.version}
15-
CommitBadge={() =>
16-
packageJSON.version.length > 8 ? (
17-
// If user is on a rolling build, display latest version of rolling build.
18-
<a href={FLOOD_PROJECT_URL}>
19-
<img alt="Latest version of rolling build" src="https://img.shields.io/npm/v/@jesec/flood?label=HEAD" />
20-
</a>
21-
) : (
22-
// If user is on a released build, display commits to project made since user's version.
23-
<a href={FLOOD_PROJECT_URL}>
24-
<img
25-
alt="Commits since user's version"
26-
src={`https://img.shields.io/github/commits-since/jesec/flood/v${packageJSON.version}`}
27-
/>
28-
</a>
29-
)
30-
}
31-
/>
22+
<Markdown>{versioned}</Markdown>
3223
</Suspense>
3324
);
3425

client/src/javascript/typings.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
declare module '*.md' {
2-
export const react: any;
3-
const value: any;
2+
const value: string;
43
export default value;
54
}
65

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@
156156
"feedsub": "^0.7.8",
157157
"file-loader": "^6.2.0",
158158
"form-data": "^4.0.0",
159-
"frontmatter-markdown-loader": "^3.7.0",
160159
"fs-extra": "^10.1.0",
161160
"get-user-locale": "^1.5.1",
162161
"hash-wasm": "^4.9.0",
@@ -183,10 +182,12 @@
183182
"postcss": "^8.4.24",
184183
"postcss-loader": "^7.3.3",
185184
"prettier": "^2.8.8",
185+
"raw-loader": "^4.0.2",
186186
"react": "^18.2.0",
187187
"react-dev-utils": "^12.0.1",
188188
"react-dom": "^18.2.0",
189189
"react-dropzone": "^14.2.3",
190+
"react-markdown": "^9.0.1",
190191
"react-measure": "^2.5.2",
191192
"react-refresh": "^0.14.0",
192193
"react-router": "^6.26.0",

0 commit comments

Comments
 (0)