From aa24f1e6d13164c46db12455504bf48dda8b9673 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 6 Feb 2025 21:38:13 +0100 Subject: [PATCH] Bug 38664: Treat .vue files like other JS files Signed-off-by: Katrin Fischer --- .prettierrc.js | 10 +--------- misc/devel/tidy.pl | 11 +---------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.prettierrc.js b/.prettierrc.js index 56742a86de..6d94abab2c 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -5,20 +5,12 @@ module.exports = { useTabs: false, overrides: [ { - files: ["*.js", "*.ts"], + files: ["*.js", "*.ts", "*.vue"], options: { trailingComma: "es5", arrowParens: "avoid", }, }, - { - files: "*.vue", - options: { - trailingComma: "es5", - arrowParens: "avoid", - semi: false, - }, - }, { files: ["*.tt", "*.inc"], options: { diff --git a/misc/devel/tidy.pl b/misc/devel/tidy.pl index 9fbdfe8148..3b52effe7a 100755 --- a/misc/devel/tidy.pl +++ b/misc/devel/tidy.pl @@ -98,8 +98,6 @@ sub tidy { return tidy_perl($file); } elsif ( $filetype eq 'js' ) { return tidy_js($file); - } elsif ( $filetype eq 'vue' ) { - return tidy_vue($file); } elsif ( $filetype eq 'tt' ) { return tidy_tt($file); } else { @@ -144,12 +142,6 @@ sub tidy_js { print qx{$cmd}; } -sub tidy_vue { - my ($file) = @_; - my $cmd = sprintf q{yarn --silent run prettier %s%s}, ( $no_write ? '' : '--write ' ), $file; - print qx{$cmd}; -} - sub tidy_tt { my ($original_file) = @_; my ( $success, $error_message, $full_buf, $stdout_buf, $stderr_buf ); @@ -193,8 +185,7 @@ sub get_filetype { return 'perl' if $file =~ m{^svc} || $file =~ m{^opac/svc}; return 'perl' if $file =~ m{\.pl$} || $file =~ m{\.pm} || $file =~ m{\.t$}; - return 'js' if $file =~ m{\.js$} || $file =~ m{\.ts$}; - return 'vue' if $file =~ m{\.vue$}; + return 'js' if $file =~ m{\.js$} || $file =~ m{\.ts$} || $file =~ m{\.vue$}; return 'tt' if $file =~ m{\.inc$} || $file =~ m{\.tt$};