Skip to content

Commit 324fd63

Browse files
authored
Merge branch 'main' into fix/token-generator
2 parents bda56ac + 87984e2 commit 324fd63

File tree

14 files changed

+325
-21
lines changed

14 files changed

+325
-21
lines changed

components.d.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ declare module '@vue/runtime-core' {
7272
DockerRunToDockerComposeConverter: typeof import('./src/tools/docker-run-to-docker-compose-converter/docker-run-to-docker-compose-converter.vue')['default']
7373
DynamicValues: typeof import('./src/tools/benchmark-builder/dynamic-values.vue')['default']
7474
Editor: typeof import('./src/tools/html-wysiwyg-editor/editor/editor.vue')['default']
75+
EmailNormalizer: typeof import('./src/tools/email-normalizer/email-normalizer.vue')['default']
7576
EmojiCard: typeof import('./src/tools/emoji-picker/emoji-card.vue')['default']
7677
EmojiGrid: typeof import('./src/tools/emoji-picker/emoji-grid.vue')['default']
7778
EmojiPicker: typeof import('./src/tools/emoji-picker/emoji-picker.vue')['default']
@@ -110,6 +111,7 @@ declare module '@vue/runtime-core' {
110111
JsonMinify: typeof import('./src/tools/json-minify/json-minify.vue')['default']
111112
JsonToCsv: typeof import('./src/tools/json-to-csv/json-to-csv.vue')['default']
112113
JsonToToml: typeof import('./src/tools/json-to-toml/json-to-toml.vue')['default']
114+
JsonToXml: typeof import('./src/tools/json-to-xml/json-to-xml.vue')['default']
113115
JsonToYaml: typeof import('./src/tools/json-to-yaml-converter/json-to-yaml.vue')['default']
114116
JsonViewer: typeof import('./src/tools/json-viewer/json-viewer.vue')['default']
115117
JwtParser: typeof import('./src/tools/jwt-parser/jwt-parser.vue')['default']
@@ -119,6 +121,7 @@ declare module '@vue/runtime-core' {
119121
LoremIpsumGenerator: typeof import('./src/tools/lorem-ipsum-generator/lorem-ipsum-generator.vue')['default']
120122
MacAddressGenerator: typeof import('./src/tools/mac-address-generator/mac-address-generator.vue')['default']
121123
MacAddressLookup: typeof import('./src/tools/mac-address-lookup/mac-address-lookup.vue')['default']
124+
MarkdownToHtml: typeof import('./src/tools/markdown-to-html/markdown-to-html.vue')['default']
122125
MathEvaluator: typeof import('./src/tools/math-evaluator/math-evaluator.vue')['default']
123126
MenuBar: typeof import('./src/tools/html-wysiwyg-editor/editor/menu-bar.vue')['default']
124127
MenuBarItem: typeof import('./src/tools/html-wysiwyg-editor/editor/menu-bar-item.vue')['default']
@@ -127,28 +130,23 @@ declare module '@vue/runtime-core' {
127130
MetaTagGenerator: typeof import('./src/tools/meta-tag-generator/meta-tag-generator.vue')['default']
128131
MimeTypes: typeof import('./src/tools/mime-types/mime-types.vue')['default']
129132
NavbarButtons: typeof import('./src/components/NavbarButtons.vue')['default']
133+
NButton: typeof import('naive-ui')['NButton']
130134
NCode: typeof import('naive-ui')['NCode']
131135
NCollapseTransition: typeof import('naive-ui')['NCollapseTransition']
132136
NConfigProvider: typeof import('naive-ui')['NConfigProvider']
133-
NDivider: typeof import('naive-ui')['NDivider']
134137
NEllipsis: typeof import('naive-ui')['NEllipsis']
135138
NForm: typeof import('naive-ui')['NForm']
136139
NFormItem: typeof import('naive-ui')['NFormItem']
137-
NGi: typeof import('naive-ui')['NGi']
138-
NGrid: typeof import('naive-ui')['NGrid']
139140
NH1: typeof import('naive-ui')['NH1']
140141
NH3: typeof import('naive-ui')['NH3']
141142
NIcon: typeof import('naive-ui')['NIcon']
142143
NInputNumber: typeof import('naive-ui')['NInputNumber']
143-
NLabel: typeof import('naive-ui')['NLabel']
144144
NLayout: typeof import('naive-ui')['NLayout']
145145
NLayoutSider: typeof import('naive-ui')['NLayoutSider']
146146
NMenu: typeof import('naive-ui')['NMenu']
147147
NP: typeof import('naive-ui')['NP']
148148
NScrollbar: typeof import('naive-ui')['NScrollbar']
149149
NSlider: typeof import('naive-ui')['NSlider']
150-
NSpace: typeof import('naive-ui')['NSpace']
151-
NSpin: typeof import('naive-ui')['NSpin']
152150
NSwitch: typeof import('naive-ui')['NSwitch']
153151
NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default']
154152
OtpCodeGeneratorAndValidator: typeof import('./src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue')['default']
@@ -191,6 +189,7 @@ declare module '@vue/runtime-core' {
191189
UuidGenerator: typeof import('./src/tools/uuid-generator/uuid-generator.vue')['default']
192190
WifiQrCodeGenerator: typeof import('./src/tools/wifi-qr-code-generator/wifi-qr-code-generator.vue')['default']
193191
XmlFormatter: typeof import('./src/tools/xml-formatter/xml-formatter.vue')['default']
192+
XmlToJson: typeof import('./src/tools/xml-to-json/xml-to-json.vue')['default']
194193
YamlToJson: typeof import('./src/tools/yaml-to-json-converter/yaml-to-json.vue')['default']
195194
YamlToToml: typeof import('./src/tools/yaml-to-toml/yaml-to-toml.vue')['default']
196195
YamlViewer: typeof import('./src/tools/yaml-viewer/yaml-viewer.vue')['default']

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"@tiptap/pm": "2.1.6",
4242
"@tiptap/starter-kit": "2.1.6",
4343
"@tiptap/vue-3": "2.0.3",
44+
"@types/markdown-it": "^13.0.7",
4445
"@types/figlet": "^1.5.8",
4546
"@vicons/material": "^0.12.0",
4647
"@vicons/tabler": "^0.12.0",
@@ -57,6 +58,7 @@
5758
"crypto-js": "^4.1.1",
5859
"date-fns": "^2.29.3",
5960
"dompurify": "^3.0.6",
61+
"email-normalizer": "^1.0.0",
6062
"emojilib": "^3.0.10",
6163
"figlet": "^1.7.0",
6264
"figue": "^1.2.0",
@@ -69,6 +71,7 @@
6971
"jwt-decode": "^3.1.2",
7072
"libphonenumber-js": "^1.10.28",
7173
"lodash": "^4.17.21",
74+
"markdown-it": "^14.0.0",
7275
"marked": "^10.0.0",
7376
"mathjs": "^11.9.1",
7477
"mime-types": "^2.1.35",
@@ -92,6 +95,7 @@
9295
"vue-router": "^4.1.6",
9396
"vue-tsc": "^1.8.1",
9497
"xml-formatter": "^3.3.2",
98+
"xml-js": "^1.6.11",
9599
"yaml": "^2.2.1"
96100
},
97101
"devDependencies": {

pnpm-lock.yaml

Lines changed: 78 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/TextareaCopyable.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import sqlHljs from 'highlight.js/lib/languages/sql';
77
import xmlHljs from 'highlight.js/lib/languages/xml';
88
import yamlHljs from 'highlight.js/lib/languages/yaml';
99
import iniHljs from 'highlight.js/lib/languages/ini';
10+
import markdownHljs from 'highlight.js/lib/languages/markdown';
1011
import { useCopy } from '@/composable/copy';
1112
1213
const props = withDefaults(
@@ -30,6 +31,7 @@ hljs.registerLanguage('html', xmlHljs);
3031
hljs.registerLanguage('xml', xmlHljs);
3132
hljs.registerLanguage('yaml', yamlHljs);
3233
hljs.registerLanguage('toml', iniHljs);
34+
hljs.registerLanguage('markdown', markdownHljs);
3335
3436
const { value, language, followHeightOf, copyPlacement, copyMessage } = toRefs(props);
3537
const { height } = followHeightOf.value ? useElementSize(followHeightOf) : { height: ref(null) };

0 commit comments

Comments
 (0)