From 8e82248f5e1cd066cd5f24c217c531ae7c16d702 Mon Sep 17 00:00:00 2001 From: Joscha Date: Sun, 2 Mar 2025 17:34:30 +0100 Subject: [PATCH] Set up prettier --- .gitignore | 1 + .prettierignore | 5 +++++ .prettierrc | 3 +++ .vscode/settings.json | 5 +++-- meta/fmt | 4 ++++ package.json | 8 ++++++++ .../pnpm-lock.yaml => pnpm-lock.yaml | 13 +++++++++++++ pnpm-workspace.yaml | 2 ++ 8 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc create mode 100644 package.json rename showbits-thermal-printer-ui/pnpm-lock.yaml => pnpm-lock.yaml (98%) create mode 100644 pnpm-workspace.yaml diff --git a/.gitignore b/.gitignore index b83d222..cb95ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +/node_modules/ /target/ diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..9573ec3 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,5 @@ +/pnpm-lock.yaml +/showbits-thermal-printer-ui/dist/ +/showbits-thermal-printer-ui/pnpm-lock.yaml +/showbits-typst-plugin/target/ +/target/ diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..5b5bd99 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,3 @@ +{ + "proseWrap": "always" +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 6d249ee..f4d78c2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,8 @@ { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "[fish]": { "editor.defaultFormatter": "bmalehorn.vscode-fish" }, "[rust]": { "editor.defaultFormatter": "rust-lang.rust-analyzer" }, "[toml]": { "editor.defaultFormatter": "tamasfe.even-better-toml" }, - + "[typst]": { "editor.defaultFormatter": "myriad-dreamin.tinymist" }, + "editor.defaultFormatter": "esbenp.prettier-vscode", "tinymist.fontPaths": ["showbits-assets/data"] } diff --git a/meta/fmt b/meta/fmt index 12cb37c..97d5ddf 100755 --- a/meta/fmt +++ b/meta/fmt @@ -1,5 +1,9 @@ #!/usr/bin/env fish cargo fmt + pushd showbits-typst-plugin cargo fmt +popd + +pnpm fmt diff --git a/package.json b/package.json new file mode 100644 index 0000000..7785260 --- /dev/null +++ b/package.json @@ -0,0 +1,8 @@ +{ + "scripts": { + "fmt": "prettier . --write" + }, + "devDependencies": { + "prettier": "^3.5.2" + } +} diff --git a/showbits-thermal-printer-ui/pnpm-lock.yaml b/pnpm-lock.yaml similarity index 98% rename from showbits-thermal-printer-ui/pnpm-lock.yaml rename to pnpm-lock.yaml index 906708a..16dc788 100644 --- a/showbits-thermal-printer-ui/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,12 @@ settings: importers: .: + devDependencies: + prettier: + specifier: ^3.5.2 + version: 3.5.2 + + showbits-thermal-printer-ui: dependencies: vue: specifier: ^3.5.13 @@ -426,6 +432,11 @@ packages: resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} + prettier@3.5.2: + resolution: {integrity: sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==} + engines: {node: '>=14'} + hasBin: true + rollup@4.34.9: resolution: {integrity: sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -813,6 +824,8 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 + prettier@3.5.2: {} + rollup@4.34.9: dependencies: '@types/estree': 1.0.6 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml new file mode 100644 index 0000000..0483be3 --- /dev/null +++ b/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +packages: + - showbits-thermal-printer-ui