diff --git a/package.json b/package.json index 0b6e816d..ffa7bd4e 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "highlight.js": "^11.7.0", "iarna-toml-esm": "^3.0.5", "ibantools": "^4.3.3", - "js-yaml": "^4.1.0", "json5": "^2.2.3", "jwt-decode": "^3.1.2", "libphonenumber-js": "^1.10.28", @@ -102,7 +101,6 @@ "@types/bcryptjs": "^2.4.2", "@types/crypto-js": "^4.1.1", "@types/dompurify": "^3.0.5", - "@types/js-yaml": "^4.0.9", "@types/jsdom": "^21.0.0", "@types/lodash": "^4.14.192", "@types/mime-types": "^2.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b0e57b0..dfacabd4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -86,9 +86,6 @@ dependencies: ibantools: specifier: ^4.3.3 version: 4.3.3 - js-yaml: - specifier: ^4.1.0 - version: 4.1.0 json5: specifier: ^2.2.3 version: 2.2.3 @@ -202,9 +199,6 @@ devDependencies: '@types/dompurify': specifier: ^3.0.5 version: 3.0.5 - '@types/js-yaml': - specifier: ^4.0.9 - version: 4.0.9 '@types/jsdom': specifier: ^21.0.0 version: 21.1.0 @@ -2948,10 +2942,6 @@ packages: '@types/node': 18.15.11 dev: true - /@types/js-yaml@4.0.9: - resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==} - dev: true - /@types/jsdom@21.1.0: resolution: {integrity: sha512-leWreJOdnuIxq9Y70tBVm/bvTuh31DSlF/r4l7Cfi4uhVQqLHD0Q4v301GMisEMwwbMgF7ZKxuZ+Jbd4NcdmRw==} dependencies: @@ -6530,6 +6520,7 @@ packages: hasBin: true dependencies: argparse: 2.0.1 + dev: true /jsbn@1.1.0: resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==} diff --git a/src/tools/yaml-viewer/yaml-models.ts b/src/tools/yaml-viewer/yaml-models.ts index 54a0a0bf..54569db8 100644 --- a/src/tools/yaml-viewer/yaml-models.ts +++ b/src/tools/yaml-viewer/yaml-models.ts @@ -1,6 +1,6 @@ import { type MaybeRef, get } from '@vueuse/core'; -import yaml from 'js-yaml'; +import yaml from 'yaml'; export { formatYaml }; @@ -13,10 +13,10 @@ function formatYaml({ sortKeys?: MaybeRef indentSize?: MaybeRef }) { - const parsedYaml = yaml.load(get(rawYaml)); + const parsedYaml = yaml.parse(get(rawYaml)); - const formattedYAML = yaml.dump(parsedYaml, { - sortKeys: get(sortKeys), + const formattedYAML = yaml.stringify(parsedYaml, { + sortMapEntries: get(sortKeys), indent: get(indentSize), }); diff --git a/src/tools/yaml-viewer/yaml-viewer.vue b/src/tools/yaml-viewer/yaml-viewer.vue index dfa3c832..3385eee2 100644 --- a/src/tools/yaml-viewer/yaml-viewer.vue +++ b/src/tools/yaml-viewer/yaml-viewer.vue @@ -1,5 +1,5 @@