Skip to content

Commit d2749f1

Browse files
committed
Merge branch 'feat/md-to-html' into chore/all-my-stuffs
# Conflicts: # components.d.ts # package.json # pnpm-lock.yaml # src/components/TextareaCopyable.vue # src/tools/index.ts # src/tools/markdown-to-html/index.ts # src/tools/markdown-to-html/markdown-to-html.vue
2 parents b89bac5 + 1b2ce73 commit d2749f1

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
"@types/lodash.last": "^3.0.9",
7373
"@types/turndown": "^5.0.4",
7474
"@types/arr-diff": "^4.0.3",
75+
"@types/markdown-it": "^13.0.7",
7576
"@types/figlet": "^1.5.8",
7677
"@types/markdown-it": "^13.0.7",
7778
"@vicons/material": "^0.12.0",
@@ -152,6 +153,7 @@
152153
"lodash.flattendeep": "^4.4.0",
153154
"lodash.last": "^3.0.0",
154155
"lorem-ipsum-japanese": "^1.0.1",
156+
"markdown-it": "^14.0.0",
155157
"marked": "^10.0.0",
156158
"mathjs": "^11.9.1",
157159
"mime-types": "^2.1.35",

src/tools/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import { tool as icalGenerator } from './ical-generator';
6363
import { tool as imageToCss } from './image-to-css';
6464
import { tool as jsonToGo } from './json-to-go';
6565
import { tool as jsonToSchema } from './json-to-schema';
66+
import { tool as markdownToHtml } from './markdown-to-html';
6667
import { tool as pdfSignatureChecker } from './pdf-signature-checker';
6768
import { tool as numeronymGenerator } from './numeronym-generator';
6869
import { tool as macAddressGenerator } from './mac-address-generator';

src/tools/markdown-to-html/markdown-to-html.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function printHtml() {
3737

3838
<div flex justify-center>
3939
<n-button @click="printHtml">
40-
Print as PDF
40+
Print (ie, use a PDF Printer to get a PDF file)
4141
</n-button>
4242
</div>
4343
</div>

0 commit comments

Comments
 (0)