From a1a7a1b5106b101a1a0f5ee9e0e90cbe6050bfd1 Mon Sep 17 00:00:00 2001
From: mitermayer <mitermayer.reis@gmail.com>
Date: Tue, 5 Sep 2017 20:37:17 -0700
Subject: Adding support for prettier configuration

---
 plugin/prettier.vim | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugin')

diff --git a/plugin/prettier.vim b/plugin/prettier.vim
index f6cb7c8..7888309 100644
--- a/plugin/prettier.vim
+++ b/plugin/prettier.vim
@@ -54,6 +54,9 @@ let g:prettier#config#trailing_comma = get(g:,'prettier#config#trailing_comma',
 " flow|babylon|typescript|postcss|json|graphql
 let g:prettier#config#parser = get(g:,'prettier#config#parser', 'flow')
 
+" cli-override|file-override|prefer-file
+let g:prettier#config#config_precedence = get(g:, 'prettier#config#config_precedence', 'prefer-file')
+
 " synchronous by default
 command! -nargs=? -range=% Prettier call prettier#Prettier(g:prettier#exec_cmd_async, <line1>, <line2>)
 
-- 
cgit v1.3


From aa2bb361505c8026e97624705da7f97fb775cc69 Mon Sep 17 00:00:00 2001
From: mitermayer <mitermayer.reis@gmail.com>
Date: Tue, 5 Sep 2017 20:40:39 -0700
Subject: minor bump with breaking changes with older prettier versions

---
 package.json        | 2 +-
 plugin/prettier.vim | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugin')

diff --git a/package.json b/package.json
index 9c82daf..8be8b03 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vim-prettier",
   "author": "Mitermayer Reis <mitermayer.reis@gmail.com>",
-  "version": "0.0.15",
+  "version": "0.1.0",
   "description": "Vim plugin for prettier",
   "license": "MIT",
   "repository": {
diff --git a/plugin/prettier.vim b/plugin/prettier.vim
index 7888309..7688063 100644
--- a/plugin/prettier.vim
+++ b/plugin/prettier.vim
@@ -5,7 +5,7 @@
 " Name Of File: prettier.vim
 "  Description: A vim plugin wrapper for prettier, pre-configured with custom default prettier settings.
 "   Maintainer: Mitermayer Reis <mitermayer.reis at gmail.com>
-"      Version: 0.0.15
+"      Version: 0.1.0
 "        Usage: Use :help vim-prettier-usage, or visit https://github.com/prettier/vim-prettier
 "
 "==========================================================================================================
-- 
cgit v1.3