diff --git a/package.json b/package.json index b439cbf9..adb6698b 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,6 @@ "js-base64": "^3.7.7", "jsbarcode": "^3.11.6", "iconv-lite": "^0.6.3", - "js-base64": "^3.7.6", "js-base64": "^3.7.7", "json5": "^2.2.3", "jwt-decode": "^3.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 27de533d..f66d5855 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3466,7 +3466,7 @@ packages: /@types/lodash-es@4.17.10: resolution: {integrity: sha512-YJP+w/2khSBwbUSFdGsSqmDvmnN3cCKoPOL7Zjle6s30ZtemkkqhjVfFqGwPN7ASil5VyjE2GtyU/yqYY6mC0A==} dependencies: - '@types/lodash': 4.14.192 + '@types/lodash': 4.14.200 dev: false /@types/lodash.defaultsdeep@4.6.9: @@ -3489,6 +3489,7 @@ packages: /@types/lodash@4.14.192: resolution: {integrity: sha512-km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A==} + dev: true /@types/lodash@4.14.200: resolution: {integrity: sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==} diff --git a/src/components/FormatTransformer.vue b/src/components/FormatTransformer.vue index bcfcdb58..12c3d691 100644 --- a/src/components/FormatTransformer.vue +++ b/src/components/FormatTransformer.vue @@ -1,7 +1,9 @@ diff --git a/src/components/TextareaCopyable.vue b/src/components/TextareaCopyable.vue index 2539d303..a0961f1b 100644 --- a/src/components/TextareaCopyable.vue +++ b/src/components/TextareaCopyable.vue @@ -25,16 +25,8 @@ const props = withDefaults( copyPlacement?: 'top-right' | 'bottom-right' | 'outside' | 'none' copyMessage?: string wordWrap?: boolean -<<<<<<< HEAD -<<<<<<< HEAD downloadFileName?: string downloadButtonText?: string -======= ->>>>>>> feat/cert-key-parser -======= - downloadFileName?: string - downloadButtonText?: string ->>>>>>> feat/email-parser }>(), { followHeightOf: null, diff --git a/src/tools/json-minify/json-minify.vue b/src/tools/json-minify/json-minify.vue index 51d62703..e29dd0e0 100644 --- a/src/tools/json-minify/json-minify.vue +++ b/src/tools/json-minify/json-minify.vue @@ -23,5 +23,6 @@ const rules: UseValidationRule[] = [ output-language="json" :input-validation-rules="rules" :transformer="transformer" + download-file-name="output.json" /> diff --git a/src/tools/json-to-csv/json-to-csv.vue b/src/tools/json-to-csv/json-to-csv.vue index e2f5ddb6..0c0c8dc6 100644 --- a/src/tools/json-to-csv/json-to-csv.vue +++ b/src/tools/json-to-csv/json-to-csv.vue @@ -28,5 +28,6 @@ const rules: UseValidationRule[] = [ output-label="CSV version of your JSON" :input-validation-rules="rules" :transformer="transformer" + download-file-name="output.csv" /> diff --git a/src/tools/json-to-toml/json-to-toml.vue b/src/tools/json-to-toml/json-to-toml.vue index b1d37a38..bd3d3633 100644 --- a/src/tools/json-to-toml/json-to-toml.vue +++ b/src/tools/json-to-toml/json-to-toml.vue @@ -24,5 +24,6 @@ const rules: UseValidationRule[] = [ output-language="toml" :input-validation-rules="rules" :transformer="transformer" + download-file-name="output.toml" /> diff --git a/src/tools/json-to-yaml-converter/json-to-yaml.vue b/src/tools/json-to-yaml-converter/json-to-yaml.vue index cbaeb22d..e2aab10d 100644 --- a/src/tools/json-to-yaml-converter/json-to-yaml.vue +++ b/src/tools/json-to-yaml-converter/json-to-yaml.vue @@ -23,5 +23,6 @@ const rules: UseValidationRule[] = [ output-language="yaml" :input-validation-rules="rules" :transformer="transformer" + download-file-name="output.yaml" /> diff --git a/src/tools/list-converter/list-converter.vue b/src/tools/list-converter/list-converter.vue index 19dd30e5..3b9043d6 100644 --- a/src/tools/list-converter/list-converter.vue +++ b/src/tools/list-converter/list-converter.vue @@ -119,5 +119,6 @@ function transformer(value: string) { input-placeholder="Paste your input data here..." output-label="Your transformed data" :transformer="transformer" + download-file-name="output.txt" /> diff --git a/src/tools/toml-to-json/toml-to-json.vue b/src/tools/toml-to-json/toml-to-json.vue index 8c6dbfe2..c5fe9d43 100644 --- a/src/tools/toml-to-json/toml-to-json.vue +++ b/src/tools/toml-to-json/toml-to-json.vue @@ -22,5 +22,6 @@ const rules: UseValidationRule[] = [ output-language="json" :input-validation-rules="rules" :transformer="transformer" + download-file-name="output.json" /> diff --git a/src/tools/toml-to-yaml/toml-to-yaml.vue b/src/tools/toml-to-yaml/toml-to-yaml.vue index ec4e0158..989e9eef 100644 --- a/src/tools/toml-to-yaml/toml-to-yaml.vue +++ b/src/tools/toml-to-yaml/toml-to-yaml.vue @@ -23,5 +23,6 @@ const rules: UseValidationRule[] = [ output-language="yaml" :input-validation-rules="rules" :transformer="transformer" + download-file-name="output.yaml" /> diff --git a/src/tools/xml-formatter/xml-formatter.vue b/src/tools/xml-formatter/xml-formatter.vue index d59cf8c7..968faa2f 100644 --- a/src/tools/xml-formatter/xml-formatter.vue +++ b/src/tools/xml-formatter/xml-formatter.vue @@ -42,5 +42,6 @@ const rules: UseValidationRule[] = [ :input-validation-rules="rules" :transformer="transformer" :input-default="defaultValue" + download-file-name="output.xml" /> diff --git a/src/tools/yaml-to-json-converter/yaml-to-json.vue b/src/tools/yaml-to-json-converter/yaml-to-json.vue index 72608add..9c605fe5 100644 --- a/src/tools/yaml-to-json-converter/yaml-to-json.vue +++ b/src/tools/yaml-to-json-converter/yaml-to-json.vue @@ -27,5 +27,6 @@ const rules: UseValidationRule[] = [ output-language="json" :input-validation-rules="rules" :transformer="transformer" + download-file-name="output.json" /> diff --git a/src/tools/yaml-to-toml/yaml-to-toml.vue b/src/tools/yaml-to-toml/yaml-to-toml.vue index cad72e6b..37f22def 100644 --- a/src/tools/yaml-to-toml/yaml-to-toml.vue +++ b/src/tools/yaml-to-toml/yaml-to-toml.vue @@ -24,5 +24,6 @@ const rules: UseValidationRule[] = [ output-language="toml" :input-validation-rules="rules" :transformer="transformer" + download-file-name="output.toml" />