Merge pull request #52 from prettier/issue/51-adding-support-for-prettier-1.60.1.0

Issue/51 adding support for prettier 1.7

5 files changed, 20 insertions, 3 deletions

diff --git a/README.md b/README.md
index 92c3c06..7581820 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,10 @@
 
 A vim plugin wrapper for prettier, pre-configured with custom default prettier settings.
 
+**Note:** requires `prettier` version 1.7.0+
+
+***
+
 By default it will auto format **javascript**, **typescript**, **less**, **scss**, **css**, **json**, and **graphql** files that have "@format" annotation in the header of the file.
 
 ![vim-prettier](/media/vim-prettier.gif?raw=true "vim-prettier")
@@ -133,6 +137,9 @@ g:prettier#config#trailing_comma = 'all'
 
 " flow|babylon|typescript|postcss|json|graphql
 g:prettier#config#parser = 'flow'
+
+" cli-override|file-override|prefer-file
+g:prettier#config#config_precedence = 'prefer-file'
 ```
 
 ### REQUIREMENT(S)
diff --git a/autoload/prettier.vim b/autoload/prettier.vim
index 8982911..7d6eb08 100644
--- a/autoload/prettier.vim
+++ b/autoload/prettier.vim
@@ -190,6 +190,8 @@ function! s:Get_Prettier_Exec_Args(config) abort
           \ get(a:config, 'trailingComma', g:prettier#config#trailing_comma) .
           \ ' --parser ' .
           \ get(a:config, 'parser', g:prettier#config#parser) .
+          \ ' --config-precedence ' .
+          \ get(a:config, 'configPrecedence', g:prettier#config#config_precedence) .
           \ ' --stdin '
   return cmd
 endfunction
diff --git a/doc/prettier.txt b/doc/prettier.txt
index 9a0f209..38fad26 100644
--- a/doc/prettier.txt
+++ b/doc/prettier.txt
@@ -14,6 +14,8 @@ INTRODUCTION                                        *vim-prettier-introduction*
 A vim plugin wrapper for prettier, pre-configured with 
 custom default prettier settings.
 
+**Note:** requires `prettier` version 1.7.0+
+
 By default it will auto format javascript, typescript, less, scss, css,
 json, and graphql files that have '@format' annotation in the header of the file.
 
@@ -123,6 +125,9 @@ However they can be configured by:
 
   " flow|babylon|typescript|postcss|json|graphql
   g:prettier#config#parser = 'flow'
+
+  " cli-override|file-override|prefer-file
+  g:prettier#config#config_precedence = 'prefer-file'
 <
 ==============================================================================
 REQUIREMENT(S)                                      *vim-prettier-requirements*
diff --git a/package.json b/package.json
index b13e690..17af76d 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": {
@@ -9,6 +9,6 @@
     "url": "git://github.com/prettier/vim-prettier.git"
   },
   "dependencies": {
-    "prettier": "^1.5.3"
+    "prettier": "^1.7.0"
   }
 }
diff --git a/plugin/prettier.vim b/plugin/prettier.vim
index f6cb7c8..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
 "
 "==========================================================================================================
@@ -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>)