From ae316ecba9c3ac623ec657f1b314377645e2d3f5 Mon Sep 17 00:00:00 2001 From: Rafael Derolez Date: Sun, 22 Oct 2023 21:00:38 +0200 Subject: [PATCH 1/2] feat(typescript): added mjs file files to prettier detection file table --- lua/astrocommunity/pack/typescript/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/astrocommunity/pack/typescript/init.lua b/lua/astrocommunity/pack/typescript/init.lua index 945f680ce..5133edcbc 100644 --- a/lua/astrocommunity/pack/typescript/init.lua +++ b/lua/astrocommunity/pack/typescript/init.lua @@ -66,8 +66,10 @@ return { or util.root_has_file ".prettierrc.json5" or util.root_has_file ".prettierrc.js" or util.root_has_file ".prettierrc.cjs" + or util.root_has_file ".prettierrc.mjs" or util.root_has_file "prettier.config.js" or util.root_has_file "prettier.config.cjs" + or util.root_has_file "prettier.config.mjs" or util.root_has_file ".prettierrc.toml" end From 9c3a73528870694b854943fcc5030a4ae9a2b68c Mon Sep 17 00:00:00 2001 From: Uzair Aftab <48220549+Uzaaft@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:22:16 +0100 Subject: [PATCH 2/2] fix(typescript): Fix order of presedence --- lua/astrocommunity/pack/typescript/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/astrocommunity/pack/typescript/init.lua b/lua/astrocommunity/pack/typescript/init.lua index 5133edcbc..bad1d6dd3 100644 --- a/lua/astrocommunity/pack/typescript/init.lua +++ b/lua/astrocommunity/pack/typescript/init.lua @@ -66,10 +66,10 @@ return { or util.root_has_file ".prettierrc.json5" or util.root_has_file ".prettierrc.js" or util.root_has_file ".prettierrc.cjs" - or util.root_has_file ".prettierrc.mjs" or util.root_has_file "prettier.config.js" - or util.root_has_file "prettier.config.cjs" + or util.root_has_file ".prettierrc.mjs" or util.root_has_file "prettier.config.mjs" + or util.root_has_file "prettier.config.cjs" or util.root_has_file ".prettierrc.toml" end